From 1bd47d3e04c409582486ea3ec915d3b7899f6841 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 20 Feb 2013 00:04:38 -0800 Subject: Wed Feb 20 00:04:38 PST 2013 --- community/nemo/PKGBUILD | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 community/nemo/PKGBUILD (limited to 'community/nemo/PKGBUILD') diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD new file mode 100644 index 000000000..b89dda95c --- /dev/null +++ b/community/nemo/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 84548 2013-02-19 20:34:47Z faidoc $ +# Maintainer: Alexandre Filgueira +# Contributor: Ner0 + +pkgname=nemo +pkgver=1.7.1 +pkgrel=1 +pkgdesc="Cinnamon file manager (Nautilus fork), stable version" +arch=('i686' 'x86_64') +url="https://github.com/linuxmint/nemo" +license=('GPL') +depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2' + 'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql') +makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common') +optdepends=('gksu: Open as Root') +provides=('nemo-fm') +replaces=('nemo-fm') +conflicts=('nemo-fm') +options=('!emptydirs' '!libtool') +install=nemo.install +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" + "gnome-autogen.sh") +md5sums=('b348b6e340e055bef3163555b99621bb' + 'a925691c9b57a6a884dcf07da057fd1f') + +build() { + cd linuxmint-nemo-* + + # Get default terminal value + _terminal=$(gsettings get org.gnome.desktop.default-applications.terminal exec | tr -d "'") + + # Set "Open in Terminal" to default terminal (Arch doesn't use x-terminal-emulator) + sed -i "s/x-terminal-emulator/$_terminal/" src/nemo-view.c + + cp ${srcdir}/gnome-autogen.sh . + sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am + sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh + chmod +x gnome-autogen.sh + + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --libexecdir=/usr/lib/nemo \ + --disable-nst-extension \ + --disable-update-mimedb \ + --disable-packagekit \ + --disable-gtk-doc-html \ + --disable-schemas-compile + make +} + +package() { + cd linuxmint-nemo-* + + make DESTDIR="$pkgdir/" install + + # Python2 fix + sed -i 's/bin\/python/bin\/python2/g' "${pkgdir}/usr/share/nemo/actions/myaction.py" +} -- cgit v1.2.3-54-g00ecf From 582035722561a5ecbadc13abc26331353d810567 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 5 Mar 2013 00:04:04 -0800 Subject: Tue Mar 5 00:04:04 PST 2013 --- community/busybox/PKGBUILD | 4 +- community/busybox/busybox.install | 6 +-- community/conntrack-tools/PKGBUILD | 12 +++--- community/guvcview/PKGBUILD | 8 ++-- community/hercules/PKGBUILD | 37 ++++++++++-------- community/libnetfilter_acct/PKGBUILD | 8 ++-- community/libnetfilter_conntrack/PKGBUILD | 8 ++-- community/libvirt/PKGBUILD | 9 +++-- community/nemo/PKGBUILD | 20 +++++----- community/nemo/use-terminal-config.patch | 45 ++++++++++++++++++++++ community/nfacct/PKGBUILD | 33 ++++++++++++++++ community/tinc/PKGBUILD | 10 ++--- community/wings3d/PKGBUILD | 36 ++++++++--------- community/wings3d/wings3d.sh | 2 - community/xfmedia/PKGBUILD | 7 ++-- extra/opencv/PKGBUILD | 31 +++++++++------ extra/qwt/PKGBUILD | 6 +-- extra/raptor/PKGBUILD | 8 ++-- extra/xfce4-eyes-plugin/PKGBUILD | 42 +++++++++++--------- extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install | 6 ++- extra/xfdesktop/PKGBUILD | 16 +++----- .../add-backgrounds-xfce-to-search-path.patch | 36 ----------------- libre/linux-libre-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 6 +-- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 6 +-- libre/linux-libre/linux-libre.install | 2 +- pcr/libav-builder/PKGBUILD | 2 +- pcr/libnatpmp/PKGBUILD | 8 ++-- pcr/python2-renpy/PKGBUILD | 8 ++-- pcr/renpy/PKGBUILD | 21 +++++----- 32 files changed, 255 insertions(+), 198 deletions(-) create mode 100644 community/nemo/use-terminal-config.patch create mode 100644 community/nfacct/PKGBUILD delete mode 100644 community/wings3d/wings3d.sh delete mode 100644 extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch (limited to 'community/nemo/PKGBUILD') diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index d20578341..b875b26f6 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73502 2012-07-08 17:57:22Z spupykin $ +# $Id: PKGBUILD 85655 2013-03-04 13:07:52Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jens Pranaitis pkgname=busybox pkgver=1.20.2 -pkgrel=1 +pkgrel=2 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64") url="http://www.busybox.net" diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install index 72a1e98b3..ecbeec39a 100644 --- a/community/busybox/busybox.install +++ b/community/busybox/busybox.install @@ -4,10 +4,10 @@ post_install() { } pre_upgrade() { - stat -c %a bin/busybox >tmp/busybox.upgrade.script + busybox stat -c %a bin/busybox >tmp/busybox.upgrade.script } post_upgrade() { - [ -f tmp/busybox.upgrade.script ] && chmod `cat tmp/busybox.upgrade.script` bin/busybox - rm -f tmp/busybox.upgrade.script + [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` bin/busybox + busybox rm -f tmp/busybox.upgrade.script } diff --git a/community/conntrack-tools/PKGBUILD b/community/conntrack-tools/PKGBUILD index c6dbe7a57..3f394f00b 100644 --- a/community/conntrack-tools/PKGBUILD +++ b/community/conntrack-tools/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 83854 2013-02-05 18:12:01Z eric $ +# $Id: PKGBUILD 85682 2013-03-04 23:03:57Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Valere Monseur # Contributor: Alessandro Sagratini # Contributor: Kevin Edmonds pkgname=conntrack-tools -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 pkgdesc='Userspace tools to interact with the Netfilter connection tracking system' arch=('i686' 'x86_64') url='http://www.netfilter.org/projects/conntrack-tools' @@ -21,9 +21,9 @@ source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.b 'conntrackd.service' '01-config-file-path.patch') install=$pkgname.install -md5sums=('ee737c774e01349f75e935228a2d851b' - 'bd135eaefb47923bb8e8d26f084d3e9d' - 'e71ff7b8c4997b797cab3eaaccb693f4') +sha1sums=('6fda497ef1ebd5e4afe01830ece072d2df2fe50f' + '2c205952a447ee0a6a7fc99bddeea1bfaf1b8034' + 'e7607a9ac14dd839f3716ac68d46e19ab26ef112') build() { cd $pkgname-$pkgver diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD index 8ef3c1f61..0d22217cd 100644 --- a/community/guvcview/PKGBUILD +++ b/community/guvcview/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 84351 2013-02-16 22:50:29Z ioni $ +# $Id: PKGBUILD 85669 2013-03-04 16:14:23Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Maxwell Pray a.k.a. Synthead pkgname=guvcview -pkgver=1.6.1 -pkgrel=3 +pkgver=1.7.0 +pkgrel=1 pkgdesc="A video viewer and capturer for the linux uvc driver" arch=('i686' 'x86_64') url="http://guvcview.sourceforge.net/" @@ -14,7 +14,7 @@ makedepends=('pkg-config' 'intltool') optdepends=('pulseaudio: for PulseAudio support') options=('!docs') source=("http://downloads.sourceforge.net/project/${pkgname}/source/${pkgname}-src-${pkgver}.tar.gz") -md5sums=('b3dfd04d8aae0c807d5f5d6ba035580f') +md5sums=('fe141fe2fe2a16df69f7866c27334a56') build() { cd "${srcdir}/${pkgname}-src-${pkgver}" diff --git a/community/hercules/PKGBUILD b/community/hercules/PKGBUILD index 4f49a03bf..4db656d80 100644 --- a/community/hercules/PKGBUILD +++ b/community/hercules/PKGBUILD @@ -1,30 +1,35 @@ -# $Id: PKGBUILD 83152 2013-01-27 16:17:47Z pierre $ +# $Id: PKGBUILD 85609 2013-03-03 23:25:19Z arodseth $ +# Maintainer: Alexander Rødseth +# Contributor: Kevin Piche # Contributor: Tom Newsom -# Maintainer: Kevin Piche pkgname=hercules -pkgver=3.07 -pkgrel=2 -pkgdesc="A software implementation of the mainframe System/370 and ESA/390 architectures" -url="http://www.hercules-390.org/" -source=("http://www.hercules-390.org/$pkgname-$pkgver.tar.gz") -arch=('i686' 'x86_64') +pkgver=3.08 +pkgrel=1 +arch=('x86_64' 'i686') +pkgdesc='Software implementation of System/370 and ESA/390' +url='http://www.hercules-390.eu/' +source=("http://downloads.hercules-390.eu/$pkgname-$pkgver.tar.gz") license=('custom') options=('!libtool') -depends=('bzip2' 'libgcrypt' 'zlib') -md5sums=('a12aa1645b0695b25b7fc0c9a3ccab3a') +depends=('bzip2' 'libgcrypt' 'zlib' 'perl') +sha256sums=('85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" + # Change module extension from .la to .so. sed '/HDL_MODULE_SUFFIX/ s/\.la/.so/' -i hdl.h ./configure --prefix=/usr - make + make -j1 } package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr install - install -D -m644 COPYRIGHT \ - $pkgdir/usr/share/licenses/hercules/qpl1 + cd "$srcdir/$pkgname-$pkgver" + + make prefix="$pkgdir/usr" install + install -Dm644 COPYRIGHT \ + "$pkgdir/usr/share/licenses/hercules/qpl1" } + +# vim:set ts=2 sw=2 et: diff --git a/community/libnetfilter_acct/PKGBUILD b/community/libnetfilter_acct/PKGBUILD index 3ab673656..33666d8fd 100644 --- a/community/libnetfilter_acct/PKGBUILD +++ b/community/libnetfilter_acct/PKGBUILD @@ -1,13 +1,13 @@ # $Id: PKGBUILD 71613 2012-05-31 08:51:38Z spupykin $ # Maintainer: Sergej Pupykin -# Maintainer: Sébastien Luttringer +# Maintainer: Sébastien Luttringer # Contributor: Kevin Edmonds # Maintainer: Filip Wojciechowski, filip at loka dot pl pkgname=libnetfilter_acct -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=1 -pkgdesc='userspace library providing interface to extended accounting infrastructure' +pkgdesc='Library providing interface to extended accounting infrastructure' arch=('i686' 'x86_64') url="http://www.netfilter.org/projects/libnetfilter_acct/index.html" license=('GPL') @@ -15,7 +15,7 @@ depends=('libnfnetlink' 'libmnl') makedepends=('pkgconfig') options=('!libtool') source=(http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2) -md5sums=('4755429cbd46ad0ed32bb30f84da0dee') +md5sums=('2118d9514c079839ebd9cb3144ad2ad7') build() { cd $pkgname-$pkgver diff --git a/community/libnetfilter_conntrack/PKGBUILD b/community/libnetfilter_conntrack/PKGBUILD index 1592d9027..302795ef4 100644 --- a/community/libnetfilter_conntrack/PKGBUILD +++ b/community/libnetfilter_conntrack/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 77383 2012-10-09 10:14:26Z seblu $ +# $Id: PKGBUILD 85675 2013-03-04 19:37:18Z seblu $ # Maintainer: Sergej Pupykin -# Maintainer: Sébastien Luttringer +# Maintainer: Sébastien Luttringer # Contributor: Alessandro Sagratini # Contributor: Kevin Edmonds pkgname=libnetfilter_conntrack -pkgver=1.0.2 +pkgver=1.0.3 pkgrel=1 pkgdesc='Library providing an API to the in-kernel connection tracking state table' arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ url='http://www.netfilter.org/projects/libnetfilter_conntrack/' license=('GPL') options=('!libtool') source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('447114b5d61bb9a9617ead3217c3d3ff') +md5sums=('73394a3d8d0cfecc6abb6027b4792d52') build() { cd $pkgname-$pkgver diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 54337d10f..f4c7301ca 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85292 2013-02-28 15:18:09Z spupykin $ +# $Id: PKGBUILD 85657 2013-03-04 13:08:37Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.0.3 -pkgrel=1rc2 +pkgrel=2rc2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -12,7 +12,7 @@ license=('LGPL') depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' 'avahi' 'yajl' 'libpciaccess' 'udev' 'dbus-core' 'libxau' 'libxdmcp' 'libpcap' 'curl' 'libsasl' 'libgcrypt' 'libgpg-error' 'openssl' 'libxcb' 'gcc-libs' - 'iproute2' 'libnl' 'libx11' 'audit') + 'iproute2' 'libnl' 'libx11' 'audit' '') makedepends=('pkgconfig' 'lvm2' 'linux-api-headers') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' @@ -20,7 +20,8 @@ optdepends=('bridge-utils: for briged networking (default)' 'openbsd-netcat: for remote management over ssh' 'qemu' 'radvd' - 'dmidecode') + 'dmidecode' + 'ebtables') options=('emptydirs' '!libtool') backup=('etc/conf.d/libvirtd' 'etc/conf.d/libvirtd-guests' diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index b89dda95c..01df50a53 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 84548 2013-02-19 20:34:47Z faidoc $ +# $Id: PKGBUILD 85617 2013-03-04 04:34:16Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo pkgver=1.7.1 -pkgrel=1 -pkgdesc="Cinnamon file manager (Nautilus fork), stable version" +pkgrel=2 +pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" license=('GPL') @@ -19,18 +19,17 @@ conflicts=('nemo-fm') options=('!emptydirs' '!libtool') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" - "gnome-autogen.sh") + "gnome-autogen.sh" + "use-terminal-config.patch") md5sums=('b348b6e340e055bef3163555b99621bb' - 'a925691c9b57a6a884dcf07da057fd1f') + 'a925691c9b57a6a884dcf07da057fd1f' + '6cca080cc8fe3df7e725c0f8cd5fa485') build() { cd linuxmint-nemo-* - # Get default terminal value - _terminal=$(gsettings get org.gnome.desktop.default-applications.terminal exec | tr -d "'") - - # Set "Open in Terminal" to default terminal (Arch doesn't use x-terminal-emulator) - sed -i "s/x-terminal-emulator/$_terminal/" src/nemo-view.c + # Read the default terminal app from GSettings + patch -Np1 -i ../use-terminal-config.patch cp ${srcdir}/gnome-autogen.sh . sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am @@ -40,7 +39,6 @@ build() { ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nemo \ - --disable-nst-extension \ --disable-update-mimedb \ --disable-packagekit \ --disable-gtk-doc-html \ diff --git a/community/nemo/use-terminal-config.patch b/community/nemo/use-terminal-config.patch new file mode 100644 index 000000000..a6af75d48 --- /dev/null +++ b/community/nemo/use-terminal-config.patch @@ -0,0 +1,45 @@ +diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c +--- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c 2013-02-19 17:30:18.000000000 +0100 ++++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c 2013-03-04 04:05:13.472897136 +0100 +@@ -77,5 +77,6 @@ + nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); + gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); + gnome_background_preferences = g_settings_new("org.gnome.desktop.background"); +- gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); ++ gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); ++ gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); + } +diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h +--- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h 2013-02-19 17:30:18.000000000 +0100 ++++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h 2013-03-04 04:49:20.581767625 +0100 +@@ -211,6 +211,9 @@ + #define GNOME_DESKTOP_MEDIA_HANDLING_AUTOMOUNT_OPEN "automount-open" + #define GNOME_DESKTOP_MEDIA_HANDLING_AUTORUN "autorun-never" + ++/* Terminal */ ++#define GNOME_DESKTOP_TERMINAL_EXEC "exec" ++ + void nemo_global_preferences_init (void); + char *nemo_global_preferences_get_default_folder_viewer_preference_as_iid (void); + +@@ -224,6 +227,7 @@ + GSettings *gnome_lockdown_preferences; + GSettings *gnome_background_preferences; + GSettings *gnome_media_handling_preferences; ++GSettings *gnome_terminal_preferences; + + G_END_DECLS + +diff -Naur linuxmint-nemo-63f7b44.orig/src/nemo-view.c linuxmint-nemo-63f7b44/src/nemo-view.c +--- linuxmint-nemo-63f7b44.orig/src/nemo-view.c 2013-02-19 17:30:18.000000000 +0100 ++++ linuxmint-nemo-63f7b44/src/nemo-view.c 2013-03-04 04:14:47.222310992 +0100 +@@ -6716,7 +6716,8 @@ + open_in_terminal (gchar *location) + { + gchar *argv[2]; +- argv[0] = "x-terminal-emulator"; ++ argv[0] = g_settings_get_string (gnome_terminal_preferences, ++ GNOME_DESKTOP_TERMINAL_EXEC); + argv[1] = NULL; + g_spawn_async(location, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); + } diff --git a/community/nfacct/PKGBUILD b/community/nfacct/PKGBUILD new file mode 100644 index 000000000..98cacbdfe --- /dev/null +++ b/community/nfacct/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 85684 2013-03-04 23:04:09Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Alessandro Sagratini + +pkgname=nfacct +pkgver=1.0.1 +pkgrel=1 +pkgdesc='Command line tool to create/retrieve/delete accounting objects' +arch=('i686' 'x86_64') +url='http://www.netfilter.org/projects/nfacct/' +license=('GPL2') +depends=('libnetfilter_acct') +options=(!libtool) +source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") +md5sums=('992e863409d144350dbc8f0554a0f478') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $pkgname-$pkgver + make -k check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD index 1fa1f008a..227efcbec 100644 --- a/community/tinc/PKGBUILD +++ b/community/tinc/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76061 2012-09-10 11:46:16Z tredaelli $ +# $Id: PKGBUILD 85671 2013-03-04 16:46:31Z tredaelli $ # Maintainer: Timothy Redaelli # Contributor: helios # Contributor: Lothar Gesslein # Contributor: Dominik George pkgname=tinc -pkgver=1.0.19 -pkgrel=2 +pkgver=1.0.20 +pkgrel=1 pkgdesc="VPN (Virtual Private Network) daemon" arch=('i686' 'x86_64') url="http://www.tinc-vpn.org/" @@ -16,8 +16,8 @@ backup=(etc/conf.d/tincd.conf) install=tinc.install source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig} tincd.rc tincd.conf tincd@.service) -md5sums=('5d97ee0f1ccf8fea5b492f6b54d5ac32' - 'af4a88d89a17c216e38b93630389181a' +md5sums=('001277e0ccd7ca29f7fa4039774ad611' + '8ad9e8784712bdc1496223c6dbd99ab9' '64bb53748d9051255f243003f0d511f5' '7c0276d4812cc5d3cc18142562a3aa82' '035b0e549b08da55d19a8df5b8306e4d') diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD index 1cc5d5830..057466d2b 100644 --- a/community/wings3d/PKGBUILD +++ b/community/wings3d/PKGBUILD @@ -1,51 +1,47 @@ -# $Id: PKGBUILD 85259 2013-02-28 10:18:30Z arodseth $ +# $Id: PKGBUILD 85612 2013-03-03 23:56:10Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: kappa pkgname=wings3d _pkgname=wings pkgver=1.4.1 -pkgrel=12 +pkgrel=15 pkgdesc='3D modeling program' arch=('x86_64' 'i686') url='http://www.wings3d.com/' license=('GPL') -depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang=R15B03_1') +depends=('erlang' 'erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils') makedepends=('setconf' 'gendesk') optdepends=('povray: rendering support via POV-Ray') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/wings/tar.gz/dgud/r15b-driver-compat" - "$pkgname.sh" +options=('!emptydirs') +# Using the binary release, but would prefer using a source release, if there is one that compiles +source=("http://sourceforge.net/projects/$_pkgname/files/$_pkgname/$pkgver/$_pkgname-$pkgver-linux.bzip2.run.gz" "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png") -sha256sums=('b89aca41937d4d07424ccc0447eb5a6c3755350428201d7d7644e467dcd20fdf' - '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e' +sha256sums=('760e19fa4973ed0fc75057897135a8efa241e834b078fc05c28786672137b322' '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a') _genericname=('3D Modeler') -_dirname="$_pkgname-dgud-r15b-driver-compat" build() { cd "$srcdir" gendesk setconf "$pkgname.desktop" Categories "Graphics;3DGraphics;" - cd "$_dirname" - export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*) - make - make lang + chmod +x "$_pkgname-$pkgver-linux.bzip2.run" + "./$_pkgname-$pkgver-linux.bzip2.run" --nox11 --nochown --tar xf > /dev/null + setconf install_wings INSTALL_DIR "$pkgdir/opt/$pkgname-$pkgver" } package() { - cd "$srcdir/$_dirname" - - mkdir -p "$pkgdir/usr/lib/$pkgname" - for subdir in ebin fonts patches plugins shaders textures; do - cp -r "$srcdir/$_dirname/$subdir/" "$pkgdir/usr/lib/$pkgname" - done + cd "$srcdir" + ./install_wings - install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + cd "$pkgdir" + setconf "opt/$pkgname-$pkgver/$_pkgname" ROOTDIR "/opt/$pkgname-$pkgver" + install -Dm755 "opt/$pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$pkgname" cd "$srcdir" - install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" + install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE" install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" diff --git a/community/wings3d/wings3d.sh b/community/wings3d/wings3d.sh deleted file mode 100644 index c0fd3b2fb..000000000 --- a/community/wings3d/wings3d.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -erl -noinput -smp disable -pa /usr/lib/erlang/lib/esdl-*/ebin /usr/lib/wings3d/ebin -run wings_start start_halt ${1+"$@"} diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD index aad13ec98..399f7423a 100644 --- a/community/xfmedia/PKGBUILD +++ b/community/xfmedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70120 2012-04-30 04:20:16Z foutrelis $ +# $Id: PKGBUILD 85661 2013-03-04 13:23:23Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer : Sergej Pupykin # Maintainer : Tom Killian @@ -6,7 +6,7 @@ pkgname=xfmedia pkgver=0.9.2 -pkgrel=11 +pkgrel=12 pkgdesc="xfce media player" arch=('i686' 'x86_64') license=('GPL') @@ -31,7 +31,8 @@ build() { patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch patch -Np1 -i ../xfmedia-exo-0.6.patch patch -Np1 -i ../xfmedia-xine-1.2.0.patch - LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure --prefix=/usr + LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure \ + --prefix=/usr --sysconfdir=/etc make } diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 4dbcb64b7..8490915a6 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178140 2013-02-16 22:48:58Z ioni $ +# $Id: PKGBUILD 179299 2013-03-04 22:18:11Z schiv $ # Maintainer: Ray Rashif # Contributor: Tobias Powalowski pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.4.3 -pkgrel=5 +pkgver=2.4.4 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -14,7 +14,8 @@ url="http://opencv.org/" depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl' 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') makedepends=('cmake' 'python2-numpy' 'mesa' - 'opencl-headers' 'eigen2') + 'opencl-headers' 'eigen2' + 'texlive-bin' 'python2-sphinx') # for docs optdepends=('opencv-docs' 'opencv-samples' 'eigen2' @@ -22,7 +23,7 @@ optdepends=('opencv-docs' source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" 'pkgconfig.patch' 'fsh.patch') -md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe' +md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') @@ -33,6 +34,7 @@ _cmakeopts=('-D WITH_OPENCL=ON' '-D ENABLE_SSE=OFF' '-D ENABLE_SSE2=OFF' '-D ENABLE_SSE3=OFF' + '-D BUILD_DOCS=ON' '-D BUILD_PACKAGE=OFF' '-D BUILD_WITH_DEBUG_INFO=OFF' '-D BUILD_TESTS=OFF' @@ -49,12 +51,16 @@ build() { # fix pkg-config mess # see https://bugs.archlinux.org/task/32430 + # and http://code.opencv.org/issues/1925 patch -Np1 -i "$srcdir/pkgconfig.patch" - # fix another upstream mess + # fix another upstream mess that they won't fix # see http://code.opencv.org/issues/2512 patch -Np1 -i "$srcdir/fsh.patch" + # python2 compatibility for generating docs + sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake + cmake ${_cmakeopts[@]} . make @@ -72,11 +78,10 @@ package_opencv() { cd "$pkgdir/usr/share" # separate docs package; also be -R friendly - [ -d doc/$pkgname ] && mv doc/$pkgname "$srcdir/opencv-doc" \ - && rm -r doc + [[ -d doc ]] && mv doc "$srcdir/opencv-doc" # separate samples package - [ -d $pkgname/samples ] && mv $pkgname/samples "$srcdir/opencv-samples" + [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples" } package_opencv-docs() { @@ -85,10 +90,14 @@ package_opencv-docs() { unset optdepends options=('docs') + # PDFs are not being generated for some reason as of 2.4.4 + # even after adding latex and sphinx deps + # when previously without them there were a couple of good docs installed + cd "$srcdir" - mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" + # doc dir now includes opencv subdir (looks like they finally listened) + cp -r opencv-doc "$pkgdir/usr/share/doc" # install license file #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index 3e14cf1c7..6ea145189 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179088 2013-03-03 09:38:46Z andrea $ +# $Id: PKGBUILD 179293 2013-03-04 21:34:48Z andrea $ # Maintainer: Ronald van Haren pkgname=qwt pkgver=6.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64') url="http://qwt.sourceforge.net/" @@ -37,7 +37,7 @@ package() { # needed by qmake (FS#30407) install -d "${pkgdir}"/usr/share/qt4/mkspecs/features/ - install -m644 qwtconfig.pri qwt.prf \ + install -m644 qwtconfig.pri qwt.prf qwtfunctions.pri \ "${pkgdir}"/usr/share/qt4/mkspecs/features/ # move man pages diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index c87ffb225..47f2f3ed3 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 175875 2013-01-23 00:13:12Z eric $ +# $Id: PKGBUILD 179134 2013-03-04 08:06:34Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Andreas Radke # Contributor: eric # Contributor: Damir Perisa pkgname=raptor -pkgver=2.0.8 -pkgrel=3 +pkgver=2.0.9 +pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') url="http://librdf.org/raptor" @@ -33,4 +33,4 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('ac60858b875aab8fa7917f21a1237aa9') +md5sums=('4ceb9316488b0ea01acf011023cf7fff') diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD index 055380203..d6a099d7d 100644 --- a/extra/xfce4-eyes-plugin/PKGBUILD +++ b/extra/xfce4-eyes-plugin/PKGBUILD @@ -1,32 +1,38 @@ -# $Id: PKGBUILD 157855 2012-04-30 04:20:22Z foutrelis $ -# Maintainer: AndyRTR +# $Id: PKGBUILD 179295 2013-03-04 21:35:04Z foutrelis $ +# Maintainer: +# Contributor: AndyRTR # Contributor: Aurelien Foret pkgname=xfce4-eyes-plugin -pkgver=4.4.1 -pkgrel=3 +pkgver=4.4.2 +pkgrel=1 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel" -arch=(i686 x86_64) +arch=('i686' 'x86_64') +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin" license=('GPL2') -url="http://xfce-goodies.berlios.de/" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme') +depends=('xfce4-panel' 'hicolor-icon-theme') makedepends=('intltool' 'perlxml') -install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/4.4/${pkgname}-${pkgver}.tar.bz2) -md5sums=('dcbf6ea9035d379d168b479be0d09f14') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/4.4/$pkgname-$pkgver.tar.bz2) +sha256sums=('dad102fedd0d9e6df45338a018387b2aacaf24b05eb798275be0dfc05ffa3021') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install b/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install +++ b/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 463787925..1b999453e 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170256 2012-11-06 11:49:29Z foutrelis $ +# $Id: PKGBUILD 179291 2013-03-04 21:25:21Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: tobias pkgname=xfdesktop -pkgver=4.10.0 -pkgrel=5 +pkgver=4.10.1 +pkgrel=1 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -16,18 +16,12 @@ conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 - add-backgrounds-xfce-to-search-path.patch) -sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b' - 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) +sha256sums=('2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad') build() { cd "$srcdir/$pkgname-$pkgver" - # Add backgrounds/xfce/ to the single image list in the settings app - # https://bugzilla.xfce.org/show_bug.cgi?id=8799 - patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch deleted file mode 100644 index c48aeac33..000000000 --- a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -@@ -, +, @@ - settings app. (Bug #8799) ---- - settings/main.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) ---- a/settings/main.c -+++ a/settings/main.c -@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) - xfconf_channel_set_string(panel->channel, prop_image, image_file); - xfconf_channel_set_string(panel->channel, prop_last, image_file); - -+ /* Add all backdrops in xfce4/backdrops/ */ - backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, - "xfce4/backdrops/"); - for(i = 0; backdrop_dirs[i]; ++i) { -@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) - if(tmp) - image_file_iter = tmp; - } -+ g_strfreev(backdrop_dirs); -+ -+ /* Add all backdrops in backgrounds/xfce/ */ -+ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, -+ "backgrounds/xfce/"); -+ for(i = 0; backdrop_dirs[i]; ++i) { -+ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i], -+ image_file); -+ if(tmp) -+ image_file_iter = tmp; -+ } -+ g_strfreev(backdrop_dirs); -+ - - if(!image_file_iter) - image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file); --- diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 898a24f12..95d0c374f 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.1 +_kernver=3.8.2 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=6 +pkgrel=7 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index b8da783ad..c177a1ad6 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.67 +_kernver=3.0.68 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=5 +pkgrel=6 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 2fa94e7dd..fc5cd17c9 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179096 2013-03-03 15:52:54Z andyrtr $ +# $Id: PKGBUILD 179286 2013-03-04 17:14:18Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=67 +_sublevel=68 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.66 # nearly always the same as pkgver @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '7756388fbd9608b61e33fb41773af010' + '571adcbf6f408967fe4df19c1c17b00b' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index 5fc657d19..283424020 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.67-1-LIBRE-LTS +KERNEL_VERSION=3.0.68-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b2a459f37..a1d7989a1 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178913 2013-02-28 18:41:03Z tpowa $ +# $Id: PKGBUILD 179278 2013-03-04 13:23:40Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=1 +_sublevel=2 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.1 # nearly always the same as pkgver @@ -31,7 +31,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'd5ad2ecc865a32378517c3c07ca99173' + '61b8b43e04065556b2b173d34111674d' '4d73ccd0f1825a4bd474d4fead6c0d42' 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index e734fb2aa..e8d4fb3d8 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.1-1-LIBRE +KERNEL_VERSION=3.8.2-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD index 372243b2a..5f7168f86 100644 --- a/pcr/libav-builder/PKGBUILD +++ b/pcr/libav-builder/PKGBUILD @@ -8,7 +8,7 @@ elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; t pkgname=libav-builder fi pkgflag=builder -pkgver=0.8.4 +pkgver=9.3 pkgrel=1 pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)" arch=any diff --git a/pcr/libnatpmp/PKGBUILD b/pcr/libnatpmp/PKGBUILD index 0fa0ff469..f3306e87d 100644 --- a/pcr/libnatpmp/PKGBUILD +++ b/pcr/libnatpmp/PKGBUILD @@ -3,14 +3,15 @@ pkgname=libnatpmp pkgver=20120821 -pkgrel=1 +pkgrel=2 pkgdesc="A portable and fully compliant implementation of the NAT-PMP protocol" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://miniupnp.free.fr/libnatpmp.html" license=('custom:BSD') depends=('glibc') makedepends=() source=(http://miniupnp.free.fr/files/download.php?file=libnatpmp-$pkgver.tar.gz) +md5sums=('d2b9c2dedba3a00deb0e7589982ceced') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,5 +25,6 @@ package() { # Needed by some packages install -m 644 getgateway.h declspec.h "$pkgdir/usr/include/libnatpmp" + + install -Dm 644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } -md5sums=('22a1225b890471a7750a9bf26eb863f7') diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD index 4d6611548..b5891747d 100644 --- a/pcr/python2-renpy/PKGBUILD +++ b/pcr/python2-renpy/PKGBUILD @@ -5,8 +5,8 @@ pkgname=python2-renpy pkgflag=renpy -pkgver=6.14.1 -pkgrel=3 +pkgver=6.15.0 +pkgrel=1 pkgdesc="Platform-dependant Ren'Py libraries." arch=( i686 @@ -43,8 +43,8 @@ source=( "http://www.$pkgflag.org/dl/$pkgver/$pkgflag-$pkgver-source.tar.bz2" ) -md5sums=( - 16814530ba9ce1f2968bb8c8c785651b +sha512sums=( + 8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1 ) build() { diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD index 89c07a433..0baad307c 100644 --- a/pcr/renpy/PKGBUILD +++ b/pcr/renpy/PKGBUILD @@ -1,7 +1,8 @@ # Maintainer: AlexanderR +# Maintainer (Parabola): Márcio Silva pkgname=renpy -pkgver=6.14.1 +pkgver=6.15.0 pkgrel=1 pkgdesc="Ren'Py is a visual novel engine that helps you use words, images, and sounds to tell stories with the computer. This package contains both player and development tools." arch=('any') @@ -20,12 +21,14 @@ source=("http://www.renpy.org/dl/$pkgver/renpy-$pkgver-source.tar.bz2" 'python2.diff' 'renpy-launcher.sh') -md5sums=('16814530ba9ce1f2968bb8c8c785651b' - 'a9beb35fa6c6d8af7ba5d2a764c33158' - 'd206d24b78e207a2c3b603fef14ac47f' - '8b9922e26e567248a2a5adc1d0cdfdd4' - '0476b16220e6faeb031e1dbfe45249b4' - 'dfa92cdecc15e5c1ddee387fbbbb2d9c') +sha512sums=( + 8ad2299a61d0e2e2c0c08d441459b28a09a3244dfcf173957e3bbbf2d9eb64087c12c05e62438dca815116d9582a136c50d5cceb33796146adc4d9508ac630b1 + 1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5 + 2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df + bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09 + 3ae0627b8c12658f530f7d7a6a1e9226aee3e387c9ac011f00a4b5ed7394115c3b653f7a4a45c6ee2ef102fb584df1cec36f306eceff3d18aac49b5aad4a9fab + 727f9f16e1cff76c279d6e1578572a92c7b21ec34c6cb2841a04ac7b5cf6d2836487293744a9541993ee2e3a8dae927feb4e78f1afd01a748f5489090453cdd7 +) build() { cd "$srcdir/renpy-$pkgver-source" @@ -33,7 +36,7 @@ build() { patch -p1 < ../python2.diff # fonts are provided by ttf-dejavu - rm common/DejaVuSans.ttf common/DejaVuSans.txt + rm $pkgname/common/DejaVuSans.ttf $pkgname/common/DejaVuSans.txt } package(){ @@ -47,7 +50,7 @@ package(){ cd renpy-$pkgver-source - cp -r launcher renpy common renpy.py template the_question tutorial "$pkgdir/usr/share/$pkgname" + cp -r launcher $pkgname{,.py} template the_question tutorial "$pkgdir/usr/share/$pkgname" cp -r doc/* "$pkgdir/usr/share/doc/$pkgname" install -D -m644 launcher/game/logo.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" install -D -m644 'LICENSE.txt' "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -- cgit v1.2.3-54-g00ecf From a42cd7aaabfdb3ecc0a538548e8dbcc7ca860b2d Mon Sep 17 00:00:00 2001 From: root Date: Sat, 23 Mar 2013 00:06:21 -0700 Subject: Sat Mar 23 00:06:20 PDT 2013 --- community/bbswitch/PKGBUILD | 11 +- community/bsd-games/PKGBUILD | 24 +- community/cinnamon-control-center/PKGBUILD | 32 +- .../fix-audio-input-icons.patch | 15 - .../fix-faces-location.patch | 12 - community/cinnamon-control-center/pulse3.0.patch | 25 - .../cinnamon-control-center/sound-nua-rename.patch | 26 - community/cinnamon/PKGBUILD | 16 +- community/cinnamon/fix-control-center-check.patch | 2 +- community/cinnamon/gnome-autogen.sh | 538 -- community/couchdb/PKGBUILD | 10 +- community/couchdb/build-fix.patch | 5568 ++++++++++++++++++++ community/drbd/PKGBUILD | 21 +- community/gens-gs/PKGBUILD | 62 + community/gens-gs/gens-gtk.patch | 187 + community/gens/PKGBUILD | 57 + community/gens/gens.desktop | 9 + community/mixxx/PKGBUILD | 4 +- community/nemo/PKGBUILD | 15 +- community/nemo/gnome-autogen.sh | 538 -- community/nginx/PKGBUILD | 11 +- community/nginx/logrotate | 2 +- community/nginx/nginx.install | 10 +- community/pypanel/PKGBUILD | 4 +- community/qtcreator/PKGBUILD | 8 +- community/rdiff-backup/PKGBUILD | 4 +- community/tremulous/PKGBUILD | 45 +- community/wesnoth/PKGBUILD | 8 +- community/weston/PKGBUILD | 6 +- community/wine/PKGBUILD | 154 - community/wine/wine.install | 12 - core/libgcrypt/PKGBUILD | 8 +- extra/cfitsio/PKGBUILD | 12 +- extra/fetchmail/PKGBUILD | 16 +- extra/fetchmail/fetchmail.conf | 5 - extra/fetchmail/fetchmail.install | 4 +- extra/fetchmail/fetchmail.rc | 38 - extra/fetchmail/fetchmail.service | 3 +- extra/gnuplot/PKGBUILD | 6 +- extra/gst-libav/PKGBUILD | 6 +- extra/gst-plugins-base/PKGBUILD | 8 +- extra/gst-plugins-good/PKGBUILD | 8 +- extra/gst-plugins-ugly/PKGBUILD | 8 +- extra/gstreamer/PKGBUILD | 6 +- extra/xf86-video-intel/PKGBUILD | 6 +- kernels/linux-libre-pae/PKGBUILD | 21 +- ...rm-i915-enable-irqs-earlier-when-resuming.patch | 82 - ...up-sequence-to-have-irqs-for-output-setup.patch | 124 - kernels/linux-libre-pae/fat-3.6.x.patch | 33 - kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 21 +- ...rm-i915-enable-irqs-earlier-when-resuming.patch | 82 - ...up-sequence-to-have-irqs-for-output-setup.patch | 124 - kernels/linux-libre-xen/fat-3.6.x.patch | 33 - kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/gnome-desktop2/PKGBUILD | 35 + libre/gnome-menus/PKGBUILD | 36 + libre/gnome-menus/menus.patch | 25 + libre/gst-libav/PKGBUILD | 35 + libre/gst-plugins-bad-libre/PKGBUILD | 12 +- libre/gst-plugins-base/PKGBUILD | 52 + libre/gst-plugins-good/PKGBUILD | 38 + libre/gst-plugins-ugly/PKGBUILD | 37 + libre/gstreamer/PKGBUILD | 35 + libre/gstreamer0.10-bad-libre/PKGBUILD | 10 +- libre/gstreamer0.10-base/PKGBUILD | 53 + libre/gstreamer0.10-good/PKGBUILD | 8 +- libre/gstreamer0.10-ugly/PKGBUILD | 54 + libre/gstreamer0.10-ugly/cdio-cd-text-api.patch | 183 + libre/gstreamer0.10-ugly/opencore-amr.patch | 35 + libre/gstreamer0.10/PKGBUILD | 41 + libre/libtasn1/PKGBUILD | 36 + libre/libtasn1/libtasn1.install | 18 + libre/linux-libre-kmod-alx/PKGBUILD | 6 +- libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 +- libre/linux-libre-lts/PKGBUILD | 6 +- libre/linux-libre-lts/linux-libre-lts.install | 2 +- libre/linux-libre/PKGBUILD | 17 +- ...rm-i915-enable-irqs-earlier-when-resuming.patch | 82 - ...up-sequence-to-have-irqs-for-output-setup.patch | 124 - libre/linux-libre/linux-libre.install | 2 +- libre/usermin/PKGBUILD | 134 + libre/usermin/usermin.install | 34 + libre/usermin/usermin.rc | 44 + libre/usermin/usermin.service | 9 + libre/webmin/PKGBUILD | 221 + libre/webmin/webmin.install | 35 + libre/webmin/webmin.rc | 46 + libre/webmin/webmin.service | 11 + libre/xsp/PKGBUILD | 64 + libre/xsp/xsp.conf.d | 10 + libre/xsp/xsp.install | 37 + libre/xsp/xsp.rc.d | 40 + libre/xsp/xsp.service | 8 + libre/xsp/xsp.webapp | 8 + 95 files changed, 7483 insertions(+), 2298 deletions(-) delete mode 100644 community/cinnamon-control-center/fix-audio-input-icons.patch delete mode 100644 community/cinnamon-control-center/fix-faces-location.patch delete mode 100644 community/cinnamon-control-center/pulse3.0.patch delete mode 100644 community/cinnamon-control-center/sound-nua-rename.patch delete mode 100644 community/cinnamon/gnome-autogen.sh create mode 100644 community/couchdb/build-fix.patch create mode 100755 community/gens-gs/PKGBUILD create mode 100755 community/gens-gs/gens-gtk.patch create mode 100755 community/gens/PKGBUILD create mode 100755 community/gens/gens.desktop delete mode 100644 community/nemo/gnome-autogen.sh delete mode 100644 community/wine/PKGBUILD delete mode 100644 community/wine/wine.install delete mode 100644 extra/fetchmail/fetchmail.conf delete mode 100644 extra/fetchmail/fetchmail.rc delete mode 100644 kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch delete mode 100644 kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch delete mode 100644 kernels/linux-libre-pae/fat-3.6.x.patch delete mode 100644 kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch delete mode 100644 kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch delete mode 100644 kernels/linux-libre-xen/fat-3.6.x.patch create mode 100644 libre/gnome-desktop2/PKGBUILD create mode 100644 libre/gnome-menus/PKGBUILD create mode 100644 libre/gnome-menus/menus.patch create mode 100644 libre/gst-libav/PKGBUILD create mode 100644 libre/gst-plugins-base/PKGBUILD create mode 100644 libre/gst-plugins-good/PKGBUILD create mode 100644 libre/gst-plugins-ugly/PKGBUILD create mode 100644 libre/gstreamer/PKGBUILD create mode 100644 libre/gstreamer0.10-base/PKGBUILD create mode 100644 libre/gstreamer0.10-ugly/PKGBUILD create mode 100644 libre/gstreamer0.10-ugly/cdio-cd-text-api.patch create mode 100644 libre/gstreamer0.10-ugly/opencore-amr.patch create mode 100644 libre/gstreamer0.10/PKGBUILD create mode 100644 libre/libtasn1/PKGBUILD create mode 100644 libre/libtasn1/libtasn1.install delete mode 100644 libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch delete mode 100644 libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch create mode 100644 libre/usermin/PKGBUILD create mode 100644 libre/usermin/usermin.install create mode 100644 libre/usermin/usermin.rc create mode 100644 libre/usermin/usermin.service create mode 100644 libre/webmin/PKGBUILD create mode 100644 libre/webmin/webmin.install create mode 100644 libre/webmin/webmin.rc create mode 100644 libre/webmin/webmin.service create mode 100644 libre/xsp/PKGBUILD create mode 100644 libre/xsp/xsp.conf.d create mode 100644 libre/xsp/xsp.install create mode 100644 libre/xsp/xsp.rc.d create mode 100644 libre/xsp/xsp.service create mode 100644 libre/xsp/xsp.webapp (limited to 'community/nemo/PKGBUILD') diff --git a/community/bbswitch/PKGBUILD b/community/bbswitch/PKGBUILD index 3dbf06f98..9552835c9 100644 --- a/community/bbswitch/PKGBUILD +++ b/community/bbswitch/PKGBUILD @@ -3,9 +3,9 @@ # Contributor: Samsagax pkgname=bbswitch -pkgver=0.5 +pkgver=0.6 _extramodules=extramodules-3.8-ARCH # Don't forget to update bbswitch.install -pkgrel=3 +pkgrel=1 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops" arch=('i686' 'x86_64') url=("http://github.com/Bumblebee-Project/bbswitch") @@ -13,17 +13,14 @@ license=('GPL') depends=('linux>=3.8' 'linux<3.9') makedepends=('linux-headers>=3.8' 'linux-headers<3.9') install=bbswitch.install -source=("https://github.com/downloads/Bumblebee-Project/bbswitch/${pkgname}-${pkgver}.tar.gz" - "https://github.com/Bumblebee-Project/bbswitch/commit/5593d9519364dc7f6f28c3dd8358afb907f39c0f.patch") -md5sums=('5e0e6eb9c5e8c10db56e5b349b43bba7' - 'd76180b8f6fd092038d5ae7c71a9caa8') +source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz") +md5sums=('c5496e3225c8e70d02a24bfd8a50faf6') build() { cd ${srcdir}/${pkgname}-${pkgver} _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - patch -Np1 < ${srcdir}/5593d9519364dc7f6f28c3dd8358afb907f39c0f.patch make KDIR=/usr/src/linux-${_kernver} } diff --git a/community/bsd-games/PKGBUILD b/community/bsd-games/PKGBUILD index 470e8a2f0..00bb7c247 100644 --- a/community/bsd-games/PKGBUILD +++ b/community/bsd-games/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73816 2012-07-15 23:02:25Z cbrannon $ +# $Id: PKGBUILD 86789 2013-03-22 02:13:44Z eric $ # Maintainer: Chris Brannon # Contributor: Abhishek Dasgupta # Contributor: SmackleFunky @@ -17,15 +17,21 @@ source=(ftp://ftp.ibiblio.org/pub/Linux/games/$pkgname-$pkgver.tar.gz config.params stdio.h.diff gamescreen.h.diff getline.diff number.c.diff bsd-games-2.17-64bit.patch bad-ntohl-cast.diff null-check.diff) +md5sums=('238a38a3a017ca9b216fc42bde405639' + '9916baef5cb8aa09361f67de12ca7bef' + '784f68c796b9e099ac008aecef1af998' + '9c0fa6e2345bd0a7945c9a41d5ba68aa' + '5356bd6999ae53dd27cb2a0f837a3e70' + '47249a90f38ccb4dd07625b245bbc728' + '257813b76a41c8b2c02701571c804227' + '3d21a9dad2e603ddf3842972e4ff85a1' + 'a43ca0b4b9ebc4eec26372c52014ac0a') build() { cd "${srcdir}/$pkgname-$pkgver" [ "$CARCH" = "x86_64" ] && patch -p1 < "$srcdir/bsd-games-2.17-64bit.patch" cp "${srcdir}/config.params" . -# Patches - sed -i "s%PKGDIR%$pkgdir%" config.params - # Several games use their own internal functions named getline. All # are different, and none is the getline from glibc. So we need a patch # in order to compile. Each internal getline function is prefixed @@ -65,6 +71,7 @@ build() { package() { cd "${srcdir}/$pkgname-$pkgver" + sed -i "s%PKGDIR%$pkgdir%g" hide-game install-man install-score Makeconfig subst.sed make install # This make install command does install to $pkgdir, because of the # change to config.params in the build function. @@ -91,12 +98,3 @@ package() { install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/COPYING" } -md5sums=('238a38a3a017ca9b216fc42bde405639' - '9916baef5cb8aa09361f67de12ca7bef' - '784f68c796b9e099ac008aecef1af998' - '9c0fa6e2345bd0a7945c9a41d5ba68aa' - '5356bd6999ae53dd27cb2a0f837a3e70' - '47249a90f38ccb4dd07625b245bbc728' - '257813b76a41c8b2c02701571c804227' - '3d21a9dad2e603ddf3842972e4ff85a1' - 'a43ca0b4b9ebc4eec26372c52014ac0a') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index c066ea4b3..74b724004 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 85563 2013-03-03 05:46:41Z bgyorgy $ +# $Id: PKGBUILD 86850 2013-03-22 21:27:24Z faidoc $ # Maintainer: Alexandre Filgueira # Jan de Groot pkgname=cinnamon-control-center -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') depends=('cinnamon' 'cheese' 'libgtop' 'network-manager-applet') @@ -17,34 +17,12 @@ url="https://github.com/linuxmint/cinnamon-control-center" install=cinnamon-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" - "pulse3.0.patch" - "sound-nua-rename.patch" - "fix-audio-input-icons.patch" - "fix-faces-location.patch") -sha256sums=('eab36af1accfce7b4d5eaf07a865d7290add07b875ed5e52072c1ad2e8570c1e' - 'ddf7c99a1d45a7be54e69e90f194e33f3e56a7f294aa369bfb2e541d8241156e' - '2f49543e4ccabf5c8ce1cd9e4c37e5b291c23cff494eaa671857b2dcf7af4c5b' - '2cefa2764db206c9c6258e3f374988056907dda0c5bbeedbc249fc7c058a0d6b' - '7360f3e018765e80a7afc5a469c1d54ec3fdeb7e58c867596ef26773fb8e7a8a') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") +sha256sums=('09af52ae7417b611b91ca9fdafbde08c68356f2b66241780b513ad2249a831c1') build() { cd $pkgname-$pkgver - patch -Np1 -i ../pulse3.0.patch - - # Upstream patch: Change sound module registered name from sound-nua to 'sound' - patch -Np1 -i ../sound-nua-rename.patch - - # Fix icons on Sound preferences dialog - patch -Np1 -i ../fix-audio-input-icons.patch - - # Fix faces location on User accounts dialog - patch -Np1 -i ../fix-faces-location.patch - - # Use freedesktop as default sound theme instead of ubuntu (otherwise the Sound panel craches) - patch -RNp1 -i debian/patches/98_default_sound_theme.patch - autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ diff --git a/community/cinnamon-control-center/fix-audio-input-icons.patch b/community/cinnamon-control-center/fix-audio-input-icons.patch deleted file mode 100644 index 77c9b3c5b..000000000 --- a/community/cinnamon-control-center/fix-audio-input-icons.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c ---- cinnamon-control-center-1.7.1.orig/panels/sound-nua/gvc-mixer-dialog.c 2013-02-19 17:37:17.000000000 +0100 -+++ cinnamon-control-center-1.7.1/panels/sound-nua/gvc-mixer-dialog.c 2013-02-26 23:12:37.192399508 +0100 -@@ -1929,9 +1929,9 @@ - gvc_channel_bar_set_name (GVC_CHANNEL_BAR (self->priv->input_bar), - _("_Input volume:")); - gvc_channel_bar_set_low_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar), -- "audio-input-microphone-low-symbolic"); -+ "cin-audio-input-microphone-low-symbolic"); - gvc_channel_bar_set_high_icon_name (GVC_CHANNEL_BAR (self->priv->input_bar), -- "audio-input-microphone-high-symbolic"); -+ "cin-audio-input-microphone-high-symbolic"); - gtk_widget_set_sensitive (self->priv->input_bar, FALSE); - - if (self->priv->size_group != NULL) { diff --git a/community/cinnamon-control-center/fix-faces-location.patch b/community/cinnamon-control-center/fix-faces-location.patch deleted file mode 100644 index 1af65fa99..000000000 --- a/community/cinnamon-control-center/fix-faces-location.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c ---- cinnamon-control-center-1.7.1.orig/panels/user-accounts/um-photo-dialog.c 2013-02-19 17:37:17.000000000 +0100 -+++ cinnamon-control-center-1.7.1/panels/user-accounts/um-photo-dialog.c 2013-02-27 19:17:18.249329833 +0100 -@@ -406,7 +406,7 @@ - for (i = 0; dirs[i] != NULL; i++) { - char *path; - -- path = g_build_filename (dirs[i], "pixmaps", "faces", NULL); -+ path = g_build_filename (dirs[i], "pixmaps", "cinnamon", "faces", NULL); - dir = g_dir_open (path, 0, NULL); - if (dir == NULL) { - g_free (path); diff --git a/community/cinnamon-control-center/pulse3.0.patch b/community/cinnamon-control-center/pulse3.0.patch deleted file mode 100644 index 9341b788e..000000000 --- a/community/cinnamon-control-center/pulse3.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001 -From: David Henningsson -Date: Fri, 07 Dec 2012 10:52:09 +0000 -Subject: sound: Fix port handling for the unknown availability case - -The current code assumes that port availability transitions will be -between YES and NO, and doesn't account for the fact that it may also be -UNKNOWN. This causes spurious entries if the port availability -transitions between YES and UNKNOWN. ---- -diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c -index 34ddc0c..2f6cf34 100644 ---- a/panels/sound/gvc-mixer-control.c -+++ b/panels/sound/gvc-mixer-control.c -@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control, - else { - for (i = 0; i < info->n_ports; i++) { - if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) { -- if (card_port->available != info->ports[i]->available) { -+ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) { - card_port->available = info->ports[i]->available; - g_debug ("sync port availability on card %i, card port name '%s', new available value %i", - gvc_mixer_card_get_index (card), --- -cgit v0.9.0.2 \ No newline at end of file diff --git a/community/cinnamon-control-center/sound-nua-rename.patch b/community/cinnamon-control-center/sound-nua-rename.patch deleted file mode 100644 index fb25b9f42..000000000 --- a/community/cinnamon-control-center/sound-nua-rename.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/panels/sound-nua/cc-sound-panel.c b/panels/sound-nua/cc-sound-panel.c -index 1c115f0..092f319 100644 ---- a/panels/sound-nua/cc-sound-panel.c -+++ b/panels/sound-nua/cc-sound-panel.c -@@ -120,7 +120,7 @@ enum { - cc_sound_panel_register_type (G_TYPE_MODULE (module)); - g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, - CC_TYPE_SOUND_PANEL, -- "sound-nua", 0); -+ "sound", 0); - } - - /* GIO extension stuff */ -diff --git a/panels/sound/cc-sound-panel.c b/panels/sound/cc-sound-panel.c -index 2f69c0f..3b78ce2 100644 ---- a/panels/sound/cc-sound-panel.c -+++ b/panels/sound/cc-sound-panel.c -@@ -127,7 +127,7 @@ enum { - cc_sound_panel_register_type (G_TYPE_MODULE (module)); - g_io_extension_point_implement (CC_SHELL_PANEL_EXTENSION_POINT, - CC_TYPE_SOUND_PANEL, -- "sound", 0); -+ "gnome-sound", 0); - } - - /* GIO extension stuff */ diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 722ca2356..594f40855 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 86162 2013-03-12 14:14:05Z faidoc $ +# $Id: PKGBUILD 86852 2013-03-22 21:33:07Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.2 -pkgrel=3 +pkgver=1.7.3 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -24,13 +24,11 @@ optdepends=('cinnamon-control-center: extended configurations for Cinnamon' options=('!libtool' '!emptydirs') install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" - "gnome-autogen.sh" "keyboard_applet.patch" "fix-control-center-check.patch") -md5sums=('d136978607d2584ea1ca29db436f96df' - 'a925691c9b57a6a884dcf07da057fd1f' +md5sums=('c733e2a2280508aecf3ee010587e6743' '2b1ece84416c3e4de030be15f1774d82' - 'fd429779aa986ffb3f481149f19a0baf') + 'c3f25b06d345d9d36c197cd96e08f496') build() { cd ${srcdir}/linuxmint-Cinnamon* @@ -42,10 +40,6 @@ build() { # Check for the cc-panel path, not for the unneeded binary patch -Np1 -i ${srcdir}/fix-control-center-check.patch - cp ${srcdir}/gnome-autogen.sh . - sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am - sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh - chmod +x gnome-autogen.sh ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ diff --git a/community/cinnamon/fix-control-center-check.patch b/community/cinnamon/fix-control-center-check.patch index 4c7b3bb0e..981b1c1a5 100644 --- a/community/cinnamon/fix-control-center-check.patch +++ b/community/cinnamon/fix-control-center-check.patch @@ -9,4 +9,4 @@ diff -Naur cinnamon-1.7.1.orig/files/usr/bin/cinnamon-settings cinnamon-1.7.1/fi + elif os.path.exists("/usr/lib/cinnamon-control-center-1/panels"): print "Unknown module %s, using cinnamon-control-center" % module os.execvp("/usr/lib/cinnamon-settings/cinnamon-settings.py", ("",) + tuple(sys.argv[1:])) - elif os.path.exists("/usr/bin/gnome-control-center"): + elif os.path.exists("/usr/bin/gnome-control-center"): \ No newline at end of file diff --git a/community/cinnamon/gnome-autogen.sh b/community/cinnamon/gnome-autogen.sh deleted file mode 100644 index 2467a1de2..000000000 --- a/community/cinnamon/gnome-autogen.sh +++ /dev/null @@ -1,538 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -#name of package -test "$PKG_NAME" || PKG_NAME=Package -test "$srcdir" || srcdir=. - -# default version requirements ... -test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53 -test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9 -test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3 -test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40 -test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0 -test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 -test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 -test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 -test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0 -test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2 - -# a list of required m4 macros. Package can set an initial value -test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= -test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS= - -# Not all echo versions allow -n, so we check what is possible. This test is -# based on the one in autoconf. -ECHO_C= -ECHO_N= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ;; - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -# some terminal codes ... -if tty < /dev/null 1>/dev/null 2>&1; then - boldface="`tput bold 2>/dev/null`" - normal="`tput sgr0 2>/dev/null`" -else - boldface= - normal= -fi -printbold() { - echo $ECHO_N "$boldface" $ECHO_C - echo "$@" - echo $ECHO_N "$normal" $ECHO_C -} -printerr() { - echo "$@" >&2 -} - -# Usage: -# compare_versions MIN_VERSION ACTUAL_VERSION -# returns true if ACTUAL_VERSION >= MIN_VERSION -compare_versions() { - ch_min_version=$1 - ch_actual_version=$2 - ch_status=0 - IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." - set $ch_actual_version - for ch_min in $ch_min_version; do - ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes - if [ -z "$ch_min" ]; then break; fi - if [ -z "$ch_cur" ]; then ch_status=1; break; fi - if [ $ch_cur -gt $ch_min ]; then break; fi - if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi - done - IFS="$ch_save_IFS" - return $ch_status -} - -# Usage: -# version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE -# checks to see if the package is available -version_check() { - vc_package=$1 - vc_variable=$2 - vc_checkprogs=$3 - vc_min_version=$4 - vc_source=$5 - vc_status=1 - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then - printbold "using $vc_checkprog for $vc_package" - return 0 - fi - - if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then - vc_comparator="=" - else - vc_comparator=">=" - fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " $ECHO_C - if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then - vc_actual_version=`$vc_checkprog --version | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" - # set variables - eval "$vc_variable=$vc_checkprog; \ - ${vc_variable}_VERSION=$vc_actual_version" - vc_status=0 - break - else - echo "too old (found version $vc_actual_version)" - fi - else - echo "not found." - fi - done - if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" - printerr " to build $PKG_NAME. Download the appropriate package for" - printerr " from your distribution or get the source tarball at" - printerr " $vc_source" - printerr - exit $vc_status - fi - return $vc_status -} - -# Usage: -# require_m4macro filename.m4 -# adds filename.m4 to the list of required macros -require_m4macro() { - case "$REQUIRED_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;; - esac -} - -forbid_m4macro() { - case "$FORBIDDEN_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; - esac -} - -# Usage: -# add_to_cm_macrodirs dirname -# Adds the dir to $cm_macrodirs, if it's not there yet. -add_to_cm_macrodirs() { - case $cm_macrodirs in - "$1 "* | *" $1 "* | *" $1") ;; - *) cm_macrodirs="$cm_macrodirs $1";; - esac -} - -# Usage: -# print_m4macros_error -# Prints an error message saying that autoconf macros were misused -print_m4macros_error() { - printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" - printerr -} - -# Usage: -# check_m4macros -# Checks that all the requested macro files are in the aclocal macro path -# Uses REQUIRED_M4MACROS and ACLOCAL variables. -check_m4macros() { - # construct list of macro directories - cm_macrodirs=`$ACLOCAL --print-ac-dir` - # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 - # but it contains only Automake's own macros, so we can ignore it. - - # Read the dirlist file, supported by Automake >= 1.7. - # If AUTOMAKE was defined, no version was detected. - if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then - cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` - if [ -n "$cm_dirlist" ] ; then - for cm_dir in $cm_dirlist; do - if [ -d $cm_dir ]; then - add_to_cm_macrodirs $cm_dir - fi - done - fi - fi - - # Parse $ACLOCAL_FLAGS - set - $ACLOCAL_FLAGS - while [ $# -gt 0 ]; do - if [ "$1" = "-I" ]; then - add_to_cm_macrodirs "$2" - shift - fi - shift - done - - cm_status=0 - if [ -n "$REQUIRED_M4MACROS" ]; then - printbold "Checking for required M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $REQUIRED_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - # The macro dir in Cygwin environments may contain a file - # called dirlist containing other directories to look in. - if [ -f "$cm_dir/dirlist" ]; then - for cm_otherdir in `cat $cm_dir/dirlist`; do - if [ -f "$cm_otherdir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - fi - done - if $cm_macrofound; then - : - else - printerr " $cm_macro not found" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi - if [ -n "$FORBIDDEN_M4MACROS" ]; then - printbold "Checking for forbidden M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $FORBIDDEN_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - if $cm_macrofound; then - printerr " $cm_macro found (should be cleared from macros dir)" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi -} - -# try to catch the case where the macros2/ directory hasn't been cleared out. -forbid_m4macro gnome-cxx-check.m4 - -want_libtool=false -want_gettext=false -want_glib_gettext=false -want_intltool=false -want_pkg_config=false -want_gtk_doc=false -want_gnome_doc_utils=false -want_maintainer_mode=false - -find_configure_files() { - configure_ac= - if test -f "$1/configure.ac"; then - configure_ac="$1/configure.ac" - elif test -f "$1/configure.in"; then - configure_ac="$1/configure.in" - fi - if test "x$configure_ac" != x; then - echo "$configure_ac" - # TODO We have not detected the right autoconf yet! - autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do - find_configure_files "$1/$dir" - done - fi -} - -configure_files="`find_configure_files $srcdir`" - -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - continue - fi - if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || - grep "^LT_INIT" $configure_ac >/dev/null; then - want_libtool=true - fi - if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then - want_gettext=true - fi - if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then - want_glib_gettext=true - fi - if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null || - grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then - want_intltool=true - fi - if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then - want_pkg_config=true - fi - if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then - want_gtk_doc=true - fi - if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then - want_gnome_doc_utils=true - fi - - # check that AM_MAINTAINER_MODE is used - if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then - want_maintainer_mode=true - fi - - if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then - require_m4macro yelp.m4 - fi - - # check to make sure gnome-common macros can be found ... - if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null || - grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null || - grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then - require_m4macro gnome-common.m4 - fi - if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null || - grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then - require_m4macro gnome-compiler-flags.m4 - fi - if grep "^GNOME_CODE_COVERAGE" $configure_ac >/dev/null; then - require_m4macro gnome-code-coverage.m4 - fi -done - -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.13 automake-1.12" ;; - 1.13*) automake_progs="automake-1.13" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" -ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` - -if $want_libtool; then - version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \ - "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" - require_m4macro libtool.m4 -fi - -if $want_gettext; then - version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ - "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" - require_m4macro gettext.m4 -fi - -if $want_glib_gettext; then - version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ - "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" - require_m4macro glib-gettext.m4 -fi - -if $want_intltool; then - version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/intltool/" - require_m4macro intltool.m4 -fi - -if $want_pkg_config; then - version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \ - "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" - require_m4macro pkg.m4 -fi - -if $want_gtk_doc; then - version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - require_m4macro gtk-doc.m4 -fi - -if $want_gnome_doc_utils; then - version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " -fi - -check_m4macros - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - printerr "**Warning**: I am going to run \`configure' with no arguments." - printerr "If you wish to pass any to it, please specify them on the" - printerr \`$0\'" command line." - printerr -fi - -topdir=`pwd` -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - basename=`basename $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - elif [ ! -w $dirname ]; then - echo skipping $dirname -- directory is read only - else - printbold "Processing $configure_ac" - cd $dirname - - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 - fi - - if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi - fi - - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || - grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi - if grep "^GTK_DOC_CHECK" $basename >/dev/null; then - printbold "Running $GTKDOCIZE..." - $GTKDOCIZE --copy || exit 1 - fi - - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - if grep "^GNOME_DOC_INIT" $basename >/dev/null; then - printbold "Running $GNOME_DOC_PREPARE..." - $GNOME_DOC_PREPARE --force --copy || exit 1 - fi - - # Now run aclocal to pull in any additional macros needed - - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete gnome macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in - fi - - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - if [ -f COPYING ]; then - cp -pf COPYING COPYING.autogen_bak - fi - if [ -f INSTALL ]; then - cp -pf INSTALL INSTALL.autogen_bak - fi - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 - fi - if [ -f COPYING.autogen_bak ]; then - cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING - rm -f COPYING.autogen_bak - fi - if [ -f INSTALL.autogen_bak ]; then - cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL - rm -f INSTALL.autogen_bak - fi - - cd "$topdir" - fi -done - -conf_flags="" - -if $want_maintainer_mode; then - conf_flags="--enable-maintainer-mode" -fi - -if test x$NOCONFIGURE = x; then - printbold Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index c09195ce1..8fd1b505d 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 82681 2013-01-23 00:15:50Z eric $ +# $Id: PKGBUILD 86802 2013-03-22 11:40:46Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger @@ -19,16 +19,18 @@ backup=('etc/couchdb/local.ini' source=("http://apache-mirror.rbc.ru/pub/apache/couchdb/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} "couchdb.service" "couchdb.tmpfiles" - "couchdb.rc") + "couchdb.rc" + "build-fix.patch") md5sums=('df75b03e56c2431ede7625200f0d44a7' 'e6e943c1da93cfcb41a4286daa80195d' '8914a7ffc6745f94106d96206709acb4' '1e254ebe32eeb061be64193bafa35dbf' - 'a75ee9b310a950eea13b07274b7a0669') + 'a75ee9b310a950eea13b07274b7a0669' + '71afe48505dfc07ba2091786b4650fa2') build() { cd "$srcdir/apache-$pkgname-$pkgver" - + patch -p1 <$srcdir/build-fix.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var diff --git a/community/couchdb/build-fix.patch b/community/couchdb/build-fix.patch new file mode 100644 index 000000000..d847b3cf2 --- /dev/null +++ b/community/couchdb/build-fix.patch @@ -0,0 +1,5568 @@ +diff -wbBur apache-couchdb-1.2.1/src/Makefile.am apache-couchdb-1.2.1.q/src/Makefile.am +--- apache-couchdb-1.2.1/src/Makefile.am 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/Makefile.am 2013-03-22 15:28:06.836935634 +0400 +@@ -10,4 +10,4 @@ + ## License for the specific language governing permissions and limitations under + ## the License. + +-SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy ++SUBDIRS = couchdb ejson erlang-oauth ibrowse mochiweb snappy +diff -wbBur apache-couchdb-1.2.1/src/Makefile.in apache-couchdb-1.2.1.q/src/Makefile.in +--- apache-couchdb-1.2.1/src/Makefile.in 2012-12-21 01:28:49.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/Makefile.in 2013-03-22 15:28:11.563602246 +0400 +@@ -267,7 +267,7 @@ + version_release = @version_release@ + version_revision = @version_revision@ + version_stage = @version_stage@ +-SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy ++SUBDIRS = couchdb ejson erlang-oauth ibrowse mochiweb snappy + all: all-recursive + + .SUFFIXES: +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochifmt.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -369,8 +369,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + tokenize_test() -> + {?MODULE, [{raw, "ABC"}]} = tokenize("ABC"), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt_records.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_records.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochifmt_records.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_records.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -9,11 +9,15 @@ + %% M:format("{0.bar}", [#rec{bar=foo}]). + %% foo + +--module(mochifmt_records, [Recs]). ++-module(mochifmt_records). + -author('bob@mochimedia.com'). +--export([get_value/2]). ++-export([new/1, get_value/3]). + +-get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) -> ++new([{_Rec, RecFields}]=Recs) when is_list(RecFields) -> ++ {?MODULE, Recs}. ++ ++get_value(Key, Rec, {?MODULE, Recs}) ++ when is_tuple(Rec) and is_atom(element(1, Rec)) -> + try begin + Atom = list_to_existing_atom(Key), + {_, Fields} = proplists:lookup(element(1, Rec), Recs), +@@ -21,7 +25,7 @@ + end + catch error:_ -> mochifmt:get_value(Key, Rec) + end; +-get_value(Key, Args) -> ++get_value(Key, Args, {?MODULE, _Recs}) -> + mochifmt:get_value(Key, Args). + + get_rec_index(Atom, [Atom | _], Index) -> +@@ -33,6 +37,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt_std.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_std.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochifmt_std.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_std.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -3,28 +3,31 @@ + + %% @doc Template module for a mochifmt formatter. + +--module(mochifmt_std, []). ++-module(mochifmt_std). + -author('bob@mochimedia.com'). +--export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]). ++-export([new/0, format/3, get_value/3, format_field/3, get_field/3, convert_field/3]). + +-format(Format, Args) -> ++new() -> ++ {?MODULE}. ++ ++format(Format, Args, {?MODULE}=THIS) -> + mochifmt:format(Format, Args, THIS). + +-get_field(Key, Args) -> ++get_field(Key, Args, {?MODULE}=THIS) -> + mochifmt:get_field(Key, Args, THIS). + +-convert_field(Key, Args) -> ++convert_field(Key, Args, {?MODULE}) -> + mochifmt:convert_field(Key, Args). + +-get_value(Key, Args) -> ++get_value(Key, Args, {?MODULE}) -> + mochifmt:get_value(Key, Args). + +-format_field(Arg, Format) -> ++format_field(Arg, Format, {?MODULE}=THIS) -> + mochifmt:format_field(Arg, Format, THIS). + + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiglobal.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiglobal.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiglobal.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiglobal.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -30,7 +30,7 @@ + put(_K, V, Mod) -> + Bin = compile(Mod, V), + code:purge(Mod), +- code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin), ++ {module, Mod} = code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin), + ok. + + -spec delete(atom()) -> boolean(). +@@ -77,8 +77,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + get_put_delete_test() -> + K = '$$test$$mochiglobal', + delete(K), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochihex.erl apache-couchdb-1.2.1.q/src/mochiweb/mochihex.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochihex.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochihex.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -8,9 +8,6 @@ + + -export([to_hex/1, to_bin/1, to_int/1, dehex/1, hexdigit/1]). + +-%% @type iolist() = [char() | binary() | iolist()] +-%% @type iodata() = iolist() | binary() +- + %% @spec to_hex(integer | iolist()) -> string() + %% @doc Convert an iolist to a hexadecimal string. + to_hex(0) -> +@@ -68,8 +65,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + to_hex_test() -> + "ff000ff1" = to_hex([255, 0, 15, 241]), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochijson2.erl apache-couchdb-1.2.1.q/src/mochiweb/mochijson2.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochijson2.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochijson2.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -40,9 +40,9 @@ + -module(mochijson2). + -author('bob@mochimedia.com'). + -export([encoder/1, encode/1]). +--export([decoder/1, decode/1]). ++-export([decoder/1, decode/1, decode/2]). + +-% This is a macro to placate syntax highlighters.. ++%% This is a macro to placate syntax highlighters.. + -define(Q, $\"). + -define(ADV_COL(S, N), S#decoder{offset=N+S#decoder.offset, + column=N+S#decoder.column}). +@@ -64,15 +64,14 @@ + -define(IS_WHITESPACE(C), + (C =:= $\s orelse C =:= $\t orelse C =:= $\r orelse C =:= $\n)). + +-%% @type iolist() = [char() | binary() | iolist()] +-%% @type iodata() = iolist() | binary() + %% @type json_string() = atom | binary() + %% @type json_number() = integer() | float() + %% @type json_array() = [json_term()] + %% @type json_object() = {struct, [{json_string(), json_term()}]} ++%% @type json_eep18_object() = {[{json_string(), json_term()}]} + %% @type json_iolist() = {json, iolist()} + %% @type json_term() = json_string() | json_number() | json_array() | +-%% json_object() | json_iolist() ++%% json_object() | json_eep18_object() | json_iolist() + + -record(encoder, {handler=null, + utf8=false}). +@@ -102,6 +101,14 @@ + State = parse_decoder_options(Options, #decoder{}), + fun (O) -> json_decode(O, State) end. + ++%% @spec decode(iolist(), [{format, proplist | eep18 | struct}]) -> json_term() ++%% @doc Decode the given iolist to Erlang terms using the given object format ++%% for decoding, where proplist returns JSON objects as [{binary(), json_term()}] ++%% proplists, eep18 returns JSON objects as {[binary(), json_term()]}, and struct ++%% returns them as-is. ++decode(S, Options) -> ++ json_decode(S, parse_decoder_options(Options, #decoder{})). ++ + %% @spec decode(iolist()) -> json_term() + %% @doc Decode the given iolist to Erlang terms. + decode(S) -> +@@ -119,7 +126,10 @@ + parse_decoder_options([], State) -> + State; + parse_decoder_options([{object_hook, Hook} | Rest], State) -> +- parse_decoder_options(Rest, State#decoder{object_hook=Hook}). ++ parse_decoder_options(Rest, State#decoder{object_hook=Hook}); ++parse_decoder_options([{format, Format} | Rest], State) ++ when Format =:= struct orelse Format =:= eep18 orelse Format =:= proplist -> ++ parse_decoder_options(Rest, State#decoder{object_hook=Format}). + + json_encode(true, _State) -> + <<"true">>; +@@ -139,6 +149,10 @@ + json_encode_proplist(Props, State); + json_encode({struct, Props}, State) when is_list(Props) -> + json_encode_proplist(Props, State); ++json_encode({Props}, State) when is_list(Props) -> ++ json_encode_proplist(Props, State); ++json_encode({}, State) -> ++ json_encode_proplist([], State); + json_encode(Array, State) when is_list(Array) -> + json_encode_array(Array, State); + json_encode({array, Array}, State) when is_list(Array) -> +@@ -318,8 +332,12 @@ + decode_object(B, S1) + end. + +-make_object(V, #decoder{object_hook=null}) -> ++make_object(V, #decoder{object_hook=N}) when N =:= null orelse N =:= struct -> + V; ++make_object({struct, P}, #decoder{object_hook=eep18}) -> ++ {P}; ++make_object({struct, P}, #decoder{object_hook=proplist}) -> ++ P; + make_object(V, #decoder{object_hook=Hook}) -> + Hook(V). + +@@ -559,8 +577,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + + %% testing constructs borrowed from the Yaws JSON implementation. +@@ -838,12 +856,34 @@ + + handler_test() -> + ?assertEqual( +- {'EXIT',{json_encode,{bad_term,{}}}}, +- catch encode({})), +- F = fun ({}) -> [] end, ++ {'EXIT',{json_encode,{bad_term,{x,y}}}}, ++ catch encode({x,y})), ++ F = fun ({x,y}) -> [] end, + ?assertEqual( + <<"[]">>, +- iolist_to_binary((encoder([{handler, F}]))({}))), ++ iolist_to_binary((encoder([{handler, F}]))({x, y}))), + ok. + ++encode_empty_test_() -> ++ [{A, ?_assertEqual(<<"{}">>, iolist_to_binary(encode(B)))} ++ || {A, B} <- [{"eep18 {}", {}}, ++ {"eep18 {[]}", {[]}}, ++ {"{struct, []}", {struct, []}}]]. ++ ++encode_test_() -> ++ P = [{<<"k">>, <<"v">>}], ++ JSON = iolist_to_binary(encode({struct, P})), ++ [{atom_to_list(F), ++ ?_assertEqual(JSON, iolist_to_binary(encode(decode(JSON, [{format, F}]))))} ++ || F <- [struct, eep18, proplist]]. ++ ++format_test_() -> ++ P = [{<<"k">>, <<"v">>}], ++ JSON = iolist_to_binary(encode({struct, P})), ++ [{atom_to_list(F), ++ ?_assertEqual(A, decode(JSON, [{format, F}]))} ++ || {F, A} <- [{struct, {struct, P}}, ++ {eep18, {P}}, ++ {proplist, P}]]. ++ + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochijson.erl apache-couchdb-1.2.1.q/src/mochiweb/mochijson.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochijson.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochijson.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -15,8 +15,6 @@ + -define(INC_COL(S), S#decoder{column=1+S#decoder.column}). + -define(INC_LINE(S), S#decoder{column=1, line=1+S#decoder.line}). + +-%% @type iolist() = [char() | binary() | iolist()] +-%% @type iodata() = iolist() | binary() + %% @type json_string() = atom | string() | binary() + %% @type json_number() = integer() | float() + %% @type json_array() = {array, [json_term()]} +@@ -406,8 +404,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + %% testing constructs borrowed from the Yaws JSON implementation. + +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochilists.erl apache-couchdb-1.2.1.q/src/mochiweb/mochilists.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochilists.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochilists.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -55,8 +55,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + set_defaults_test() -> + ?assertEqual( +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochilogfile2.erl apache-couchdb-1.2.1.q/src/mochiweb/mochilogfile2.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochilogfile2.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochilogfile2.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -57,8 +57,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + name_test() -> + D = mochitemp:mkdtemp(), + FileName = filename:join(D, "open_close_test.log"), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochinum.erl apache-couchdb-1.2.1.q/src/mochiweb/mochinum.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochinum.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochinum.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -243,8 +243,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + int_ceil_test() -> + ?assertEqual(1, int_ceil(0.0001)), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochitemp.erl apache-couchdb-1.2.1.q/src/mochiweb/mochitemp.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochitemp.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochitemp.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -135,8 +135,9 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). ++ + pushenv(L) -> + [{K, os:getenv(K)} || K <- L]. + popenv(L) -> +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiutf8.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiutf8.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiutf8.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiutf8.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -5,8 +5,9 @@ + %% invalid bytes. + + -module(mochiutf8). +--export([valid_utf8_bytes/1, codepoint_to_bytes/1, bytes_to_codepoints/1]). +--export([bytes_foldl/3, codepoint_foldl/3, read_codepoint/1, len/1]). ++-export([valid_utf8_bytes/1, codepoint_to_bytes/1, codepoints_to_bytes/1]). ++-export([bytes_to_codepoints/1, bytes_foldl/3, codepoint_foldl/3]). ++-export([read_codepoint/1, len/1]). + + %% External API + +@@ -192,8 +193,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + binary_skip_bytes_test() -> + ?assertEqual(<<"foo">>, +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_acceptor.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_acceptor.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_acceptor.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_acceptor.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -14,10 +14,10 @@ + proc_lib:spawn_link(?MODULE, init, [Server, Listen, Loop]). + + init(Server, Listen, Loop) -> +- T1 = now(), ++ T1 = os:timestamp(), + case catch mochiweb_socket:accept(Listen) of + {ok, Socket} -> +- gen_server:cast(Server, {accepted, self(), timer:now_diff(now(), T1)}), ++ gen_server:cast(Server, {accepted, self(), timer:now_diff(os:timestamp(), T1)}), + call_loop(Loop, Socket); + {error, closed} -> + exit(normal); +@@ -35,6 +35,8 @@ + + call_loop({M, F}, Socket) -> + M:F(Socket); ++call_loop({M, F, [A1]}, Socket) -> ++ M:F(Socket, A1); + call_loop({M, F, A}, Socket) -> + erlang:apply(M, F, [Socket | A]); + call_loop(Loop, Socket) -> +@@ -43,6 +45,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb.app.src apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.app.src +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb.app.src 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.app.src 2013-03-22 15:26:58.000000000 +0400 +@@ -1,9 +1,9 @@ + %% This is generated from src/mochiweb.app.src + {application, mochiweb, + [{description, "MochiMedia Web Server"}, +- {vsn, "1.4.1"}, ++ {vsn, "2.5.0"}, + {modules, []}, + {registered, []}, +- {mod, {mochiweb_app, []}}, + {env, []}, +- {applications, [kernel, stdlib, crypto, inets]}]}. ++ {applications, [kernel, stdlib, crypto, inets, ssl, xmerl, ++ compiler, syntax_tools]}]}. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_charref.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_charref.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_charref.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_charref.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -1,17 +1,17 @@ + %% @author Bob Ippolito + %% @copyright 2007 Mochi Media, Inc. + +-%% @doc Converts HTML 4 charrefs and entities to codepoints. ++%% @doc Converts HTML 5 charrefs and entities to codepoints (or lists of code points). + -module(mochiweb_charref). + -export([charref/1]). + + %% External API. + +-%% @spec charref(S) -> integer() | undefined + %% @doc Convert a decimal charref, hex charref, or html entity to a unicode + %% codepoint, or return undefined on failure. + %% The input should not include an ampersand or semicolon. + %% charref("#38") = 38, charref("#x26") = 38, charref("amp") = 38. ++-spec charref(binary() | string()) -> integer() | [integer()] | undefined. + charref(B) when is_binary(B) -> + charref(binary_to_list(B)); + charref([$#, C | L]) when C =:= $x orelse C =:= $X -> +@@ -29,266 +29,2141 @@ + + %% Internal API. + +-entity("nbsp") -> 160; +-entity("iexcl") -> 161; +-entity("cent") -> 162; +-entity("pound") -> 163; +-entity("curren") -> 164; +-entity("yen") -> 165; +-entity("brvbar") -> 166; +-entity("sect") -> 167; +-entity("uml") -> 168; +-entity("copy") -> 169; +-entity("ordf") -> 170; +-entity("laquo") -> 171; +-entity("not") -> 172; +-entity("shy") -> 173; +-entity("reg") -> 174; +-entity("macr") -> 175; +-entity("deg") -> 176; +-entity("plusmn") -> 177; +-entity("sup2") -> 178; +-entity("sup3") -> 179; +-entity("acute") -> 180; +-entity("micro") -> 181; +-entity("para") -> 182; +-entity("middot") -> 183; +-entity("cedil") -> 184; +-entity("sup1") -> 185; +-entity("ordm") -> 186; +-entity("raquo") -> 187; +-entity("frac14") -> 188; +-entity("frac12") -> 189; +-entity("frac34") -> 190; +-entity("iquest") -> 191; +-entity("Agrave") -> 192; +-entity("Aacute") -> 193; +-entity("Acirc") -> 194; +-entity("Atilde") -> 195; +-entity("Auml") -> 196; +-entity("Aring") -> 197; +-entity("AElig") -> 198; +-entity("Ccedil") -> 199; +-entity("Egrave") -> 200; +-entity("Eacute") -> 201; +-entity("Ecirc") -> 202; +-entity("Euml") -> 203; +-entity("Igrave") -> 204; +-entity("Iacute") -> 205; +-entity("Icirc") -> 206; +-entity("Iuml") -> 207; +-entity("ETH") -> 208; +-entity("Ntilde") -> 209; +-entity("Ograve") -> 210; +-entity("Oacute") -> 211; +-entity("Ocirc") -> 212; +-entity("Otilde") -> 213; +-entity("Ouml") -> 214; +-entity("times") -> 215; +-entity("Oslash") -> 216; +-entity("Ugrave") -> 217; +-entity("Uacute") -> 218; +-entity("Ucirc") -> 219; +-entity("Uuml") -> 220; +-entity("Yacute") -> 221; +-entity("THORN") -> 222; +-entity("szlig") -> 223; +-entity("agrave") -> 224; +-entity("aacute") -> 225; +-entity("acirc") -> 226; +-entity("atilde") -> 227; +-entity("auml") -> 228; +-entity("aring") -> 229; +-entity("aelig") -> 230; +-entity("ccedil") -> 231; +-entity("egrave") -> 232; +-entity("eacute") -> 233; +-entity("ecirc") -> 234; +-entity("euml") -> 235; +-entity("igrave") -> 236; +-entity("iacute") -> 237; +-entity("icirc") -> 238; +-entity("iuml") -> 239; +-entity("eth") -> 240; +-entity("ntilde") -> 241; +-entity("ograve") -> 242; +-entity("oacute") -> 243; +-entity("ocirc") -> 244; +-entity("otilde") -> 245; +-entity("ouml") -> 246; +-entity("divide") -> 247; +-entity("oslash") -> 248; +-entity("ugrave") -> 249; +-entity("uacute") -> 250; +-entity("ucirc") -> 251; +-entity("uuml") -> 252; +-entity("yacute") -> 253; +-entity("thorn") -> 254; +-entity("yuml") -> 255; +-entity("fnof") -> 402; +-entity("Alpha") -> 913; +-entity("Beta") -> 914; +-entity("Gamma") -> 915; +-entity("Delta") -> 916; +-entity("Epsilon") -> 917; +-entity("Zeta") -> 918; +-entity("Eta") -> 919; +-entity("Theta") -> 920; +-entity("Iota") -> 921; +-entity("Kappa") -> 922; +-entity("Lambda") -> 923; +-entity("Mu") -> 924; +-entity("Nu") -> 925; +-entity("Xi") -> 926; +-entity("Omicron") -> 927; +-entity("Pi") -> 928; +-entity("Rho") -> 929; +-entity("Sigma") -> 931; +-entity("Tau") -> 932; +-entity("Upsilon") -> 933; +-entity("Phi") -> 934; +-entity("Chi") -> 935; +-entity("Psi") -> 936; +-entity("Omega") -> 937; +-entity("alpha") -> 945; +-entity("beta") -> 946; +-entity("gamma") -> 947; +-entity("delta") -> 948; +-entity("epsilon") -> 949; +-entity("zeta") -> 950; +-entity("eta") -> 951; +-entity("theta") -> 952; +-entity("iota") -> 953; +-entity("kappa") -> 954; +-entity("lambda") -> 955; +-entity("mu") -> 956; +-entity("nu") -> 957; +-entity("xi") -> 958; +-entity("omicron") -> 959; +-entity("pi") -> 960; +-entity("rho") -> 961; +-entity("sigmaf") -> 962; +-entity("sigma") -> 963; +-entity("tau") -> 964; +-entity("upsilon") -> 965; +-entity("phi") -> 966; +-entity("chi") -> 967; +-entity("psi") -> 968; +-entity("omega") -> 969; +-entity("thetasym") -> 977; +-entity("upsih") -> 978; +-entity("piv") -> 982; +-entity("bull") -> 8226; +-entity("hellip") -> 8230; +-entity("prime") -> 8242; +-entity("Prime") -> 8243; +-entity("oline") -> 8254; +-entity("frasl") -> 8260; +-entity("weierp") -> 8472; +-entity("image") -> 8465; +-entity("real") -> 8476; +-entity("trade") -> 8482; +-entity("alefsym") -> 8501; +-entity("larr") -> 8592; +-entity("uarr") -> 8593; +-entity("rarr") -> 8594; +-entity("darr") -> 8595; +-entity("harr") -> 8596; +-entity("crarr") -> 8629; +-entity("lArr") -> 8656; +-entity("uArr") -> 8657; +-entity("rArr") -> 8658; +-entity("dArr") -> 8659; +-entity("hArr") -> 8660; +-entity("forall") -> 8704; +-entity("part") -> 8706; +-entity("exist") -> 8707; +-entity("empty") -> 8709; +-entity("nabla") -> 8711; +-entity("isin") -> 8712; +-entity("notin") -> 8713; +-entity("ni") -> 8715; +-entity("prod") -> 8719; +-entity("sum") -> 8721; +-entity("minus") -> 8722; +-entity("lowast") -> 8727; +-entity("radic") -> 8730; +-entity("prop") -> 8733; +-entity("infin") -> 8734; +-entity("ang") -> 8736; +-entity("and") -> 8743; +-entity("or") -> 8744; +-entity("cap") -> 8745; +-entity("cup") -> 8746; +-entity("int") -> 8747; +-entity("there4") -> 8756; +-entity("sim") -> 8764; +-entity("cong") -> 8773; +-entity("asymp") -> 8776; +-entity("ne") -> 8800; +-entity("equiv") -> 8801; +-entity("le") -> 8804; +-entity("ge") -> 8805; +-entity("sub") -> 8834; +-entity("sup") -> 8835; +-entity("nsub") -> 8836; +-entity("sube") -> 8838; +-entity("supe") -> 8839; +-entity("oplus") -> 8853; +-entity("otimes") -> 8855; +-entity("perp") -> 8869; +-entity("sdot") -> 8901; +-entity("lceil") -> 8968; +-entity("rceil") -> 8969; +-entity("lfloor") -> 8970; +-entity("rfloor") -> 8971; +-entity("lang") -> 9001; +-entity("rang") -> 9002; +-entity("loz") -> 9674; +-entity("spades") -> 9824; +-entity("clubs") -> 9827; +-entity("hearts") -> 9829; +-entity("diams") -> 9830; +-entity("quot") -> 34; +-entity("amp") -> 38; +-entity("lt") -> 60; +-entity("gt") -> 62; +-entity("OElig") -> 338; +-entity("oelig") -> 339; +-entity("Scaron") -> 352; +-entity("scaron") -> 353; +-entity("Yuml") -> 376; +-entity("circ") -> 710; +-entity("tilde") -> 732; +-entity("ensp") -> 8194; +-entity("emsp") -> 8195; +-entity("thinsp") -> 8201; +-entity("zwnj") -> 8204; +-entity("zwj") -> 8205; +-entity("lrm") -> 8206; +-entity("rlm") -> 8207; +-entity("ndash") -> 8211; +-entity("mdash") -> 8212; +-entity("lsquo") -> 8216; +-entity("rsquo") -> 8217; +-entity("sbquo") -> 8218; +-entity("ldquo") -> 8220; +-entity("rdquo") -> 8221; +-entity("bdquo") -> 8222; +-entity("dagger") -> 8224; +-entity("Dagger") -> 8225; +-entity("permil") -> 8240; +-entity("lsaquo") -> 8249; +-entity("rsaquo") -> 8250; +-entity("euro") -> 8364; +-entity(_) -> undefined. ++%% [2011-10-14] Generated from: ++%% http://www.w3.org/TR/html5/named-character-references.html + ++entity("AElig") -> 16#000C6; ++entity("AMP") -> 16#00026; ++entity("Aacute") -> 16#000C1; ++entity("Abreve") -> 16#00102; ++entity("Acirc") -> 16#000C2; ++entity("Acy") -> 16#00410; ++entity("Afr") -> 16#1D504; ++entity("Agrave") -> 16#000C0; ++entity("Alpha") -> 16#00391; ++entity("Amacr") -> 16#00100; ++entity("And") -> 16#02A53; ++entity("Aogon") -> 16#00104; ++entity("Aopf") -> 16#1D538; ++entity("ApplyFunction") -> 16#02061; ++entity("Aring") -> 16#000C5; ++entity("Ascr") -> 16#1D49C; ++entity("Assign") -> 16#02254; ++entity("Atilde") -> 16#000C3; ++entity("Auml") -> 16#000C4; ++entity("Backslash") -> 16#02216; ++entity("Barv") -> 16#02AE7; ++entity("Barwed") -> 16#02306; ++entity("Bcy") -> 16#00411; ++entity("Because") -> 16#02235; ++entity("Bernoullis") -> 16#0212C; ++entity("Beta") -> 16#00392; ++entity("Bfr") -> 16#1D505; ++entity("Bopf") -> 16#1D539; ++entity("Breve") -> 16#002D8; ++entity("Bscr") -> 16#0212C; ++entity("Bumpeq") -> 16#0224E; ++entity("CHcy") -> 16#00427; ++entity("COPY") -> 16#000A9; ++entity("Cacute") -> 16#00106; ++entity("Cap") -> 16#022D2; ++entity("CapitalDifferentialD") -> 16#02145; ++entity("Cayleys") -> 16#0212D; ++entity("Ccaron") -> 16#0010C; ++entity("Ccedil") -> 16#000C7; ++entity("Ccirc") -> 16#00108; ++entity("Cconint") -> 16#02230; ++entity("Cdot") -> 16#0010A; ++entity("Cedilla") -> 16#000B8; ++entity("CenterDot") -> 16#000B7; ++entity("Cfr") -> 16#0212D; ++entity("Chi") -> 16#003A7; ++entity("CircleDot") -> 16#02299; ++entity("CircleMinus") -> 16#02296; ++entity("CirclePlus") -> 16#02295; ++entity("CircleTimes") -> 16#02297; ++entity("ClockwiseContourIntegral") -> 16#02232; ++entity("CloseCurlyDoubleQuote") -> 16#0201D; ++entity("CloseCurlyQuote") -> 16#02019; ++entity("Colon") -> 16#02237; ++entity("Colone") -> 16#02A74; ++entity("Congruent") -> 16#02261; ++entity("Conint") -> 16#0222F; ++entity("ContourIntegral") -> 16#0222E; ++entity("Copf") -> 16#02102; ++entity("Coproduct") -> 16#02210; ++entity("CounterClockwiseContourIntegral") -> 16#02233; ++entity("Cross") -> 16#02A2F; ++entity("Cscr") -> 16#1D49E; ++entity("Cup") -> 16#022D3; ++entity("CupCap") -> 16#0224D; ++entity("DD") -> 16#02145; ++entity("DDotrahd") -> 16#02911; ++entity("DJcy") -> 16#00402; ++entity("DScy") -> 16#00405; ++entity("DZcy") -> 16#0040F; ++entity("Dagger") -> 16#02021; ++entity("Darr") -> 16#021A1; ++entity("Dashv") -> 16#02AE4; ++entity("Dcaron") -> 16#0010E; ++entity("Dcy") -> 16#00414; ++entity("Del") -> 16#02207; ++entity("Delta") -> 16#00394; ++entity("Dfr") -> 16#1D507; ++entity("DiacriticalAcute") -> 16#000B4; ++entity("DiacriticalDot") -> 16#002D9; ++entity("DiacriticalDoubleAcute") -> 16#002DD; ++entity("DiacriticalGrave") -> 16#00060; ++entity("DiacriticalTilde") -> 16#002DC; ++entity("Diamond") -> 16#022C4; ++entity("DifferentialD") -> 16#02146; ++entity("Dopf") -> 16#1D53B; ++entity("Dot") -> 16#000A8; ++entity("DotDot") -> 16#020DC; ++entity("DotEqual") -> 16#02250; ++entity("DoubleContourIntegral") -> 16#0222F; ++entity("DoubleDot") -> 16#000A8; ++entity("DoubleDownArrow") -> 16#021D3; ++entity("DoubleLeftArrow") -> 16#021D0; ++entity("DoubleLeftRightArrow") -> 16#021D4; ++entity("DoubleLeftTee") -> 16#02AE4; ++entity("DoubleLongLeftArrow") -> 16#027F8; ++entity("DoubleLongLeftRightArrow") -> 16#027FA; ++entity("DoubleLongRightArrow") -> 16#027F9; ++entity("DoubleRightArrow") -> 16#021D2; ++entity("DoubleRightTee") -> 16#022A8; ++entity("DoubleUpArrow") -> 16#021D1; ++entity("DoubleUpDownArrow") -> 16#021D5; ++entity("DoubleVerticalBar") -> 16#02225; ++entity("DownArrow") -> 16#02193; ++entity("DownArrowBar") -> 16#02913; ++entity("DownArrowUpArrow") -> 16#021F5; ++entity("DownBreve") -> 16#00311; ++entity("DownLeftRightVector") -> 16#02950; ++entity("DownLeftTeeVector") -> 16#0295E; ++entity("DownLeftVector") -> 16#021BD; ++entity("DownLeftVectorBar") -> 16#02956; ++entity("DownRightTeeVector") -> 16#0295F; ++entity("DownRightVector") -> 16#021C1; ++entity("DownRightVectorBar") -> 16#02957; ++entity("DownTee") -> 16#022A4; ++entity("DownTeeArrow") -> 16#021A7; ++entity("Downarrow") -> 16#021D3; ++entity("Dscr") -> 16#1D49F; ++entity("Dstrok") -> 16#00110; ++entity("ENG") -> 16#0014A; ++entity("ETH") -> 16#000D0; ++entity("Eacute") -> 16#000C9; ++entity("Ecaron") -> 16#0011A; ++entity("Ecirc") -> 16#000CA; ++entity("Ecy") -> 16#0042D; ++entity("Edot") -> 16#00116; ++entity("Efr") -> 16#1D508; ++entity("Egrave") -> 16#000C8; ++entity("Element") -> 16#02208; ++entity("Emacr") -> 16#00112; ++entity("EmptySmallSquare") -> 16#025FB; ++entity("EmptyVerySmallSquare") -> 16#025AB; ++entity("Eogon") -> 16#00118; ++entity("Eopf") -> 16#1D53C; ++entity("Epsilon") -> 16#00395; ++entity("Equal") -> 16#02A75; ++entity("EqualTilde") -> 16#02242; ++entity("Equilibrium") -> 16#021CC; ++entity("Escr") -> 16#02130; ++entity("Esim") -> 16#02A73; ++entity("Eta") -> 16#00397; ++entity("Euml") -> 16#000CB; ++entity("Exists") -> 16#02203; ++entity("ExponentialE") -> 16#02147; ++entity("Fcy") -> 16#00424; ++entity("Ffr") -> 16#1D509; ++entity("FilledSmallSquare") -> 16#025FC; ++entity("FilledVerySmallSquare") -> 16#025AA; ++entity("Fopf") -> 16#1D53D; ++entity("ForAll") -> 16#02200; ++entity("Fouriertrf") -> 16#02131; ++entity("Fscr") -> 16#02131; ++entity("GJcy") -> 16#00403; ++entity("GT") -> 16#0003E; ++entity("Gamma") -> 16#00393; ++entity("Gammad") -> 16#003DC; ++entity("Gbreve") -> 16#0011E; ++entity("Gcedil") -> 16#00122; ++entity("Gcirc") -> 16#0011C; ++entity("Gcy") -> 16#00413; ++entity("Gdot") -> 16#00120; ++entity("Gfr") -> 16#1D50A; ++entity("Gg") -> 16#022D9; ++entity("Gopf") -> 16#1D53E; ++entity("GreaterEqual") -> 16#02265; ++entity("GreaterEqualLess") -> 16#022DB; ++entity("GreaterFullEqual") -> 16#02267; ++entity("GreaterGreater") -> 16#02AA2; ++entity("GreaterLess") -> 16#02277; ++entity("GreaterSlantEqual") -> 16#02A7E; ++entity("GreaterTilde") -> 16#02273; ++entity("Gscr") -> 16#1D4A2; ++entity("Gt") -> 16#0226B; ++entity("HARDcy") -> 16#0042A; ++entity("Hacek") -> 16#002C7; ++entity("Hat") -> 16#0005E; ++entity("Hcirc") -> 16#00124; ++entity("Hfr") -> 16#0210C; ++entity("HilbertSpace") -> 16#0210B; ++entity("Hopf") -> 16#0210D; ++entity("HorizontalLine") -> 16#02500; ++entity("Hscr") -> 16#0210B; ++entity("Hstrok") -> 16#00126; ++entity("HumpDownHump") -> 16#0224E; ++entity("HumpEqual") -> 16#0224F; ++entity("IEcy") -> 16#00415; ++entity("IJlig") -> 16#00132; ++entity("IOcy") -> 16#00401; ++entity("Iacute") -> 16#000CD; ++entity("Icirc") -> 16#000CE; ++entity("Icy") -> 16#00418; ++entity("Idot") -> 16#00130; ++entity("Ifr") -> 16#02111; ++entity("Igrave") -> 16#000CC; ++entity("Im") -> 16#02111; ++entity("Imacr") -> 16#0012A; ++entity("ImaginaryI") -> 16#02148; ++entity("Implies") -> 16#021D2; ++entity("Int") -> 16#0222C; ++entity("Integral") -> 16#0222B; ++entity("Intersection") -> 16#022C2; ++entity("InvisibleComma") -> 16#02063; ++entity("InvisibleTimes") -> 16#02062; ++entity("Iogon") -> 16#0012E; ++entity("Iopf") -> 16#1D540; ++entity("Iota") -> 16#00399; ++entity("Iscr") -> 16#02110; ++entity("Itilde") -> 16#00128; ++entity("Iukcy") -> 16#00406; ++entity("Iuml") -> 16#000CF; ++entity("Jcirc") -> 16#00134; ++entity("Jcy") -> 16#00419; ++entity("Jfr") -> 16#1D50D; ++entity("Jopf") -> 16#1D541; ++entity("Jscr") -> 16#1D4A5; ++entity("Jsercy") -> 16#00408; ++entity("Jukcy") -> 16#00404; ++entity("KHcy") -> 16#00425; ++entity("KJcy") -> 16#0040C; ++entity("Kappa") -> 16#0039A; ++entity("Kcedil") -> 16#00136; ++entity("Kcy") -> 16#0041A; ++entity("Kfr") -> 16#1D50E; ++entity("Kopf") -> 16#1D542; ++entity("Kscr") -> 16#1D4A6; ++entity("LJcy") -> 16#00409; ++entity("LT") -> 16#0003C; ++entity("Lacute") -> 16#00139; ++entity("Lambda") -> 16#0039B; ++entity("Lang") -> 16#027EA; ++entity("Laplacetrf") -> 16#02112; ++entity("Larr") -> 16#0219E; ++entity("Lcaron") -> 16#0013D; ++entity("Lcedil") -> 16#0013B; ++entity("Lcy") -> 16#0041B; ++entity("LeftAngleBracket") -> 16#027E8; ++entity("LeftArrow") -> 16#02190; ++entity("LeftArrowBar") -> 16#021E4; ++entity("LeftArrowRightArrow") -> 16#021C6; ++entity("LeftCeiling") -> 16#02308; ++entity("LeftDoubleBracket") -> 16#027E6; ++entity("LeftDownTeeVector") -> 16#02961; ++entity("LeftDownVector") -> 16#021C3; ++entity("LeftDownVectorBar") -> 16#02959; ++entity("LeftFloor") -> 16#0230A; ++entity("LeftRightArrow") -> 16#02194; ++entity("LeftRightVector") -> 16#0294E; ++entity("LeftTee") -> 16#022A3; ++entity("LeftTeeArrow") -> 16#021A4; ++entity("LeftTeeVector") -> 16#0295A; ++entity("LeftTriangle") -> 16#022B2; ++entity("LeftTriangleBar") -> 16#029CF; ++entity("LeftTriangleEqual") -> 16#022B4; ++entity("LeftUpDownVector") -> 16#02951; ++entity("LeftUpTeeVector") -> 16#02960; ++entity("LeftUpVector") -> 16#021BF; ++entity("LeftUpVectorBar") -> 16#02958; ++entity("LeftVector") -> 16#021BC; ++entity("LeftVectorBar") -> 16#02952; ++entity("Leftarrow") -> 16#021D0; ++entity("Leftrightarrow") -> 16#021D4; ++entity("LessEqualGreater") -> 16#022DA; ++entity("LessFullEqual") -> 16#02266; ++entity("LessGreater") -> 16#02276; ++entity("LessLess") -> 16#02AA1; ++entity("LessSlantEqual") -> 16#02A7D; ++entity("LessTilde") -> 16#02272; ++entity("Lfr") -> 16#1D50F; ++entity("Ll") -> 16#022D8; ++entity("Lleftarrow") -> 16#021DA; ++entity("Lmidot") -> 16#0013F; ++entity("LongLeftArrow") -> 16#027F5; ++entity("LongLeftRightArrow") -> 16#027F7; ++entity("LongRightArrow") -> 16#027F6; ++entity("Longleftarrow") -> 16#027F8; ++entity("Longleftrightarrow") -> 16#027FA; ++entity("Longrightarrow") -> 16#027F9; ++entity("Lopf") -> 16#1D543; ++entity("LowerLeftArrow") -> 16#02199; ++entity("LowerRightArrow") -> 16#02198; ++entity("Lscr") -> 16#02112; ++entity("Lsh") -> 16#021B0; ++entity("Lstrok") -> 16#00141; ++entity("Lt") -> 16#0226A; ++entity("Map") -> 16#02905; ++entity("Mcy") -> 16#0041C; ++entity("MediumSpace") -> 16#0205F; ++entity("Mellintrf") -> 16#02133; ++entity("Mfr") -> 16#1D510; ++entity("MinusPlus") -> 16#02213; ++entity("Mopf") -> 16#1D544; ++entity("Mscr") -> 16#02133; ++entity("Mu") -> 16#0039C; ++entity("NJcy") -> 16#0040A; ++entity("Nacute") -> 16#00143; ++entity("Ncaron") -> 16#00147; ++entity("Ncedil") -> 16#00145; ++entity("Ncy") -> 16#0041D; ++entity("NegativeMediumSpace") -> 16#0200B; ++entity("NegativeThickSpace") -> 16#0200B; ++entity("NegativeThinSpace") -> 16#0200B; ++entity("NegativeVeryThinSpace") -> 16#0200B; ++entity("NestedGreaterGreater") -> 16#0226B; ++entity("NestedLessLess") -> 16#0226A; ++entity("NewLine") -> 16#0000A; ++entity("Nfr") -> 16#1D511; ++entity("NoBreak") -> 16#02060; ++entity("NonBreakingSpace") -> 16#000A0; ++entity("Nopf") -> 16#02115; ++entity("Not") -> 16#02AEC; ++entity("NotCongruent") -> 16#02262; ++entity("NotCupCap") -> 16#0226D; ++entity("NotDoubleVerticalBar") -> 16#02226; ++entity("NotElement") -> 16#02209; ++entity("NotEqual") -> 16#02260; ++entity("NotEqualTilde") -> [16#02242, 16#00338]; ++entity("NotExists") -> 16#02204; ++entity("NotGreater") -> 16#0226F; ++entity("NotGreaterEqual") -> 16#02271; ++entity("NotGreaterFullEqual") -> [16#02267, 16#00338]; ++entity("NotGreaterGreater") -> [16#0226B, 16#00338]; ++entity("NotGreaterLess") -> 16#02279; ++entity("NotGreaterSlantEqual") -> [16#02A7E, 16#00338]; ++entity("NotGreaterTilde") -> 16#02275; ++entity("NotHumpDownHump") -> [16#0224E, 16#00338]; ++entity("NotHumpEqual") -> [16#0224F, 16#00338]; ++entity("NotLeftTriangle") -> 16#022EA; ++entity("NotLeftTriangleBar") -> [16#029CF, 16#00338]; ++entity("NotLeftTriangleEqual") -> 16#022EC; ++entity("NotLess") -> 16#0226E; ++entity("NotLessEqual") -> 16#02270; ++entity("NotLessGreater") -> 16#02278; ++entity("NotLessLess") -> [16#0226A, 16#00338]; ++entity("NotLessSlantEqual") -> [16#02A7D, 16#00338]; ++entity("NotLessTilde") -> 16#02274; ++entity("NotNestedGreaterGreater") -> [16#02AA2, 16#00338]; ++entity("NotNestedLessLess") -> [16#02AA1, 16#00338]; ++entity("NotPrecedes") -> 16#02280; ++entity("NotPrecedesEqual") -> [16#02AAF, 16#00338]; ++entity("NotPrecedesSlantEqual") -> 16#022E0; ++entity("NotReverseElement") -> 16#0220C; ++entity("NotRightTriangle") -> 16#022EB; ++entity("NotRightTriangleBar") -> [16#029D0, 16#00338]; ++entity("NotRightTriangleEqual") -> 16#022ED; ++entity("NotSquareSubset") -> [16#0228F, 16#00338]; ++entity("NotSquareSubsetEqual") -> 16#022E2; ++entity("NotSquareSuperset") -> [16#02290, 16#00338]; ++entity("NotSquareSupersetEqual") -> 16#022E3; ++entity("NotSubset") -> [16#02282, 16#020D2]; ++entity("NotSubsetEqual") -> 16#02288; ++entity("NotSucceeds") -> 16#02281; ++entity("NotSucceedsEqual") -> [16#02AB0, 16#00338]; ++entity("NotSucceedsSlantEqual") -> 16#022E1; ++entity("NotSucceedsTilde") -> [16#0227F, 16#00338]; ++entity("NotSuperset") -> [16#02283, 16#020D2]; ++entity("NotSupersetEqual") -> 16#02289; ++entity("NotTilde") -> 16#02241; ++entity("NotTildeEqual") -> 16#02244; ++entity("NotTildeFullEqual") -> 16#02247; ++entity("NotTildeTilde") -> 16#02249; ++entity("NotVerticalBar") -> 16#02224; ++entity("Nscr") -> 16#1D4A9; ++entity("Ntilde") -> 16#000D1; ++entity("Nu") -> 16#0039D; ++entity("OElig") -> 16#00152; ++entity("Oacute") -> 16#000D3; ++entity("Ocirc") -> 16#000D4; ++entity("Ocy") -> 16#0041E; ++entity("Odblac") -> 16#00150; ++entity("Ofr") -> 16#1D512; ++entity("Ograve") -> 16#000D2; ++entity("Omacr") -> 16#0014C; ++entity("Omega") -> 16#003A9; ++entity("Omicron") -> 16#0039F; ++entity("Oopf") -> 16#1D546; ++entity("OpenCurlyDoubleQuote") -> 16#0201C; ++entity("OpenCurlyQuote") -> 16#02018; ++entity("Or") -> 16#02A54; ++entity("Oscr") -> 16#1D4AA; ++entity("Oslash") -> 16#000D8; ++entity("Otilde") -> 16#000D5; ++entity("Otimes") -> 16#02A37; ++entity("Ouml") -> 16#000D6; ++entity("OverBar") -> 16#0203E; ++entity("OverBrace") -> 16#023DE; ++entity("OverBracket") -> 16#023B4; ++entity("OverParenthesis") -> 16#023DC; ++entity("PartialD") -> 16#02202; ++entity("Pcy") -> 16#0041F; ++entity("Pfr") -> 16#1D513; ++entity("Phi") -> 16#003A6; ++entity("Pi") -> 16#003A0; ++entity("PlusMinus") -> 16#000B1; ++entity("Poincareplane") -> 16#0210C; ++entity("Popf") -> 16#02119; ++entity("Pr") -> 16#02ABB; ++entity("Precedes") -> 16#0227A; ++entity("PrecedesEqual") -> 16#02AAF; ++entity("PrecedesSlantEqual") -> 16#0227C; ++entity("PrecedesTilde") -> 16#0227E; ++entity("Prime") -> 16#02033; ++entity("Product") -> 16#0220F; ++entity("Proportion") -> 16#02237; ++entity("Proportional") -> 16#0221D; ++entity("Pscr") -> 16#1D4AB; ++entity("Psi") -> 16#003A8; ++entity("QUOT") -> 16#00022; ++entity("Qfr") -> 16#1D514; ++entity("Qopf") -> 16#0211A; ++entity("Qscr") -> 16#1D4AC; ++entity("RBarr") -> 16#02910; ++entity("REG") -> 16#000AE; ++entity("Racute") -> 16#00154; ++entity("Rang") -> 16#027EB; ++entity("Rarr") -> 16#021A0; ++entity("Rarrtl") -> 16#02916; ++entity("Rcaron") -> 16#00158; ++entity("Rcedil") -> 16#00156; ++entity("Rcy") -> 16#00420; ++entity("Re") -> 16#0211C; ++entity("ReverseElement") -> 16#0220B; ++entity("ReverseEquilibrium") -> 16#021CB; ++entity("ReverseUpEquilibrium") -> 16#0296F; ++entity("Rfr") -> 16#0211C; ++entity("Rho") -> 16#003A1; ++entity("RightAngleBracket") -> 16#027E9; ++entity("RightArrow") -> 16#02192; ++entity("RightArrowBar") -> 16#021E5; ++entity("RightArrowLeftArrow") -> 16#021C4; ++entity("RightCeiling") -> 16#02309; ++entity("RightDoubleBracket") -> 16#027E7; ++entity("RightDownTeeVector") -> 16#0295D; ++entity("RightDownVector") -> 16#021C2; ++entity("RightDownVectorBar") -> 16#02955; ++entity("RightFloor") -> 16#0230B; ++entity("RightTee") -> 16#022A2; ++entity("RightTeeArrow") -> 16#021A6; ++entity("RightTeeVector") -> 16#0295B; ++entity("RightTriangle") -> 16#022B3; ++entity("RightTriangleBar") -> 16#029D0; ++entity("RightTriangleEqual") -> 16#022B5; ++entity("RightUpDownVector") -> 16#0294F; ++entity("RightUpTeeVector") -> 16#0295C; ++entity("RightUpVector") -> 16#021BE; ++entity("RightUpVectorBar") -> 16#02954; ++entity("RightVector") -> 16#021C0; ++entity("RightVectorBar") -> 16#02953; ++entity("Rightarrow") -> 16#021D2; ++entity("Ropf") -> 16#0211D; ++entity("RoundImplies") -> 16#02970; ++entity("Rrightarrow") -> 16#021DB; ++entity("Rscr") -> 16#0211B; ++entity("Rsh") -> 16#021B1; ++entity("RuleDelayed") -> 16#029F4; ++entity("SHCHcy") -> 16#00429; ++entity("SHcy") -> 16#00428; ++entity("SOFTcy") -> 16#0042C; ++entity("Sacute") -> 16#0015A; ++entity("Sc") -> 16#02ABC; ++entity("Scaron") -> 16#00160; ++entity("Scedil") -> 16#0015E; ++entity("Scirc") -> 16#0015C; ++entity("Scy") -> 16#00421; ++entity("Sfr") -> 16#1D516; ++entity("ShortDownArrow") -> 16#02193; ++entity("ShortLeftArrow") -> 16#02190; ++entity("ShortRightArrow") -> 16#02192; ++entity("ShortUpArrow") -> 16#02191; ++entity("Sigma") -> 16#003A3; ++entity("SmallCircle") -> 16#02218; ++entity("Sopf") -> 16#1D54A; ++entity("Sqrt") -> 16#0221A; ++entity("Square") -> 16#025A1; ++entity("SquareIntersection") -> 16#02293; ++entity("SquareSubset") -> 16#0228F; ++entity("SquareSubsetEqual") -> 16#02291; ++entity("SquareSuperset") -> 16#02290; ++entity("SquareSupersetEqual") -> 16#02292; ++entity("SquareUnion") -> 16#02294; ++entity("Sscr") -> 16#1D4AE; ++entity("Star") -> 16#022C6; ++entity("Sub") -> 16#022D0; ++entity("Subset") -> 16#022D0; ++entity("SubsetEqual") -> 16#02286; ++entity("Succeeds") -> 16#0227B; ++entity("SucceedsEqual") -> 16#02AB0; ++entity("SucceedsSlantEqual") -> 16#0227D; ++entity("SucceedsTilde") -> 16#0227F; ++entity("SuchThat") -> 16#0220B; ++entity("Sum") -> 16#02211; ++entity("Sup") -> 16#022D1; ++entity("Superset") -> 16#02283; ++entity("SupersetEqual") -> 16#02287; ++entity("Supset") -> 16#022D1; ++entity("THORN") -> 16#000DE; ++entity("TRADE") -> 16#02122; ++entity("TSHcy") -> 16#0040B; ++entity("TScy") -> 16#00426; ++entity("Tab") -> 16#00009; ++entity("Tau") -> 16#003A4; ++entity("Tcaron") -> 16#00164; ++entity("Tcedil") -> 16#00162; ++entity("Tcy") -> 16#00422; ++entity("Tfr") -> 16#1D517; ++entity("Therefore") -> 16#02234; ++entity("Theta") -> 16#00398; ++entity("ThickSpace") -> [16#0205F, 16#0200A]; ++entity("ThinSpace") -> 16#02009; ++entity("Tilde") -> 16#0223C; ++entity("TildeEqual") -> 16#02243; ++entity("TildeFullEqual") -> 16#02245; ++entity("TildeTilde") -> 16#02248; ++entity("Topf") -> 16#1D54B; ++entity("TripleDot") -> 16#020DB; ++entity("Tscr") -> 16#1D4AF; ++entity("Tstrok") -> 16#00166; ++entity("Uacute") -> 16#000DA; ++entity("Uarr") -> 16#0219F; ++entity("Uarrocir") -> 16#02949; ++entity("Ubrcy") -> 16#0040E; ++entity("Ubreve") -> 16#0016C; ++entity("Ucirc") -> 16#000DB; ++entity("Ucy") -> 16#00423; ++entity("Udblac") -> 16#00170; ++entity("Ufr") -> 16#1D518; ++entity("Ugrave") -> 16#000D9; ++entity("Umacr") -> 16#0016A; ++entity("UnderBar") -> 16#0005F; ++entity("UnderBrace") -> 16#023DF; ++entity("UnderBracket") -> 16#023B5; ++entity("UnderParenthesis") -> 16#023DD; ++entity("Union") -> 16#022C3; ++entity("UnionPlus") -> 16#0228E; ++entity("Uogon") -> 16#00172; ++entity("Uopf") -> 16#1D54C; ++entity("UpArrow") -> 16#02191; ++entity("UpArrowBar") -> 16#02912; ++entity("UpArrowDownArrow") -> 16#021C5; ++entity("UpDownArrow") -> 16#02195; ++entity("UpEquilibrium") -> 16#0296E; ++entity("UpTee") -> 16#022A5; ++entity("UpTeeArrow") -> 16#021A5; ++entity("Uparrow") -> 16#021D1; ++entity("Updownarrow") -> 16#021D5; ++entity("UpperLeftArrow") -> 16#02196; ++entity("UpperRightArrow") -> 16#02197; ++entity("Upsi") -> 16#003D2; ++entity("Upsilon") -> 16#003A5; ++entity("Uring") -> 16#0016E; ++entity("Uscr") -> 16#1D4B0; ++entity("Utilde") -> 16#00168; ++entity("Uuml") -> 16#000DC; ++entity("VDash") -> 16#022AB; ++entity("Vbar") -> 16#02AEB; ++entity("Vcy") -> 16#00412; ++entity("Vdash") -> 16#022A9; ++entity("Vdashl") -> 16#02AE6; ++entity("Vee") -> 16#022C1; ++entity("Verbar") -> 16#02016; ++entity("Vert") -> 16#02016; ++entity("VerticalBar") -> 16#02223; ++entity("VerticalLine") -> 16#0007C; ++entity("VerticalSeparator") -> 16#02758; ++entity("VerticalTilde") -> 16#02240; ++entity("VeryThinSpace") -> 16#0200A; ++entity("Vfr") -> 16#1D519; ++entity("Vopf") -> 16#1D54D; ++entity("Vscr") -> 16#1D4B1; ++entity("Vvdash") -> 16#022AA; ++entity("Wcirc") -> 16#00174; ++entity("Wedge") -> 16#022C0; ++entity("Wfr") -> 16#1D51A; ++entity("Wopf") -> 16#1D54E; ++entity("Wscr") -> 16#1D4B2; ++entity("Xfr") -> 16#1D51B; ++entity("Xi") -> 16#0039E; ++entity("Xopf") -> 16#1D54F; ++entity("Xscr") -> 16#1D4B3; ++entity("YAcy") -> 16#0042F; ++entity("YIcy") -> 16#00407; ++entity("YUcy") -> 16#0042E; ++entity("Yacute") -> 16#000DD; ++entity("Ycirc") -> 16#00176; ++entity("Ycy") -> 16#0042B; ++entity("Yfr") -> 16#1D51C; ++entity("Yopf") -> 16#1D550; ++entity("Yscr") -> 16#1D4B4; ++entity("Yuml") -> 16#00178; ++entity("ZHcy") -> 16#00416; ++entity("Zacute") -> 16#00179; ++entity("Zcaron") -> 16#0017D; ++entity("Zcy") -> 16#00417; ++entity("Zdot") -> 16#0017B; ++entity("ZeroWidthSpace") -> 16#0200B; ++entity("Zeta") -> 16#00396; ++entity("Zfr") -> 16#02128; ++entity("Zopf") -> 16#02124; ++entity("Zscr") -> 16#1D4B5; ++entity("aacute") -> 16#000E1; ++entity("abreve") -> 16#00103; ++entity("ac") -> 16#0223E; ++entity("acE") -> [16#0223E, 16#00333]; ++entity("acd") -> 16#0223F; ++entity("acirc") -> 16#000E2; ++entity("acute") -> 16#000B4; ++entity("acy") -> 16#00430; ++entity("aelig") -> 16#000E6; ++entity("af") -> 16#02061; ++entity("afr") -> 16#1D51E; ++entity("agrave") -> 16#000E0; ++entity("alefsym") -> 16#02135; ++entity("aleph") -> 16#02135; ++entity("alpha") -> 16#003B1; ++entity("amacr") -> 16#00101; ++entity("amalg") -> 16#02A3F; ++entity("amp") -> 16#00026; ++entity("and") -> 16#02227; ++entity("andand") -> 16#02A55; ++entity("andd") -> 16#02A5C; ++entity("andslope") -> 16#02A58; ++entity("andv") -> 16#02A5A; ++entity("ang") -> 16#02220; ++entity("ange") -> 16#029A4; ++entity("angle") -> 16#02220; ++entity("angmsd") -> 16#02221; ++entity("angmsdaa") -> 16#029A8; ++entity("angmsdab") -> 16#029A9; ++entity("angmsdac") -> 16#029AA; ++entity("angmsdad") -> 16#029AB; ++entity("angmsdae") -> 16#029AC; ++entity("angmsdaf") -> 16#029AD; ++entity("angmsdag") -> 16#029AE; ++entity("angmsdah") -> 16#029AF; ++entity("angrt") -> 16#0221F; ++entity("angrtvb") -> 16#022BE; ++entity("angrtvbd") -> 16#0299D; ++entity("angsph") -> 16#02222; ++entity("angst") -> 16#000C5; ++entity("angzarr") -> 16#0237C; ++entity("aogon") -> 16#00105; ++entity("aopf") -> 16#1D552; ++entity("ap") -> 16#02248; ++entity("apE") -> 16#02A70; ++entity("apacir") -> 16#02A6F; ++entity("ape") -> 16#0224A; ++entity("apid") -> 16#0224B; ++entity("apos") -> 16#00027; ++entity("approx") -> 16#02248; ++entity("approxeq") -> 16#0224A; ++entity("aring") -> 16#000E5; ++entity("ascr") -> 16#1D4B6; ++entity("ast") -> 16#0002A; ++entity("asymp") -> 16#02248; ++entity("asympeq") -> 16#0224D; ++entity("atilde") -> 16#000E3; ++entity("auml") -> 16#000E4; ++entity("awconint") -> 16#02233; ++entity("awint") -> 16#02A11; ++entity("bNot") -> 16#02AED; ++entity("backcong") -> 16#0224C; ++entity("backepsilon") -> 16#003F6; ++entity("backprime") -> 16#02035; ++entity("backsim") -> 16#0223D; ++entity("backsimeq") -> 16#022CD; ++entity("barvee") -> 16#022BD; ++entity("barwed") -> 16#02305; ++entity("barwedge") -> 16#02305; ++entity("bbrk") -> 16#023B5; ++entity("bbrktbrk") -> 16#023B6; ++entity("bcong") -> 16#0224C; ++entity("bcy") -> 16#00431; ++entity("bdquo") -> 16#0201E; ++entity("becaus") -> 16#02235; ++entity("because") -> 16#02235; ++entity("bemptyv") -> 16#029B0; ++entity("bepsi") -> 16#003F6; ++entity("bernou") -> 16#0212C; ++entity("beta") -> 16#003B2; ++entity("beth") -> 16#02136; ++entity("between") -> 16#0226C; ++entity("bfr") -> 16#1D51F; ++entity("bigcap") -> 16#022C2; ++entity("bigcirc") -> 16#025EF; ++entity("bigcup") -> 16#022C3; ++entity("bigodot") -> 16#02A00; ++entity("bigoplus") -> 16#02A01; ++entity("bigotimes") -> 16#02A02; ++entity("bigsqcup") -> 16#02A06; ++entity("bigstar") -> 16#02605; ++entity("bigtriangledown") -> 16#025BD; ++entity("bigtriangleup") -> 16#025B3; ++entity("biguplus") -> 16#02A04; ++entity("bigvee") -> 16#022C1; ++entity("bigwedge") -> 16#022C0; ++entity("bkarow") -> 16#0290D; ++entity("blacklozenge") -> 16#029EB; ++entity("blacksquare") -> 16#025AA; ++entity("blacktriangle") -> 16#025B4; ++entity("blacktriangledown") -> 16#025BE; ++entity("blacktriangleleft") -> 16#025C2; ++entity("blacktriangleright") -> 16#025B8; ++entity("blank") -> 16#02423; ++entity("blk12") -> 16#02592; ++entity("blk14") -> 16#02591; ++entity("blk34") -> 16#02593; ++entity("block") -> 16#02588; ++entity("bne") -> [16#0003D, 16#020E5]; ++entity("bnequiv") -> [16#02261, 16#020E5]; ++entity("bnot") -> 16#02310; ++entity("bopf") -> 16#1D553; ++entity("bot") -> 16#022A5; ++entity("bottom") -> 16#022A5; ++entity("bowtie") -> 16#022C8; ++entity("boxDL") -> 16#02557; ++entity("boxDR") -> 16#02554; ++entity("boxDl") -> 16#02556; ++entity("boxDr") -> 16#02553; ++entity("boxH") -> 16#02550; ++entity("boxHD") -> 16#02566; ++entity("boxHU") -> 16#02569; ++entity("boxHd") -> 16#02564; ++entity("boxHu") -> 16#02567; ++entity("boxUL") -> 16#0255D; ++entity("boxUR") -> 16#0255A; ++entity("boxUl") -> 16#0255C; ++entity("boxUr") -> 16#02559; ++entity("boxV") -> 16#02551; ++entity("boxVH") -> 16#0256C; ++entity("boxVL") -> 16#02563; ++entity("boxVR") -> 16#02560; ++entity("boxVh") -> 16#0256B; ++entity("boxVl") -> 16#02562; ++entity("boxVr") -> 16#0255F; ++entity("boxbox") -> 16#029C9; ++entity("boxdL") -> 16#02555; ++entity("boxdR") -> 16#02552; ++entity("boxdl") -> 16#02510; ++entity("boxdr") -> 16#0250C; ++entity("boxh") -> 16#02500; ++entity("boxhD") -> 16#02565; ++entity("boxhU") -> 16#02568; ++entity("boxhd") -> 16#0252C; ++entity("boxhu") -> 16#02534; ++entity("boxminus") -> 16#0229F; ++entity("boxplus") -> 16#0229E; ++entity("boxtimes") -> 16#022A0; ++entity("boxuL") -> 16#0255B; ++entity("boxuR") -> 16#02558; ++entity("boxul") -> 16#02518; ++entity("boxur") -> 16#02514; ++entity("boxv") -> 16#02502; ++entity("boxvH") -> 16#0256A; ++entity("boxvL") -> 16#02561; ++entity("boxvR") -> 16#0255E; ++entity("boxvh") -> 16#0253C; ++entity("boxvl") -> 16#02524; ++entity("boxvr") -> 16#0251C; ++entity("bprime") -> 16#02035; ++entity("breve") -> 16#002D8; ++entity("brvbar") -> 16#000A6; ++entity("bscr") -> 16#1D4B7; ++entity("bsemi") -> 16#0204F; ++entity("bsim") -> 16#0223D; ++entity("bsime") -> 16#022CD; ++entity("bsol") -> 16#0005C; ++entity("bsolb") -> 16#029C5; ++entity("bsolhsub") -> 16#027C8; ++entity("bull") -> 16#02022; ++entity("bullet") -> 16#02022; ++entity("bump") -> 16#0224E; ++entity("bumpE") -> 16#02AAE; ++entity("bumpe") -> 16#0224F; ++entity("bumpeq") -> 16#0224F; ++entity("cacute") -> 16#00107; ++entity("cap") -> 16#02229; ++entity("capand") -> 16#02A44; ++entity("capbrcup") -> 16#02A49; ++entity("capcap") -> 16#02A4B; ++entity("capcup") -> 16#02A47; ++entity("capdot") -> 16#02A40; ++entity("caps") -> [16#02229, 16#0FE00]; ++entity("caret") -> 16#02041; ++entity("caron") -> 16#002C7; ++entity("ccaps") -> 16#02A4D; ++entity("ccaron") -> 16#0010D; ++entity("ccedil") -> 16#000E7; ++entity("ccirc") -> 16#00109; ++entity("ccups") -> 16#02A4C; ++entity("ccupssm") -> 16#02A50; ++entity("cdot") -> 16#0010B; ++entity("cedil") -> 16#000B8; ++entity("cemptyv") -> 16#029B2; ++entity("cent") -> 16#000A2; ++entity("centerdot") -> 16#000B7; ++entity("cfr") -> 16#1D520; ++entity("chcy") -> 16#00447; ++entity("check") -> 16#02713; ++entity("checkmark") -> 16#02713; ++entity("chi") -> 16#003C7; ++entity("cir") -> 16#025CB; ++entity("cirE") -> 16#029C3; ++entity("circ") -> 16#002C6; ++entity("circeq") -> 16#02257; ++entity("circlearrowleft") -> 16#021BA; ++entity("circlearrowright") -> 16#021BB; ++entity("circledR") -> 16#000AE; ++entity("circledS") -> 16#024C8; ++entity("circledast") -> 16#0229B; ++entity("circledcirc") -> 16#0229A; ++entity("circleddash") -> 16#0229D; ++entity("cire") -> 16#02257; ++entity("cirfnint") -> 16#02A10; ++entity("cirmid") -> 16#02AEF; ++entity("cirscir") -> 16#029C2; ++entity("clubs") -> 16#02663; ++entity("clubsuit") -> 16#02663; ++entity("colon") -> 16#0003A; ++entity("colone") -> 16#02254; ++entity("coloneq") -> 16#02254; ++entity("comma") -> 16#0002C; ++entity("commat") -> 16#00040; ++entity("comp") -> 16#02201; ++entity("compfn") -> 16#02218; ++entity("complement") -> 16#02201; ++entity("complexes") -> 16#02102; ++entity("cong") -> 16#02245; ++entity("congdot") -> 16#02A6D; ++entity("conint") -> 16#0222E; ++entity("copf") -> 16#1D554; ++entity("coprod") -> 16#02210; ++entity("copy") -> 16#000A9; ++entity("copysr") -> 16#02117; ++entity("crarr") -> 16#021B5; ++entity("cross") -> 16#02717; ++entity("cscr") -> 16#1D4B8; ++entity("csub") -> 16#02ACF; ++entity("csube") -> 16#02AD1; ++entity("csup") -> 16#02AD0; ++entity("csupe") -> 16#02AD2; ++entity("ctdot") -> 16#022EF; ++entity("cudarrl") -> 16#02938; ++entity("cudarrr") -> 16#02935; ++entity("cuepr") -> 16#022DE; ++entity("cuesc") -> 16#022DF; ++entity("cularr") -> 16#021B6; ++entity("cularrp") -> 16#0293D; ++entity("cup") -> 16#0222A; ++entity("cupbrcap") -> 16#02A48; ++entity("cupcap") -> 16#02A46; ++entity("cupcup") -> 16#02A4A; ++entity("cupdot") -> 16#0228D; ++entity("cupor") -> 16#02A45; ++entity("cups") -> [16#0222A, 16#0FE00]; ++entity("curarr") -> 16#021B7; ++entity("curarrm") -> 16#0293C; ++entity("curlyeqprec") -> 16#022DE; ++entity("curlyeqsucc") -> 16#022DF; ++entity("curlyvee") -> 16#022CE; ++entity("curlywedge") -> 16#022CF; ++entity("curren") -> 16#000A4; ++entity("curvearrowleft") -> 16#021B6; ++entity("curvearrowright") -> 16#021B7; ++entity("cuvee") -> 16#022CE; ++entity("cuwed") -> 16#022CF; ++entity("cwconint") -> 16#02232; ++entity("cwint") -> 16#02231; ++entity("cylcty") -> 16#0232D; ++entity("dArr") -> 16#021D3; ++entity("dHar") -> 16#02965; ++entity("dagger") -> 16#02020; ++entity("daleth") -> 16#02138; ++entity("darr") -> 16#02193; ++entity("dash") -> 16#02010; ++entity("dashv") -> 16#022A3; ++entity("dbkarow") -> 16#0290F; ++entity("dblac") -> 16#002DD; ++entity("dcaron") -> 16#0010F; ++entity("dcy") -> 16#00434; ++entity("dd") -> 16#02146; ++entity("ddagger") -> 16#02021; ++entity("ddarr") -> 16#021CA; ++entity("ddotseq") -> 16#02A77; ++entity("deg") -> 16#000B0; ++entity("delta") -> 16#003B4; ++entity("demptyv") -> 16#029B1; ++entity("dfisht") -> 16#0297F; ++entity("dfr") -> 16#1D521; ++entity("dharl") -> 16#021C3; ++entity("dharr") -> 16#021C2; ++entity("diam") -> 16#022C4; ++entity("diamond") -> 16#022C4; ++entity("diamondsuit") -> 16#02666; ++entity("diams") -> 16#02666; ++entity("die") -> 16#000A8; ++entity("digamma") -> 16#003DD; ++entity("disin") -> 16#022F2; ++entity("div") -> 16#000F7; ++entity("divide") -> 16#000F7; ++entity("divideontimes") -> 16#022C7; ++entity("divonx") -> 16#022C7; ++entity("djcy") -> 16#00452; ++entity("dlcorn") -> 16#0231E; ++entity("dlcrop") -> 16#0230D; ++entity("dollar") -> 16#00024; ++entity("dopf") -> 16#1D555; ++entity("dot") -> 16#002D9; ++entity("doteq") -> 16#02250; ++entity("doteqdot") -> 16#02251; ++entity("dotminus") -> 16#02238; ++entity("dotplus") -> 16#02214; ++entity("dotsquare") -> 16#022A1; ++entity("doublebarwedge") -> 16#02306; ++entity("downarrow") -> 16#02193; ++entity("downdownarrows") -> 16#021CA; ++entity("downharpoonleft") -> 16#021C3; ++entity("downharpoonright") -> 16#021C2; ++entity("drbkarow") -> 16#02910; ++entity("drcorn") -> 16#0231F; ++entity("drcrop") -> 16#0230C; ++entity("dscr") -> 16#1D4B9; ++entity("dscy") -> 16#00455; ++entity("dsol") -> 16#029F6; ++entity("dstrok") -> 16#00111; ++entity("dtdot") -> 16#022F1; ++entity("dtri") -> 16#025BF; ++entity("dtrif") -> 16#025BE; ++entity("duarr") -> 16#021F5; ++entity("duhar") -> 16#0296F; ++entity("dwangle") -> 16#029A6; ++entity("dzcy") -> 16#0045F; ++entity("dzigrarr") -> 16#027FF; ++entity("eDDot") -> 16#02A77; ++entity("eDot") -> 16#02251; ++entity("eacute") -> 16#000E9; ++entity("easter") -> 16#02A6E; ++entity("ecaron") -> 16#0011B; ++entity("ecir") -> 16#02256; ++entity("ecirc") -> 16#000EA; ++entity("ecolon") -> 16#02255; ++entity("ecy") -> 16#0044D; ++entity("edot") -> 16#00117; ++entity("ee") -> 16#02147; ++entity("efDot") -> 16#02252; ++entity("efr") -> 16#1D522; ++entity("eg") -> 16#02A9A; ++entity("egrave") -> 16#000E8; ++entity("egs") -> 16#02A96; ++entity("egsdot") -> 16#02A98; ++entity("el") -> 16#02A99; ++entity("elinters") -> 16#023E7; ++entity("ell") -> 16#02113; ++entity("els") -> 16#02A95; ++entity("elsdot") -> 16#02A97; ++entity("emacr") -> 16#00113; ++entity("empty") -> 16#02205; ++entity("emptyset") -> 16#02205; ++entity("emptyv") -> 16#02205; ++entity("emsp") -> 16#02003; ++entity("emsp13") -> 16#02004; ++entity("emsp14") -> 16#02005; ++entity("eng") -> 16#0014B; ++entity("ensp") -> 16#02002; ++entity("eogon") -> 16#00119; ++entity("eopf") -> 16#1D556; ++entity("epar") -> 16#022D5; ++entity("eparsl") -> 16#029E3; ++entity("eplus") -> 16#02A71; ++entity("epsi") -> 16#003B5; ++entity("epsilon") -> 16#003B5; ++entity("epsiv") -> 16#003F5; ++entity("eqcirc") -> 16#02256; ++entity("eqcolon") -> 16#02255; ++entity("eqsim") -> 16#02242; ++entity("eqslantgtr") -> 16#02A96; ++entity("eqslantless") -> 16#02A95; ++entity("equals") -> 16#0003D; ++entity("equest") -> 16#0225F; ++entity("equiv") -> 16#02261; ++entity("equivDD") -> 16#02A78; ++entity("eqvparsl") -> 16#029E5; ++entity("erDot") -> 16#02253; ++entity("erarr") -> 16#02971; ++entity("escr") -> 16#0212F; ++entity("esdot") -> 16#02250; ++entity("esim") -> 16#02242; ++entity("eta") -> 16#003B7; ++entity("eth") -> 16#000F0; ++entity("euml") -> 16#000EB; ++entity("euro") -> 16#020AC; ++entity("excl") -> 16#00021; ++entity("exist") -> 16#02203; ++entity("expectation") -> 16#02130; ++entity("exponentiale") -> 16#02147; ++entity("fallingdotseq") -> 16#02252; ++entity("fcy") -> 16#00444; ++entity("female") -> 16#02640; ++entity("ffilig") -> 16#0FB03; ++entity("fflig") -> 16#0FB00; ++entity("ffllig") -> 16#0FB04; ++entity("ffr") -> 16#1D523; ++entity("filig") -> 16#0FB01; ++entity("fjlig") -> [16#00066, 16#0006A]; ++entity("flat") -> 16#0266D; ++entity("fllig") -> 16#0FB02; ++entity("fltns") -> 16#025B1; ++entity("fnof") -> 16#00192; ++entity("fopf") -> 16#1D557; ++entity("forall") -> 16#02200; ++entity("fork") -> 16#022D4; ++entity("forkv") -> 16#02AD9; ++entity("fpartint") -> 16#02A0D; ++entity("frac12") -> 16#000BD; ++entity("frac13") -> 16#02153; ++entity("frac14") -> 16#000BC; ++entity("frac15") -> 16#02155; ++entity("frac16") -> 16#02159; ++entity("frac18") -> 16#0215B; ++entity("frac23") -> 16#02154; ++entity("frac25") -> 16#02156; ++entity("frac34") -> 16#000BE; ++entity("frac35") -> 16#02157; ++entity("frac38") -> 16#0215C; ++entity("frac45") -> 16#02158; ++entity("frac56") -> 16#0215A; ++entity("frac58") -> 16#0215D; ++entity("frac78") -> 16#0215E; ++entity("frasl") -> 16#02044; ++entity("frown") -> 16#02322; ++entity("fscr") -> 16#1D4BB; ++entity("gE") -> 16#02267; ++entity("gEl") -> 16#02A8C; ++entity("gacute") -> 16#001F5; ++entity("gamma") -> 16#003B3; ++entity("gammad") -> 16#003DD; ++entity("gap") -> 16#02A86; ++entity("gbreve") -> 16#0011F; ++entity("gcirc") -> 16#0011D; ++entity("gcy") -> 16#00433; ++entity("gdot") -> 16#00121; ++entity("ge") -> 16#02265; ++entity("gel") -> 16#022DB; ++entity("geq") -> 16#02265; ++entity("geqq") -> 16#02267; ++entity("geqslant") -> 16#02A7E; ++entity("ges") -> 16#02A7E; ++entity("gescc") -> 16#02AA9; ++entity("gesdot") -> 16#02A80; ++entity("gesdoto") -> 16#02A82; ++entity("gesdotol") -> 16#02A84; ++entity("gesl") -> [16#022DB, 16#0FE00]; ++entity("gesles") -> 16#02A94; ++entity("gfr") -> 16#1D524; ++entity("gg") -> 16#0226B; ++entity("ggg") -> 16#022D9; ++entity("gimel") -> 16#02137; ++entity("gjcy") -> 16#00453; ++entity("gl") -> 16#02277; ++entity("glE") -> 16#02A92; ++entity("gla") -> 16#02AA5; ++entity("glj") -> 16#02AA4; ++entity("gnE") -> 16#02269; ++entity("gnap") -> 16#02A8A; ++entity("gnapprox") -> 16#02A8A; ++entity("gne") -> 16#02A88; ++entity("gneq") -> 16#02A88; ++entity("gneqq") -> 16#02269; ++entity("gnsim") -> 16#022E7; ++entity("gopf") -> 16#1D558; ++entity("grave") -> 16#00060; ++entity("gscr") -> 16#0210A; ++entity("gsim") -> 16#02273; ++entity("gsime") -> 16#02A8E; ++entity("gsiml") -> 16#02A90; ++entity("gt") -> 16#0003E; ++entity("gtcc") -> 16#02AA7; ++entity("gtcir") -> 16#02A7A; ++entity("gtdot") -> 16#022D7; ++entity("gtlPar") -> 16#02995; ++entity("gtquest") -> 16#02A7C; ++entity("gtrapprox") -> 16#02A86; ++entity("gtrarr") -> 16#02978; ++entity("gtrdot") -> 16#022D7; ++entity("gtreqless") -> 16#022DB; ++entity("gtreqqless") -> 16#02A8C; ++entity("gtrless") -> 16#02277; ++entity("gtrsim") -> 16#02273; ++entity("gvertneqq") -> [16#02269, 16#0FE00]; ++entity("gvnE") -> [16#02269, 16#0FE00]; ++entity("hArr") -> 16#021D4; ++entity("hairsp") -> 16#0200A; ++entity("half") -> 16#000BD; ++entity("hamilt") -> 16#0210B; ++entity("hardcy") -> 16#0044A; ++entity("harr") -> 16#02194; ++entity("harrcir") -> 16#02948; ++entity("harrw") -> 16#021AD; ++entity("hbar") -> 16#0210F; ++entity("hcirc") -> 16#00125; ++entity("hearts") -> 16#02665; ++entity("heartsuit") -> 16#02665; ++entity("hellip") -> 16#02026; ++entity("hercon") -> 16#022B9; ++entity("hfr") -> 16#1D525; ++entity("hksearow") -> 16#02925; ++entity("hkswarow") -> 16#02926; ++entity("hoarr") -> 16#021FF; ++entity("homtht") -> 16#0223B; ++entity("hookleftarrow") -> 16#021A9; ++entity("hookrightarrow") -> 16#021AA; ++entity("hopf") -> 16#1D559; ++entity("horbar") -> 16#02015; ++entity("hscr") -> 16#1D4BD; ++entity("hslash") -> 16#0210F; ++entity("hstrok") -> 16#00127; ++entity("hybull") -> 16#02043; ++entity("hyphen") -> 16#02010; ++entity("iacute") -> 16#000ED; ++entity("ic") -> 16#02063; ++entity("icirc") -> 16#000EE; ++entity("icy") -> 16#00438; ++entity("iecy") -> 16#00435; ++entity("iexcl") -> 16#000A1; ++entity("iff") -> 16#021D4; ++entity("ifr") -> 16#1D526; ++entity("igrave") -> 16#000EC; ++entity("ii") -> 16#02148; ++entity("iiiint") -> 16#02A0C; ++entity("iiint") -> 16#0222D; ++entity("iinfin") -> 16#029DC; ++entity("iiota") -> 16#02129; ++entity("ijlig") -> 16#00133; ++entity("imacr") -> 16#0012B; ++entity("image") -> 16#02111; ++entity("imagline") -> 16#02110; ++entity("imagpart") -> 16#02111; ++entity("imath") -> 16#00131; ++entity("imof") -> 16#022B7; ++entity("imped") -> 16#001B5; ++entity("in") -> 16#02208; ++entity("incare") -> 16#02105; ++entity("infin") -> 16#0221E; ++entity("infintie") -> 16#029DD; ++entity("inodot") -> 16#00131; ++entity("int") -> 16#0222B; ++entity("intcal") -> 16#022BA; ++entity("integers") -> 16#02124; ++entity("intercal") -> 16#022BA; ++entity("intlarhk") -> 16#02A17; ++entity("intprod") -> 16#02A3C; ++entity("iocy") -> 16#00451; ++entity("iogon") -> 16#0012F; ++entity("iopf") -> 16#1D55A; ++entity("iota") -> 16#003B9; ++entity("iprod") -> 16#02A3C; ++entity("iquest") -> 16#000BF; ++entity("iscr") -> 16#1D4BE; ++entity("isin") -> 16#02208; ++entity("isinE") -> 16#022F9; ++entity("isindot") -> 16#022F5; ++entity("isins") -> 16#022F4; ++entity("isinsv") -> 16#022F3; ++entity("isinv") -> 16#02208; ++entity("it") -> 16#02062; ++entity("itilde") -> 16#00129; ++entity("iukcy") -> 16#00456; ++entity("iuml") -> 16#000EF; ++entity("jcirc") -> 16#00135; ++entity("jcy") -> 16#00439; ++entity("jfr") -> 16#1D527; ++entity("jmath") -> 16#00237; ++entity("jopf") -> 16#1D55B; ++entity("jscr") -> 16#1D4BF; ++entity("jsercy") -> 16#00458; ++entity("jukcy") -> 16#00454; ++entity("kappa") -> 16#003BA; ++entity("kappav") -> 16#003F0; ++entity("kcedil") -> 16#00137; ++entity("kcy") -> 16#0043A; ++entity("kfr") -> 16#1D528; ++entity("kgreen") -> 16#00138; ++entity("khcy") -> 16#00445; ++entity("kjcy") -> 16#0045C; ++entity("kopf") -> 16#1D55C; ++entity("kscr") -> 16#1D4C0; ++entity("lAarr") -> 16#021DA; ++entity("lArr") -> 16#021D0; ++entity("lAtail") -> 16#0291B; ++entity("lBarr") -> 16#0290E; ++entity("lE") -> 16#02266; ++entity("lEg") -> 16#02A8B; ++entity("lHar") -> 16#02962; ++entity("lacute") -> 16#0013A; ++entity("laemptyv") -> 16#029B4; ++entity("lagran") -> 16#02112; ++entity("lambda") -> 16#003BB; ++entity("lang") -> 16#027E8; ++entity("langd") -> 16#02991; ++entity("langle") -> 16#027E8; ++entity("lap") -> 16#02A85; ++entity("laquo") -> 16#000AB; ++entity("larr") -> 16#02190; ++entity("larrb") -> 16#021E4; ++entity("larrbfs") -> 16#0291F; ++entity("larrfs") -> 16#0291D; ++entity("larrhk") -> 16#021A9; ++entity("larrlp") -> 16#021AB; ++entity("larrpl") -> 16#02939; ++entity("larrsim") -> 16#02973; ++entity("larrtl") -> 16#021A2; ++entity("lat") -> 16#02AAB; ++entity("latail") -> 16#02919; ++entity("late") -> 16#02AAD; ++entity("lates") -> [16#02AAD, 16#0FE00]; ++entity("lbarr") -> 16#0290C; ++entity("lbbrk") -> 16#02772; ++entity("lbrace") -> 16#0007B; ++entity("lbrack") -> 16#0005B; ++entity("lbrke") -> 16#0298B; ++entity("lbrksld") -> 16#0298F; ++entity("lbrkslu") -> 16#0298D; ++entity("lcaron") -> 16#0013E; ++entity("lcedil") -> 16#0013C; ++entity("lceil") -> 16#02308; ++entity("lcub") -> 16#0007B; ++entity("lcy") -> 16#0043B; ++entity("ldca") -> 16#02936; ++entity("ldquo") -> 16#0201C; ++entity("ldquor") -> 16#0201E; ++entity("ldrdhar") -> 16#02967; ++entity("ldrushar") -> 16#0294B; ++entity("ldsh") -> 16#021B2; ++entity("le") -> 16#02264; ++entity("leftarrow") -> 16#02190; ++entity("leftarrowtail") -> 16#021A2; ++entity("leftharpoondown") -> 16#021BD; ++entity("leftharpoonup") -> 16#021BC; ++entity("leftleftarrows") -> 16#021C7; ++entity("leftrightarrow") -> 16#02194; ++entity("leftrightarrows") -> 16#021C6; ++entity("leftrightharpoons") -> 16#021CB; ++entity("leftrightsquigarrow") -> 16#021AD; ++entity("leftthreetimes") -> 16#022CB; ++entity("leg") -> 16#022DA; ++entity("leq") -> 16#02264; ++entity("leqq") -> 16#02266; ++entity("leqslant") -> 16#02A7D; ++entity("les") -> 16#02A7D; ++entity("lescc") -> 16#02AA8; ++entity("lesdot") -> 16#02A7F; ++entity("lesdoto") -> 16#02A81; ++entity("lesdotor") -> 16#02A83; ++entity("lesg") -> [16#022DA, 16#0FE00]; ++entity("lesges") -> 16#02A93; ++entity("lessapprox") -> 16#02A85; ++entity("lessdot") -> 16#022D6; ++entity("lesseqgtr") -> 16#022DA; ++entity("lesseqqgtr") -> 16#02A8B; ++entity("lessgtr") -> 16#02276; ++entity("lesssim") -> 16#02272; ++entity("lfisht") -> 16#0297C; ++entity("lfloor") -> 16#0230A; ++entity("lfr") -> 16#1D529; ++entity("lg") -> 16#02276; ++entity("lgE") -> 16#02A91; ++entity("lhard") -> 16#021BD; ++entity("lharu") -> 16#021BC; ++entity("lharul") -> 16#0296A; ++entity("lhblk") -> 16#02584; ++entity("ljcy") -> 16#00459; ++entity("ll") -> 16#0226A; ++entity("llarr") -> 16#021C7; ++entity("llcorner") -> 16#0231E; ++entity("llhard") -> 16#0296B; ++entity("lltri") -> 16#025FA; ++entity("lmidot") -> 16#00140; ++entity("lmoust") -> 16#023B0; ++entity("lmoustache") -> 16#023B0; ++entity("lnE") -> 16#02268; ++entity("lnap") -> 16#02A89; ++entity("lnapprox") -> 16#02A89; ++entity("lne") -> 16#02A87; ++entity("lneq") -> 16#02A87; ++entity("lneqq") -> 16#02268; ++entity("lnsim") -> 16#022E6; ++entity("loang") -> 16#027EC; ++entity("loarr") -> 16#021FD; ++entity("lobrk") -> 16#027E6; ++entity("longleftarrow") -> 16#027F5; ++entity("longleftrightarrow") -> 16#027F7; ++entity("longmapsto") -> 16#027FC; ++entity("longrightarrow") -> 16#027F6; ++entity("looparrowleft") -> 16#021AB; ++entity("looparrowright") -> 16#021AC; ++entity("lopar") -> 16#02985; ++entity("lopf") -> 16#1D55D; ++entity("loplus") -> 16#02A2D; ++entity("lotimes") -> 16#02A34; ++entity("lowast") -> 16#02217; ++entity("lowbar") -> 16#0005F; ++entity("loz") -> 16#025CA; ++entity("lozenge") -> 16#025CA; ++entity("lozf") -> 16#029EB; ++entity("lpar") -> 16#00028; ++entity("lparlt") -> 16#02993; ++entity("lrarr") -> 16#021C6; ++entity("lrcorner") -> 16#0231F; ++entity("lrhar") -> 16#021CB; ++entity("lrhard") -> 16#0296D; ++entity("lrm") -> 16#0200E; ++entity("lrtri") -> 16#022BF; ++entity("lsaquo") -> 16#02039; ++entity("lscr") -> 16#1D4C1; ++entity("lsh") -> 16#021B0; ++entity("lsim") -> 16#02272; ++entity("lsime") -> 16#02A8D; ++entity("lsimg") -> 16#02A8F; ++entity("lsqb") -> 16#0005B; ++entity("lsquo") -> 16#02018; ++entity("lsquor") -> 16#0201A; ++entity("lstrok") -> 16#00142; ++entity("lt") -> 16#0003C; ++entity("ltcc") -> 16#02AA6; ++entity("ltcir") -> 16#02A79; ++entity("ltdot") -> 16#022D6; ++entity("lthree") -> 16#022CB; ++entity("ltimes") -> 16#022C9; ++entity("ltlarr") -> 16#02976; ++entity("ltquest") -> 16#02A7B; ++entity("ltrPar") -> 16#02996; ++entity("ltri") -> 16#025C3; ++entity("ltrie") -> 16#022B4; ++entity("ltrif") -> 16#025C2; ++entity("lurdshar") -> 16#0294A; ++entity("luruhar") -> 16#02966; ++entity("lvertneqq") -> [16#02268, 16#0FE00]; ++entity("lvnE") -> [16#02268, 16#0FE00]; ++entity("mDDot") -> 16#0223A; ++entity("macr") -> 16#000AF; ++entity("male") -> 16#02642; ++entity("malt") -> 16#02720; ++entity("maltese") -> 16#02720; ++entity("map") -> 16#021A6; ++entity("mapsto") -> 16#021A6; ++entity("mapstodown") -> 16#021A7; ++entity("mapstoleft") -> 16#021A4; ++entity("mapstoup") -> 16#021A5; ++entity("marker") -> 16#025AE; ++entity("mcomma") -> 16#02A29; ++entity("mcy") -> 16#0043C; ++entity("mdash") -> 16#02014; ++entity("measuredangle") -> 16#02221; ++entity("mfr") -> 16#1D52A; ++entity("mho") -> 16#02127; ++entity("micro") -> 16#000B5; ++entity("mid") -> 16#02223; ++entity("midast") -> 16#0002A; ++entity("midcir") -> 16#02AF0; ++entity("middot") -> 16#000B7; ++entity("minus") -> 16#02212; ++entity("minusb") -> 16#0229F; ++entity("minusd") -> 16#02238; ++entity("minusdu") -> 16#02A2A; ++entity("mlcp") -> 16#02ADB; ++entity("mldr") -> 16#02026; ++entity("mnplus") -> 16#02213; ++entity("models") -> 16#022A7; ++entity("mopf") -> 16#1D55E; ++entity("mp") -> 16#02213; ++entity("mscr") -> 16#1D4C2; ++entity("mstpos") -> 16#0223E; ++entity("mu") -> 16#003BC; ++entity("multimap") -> 16#022B8; ++entity("mumap") -> 16#022B8; ++entity("nGg") -> [16#022D9, 16#00338]; ++entity("nGt") -> [16#0226B, 16#020D2]; ++entity("nGtv") -> [16#0226B, 16#00338]; ++entity("nLeftarrow") -> 16#021CD; ++entity("nLeftrightarrow") -> 16#021CE; ++entity("nLl") -> [16#022D8, 16#00338]; ++entity("nLt") -> [16#0226A, 16#020D2]; ++entity("nLtv") -> [16#0226A, 16#00338]; ++entity("nRightarrow") -> 16#021CF; ++entity("nVDash") -> 16#022AF; ++entity("nVdash") -> 16#022AE; ++entity("nabla") -> 16#02207; ++entity("nacute") -> 16#00144; ++entity("nang") -> [16#02220, 16#020D2]; ++entity("nap") -> 16#02249; ++entity("napE") -> [16#02A70, 16#00338]; ++entity("napid") -> [16#0224B, 16#00338]; ++entity("napos") -> 16#00149; ++entity("napprox") -> 16#02249; ++entity("natur") -> 16#0266E; ++entity("natural") -> 16#0266E; ++entity("naturals") -> 16#02115; ++entity("nbsp") -> 16#000A0; ++entity("nbump") -> [16#0224E, 16#00338]; ++entity("nbumpe") -> [16#0224F, 16#00338]; ++entity("ncap") -> 16#02A43; ++entity("ncaron") -> 16#00148; ++entity("ncedil") -> 16#00146; ++entity("ncong") -> 16#02247; ++entity("ncongdot") -> [16#02A6D, 16#00338]; ++entity("ncup") -> 16#02A42; ++entity("ncy") -> 16#0043D; ++entity("ndash") -> 16#02013; ++entity("ne") -> 16#02260; ++entity("neArr") -> 16#021D7; ++entity("nearhk") -> 16#02924; ++entity("nearr") -> 16#02197; ++entity("nearrow") -> 16#02197; ++entity("nedot") -> [16#02250, 16#00338]; ++entity("nequiv") -> 16#02262; ++entity("nesear") -> 16#02928; ++entity("nesim") -> [16#02242, 16#00338]; ++entity("nexist") -> 16#02204; ++entity("nexists") -> 16#02204; ++entity("nfr") -> 16#1D52B; ++entity("ngE") -> [16#02267, 16#00338]; ++entity("nge") -> 16#02271; ++entity("ngeq") -> 16#02271; ++entity("ngeqq") -> [16#02267, 16#00338]; ++entity("ngeqslant") -> [16#02A7E, 16#00338]; ++entity("nges") -> [16#02A7E, 16#00338]; ++entity("ngsim") -> 16#02275; ++entity("ngt") -> 16#0226F; ++entity("ngtr") -> 16#0226F; ++entity("nhArr") -> 16#021CE; ++entity("nharr") -> 16#021AE; ++entity("nhpar") -> 16#02AF2; ++entity("ni") -> 16#0220B; ++entity("nis") -> 16#022FC; ++entity("nisd") -> 16#022FA; ++entity("niv") -> 16#0220B; ++entity("njcy") -> 16#0045A; ++entity("nlArr") -> 16#021CD; ++entity("nlE") -> [16#02266, 16#00338]; ++entity("nlarr") -> 16#0219A; ++entity("nldr") -> 16#02025; ++entity("nle") -> 16#02270; ++entity("nleftarrow") -> 16#0219A; ++entity("nleftrightarrow") -> 16#021AE; ++entity("nleq") -> 16#02270; ++entity("nleqq") -> [16#02266, 16#00338]; ++entity("nleqslant") -> [16#02A7D, 16#00338]; ++entity("nles") -> [16#02A7D, 16#00338]; ++entity("nless") -> 16#0226E; ++entity("nlsim") -> 16#02274; ++entity("nlt") -> 16#0226E; ++entity("nltri") -> 16#022EA; ++entity("nltrie") -> 16#022EC; ++entity("nmid") -> 16#02224; ++entity("nopf") -> 16#1D55F; ++entity("not") -> 16#000AC; ++entity("notin") -> 16#02209; ++entity("notinE") -> [16#022F9, 16#00338]; ++entity("notindot") -> [16#022F5, 16#00338]; ++entity("notinva") -> 16#02209; ++entity("notinvb") -> 16#022F7; ++entity("notinvc") -> 16#022F6; ++entity("notni") -> 16#0220C; ++entity("notniva") -> 16#0220C; ++entity("notnivb") -> 16#022FE; ++entity("notnivc") -> 16#022FD; ++entity("npar") -> 16#02226; ++entity("nparallel") -> 16#02226; ++entity("nparsl") -> [16#02AFD, 16#020E5]; ++entity("npart") -> [16#02202, 16#00338]; ++entity("npolint") -> 16#02A14; ++entity("npr") -> 16#02280; ++entity("nprcue") -> 16#022E0; ++entity("npre") -> [16#02AAF, 16#00338]; ++entity("nprec") -> 16#02280; ++entity("npreceq") -> [16#02AAF, 16#00338]; ++entity("nrArr") -> 16#021CF; ++entity("nrarr") -> 16#0219B; ++entity("nrarrc") -> [16#02933, 16#00338]; ++entity("nrarrw") -> [16#0219D, 16#00338]; ++entity("nrightarrow") -> 16#0219B; ++entity("nrtri") -> 16#022EB; ++entity("nrtrie") -> 16#022ED; ++entity("nsc") -> 16#02281; ++entity("nsccue") -> 16#022E1; ++entity("nsce") -> [16#02AB0, 16#00338]; ++entity("nscr") -> 16#1D4C3; ++entity("nshortmid") -> 16#02224; ++entity("nshortparallel") -> 16#02226; ++entity("nsim") -> 16#02241; ++entity("nsime") -> 16#02244; ++entity("nsimeq") -> 16#02244; ++entity("nsmid") -> 16#02224; ++entity("nspar") -> 16#02226; ++entity("nsqsube") -> 16#022E2; ++entity("nsqsupe") -> 16#022E3; ++entity("nsub") -> 16#02284; ++entity("nsubE") -> [16#02AC5, 16#00338]; ++entity("nsube") -> 16#02288; ++entity("nsubset") -> [16#02282, 16#020D2]; ++entity("nsubseteq") -> 16#02288; ++entity("nsubseteqq") -> [16#02AC5, 16#00338]; ++entity("nsucc") -> 16#02281; ++entity("nsucceq") -> [16#02AB0, 16#00338]; ++entity("nsup") -> 16#02285; ++entity("nsupE") -> [16#02AC6, 16#00338]; ++entity("nsupe") -> 16#02289; ++entity("nsupset") -> [16#02283, 16#020D2]; ++entity("nsupseteq") -> 16#02289; ++entity("nsupseteqq") -> [16#02AC6, 16#00338]; ++entity("ntgl") -> 16#02279; ++entity("ntilde") -> 16#000F1; ++entity("ntlg") -> 16#02278; ++entity("ntriangleleft") -> 16#022EA; ++entity("ntrianglelefteq") -> 16#022EC; ++entity("ntriangleright") -> 16#022EB; ++entity("ntrianglerighteq") -> 16#022ED; ++entity("nu") -> 16#003BD; ++entity("num") -> 16#00023; ++entity("numero") -> 16#02116; ++entity("numsp") -> 16#02007; ++entity("nvDash") -> 16#022AD; ++entity("nvHarr") -> 16#02904; ++entity("nvap") -> [16#0224D, 16#020D2]; ++entity("nvdash") -> 16#022AC; ++entity("nvge") -> [16#02265, 16#020D2]; ++entity("nvgt") -> [16#0003E, 16#020D2]; ++entity("nvinfin") -> 16#029DE; ++entity("nvlArr") -> 16#02902; ++entity("nvle") -> [16#02264, 16#020D2]; ++entity("nvlt") -> [16#0003C, 16#020D2]; ++entity("nvltrie") -> [16#022B4, 16#020D2]; ++entity("nvrArr") -> 16#02903; ++entity("nvrtrie") -> [16#022B5, 16#020D2]; ++entity("nvsim") -> [16#0223C, 16#020D2]; ++entity("nwArr") -> 16#021D6; ++entity("nwarhk") -> 16#02923; ++entity("nwarr") -> 16#02196; ++entity("nwarrow") -> 16#02196; ++entity("nwnear") -> 16#02927; ++entity("oS") -> 16#024C8; ++entity("oacute") -> 16#000F3; ++entity("oast") -> 16#0229B; ++entity("ocir") -> 16#0229A; ++entity("ocirc") -> 16#000F4; ++entity("ocy") -> 16#0043E; ++entity("odash") -> 16#0229D; ++entity("odblac") -> 16#00151; ++entity("odiv") -> 16#02A38; ++entity("odot") -> 16#02299; ++entity("odsold") -> 16#029BC; ++entity("oelig") -> 16#00153; ++entity("ofcir") -> 16#029BF; ++entity("ofr") -> 16#1D52C; ++entity("ogon") -> 16#002DB; ++entity("ograve") -> 16#000F2; ++entity("ogt") -> 16#029C1; ++entity("ohbar") -> 16#029B5; ++entity("ohm") -> 16#003A9; ++entity("oint") -> 16#0222E; ++entity("olarr") -> 16#021BA; ++entity("olcir") -> 16#029BE; ++entity("olcross") -> 16#029BB; ++entity("oline") -> 16#0203E; ++entity("olt") -> 16#029C0; ++entity("omacr") -> 16#0014D; ++entity("omega") -> 16#003C9; ++entity("omicron") -> 16#003BF; ++entity("omid") -> 16#029B6; ++entity("ominus") -> 16#02296; ++entity("oopf") -> 16#1D560; ++entity("opar") -> 16#029B7; ++entity("operp") -> 16#029B9; ++entity("oplus") -> 16#02295; ++entity("or") -> 16#02228; ++entity("orarr") -> 16#021BB; ++entity("ord") -> 16#02A5D; ++entity("order") -> 16#02134; ++entity("orderof") -> 16#02134; ++entity("ordf") -> 16#000AA; ++entity("ordm") -> 16#000BA; ++entity("origof") -> 16#022B6; ++entity("oror") -> 16#02A56; ++entity("orslope") -> 16#02A57; ++entity("orv") -> 16#02A5B; ++entity("oscr") -> 16#02134; ++entity("oslash") -> 16#000F8; ++entity("osol") -> 16#02298; ++entity("otilde") -> 16#000F5; ++entity("otimes") -> 16#02297; ++entity("otimesas") -> 16#02A36; ++entity("ouml") -> 16#000F6; ++entity("ovbar") -> 16#0233D; ++entity("par") -> 16#02225; ++entity("para") -> 16#000B6; ++entity("parallel") -> 16#02225; ++entity("parsim") -> 16#02AF3; ++entity("parsl") -> 16#02AFD; ++entity("part") -> 16#02202; ++entity("pcy") -> 16#0043F; ++entity("percnt") -> 16#00025; ++entity("period") -> 16#0002E; ++entity("permil") -> 16#02030; ++entity("perp") -> 16#022A5; ++entity("pertenk") -> 16#02031; ++entity("pfr") -> 16#1D52D; ++entity("phi") -> 16#003C6; ++entity("phiv") -> 16#003D5; ++entity("phmmat") -> 16#02133; ++entity("phone") -> 16#0260E; ++entity("pi") -> 16#003C0; ++entity("pitchfork") -> 16#022D4; ++entity("piv") -> 16#003D6; ++entity("planck") -> 16#0210F; ++entity("planckh") -> 16#0210E; ++entity("plankv") -> 16#0210F; ++entity("plus") -> 16#0002B; ++entity("plusacir") -> 16#02A23; ++entity("plusb") -> 16#0229E; ++entity("pluscir") -> 16#02A22; ++entity("plusdo") -> 16#02214; ++entity("plusdu") -> 16#02A25; ++entity("pluse") -> 16#02A72; ++entity("plusmn") -> 16#000B1; ++entity("plussim") -> 16#02A26; ++entity("plustwo") -> 16#02A27; ++entity("pm") -> 16#000B1; ++entity("pointint") -> 16#02A15; ++entity("popf") -> 16#1D561; ++entity("pound") -> 16#000A3; ++entity("pr") -> 16#0227A; ++entity("prE") -> 16#02AB3; ++entity("prap") -> 16#02AB7; ++entity("prcue") -> 16#0227C; ++entity("pre") -> 16#02AAF; ++entity("prec") -> 16#0227A; ++entity("precapprox") -> 16#02AB7; ++entity("preccurlyeq") -> 16#0227C; ++entity("preceq") -> 16#02AAF; ++entity("precnapprox") -> 16#02AB9; ++entity("precneqq") -> 16#02AB5; ++entity("precnsim") -> 16#022E8; ++entity("precsim") -> 16#0227E; ++entity("prime") -> 16#02032; ++entity("primes") -> 16#02119; ++entity("prnE") -> 16#02AB5; ++entity("prnap") -> 16#02AB9; ++entity("prnsim") -> 16#022E8; ++entity("prod") -> 16#0220F; ++entity("profalar") -> 16#0232E; ++entity("profline") -> 16#02312; ++entity("profsurf") -> 16#02313; ++entity("prop") -> 16#0221D; ++entity("propto") -> 16#0221D; ++entity("prsim") -> 16#0227E; ++entity("prurel") -> 16#022B0; ++entity("pscr") -> 16#1D4C5; ++entity("psi") -> 16#003C8; ++entity("puncsp") -> 16#02008; ++entity("qfr") -> 16#1D52E; ++entity("qint") -> 16#02A0C; ++entity("qopf") -> 16#1D562; ++entity("qprime") -> 16#02057; ++entity("qscr") -> 16#1D4C6; ++entity("quaternions") -> 16#0210D; ++entity("quatint") -> 16#02A16; ++entity("quest") -> 16#0003F; ++entity("questeq") -> 16#0225F; ++entity("quot") -> 16#00022; ++entity("rAarr") -> 16#021DB; ++entity("rArr") -> 16#021D2; ++entity("rAtail") -> 16#0291C; ++entity("rBarr") -> 16#0290F; ++entity("rHar") -> 16#02964; ++entity("race") -> [16#0223D, 16#00331]; ++entity("racute") -> 16#00155; ++entity("radic") -> 16#0221A; ++entity("raemptyv") -> 16#029B3; ++entity("rang") -> 16#027E9; ++entity("rangd") -> 16#02992; ++entity("range") -> 16#029A5; ++entity("rangle") -> 16#027E9; ++entity("raquo") -> 16#000BB; ++entity("rarr") -> 16#02192; ++entity("rarrap") -> 16#02975; ++entity("rarrb") -> 16#021E5; ++entity("rarrbfs") -> 16#02920; ++entity("rarrc") -> 16#02933; ++entity("rarrfs") -> 16#0291E; ++entity("rarrhk") -> 16#021AA; ++entity("rarrlp") -> 16#021AC; ++entity("rarrpl") -> 16#02945; ++entity("rarrsim") -> 16#02974; ++entity("rarrtl") -> 16#021A3; ++entity("rarrw") -> 16#0219D; ++entity("ratail") -> 16#0291A; ++entity("ratio") -> 16#02236; ++entity("rationals") -> 16#0211A; ++entity("rbarr") -> 16#0290D; ++entity("rbbrk") -> 16#02773; ++entity("rbrace") -> 16#0007D; ++entity("rbrack") -> 16#0005D; ++entity("rbrke") -> 16#0298C; ++entity("rbrksld") -> 16#0298E; ++entity("rbrkslu") -> 16#02990; ++entity("rcaron") -> 16#00159; ++entity("rcedil") -> 16#00157; ++entity("rceil") -> 16#02309; ++entity("rcub") -> 16#0007D; ++entity("rcy") -> 16#00440; ++entity("rdca") -> 16#02937; ++entity("rdldhar") -> 16#02969; ++entity("rdquo") -> 16#0201D; ++entity("rdquor") -> 16#0201D; ++entity("rdsh") -> 16#021B3; ++entity("real") -> 16#0211C; ++entity("realine") -> 16#0211B; ++entity("realpart") -> 16#0211C; ++entity("reals") -> 16#0211D; ++entity("rect") -> 16#025AD; ++entity("reg") -> 16#000AE; ++entity("rfisht") -> 16#0297D; ++entity("rfloor") -> 16#0230B; ++entity("rfr") -> 16#1D52F; ++entity("rhard") -> 16#021C1; ++entity("rharu") -> 16#021C0; ++entity("rharul") -> 16#0296C; ++entity("rho") -> 16#003C1; ++entity("rhov") -> 16#003F1; ++entity("rightarrow") -> 16#02192; ++entity("rightarrowtail") -> 16#021A3; ++entity("rightharpoondown") -> 16#021C1; ++entity("rightharpoonup") -> 16#021C0; ++entity("rightleftarrows") -> 16#021C4; ++entity("rightleftharpoons") -> 16#021CC; ++entity("rightrightarrows") -> 16#021C9; ++entity("rightsquigarrow") -> 16#0219D; ++entity("rightthreetimes") -> 16#022CC; ++entity("ring") -> 16#002DA; ++entity("risingdotseq") -> 16#02253; ++entity("rlarr") -> 16#021C4; ++entity("rlhar") -> 16#021CC; ++entity("rlm") -> 16#0200F; ++entity("rmoust") -> 16#023B1; ++entity("rmoustache") -> 16#023B1; ++entity("rnmid") -> 16#02AEE; ++entity("roang") -> 16#027ED; ++entity("roarr") -> 16#021FE; ++entity("robrk") -> 16#027E7; ++entity("ropar") -> 16#02986; ++entity("ropf") -> 16#1D563; ++entity("roplus") -> 16#02A2E; ++entity("rotimes") -> 16#02A35; ++entity("rpar") -> 16#00029; ++entity("rpargt") -> 16#02994; ++entity("rppolint") -> 16#02A12; ++entity("rrarr") -> 16#021C9; ++entity("rsaquo") -> 16#0203A; ++entity("rscr") -> 16#1D4C7; ++entity("rsh") -> 16#021B1; ++entity("rsqb") -> 16#0005D; ++entity("rsquo") -> 16#02019; ++entity("rsquor") -> 16#02019; ++entity("rthree") -> 16#022CC; ++entity("rtimes") -> 16#022CA; ++entity("rtri") -> 16#025B9; ++entity("rtrie") -> 16#022B5; ++entity("rtrif") -> 16#025B8; ++entity("rtriltri") -> 16#029CE; ++entity("ruluhar") -> 16#02968; ++entity("rx") -> 16#0211E; ++entity("sacute") -> 16#0015B; ++entity("sbquo") -> 16#0201A; ++entity("sc") -> 16#0227B; ++entity("scE") -> 16#02AB4; ++entity("scap") -> 16#02AB8; ++entity("scaron") -> 16#00161; ++entity("sccue") -> 16#0227D; ++entity("sce") -> 16#02AB0; ++entity("scedil") -> 16#0015F; ++entity("scirc") -> 16#0015D; ++entity("scnE") -> 16#02AB6; ++entity("scnap") -> 16#02ABA; ++entity("scnsim") -> 16#022E9; ++entity("scpolint") -> 16#02A13; ++entity("scsim") -> 16#0227F; ++entity("scy") -> 16#00441; ++entity("sdot") -> 16#022C5; ++entity("sdotb") -> 16#022A1; ++entity("sdote") -> 16#02A66; ++entity("seArr") -> 16#021D8; ++entity("searhk") -> 16#02925; ++entity("searr") -> 16#02198; ++entity("searrow") -> 16#02198; ++entity("sect") -> 16#000A7; ++entity("semi") -> 16#0003B; ++entity("seswar") -> 16#02929; ++entity("setminus") -> 16#02216; ++entity("setmn") -> 16#02216; ++entity("sext") -> 16#02736; ++entity("sfr") -> 16#1D530; ++entity("sfrown") -> 16#02322; ++entity("sharp") -> 16#0266F; ++entity("shchcy") -> 16#00449; ++entity("shcy") -> 16#00448; ++entity("shortmid") -> 16#02223; ++entity("shortparallel") -> 16#02225; ++entity("shy") -> 16#000AD; ++entity("sigma") -> 16#003C3; ++entity("sigmaf") -> 16#003C2; ++entity("sigmav") -> 16#003C2; ++entity("sim") -> 16#0223C; ++entity("simdot") -> 16#02A6A; ++entity("sime") -> 16#02243; ++entity("simeq") -> 16#02243; ++entity("simg") -> 16#02A9E; ++entity("simgE") -> 16#02AA0; ++entity("siml") -> 16#02A9D; ++entity("simlE") -> 16#02A9F; ++entity("simne") -> 16#02246; ++entity("simplus") -> 16#02A24; ++entity("simrarr") -> 16#02972; ++entity("slarr") -> 16#02190; ++entity("smallsetminus") -> 16#02216; ++entity("smashp") -> 16#02A33; ++entity("smeparsl") -> 16#029E4; ++entity("smid") -> 16#02223; ++entity("smile") -> 16#02323; ++entity("smt") -> 16#02AAA; ++entity("smte") -> 16#02AAC; ++entity("smtes") -> [16#02AAC, 16#0FE00]; ++entity("softcy") -> 16#0044C; ++entity("sol") -> 16#0002F; ++entity("solb") -> 16#029C4; ++entity("solbar") -> 16#0233F; ++entity("sopf") -> 16#1D564; ++entity("spades") -> 16#02660; ++entity("spadesuit") -> 16#02660; ++entity("spar") -> 16#02225; ++entity("sqcap") -> 16#02293; ++entity("sqcaps") -> [16#02293, 16#0FE00]; ++entity("sqcup") -> 16#02294; ++entity("sqcups") -> [16#02294, 16#0FE00]; ++entity("sqsub") -> 16#0228F; ++entity("sqsube") -> 16#02291; ++entity("sqsubset") -> 16#0228F; ++entity("sqsubseteq") -> 16#02291; ++entity("sqsup") -> 16#02290; ++entity("sqsupe") -> 16#02292; ++entity("sqsupset") -> 16#02290; ++entity("sqsupseteq") -> 16#02292; ++entity("squ") -> 16#025A1; ++entity("square") -> 16#025A1; ++entity("squarf") -> 16#025AA; ++entity("squf") -> 16#025AA; ++entity("srarr") -> 16#02192; ++entity("sscr") -> 16#1D4C8; ++entity("ssetmn") -> 16#02216; ++entity("ssmile") -> 16#02323; ++entity("sstarf") -> 16#022C6; ++entity("star") -> 16#02606; ++entity("starf") -> 16#02605; ++entity("straightepsilon") -> 16#003F5; ++entity("straightphi") -> 16#003D5; ++entity("strns") -> 16#000AF; ++entity("sub") -> 16#02282; ++entity("subE") -> 16#02AC5; ++entity("subdot") -> 16#02ABD; ++entity("sube") -> 16#02286; ++entity("subedot") -> 16#02AC3; ++entity("submult") -> 16#02AC1; ++entity("subnE") -> 16#02ACB; ++entity("subne") -> 16#0228A; ++entity("subplus") -> 16#02ABF; ++entity("subrarr") -> 16#02979; ++entity("subset") -> 16#02282; ++entity("subseteq") -> 16#02286; ++entity("subseteqq") -> 16#02AC5; ++entity("subsetneq") -> 16#0228A; ++entity("subsetneqq") -> 16#02ACB; ++entity("subsim") -> 16#02AC7; ++entity("subsub") -> 16#02AD5; ++entity("subsup") -> 16#02AD3; ++entity("succ") -> 16#0227B; ++entity("succapprox") -> 16#02AB8; ++entity("succcurlyeq") -> 16#0227D; ++entity("succeq") -> 16#02AB0; ++entity("succnapprox") -> 16#02ABA; ++entity("succneqq") -> 16#02AB6; ++entity("succnsim") -> 16#022E9; ++entity("succsim") -> 16#0227F; ++entity("sum") -> 16#02211; ++entity("sung") -> 16#0266A; ++entity("sup") -> 16#02283; ++entity("sup1") -> 16#000B9; ++entity("sup2") -> 16#000B2; ++entity("sup3") -> 16#000B3; ++entity("supE") -> 16#02AC6; ++entity("supdot") -> 16#02ABE; ++entity("supdsub") -> 16#02AD8; ++entity("supe") -> 16#02287; ++entity("supedot") -> 16#02AC4; ++entity("suphsol") -> 16#027C9; ++entity("suphsub") -> 16#02AD7; ++entity("suplarr") -> 16#0297B; ++entity("supmult") -> 16#02AC2; ++entity("supnE") -> 16#02ACC; ++entity("supne") -> 16#0228B; ++entity("supplus") -> 16#02AC0; ++entity("supset") -> 16#02283; ++entity("supseteq") -> 16#02287; ++entity("supseteqq") -> 16#02AC6; ++entity("supsetneq") -> 16#0228B; ++entity("supsetneqq") -> 16#02ACC; ++entity("supsim") -> 16#02AC8; ++entity("supsub") -> 16#02AD4; ++entity("supsup") -> 16#02AD6; ++entity("swArr") -> 16#021D9; ++entity("swarhk") -> 16#02926; ++entity("swarr") -> 16#02199; ++entity("swarrow") -> 16#02199; ++entity("swnwar") -> 16#0292A; ++entity("szlig") -> 16#000DF; ++entity("target") -> 16#02316; ++entity("tau") -> 16#003C4; ++entity("tbrk") -> 16#023B4; ++entity("tcaron") -> 16#00165; ++entity("tcedil") -> 16#00163; ++entity("tcy") -> 16#00442; ++entity("tdot") -> 16#020DB; ++entity("telrec") -> 16#02315; ++entity("tfr") -> 16#1D531; ++entity("there4") -> 16#02234; ++entity("therefore") -> 16#02234; ++entity("theta") -> 16#003B8; ++entity("thetasym") -> 16#003D1; ++entity("thetav") -> 16#003D1; ++entity("thickapprox") -> 16#02248; ++entity("thicksim") -> 16#0223C; ++entity("thinsp") -> 16#02009; ++entity("thkap") -> 16#02248; ++entity("thksim") -> 16#0223C; ++entity("thorn") -> 16#000FE; ++entity("tilde") -> 16#002DC; ++entity("times") -> 16#000D7; ++entity("timesb") -> 16#022A0; ++entity("timesbar") -> 16#02A31; ++entity("timesd") -> 16#02A30; ++entity("tint") -> 16#0222D; ++entity("toea") -> 16#02928; ++entity("top") -> 16#022A4; ++entity("topbot") -> 16#02336; ++entity("topcir") -> 16#02AF1; ++entity("topf") -> 16#1D565; ++entity("topfork") -> 16#02ADA; ++entity("tosa") -> 16#02929; ++entity("tprime") -> 16#02034; ++entity("trade") -> 16#02122; ++entity("triangle") -> 16#025B5; ++entity("triangledown") -> 16#025BF; ++entity("triangleleft") -> 16#025C3; ++entity("trianglelefteq") -> 16#022B4; ++entity("triangleq") -> 16#0225C; ++entity("triangleright") -> 16#025B9; ++entity("trianglerighteq") -> 16#022B5; ++entity("tridot") -> 16#025EC; ++entity("trie") -> 16#0225C; ++entity("triminus") -> 16#02A3A; ++entity("triplus") -> 16#02A39; ++entity("trisb") -> 16#029CD; ++entity("tritime") -> 16#02A3B; ++entity("trpezium") -> 16#023E2; ++entity("tscr") -> 16#1D4C9; ++entity("tscy") -> 16#00446; ++entity("tshcy") -> 16#0045B; ++entity("tstrok") -> 16#00167; ++entity("twixt") -> 16#0226C; ++entity("twoheadleftarrow") -> 16#0219E; ++entity("twoheadrightarrow") -> 16#021A0; ++entity("uArr") -> 16#021D1; ++entity("uHar") -> 16#02963; ++entity("uacute") -> 16#000FA; ++entity("uarr") -> 16#02191; ++entity("ubrcy") -> 16#0045E; ++entity("ubreve") -> 16#0016D; ++entity("ucirc") -> 16#000FB; ++entity("ucy") -> 16#00443; ++entity("udarr") -> 16#021C5; ++entity("udblac") -> 16#00171; ++entity("udhar") -> 16#0296E; ++entity("ufisht") -> 16#0297E; ++entity("ufr") -> 16#1D532; ++entity("ugrave") -> 16#000F9; ++entity("uharl") -> 16#021BF; ++entity("uharr") -> 16#021BE; ++entity("uhblk") -> 16#02580; ++entity("ulcorn") -> 16#0231C; ++entity("ulcorner") -> 16#0231C; ++entity("ulcrop") -> 16#0230F; ++entity("ultri") -> 16#025F8; ++entity("umacr") -> 16#0016B; ++entity("uml") -> 16#000A8; ++entity("uogon") -> 16#00173; ++entity("uopf") -> 16#1D566; ++entity("uparrow") -> 16#02191; ++entity("updownarrow") -> 16#02195; ++entity("upharpoonleft") -> 16#021BF; ++entity("upharpoonright") -> 16#021BE; ++entity("uplus") -> 16#0228E; ++entity("upsi") -> 16#003C5; ++entity("upsih") -> 16#003D2; ++entity("upsilon") -> 16#003C5; ++entity("upuparrows") -> 16#021C8; ++entity("urcorn") -> 16#0231D; ++entity("urcorner") -> 16#0231D; ++entity("urcrop") -> 16#0230E; ++entity("uring") -> 16#0016F; ++entity("urtri") -> 16#025F9; ++entity("uscr") -> 16#1D4CA; ++entity("utdot") -> 16#022F0; ++entity("utilde") -> 16#00169; ++entity("utri") -> 16#025B5; ++entity("utrif") -> 16#025B4; ++entity("uuarr") -> 16#021C8; ++entity("uuml") -> 16#000FC; ++entity("uwangle") -> 16#029A7; ++entity("vArr") -> 16#021D5; ++entity("vBar") -> 16#02AE8; ++entity("vBarv") -> 16#02AE9; ++entity("vDash") -> 16#022A8; ++entity("vangrt") -> 16#0299C; ++entity("varepsilon") -> 16#003F5; ++entity("varkappa") -> 16#003F0; ++entity("varnothing") -> 16#02205; ++entity("varphi") -> 16#003D5; ++entity("varpi") -> 16#003D6; ++entity("varpropto") -> 16#0221D; ++entity("varr") -> 16#02195; ++entity("varrho") -> 16#003F1; ++entity("varsigma") -> 16#003C2; ++entity("varsubsetneq") -> [16#0228A, 16#0FE00]; ++entity("varsubsetneqq") -> [16#02ACB, 16#0FE00]; ++entity("varsupsetneq") -> [16#0228B, 16#0FE00]; ++entity("varsupsetneqq") -> [16#02ACC, 16#0FE00]; ++entity("vartheta") -> 16#003D1; ++entity("vartriangleleft") -> 16#022B2; ++entity("vartriangleright") -> 16#022B3; ++entity("vcy") -> 16#00432; ++entity("vdash") -> 16#022A2; ++entity("vee") -> 16#02228; ++entity("veebar") -> 16#022BB; ++entity("veeeq") -> 16#0225A; ++entity("vellip") -> 16#022EE; ++entity("verbar") -> 16#0007C; ++entity("vert") -> 16#0007C; ++entity("vfr") -> 16#1D533; ++entity("vltri") -> 16#022B2; ++entity("vnsub") -> [16#02282, 16#020D2]; ++entity("vnsup") -> [16#02283, 16#020D2]; ++entity("vopf") -> 16#1D567; ++entity("vprop") -> 16#0221D; ++entity("vrtri") -> 16#022B3; ++entity("vscr") -> 16#1D4CB; ++entity("vsubnE") -> [16#02ACB, 16#0FE00]; ++entity("vsubne") -> [16#0228A, 16#0FE00]; ++entity("vsupnE") -> [16#02ACC, 16#0FE00]; ++entity("vsupne") -> [16#0228B, 16#0FE00]; ++entity("vzigzag") -> 16#0299A; ++entity("wcirc") -> 16#00175; ++entity("wedbar") -> 16#02A5F; ++entity("wedge") -> 16#02227; ++entity("wedgeq") -> 16#02259; ++entity("weierp") -> 16#02118; ++entity("wfr") -> 16#1D534; ++entity("wopf") -> 16#1D568; ++entity("wp") -> 16#02118; ++entity("wr") -> 16#02240; ++entity("wreath") -> 16#02240; ++entity("wscr") -> 16#1D4CC; ++entity("xcap") -> 16#022C2; ++entity("xcirc") -> 16#025EF; ++entity("xcup") -> 16#022C3; ++entity("xdtri") -> 16#025BD; ++entity("xfr") -> 16#1D535; ++entity("xhArr") -> 16#027FA; ++entity("xharr") -> 16#027F7; ++entity("xi") -> 16#003BE; ++entity("xlArr") -> 16#027F8; ++entity("xlarr") -> 16#027F5; ++entity("xmap") -> 16#027FC; ++entity("xnis") -> 16#022FB; ++entity("xodot") -> 16#02A00; ++entity("xopf") -> 16#1D569; ++entity("xoplus") -> 16#02A01; ++entity("xotime") -> 16#02A02; ++entity("xrArr") -> 16#027F9; ++entity("xrarr") -> 16#027F6; ++entity("xscr") -> 16#1D4CD; ++entity("xsqcup") -> 16#02A06; ++entity("xuplus") -> 16#02A04; ++entity("xutri") -> 16#025B3; ++entity("xvee") -> 16#022C1; ++entity("xwedge") -> 16#022C0; ++entity("yacute") -> 16#000FD; ++entity("yacy") -> 16#0044F; ++entity("ycirc") -> 16#00177; ++entity("ycy") -> 16#0044B; ++entity("yen") -> 16#000A5; ++entity("yfr") -> 16#1D536; ++entity("yicy") -> 16#00457; ++entity("yopf") -> 16#1D56A; ++entity("yscr") -> 16#1D4CE; ++entity("yucy") -> 16#0044E; ++entity("yuml") -> 16#000FF; ++entity("zacute") -> 16#0017A; ++entity("zcaron") -> 16#0017E; ++entity("zcy") -> 16#00437; ++entity("zdot") -> 16#0017C; ++entity("zeetrf") -> 16#02128; ++entity("zeta") -> 16#003B6; ++entity("zfr") -> 16#1D537; ++entity("zhcy") -> 16#00436; ++entity("zigrarr") -> 16#021DD; ++entity("zopf") -> 16#1D56B; ++entity("zscr") -> 16#1D4CF; ++entity("zwj") -> 16#0200D; ++entity("zwnj") -> 16#0200C; ++entity(_) -> undefined. + + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + exhaustive_entity_test() -> + T = mochiweb_cover:clause_lookup_table(?MODULE, entity), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_cookies.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cookies.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_cookies.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cookies.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -23,6 +23,7 @@ + + %% @type proplist() = [{Key::string(), Value::string()}]. + %% @type header() = {Name::string(), Value::string()}. ++%% @type int_seconds() = integer(). + + %% @spec cookie(Key::string(), Value::string()) -> header() + %% @doc Short-hand for cookie(Key, Value, []). +@@ -30,7 +31,7 @@ + cookie(Key, Value, []). + + %% @spec cookie(Key::string(), Value::string(), Options::[Option]) -> header() +-%% where Option = {max_age, integer()} | {local_time, {date(), time()}} ++%% where Option = {max_age, int_seconds()} | {local_time, {date(), time()}} + %% | {domain, string()} | {path, string()} + %% | {secure, true | false} | {http_only, true | false} + %% +@@ -115,12 +116,33 @@ + orelse erlang:error({cookie_quoting_required, V}), + V. + ++ ++%% Return a date in the form of: Wdy, DD-Mon-YYYY HH:MM:SS GMT ++%% See also: rfc2109: 10.1.2 ++rfc2109_cookie_expires_date(LocalTime) -> ++ {{YYYY,MM,DD},{Hour,Min,Sec}} = ++ case calendar:local_time_to_universal_time_dst(LocalTime) of ++ [] -> ++ {Date, {Hour1, Min1, Sec1}} = LocalTime, ++ LocalTime2 = {Date, {Hour1 + 1, Min1, Sec1}}, ++ case calendar:local_time_to_universal_time_dst(LocalTime2) of ++ [Gmt] -> Gmt; ++ [_,Gmt] -> Gmt ++ end; ++ [Gmt] -> Gmt; ++ [_,Gmt] -> Gmt ++ end, ++ DayNumber = calendar:day_of_the_week({YYYY,MM,DD}), ++ lists:flatten( ++ io_lib:format("~s, ~2.2.0w-~3.s-~4.4.0w ~2.2.0w:~2.2.0w:~2.2.0w GMT", ++ [httpd_util:day(DayNumber),DD,httpd_util:month(MM),YYYY,Hour,Min,Sec])). ++ + add_seconds(Secs, LocalTime) -> + Greg = calendar:datetime_to_gregorian_seconds(LocalTime), + calendar:gregorian_seconds_to_datetime(Greg + Secs). + + age_to_cookie_date(Age, LocalTime) -> +- httpd_util:rfc1123_date(add_seconds(Age, LocalTime)). ++ rfc2109_cookie_expires_date(add_seconds(Age, LocalTime)). + + %% @spec parse_cookie(string()) -> [{K::string(), V::string()}] + %% @doc Parse the contents of a Cookie header field, ignoring cookie +@@ -203,8 +225,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + quote_test() -> + %% ?assertError eunit macro is not compatible with coverage module +@@ -293,14 +315,14 @@ + C2 = {"Set-Cookie", + "Customer=WILE_E_COYOTE; " + "Version=1; " +- "Expires=Tue, 15 May 2007 13:45:33 GMT; " ++ "Expires=Tue, 15-May-2007 13:45:33 GMT; " + "Max-Age=0"}, + C2 = cookie("Customer", "WILE_E_COYOTE", + [{max_age, -111}, {local_time, LocalTime}]), + C3 = {"Set-Cookie", + "Customer=WILE_E_COYOTE; " + "Version=1; " +- "Expires=Wed, 16 May 2007 13:45:50 GMT; " ++ "Expires=Wed, 16-May-2007 13:45:50 GMT; " + "Max-Age=86417"}, + C3 = cookie("Customer", "WILE_E_COYOTE", + [{max_age, 86417}, {local_time, LocalTime}]), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_cover.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cover.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_cover.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cover.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -46,8 +46,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + foo_table(a) -> b; + foo_table("a") -> <<"b">>; + foo_table(123) -> {4, 3, 2}; +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_echo.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_echo.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_echo.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_echo.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -11,11 +11,14 @@ + mochiweb_socket_server:stop(?MODULE). + + start() -> +- mochiweb_socket_server:start([{name, ?MODULE}, ++ mochiweb_socket_server:start([{link, false} | options()]). ++ ++options() -> ++ [{name, ?MODULE}, + {port, 6789}, + {ip, "127.0.0.1"}, + {max, 1}, +- {loop, {?MODULE, loop}}]). ++ {loop, {?MODULE, loop}}]. + + loop(Socket) -> + case mochiweb_socket:recv(Socket, 0, 30000) of +@@ -33,6 +36,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -6,22 +6,9 @@ + -module(mochiweb). + -author('bob@mochimedia.com'). + +--export([start/0, stop/0]). + -export([new_request/1, new_response/1]). + -export([all_loaded/0, all_loaded/1, reload/0]). +- +-%% @spec start() -> ok +-%% @doc Start the MochiWeb server. +-start() -> +- ensure_started(crypto), +- application:start(mochiweb). +- +-%% @spec stop() -> ok +-%% @doc Stop the MochiWeb server. +-stop() -> +- Res = application:stop(mochiweb), +- application:stop(crypto), +- Res. ++-export([ensure_started/1]). + + reload() -> + [c:l(Module) || Module <- all_loaded()]. +@@ -78,8 +65,8 @@ + Code, + mochiweb_headers:make(Headers)). + +-%% Internal API +- ++%% @spec ensure_started(App::atom()) -> ok ++%% @doc Start the given App if it has not been started already. + ensure_started(App) -> + case application:start(App) of + ok -> +@@ -92,8 +78,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + -record(treq, {path, body= <<>>, xreply= <<>>}). + +@@ -112,7 +98,7 @@ + ssl -> + ServerOpts0 ++ [{ssl, true}, {ssl_opts, ssl_cert_opts()}] + end, +- {ok, Server} = mochiweb_http:start(ServerOpts), ++ {ok, Server} = mochiweb_http:start_link(ServerOpts), + Port = mochiweb_socket_server:get(Server, port), + Res = (catch ClientFun(Transport, Port)), + mochiweb_http:stop(Server), +@@ -123,6 +109,8 @@ + "/foo/bar/baz wibble quux" = R:get(path), + ok. + ++-define(LARGE_TIMEOUT, 60). ++ + single_http_GET_test() -> + do_GET(plain, 1). + +@@ -135,11 +123,13 @@ + multiple_https_GET_test() -> + do_GET(ssl, 3). + +-hundred_http_GET_test() -> +- do_GET(plain, 100). +- +-hundred_https_GET_test() -> +- do_GET(ssl, 100). ++hundred_http_GET_test_() -> % note the underscore ++ {timeout, ?LARGE_TIMEOUT, ++ fun() -> ?assertEqual(ok, do_GET(plain,100)) end}. ++ ++hundred_https_GET_test_() -> % note the underscore ++ {timeout, ?LARGE_TIMEOUT, ++ fun() -> ?assertEqual(ok, do_GET(ssl,100)) end}. + + single_128_http_POST_test() -> + do_POST(plain, 128, 1). +@@ -165,11 +155,13 @@ + multiple_100K_https_POST_test() -> + do_POST(ssl, 102400, 3). + +-hundred_128_http_POST_test() -> +- do_POST(plain, 128, 100). +- +-hundred_128_https_POST_test() -> +- do_POST(ssl, 128, 100). ++hundred_128_http_POST_test_() -> % note the underscore ++ {timeout, ?LARGE_TIMEOUT, ++ fun() -> ?assertEqual(ok, do_POST(plain, 128, 100)) end}. ++ ++hundred_128_https_POST_test_() -> % note the underscore ++ {timeout, ?LARGE_TIMEOUT, ++ fun() -> ?assertEqual(ok, do_POST(ssl, 128, 100)) end}. + + do_GET(Transport, Times) -> + PathPrefix = "/whatever/", +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_headers.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_headers.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_headers.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_headers.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -6,7 +6,7 @@ + -module(mochiweb_headers). + -author('bob@mochimedia.com'). + -export([empty/0, from_list/1, insert/3, enter/3, get_value/2, lookup/2]). +--export([delete_any/2, get_primary_value/2]). ++-export([delete_any/2, get_primary_value/2, get_combined_value/2]). + -export([default/3, enter_from_list/2, default_from_list/2]). + -export([to_list/1, make/1]). + -export([from_binary/1]). +@@ -24,8 +24,8 @@ + %% @doc Construct a headers() from the given list. + make(L) when is_list(L) -> + from_list(L); +-%% assume a tuple is already mochiweb_headers. +-make(T) when is_tuple(T) -> ++%% assume a non-list is already mochiweb_headers. ++make(T) -> + T. + + %% @spec from_binary(iolist()) -> headers() +@@ -112,6 +112,34 @@ + lists:takewhile(fun (C) -> C =/= $; end, V) + end. + ++%% @spec get_combined_value(key(), headers()) -> string() | undefined ++%% @doc Return the value from the given header using a case insensitive search. ++%% If the value of the header is a comma-separated list where holds values ++%% are all identical, the identical value will be returned. ++%% undefined will be returned for keys that are not present or the ++%% values in the list are not the same. ++%% ++%% NOTE: The process isn't designed for a general purpose. If you need ++%% to access all values in the combined header, please refer to ++%% '''tokenize_header_value/1'''. ++%% ++%% Section 4.2 of the RFC 2616 (HTTP 1.1) describes multiple message-header ++%% fields with the same field-name may be present in a message if and only ++%% if the entire field-value for that header field is defined as a ++%% comma-separated list [i.e., #(values)]. ++get_combined_value(K, T) -> ++ case get_value(K, T) of ++ undefined -> ++ undefined; ++ V -> ++ case sets:to_list(sets:from_list(tokenize_header_value(V))) of ++ [Val] -> ++ Val; ++ _ -> ++ undefined ++ end ++ end. ++ + %% @spec lookup(key(), headers()) -> {value, {key(), string()}} | none + %% @doc Return the case preserved key and value for the given header using + %% a case insensitive search. none will be returned for keys that are +@@ -164,6 +192,49 @@ + + %% Internal API + ++tokenize_header_value(undefined) -> ++ undefined; ++tokenize_header_value(V) -> ++ reversed_tokens(trim_and_reverse(V, false), [], []). ++ ++trim_and_reverse([S | Rest], Reversed) when S=:=$ ; S=:=$\n; S=:=$\t -> ++ trim_and_reverse(Rest, Reversed); ++trim_and_reverse(V, false) -> ++ trim_and_reverse(lists:reverse(V), true); ++trim_and_reverse(V, true) -> ++ V. ++ ++reversed_tokens([], [], Acc) -> ++ Acc; ++reversed_tokens([], Token, Acc) -> ++ [Token | Acc]; ++reversed_tokens("\"" ++ Rest, [], Acc) -> ++ case extract_quoted_string(Rest, []) of ++ {String, NewRest} -> ++ reversed_tokens(NewRest, [], [String | Acc]); ++ undefined -> ++ undefined ++ end; ++reversed_tokens("\"" ++ _Rest, _Token, _Acc) -> ++ undefined; ++reversed_tokens([C | Rest], [], Acc) when C=:=$ ;C=:=$\n;C=:=$\t;C=:=$, -> ++ reversed_tokens(Rest, [], Acc); ++reversed_tokens([C | Rest], Token, Acc) when C=:=$ ;C=:=$\n;C=:=$\t;C=:=$, -> ++ reversed_tokens(Rest, [], [Token | Acc]); ++reversed_tokens([C | Rest], Token, Acc) -> ++ reversed_tokens(Rest, [C | Token], Acc); ++reversed_tokens(_, _, _) -> ++ undefeined. ++ ++extract_quoted_string([], _Acc) -> ++ undefined; ++extract_quoted_string("\"\\" ++ Rest, Acc) -> ++ extract_quoted_string(Rest, "\"" ++ Acc); ++extract_quoted_string("\"" ++ Rest, Acc) -> ++ {Acc, Rest}; ++extract_quoted_string([C | Rest], Acc) -> ++ extract_quoted_string(Rest, [C | Acc]). ++ + expand({array, L}) -> + mochiweb_util:join(lists:reverse(L), ", "); + expand(V) -> +@@ -195,8 +266,8 @@ + %% + %% Tests. + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + make_test() -> + Identity = make([{hdr, foo}]), +@@ -237,6 +308,37 @@ + get_primary_value(<<"baz">>, H)), + ok. + ++get_combined_value_test() -> ++ H = make([{hdr, foo}, {baz, <<"wibble,taco">>}, {content_length, "123, 123"}, ++ {test, " 123, 123, 123 , 123,123 "}, ++ {test2, "456, 123, 123 , 123"}, ++ {test3, "123"}, {test4, " 123, "}]), ++ ?assertEqual( ++ "foo", ++ get_combined_value(hdr, H)), ++ ?assertEqual( ++ undefined, ++ get_combined_value(bar, H)), ++ ?assertEqual( ++ undefined, ++ get_combined_value(<<"baz">>, H)), ++ ?assertEqual( ++ "123", ++ get_combined_value(<<"content_length">>, H)), ++ ?assertEqual( ++ "123", ++ get_combined_value(<<"test">>, H)), ++ ?assertEqual( ++ undefined, ++ get_combined_value(<<"test2">>, H)), ++ ?assertEqual( ++ "123", ++ get_combined_value(<<"test3">>, H)), ++ ?assertEqual( ++ "123", ++ get_combined_value(<<"test4">>, H)), ++ ok. ++ + set_cookie_test() -> + H = make([{"set-cookie", foo}, {"set-cookie", bar}, {"set-cookie", baz}]), + ?assertEqual( +@@ -296,4 +398,23 @@ + [] = ?MODULE:to_list(?MODULE:from_binary([<<"\r\n\r\n">>])), + ok. + ++tokenize_header_value_test() -> ++ ?assertEqual(["a quote in a \"quote\"."], ++ tokenize_header_value("\"a quote in a \\\"quote\\\".\"")), ++ ?assertEqual(["abc"], tokenize_header_value("abc")), ++ ?assertEqual(["abc", "def"], tokenize_header_value("abc def")), ++ ?assertEqual(["abc", "def"], tokenize_header_value("abc , def")), ++ ?assertEqual(["abc", "def"], tokenize_header_value(",abc ,, def,,")), ++ ?assertEqual(["abc def"], tokenize_header_value("\"abc def\" ")), ++ ?assertEqual(["abc, def"], tokenize_header_value("\"abc, def\"")), ++ ?assertEqual(["\\a\\$"], tokenize_header_value("\"\\a\\$\"")), ++ ?assertEqual(["abc def", "foo, bar", "12345", ""], ++ tokenize_header_value("\"abc def\" \"foo, bar\" , 12345, \"\"")), ++ ?assertEqual(undefined, ++ tokenize_header_value(undefined)), ++ ?assertEqual(undefined, ++ tokenize_header_value("umatched quote\"")), ++ ?assertEqual(undefined, ++ tokenize_header_value("\"unmatched quote")). ++ + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_html.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_html.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_html.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_html.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -95,7 +95,12 @@ + to_tokens({Tag0, [], Acc}); + to_tokens({Tag0, Attrs, Acc}) -> + Tag = to_tag(Tag0), +- to_tokens([{Tag, Acc}], [{start_tag, Tag, Attrs, is_singleton(Tag)}]). ++ case is_singleton(Tag) of ++ true -> ++ to_tokens([], [{start_tag, Tag, Attrs, true}]); ++ false -> ++ to_tokens([{Tag, Acc}], [{start_tag, Tag, Attrs, false}]) ++ end. + + %% @spec to_html([html_token()] | html_node()) -> iolist() + %% @doc Convert a list of html_token() to a HTML document. +@@ -312,7 +317,8 @@ + {Tag, S1} = tokenize_literal(B, ?ADV_COL(S, 2)), + {S2, _} = find_gt(B, S1), + {{end_tag, Tag}, S2}; +- <<_:O/binary, "<", C, _/binary>> when ?IS_WHITESPACE(C) -> ++ <<_:O/binary, "<", C, _/binary>> ++ when ?IS_WHITESPACE(C); not ?IS_LITERAL_SAFE(C) -> + %% This isn't really strict HTML + {{data, Data, _Whitespace}, S1} = tokenize_data(B, ?INC_COL(S)), + {{data, <<$<, Data/binary>>, false}, S1}; +@@ -501,8 +507,6 @@ + tokenize_quoted_attr_value(B, S1, [Data|Acc], Q); + <<_:O/binary, Q, _/binary>> -> + { iolist_to_binary(lists:reverse(Acc)), ?INC_COL(S) }; +- <<_:O/binary, $\n, _/binary>> -> +- { iolist_to_binary(lists:reverse(Acc)), ?INC_LINE(S) }; + <<_:O/binary, C, _/binary>> -> + tokenize_quoted_attr_value(B, ?INC_COL(S), [C|Acc], Q) + end. +@@ -603,32 +607,33 @@ + end. + + tokenize_charref(Bin, S=#decoder{offset=O}) -> +- tokenize_charref(Bin, S, O). ++ try ++ tokenize_charref(Bin, S, O) ++ catch ++ throw:invalid_charref -> ++ {{data, <<"&">>, false}, S} ++ end. + + tokenize_charref(Bin, S=#decoder{offset=O}, Start) -> + case Bin of + <<_:O/binary>> -> +- <<_:Start/binary, Raw/binary>> = Bin, +- {{data, Raw, false}, S}; ++ throw(invalid_charref); + <<_:O/binary, C, _/binary>> when ?IS_WHITESPACE(C) + orelse C =:= ?SQUOTE + orelse C =:= ?QUOTE + orelse C =:= $/ + orelse C =:= $> -> +- Len = O - Start, +- <<_:Start/binary, Raw:Len/binary, _/binary>> = Bin, +- {{data, Raw, false}, S}; ++ throw(invalid_charref); + <<_:O/binary, $;, _/binary>> -> + Len = O - Start, + <<_:Start/binary, Raw:Len/binary, _/binary>> = Bin, + Data = case mochiweb_charref:charref(Raw) of + undefined -> +- Start1 = Start - 1, +- Len1 = Len + 2, +- <<_:Start1/binary, R:Len1/binary, _/binary>> = Bin, +- R; +- Unichar -> +- mochiutf8:codepoint_to_bytes(Unichar) ++ throw(invalid_charref); ++ Unichar when is_integer(Unichar) -> ++ mochiutf8:codepoint_to_bytes(Unichar); ++ Unichars when is_list(Unichars) -> ++ unicode:characters_to_binary(Unichars) + end, + {{data, Data, false}, ?INC_COL(S)}; + _ -> +@@ -759,8 +764,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + to_html_test() -> + ?assertEqual( +@@ -1232,6 +1237,14 @@ + { <<"img">>, [ { <<"src">>, <<"/images/icon>.png">> } ], [] } + ]}, + mochiweb_html:parse(D2)), ++ ++ %% Quoted attributes can contain whitespace and newlines ++ D3 = <<"">>, ++ ?assertEqual( ++ {<<"html">>,[],[ ++ { <<"a">>, [ { <<"href">>, <<"#">> }, {<<"onclick">>, <<"javascript: test(1,\ntrue);">>} ], [] } ++ ]}, ++ mochiweb_html:parse(D3)), + ok. + + parse_missing_attr_name_test() -> +@@ -1261,4 +1274,59 @@ + mochiweb_html:parse(D0)), + ok. + ++to_html_singleton_test() -> ++ D0 = <<"">>, ++ T0 = {<<"link">>,[],[]}, ++ ?assertEqual(D0, iolist_to_binary(to_html(T0))), ++ ++ D1 = <<"">>, ++ T1 = {<<"head">>,[],[{<<"link">>,[],[]}]}, ++ ?assertEqual(D1, iolist_to_binary(to_html(T1))), ++ ++ D2 = <<"">>, ++ T2 = {<<"head">>,[],[{<<"link">>,[],[]}, {<<"link">>,[],[]}]}, ++ ?assertEqual(D2, iolist_to_binary(to_html(T2))), ++ ++ %% Make sure singletons are converted to singletons. ++ D3 = <<"">>, ++ T3 = {<<"head">>,[],[{<<"link">>,[],[<<"funny">>]}]}, ++ ?assertEqual(D3, iolist_to_binary(to_html(T3))), ++ ++ D4 = <<"">>, ++ T4 = {<<"link">>,[],[<<"funny">>]}, ++ ?assertEqual(D4, iolist_to_binary(to_html(T4))), ++ ++ ok. ++ ++parse_amp_test_() -> ++ [?_assertEqual( ++ {<<"html">>,[], ++ [{<<"body">>,[{<<"onload">>,<<"javascript:A('1&2')">>}],[]}]}, ++ mochiweb_html:parse("")), ++ ?_assertEqual( ++ {<<"html">>,[], ++ [{<<"body">>,[{<<"onload">>,<<"javascript:A('1& 2')">>}],[]}]}, ++ mochiweb_html:parse("")), ++ ?_assertEqual( ++ {<<"html">>,[], ++ [{<<"body">>,[],[<<"& ">>]}]}, ++ mochiweb_html:parse("& ")), ++ ?_assertEqual( ++ {<<"html">>,[], ++ [{<<"body">>,[],[<<"&">>]}]}, ++ mochiweb_html:parse("&"))]. ++ ++parse_unescaped_lt_test() -> ++ D1 = <<"">>, ++ ?assertEqual( ++ {<<"div">>, [], [<<" < < ">>, {<<"a">>, [{<<"href">>, <<"/">>}], ++ [<<"Back">>]}]}, ++ mochiweb_html:parse(D1)), ++ ++ D2 = <<"
<< Back
">>, ++ ?assertEqual( ++ {<<"div">>, [], [<<" << ">>, {<<"a">>, [{<<"href">>, <<"/">>}], ++ [<<"Back">>]}]}, ++ mochiweb_html:parse(D2)). ++ + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_http.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_http.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_http.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_http.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -5,13 +5,13 @@ + + -module(mochiweb_http). + -author('bob@mochimedia.com'). +--export([start/0, start/1, stop/0, stop/1]). +--export([loop/2, default_body/1]). ++-export([start/1, start_link/1, stop/0, stop/1]). ++-export([loop/2]). + -export([after_response/2, reentry/1]). + -export([parse_range_request/1, range_skip_length/2]). + +--define(REQUEST_RECV_TIMEOUT, 300000). % timeout waiting for request line +--define(HEADERS_RECV_TIMEOUT, 30000). % timeout waiting for headers ++-define(REQUEST_RECV_TIMEOUT, 300000). %% timeout waiting for request line ++-define(HEADERS_RECV_TIMEOUT, 30000). %% timeout waiting for headers + + -define(MAX_HEADERS, 1000). + -define(DEFAULTS, [{name, ?MODULE}, +@@ -19,9 +19,7 @@ + + parse_options(Options) -> + {loop, HttpLoop} = proplists:lookup(loop, Options), +- Loop = fun (S) -> +- ?MODULE:loop(S, HttpLoop) +- end, ++ Loop = {?MODULE, loop, [HttpLoop]}, + Options1 = [{loop, Loop} | proplists:delete(loop, Options)], + mochilists:set_defaults(?DEFAULTS, Options1). + +@@ -31,15 +29,12 @@ + stop(Name) -> + mochiweb_socket_server:stop(Name). + +-start() -> +- start([{ip, "127.0.0.1"}, +- {loop, {?MODULE, default_body}}]). +- + %% @spec start(Options) -> ServerRet + %% Options = [option()] + %% Option = {name, atom()} | {ip, string() | tuple()} | {backlog, integer()} + %% | {nodelay, boolean()} | {acceptor_pool_size, integer()} + %% | {ssl, boolean()} | {profile_fun, undefined | (Props) -> ok} ++%% | {link, false} + %% @doc Start a mochiweb server. + %% profile_fun is used to profile accept timing. + %% After each accept, if defined, profile_fun is called with a proplist of a subset of the mochiweb_socket_server state and timing information. +@@ -48,62 +43,18 @@ + start(Options) -> + mochiweb_socket_server:start(parse_options(Options)). + +-frm(Body) -> +- ["" +- "
" +- "" +- "" +- "
" +- "
" +- "
" +- "" +- "" +- "" +- "
" +- "
", Body, "
" +- ""]. +- +-default_body(Req, M, "/chunked") when M =:= 'GET'; M =:= 'HEAD' -> +- Res = Req:ok({"text/plain", [], chunked}), +- Res:write_chunk("First chunk\r\n"), +- timer:sleep(5000), +- Res:write_chunk("Last chunk\r\n"), +- Res:write_chunk(""); +-default_body(Req, M, _Path) when M =:= 'GET'; M =:= 'HEAD' -> +- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, +- {parse_cookie, Req:parse_cookie()}, +- Req:dump()]]), +- Req:ok({"text/html", +- [mochiweb_cookies:cookie("mochiweb_http", "test_cookie")], +- frm(Body)}); +-default_body(Req, 'POST', "/multipart") -> +- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, +- {parse_cookie, Req:parse_cookie()}, +- {body, Req:recv_body()}, +- Req:dump()]]), +- Req:ok({"text/html", [], frm(Body)}); +-default_body(Req, 'POST', _Path) -> +- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, +- {parse_cookie, Req:parse_cookie()}, +- {parse_post, Req:parse_post()}, +- Req:dump()]]), +- Req:ok({"text/html", [], frm(Body)}); +-default_body(Req, _Method, _Path) -> +- Req:respond({501, [], []}). +- +-default_body(Req) -> +- default_body(Req, Req:get(method), Req:get(path)). ++start_link(Options) -> ++ mochiweb_socket_server:start_link(parse_options(Options)). + + loop(Socket, Body) -> +- mochiweb_socket:setopts(Socket, [{packet, http}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, http}]), + request(Socket, Body). + + request(Socket, Body) -> +- mochiweb_socket:setopts(Socket, [{active, once}]), ++ ok = mochiweb_socket:setopts(Socket, [{active, once}]), + receive + {Protocol, _, {http_request, Method, Path, Version}} when Protocol == http orelse Protocol == ssl -> +- mochiweb_socket:setopts(Socket, [{packet, httph}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, httph}]), + headers(Socket, {Method, Path, Version}, [], Body, 0); + {Protocol, _, {http_error, "\r\n"}} when Protocol == http orelse Protocol == ssl -> + request(Socket, Body); +@@ -112,6 +63,13 @@ + {tcp_closed, _} -> + mochiweb_socket:close(Socket), + exit(normal); ++ {ssl_closed, _} -> ++ mochiweb_socket:close(Socket), ++ exit(normal); ++ {tcp_error,_,emsgsize} -> ++ % R15B02 returns this then closes the socket, so close and exit ++ mochiweb_socket:close(Socket), ++ exit(normal); + _Other -> + handle_invalid_request(Socket) + after ?REQUEST_RECV_TIMEOUT -> +@@ -126,10 +84,10 @@ + + headers(Socket, Request, Headers, _Body, ?MAX_HEADERS) -> + %% Too many headers sent, bad request. +- mochiweb_socket:setopts(Socket, [{packet, raw}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), + handle_invalid_request(Socket, Request, Headers); + headers(Socket, Request, Headers, Body, HeaderCount) -> +- mochiweb_socket:setopts(Socket, [{active, once}]), ++ ok = mochiweb_socket:setopts(Socket, [{active, once}]), + receive + {Protocol, _, http_eoh} when Protocol == http orelse Protocol == ssl -> + Req = new_request(Socket, Request, Headers), +@@ -141,6 +99,10 @@ + {tcp_closed, _} -> + mochiweb_socket:close(Socket), + exit(normal); ++ {tcp_error,_,emsgsize} -> ++ % R15B02 returns this then closes the socket, so close and exit ++ mochiweb_socket:close(Socket), ++ exit(normal); + _Other -> + handle_invalid_request(Socket, Request, Headers) + after ?HEADERS_RECV_TIMEOUT -> +@@ -148,14 +110,19 @@ + exit(normal) + end. + ++call_body({M, F, A}, Req) -> ++ erlang:apply(M, F, [Req | A]); + call_body({M, F}, Req) -> + M:F(Req); + call_body(Body, Req) -> + Body(Req). + ++-spec handle_invalid_request(term()) -> no_return(). + handle_invalid_request(Socket) -> +- handle_invalid_request(Socket, {'GET', {abs_path, "/"}, {0,9}}, []). ++ handle_invalid_request(Socket, {'GET', {abs_path, "/"}, {0,9}}, []), ++ exit(normal). + ++-spec handle_invalid_request(term(), term(), term()) -> no_return(). + handle_invalid_request(Socket, Request, RevHeaders) -> + Req = new_request(Socket, Request, RevHeaders), + Req:respond({400, [], []}), +@@ -163,7 +130,7 @@ + exit(normal). + + new_request(Socket, Request, RevHeaders) -> +- mochiweb_socket:setopts(Socket, [{packet, raw}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), + mochiweb:new_request({Socket, Request, lists:reverse(RevHeaders)}). + + after_response(Body, Req) -> +@@ -174,6 +141,7 @@ + exit(normal); + false -> + Req:cleanup(), ++ erlang:garbage_collect(), + ?MODULE:loop(Socket, Body) + end. + +@@ -211,6 +179,8 @@ + invalid_range; + {Start, End} when 0 =< Start, Start =< End, End < Size -> + {Start, End - Start + 1}; ++ {Start, End} when 0 =< Start, Start =< End, End >= Size -> ++ {Start, Size - Start}; + {_OutOfRange, _End} -> + invalid_range + end. +@@ -218,8 +188,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + range_test() -> + %% valid, single ranges +@@ -265,19 +235,23 @@ + BodySizeLess1 = BodySize - 1, + ?assertEqual({BodySizeLess1, 1}, + range_skip_length({BodySize - 1, none}, BodySize)), ++ ?assertEqual({BodySizeLess1, 1}, ++ range_skip_length({BodySize - 1, BodySize+5}, BodySize)), ++ ?assertEqual({BodySizeLess1, 1}, ++ range_skip_length({BodySize - 1, BodySize}, BodySize)), + + %% out of range, return whole thing + ?assertEqual({0, BodySize}, + range_skip_length({none, BodySize + 1}, BodySize)), + ?assertEqual({0, BodySize}, + range_skip_length({none, -1}, BodySize)), ++ ?assertEqual({0, BodySize}, ++ range_skip_length({0, BodySize + 1}, BodySize)), + + %% invalid ranges + ?assertEqual(invalid_range, + range_skip_length({-1, 30}, BodySize)), + ?assertEqual(invalid_range, +- range_skip_length({0, BodySize + 1}, BodySize)), +- ?assertEqual(invalid_range, + range_skip_length({-1, BodySize + 1}, BodySize)), + ?assertEqual(invalid_range, + range_skip_length({BodySize, 40}, BodySize)), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_io.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_io.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_io.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_io.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -38,9 +38,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). +- +- +- ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_mime.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_mime.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_mime.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_mime.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -11,72 +11,393 @@ + %% @doc Given a filename extension (e.g. ".html") return a guess for the MIME + %% type such as "text/html". Will return the atom undefined if no good + %% guess is available. +-from_extension(".html") -> +- "text/html"; +-from_extension(".xhtml") -> +- "application/xhtml+xml"; +-from_extension(".xml") -> +- "application/xml"; +-from_extension(".css") -> +- "text/css"; ++ ++from_extension(".stl") -> ++ "application/SLA"; ++from_extension(".stp") -> ++ "application/STEP"; ++from_extension(".step") -> ++ "application/STEP"; ++from_extension(".dwg") -> ++ "application/acad"; ++from_extension(".ez") -> ++ "application/andrew-inset"; ++from_extension(".ccad") -> ++ "application/clariscad"; ++from_extension(".drw") -> ++ "application/drafting"; ++from_extension(".tsp") -> ++ "application/dsptype"; ++from_extension(".dxf") -> ++ "application/dxf"; ++from_extension(".xls") -> ++ "application/excel"; ++from_extension(".unv") -> ++ "application/i-deas"; ++from_extension(".jar") -> ++ "application/java-archive"; ++from_extension(".hqx") -> ++ "application/mac-binhex40"; ++from_extension(".cpt") -> ++ "application/mac-compactpro"; ++from_extension(".pot") -> ++ "application/vnd.ms-powerpoint"; ++from_extension(".ppt") -> ++ "application/vnd.ms-powerpoint"; ++from_extension(".dms") -> ++ "application/octet-stream"; ++from_extension(".lha") -> ++ "application/octet-stream"; ++from_extension(".lzh") -> ++ "application/octet-stream"; ++from_extension(".oda") -> ++ "application/oda"; ++from_extension(".ogg") -> ++ "application/ogg"; ++from_extension(".ogm") -> ++ "application/ogg"; ++from_extension(".pdf") -> ++ "application/pdf"; ++from_extension(".pgp") -> ++ "application/pgp"; ++from_extension(".ai") -> ++ "application/postscript"; ++from_extension(".eps") -> ++ "application/postscript"; ++from_extension(".ps") -> ++ "application/postscript"; ++from_extension(".prt") -> ++ "application/pro_eng"; ++from_extension(".rtf") -> ++ "application/rtf"; ++from_extension(".smi") -> ++ "application/smil"; ++from_extension(".smil") -> ++ "application/smil"; ++from_extension(".sol") -> ++ "application/solids"; ++from_extension(".vda") -> ++ "application/vda"; ++from_extension(".xlm") -> ++ "application/vnd.ms-excel"; ++from_extension(".cod") -> ++ "application/vnd.rim.cod"; ++from_extension(".pgn") -> ++ "application/x-chess-pgn"; ++from_extension(".cpio") -> ++ "application/x-cpio"; ++from_extension(".csh") -> ++ "application/x-csh"; ++from_extension(".deb") -> ++ "application/x-debian-package"; ++from_extension(".dcr") -> ++ "application/x-director"; ++from_extension(".dir") -> ++ "application/x-director"; ++from_extension(".dxr") -> ++ "application/x-director"; ++from_extension(".gz") -> ++ "application/x-gzip"; ++from_extension(".hdf") -> ++ "application/x-hdf"; ++from_extension(".ipx") -> ++ "application/x-ipix"; ++from_extension(".ips") -> ++ "application/x-ipscript"; + from_extension(".js") -> + "application/x-javascript"; +-from_extension(".jpg") -> +- "image/jpeg"; +-from_extension(".gif") -> +- "image/gif"; +-from_extension(".png") -> +- "image/png"; ++from_extension(".skd") -> ++ "application/x-koan"; ++from_extension(".skm") -> ++ "application/x-koan"; ++from_extension(".skp") -> ++ "application/x-koan"; ++from_extension(".skt") -> ++ "application/x-koan"; ++from_extension(".latex") -> ++ "application/x-latex"; ++from_extension(".lsp") -> ++ "application/x-lisp"; ++from_extension(".scm") -> ++ "application/x-lotusscreencam"; ++from_extension(".mif") -> ++ "application/x-mif"; ++from_extension(".com") -> ++ "application/x-msdos-program"; ++from_extension(".exe") -> ++ "application/octet-stream"; ++from_extension(".cdf") -> ++ "application/x-netcdf"; ++from_extension(".nc") -> ++ "application/x-netcdf"; ++from_extension(".pl") -> ++ "application/x-perl"; ++from_extension(".pm") -> ++ "application/x-perl"; ++from_extension(".rar") -> ++ "application/x-rar-compressed"; ++from_extension(".sh") -> ++ "application/x-sh"; ++from_extension(".shar") -> ++ "application/x-shar"; + from_extension(".swf") -> + "application/x-shockwave-flash"; +-from_extension(".zip") -> +- "application/zip"; +-from_extension(".bz2") -> +- "application/x-bzip2"; +-from_extension(".gz") -> +- "application/x-gzip"; ++from_extension(".sit") -> ++ "application/x-stuffit"; ++from_extension(".sv4cpio") -> ++ "application/x-sv4cpio"; ++from_extension(".sv4crc") -> ++ "application/x-sv4crc"; ++from_extension(".tar.gz") -> ++ "application/x-tar-gz"; ++from_extension(".tgz") -> ++ "application/x-tar-gz"; + from_extension(".tar") -> + "application/x-tar"; +-from_extension(".tgz") -> +- "application/x-gzip"; ++from_extension(".tcl") -> ++ "application/x-tcl"; ++from_extension(".texi") -> ++ "application/x-texinfo"; ++from_extension(".texinfo") -> ++ "application/x-texinfo"; ++from_extension(".man") -> ++ "application/x-troff-man"; ++from_extension(".me") -> ++ "application/x-troff-me"; ++from_extension(".ms") -> ++ "application/x-troff-ms"; ++from_extension(".roff") -> ++ "application/x-troff"; ++from_extension(".t") -> ++ "application/x-troff"; ++from_extension(".tr") -> ++ "application/x-troff"; ++from_extension(".ustar") -> ++ "application/x-ustar"; ++from_extension(".src") -> ++ "application/x-wais-source"; ++from_extension(".zip") -> ++ "application/zip"; ++from_extension(".tsi") -> ++ "audio/TSP-audio"; ++from_extension(".au") -> ++ "audio/basic"; ++from_extension(".snd") -> ++ "audio/basic"; ++from_extension(".kar") -> ++ "audio/midi"; ++from_extension(".mid") -> ++ "audio/midi"; ++from_extension(".midi") -> ++ "audio/midi"; ++from_extension(".mp2") -> ++ "audio/mpeg"; ++from_extension(".mp3") -> ++ "audio/mpeg"; ++from_extension(".mpga") -> ++ "audio/mpeg"; ++from_extension(".aif") -> ++ "audio/x-aiff"; ++from_extension(".aifc") -> ++ "audio/x-aiff"; ++from_extension(".aiff") -> ++ "audio/x-aiff"; ++from_extension(".m3u") -> ++ "audio/x-mpegurl"; ++from_extension(".wax") -> ++ "audio/x-ms-wax"; ++from_extension(".wma") -> ++ "audio/x-ms-wma"; ++from_extension(".rpm") -> ++ "audio/x-pn-realaudio-plugin"; ++from_extension(".ram") -> ++ "audio/x-pn-realaudio"; ++from_extension(".rm") -> ++ "audio/x-pn-realaudio"; ++from_extension(".ra") -> ++ "audio/x-realaudio"; ++from_extension(".wav") -> ++ "audio/x-wav"; ++from_extension(".pdb") -> ++ "chemical/x-pdb"; ++from_extension(".ras") -> ++ "image/cmu-raster"; ++from_extension(".gif") -> ++ "image/gif"; ++from_extension(".ief") -> ++ "image/ief"; ++from_extension(".jpe") -> ++ "image/jpeg"; ++from_extension(".jpeg") -> ++ "image/jpeg"; ++from_extension(".jpg") -> ++ "image/jpeg"; ++from_extension(".jp2") -> ++ "image/jp2"; ++from_extension(".png") -> ++ "image/png"; ++from_extension(".tif") -> ++ "image/tiff"; ++from_extension(".tiff") -> ++ "image/tiff"; ++from_extension(".pnm") -> ++ "image/x-portable-anymap"; ++from_extension(".pbm") -> ++ "image/x-portable-bitmap"; ++from_extension(".pgm") -> ++ "image/x-portable-graymap"; ++from_extension(".ppm") -> ++ "image/x-portable-pixmap"; ++from_extension(".rgb") -> ++ "image/x-rgb"; ++from_extension(".xbm") -> ++ "image/x-xbitmap"; ++from_extension(".xwd") -> ++ "image/x-xwindowdump"; ++from_extension(".iges") -> ++ "model/iges"; ++from_extension(".igs") -> ++ "model/iges"; ++from_extension(".mesh") -> ++ "model/mesh"; ++from_extension(".") -> ++ ""; ++from_extension(".msh") -> ++ "model/mesh"; ++from_extension(".silo") -> ++ "model/mesh"; ++from_extension(".vrml") -> ++ "model/vrml"; ++from_extension(".wrl") -> ++ "model/vrml"; ++from_extension(".css") -> ++ "text/css"; ++from_extension(".htm") -> ++ "text/html"; ++from_extension(".html") -> ++ "text/html"; ++from_extension(".asc") -> ++ "text/plain"; ++from_extension(".c") -> ++ "text/plain"; ++from_extension(".cc") -> ++ "text/plain"; ++from_extension(".f90") -> ++ "text/plain"; ++from_extension(".f") -> ++ "text/plain"; ++from_extension(".hh") -> ++ "text/plain"; ++from_extension(".m") -> ++ "text/plain"; + from_extension(".txt") -> + "text/plain"; +-from_extension(".doc") -> +- "application/msword"; +-from_extension(".pdf") -> +- "application/pdf"; +-from_extension(".xls") -> +- "application/vnd.ms-excel"; +-from_extension(".rtf") -> +- "application/rtf"; ++from_extension(".rtx") -> ++ "text/richtext"; ++from_extension(".sgm") -> ++ "text/sgml"; ++from_extension(".sgml") -> ++ "text/sgml"; ++from_extension(".tsv") -> ++ "text/tab-separated-values"; ++from_extension(".jad") -> ++ "text/vnd.sun.j2me.app-descriptor"; ++from_extension(".etx") -> ++ "text/x-setext"; ++from_extension(".xml") -> ++ "application/xml"; ++from_extension(".dl") -> ++ "video/dl"; ++from_extension(".fli") -> ++ "video/fli"; ++from_extension(".flv") -> ++ "video/x-flv"; ++from_extension(".gl") -> ++ "video/gl"; ++from_extension(".mp4") -> ++ "video/mp4"; ++from_extension(".mpe") -> ++ "video/mpeg"; ++from_extension(".mpeg") -> ++ "video/mpeg"; ++from_extension(".mpg") -> ++ "video/mpeg"; + from_extension(".mov") -> + "video/quicktime"; +-from_extension(".mp3") -> +- "audio/mpeg"; ++from_extension(".qt") -> ++ "video/quicktime"; ++from_extension(".viv") -> ++ "video/vnd.vivo"; ++from_extension(".vivo") -> ++ "video/vnd.vivo"; ++from_extension(".asf") -> ++ "video/x-ms-asf"; ++from_extension(".asx") -> ++ "video/x-ms-asx"; ++from_extension(".wmv") -> ++ "video/x-ms-wmv"; ++from_extension(".wmx") -> ++ "video/x-ms-wmx"; ++from_extension(".wvx") -> ++ "video/x-ms-wvx"; ++from_extension(".avi") -> ++ "video/x-msvideo"; ++from_extension(".movie") -> ++ "video/x-sgi-movie"; ++from_extension(".mime") -> ++ "www/mime"; ++from_extension(".ice") -> ++ "x-conference/x-cooltalk"; ++from_extension(".vrm") -> ++ "x-world/x-vrml"; ++from_extension(".spx") -> ++ "audio/ogg"; ++from_extension(".xhtml") -> ++ "application/xhtml+xml"; ++from_extension(".bz2") -> ++ "application/x-bzip2"; ++from_extension(".doc") -> ++ "application/msword"; + from_extension(".z") -> + "application/x-compress"; +-from_extension(".wav") -> +- "audio/x-wav"; + from_extension(".ico") -> + "image/x-icon"; + from_extension(".bmp") -> + "image/bmp"; + from_extension(".m4a") -> + "audio/mpeg"; +-from_extension(".m3u") -> +- "audio/x-mpegurl"; +-from_extension(".exe") -> +- "application/octet-stream"; + from_extension(".csv") -> + "text/csv"; ++from_extension(".eot") -> ++ "application/vnd.ms-fontobject"; ++from_extension(".m4v") -> ++ "video/mp4"; ++from_extension(".svg") -> ++ "image/svg+xml"; ++from_extension(".svgz") -> ++ "image/svg+xml"; ++from_extension(".ttc") -> ++ "application/x-font-ttf"; ++from_extension(".ttf") -> ++ "application/x-font-ttf"; ++from_extension(".vcf") -> ++ "text/x-vcard"; ++from_extension(".webm") -> ++ "video/web"; ++from_extension(".webp") -> ++ "image/web"; ++from_extension(".woff") -> ++ "application/x-font-woff"; ++from_extension(".otf") -> ++ "font/opentype"; + from_extension(_) -> + undefined. + + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + exhaustive_from_extension_test() -> + T = mochiweb_cover:clause_lookup_table(?MODULE, from_extension), +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_multipart.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_multipart.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_multipart.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_multipart.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -128,7 +128,7 @@ + + parse_multipart_request(Req, Callback) -> + %% TODO: Support chunked? +- Length = list_to_integer(Req:get_header_value("content-length")), ++ Length = list_to_integer(Req:get_combined_header_value("content-length")), + Boundary = iolist_to_binary( + get_boundary(Req:get_header_value("content-type"))), + Prefix = <<"\r\n--", Boundary/binary>>, +@@ -240,24 +240,22 @@ + S + end. + +-find_in_binary(B, Data) when size(B) > 0 -> +- case size(Data) - size(B) of ++%% @spec find_in_binary(Pattern::binary(), Data::binary()) -> ++%% {exact, N} | {partial, N, K} | not_found ++%% @doc Searches for the given pattern in the given binary. ++find_in_binary(P, Data) when size(P) > 0 -> ++ PS = size(P), ++ DS = size(Data), ++ case DS - PS of + Last when Last < 0 -> +- partial_find(B, Data, 0, size(Data)); ++ partial_find(P, Data, 0, DS); + Last -> +- find_in_binary(B, size(B), Data, 0, Last) ++ case binary:match(Data, P) of ++ {Pos, _} -> {exact, Pos}; ++ nomatch -> partial_find(P, Data, Last+1, PS-1) ++ end + end. + +-find_in_binary(B, BS, D, N, Last) when N =< Last-> +- case D of +- <<_:N/binary, B:BS/binary, _/binary>> -> +- {exact, N}; +- _ -> +- find_in_binary(B, BS, D, 1 + N, Last) +- end; +-find_in_binary(B, BS, D, N, Last) when N =:= 1 + Last -> +- partial_find(B, D, N, BS - 1). +- + partial_find(_B, _D, _N, 0) -> + not_found; + partial_find(B, D, N, K) -> +@@ -295,8 +293,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + ssl_cert_opts() -> + EbinDir = filename:dirname(code:which(?MODULE)), +@@ -313,7 +311,7 @@ + ssl -> + ServerOpts0 ++ [{ssl, true}, {ssl_opts, ssl_cert_opts()}] + end, +- {ok, Server} = mochiweb_socket_server:start(ServerOpts), ++ {ok, Server} = mochiweb_socket_server:start_link(ServerOpts), + Port = mochiweb_socket_server:get(Server, port), + ClientOpts = [binary, {active, false}], + {ok, Client} = case Transport of +@@ -821,4 +819,54 @@ + 10))), + ok. + ++%% @todo Move somewhere more appropriate than in the test suite ++ ++multipart_parsing_benchmark_test() -> ++ run_multipart_parsing_benchmark(1). ++ ++run_multipart_parsing_benchmark(0) -> ok; ++run_multipart_parsing_benchmark(N) -> ++ multipart_parsing_benchmark(), ++ run_multipart_parsing_benchmark(N-1). ++ ++multipart_parsing_benchmark() -> ++ ContentType = "multipart/form-data; boundary=----------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5", ++ Chunk = binary:copy(<<"This Is_%Some=Quite0Long4String2Used9For7BenchmarKing.5">>, 102400), ++ BinContent = <<"------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"Filename\"\r\n\r\nhello.txt\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"success_action_status\"\r\n\r\n201\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"file\"; filename=\"hello.txt\"\r\nContent-Type: application/octet-stream\r\n\r\n", Chunk/binary, "\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"Upload\"\r\n\r\nSubmit Query\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5--">>, ++ Expect = [{headers, ++ [{"content-disposition", ++ {"form-data", [{"name", "Filename"}]}}]}, ++ {body, <<"hello.txt">>}, ++ body_end, ++ {headers, ++ [{"content-disposition", ++ {"form-data", [{"name", "success_action_status"}]}}]}, ++ {body, <<"201">>}, ++ body_end, ++ {headers, ++ [{"content-disposition", ++ {"form-data", [{"name", "file"}, {"filename", "hello.txt"}]}}, ++ {"content-type", {"application/octet-stream", []}}]}, ++ {body, Chunk}, ++ body_end, ++ {headers, ++ [{"content-disposition", ++ {"form-data", [{"name", "Upload"}]}}]}, ++ {body, <<"Submit Query">>}, ++ body_end, ++ eof], ++ TestCallback = fun (Next) -> test_callback(Next, Expect) end, ++ ServerFun = fun (Socket) -> ++ ok = mochiweb_socket:send(Socket, BinContent), ++ exit(normal) ++ end, ++ ClientFun = fun (Socket) -> ++ Req = fake_request(Socket, ContentType, ++ byte_size(BinContent)), ++ Res = parse_multipart_request(Req, TestCallback), ++ {0, <<>>, ok} = Res, ++ ok ++ end, ++ ok = with_socket_server(plain, ServerFun, ClientFun), ++ ok. + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_request.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_request.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -3,7 +3,7 @@ + + %% @doc MochiWeb HTTP Request abstraction. + +--module(mochiweb_request, [Socket, Method, RawPath, Version, Headers]). ++-module(mochiweb_request). + -author('bob@mochimedia.com'). + + -include_lib("kernel/include/file.hrl"). +@@ -11,17 +11,18 @@ + + -define(QUIP, "Any of you quaids got a smint?"). + +--export([get_header_value/1, get_primary_header_value/1, get/1, dump/0]). +--export([send/1, recv/1, recv/2, recv_body/0, recv_body/1, stream_body/3]). +--export([start_response/1, start_response_length/1, start_raw_response/1]). +--export([respond/1, ok/1]). +--export([not_found/0, not_found/1]). +--export([parse_post/0, parse_qs/0]). +--export([should_close/0, cleanup/0]). +--export([parse_cookie/0, get_cookie_value/1]). +--export([serve_file/2, serve_file/3]). +--export([accepted_encodings/1]). +--export([accepts_content_type/1]). ++-export([new/5]). ++-export([get_header_value/2, get_primary_header_value/2, get_combined_header_value/2, get/2, dump/1]). ++-export([send/2, recv/2, recv/3, recv_body/1, recv_body/2, stream_body/4]). ++-export([start_response/2, start_response_length/2, start_raw_response/2]). ++-export([respond/2, ok/2]). ++-export([not_found/1, not_found/2]). ++-export([parse_post/1, parse_qs/1]). ++-export([should_close/1, cleanup/1]). ++-export([parse_cookie/1, get_cookie_value/2]). ++-export([serve_file/3, serve_file/4]). ++-export([accepted_encodings/2]). ++-export([accepts_content_type/2, accepted_content_types/2]). + + -define(SAVE_QS, mochiweb_request_qs). + -define(SAVE_PATH, mochiweb_request_path). +@@ -32,11 +33,10 @@ + -define(SAVE_COOKIE, mochiweb_request_cookie). + -define(SAVE_FORCE_CLOSE, mochiweb_request_force_close). + +-%% @type iolist() = [iolist() | binary() | char()]. +-%% @type iodata() = binary() | iolist(). + %% @type key() = atom() | string() | binary() + %% @type value() = atom() | string() | binary() | integer() + %% @type headers(). A mochiweb_headers structure. ++%% @type request(). A mochiweb_request parameterized module instance. + %% @type response(). A mochiweb_response parameterized module instance. + %% @type ioheaders() = headers() | [{key(), value()}]. + +@@ -46,50 +46,58 @@ + % Maximum recv_body() length of 1MB + -define(MAX_RECV_BODY, (1024*1024)). + +-%% @spec get_header_value(K) -> undefined | Value ++%% @spec new(Socket, Method, RawPath, Version, headers()) -> request() ++%% @doc Create a new request instance. ++new(Socket, Method, RawPath, Version, Headers) -> ++ {?MODULE, [Socket, Method, RawPath, Version, Headers]}. ++ ++%% @spec get_header_value(K, request()) -> undefined | Value + %% @doc Get the value of a given request header. +-get_header_value(K) -> ++get_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> + mochiweb_headers:get_value(K, Headers). + +-get_primary_header_value(K) -> ++get_primary_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> + mochiweb_headers:get_primary_value(K, Headers). + ++get_combined_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> ++ mochiweb_headers:get_combined_value(K, Headers). ++ + %% @type field() = socket | scheme | method | raw_path | version | headers | peer | path | body_length | range + +-%% @spec get(field()) -> term() ++%% @spec get(field(), request()) -> term() + %% @doc Return the internal representation of the given field. If + %% socket is requested on a HTTPS connection, then + %% an ssl socket will be returned as {ssl, SslSocket}. + %% You can use SslSocket with the ssl + %% application, eg: ssl:peercert(SslSocket). +-get(socket) -> ++get(socket, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + Socket; +-get(scheme) -> ++get(scheme, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + case mochiweb_socket:type(Socket) of + plain -> + http; + ssl -> + https + end; +-get(method) -> ++get(method, {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}) -> + Method; +-get(raw_path) -> ++get(raw_path, {?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> + RawPath; +-get(version) -> ++get(version, {?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}) -> + Version; +-get(headers) -> ++get(headers, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> + Headers; +-get(peer) -> ++get(peer, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case mochiweb_socket:peername(Socket) of + {ok, {Addr={10, _, _, _}, _Port}} -> +- case get_header_value("x-forwarded-for") of ++ case get_header_value("x-forwarded-for", THIS) of + undefined -> + inet_parse:ntoa(Addr); + Hosts -> + string:strip(lists:last(string:tokens(Hosts, ","))) + end; + {ok, {{127, 0, 0, 1}, _Port}} -> +- case get_header_value("x-forwarded-for") of ++ case get_header_value("x-forwarded-for", THIS) of + undefined -> + "127.0.0.1"; + Hosts -> +@@ -100,7 +108,7 @@ + {error, enotconn} -> + exit(normal) + end; +-get(path) -> ++get(path, {?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> + case erlang:get(?SAVE_PATH) of + undefined -> + {Path0, _, _} = mochiweb_util:urlsplit_path(RawPath), +@@ -110,35 +118,35 @@ + Cached -> + Cached + end; +-get(body_length) -> ++get(body_length, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case erlang:get(?SAVE_BODY_LENGTH) of + undefined -> +- BodyLength = body_length(), ++ BodyLength = body_length(THIS), + put(?SAVE_BODY_LENGTH, {cached, BodyLength}), + BodyLength; + {cached, Cached} -> + Cached + end; +-get(range) -> +- case get_header_value(range) of ++get(range, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ case get_header_value(range, THIS) of + undefined -> + undefined; + RawRange -> + mochiweb_http:parse_range_request(RawRange) + end. + +-%% @spec dump() -> {mochiweb_request, [{atom(), term()}]} ++%% @spec dump(request()) -> {mochiweb_request, [{atom(), term()}]} + %% @doc Dump the internal representation to a "human readable" set of terms + %% for debugging/inspection purposes. +-dump() -> ++dump({?MODULE, [_Socket, Method, RawPath, Version, Headers]}) -> + {?MODULE, [{method, Method}, + {version, Version}, + {raw_path, RawPath}, + {headers, mochiweb_headers:to_list(Headers)}]}. + +-%% @spec send(iodata()) -> ok ++%% @spec send(iodata(), request()) -> ok + %% @doc Send data over the socket. +-send(Data) -> ++send(Data, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + case mochiweb_socket:send(Socket, Data) of + ok -> + ok; +@@ -146,16 +154,16 @@ + exit(normal) + end. + +-%% @spec recv(integer()) -> binary() ++%% @spec recv(integer(), request()) -> binary() + %% @doc Receive Length bytes from the client as a binary, with the default + %% idle timeout. +-recv(Length) -> +- recv(Length, ?IDLE_TIMEOUT). ++recv(Length, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ recv(Length, ?IDLE_TIMEOUT, THIS). + +-%% @spec recv(integer(), integer()) -> binary() ++%% @spec recv(integer(), integer(), request()) -> binary() + %% @doc Receive Length bytes from the client as a binary, with the given + %% Timeout in msec. +-recv(Length, Timeout) -> ++recv(Length, Timeout, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + case mochiweb_socket:recv(Socket, Length, Timeout) of + {ok, Data} -> + put(?SAVE_RECV, true), +@@ -164,12 +172,12 @@ + exit(normal) + end. + +-%% @spec body_length() -> undefined | chunked | unknown_transfer_encoding | integer() ++%% @spec body_length(request()) -> undefined | chunked | unknown_transfer_encoding | integer() + %% @doc Infer body length from transfer-encoding and content-length headers. +-body_length() -> +- case get_header_value("transfer-encoding") of ++body_length({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ case get_header_value("transfer-encoding", THIS) of + undefined -> +- case get_header_value("content-length") of ++ case get_combined_header_value("content-length", THIS) of + undefined -> + undefined; + Length -> +@@ -182,16 +190,16 @@ + end. + + +-%% @spec recv_body() -> binary() ++%% @spec recv_body(request()) -> binary() + %% @doc Receive the body of the HTTP request (defined by Content-Length). + %% Will only receive up to the default max-body length of 1MB. +-recv_body() -> +- recv_body(?MAX_RECV_BODY). ++recv_body({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ recv_body(?MAX_RECV_BODY, THIS). + +-%% @spec recv_body(integer()) -> binary() ++%% @spec recv_body(integer(), request()) -> binary() + %% @doc Receive the body of the HTTP request (defined by Content-Length). + %% Will receive up to MaxBody bytes. +-recv_body(MaxBody) -> ++recv_body(MaxBody, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case erlang:get(?SAVE_BODY) of + undefined -> + % we could use a sane constant for max chunk size +@@ -205,17 +213,18 @@ + true -> + {NewLength, [Bin | BinAcc]} + end +- end, {0, []}, MaxBody), ++ end, {0, []}, MaxBody, THIS), + put(?SAVE_BODY, Body), + Body; + Cached -> Cached + end. + +-stream_body(MaxChunkSize, ChunkFun, FunState) -> +- stream_body(MaxChunkSize, ChunkFun, FunState, undefined). ++stream_body(MaxChunkSize, ChunkFun, FunState, {?MODULE,[_Socket,_Method,_RawPath,_Version,_Headers]}=THIS) -> ++ stream_body(MaxChunkSize, ChunkFun, FunState, undefined, THIS). + +-stream_body(MaxChunkSize, ChunkFun, FunState, MaxBodyLength) -> +- Expect = case get_header_value("expect") of ++stream_body(MaxChunkSize, ChunkFun, FunState, MaxBodyLength, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ Expect = case get_header_value("expect", THIS) of + undefined -> + undefined; + Value when is_list(Value) -> +@@ -223,11 +232,12 @@ + end, + case Expect of + "100-continue" -> +- start_raw_response({100, gb_trees:empty()}); ++ _ = start_raw_response({100, gb_trees:empty()}, THIS), ++ ok; + _Else -> + ok + end, +- case body_length() of ++ case body_length(THIS) of + undefined -> + undefined; + {unknown_transfer_encoding, Unknown} -> +@@ -236,7 +246,7 @@ + % In this case the MaxBody is actually used to + % determine the maximum allowed size of a single + % chunk. +- stream_chunked_body(MaxChunkSize, ChunkFun, FunState); ++ stream_chunked_body(MaxChunkSize, ChunkFun, FunState, THIS); + 0 -> + <<>>; + Length when is_integer(Length) -> +@@ -244,62 +254,64 @@ + MaxBodyLength when is_integer(MaxBodyLength), MaxBodyLength < Length -> + exit({body_too_large, content_length}); + _ -> +- stream_unchunked_body(Length, ChunkFun, FunState) +- end; +- Length -> +- exit({length_not_integer, Length}) ++ stream_unchunked_body(Length, ChunkFun, FunState, THIS) ++ end + end. + + +-%% @spec start_response({integer(), ioheaders()}) -> response() ++%% @spec start_response({integer(), ioheaders()}, request()) -> response() + %% @doc Start the HTTP response by sending the Code HTTP response and + %% ResponseHeaders. The server will set header defaults such as Server + %% and Date if not present in ResponseHeaders. +-start_response({Code, ResponseHeaders}) -> ++start_response({Code, ResponseHeaders}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + HResponse = mochiweb_headers:make(ResponseHeaders), + HResponse1 = mochiweb_headers:default_from_list(server_headers(), + HResponse), +- start_raw_response({Code, HResponse1}). ++ start_raw_response({Code, HResponse1}, THIS). + +-%% @spec start_raw_response({integer(), headers()}) -> response() ++%% @spec start_raw_response({integer(), headers()}, request()) -> response() + %% @doc Start the HTTP response by sending the Code HTTP response and + %% ResponseHeaders. +-start_raw_response({Code, ResponseHeaders}) -> ++start_raw_response({Code, ResponseHeaders}, {?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}=THIS) -> + F = fun ({K, V}, Acc) -> + [mochiweb_util:make_io(K), <<": ">>, V, <<"\r\n">> | Acc] + end, + End = lists:foldl(F, [<<"\r\n">>], + mochiweb_headers:to_list(ResponseHeaders)), +- send([make_version(Version), make_code(Code), <<"\r\n">> | End]), ++ send([make_version(Version), make_code(Code), <<"\r\n">> | End], THIS), + mochiweb:new_response({THIS, Code, ResponseHeaders}). + + +-%% @spec start_response_length({integer(), ioheaders(), integer()}) -> response() ++%% @spec start_response_length({integer(), ioheaders(), integer()}, request()) -> response() + %% @doc Start the HTTP response by sending the Code HTTP response and + %% ResponseHeaders including a Content-Length of Length. The server + %% will set header defaults such as Server + %% and Date if not present in ResponseHeaders. +-start_response_length({Code, ResponseHeaders, Length}) -> ++start_response_length({Code, ResponseHeaders, Length}, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + HResponse = mochiweb_headers:make(ResponseHeaders), + HResponse1 = mochiweb_headers:enter("Content-Length", Length, HResponse), +- start_response({Code, HResponse1}). ++ start_response({Code, HResponse1}, THIS). + +-%% @spec respond({integer(), ioheaders(), iodata() | chunked | {file, IoDevice}}) -> response() ++%% @spec respond({integer(), ioheaders(), iodata() | chunked | {file, IoDevice}}, request()) -> response() + %% @doc Start the HTTP response with start_response, and send Body to the + %% client (if the get(method) /= 'HEAD'). The Content-Length header + %% will be set by the Body length, and the server will insert header + %% defaults. +-respond({Code, ResponseHeaders, {file, IoDevice}}) -> ++respond({Code, ResponseHeaders, {file, IoDevice}}, ++ {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}=THIS) -> + Length = mochiweb_io:iodevice_size(IoDevice), +- Response = start_response_length({Code, ResponseHeaders, Length}), ++ Response = start_response_length({Code, ResponseHeaders, Length}, THIS), + case Method of + 'HEAD' -> + ok; + _ -> +- mochiweb_io:iodevice_stream(fun send/1, IoDevice) ++ mochiweb_io:iodevice_stream( ++ fun (Body) -> send(Body, THIS) end, ++ IoDevice) + end, + Response; +-respond({Code, ResponseHeaders, chunked}) -> ++respond({Code, ResponseHeaders, chunked}, {?MODULE, [_Socket, Method, _RawPath, Version, _Headers]}=THIS) -> + HResponse = mochiweb_headers:make(ResponseHeaders), + HResponse1 = case Method of + 'HEAD' -> +@@ -320,35 +332,35 @@ + put(?SAVE_FORCE_CLOSE, true), + HResponse + end, +- start_response({Code, HResponse1}); +-respond({Code, ResponseHeaders, Body}) -> +- Response = start_response_length({Code, ResponseHeaders, iolist_size(Body)}), ++ start_response({Code, HResponse1}, THIS); ++respond({Code, ResponseHeaders, Body}, {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}=THIS) -> ++ Response = start_response_length({Code, ResponseHeaders, iolist_size(Body)}, THIS), + case Method of + 'HEAD' -> + ok; + _ -> +- send(Body) ++ send(Body, THIS) + end, + Response. + +-%% @spec not_found() -> response() ++%% @spec not_found(request()) -> response() + %% @doc Alias for not_found([]). +-not_found() -> +- not_found([]). ++not_found({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ not_found([], THIS). + +-%% @spec not_found(ExtraHeaders) -> response() ++%% @spec not_found(ExtraHeaders, request()) -> response() + %% @doc Alias for respond({404, [{"Content-Type", "text/plain"} + %% | ExtraHeaders], <<"Not found.">>}). +-not_found(ExtraHeaders) -> ++not_found(ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + respond({404, [{"Content-Type", "text/plain"} | ExtraHeaders], +- <<"Not found.">>}). ++ <<"Not found.">>}, THIS). + +-%% @spec ok({value(), iodata()} | {value(), ioheaders(), iodata() | {file, IoDevice}}) -> ++%% @spec ok({value(), iodata()} | {value(), ioheaders(), iodata() | {file, IoDevice}}, request()) -> + %% response() + %% @doc respond({200, [{"Content-Type", ContentType} | Headers], Body}). +-ok({ContentType, Body}) -> +- ok({ContentType, [], Body}); +-ok({ContentType, ResponseHeaders, Body}) -> ++ok({ContentType, Body}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ ok({ContentType, [], Body}, THIS); ++ok({ContentType, ResponseHeaders, Body}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + HResponse = mochiweb_headers:make(ResponseHeaders), + case THIS:get(range) of + X when (X =:= undefined orelse X =:= fail) orelse Body =:= chunked -> +@@ -357,7 +369,7 @@ + %% full response. + HResponse1 = mochiweb_headers:enter("Content-Type", ContentType, + HResponse), +- respond({200, HResponse1, Body}); ++ respond({200, HResponse1, Body}, THIS); + Ranges -> + {PartList, Size} = range_parts(Body, Ranges), + case PartList of +@@ -366,7 +378,7 @@ + ContentType, + HResponse), + %% could be 416, for now we'll just return 200 +- respond({200, HResponse1, Body}); ++ respond({200, HResponse1, Body}, THIS); + PartList -> + {RangeHeaders, RangeBody} = + mochiweb_multipart:parts_to_body(PartList, ContentType, Size), +@@ -374,46 +386,50 @@ + [{"Accept-Ranges", "bytes"} | + RangeHeaders], + HResponse), +- respond({206, HResponse1, RangeBody}) ++ respond({206, HResponse1, RangeBody}, THIS) + end + end. + +-%% @spec should_close() -> bool() ++%% @spec should_close(request()) -> bool() + %% @doc Return true if the connection must be closed. If false, using + %% Keep-Alive should be safe. +-should_close() -> ++should_close({?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}=THIS) -> + ForceClose = erlang:get(?SAVE_FORCE_CLOSE) =/= undefined, + DidNotRecv = erlang:get(?SAVE_RECV) =:= undefined, + ForceClose orelse Version < {1, 0} + %% Connection: close +- orelse get_header_value("connection") =:= "close" ++ orelse is_close(get_header_value("connection", THIS)) + %% HTTP 1.0 requires Connection: Keep-Alive + orelse (Version =:= {1, 0} +- andalso get_header_value("connection") =/= "Keep-Alive") ++ andalso get_header_value("connection", THIS) =/= "Keep-Alive") + %% unread data left on the socket, can't safely continue + orelse (DidNotRecv +- andalso get_header_value("content-length") =/= undefined +- andalso list_to_integer(get_header_value("content-length")) > 0) ++ andalso get_combined_header_value("content-length", THIS) =/= undefined ++ andalso list_to_integer(get_combined_header_value("content-length", THIS)) > 0) + orelse (DidNotRecv +- andalso get_header_value("transfer-encoding") =:= "chunked"). ++ andalso get_header_value("transfer-encoding", THIS) =:= "chunked"). ++ ++is_close("close") -> ++ true; ++is_close(S=[_C, _L, _O, _S, _E]) -> ++ string:to_lower(S) =:= "close"; ++is_close(_) -> ++ false. + +-%% @spec cleanup() -> ok ++%% @spec cleanup(request()) -> ok + %% @doc Clean up any junk in the process dictionary, required before continuing + %% a Keep-Alive request. +-cleanup() -> +- [erase(K) || K <- [?SAVE_QS, +- ?SAVE_PATH, +- ?SAVE_RECV, +- ?SAVE_BODY, +- ?SAVE_BODY_LENGTH, +- ?SAVE_POST, +- ?SAVE_COOKIE, +- ?SAVE_FORCE_CLOSE]], ++cleanup({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}) -> ++ L = [?SAVE_QS, ?SAVE_PATH, ?SAVE_RECV, ?SAVE_BODY, ?SAVE_BODY_LENGTH, ++ ?SAVE_POST, ?SAVE_COOKIE, ?SAVE_FORCE_CLOSE], ++ lists:foreach(fun(K) -> ++ erase(K) ++ end, L), + ok. + +-%% @spec parse_qs() -> [{Key::string(), Value::string()}] ++%% @spec parse_qs(request()) -> [{Key::string(), Value::string()}] + %% @doc Parse the query string of the URL. +-parse_qs() -> ++parse_qs({?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> + case erlang:get(?SAVE_QS) of + undefined -> + {_, QueryString, _} = mochiweb_util:urlsplit_path(RawPath), +@@ -424,17 +440,17 @@ + Cached + end. + +-%% @spec get_cookie_value(Key::string) -> string() | undefined ++%% @spec get_cookie_value(Key::string, request()) -> string() | undefined + %% @doc Get the value of the given cookie. +-get_cookie_value(Key) -> +- proplists:get_value(Key, parse_cookie()). ++get_cookie_value(Key, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ proplists:get_value(Key, parse_cookie(THIS)). + +-%% @spec parse_cookie() -> [{Key::string(), Value::string()}] ++%% @spec parse_cookie(request()) -> [{Key::string(), Value::string()}] + %% @doc Parse the cookie header. +-parse_cookie() -> ++parse_cookie({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case erlang:get(?SAVE_COOKIE) of + undefined -> +- Cookies = case get_header_value("cookie") of ++ Cookies = case get_header_value("cookie", THIS) of + undefined -> + []; + Value -> +@@ -446,17 +462,17 @@ + Cached + end. + +-%% @spec parse_post() -> [{Key::string(), Value::string()}] ++%% @spec parse_post(request()) -> [{Key::string(), Value::string()}] + %% @doc Parse an application/x-www-form-urlencoded form POST. This + %% has the side-effect of calling recv_body(). +-parse_post() -> ++parse_post({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case erlang:get(?SAVE_POST) of + undefined -> +- Parsed = case recv_body() of ++ Parsed = case recv_body(THIS) of + undefined -> + []; + Binary -> +- case get_primary_header_value("content-type") of ++ case get_primary_header_value("content-type",THIS) of + "application/x-www-form-urlencoded" ++ _ -> + mochiweb_util:parse_qs(Binary); + _ -> +@@ -469,41 +485,43 @@ + Cached + end. + +-%% @spec stream_chunked_body(integer(), fun(), term()) -> term() ++%% @spec stream_chunked_body(integer(), fun(), term(), request()) -> term() + %% @doc The function is called for each chunk. + %% Used internally by read_chunked_body. +-stream_chunked_body(MaxChunkSize, Fun, FunState) -> +- case read_chunk_length() of ++stream_chunked_body(MaxChunkSize, Fun, FunState, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ case read_chunk_length(THIS) of + 0 -> +- Fun({0, read_chunk(0)}, FunState); ++ Fun({0, read_chunk(0, THIS)}, FunState); + Length when Length > MaxChunkSize -> +- NewState = read_sub_chunks(Length, MaxChunkSize, Fun, FunState), +- stream_chunked_body(MaxChunkSize, Fun, NewState); ++ NewState = read_sub_chunks(Length, MaxChunkSize, Fun, FunState, THIS), ++ stream_chunked_body(MaxChunkSize, Fun, NewState, THIS); + Length -> +- NewState = Fun({Length, read_chunk(Length)}, FunState), +- stream_chunked_body(MaxChunkSize, Fun, NewState) ++ NewState = Fun({Length, read_chunk(Length, THIS)}, FunState), ++ stream_chunked_body(MaxChunkSize, Fun, NewState, THIS) + end. + +-stream_unchunked_body(0, Fun, FunState) -> ++stream_unchunked_body(0, Fun, FunState, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}) -> + Fun({0, <<>>}, FunState); +-stream_unchunked_body(Length, Fun, FunState) when Length > 0 -> ++stream_unchunked_body(Length, Fun, FunState, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) when Length > 0 -> + PktSize = case Length > ?RECBUF_SIZE of + true -> + ?RECBUF_SIZE; + false -> + Length + end, +- Bin = recv(PktSize), ++ Bin = recv(PktSize, THIS), + NewState = Fun({PktSize, Bin}, FunState), +- stream_unchunked_body(Length - PktSize, Fun, NewState). ++ stream_unchunked_body(Length - PktSize, Fun, NewState, THIS). + +-%% @spec read_chunk_length() -> integer() ++%% @spec read_chunk_length(request()) -> integer() + %% @doc Read the length of the next HTTP chunk. +-read_chunk_length() -> +- mochiweb_socket:setopts(Socket, [{packet, line}]), ++read_chunk_length({?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> ++ ok = mochiweb_socket:setopts(Socket, [{packet, line}]), + case mochiweb_socket:recv(Socket, 0, ?IDLE_TIMEOUT) of + {ok, Header} -> +- mochiweb_socket:setopts(Socket, [{packet, raw}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), + Splitter = fun (C) -> + C =/= $\r andalso C =/= $\n andalso C =/= $ + end, +@@ -513,11 +531,11 @@ + exit(normal) + end. + +-%% @spec read_chunk(integer()) -> Chunk::binary() | [Footer::binary()] ++%% @spec read_chunk(integer(), request()) -> Chunk::binary() | [Footer::binary()] + %% @doc Read in a HTTP chunk of the given length. If Length is 0, then read the + %% HTTP footers (as a list of binaries, since they're nominal). +-read_chunk(0) -> +- mochiweb_socket:setopts(Socket, [{packet, line}]), ++read_chunk(0, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> ++ ok = mochiweb_socket:setopts(Socket, [{packet, line}]), + F = fun (F1, Acc) -> + case mochiweb_socket:recv(Socket, 0, ?IDLE_TIMEOUT) of + {ok, <<"\r\n">>} -> +@@ -529,10 +547,10 @@ + end + end, + Footers = F(F, []), +- mochiweb_socket:setopts(Socket, [{packet, raw}]), ++ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), + put(?SAVE_RECV, true), + Footers; +-read_chunk(Length) -> ++read_chunk(Length, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> + case mochiweb_socket:recv(Socket, 2 + Length, ?IDLE_TIMEOUT) of + {ok, <>} -> + Chunk; +@@ -540,32 +558,34 @@ + exit(normal) + end. + +-read_sub_chunks(Length, MaxChunkSize, Fun, FunState) when Length > MaxChunkSize -> +- Bin = recv(MaxChunkSize), ++read_sub_chunks(Length, MaxChunkSize, Fun, FunState, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) when Length > MaxChunkSize -> ++ Bin = recv(MaxChunkSize, THIS), + NewState = Fun({size(Bin), Bin}, FunState), +- read_sub_chunks(Length - MaxChunkSize, MaxChunkSize, Fun, NewState); ++ read_sub_chunks(Length - MaxChunkSize, MaxChunkSize, Fun, NewState, THIS); + +-read_sub_chunks(Length, _MaxChunkSize, Fun, FunState) -> +- Fun({Length, read_chunk(Length)}, FunState). ++read_sub_chunks(Length, _MaxChunkSize, Fun, FunState, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ Fun({Length, read_chunk(Length, THIS)}, FunState). + +-%% @spec serve_file(Path, DocRoot) -> Response ++%% @spec serve_file(Path, DocRoot, request()) -> Response + %% @doc Serve a file relative to DocRoot. +-serve_file(Path, DocRoot) -> +- serve_file(Path, DocRoot, []). ++serve_file(Path, DocRoot, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ serve_file(Path, DocRoot, [], THIS). + +-%% @spec serve_file(Path, DocRoot, ExtraHeaders) -> Response ++%% @spec serve_file(Path, DocRoot, ExtraHeaders, request()) -> Response + %% @doc Serve a file relative to DocRoot. +-serve_file(Path, DocRoot, ExtraHeaders) -> ++serve_file(Path, DocRoot, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case mochiweb_util:safe_relative_path(Path) of + undefined -> +- not_found(ExtraHeaders); ++ not_found(ExtraHeaders, THIS); + RelPath -> + FullPath = filename:join([DocRoot, RelPath]), + case filelib:is_dir(FullPath) of + true -> +- maybe_redirect(RelPath, FullPath, ExtraHeaders); ++ maybe_redirect(RelPath, FullPath, ExtraHeaders, THIS); + false -> +- maybe_serve_file(FullPath, ExtraHeaders) ++ maybe_serve_file(FullPath, ExtraHeaders, THIS) + end + end. + +@@ -575,13 +595,14 @@ + directory_index(FullPath) -> + filename:join([FullPath, "index.html"]). + +-maybe_redirect([], FullPath, ExtraHeaders) -> +- maybe_serve_file(directory_index(FullPath), ExtraHeaders); ++maybe_redirect([], FullPath, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ maybe_serve_file(directory_index(FullPath), ExtraHeaders, THIS); + +-maybe_redirect(RelPath, FullPath, ExtraHeaders) -> ++maybe_redirect(RelPath, FullPath, ExtraHeaders, ++ {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}=THIS) -> + case string:right(RelPath, 1) of + "/" -> +- maybe_serve_file(directory_index(FullPath), ExtraHeaders); ++ maybe_serve_file(directory_index(FullPath), ExtraHeaders, THIS); + _ -> + Host = mochiweb_headers:get_value("host", Headers), + Location = "http://" ++ Host ++ "/" ++ RelPath ++ "/", +@@ -596,16 +617,16 @@ + "

The document has moved >, + Bottom = <<">here.

\n">>, + Body = <>, +- respond({301, MoreHeaders, Body}) ++ respond({301, MoreHeaders, Body}, THIS) + end. + +-maybe_serve_file(File, ExtraHeaders) -> ++maybe_serve_file(File, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + case file:read_file_info(File) of + {ok, FileInfo} -> + LastModified = httpd_util:rfc1123_date(FileInfo#file_info.mtime), +- case get_header_value("if-modified-since") of ++ case get_header_value("if-modified-since", THIS) of + LastModified -> +- respond({304, ExtraHeaders, ""}); ++ respond({304, ExtraHeaders, ""}, THIS); + _ -> + case file:open(File, [raw, binary]) of + {ok, IoDevice} -> +@@ -613,15 +634,15 @@ + Res = ok({ContentType, + [{"last-modified", LastModified} + | ExtraHeaders], +- {file, IoDevice}}), +- file:close(IoDevice), ++ {file, IoDevice}}, THIS), ++ ok = file:close(IoDevice), + Res; + _ -> +- not_found(ExtraHeaders) ++ not_found(ExtraHeaders, THIS) + end + end; + {error, _} -> +- not_found(ExtraHeaders) ++ not_found(ExtraHeaders, THIS) + end. + + server_headers() -> +@@ -669,7 +690,7 @@ + end, + {lists:foldr(F, [], Ranges), Size}. + +-%% @spec accepted_encodings([encoding()]) -> [encoding()] | bad_accept_encoding_value ++%% @spec accepted_encodings([encoding()], request()) -> [encoding()] | bad_accept_encoding_value + %% @type encoding() = string(). + %% + %% @doc Returns a list of encodings accepted by a request. Encodings that are +@@ -693,8 +714,8 @@ + %% accepted_encodings(["gzip", "deflate", "identity"]) -> + %% ["deflate", "gzip", "identity"] + %% +-accepted_encodings(SupportedEncodings) -> +- AcceptEncodingHeader = case get_header_value("Accept-Encoding") of ++accepted_encodings(SupportedEncodings, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ AcceptEncodingHeader = case get_header_value("Accept-Encoding", THIS) of + undefined -> + ""; + Value -> +@@ -709,7 +730,7 @@ + ) + end. + +-%% @spec accepts_content_type(string() | binary()) -> boolean() | bad_accept_header ++%% @spec accepts_content_type(string() | binary(), request()) -> boolean() | bad_accept_header + %% + %% @doc Determines whether a request accepts a given media type by analyzing its + %% "Accept" header. +@@ -731,16 +752,9 @@ + %% 5) For an "Accept" header with value "text/*; q=0.0, */*": + %% accepts_content_type("text/plain") -> false + %% +-accepts_content_type(ContentType) when is_binary(ContentType) -> +- accepts_content_type(binary_to_list(ContentType)); +-accepts_content_type(ContentType1) -> ++accepts_content_type(ContentType1, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> + ContentType = re:replace(ContentType1, "\\s", "", [global, {return, list}]), +- AcceptHeader = case get_header_value("Accept") of +- undefined -> +- "*/*"; +- Value -> +- Value +- end, ++ AcceptHeader = accept_header(THIS), + case mochiweb_util:parse_qvalues(AcceptHeader) of + invalid_qvalue_string -> + bad_accept_header; +@@ -761,9 +775,83 @@ + (not lists:member({SuperType, 0.0}, QList)) + end. + ++%% @spec accepted_content_types([string() | binary()], request()) -> [string()] | bad_accept_header ++%% ++%% @doc Filters which of the given media types this request accepts. This filtering ++%% is performed by analyzing the "Accept" header. The returned list is sorted ++%% according to the preferences specified in the "Accept" header (higher Q values ++%% first). If two or more types have the same preference (Q value), they're order ++%% in the returned list is the same as they're order in the input list. ++%% ++%% Examples ++%% ++%% 1) For a missing "Accept" header: ++%% accepted_content_types(["text/html", "application/json"]) -> ++%% ["text/html", "application/json"] ++%% ++%% 2) For an "Accept" header with value "text/html, application/*": ++%% accepted_content_types(["application/json", "text/html"]) -> ++%% ["application/json", "text/html"] ++%% ++%% 3) For an "Accept" header with value "text/html, */*; q=0.0": ++%% accepted_content_types(["text/html", "application/json"]) -> ++%% ["text/html"] ++%% ++%% 4) For an "Accept" header with value "text/html; q=0.5, */*; q=0.1": ++%% accepts_content_types(["application/json", "text/html"]) -> ++%% ["text/html", "application/json"] ++%% ++accepted_content_types(Types1, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ Types = lists:map( ++ fun(T) -> re:replace(T, "\\s", "", [global, {return, list}]) end, ++ Types1), ++ AcceptHeader = accept_header(THIS), ++ case mochiweb_util:parse_qvalues(AcceptHeader) of ++ invalid_qvalue_string -> ++ bad_accept_header; ++ QList -> ++ TypesQ = lists:foldr( ++ fun(T, Acc) -> ++ case proplists:get_value(T, QList) of ++ undefined -> ++ [MainType, _SubType] = string:tokens(T, "/"), ++ case proplists:get_value(MainType ++ "/*", QList) of ++ undefined -> ++ case proplists:get_value("*/*", QList) of ++ Q when is_float(Q), Q > 0.0 -> ++ [{Q, T} | Acc]; ++ _ -> ++ Acc ++ end; ++ Q when Q > 0.0 -> ++ [{Q, T} | Acc]; ++ _ -> ++ Acc ++ end; ++ Q when Q > 0.0 -> ++ [{Q, T} | Acc]; ++ _ -> ++ Acc ++ end ++ end, ++ [], Types), ++ % Note: Stable sort. If 2 types have the same Q value we leave them in the ++ % same order as in the input list. ++ SortFun = fun({Q1, _}, {Q2, _}) -> Q1 >= Q2 end, ++ [Type || {_Q, Type} <- lists:sort(SortFun, TypesQ)] ++ end. ++ ++accept_header({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> ++ case get_header_value("Accept", THIS) of ++ undefined -> ++ "*/*"; ++ Value -> ++ Value ++ end. ++ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_request_tests.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request_tests.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_request_tests.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request_tests.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -1,12 +1,13 @@ + -module(mochiweb_request_tests). + +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + accepts_content_type_test() -> + Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, + mochiweb_headers:make([{"Accept", "multipart/related"}])), + ?assertEqual(true, Req1:accepts_content_type("multipart/related")), ++ ?assertEqual(true, Req1:accepts_content_type(<<"multipart/related">>)), + + Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, + mochiweb_headers:make([{"Accept", "text/html"}])), +@@ -60,4 +61,122 @@ + mochiweb_headers:make([{"Accept", "text/html;level=1;q=0.1, text/html"}])), + ?assertEqual(true, Req14:accepts_content_type("text/html; level=1")). + ++accepted_encodings_test() -> ++ Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([])), ++ ?assertEqual(["identity"], ++ Req1:accepted_encodings(["gzip", "identity"])), ++ ++ Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip, deflate"}])), ++ ?assertEqual(["gzip", "identity"], ++ Req2:accepted_encodings(["gzip", "identity"])), ++ ++ Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip;q=0.5, deflate"}])), ++ ?assertEqual(["deflate", "gzip", "identity"], ++ Req3:accepted_encodings(["gzip", "deflate", "identity"])), ++ ++ Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "identity, *;q=0"}])), ++ ?assertEqual(["identity"], ++ Req4:accepted_encodings(["gzip", "deflate", "identity"])), ++ ++ Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip; q=0.1, *;q=0"}])), ++ ?assertEqual(["gzip"], ++ Req5:accepted_encodings(["gzip", "deflate", "identity"])), ++ ++ Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip; q=, *;q=0"}])), ++ ?assertEqual(bad_accept_encoding_value, ++ Req6:accepted_encodings(["gzip", "deflate", "identity"])), ++ ++ Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "gzip;q=2.0, *;q=0"}])), ++ ?assertEqual(bad_accept_encoding_value, ++ Req7:accepted_encodings(["gzip", "identity"])), ++ ++ Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept-Encoding", "deflate, *;q=0.0"}])), ++ ?assertEqual([], ++ Req8:accepted_encodings(["gzip", "identity"])). ++ ++accepted_content_types_test() -> ++ Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/html"}])), ++ ?assertEqual(["text/html"], ++ Req1:accepted_content_types(["text/html", "application/json"])), ++ ++ Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/html, */*;q=0"}])), ++ ?assertEqual(["text/html"], ++ Req2:accepted_content_types(["text/html", "application/json"])), ++ ++ Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*, */*;q=0"}])), ++ ?assertEqual(["text/html"], ++ Req3:accepted_content_types(["text/html", "application/json"])), ++ ++ Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])), ++ ?assertEqual(["text/html", "application/json"], ++ Req4:accepted_content_types(["application/json", "text/html"])), ++ ++ Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])), ++ ?assertEqual(["text/html", "application/json"], ++ Req5:accepted_content_types(["text/html", "application/json"])), ++ ++ Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*;q=0.5, */*;q=0.5"}])), ++ ?assertEqual(["application/json", "text/html"], ++ Req6:accepted_content_types(["application/json", "text/html"])), ++ ++ Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make( ++ [{"Accept", "text/html;q=0.5, application/json;q=0.5"}])), ++ ?assertEqual(["application/json", "text/html"], ++ Req7:accepted_content_types(["application/json", "text/html"])), ++ ++ Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/html"}])), ++ ?assertEqual([], ++ Req8:accepted_content_types(["application/json"])), ++ ++ Req9 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, ++ mochiweb_headers:make([{"Accept", "text/*;q=0.9, text/html;q=0.5, */*;q=0.7"}])), ++ ?assertEqual(["application/json", "text/html"], ++ Req9:accepted_content_types(["text/html", "application/json"])). ++ ++should_close_test() -> ++ F = fun (V, H) -> ++ (mochiweb_request:new( ++ nil, 'GET', "/", V, ++ mochiweb_headers:make(H) ++ )):should_close() ++ end, ++ ?assertEqual( ++ true, ++ F({1, 1}, [{"Connection", "close"}])), ++ ?assertEqual( ++ true, ++ F({1, 0}, [{"Connection", "close"}])), ++ ?assertEqual( ++ true, ++ F({1, 1}, [{"Connection", "ClOSe"}])), ++ ?assertEqual( ++ false, ++ F({1, 1}, [{"Connection", "closer"}])), ++ ?assertEqual( ++ false, ++ F({1, 1}, [])), ++ ?assertEqual( ++ true, ++ F({1, 0}, [])), ++ ?assertEqual( ++ false, ++ F({1, 0}, [{"Connection", "Keep-Alive"}])), ++ ok. ++ + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_response.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_response.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_response.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_response.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -3,39 +3,47 @@ + + %% @doc Response abstraction. + +--module(mochiweb_response, [Request, Code, Headers]). ++-module(mochiweb_response). + -author('bob@mochimedia.com'). + + -define(QUIP, "Any of you quaids got a smint?"). + +--export([get_header_value/1, get/1, dump/0]). +--export([send/1, write_chunk/1]). ++-export([new/3, get_header_value/2, get/2, dump/1]). ++-export([send/2, write_chunk/2]). + +-%% @spec get_header_value(string() | atom() | binary()) -> string() | undefined ++%% @type response(). A mochiweb_response parameterized module instance. ++ ++%% @spec new(Request, Code, Headers) -> response() ++%% @doc Create a new mochiweb_response instance. ++new(Request, Code, Headers) -> ++ {?MODULE, [Request, Code, Headers]}. ++ ++%% @spec get_header_value(string() | atom() | binary(), response()) -> ++%% string() | undefined + %% @doc Get the value of the given response header. +-get_header_value(K) -> ++get_header_value(K, {?MODULE, [_Request, _Code, Headers]}) -> + mochiweb_headers:get_value(K, Headers). + +-%% @spec get(request | code | headers) -> term() ++%% @spec get(request | code | headers, response()) -> term() + %% @doc Return the internal representation of the given field. +-get(request) -> ++get(request, {?MODULE, [Request, _Code, _Headers]}) -> + Request; +-get(code) -> ++get(code, {?MODULE, [_Request, Code, _Headers]}) -> + Code; +-get(headers) -> ++get(headers, {?MODULE, [_Request, _Code, Headers]}) -> + Headers. + +-%% @spec dump() -> {mochiweb_request, [{atom(), term()}]} ++%% @spec dump(response()) -> {mochiweb_request, [{atom(), term()}]} + %% @doc Dump the internal representation to a "human readable" set of terms + %% for debugging/inspection purposes. +-dump() -> ++dump({?MODULE, [Request, Code, Headers]}) -> + [{request, Request:dump()}, + {code, Code}, + {headers, mochiweb_headers:to_list(Headers)}]. + +-%% @spec send(iodata()) -> ok ++%% @spec send(iodata(), response()) -> ok + %% @doc Send data over the socket if the method is not HEAD. +-send(Data) -> ++send(Data, {?MODULE, [Request, _Code, _Headers]}) -> + case Request:get(method) of + 'HEAD' -> + ok; +@@ -43,22 +51,22 @@ + Request:send(Data) + end. + +-%% @spec write_chunk(iodata()) -> ok ++%% @spec write_chunk(iodata(), response()) -> ok + %% @doc Write a chunk of a HTTP chunked response. If Data is zero length, + %% then the chunked response will be finished. +-write_chunk(Data) -> ++write_chunk(Data, {?MODULE, [Request, _Code, _Headers]}=THIS) -> + case Request:get(version) of + Version when Version >= {1, 1} -> + Length = iolist_size(Data), +- send([io_lib:format("~.16b\r\n", [Length]), Data, <<"\r\n">>]); ++ send([io_lib:format("~.16b\r\n", [Length]), Data, <<"\r\n">>], THIS); + _ -> +- send(Data) ++ send(Data, THIS) + end. + + + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_socket_server.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_socket_server.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_socket_server.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_socket_server.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -9,7 +9,7 @@ + + -include("internal.hrl"). + +--export([start/1, stop/1]). ++-export([start/1, start_link/1, stop/1]). + -export([init/1, handle_call/3, handle_cast/2, terminate/2, code_change/3, + handle_info/2]). + -export([get/2, set/3]). +@@ -33,10 +33,22 @@ + + -define(is_old_state(State), not is_record(State, mochiweb_socket_server)). + +-start(State=#mochiweb_socket_server{}) -> +- start_server(State); ++start_link(Options) -> ++ start_server(start_link, parse_options(Options)). ++ + start(Options) -> +- start(parse_options(Options)). ++ case lists:keytake(link, 1, Options) of ++ {value, {_Key, false}, Options1} -> ++ start_server(start, parse_options(Options1)); ++ _ -> ++ %% TODO: https://github.com/mochi/mochiweb/issues/58 ++ %% [X] Phase 1: Add new APIs (Sep 2011) ++ %% [_] Phase 2: Add deprecation warning ++ %% [_] Phase 3: Change default to {link, false} and ignore link ++ %% [_] Phase 4: Add deprecation warning for {link, _} option ++ %% [_] Phase 5: Remove support for {link, _} option ++ start_link(Options) ++ end. + + get(Name, Property) -> + gen_server:call(Name, {get, Property}). +@@ -61,6 +73,8 @@ + + %% Internal API + ++parse_options(State=#mochiweb_socket_server{}) -> ++ State; + parse_options(Options) -> + parse_options(Options, #mochiweb_socket_server{}). + +@@ -116,22 +130,22 @@ + parse_options(Rest, State#mochiweb_socket_server{profile_fun=ProfileFun}). + + +-start_server(State=#mochiweb_socket_server{ssl=Ssl, name=Name}) -> +- case Ssl of +- true -> +- application:start(crypto), +- application:start(public_key), +- application:start(ssl); +- false -> +- void +- end, ++start_server(F, State=#mochiweb_socket_server{ssl=Ssl, name=Name}) -> ++ ok = prep_ssl(Ssl), + case Name of + undefined -> +- gen_server:start_link(?MODULE, State, []); ++ gen_server:F(?MODULE, State, []); + _ -> +- gen_server:start_link(Name, ?MODULE, State, []) ++ gen_server:F(Name, ?MODULE, State, []) + end. + ++prep_ssl(true) -> ++ ok = mochiweb:ensure_started(crypto), ++ ok = mochiweb:ensure_started(public_key), ++ ok = mochiweb:ensure_started(ssl); ++prep_ssl(false) -> ++ ok. ++ + ensure_int(N) when is_integer(N) -> + N; + ensure_int(S) when is_list(S) -> +@@ -165,27 +179,7 @@ + {_, _, _, _, _, _, _, _} -> % IPv6 + [inet6, {ip, Ip} | BaseOpts] + end, +- case listen(Port, Opts, State) of +- {stop, eacces} -> +- case Port < 1024 of +- true -> +- case catch fdsrv:start() of +- {ok, _} -> +- case fdsrv:bind_socket(tcp, Port) of +- {ok, Fd} -> +- listen(Port, [{fd, Fd} | Opts], State); +- _ -> +- {stop, fdsrv_bind_failed} +- end; +- _ -> +- {stop, fdsrv_start_failed} +- end; +- false -> +- {stop, eacces} +- end; +- Other -> +- Other +- end. ++ listen(Port, Opts, State). + + new_acceptor_pool(Listen, + State=#mochiweb_socket_server{acceptor_pool=Pool, +@@ -271,15 +265,8 @@ + + terminate(Reason, State) when ?is_old_state(State) -> + terminate(Reason, upgrade_state(State)); +-terminate(_Reason, #mochiweb_socket_server{listen=Listen, port=Port}) -> +- mochiweb_socket:close(Listen), +- case Port < 1024 of +- true -> +- catch fdsrv:stop(), +- ok; +- false -> +- ok +- end. ++terminate(_Reason, #mochiweb_socket_server{listen=Listen}) -> ++ mochiweb_socket:close(Listen). + + code_change(_OldVsn, State, _Extra) -> + State. +@@ -337,8 +324,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + upgrade_state_test() -> + OldState = {mochiweb_socket_server, +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_util.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_util.erl +--- apache-couchdb-1.2.1/src/mochiweb/mochiweb_util.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_util.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -9,7 +9,7 @@ + -export([path_split/1]). + -export([urlsplit/1, urlsplit_path/1, urlunsplit/1, urlunsplit_path/1]). + -export([guess_mime/1, parse_header/1]). +--export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2, cmd_status/1]). ++-export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2, cmd_status/1, cmd_status/2]). + -export([record_to_proplist/2, record_to_proplist/3]). + -export([safe_relative_path/1, partition/2]). + -export([parse_qvalues/1, pick_accepted_encodings/3]). +@@ -124,11 +124,17 @@ + string:join([shell_quote(X) || X <- Argv], " "). + + %% @spec cmd_status([string()]) -> {ExitStatus::integer(), Stdout::binary()} +-%% @doc Accumulate the output and exit status from the given application, will be +-%% spawned with cmd_port/2. ++%% @doc Accumulate the output and exit status from the given application, ++%% will be spawned with cmd_port/2. + cmd_status(Argv) -> ++ cmd_status(Argv, []). ++ ++%% @spec cmd_status([string()], [atom()]) -> {ExitStatus::integer(), Stdout::binary()} ++%% @doc Accumulate the output and exit status from the given application, ++%% will be spawned with cmd_port/2. ++cmd_status(Argv, Options) -> + Port = cmd_port(Argv, [exit_status, stderr_to_stdout, +- use_stdio, binary]), ++ use_stdio, binary | Options]), + try cmd_loop(Port, []) + after catch port_close(Port) + end. +@@ -578,8 +584,8 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + + make_io_test() -> + ?assertEqual( +diff -wbBur apache-couchdb-1.2.1/src/mochiweb/reloader.erl apache-couchdb-1.2.1.q/src/mochiweb/reloader.erl +--- apache-couchdb-1.2.1/src/mochiweb/reloader.erl 2012-12-21 01:24:07.000000000 +0400 ++++ apache-couchdb-1.2.1.q/src/mochiweb/reloader.erl 2013-03-22 15:26:58.000000000 +0400 +@@ -59,7 +59,7 @@ + %% @doc gen_server callback. + handle_info(doit, State) -> + Now = stamp(), +- doit(State#state.last, Now), ++ _ = doit(State#state.last, Now), + {noreply, State#state{last = Now}}; + handle_info(_Info, State) -> + {noreply, State}. +@@ -156,6 +156,6 @@ + %% + %% Tests + %% +--include_lib("eunit/include/eunit.hrl"). + -ifdef(TEST). ++-include_lib("eunit/include/eunit.hrl"). + -endif. diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD index d34757355..fc79acfde 100644 --- a/community/drbd/PKGBUILD +++ b/community/drbd/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 83703 2013-02-04 14:42:03Z seblu $ -# Maintainer: Sébastien Luttringer +# $Id: PKGBUILD 86842 2013-03-22 19:15:09Z seblu $ +# Maintainer: Sébastien Luttringer pkgname=drbd -pkgver=8.3.13 -pkgrel=2 +pkgver=8.4.2 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Userland tools for Distributed Replicated Block Device' url='http://www.drbd.org' license=('GPL2') depends=('perl' 'bash') -source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz" +source=("http://oss.linbit.com/drbd/8.4/$pkgname-$pkgver.tar.gz" "$pkgname.service") backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') -md5sums=('760a25459ef6b7262a2a3572c1561c5b' +md5sums=('b081f1046adda1d51ba351c40a8b1107' 'afbb345094db49b0a474c0b4e51c0acd') build() { cd $pkgname-$pkgver + # fix hardcoded path in udev rules + sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' scripts/drbd.rules ./configure \ --prefix=/usr \ --localstatedir=/var \ @@ -30,8 +32,7 @@ build() { --without-pacemaker \ --without-heartbeat \ --without-xen \ - --with-initdir=/etc/rc.d - #--with-legacy_utils \ + --without-legacy_utils make } @@ -42,8 +43,6 @@ package() { cd "$pkgdir" mv sbin/* usr/sbin rmdir sbin - # fix hardcoded path in udev rules - sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules # move udev files mv etc/udev usr/lib # move bash completion @@ -51,6 +50,8 @@ package() { mv etc/bash_completion.d usr/share/bash-completion/completions # remove /var/lock rmdir var/lock + # remove embeded init stuff + rm -r etc/init.d # autoload module install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf diff --git a/community/gens-gs/PKGBUILD b/community/gens-gs/PKGBUILD new file mode 100755 index 000000000..27ebfa3e6 --- /dev/null +++ b/community/gens-gs/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 86824 2013-03-22 13:05:22Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: trya +# Contributor: Yvan + +pkgname=gens-gs +pkgver=2.16.7 +pkgrel=2 +pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens" +arch=('i686' 'x86_64') +url="http://segaretro.org/Gens/GS" +license=('GPL') +if [[ $CARCH == "x86_64" ]]; then + makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm') + optdepends=('lib32-alsa-plugins: Sound support for PulseAudio' + 'lib32-libpulse: Sound support for PulseAudio') +else + depends=('gtk2' 'sdl') + makedepends=('nasm') +fi +conflicts=('gens') +options=('!libtool') +source=('http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz' + 'gens-gtk.patch') +sha256sums=('6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1' + '29b1e9755b34e00ef7d19bdc527dc4f841400a0022c81ee71c331be4a76a6c1c') + +build() { + cd "${srcdir}"/${pkgname}-r7 + +# Patch + patch -Np1 -i ../gens-gtk.patch + +# Multilib + if [[ $CARCH == "x86_64" ]]; then + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + +# Build + if [[ $CARCH == "x86_64" ]]; then + ./configure --host=i686-unknown-linux-gnu --prefix=/usr --libdir=/usr/lib32 --with-pic --disable-static + else + LIBS='-ldl -lX11' ./configure --prefix=/usr --with-pic --disable-static + fi + make +} + +package() { + cd "${srcdir}"/${pkgname}-r7 + +# Multilib + if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-gtk2' 'lib32-sdl') + fi + +# Install + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/community/gens-gs/gens-gtk.patch b/community/gens-gs/gens-gtk.patch new file mode 100755 index 000000000..0bc6fd0ee --- /dev/null +++ b/community/gens-gs/gens-gtk.patch @@ -0,0 +1,187 @@ +diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp +--- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); ++ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)about_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp +--- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); ++ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)bmf_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp +--- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 +@@ -109,7 +109,7 @@ + gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); ++ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(dir_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp +--- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 +@@ -140,7 +140,7 @@ + gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); + gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); ++ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)genopt_window, "delete_event", +@@ -458,11 +458,11 @@ + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0); + + // Dropdown for intro effect. +- cboIntroEffect = gtk_combo_box_new_text(); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect"); +- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. ++ cboIntroEffect = gtk_combo_box_text_new(); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect"); ++ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. + gtk_widget_show(cboIntroEffect); + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0); + g_signal_connect((gpointer)(cboIntroEffect), "changed", +diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp +--- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 +@@ -154,9 +154,9 @@ + GSFT_UNUSED_PARAMETER(y); + GSFT_UNUSED_PARAMETER(user_data); + +- if (context->targets) ++ if (gdk_drag_context_list_targets(context)) + { +- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); ++ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); + gtk_drag_get_data(widget, context, target_type, time); + return true; + } +diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp +--- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 +@@ -75,7 +75,7 @@ + gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); ++ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(glres_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp +--- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 +@@ -80,8 +80,7 @@ + // Callbacks. + static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); + static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data); ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); + static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); + static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); + +@@ -119,7 +118,7 @@ + gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); ++ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)pmgr_window, "delete_event", +@@ -559,11 +558,9 @@ + * @param page_num New notebook page index. + * @param user_data User data. + */ +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data) ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) + { + GSFT_UNUSED_PARAMETER(notebook); +- GSFT_UNUSED_PARAMETER(page); + GSFT_UNUSED_PARAMETER(user_data); + + // Activate the "cursor-changed" callback for the page. +diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp +--- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 +@@ -94,7 +94,7 @@ + gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); ++ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(selcd_window), "delete_event", +@@ -128,7 +128,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0); + + // Create the dropdown for the CD-ROM device name. +- cboDeviceName = gtk_combo_box_entry_new_text(); ++ cboDeviceName = gtk_combo_box_text_new_with_entry(); + gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63); + gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName); + gtk_widget_show(cboDeviceName); +@@ -156,7 +156,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0); + + // Create the dropdown for the CD-ROM drive speed selection. +- cboDriveSpeed = gtk_combo_box_new_text(); ++ cboDriveSpeed = gtk_combo_box_text_new(); + char tmpSpeed[16]; + for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++) + { +@@ -167,7 +167,7 @@ + else + szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]); + +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed); + } + gtk_widget_show(cboDriveSpeed); + gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0); +@@ -252,7 +252,7 @@ + continue; + + // Add the device file. +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName); + } + } + +diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp +--- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 +@@ -111,7 +111,7 @@ + gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); ++ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); + + // Add the window icon. + GList *icon_list = NULL; diff --git a/community/gens/PKGBUILD b/community/gens/PKGBUILD new file mode 100755 index 000000000..3b54528f0 --- /dev/null +++ b/community/gens/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 86823 2013-03-22 12:51:22Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: trya +# Contributor: robb_force + +pkgname=gens +pkgver=2.15.5 +pkgrel=8 +pkgdesc='A Sega Genesis / Sega CD / Sega 32X emulator' +arch=('i686' 'x86_64') +url='http://gens.sourceforge.net' +license=('GPL') +if [[ $CARCH == "x86_64" ]]; then + makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm') + optdepends=('lib32-alsa-plugins: Sound support for PulseAudio' + 'lib32-libpulse: Sound support for PulseAudio') +else + depends=('gtk2' 'sdl') + makedepends=('nasm') +fi +options=('!buildflags') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'gens.desktop') +sha256sums=('51910d3056da9ffbb2c01cfec064998c9a4cad0cb379d703ec1b93c83dba305a' + '146a0e98780b909877b3937c9132c85f5aba9450ef9f748bd1374ae8c9dfb751') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + +# Multilib + if [[ $CARCH == "x86_64" ]]; then + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + +# Build + export LDFLAGS=-Wl,-z,noexecstack + ./configure --host=i686-unknown-linux-gnu --prefix=/usr + make +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + +# Multilib + if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-gtk2' 'lib32-sdl') + fi + +# Install + make DESTDIR=${pkgdir} install + install -dm 755 "${pkgdir}"/usr/share/applications + install -m 644 ../gens.desktop "${pkgdir}"/usr/share/applications/gens.desktop +} + +# vim: ts=2 sw=2 et: diff --git a/community/gens/gens.desktop b/community/gens/gens.desktop new file mode 100755 index 000000000..f668f16af --- /dev/null +++ b/community/gens/gens.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Gens +Type=Application +GenericName=A Sega Genesis / Sega CD / Sega 32X emulator +Comment=A Sega Genesis / Sega CD / Sega 32X emulator +Exec=gens +Icon=/usr/share/gens/Gens2.ico +Categories=Application;Game;Emulator; diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD index a2905b788..5f3fb3b9e 100644 --- a/community/mixxx/PKGBUILD +++ b/community/mixxx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85374 2013-03-01 10:35:42Z andrea $ +# $Id: PKGBUILD 86767 2013-03-22 00:23:48Z eric $ # Maintainer: Lukas Fleischer # Contributor: Ali H. Caliskan # Contributor: Ryan Coyner @@ -19,7 +19,7 @@ md5sums=('765bc5216ec8102c2186dd3ea80187a9') build() { cd "${srcdir}/${pkgname}-${pkgver}" - scons qtdir=/usr/lib/qt4 prefix=/usr install_root="${pkgdir}/usr" + scons qtdir=/usr/lib/qt4 prefix=/usr } package() { diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 01df50a53..778009bb6 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85617 2013-03-04 04:34:16Z bgyorgy $ +# $Id: PKGBUILD 86851 2013-03-22 21:28:54Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=1.7.1 -pkgrel=2 +pkgver=1.7.2 +pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" @@ -19,10 +19,8 @@ conflicts=('nemo-fm') options=('!emptydirs' '!libtool') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" - "gnome-autogen.sh" "use-terminal-config.patch") -md5sums=('b348b6e340e055bef3163555b99621bb' - 'a925691c9b57a6a884dcf07da057fd1f' +md5sums=('809cf58f472a9e5de628a763d441b246' '6cca080cc8fe3df7e725c0f8cd5fa485') build() { @@ -31,11 +29,6 @@ build() { # Read the default terminal app from GSettings patch -Np1 -i ../use-terminal-config.patch - cp ${srcdir}/gnome-autogen.sh . - sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am - sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh - chmod +x gnome-autogen.sh - ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nemo \ diff --git a/community/nemo/gnome-autogen.sh b/community/nemo/gnome-autogen.sh deleted file mode 100644 index 2467a1de2..000000000 --- a/community/nemo/gnome-autogen.sh +++ /dev/null @@ -1,538 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -#name of package -test "$PKG_NAME" || PKG_NAME=Package -test "$srcdir" || srcdir=. - -# default version requirements ... -test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53 -test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9 -test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3 -test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40 -test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0 -test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 -test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 -test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 -test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0 -test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2 - -# a list of required m4 macros. Package can set an initial value -test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= -test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS= - -# Not all echo versions allow -n, so we check what is possible. This test is -# based on the one in autoconf. -ECHO_C= -ECHO_N= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ;; - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -# some terminal codes ... -if tty < /dev/null 1>/dev/null 2>&1; then - boldface="`tput bold 2>/dev/null`" - normal="`tput sgr0 2>/dev/null`" -else - boldface= - normal= -fi -printbold() { - echo $ECHO_N "$boldface" $ECHO_C - echo "$@" - echo $ECHO_N "$normal" $ECHO_C -} -printerr() { - echo "$@" >&2 -} - -# Usage: -# compare_versions MIN_VERSION ACTUAL_VERSION -# returns true if ACTUAL_VERSION >= MIN_VERSION -compare_versions() { - ch_min_version=$1 - ch_actual_version=$2 - ch_status=0 - IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." - set $ch_actual_version - for ch_min in $ch_min_version; do - ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes - if [ -z "$ch_min" ]; then break; fi - if [ -z "$ch_cur" ]; then ch_status=1; break; fi - if [ $ch_cur -gt $ch_min ]; then break; fi - if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi - done - IFS="$ch_save_IFS" - return $ch_status -} - -# Usage: -# version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE -# checks to see if the package is available -version_check() { - vc_package=$1 - vc_variable=$2 - vc_checkprogs=$3 - vc_min_version=$4 - vc_source=$5 - vc_status=1 - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then - printbold "using $vc_checkprog for $vc_package" - return 0 - fi - - if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then - vc_comparator="=" - else - vc_comparator=">=" - fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " $ECHO_C - if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then - vc_actual_version=`$vc_checkprog --version | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" - # set variables - eval "$vc_variable=$vc_checkprog; \ - ${vc_variable}_VERSION=$vc_actual_version" - vc_status=0 - break - else - echo "too old (found version $vc_actual_version)" - fi - else - echo "not found." - fi - done - if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" - printerr " to build $PKG_NAME. Download the appropriate package for" - printerr " from your distribution or get the source tarball at" - printerr " $vc_source" - printerr - exit $vc_status - fi - return $vc_status -} - -# Usage: -# require_m4macro filename.m4 -# adds filename.m4 to the list of required macros -require_m4macro() { - case "$REQUIRED_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;; - esac -} - -forbid_m4macro() { - case "$FORBIDDEN_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; - esac -} - -# Usage: -# add_to_cm_macrodirs dirname -# Adds the dir to $cm_macrodirs, if it's not there yet. -add_to_cm_macrodirs() { - case $cm_macrodirs in - "$1 "* | *" $1 "* | *" $1") ;; - *) cm_macrodirs="$cm_macrodirs $1";; - esac -} - -# Usage: -# print_m4macros_error -# Prints an error message saying that autoconf macros were misused -print_m4macros_error() { - printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" - printerr -} - -# Usage: -# check_m4macros -# Checks that all the requested macro files are in the aclocal macro path -# Uses REQUIRED_M4MACROS and ACLOCAL variables. -check_m4macros() { - # construct list of macro directories - cm_macrodirs=`$ACLOCAL --print-ac-dir` - # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 - # but it contains only Automake's own macros, so we can ignore it. - - # Read the dirlist file, supported by Automake >= 1.7. - # If AUTOMAKE was defined, no version was detected. - if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then - cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` - if [ -n "$cm_dirlist" ] ; then - for cm_dir in $cm_dirlist; do - if [ -d $cm_dir ]; then - add_to_cm_macrodirs $cm_dir - fi - done - fi - fi - - # Parse $ACLOCAL_FLAGS - set - $ACLOCAL_FLAGS - while [ $# -gt 0 ]; do - if [ "$1" = "-I" ]; then - add_to_cm_macrodirs "$2" - shift - fi - shift - done - - cm_status=0 - if [ -n "$REQUIRED_M4MACROS" ]; then - printbold "Checking for required M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $REQUIRED_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - # The macro dir in Cygwin environments may contain a file - # called dirlist containing other directories to look in. - if [ -f "$cm_dir/dirlist" ]; then - for cm_otherdir in `cat $cm_dir/dirlist`; do - if [ -f "$cm_otherdir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - fi - done - if $cm_macrofound; then - : - else - printerr " $cm_macro not found" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi - if [ -n "$FORBIDDEN_M4MACROS" ]; then - printbold "Checking for forbidden M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $FORBIDDEN_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - if $cm_macrofound; then - printerr " $cm_macro found (should be cleared from macros dir)" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi -} - -# try to catch the case where the macros2/ directory hasn't been cleared out. -forbid_m4macro gnome-cxx-check.m4 - -want_libtool=false -want_gettext=false -want_glib_gettext=false -want_intltool=false -want_pkg_config=false -want_gtk_doc=false -want_gnome_doc_utils=false -want_maintainer_mode=false - -find_configure_files() { - configure_ac= - if test -f "$1/configure.ac"; then - configure_ac="$1/configure.ac" - elif test -f "$1/configure.in"; then - configure_ac="$1/configure.in" - fi - if test "x$configure_ac" != x; then - echo "$configure_ac" - # TODO We have not detected the right autoconf yet! - autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do - find_configure_files "$1/$dir" - done - fi -} - -configure_files="`find_configure_files $srcdir`" - -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - continue - fi - if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || - grep "^LT_INIT" $configure_ac >/dev/null; then - want_libtool=true - fi - if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then - want_gettext=true - fi - if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then - want_glib_gettext=true - fi - if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null || - grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then - want_intltool=true - fi - if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then - want_pkg_config=true - fi - if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then - want_gtk_doc=true - fi - if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then - want_gnome_doc_utils=true - fi - - # check that AM_MAINTAINER_MODE is used - if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then - want_maintainer_mode=true - fi - - if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then - require_m4macro yelp.m4 - fi - - # check to make sure gnome-common macros can be found ... - if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null || - grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null || - grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then - require_m4macro gnome-common.m4 - fi - if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null || - grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then - require_m4macro gnome-compiler-flags.m4 - fi - if grep "^GNOME_CODE_COVERAGE" $configure_ac >/dev/null; then - require_m4macro gnome-code-coverage.m4 - fi -done - -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.13 automake-1.12" ;; - 1.13*) automake_progs="automake-1.13" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" -ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` - -if $want_libtool; then - version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \ - "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" - require_m4macro libtool.m4 -fi - -if $want_gettext; then - version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ - "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" - require_m4macro gettext.m4 -fi - -if $want_glib_gettext; then - version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ - "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" - require_m4macro glib-gettext.m4 -fi - -if $want_intltool; then - version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/intltool/" - require_m4macro intltool.m4 -fi - -if $want_pkg_config; then - version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \ - "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" - require_m4macro pkg.m4 -fi - -if $want_gtk_doc; then - version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - require_m4macro gtk-doc.m4 -fi - -if $want_gnome_doc_utils; then - version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " -fi - -check_m4macros - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - printerr "**Warning**: I am going to run \`configure' with no arguments." - printerr "If you wish to pass any to it, please specify them on the" - printerr \`$0\'" command line." - printerr -fi - -topdir=`pwd` -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - basename=`basename $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - elif [ ! -w $dirname ]; then - echo skipping $dirname -- directory is read only - else - printbold "Processing $configure_ac" - cd $dirname - - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 - fi - - if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi - fi - - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || - grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi - if grep "^GTK_DOC_CHECK" $basename >/dev/null; then - printbold "Running $GTKDOCIZE..." - $GTKDOCIZE --copy || exit 1 - fi - - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - if grep "^GNOME_DOC_INIT" $basename >/dev/null; then - printbold "Running $GNOME_DOC_PREPARE..." - $GNOME_DOC_PREPARE --force --copy || exit 1 - fi - - # Now run aclocal to pull in any additional macros needed - - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete gnome macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in - fi - - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - if [ -f COPYING ]; then - cp -pf COPYING COPYING.autogen_bak - fi - if [ -f INSTALL ]; then - cp -pf INSTALL INSTALL.autogen_bak - fi - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 - fi - if [ -f COPYING.autogen_bak ]; then - cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING - rm -f COPYING.autogen_bak - fi - if [ -f INSTALL.autogen_bak ]; then - cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL - rm -f INSTALL.autogen_bak - fi - - cd "$topdir" - fi -done - -conf_flags="" - -if $want_maintainer_mode; then - conf_flags="--enable-maintainer-mode" -fi - -if test x$NOCONFIGURE = x; then - printbold Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index b36b88ca2..e889eb458 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84738 2013-02-24 00:14:35Z foutrelis $ +# $Id: PKGBUILD 86846 2013-03-22 20:04:56Z foutrelis $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot @@ -8,7 +8,7 @@ _tmpdir=/var/lib/nginx pkgname=nginx pkgver=1.2.7 -pkgrel=4 +pkgrel=5 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') depends=('pcre' 'zlib' 'openssl' 'geoip') @@ -31,7 +31,7 @@ source=(http://nginx.org/download/nginx-$pkgver.tar.gz logrotate) sha256sums=('2457a878943fb409ec4fcb46b43af222d06a584f93228e17a4f02b0e7bfc9de3' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' - 'a21b564eaf83b4b4ce3a436e895bd37e000677fb314b89818f89f30caca6e6d9') + '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') build() { cd "$srcdir"/$pkgname-$pkgver @@ -87,9 +87,12 @@ package() { install -d "$pkgdir"/$_tmpdir install -dm700 "$pkgdir"/$_tmpdir/proxy + chmod 750 "$pkgdir"/var/log/nginx + chown http:log "$pkgdir"/var/log/nginx + install -d "$pkgdir"/usr/share/nginx mv "$pkgdir"/etc/nginx/html/ "$pkgdir"/usr/share/nginx - + install -Dm644 "$srcdir"/logrotate "$pkgdir"/etc/logrotate.d/nginx install -Dm644 "$srcdir"/service "$pkgdir"/usr/lib/systemd/system/nginx.service install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/nginx/LICENSE diff --git a/community/nginx/logrotate b/community/nginx/logrotate index 1a5bd6441..3d082bcf8 100644 --- a/community/nginx/logrotate +++ b/community/nginx/logrotate @@ -1,6 +1,6 @@ /var/log/nginx/*log { missingok - create 640 root log + create 640 http log sharedscripts compress postrotate diff --git a/community/nginx/nginx.install b/community/nginx/nginx.install index efc155556..0daccc639 100644 --- a/community/nginx/nginx.install +++ b/community/nginx/nginx.install @@ -1,12 +1,8 @@ -post_install() { - if [[ -e var/log/nginx ]]; then +post_upgrade() { + if [[ $(vercmp $2 1.2.7-4) -le 0 ]]; then chmod 750 var/log/nginx - chown root:log var/log/nginx + chown http:log var/log/nginx fi -} - -post_upgrade() { - [[ $(vercmp $2 1.2.7-3) -le 0 ]] && post_install if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then echo " >>> Since 1.2.1-2 several changes has been made in package:" echo " - *.conf files have been moved to /etc/nginx" diff --git a/community/pypanel/PKGBUILD b/community/pypanel/PKGBUILD index 82d608970..f078a915d 100644 --- a/community/pypanel/PKGBUILD +++ b/community/pypanel/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57834 2011-11-03 10:22:57Z lfleischer $ +# $Id: PKGBUILD 86770 2013-03-22 00:26:29Z eric $ # Maintainer: Lukas Fleischer # Contributor: Jeff Mickey # Contributor: Mr Green @@ -15,7 +15,7 @@ depends=('python2' 'x-server' 'python-xlib' 'imlib2' 'libxft') source=("http://downloads.sourceforge.net/sourceforge/pypanel/PyPanel-${pkgver}.tar.gz") md5sums=('f1f9a2ed80be72ab36e748833618daba') -build() { +package() { cd "${srcdir}/PyPanel-${pkgver}" python2 setup.py install --root="${pkgdir}" } diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 87ec0f2d8..4ec09ea8e 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85927 2013-03-09 00:52:24Z svenstaro $ +# $Id: PKGBUILD 86795 2013-03-22 10:46:14Z svenstaro $ # Maintainer: Imanol Celaya # Maintainer: Sven-Hendrik Haase # Contributor: Lukas Jirkovsky @@ -7,8 +7,8 @@ # Contributor: delor pkgname=qtcreator -pkgver=2.7.0rc -_pkgver=2.7.0-rc +pkgver=2.7.0 +_pkgver=2.7.0 pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') @@ -29,7 +29,7 @@ install=qtcreator.install source=("http://releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" 'qtcreator.desktop' 'fix-build.patch') -md5sums=('5c4baef738b00cfdf53739ffd1434234' +md5sums=('7bf25d211ff8babea47c2034f1b93d08' '82888d4be900e7833d768050a135cd37' '4087c00d853addf97ca329d304e9a0a5') diff --git a/community/rdiff-backup/PKGBUILD b/community/rdiff-backup/PKGBUILD index 3ffb75bad..3a25addab 100644 --- a/community/rdiff-backup/PKGBUILD +++ b/community/rdiff-backup/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 57837 2011-11-03 10:27:32Z lfleischer $ +# $Id: PKGBUILD 86773 2013-03-22 00:29:53Z eric $ # Maintainer: Lukas Fleischer # Contributor: Aaron Schaefer # Contributor: Erwin Van de Velde @@ -17,7 +17,7 @@ source=("http://savannah.nongnu.org/download/${pkgname}/${pkgname}-${pkgver}.tar md5sums=('1a94dc537fcf74d6a3a80bd27808e77b' '3b88b18eb43ac85bc70b8dce92e958ba') -build() { +package() { cd "${srcdir}/${pkgname}-${pkgver}" python2 setup.py install --root="${pkgdir}" -O1 diff --git a/community/tremulous/PKGBUILD b/community/tremulous/PKGBUILD index f53fbc46f..91b84c9e5 100644 --- a/community/tremulous/PKGBUILD +++ b/community/tremulous/PKGBUILD @@ -1,3 +1,4 @@ +# $Id: PKGBUILD 86782 2013-03-22 00:57:25Z eric $ #Contributor: Daenyth pkgname=tremulous @@ -42,31 +43,35 @@ md5sums=('e0e1b6e03e7596da00a77fe638560402' build() { local _arch=${CARCH/i686/x86} - # Build and install the server - mkdir -p $srcdir/tremded - bsdtar -x -C $srcdir/tremded -f $srcdir/mg_tremded_source_1.01.tar.gz - cd $srcdir/tremded - make || return 1 - install -D -m755 build/release-linux-$_arch/tremded.$_arch $pkgdir/opt/tremulous/tremded.$_arch - install -D -m644 $srcdir/tremdedrc $pkgdir/etc/tremdedrc - install -D -m644 $srcdir/game.qvm $pkgdir/opt/tremulous/game.qvm - install -D -m755 $srcdir/tremded.sh $pkgdir/usr/bin/tremded + # Build the server + mkdir -p "$srcdir/tremded" + bsdtar -x -C "$srcdir/tremded" -f "$srcdir/mg_tremded_source_1.01.tar.gz" + cd "$srcdir/tremded" + make +# Build the client + cd "$srcdir/Release_1.011" + patch -Np1 -i "$srcdir/fix_fs26749.patch" + make +} + +package() { + cd "$srcdir/tremded" + install -D -m755 build/release-linux-$_arch/tremded.$_arch "$pkgdir/opt/tremulous/tremded.$_arch" + install -D -m644 "$srcdir/tremdedrc" "$pkgdir/etc/tremdedrc" + install -D -m644 "$srcdir/game.qvm" "$pkgdir/opt/tremulous/game.qvm" + install -D -m755 "$srcdir/tremded.sh" "$pkgdir/usr/bin/tremded" - # Build and install the client - cd $srcdir/Release_1.011 - patch -Np1 -i $srcdir/fix_fs26749.patch || return 1 - make || return 1 - install -Dm755 build/release-linux-$_arch/tremulous.$_arch $pkgdir/opt/tremulous/tremulous.$_arch - install -D -m755 $srcdir/tremulous.sh $pkgdir/usr/bin/tremulous + cd "$srcdir/Release_1.011" + install -Dm755 build/release-linux-$_arch/tremulous.$_arch "$pkgdir/opt/tremulous/tremulous.$_arch" + install -D -m755 "$srcdir/tremulous.sh" "$pkgdir/usr/bin/tremulous" # Install the documentation - install -Dm644 $srcdir/mg-client-manual.txt $pkgdir/usr/share/tremulous/mg-client-manual.txt - install -Dm644 $srcdir/lakitu7_qvm.txt $pkgdir/usr/share/tremulous/lakitu7_qvm.txt + install -Dm644 "$srcdir/mg-client-manual.txt" "$pkgdir/usr/share/tremulous/mg-client-manual.txt" + install -Dm644 "$srcdir/lakitu7_qvm.txt" "$pkgdir/usr/share/tremulous/lakitu7_qvm.txt" # Install the .desktop and icon files - install -D -m644 $srcdir/tremulous.xpm $pkgdir/usr/share/pixmaps/tremulous.xpm - install -D -m644 $srcdir/tremulous.desktop $pkgdir/usr/share/applications/tremulous.desktop - + install -D -m644 "$srcdir/tremulous.xpm" "$pkgdir/usr/share/pixmaps/tremulous.xpm" + install -D -m644 "$srcdir/tremulous.desktop" "$pkgdir/usr/share/applications/tremulous.desktop" } # vim:set ts=2 sw=2 et: diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD index 3607e4e36..71d6d9981 100644 --- a/community/wesnoth/PKGBUILD +++ b/community/wesnoth/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 83279 2013-01-28 16:50:16Z stephane $ +# $Id: PKGBUILD 86797 2013-03-22 11:00:44Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Jan de Groot # Contributor: Tobias Powalowski @@ -6,8 +6,8 @@ # Contributor: Douglas Soares de Andrade pkgname=wesnoth -pkgver=1.10.5 -pkgrel=2 +pkgver=1.10.6 +pkgrel=1 pkgdesc="A turn-based strategy game on a fantasy world" arch=('i686' 'x86_64') license=('GPL') @@ -20,7 +20,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t wesnothd.tmpfiles.conf wesnothd.rc.d wesnothd.service) -md5sums=('03d9683cd83d17c6536bdf5c4940bbc8' +md5sums=('547e3489bbfa778912b11dbee612c380' '2d2fea6b3d86dfd589f5ad35a3be1f97' '85659b47d22dfdf4e4d046556973fc3e' 'd1b6bf1d3dc05086ee6a370adff0ae4a') diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index b285d4a11..dfed9d1d8 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: Joel Teichroeb pkgname=weston -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64') url='http://wayland.freedesktop.org' @@ -11,7 +11,7 @@ license=('MIT') options=(!libtool) depends=('libxkbcommon' 'wayland' 'mesa' 'cairo' 'poppler-glib' 'mtdev' 'libxcursor' 'glu') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('a97030613e066c05e267ea0d7888fd5f7a08eea2') +sha1sums=('d39d487317ededb9d66365bc1402ee0bc5e20dd0') build() { cd $pkgname-$pkgver diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD deleted file mode 100644 index 30f9fa0cd..000000000 --- a/community/wine/PKGBUILD +++ /dev/null @@ -1,154 +0,0 @@ -# $Id: PKGBUILD 83833 2013-02-05 14:18:11Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -# Contributor: Jan "heftig" Steffens -# Contributor: Eduardo Romero -# Contributor: Giovanni Scafora - -pkgname=wine -pkgver=1.5.23 -pkgrel=2 - -_pkgbasever=${pkgver/rc/-rc} - -source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$_pkgbasever.tar.bz2{,.sign}) -md5sums=('70228ea29efe9700a66202b495b068bc' - '8b8620cf523bb6c7e61d01480c167859') - -pkgdesc="A compatibility layer for running Windows programs" -url="http://www.winehq.com" -arch=(i686 x86_64) -license=(LGPL) -install=wine.install - -depends=( - fontconfig lib32-fontconfig - libxcursor lib32-libxcursor - libxrandr lib32-libxrandr - libxdamage lib32-libxdamage - libxi lib32-libxi - gettext lib32-gettext - glu lib32-glu - libsm lib32-libsm - gcc-libs lib32-gcc-libs - desktop-file-utils -) - -makedepends=(autoconf ncurses bison perl fontforge flex prelink - 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2' - giflib lib32-giflib - libpng lib32-libpng - gnutls lib32-gnutls - libxinerama lib32-libxinerama - libxcomposite lib32-libxcomposite - libxmu lib32-libxmu - libxxf86vm lib32-libxxf86vm - libxml2 lib32-libxml2 - libldap lib32-libldap - lcms lib32-lcms - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - alsa-lib lib32-alsa-lib - libxcomposite lib32-libxcomposite - mesa lib32-mesa - oss - samba -) - -optdepends=( - giflib lib32-giflib - libpng lib32-libpng - libldap lib32-libldap - gnutls lib32-gnutls - lcms lib32-lcms - libxml2 lib32-libxml2 - mpg123 lib32-mpg123 - openal lib32-openal - v4l-utils lib32-v4l-utils - libpulse lib32-libpulse - alsa-plugins lib32-alsa-plugins - alsa-lib lib32-alsa-lib - libjpeg-turbo lib32-libjpeg-turbo - libxcomposite lib32-libxcomposite - libxinerama lib32-libxinerama - oss cups - samba -) - -if [[ $CARCH == i686 ]]; then - # Strip lib32 etc. on i686 - depends=(${depends[@]/*32-*/}) - makedepends=(${makedepends[@]/*32-*/}) - makedepends=(${makedepends[@]/*-multilib*/}) - optdepends=(${optdepends[@]/*32-*/}) -else - provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver") - conflicts=('bin32-wine' 'wine-wow64') - replaces=('bin32-wine') -fi - -build() { - cd "$srcdir" - - # Allow ccache to work - mv $pkgname-$_pkgbasever $pkgname - - # Get rid of old build dirs - rm -rf $pkgname-{32,64}-build - mkdir $pkgname-32-build - - if [[ $CARCH == x86_64 ]]; then - msg2 "Building Wine-64..." - - mkdir $pkgname-64-build - cd "$srcdir/$pkgname-64-build" - ../$pkgname/configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - --with-x \ - --without-gstreamer \ - --enable-win64 - # Gstreamer was disabled for FS#33655 - - make - - _wine32opts=( - --libdir=/usr/lib32 - --with-wine64="$srcdir/$pkgname-64-build" - ) - - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - fi - - msg2 "Building Wine-32..." - cd "$srcdir/$pkgname-32-build" - ../$pkgname/configure \ - --prefix=/usr \ - --with-x \ - --without-gstreamer \ - "${_wine32opts[@]}" - - # These additional flags solve FS#23277 - make CFLAGS+="-mincoming-stack-boundary=2" CXXFLAGS+="-mincoming-stack-boundary=2" -} - -package() { - msg2 "Packaging Wine-32..." - cd "$srcdir/$pkgname-32-build" - - if [[ $CARCH == i686 ]]; then - make prefix="$pkgdir/usr" install - else - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib32" \ - dlldir="$pkgdir/usr/lib32/wine" install - - msg2 "Packaging Wine-64..." - cd "$srcdir/$pkgname-64-build" - make prefix="$pkgdir/usr" \ - libdir="$pkgdir/usr/lib" \ - dlldir="$pkgdir/usr/lib/wine" install - fi -} - -# vim:set ts=8 sts=2 sw=2 et: diff --git a/community/wine/wine.install b/community/wine/wine.install deleted file mode 100644 index 0548b7ffd..000000000 --- a/community/wine/wine.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - #echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64." - #echo "If you are on x86_64, the default WINEARCH will be win64." - #echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine." - #echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64." - #echo "See the Arch wiki on wine for more information." -} - -post_remove() { - update-desktop-database -q -} diff --git a/core/libgcrypt/PKGBUILD b/core/libgcrypt/PKGBUILD index e3a887bb4..b0edba380 100644 --- a/core/libgcrypt/PKGBUILD +++ b/core/libgcrypt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 156348 2012-04-17 15:57:54Z andyrtr $ +# $Id: PKGBUILD 180517 2013-03-22 13:51:08Z andyrtr $ # Maintainer: Andreas Radke pkgname=libgcrypt -pkgver=1.5.0 -pkgrel=3 +pkgver=1.5.1 +pkgrel=1 pkgdesc="a general purpose crypto library based on the code used" arch=(i686 x86_64) url="http://www.gnupg.org" @@ -14,7 +14,7 @@ install=$pkgname.install source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2 #ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt/libgcrypt/${pkgname}-${pkgver}.tar.bz2 ) -sha1sums=('3e776d44375dc1a710560b98ae8437d5da6e32cf') +sha1sums=(8b60a26b7eae1a727d58932d6b1efeb5716648ed'') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index 36f354027..af14bbaa8 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 164645 2012-08-01 17:50:06Z andrea $ +# $Id: PKGBUILD 180514 2013-03-22 13:00:52Z andrea $ # Maintainer: # Contributor: Andrea Scarpino # Contributor: Tobias Powalowski pkgname=cfitsio -pkgver=3.310 +pkgver=3.340 pkgrel=1 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format" arch=('i686' 'x86_64') @@ -13,16 +13,16 @@ license=('custom') depends=('glibc') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -md5sums=('75b6411751c7f308d45b281b7beb92d6') +md5sums=('99210838af46b7bf2d945ccbb05e3ad3') build() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} ./configure --prefix=/usr make shared } check() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} make testprog LD_LIBRARY_PATH=. ./testprog > testprog.lis [[ -z $(diff testprog.lis testprog.out) ]] || return 1 @@ -30,7 +30,7 @@ check() { } package() { - cd "${srcdir}"/${pkgname} + cd ${pkgname} make DESTDIR="${pkgdir}" install install -D -m644 License.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD index 2373b5e23..83ebe7b7f 100644 --- a/extra/fetchmail/PKGBUILD +++ b/extra/fetchmail/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 173827 2012-12-24 15:21:34Z pierre $ +# $Id: PKGBUILD 180506 2013-03-22 07:41:24Z pierre $ pkgname=fetchmail -pkgver=6.3.24 +pkgver=6.3.25 pkgrel=1 pkgdesc="A remote-mail retrieval utility" arch=('i686' 'x86_64') @@ -16,13 +16,11 @@ options=('!makeflags') install='fetchmail.install' source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz" "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc" - 'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service') -sha1sums=('8cb2aa3a85dd307ccd1899ddbb4463e011048535' - 'dff091c04ab64c25f7b6af758f93a75b969117e0' - 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' - '30401729386d6f774c6c36ab8530842166de54a8' + 'fetchmail.tmpfiles' 'fetchmail.service') +sha1sums=('a246a6a3caf90e1106448c9dde4463e87d816031' + '9a7f76c9fd9f85fc4b421e34fa8c15d2838d61fc' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' - '11ff81fc8363a54099880da18634b0d1ecf9fa82') + '69caf3fd4d4446db3bf53144e4fa8edbdbbfcd10') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,8 +32,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail" - install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail" install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail" install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service diff --git a/extra/fetchmail/fetchmail.conf b/extra/fetchmail/fetchmail.conf deleted file mode 100644 index dcac2a067..000000000 --- a/extra/fetchmail/fetchmail.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Daemon polling interval -INTERVAL=60 - -# Config location -CONFIG=/etc/fetchmailrc diff --git a/extra/fetchmail/fetchmail.install b/extra/fetchmail/fetchmail.install index 81b374c57..5f6dc4911 100644 --- a/extra/fetchmail/fetchmail.install +++ b/extra/fetchmail/fetchmail.install @@ -5,7 +5,7 @@ post_install() { getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \ -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail if [[ ! -d run/fetchmail ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf + usr/bin/systemd-tmpfiles --create fetchmail.conf fi } @@ -17,7 +17,7 @@ post_upgrade() { usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail fi if [[ ! -d run/fetchmail ]]; then - usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf + usr/bin/systemd-tmpfiles --create fetchmail.conf fi } diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc deleted file mode 100644 index 4d8b98d40..000000000 --- a/extra/fetchmail/fetchmail.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/fetchmail - -PID=`pidof -o %PPID /usr/bin/fetchmail` -case "$1" in - start) - stat_busy "Starting fetchmail" - [ -z "$PID" ] && - su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon fetchmail - stat_done - fi - ;; - stop) - stat_busy "Stopping fetchmail" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fetchmail - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/fetchmail/fetchmail.service b/extra/fetchmail/fetchmail.service index 3e7da7545..4653cc587 100644 --- a/extra/fetchmail/fetchmail.service +++ b/extra/fetchmail/fetchmail.service @@ -4,8 +4,7 @@ After=network.target [Service] User=fetchmail -EnvironmentFile=/etc/conf.d/fetchmail -ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG} +ExecStart=/usr/bin/fetchmail -d 900 -f /etc/fetchmailrc RestartSec=1 [Install] diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD index 807cc09e1..ff32fa449 100644 --- a/extra/gnuplot/PKGBUILD +++ b/extra/gnuplot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 180427 2013-03-21 20:41:25Z eric $ +# $Id: PKGBUILD 180538 2013-03-22 21:03:11Z eric $ # Maintainer: Ronald van Haren # Contributor: damir # Contributor: Tom Newsom pkgname=gnuplot pkgver=4.6.2 -pkgrel=1 +pkgrel=2 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" arch=('i686' 'x86_64') url="http://www.gnuplot.info" @@ -35,7 +35,7 @@ build() { --libexecdir=/usr/bin \ --with-gihdir=/usr/share/gnuplot \ --with-readline=gnu - make + make pkglibexecdir=/usr/bin } diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index 3506ba984..b0633edde 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 176320 2013-01-29 20:24:29Z eric $ +# $Id: PKGBUILD 180533 2013-03-22 19:27:55Z heftig $ # Maintainer: Jan de Groot pkgname=gst-libav -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('aef8be665096b3a4e64424fb39d7c5da57faaaf95e9fea6c1bb44295d4fb32d5') +sha256sums=('8ab222a52bf7482e913f2c9a4f490cda8f8ed1acfbc429f27451b0558b08044d') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index f0f04ebe0..4ba806478 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 174936 2013-01-09 12:40:39Z jgc $ +# $Id: PKGBUILD 180528 2013-03-22 19:20:44Z heftig $ # Maintainer: Jan de Groot pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('37ce6e09b99ef3879111c861ee5090582b4fd4c764e81ab6eb2b2b4dd77d7173') +sha256sums=('85e5f99af690f720ccde5ea7e793269d35883a3ead80ca9985fa44e18bb1a4a5') build() { cd $pkgbase-$pkgver - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + sed -i -e '/AC_PATH_XTRA/d' configure.ac aclocal -I m4 -I common/m4 autoconf automake --add-missing diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index d48925d3c..c80dad8e1 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174938 2013-01-09 13:33:08Z jgc $ +# $Id: PKGBUILD 180529 2013-03-22 19:22:28Z heftig $ # Maintainer: Jan de Groot pkgname=gst-plugins-good -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64') @@ -12,11 +12,11 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' ' makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('53bd0b848e7896f1b22548ca4e8be56cf425e5100e121c472dff8272d5140bc5') +sha256sums=('67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d') build() { cd $pkgname-$pkgver - sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac + sed -i -e '/AC_PATH_XTRA/d' configure.ac aclocal -I m4 -I common/m4 autoconf automake --add-missing diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index b19368690..62f2cf4b0 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178130 2013-02-16 22:48:48Z ioni $ +# $Id: PKGBUILD 180531 2013-03-22 19:24:55Z heftig $ # Maintainer: Jan de Groot pkgname=gst-plugins-ugly -pkgver=1.0.5 -pkgrel=2 +pkgver=1.0.6 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64') license=('LGPL') @@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('a62a182ea96d9b2783b493b46d531914db9d2ebb9e537e9c84668fe752791331') +sha256sums=('8655ceec7533b5d30080a5051025e26ff8d06bea8d03a6b2af56c2f839d60586') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index 3676c53d6..24478f37f 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174933 2013-01-09 12:15:29Z jgc $ +# $Id: PKGBUILD 180527 2013-03-22 19:18:50Z heftig $ # Maintainer: Jan de Groot pkgname=gstreamer -pkgver=1.0.5 +pkgver=1.0.6 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('26c2827567f09a46d0a3bc1e7f8696b2ae72b047306539178079abae487c5b77') +sha256sums=('50d4050cd6a23684b6bbf40a9b7c132edfb39fe9db2d81980adaa6e72f4d5826') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 3f576ae3b..9fa9d3913 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180201 2013-03-18 16:09:09Z andyrtr $ +# $Id: PKGBUILD 180518 2013-03-22 13:51:11Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.21.4 +pkgver=2.21.5 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2f5983627013170db5b53d5c3ca7ad5fe843f3a0fa16ea136d6a4aa684c9cb03') +sha256sums=('0fd8265039bee8f8533e8bac4df8ba8f67a65a4e78763a4982980309b05fd954') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 5e937cbf8..bee732c0c 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $ +# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.3 -pkgrel=2 +pkgver=${_basekernel}.4 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -20,17 +20,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch' - 'drm-i915-enable-irqs-earlier-when-resuming.patch' - 'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch') + 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'a762b6f22a64473a0b4d8dc5366b25d3' + 'be610dd93dbe033cfe04018b27557c3e' '5cc106ba38bab845ea62138fc0d1bbf1' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' - 'f3def2cefdcbb954c21d8505d23cc83c' - '40e7b328977ad787a0b5584f193d63fe' - '8b9159931fab0c191a86dbd5a46fa328') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-PAE @@ -50,11 +46,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # revert 2 patches which breaks displays - # FS 34327 - patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch" - patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch" - cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch b/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch deleted file mode 100644 index cb621d520..000000000 --- a/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Tue, 5 Mar 2013 09:50:58 +0100 -Subject: drm/i915: enable irqs earlier when resuming - -From: Daniel Vetter - -commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. - -We need it to restore the ilk rc6 context, since the gpu wait no -requires interrupts. But in general having interrupts around should -help in code sanity, since more and more stuff is interrupt driven. - -This regression has been introduced in - -commit 3e9605018ab3e333d51cc90fccfde2031886763b -Author: Chris Wilson -Date: Tue Nov 27 16:22:54 2012 +0000 - - drm/i915: Rearrange code to only have a single method for waiting upon the ring - -Like in the driver load code we need to make sure that hotplug -interrupts don't cause havoc with our modeset state, hence block them -with the existing infrastructure. Again we ignore races where we might -loose hotplug interrupts ... - -Note that the driver load part of the regression has already been -fixed in - -commit 52d7ecedac3f96fb562cb482c139015372728638 -Author: Daniel Vetter -Date: Sat Dec 1 21:03:22 2012 +0100 - - drm/i915: reorder setup sequence to have irqs for output setup - -v2: Add a note to the commit message about which patch fixed the -driver load part of the regression. Stable kernels need to backport -both patches. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691 -Cc: Chris Wilson -Cc: Mika Kuoppala -Reported-and-Tested-by: Ilya Tumaykin -Reviewed-by: Chris wilson (v1) -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/i915_drv.c -+++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de - intel_modeset_disable(dev); - - drm_irq_uninstall(dev); -+ dev_priv->enable_hotplug_processing = false; - } - - i915_save_state(dev); -@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de - error = i915_gem_init_hw(dev); - mutex_unlock(&dev->struct_mutex); - -+ /* We need working interrupts for modeset enabling ... */ -+ drm_irq_install(dev); -+ - intel_modeset_init_hw(dev); - intel_modeset_setup_hw_state(dev, false); -- drm_irq_install(dev); -+ -+ /* -+ * ... but also need to make sure that hotplug processing -+ * doesn't cause havoc. Like in the driver load code we don't -+ * bother with the tiny race here where we might loose hotplug -+ * notifications. -+ * */ -+ dev_priv->enable_hotplug_processing = true; - } - - intel_opregion_init(dev); diff --git a/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch deleted file mode 100644 index 8dc354488..000000000 --- a/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Sat, 1 Dec 2012 21:03:22 +0100 -Subject: drm/i915: reorder setup sequence to have irqs for output setup - -From: Daniel Vetter - -commit 52d7ecedac3f96fb562cb482c139015372728638 upstream. - -Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that -well. Noticed since the dp aux code doesn't have an automatic fallback -with a timeout (since the hw provides for that already). - -v2: Simple move drm_irq_install before intel_modeset_gem_init, as -suggested by Ben Widawsky. - -v3: Now that interrupts are enabled before all connectors are fully -set up, we might fall over serving a HPD interrupt while things are -still being set up. Instead of jumping through massive hoops and -complicating the code with a separate hpd irq enable step, simply -block out the hotplug work item from doing anything until things are -in place. - -v4: Actually, we can enable hotplug processing only after the fbdev is -fully set up, since we call down into the fbdev from the hotplug work -functions. So stick the hpd enabling right next to the poll helper -initialization. - -v5: We need to enable irqs before intel_modeset_init, since that -function sets up the outputs. - -v6: Fixup cleanup sequence, too. - -Reviewed-by: Imre Deak -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_dma.c | 23 ++++++++++++++--------- - drivers/gpu/drm/i915/i915_drv.h | 1 + - drivers/gpu/drm/i915/i915_irq.c | 4 ++++ - 3 files changed, 19 insertions(+), 9 deletions(-) - ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct - if (ret) - goto cleanup_vga_switcheroo; - -+ ret = drm_irq_install(dev); -+ if (ret) -+ goto cleanup_gem_stolen; -+ -+ /* Important: The output setup functions called by modeset_init need -+ * working irqs for e.g. gmbus and dp aux transfers. */ - intel_modeset_init(dev); - - ret = i915_gem_init(dev); - if (ret) -- goto cleanup_gem_stolen; -- -- intel_modeset_gem_init(dev); -+ goto cleanup_irq; - - INIT_WORK(&dev_priv->console_resume_work, intel_console_resume); - -- ret = drm_irq_install(dev); -- if (ret) -- goto cleanup_gem; -+ intel_modeset_gem_init(dev); - - /* Always safe in the mode setting case. */ - /* FIXME: do pre/post-mode set stuff in core KMS code */ -@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct - - ret = intel_fbdev_init(dev); - if (ret) -- goto cleanup_irq; -+ goto cleanup_gem; -+ -+ /* Only enable hotplug handling once the fbdev is fully set up. */ -+ dev_priv->enable_hotplug_processing = true; - - drm_kms_helper_poll_init(dev); - -@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct - - return 0; - --cleanup_irq: -- drm_irq_uninstall(dev); - cleanup_gem: - mutex_lock(&dev->struct_mutex); - i915_gem_cleanup_ringbuffer(dev); - mutex_unlock(&dev->struct_mutex); - i915_gem_cleanup_aliasing_ppgtt(dev); -+cleanup_irq: -+ drm_irq_uninstall(dev); - cleanup_gem_stolen: - i915_gem_cleanup_stolen(dev); - cleanup_vga_switcheroo: ---- a/drivers/gpu/drm/i915/i915_drv.h -+++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -672,6 +672,7 @@ typedef struct drm_i915_private { - - u32 hotplug_supported_mask; - struct work_struct hotplug_work; -+ bool enable_hotplug_processing; - - int num_pipe; - int num_pch_pll; ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc - struct drm_mode_config *mode_config = &dev->mode_config; - struct intel_encoder *encoder; - -+ /* HPD irq before everything is fully set up. */ -+ if (!dev_priv->enable_hotplug_processing) -+ return; -+ - mutex_lock(&mode_config->mutex); - DRM_DEBUG_KMS("running encoder hotplug functions\n"); - diff --git a/kernels/linux-libre-pae/fat-3.6.x.patch b/kernels/linux-libre-pae/fat-3.6.x.patch deleted file mode 100644 index d8deeb788..000000000 --- a/kernels/linux-libre-pae/fat-3.6.x.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Dave Reisner -Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) -Subject: fs/fat: strip "cp" prefix from codepage in display -X-Git-Tag: next-20121130~1^2~97 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 - -fs/fat: strip "cp" prefix from codepage in display - -Option parsing code expects an unsigned integer for the codepage option, -but prefixes and stores this option with "cp" before passing to -load_nls(). This makes the displayed option in /proc an invalid one. -Strip the prefix when printing so that the displayed option is valid for -reuse. - -Signed-off-by: Dave Reisner -Acked-by: OGAWA Hirofumi -Signed-off-by: Andrew Morton ---- - -diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index 3b733a7..3580681 100644 ---- a/fs/fat/inode.c -+++ b/fs/fat/inode.c -@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) - if (opts->allow_utime) - seq_printf(m, ",allow_utime=%04o", opts->allow_utime); - if (sbi->nls_disk) -- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); -+ /* strip "cp" prefix from displayed option */ -+ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); - if (isvfat) { - if (sbi->nls_io) - seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index 7951e0156..5053eb190 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.3-2-LIBRE-PAE +KERNEL_VERSION=3.8.4-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 91dc1484c..77e0ed1ff 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $ +# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ # Contributor: Tobias Powalowski # Contributor: Thomas Baechler # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.3 -pkgrel=2 +pkgver=${_basekernel}.4 +pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -20,17 +20,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' - 'change-default-console-loglevel.patch' - 'drm-i915-enable-irqs-earlier-when-resuming.patch' - 'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch') + 'change-default-console-loglevel.patch') md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'a762b6f22a64473a0b4d8dc5366b25d3' + 'be610dd93dbe033cfe04018b27557c3e' 'c13961a22d8c742fb31b59a1e27a0e7b' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' - 'f3def2cefdcbb954c21d8505d23cc83c' - '40e7b328977ad787a0b5584f193d63fe' - '8b9159931fab0c191a86dbd5a46fa328') + 'f3def2cefdcbb954c21d8505d23cc83c') _kernelname=${pkgbase#linux-libre} _localversionname=-LIBRE-XEN @@ -50,11 +46,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # revert 2 patches which breaks displays - # FS 34327 - patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch" - patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch" - cat "${srcdir}/config" > ./.config # simpler if [ "${_kernelname}" != "" ]; then diff --git a/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch b/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch deleted file mode 100644 index cb621d520..000000000 --- a/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Tue, 5 Mar 2013 09:50:58 +0100 -Subject: drm/i915: enable irqs earlier when resuming - -From: Daniel Vetter - -commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. - -We need it to restore the ilk rc6 context, since the gpu wait no -requires interrupts. But in general having interrupts around should -help in code sanity, since more and more stuff is interrupt driven. - -This regression has been introduced in - -commit 3e9605018ab3e333d51cc90fccfde2031886763b -Author: Chris Wilson -Date: Tue Nov 27 16:22:54 2012 +0000 - - drm/i915: Rearrange code to only have a single method for waiting upon the ring - -Like in the driver load code we need to make sure that hotplug -interrupts don't cause havoc with our modeset state, hence block them -with the existing infrastructure. Again we ignore races where we might -loose hotplug interrupts ... - -Note that the driver load part of the regression has already been -fixed in - -commit 52d7ecedac3f96fb562cb482c139015372728638 -Author: Daniel Vetter -Date: Sat Dec 1 21:03:22 2012 +0100 - - drm/i915: reorder setup sequence to have irqs for output setup - -v2: Add a note to the commit message about which patch fixed the -driver load part of the regression. Stable kernels need to backport -both patches. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691 -Cc: Chris Wilson -Cc: Mika Kuoppala -Reported-and-Tested-by: Ilya Tumaykin -Reviewed-by: Chris wilson (v1) -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/i915_drv.c -+++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de - intel_modeset_disable(dev); - - drm_irq_uninstall(dev); -+ dev_priv->enable_hotplug_processing = false; - } - - i915_save_state(dev); -@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de - error = i915_gem_init_hw(dev); - mutex_unlock(&dev->struct_mutex); - -+ /* We need working interrupts for modeset enabling ... */ -+ drm_irq_install(dev); -+ - intel_modeset_init_hw(dev); - intel_modeset_setup_hw_state(dev, false); -- drm_irq_install(dev); -+ -+ /* -+ * ... but also need to make sure that hotplug processing -+ * doesn't cause havoc. Like in the driver load code we don't -+ * bother with the tiny race here where we might loose hotplug -+ * notifications. -+ * */ -+ dev_priv->enable_hotplug_processing = true; - } - - intel_opregion_init(dev); diff --git a/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch deleted file mode 100644 index 8dc354488..000000000 --- a/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Sat, 1 Dec 2012 21:03:22 +0100 -Subject: drm/i915: reorder setup sequence to have irqs for output setup - -From: Daniel Vetter - -commit 52d7ecedac3f96fb562cb482c139015372728638 upstream. - -Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that -well. Noticed since the dp aux code doesn't have an automatic fallback -with a timeout (since the hw provides for that already). - -v2: Simple move drm_irq_install before intel_modeset_gem_init, as -suggested by Ben Widawsky. - -v3: Now that interrupts are enabled before all connectors are fully -set up, we might fall over serving a HPD interrupt while things are -still being set up. Instead of jumping through massive hoops and -complicating the code with a separate hpd irq enable step, simply -block out the hotplug work item from doing anything until things are -in place. - -v4: Actually, we can enable hotplug processing only after the fbdev is -fully set up, since we call down into the fbdev from the hotplug work -functions. So stick the hpd enabling right next to the poll helper -initialization. - -v5: We need to enable irqs before intel_modeset_init, since that -function sets up the outputs. - -v6: Fixup cleanup sequence, too. - -Reviewed-by: Imre Deak -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_dma.c | 23 ++++++++++++++--------- - drivers/gpu/drm/i915/i915_drv.h | 1 + - drivers/gpu/drm/i915/i915_irq.c | 4 ++++ - 3 files changed, 19 insertions(+), 9 deletions(-) - ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct - if (ret) - goto cleanup_vga_switcheroo; - -+ ret = drm_irq_install(dev); -+ if (ret) -+ goto cleanup_gem_stolen; -+ -+ /* Important: The output setup functions called by modeset_init need -+ * working irqs for e.g. gmbus and dp aux transfers. */ - intel_modeset_init(dev); - - ret = i915_gem_init(dev); - if (ret) -- goto cleanup_gem_stolen; -- -- intel_modeset_gem_init(dev); -+ goto cleanup_irq; - - INIT_WORK(&dev_priv->console_resume_work, intel_console_resume); - -- ret = drm_irq_install(dev); -- if (ret) -- goto cleanup_gem; -+ intel_modeset_gem_init(dev); - - /* Always safe in the mode setting case. */ - /* FIXME: do pre/post-mode set stuff in core KMS code */ -@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct - - ret = intel_fbdev_init(dev); - if (ret) -- goto cleanup_irq; -+ goto cleanup_gem; -+ -+ /* Only enable hotplug handling once the fbdev is fully set up. */ -+ dev_priv->enable_hotplug_processing = true; - - drm_kms_helper_poll_init(dev); - -@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct - - return 0; - --cleanup_irq: -- drm_irq_uninstall(dev); - cleanup_gem: - mutex_lock(&dev->struct_mutex); - i915_gem_cleanup_ringbuffer(dev); - mutex_unlock(&dev->struct_mutex); - i915_gem_cleanup_aliasing_ppgtt(dev); -+cleanup_irq: -+ drm_irq_uninstall(dev); - cleanup_gem_stolen: - i915_gem_cleanup_stolen(dev); - cleanup_vga_switcheroo: ---- a/drivers/gpu/drm/i915/i915_drv.h -+++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -672,6 +672,7 @@ typedef struct drm_i915_private { - - u32 hotplug_supported_mask; - struct work_struct hotplug_work; -+ bool enable_hotplug_processing; - - int num_pipe; - int num_pch_pll; ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc - struct drm_mode_config *mode_config = &dev->mode_config; - struct intel_encoder *encoder; - -+ /* HPD irq before everything is fully set up. */ -+ if (!dev_priv->enable_hotplug_processing) -+ return; -+ - mutex_lock(&mode_config->mutex); - DRM_DEBUG_KMS("running encoder hotplug functions\n"); - diff --git a/kernels/linux-libre-xen/fat-3.6.x.patch b/kernels/linux-libre-xen/fat-3.6.x.patch deleted file mode 100644 index d8deeb788..000000000 --- a/kernels/linux-libre-xen/fat-3.6.x.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Dave Reisner -Date: Thu, 29 Nov 2012 03:18:52 +0000 (+1100) -Subject: fs/fat: strip "cp" prefix from codepage in display -X-Git-Tag: next-20121130~1^2~97 -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fnext%2Flinux-next.git;a=commitdiff_plain;h=f15914873184cc3f2a8d590fa4f7e32ab0a8a405 - -fs/fat: strip "cp" prefix from codepage in display - -Option parsing code expects an unsigned integer for the codepage option, -but prefixes and stores this option with "cp" before passing to -load_nls(). This makes the displayed option in /proc an invalid one. -Strip the prefix when printing so that the displayed option is valid for -reuse. - -Signed-off-by: Dave Reisner -Acked-by: OGAWA Hirofumi -Signed-off-by: Andrew Morton ---- - -diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index 3b733a7..3580681 100644 ---- a/fs/fat/inode.c -+++ b/fs/fat/inode.c -@@ -726,7 +726,8 @@ static int fat_show_options(struct seq_file *m, struct dentry *root) - if (opts->allow_utime) - seq_printf(m, ",allow_utime=%04o", opts->allow_utime); - if (sbi->nls_disk) -- seq_printf(m, ",codepage=%s", sbi->nls_disk->charset); -+ /* strip "cp" prefix from displayed option */ -+ seq_printf(m, ",codepage=%s", &sbi->nls_disk->charset[2]); - if (isvfat) { - if (sbi->nls_io) - seq_printf(m, ",iocharset=%s", sbi->nls_io->charset); diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index d707e2ef8..0165e78f0 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.3-2-LIBRE-XEN +KERNEL_VERSION=3.8.4-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/gnome-desktop2/PKGBUILD b/libre/gnome-desktop2/PKGBUILD new file mode 100644 index 000000000..e8744d4a4 --- /dev/null +++ b/libre/gnome-desktop2/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan "heftig" Steffens +# Contributor: Jan de Groot + +_pkgname=gnome-desktop +pkgname=${_pkgname}2 +pkgver=2.32.1 +pkgrel=2.1 +pkgdesc="Library with common API for various GNOME modules (legacy version), Parabola rebranded" +arch=(i686 x86_64 mips64el) +license=(GPL LGPL) +depends=(gconf gtk2 startup-notification) +makedepends=(gnome-doc-utils intltool) +url="http://www.gnome.org" +options=(!libtool !emptydirs) +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2) +sha256sums=('55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static \ + --with-gnome-distributor="Parabola GNU/Linux-libre" \ + --disable-scrollkeeper \ + --disable-gnome-about --disable-desktop-docs + + 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 DESTDIR="$pkgdir" install +} diff --git a/libre/gnome-menus/PKGBUILD b/libre/gnome-menus/PKGBUILD new file mode 100644 index 000000000..186473b5b --- /dev/null +++ b/libre/gnome-menus/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gnome-menus +pkgver=3.6.2 +pkgrel=1.1 +pkgdesc="GNOME menu specifications, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +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/${pkgver%.*}/$pkgname-$pkgver.tar.xz + menus.patch) +sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f' + 'de14815d63ab98f999975680a8981702dee0f70d129d4d4fcf4778d966e67435') + +build() { + cd "$pkgname-$pkgver" + + patch -Np0 -i "$srcdir/menus.patch" + + PYTHON=/usr/bin/python2 ./configure \ + --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-static + make +} + +package(){ + 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/libre/gnome-menus/menus.patch b/libre/gnome-menus/menus.patch new file mode 100644 index 000000000..6648e09ec --- /dev/null +++ b/libre/gnome-menus/menus.patch @@ -0,0 +1,25 @@ +--- layout/applications.menu 2005-06-28 10:16:39.000000000 +0200 ++++ layout/applications.menu 2005-09-12 23:21:20.000000000 +0200 +@@ -7,7 +7,6 @@ + Applications.directory + + +- + /etc/X11/applnk + /usr/share/gnome/apps + +@@ -18,6 +17,14 @@ + + + ++ ++ ++ Parabola ++ Parabola.directory ++ ++ Parabola ++ ++ + + + Accessories diff --git a/libre/gst-libav/PKGBUILD b/libre/gst-libav/PKGBUILD new file mode 100644 index 000000000..3d92dcd9b --- /dev/null +++ b/libre/gst-libav/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gst-libav +pkgver=1.0.6 +pkgrel=1 +pkgdesc="Gstreamer libav Plugin, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') +url="http://gstreamer.freedesktop.org/" +depends=('gst-plugins-base-libs' 'bzip2') +makedepends=('yasm') +options=(!libtool !emptydirs) +provides=("gst-ffmpeg=$pkgver-$pkgrel") +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('8ab222a52bf7482e913f2c9a4f490cda8f8ed1acfbc429f27451b0558b08044d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --with-libav-extra-configure="--enable-runtime-cpudetect" \ + --with-package-name="GStreamer libav Plugin (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 1cb133713..7a12f8ca9 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178027 2013-02-13 20:38:52Z heftig $ +# $Id: PKGBUILD 180524 2013-03-22 19:07:19Z heftig $ # Maintainer: Jan de Groot # Maintainer (Parabola): Márcio Silva pkgbase=gst-plugins-bad pkgname=gst-plugins-bad-libre -pkgver=1.0.5 -pkgrel=1.1 -pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' +pkgver=1.0.6 +pkgrel=1 +pkgdesc='GStreamer Multimedia Framework Bad Plugins, with nonfree faac support removed and Parabola rebranded' arch=( i686 x86_64 @@ -58,7 +58,7 @@ source=( "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz" ) sha256sums=( - 2e8f5b9a2fd274142d0a916b6425b9466028978b85858dc835dc80de744b276a + 92130899d0b78b71f1551cada9b10b550e91506c2d7b8b748e5cc18a620d302d ) build() { @@ -69,7 +69,7 @@ build() { automake --add-missing ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ - --with-package-name='GStreamer Bad Plugins (Parabola)' \ + --with-package-name='GStreamer Bad Plugins (Parabola GNU/Linux-libre)' \ --with-package-origin='https://parabolagnulinux.org/' \ --with-gtk=3.0 make diff --git a/libre/gst-plugins-base/PKGBUILD b/libre/gst-plugins-base/PKGBUILD new file mode 100644 index 000000000..55ac8e72c --- /dev/null +++ b/libre/gst-plugins-base/PKGBUILD @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgbase=gst-plugins-base +pkgname=('gst-plugins-base-libs' 'gst-plugins-base') +pkgver=1.0.6 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Base Plugins, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') +options=(!libtool !emptydirs) +url="http://gstreamer.freedesktop.org/" +source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) +sha256sums=('85e5f99af690f720ccde5ea7e793269d35883a3ead80ca9985fa44e18bb1a4a5') + +build() { + cd $pkgbase-$pkgver + sed -i -e '/AC_PATH_XTRA/d' configure.ac + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make + sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile +} + +check() { + cd $pkgbase-$pkgver + # Testsuite fails on one test. Some refcount leak + make check +} + +package_gst-plugins-base-libs() { + pkgdesc="GStreamer Multimedia Framework Base Plugin libraries, Parabola rebranded" + depends=('gstreamer' 'orc' 'libxv') + + cd $pkgbase-$pkgver + make DESTDIR="${pkgdir}" install +} + +package_gst-plugins-base() { + depends=("gst-plugins-base-libs=$pkgver" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') + + cd $pkgbase-$pkgver + make -C gst-libs DESTDIR="${pkgdir}" install + make -C ext DESTDIR="${pkgdir}" install + make -C gst-libs DESTDIR="${pkgdir}" uninstall +} diff --git a/libre/gst-plugins-good/PKGBUILD b/libre/gst-plugins-good/PKGBUILD new file mode 100644 index 000000000..9101bfdba --- /dev/null +++ b/libre/gst-plugins-good/PKGBUILD @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gst-plugins-good +pkgver=1.0.6 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Good Plugins, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' 'taglib' 'libdv' 'libshout' 'libvpx' 'gdk-pixbuf2' 'libcaca' 'libavc1394' 'libiec61883' 'libxdamage' 'v4l-utils' 'cairo') +makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') +options=(!libtool !emptydirs) +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('67f7690a9826d9a6ab28b9af2536a6f3e833ee412bd59dd603c48fb3c6823e0d') + +build() { + cd $pkgname-$pkgver + sed -i -e '/AC_PATH_XTRA/d' configure.ac + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Good Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install +} diff --git a/libre/gst-plugins-ugly/PKGBUILD b/libre/gst-plugins-ugly/PKGBUILD new file mode 100644 index 000000000..e0cc268ff --- /dev/null +++ b/libre/gst-plugins-ugly/PKGBUILD @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gst-plugins-ugly +pkgver=1.0.6 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework Ugly Plugins, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +options=(!libtool !emptydirs) +source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('8655ceec7533b5d30080a5051025e26ff8d06bea8d03a6b2af56c2f839d60586') + +build() { + cd $pkgname-$pkgver + sed -i '/AC_PATH_XTRA/d' configure.ac + aclocal -I m4 -I common/m4 + autoconf + automake --add-missing + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/libre/gstreamer/PKGBUILD b/libre/gstreamer/PKGBUILD new file mode 100644 index 000000000..2eb34bb72 --- /dev/null +++ b/libre/gstreamer/PKGBUILD @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gstreamer +pkgver=1.0.6 +pkgrel=1 +pkgdesc="GStreamer Multimedia Framework, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('libxml2' 'glib2') +optdepends=('sh: feedback script') +makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') +options=('!libtool') +source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) +sha256sums=('50d4050cd6a23684b6bbf40a9b7c132edfb39fe9db2d81980adaa6e72f4d5826') + +build() { + cd "${srcdir}/gstreamer-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ + --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" \ + --enable-gtk-doc --disable-static + make +} + +check() { + cd "${srcdir}/gstreamer-${pkgver}" + make check +} + +package() { + cd "${srcdir}/gstreamer-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD index 883a9eefb..30c475d39 100644 --- a/libre/gstreamer0.10-bad-libre/PKGBUILD +++ b/libre/gstreamer0.10-bad-libre/PKGBUILD @@ -6,8 +6,8 @@ pkgbase=gstreamer0.10-bad-libre pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins') pkgver=0.10.23 -pkgrel=3.1 -arch=('i686' 'x86_64') +pkgrel=3.2 +arch=('i686' 'x86_64' 'mips64el') license=('LGPL' 'GPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.36' 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'soundtouch' 'libvdpau' 'schroedinger' 'libass' 'libvpx' 'gsm' 'libgme' 'rtmpdump' 'libsndfile' 'librsvg' 'wildmidi' 'opus') url="http://gstreamer.freedesktop.org/" @@ -19,7 +19,7 @@ build() { cd "${srcdir}/gst-plugins-bad-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-experimental \ - --with-package-name="GStreamer Bad Plugins (Parabola)" \ + --with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \ --with-package-origin="https://parabolagnulinux.org/" make @@ -33,7 +33,7 @@ build() { #} package_gstreamer0.10-bad-libre() { - pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad)" + pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), with non free faac support removed and Parabola rebranded" depends=('gstreamer0.10-base>=0.10.34') provides=("gstreamer0.10-bad=$pkgver") conflicts=('gstreamer0.10-bad') @@ -44,7 +44,7 @@ package_gstreamer0.10-bad-libre() { } package_gstreamer0.10-bad-libre-plugins() { - pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad)" + pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), with non free faac support removed and Parabola rebranded" depends=("gstreamer0.10-bad-libre=${pkgver}" 'xvidcore' 'libdca' 'bzip2' 'libdc1394' 'neon' 'musicbrainz' 'faad2' 'libmms' 'libcdaudio' 'libmpcdec' 'mjpegtools' 'libdvdnav' 'libmodplug' 'jasper' 'liblrdf' 'libofa' 'libvdpau' 'soundtouch' 'libass' 'schroedinger' 'libvpx' 'gsm' 'rtmpdump' 'libgme' 'libsndfile' 'librsvg' 'wildmidi' 'opus') groups=('gstreamer0.10-plugins') install=gstreamer0.10-bad-plugins.install diff --git a/libre/gstreamer0.10-base/PKGBUILD b/libre/gstreamer0.10-base/PKGBUILD new file mode 100644 index 000000000..620c0bd87 --- /dev/null +++ b/libre/gstreamer0.10-base/PKGBUILD @@ -0,0 +1,53 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgbase=('gstreamer0.10-base') +pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins') +pkgver=0.10.36 +pkgrel=1.1 +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10>=0.10.35' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection') +options=(!libtool !emptydirs) +url="http://gstreamer.freedesktop.org/" +source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz) +sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a') + +build() { + cd "${srcdir}/gst-plugins-base-${pkgver}" + sed -i '/AC_PATH_XTRA/d' configure.ac + autoreconf + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental --disable-gnome_vfs \ + --with-package-name="GStreamer Base Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + + make + sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile +} + +check() { + cd "${srcdir}/gst-plugins-base-${pkgver}" + make check +} + +package_gstreamer0.10-base() { + pkgdesc="GStreamer Multimedia Framework Base plugin libraries, Parabola rebranded" + depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv') + + cd "${srcdir}/gst-plugins-base-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-base-plugins() { + pkgdesc="GStreamer Multimedia Framework Base Plugins (gst-plugins-base), Parabola rebranded" + depends=("gstreamer0.10-base=${pkgver}" 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango') + replaces=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') + conflicts=('gstreamer0.10-alsa' 'gstreamer0.10-theora' 'gstreamer0.10-libvisual' 'gstreamer0.10-pango' 'gstreamer0.10-cdparanoia' 'gstreamer0.10-vorbis' 'gstreamer0.10-ogg') + groups=('gstreamer0.10-plugins') + + cd "${srcdir}/gst-plugins-base-${pkgver}" + make -C gst-libs DESTDIR="${pkgdir}" install + make -C ext DESTDIR="${pkgdir}" install + make -C gst-libs DESTDIR="${pkgdir}" uninstall +} diff --git a/libre/gstreamer0.10-good/PKGBUILD b/libre/gstreamer0.10-good/PKGBUILD index abe7dc0ef..4cbaddd1e 100644 --- a/libre/gstreamer0.10-good/PKGBUILD +++ b/libre/gstreamer0.10-good/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=gstreamer0.10-good pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins') pkgver=0.10.31 -pkgrel=1.1 -arch=('i686' 'x86_64') +pkgrel=1.2 +arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev') url="http://gstreamer.freedesktop.org/" @@ -32,7 +32,7 @@ build() { package_gstreamer0.10-good() { depends=('gstreamer0.10-base>=0.10.34' 'bzip2') - pkgdesc="GStreamer Multimedia Framework Good plugin libraries (Parabola rebranded)" + pkgdesc="GStreamer Multimedia Framework Good plugin libraries, Parabola rebranded" cd "${srcdir}/gst-plugins-good-${pkgver}" make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install @@ -41,7 +41,7 @@ package_gstreamer0.10-good() { package_gstreamer0.10-good-plugins() { depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'udev') - pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)" + pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good), Parabola rebranded" groups=('gstreamer0.10-plugins') replaces=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') conflicts=('gstreamer0.10-aalib' 'gstreamer0.10-wavpack' 'gstreamer0.10-shout2' 'gstreamer0.10-taglib' 'gstreamer0.10-libcaca' 'gstreamer0.10-libpng' 'gstreamer0.10-jpeg' 'gstreamer0.10-cairo' 'gstreamer0.10-flac' 'gstreamer0.10-speex' 'gstreamer0.10-gdkpixbuf' 'gstreamer0.10-dv1394' 'gstreamer0.10-annodex' 'gstreamer0.10-gconf' 'gstreamer0.10-esd' 'gstreamer0.10-cdio' 'gstreamer0.10-dv' 'gstreamer0.10-bad-plugins<0.10.7' 'gstreamer0.10-soup' 'gstreamer0.10-pulse') diff --git a/libre/gstreamer0.10-ugly/PKGBUILD b/libre/gstreamer0.10-ugly/PKGBUILD new file mode 100644 index 000000000..6709ab2ea --- /dev/null +++ b/libre/gstreamer0.10-ugly/PKGBUILD @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgbase=gstreamer0.10-ugly +pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') +pkgver=0.10.19 +pkgrel=5.1 +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') +url="http://gstreamer.freedesktop.org/" +options=(!libtool) +source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz + opencore-amr.patch + cdio-cd-text-api.patch) +md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c' + 'd8feb6c99bfaff8be6b2c48ea4e98e47' + '6c1c665f864387f3a77d32231fedeaab') + +build() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + patch -Np0 -i "${srcdir}/opencore-amr.patch" + patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --enable-experimental \ + --with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" + make + sed -e 's/gst-libs gst ext/gst-libs gst/' -i Makefile +} + +check() { + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make check +} + +package_gstreamer0.10-ugly() { + pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries, Parabola rebranded" + depends=('gstreamer0.10-base>=0.10.34') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make DESTDIR="${pkgdir}" install +} + +package_gstreamer0.10-ugly-plugins() { + pkgdesc="GStreamer Multimedia Framework Ugly Plugins (gst-plugins-ugly), Parabola rebranded" + depends=("gstreamer0.10-ugly=${pkgver}" 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') + groups=('gstreamer0.10-plugins') + replaces=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + conflicts=('gstreamer0.10-dvdread' 'gstreamer0.10-mpeg2dec' 'gstreamer0.10-mad' 'gstreamer0.10-lame' 'gstreamer0.10-sidplay' 'gstreamer0.10-a52dec') + + cd "${srcdir}/gst-plugins-ugly-${pkgver}" + make -C ext DESTDIR="${pkgdir}" install +} diff --git a/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch b/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch new file mode 100644 index 000000000..cbd16b8e4 --- /dev/null +++ b/libre/gstreamer0.10-ugly/cdio-cd-text-api.patch @@ -0,0 +1,183 @@ +From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 +From: Leon Merten Lohse +Date: Thu, 03 May 2012 22:50:30 +0000 +Subject: cdio: compensate for libcdio's recent cd-text api changes + +https://bugzilla.gnome.org/show_bug.cgi?id=675112 + +Conflicts: + + ext/cdio/gstcdiocddasrc.c +--- +diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c +index 2f58d18..483ebf5 100644 +--- a/ext/cdio/gstcdio.c ++++ b/ext/cdio/gstcdio.c +@@ -30,12 +30,16 @@ + GST_DEBUG_CATEGORY (gst_cdio_debug); + + void +-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, ++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, + cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) + { + const gchar *txt; + ++#if LIBCDIO_VERSION_NUM > 83 ++ txt = cdtext_get_const (cdtext, field, track); ++#else + txt = cdtext_get_const (field, cdtext); ++#endif + if (txt == NULL || *txt == '\0') { + GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); + return; +@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, + } + + GstTagList * ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) ++{ ++ GstTagList *tags = NULL; ++ ++#else + gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + { + GstTagList *tags = NULL; +@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); + return NULL; + } ++#endif + +- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, ++ &tags); + + return tags; + } + + void ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, ++ GstTagList * tags) ++{ ++#else + gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + { + cdtext_t *t; +@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); + return; + } ++#endif + +- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); +- ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ALBUM_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, ++ &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, ++ &tags); + GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); + } + +diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h +index ef31ed0..c6da580 100644 +--- a/ext/cdio/gstcdio.h ++++ b/ext/cdio/gstcdio.h +@@ -24,22 +24,38 @@ + #include + #include + #include ++#include ++ ++#if LIBCDIO_VERSION_NUM <= 83 ++ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER ++ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE ++ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE ++#endif + + GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); + #define GST_CAT_DEFAULT gst_cdio_debug + + void gst_cdio_add_cdtext_field (GstObject * src, + cdtext_t * cdtext, ++ track_t track, + cdtext_field_t field, + const gchar * gst_tag, + GstTagList ** p_tags); + + GstTagList * gst_cdio_get_cdtext (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + track_t track); + + void gst_cdio_add_cdtext_album_tags (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + GstTagList * tags); + + #endif /* __GST_CDIO_H__ */ +diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c +index 615a0c8..830839e 100644 +--- a/ext/cdio/gstcdiocddasrc.c ++++ b/ext/cdio/gstcdiocddasrc.c +@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + GstCdioCddaSrc *src; + discmode_t discmode; + gint first_track, num_tracks, i; ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t *cdtext; ++#endif + + src = GST_CDIO_CDDA_SRC (audiocdsrc); + +@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + if (src->read_speed != -1) + cdio_set_speed (src->cdio, src->read_speed); + ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext = cdio_get_cdtext (src->cdio); ++ ++ if (NULL == cdtext) ++ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); ++ else ++ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, ++ cddabasesrc->tags); ++#else + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, + cddabasesrc->tags); ++#endif + + GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); + +@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + * the right thing here (for cddb id calculations etc. as well) */ + track.start = cdio_get_track_lsn (src->cdio, i + first_track); + track.end = track.start + len_sectors - 1; /* -1? */ ++#if LIBCDIO_VERSION_NUM > 83 ++ if (NULL != cdtext) ++ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, ++ i + first_track); ++#else + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, + i + first_track); ++#endif + + gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/libre/gstreamer0.10-ugly/opencore-amr.patch b/libre/gstreamer0.10-ugly/opencore-amr.patch new file mode 100644 index 000000000..0a350dc46 --- /dev/null +++ b/libre/gstreamer0.10-ugly/opencore-amr.patch @@ -0,0 +1,35 @@ +--- ext/amrnb/amrnbdec.h.orig 2012-03-12 16:49:14.417405139 +0000 ++++ ext/amrnb/amrnbdec.h 2012-03-12 16:49:35.393899419 +0000 +@@ -22,7 +22,7 @@ + + #include + #include +-#include ++#include + + G_BEGIN_DECLS + +--- ext/amrnb/amrnbenc.h.orig 2012-03-12 16:49:23.833996062 +0000 ++++ ext/amrnb/amrnbenc.h 2012-03-12 16:49:46.597141876 +0000 +@@ -21,7 +21,7 @@ + #define __GST_AMRNBENC_H__ + + #include +-#include ++#include + #include + + G_BEGIN_DECLS +--- ext/amrwbdec/amrwbdec.h.orig 2012-03-12 16:47:48.658100992 +0000 ++++ ext/amrwbdec/amrwbdec.h 2012-03-12 16:48:12.177910733 +0000 +@@ -22,8 +22,8 @@ + + #include + #include +-#include +-#include ++#include ++#include + + G_BEGIN_DECLS + diff --git a/libre/gstreamer0.10/PKGBUILD b/libre/gstreamer0.10/PKGBUILD new file mode 100644 index 000000000..416c1cbd9 --- /dev/null +++ b/libre/gstreamer0.10/PKGBUILD @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=gstreamer0.10 +pkgver=0.10.36 +pkgrel=1.1 +pkgdesc="GStreamer Multimedia Framework, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('LGPL') +url="http://gstreamer.freedesktop.org/" +depends=('libxml2' 'glib2') +optdepends=('sh: feedback script') +makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') +options=('!libtool') +source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) +md5sums=('15389c73e091b1dda915279c388b9cb2') + +build() { + cd "${srcdir}/gstreamer-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ + --with-package-name="GStreamer (Parabola GNU/Linux-libre)" \ + --with-package-origin="https://parabolagnulinux.org/" \ + --enable-gtk-doc --disable-static + make +} + +check() { + cd "${srcdir}/gstreamer-${pkgver}" + make check +} + +package() { + cd "${srcdir}/gstreamer-${pkgver}" + make DESTDIR="${pkgdir}" install + + #Remove unversioned gst-* binaries to get rid of conflicts + cd "${pkgdir}/usr/bin" + for bins in `ls *-0.10`; do + rm -f ${bins/-0.10/} + done +} diff --git a/libre/libtasn1/PKGBUILD b/libre/libtasn1/PKGBUILD new file mode 100644 index 000000000..2131a323b --- /dev/null +++ b/libre/libtasn1/PKGBUILD @@ -0,0 +1,36 @@ +# $Id$ +# Maintainer: Jan de Groot +# Contributor: judd + +pkgname=libtasn1 +pkgver=3.2 +pkgrel=1.1 +pkgdesc="The ASN.1 library used in GNUTLS, Parabola rebranded" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL3' 'LGPL') +url="http://www.gnu.org/software/libtasn1/" +depends=('glibc' 'texinfo') +options=('!libtool') +install=libtasn1.install +source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig}) +md5sums=('1b07629163025b9693aae9b8957842b2' + '67bdae9b78ac7bbfa2ab24c7d46bd577') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ + --with-packager="Parabola GNU/Linux-libre" \ + --with-packager-bug-reports="https://labs.parabola.nu/" \ + --with-packager-version=${pkgver}-${pkgrel} + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} diff --git a/libre/libtasn1/libtasn1.install b/libre/libtasn1/libtasn1.install new file mode 100644 index 000000000..2d1ecc09f --- /dev/null +++ b/libre/libtasn1/libtasn1.install @@ -0,0 +1,18 @@ +info_dir=/usr/share/info +info_files=(libtasn1.info) + +post_install() { + for f in ${info_files[@]}; do + install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + for f in ${info_files[@]}; do + install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null + done +} diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index b9860cb3f..25343fd26 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.3 -_kernrel=2 +_kernver=3.8.4 +_kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=9 +pkgrel=10 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 3a0571c9d..5e59c2fec 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.69 +_kernver=3.0.70 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=7 +pkgrel=8 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index fc87dbdb6..eaa185f4f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180056 2013-03-15 09:48:23Z tpowa $ +# $Id: PKGBUILD 180408 2013-03-21 07:53:18Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): André Silva @@ -7,7 +7,7 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=69 +_sublevel=70 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.69 # nearly always the same as pkgver @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - 'cf63ee4dfe973aa9f933ed552ac5c277' + '0f4930f721d1815e7e1d724775bfadd9' '99f9c408b64393aceb2482c9a3e329ee' 'fba95bf1857ce6bf863e13a1ab73f584' 'c072b17032e80debc6a8626299245d46' diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index f8eccd0c4..e0a21d3fa 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.69-1-LIBRE-LTS +KERNEL_VERSION=3.0.70-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d242c7cc8..080c8dcba 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $ +# $Id: PKGBUILD 180406 2013-03-21 07:26:50Z tpowa $ # Maintainer: Tobias Powalowski # Maintainer: Thomas Baechler # Maintainer (Parabola): Nicolás Reynolds @@ -10,9 +10,9 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=3 +_sublevel=4 pkgver=${_basekernel}.${_sublevel} -pkgrel=2 +pkgrel=1 _lxopkgver=${_basekernel}.3 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -29,11 +29,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'drm-i915-enable-irqs-earlier-when-resuming.patch' - 'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'a762b6f22a64473a0b4d8dc5366b25d3' + 'be610dd93dbe033cfe04018b27557c3e' '4d73ccd0f1825a4bd474d4fead6c0d42' 'e132184c6d02ef580a504967c067e1c5' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -41,8 +39,6 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '40e7b328977ad787a0b5584f193d63fe' - '8b9159931fab0c191a86dbd5a46fa328' '6dcf31e2ad8625ab2864af257e86564b') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -68,11 +64,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # revert 2 patches which breaks displays - # FS 34327 - patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch" - patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch b/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch deleted file mode 100644 index cb621d520..000000000 --- a/libre/linux-libre/drm-i915-enable-irqs-earlier-when-resuming.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Tue, 5 Mar 2013 09:50:58 +0100 -Subject: drm/i915: enable irqs earlier when resuming - -From: Daniel Vetter - -commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream. - -We need it to restore the ilk rc6 context, since the gpu wait no -requires interrupts. But in general having interrupts around should -help in code sanity, since more and more stuff is interrupt driven. - -This regression has been introduced in - -commit 3e9605018ab3e333d51cc90fccfde2031886763b -Author: Chris Wilson -Date: Tue Nov 27 16:22:54 2012 +0000 - - drm/i915: Rearrange code to only have a single method for waiting upon the ring - -Like in the driver load code we need to make sure that hotplug -interrupts don't cause havoc with our modeset state, hence block them -with the existing infrastructure. Again we ignore races where we might -loose hotplug interrupts ... - -Note that the driver load part of the regression has already been -fixed in - -commit 52d7ecedac3f96fb562cb482c139015372728638 -Author: Daniel Vetter -Date: Sat Dec 1 21:03:22 2012 +0100 - - drm/i915: reorder setup sequence to have irqs for output setup - -v2: Add a note to the commit message about which patch fixed the -driver load part of the regression. Stable kernels need to backport -both patches. - -Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691 -Cc: Chris Wilson -Cc: Mika Kuoppala -Reported-and-Tested-by: Ilya Tumaykin -Reviewed-by: Chris wilson (v1) -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/drivers/gpu/drm/i915/i915_drv.c -+++ b/drivers/gpu/drm/i915/i915_drv.c -@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de - intel_modeset_disable(dev); - - drm_irq_uninstall(dev); -+ dev_priv->enable_hotplug_processing = false; - } - - i915_save_state(dev); -@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de - error = i915_gem_init_hw(dev); - mutex_unlock(&dev->struct_mutex); - -+ /* We need working interrupts for modeset enabling ... */ -+ drm_irq_install(dev); -+ - intel_modeset_init_hw(dev); - intel_modeset_setup_hw_state(dev, false); -- drm_irq_install(dev); -+ -+ /* -+ * ... but also need to make sure that hotplug processing -+ * doesn't cause havoc. Like in the driver load code we don't -+ * bother with the tiny race here where we might loose hotplug -+ * notifications. -+ * */ -+ dev_priv->enable_hotplug_processing = true; - } - - intel_opregion_init(dev); diff --git a/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch deleted file mode 100644 index 8dc354488..000000000 --- a/libre/linux-libre/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001 -From: Daniel Vetter -Date: Sat, 1 Dec 2012 21:03:22 +0100 -Subject: drm/i915: reorder setup sequence to have irqs for output setup - -From: Daniel Vetter - -commit 52d7ecedac3f96fb562cb482c139015372728638 upstream. - -Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that -well. Noticed since the dp aux code doesn't have an automatic fallback -with a timeout (since the hw provides for that already). - -v2: Simple move drm_irq_install before intel_modeset_gem_init, as -suggested by Ben Widawsky. - -v3: Now that interrupts are enabled before all connectors are fully -set up, we might fall over serving a HPD interrupt while things are -still being set up. Instead of jumping through massive hoops and -complicating the code with a separate hpd irq enable step, simply -block out the hotplug work item from doing anything until things are -in place. - -v4: Actually, we can enable hotplug processing only after the fbdev is -fully set up, since we call down into the fbdev from the hotplug work -functions. So stick the hpd enabling right next to the poll helper -initialization. - -v5: We need to enable irqs before intel_modeset_init, since that -function sets up the outputs. - -v6: Fixup cleanup sequence, too. - -Reviewed-by: Imre Deak -Signed-off-by: Daniel Vetter -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/gpu/drm/i915/i915_dma.c | 23 ++++++++++++++--------- - drivers/gpu/drm/i915/i915_drv.h | 1 + - drivers/gpu/drm/i915/i915_irq.c | 4 ++++ - 3 files changed, 19 insertions(+), 9 deletions(-) - ---- a/drivers/gpu/drm/i915/i915_dma.c -+++ b/drivers/gpu/drm/i915/i915_dma.c -@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct - if (ret) - goto cleanup_vga_switcheroo; - -+ ret = drm_irq_install(dev); -+ if (ret) -+ goto cleanup_gem_stolen; -+ -+ /* Important: The output setup functions called by modeset_init need -+ * working irqs for e.g. gmbus and dp aux transfers. */ - intel_modeset_init(dev); - - ret = i915_gem_init(dev); - if (ret) -- goto cleanup_gem_stolen; -- -- intel_modeset_gem_init(dev); -+ goto cleanup_irq; - - INIT_WORK(&dev_priv->console_resume_work, intel_console_resume); - -- ret = drm_irq_install(dev); -- if (ret) -- goto cleanup_gem; -+ intel_modeset_gem_init(dev); - - /* Always safe in the mode setting case. */ - /* FIXME: do pre/post-mode set stuff in core KMS code */ -@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct - - ret = intel_fbdev_init(dev); - if (ret) -- goto cleanup_irq; -+ goto cleanup_gem; -+ -+ /* Only enable hotplug handling once the fbdev is fully set up. */ -+ dev_priv->enable_hotplug_processing = true; - - drm_kms_helper_poll_init(dev); - -@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct - - return 0; - --cleanup_irq: -- drm_irq_uninstall(dev); - cleanup_gem: - mutex_lock(&dev->struct_mutex); - i915_gem_cleanup_ringbuffer(dev); - mutex_unlock(&dev->struct_mutex); - i915_gem_cleanup_aliasing_ppgtt(dev); -+cleanup_irq: -+ drm_irq_uninstall(dev); - cleanup_gem_stolen: - i915_gem_cleanup_stolen(dev); - cleanup_vga_switcheroo: ---- a/drivers/gpu/drm/i915/i915_drv.h -+++ b/drivers/gpu/drm/i915/i915_drv.h -@@ -672,6 +672,7 @@ typedef struct drm_i915_private { - - u32 hotplug_supported_mask; - struct work_struct hotplug_work; -+ bool enable_hotplug_processing; - - int num_pipe; - int num_pch_pll; ---- a/drivers/gpu/drm/i915/i915_irq.c -+++ b/drivers/gpu/drm/i915/i915_irq.c -@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc - struct drm_mode_config *mode_config = &dev->mode_config; - struct intel_encoder *encoder; - -+ /* HPD irq before everything is fully set up. */ -+ if (!dev_priv->enable_hotplug_processing) -+ return; -+ - mutex_lock(&mode_config->mutex); - DRM_DEBUG_KMS("running encoder hotplug functions\n"); - diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 24bb42986..6b7f58a8b 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.3-2-LIBRE +KERNEL_VERSION=3.8.4-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD new file mode 100644 index 000000000..7d594cdcd --- /dev/null +++ b/libre/usermin/PKGBUILD @@ -0,0 +1,134 @@ +# $Id$ +# Maintainer: Tobias Powalowski +pkgname=usermin +pkgver=1.540 +pkgrel=1.1 +pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding (Parabola rebranded)" +arch=(i686 x86_64 mips64el) +license=('custom:usermin') +url="http://www.webmin.com/" +depends=('perl' 'webmin') +makedepends=('perl-net-ssleay') +backup=('etc/usermin/miniserv.conf' 'etc/usermin/miniserv.users' 'etc/usermin/config' 'etc/usermin/usermin.cats' \ +'etc/usermin/at/config' \ +'etc/usermin/man/config' \ +'etc/usermin/ssh/config' \ +'etc/usermin/chfn/config' \ +'etc/usermin/cron/config' \ +'etc/usermin/file/config' \ +'etc/usermin/plan/config' \ +'etc/usermin/proc/config' \ +'etc/usermin/spam/config' \ +'etc/usermin/htaccess/config' \ +'etc/usermin/cshrc/config' \ +'etc/usermin/gnupg/config' \ +'etc/usermin/mysql/config' \ +'etc/usermin/quota/config' \ +'etc/usermin/shell/config' \ +'etc/usermin/theme/config' \ +'etc/usermin/mailbox/config' \ +'etc/usermin/schedule/config' \ +'etc/usermin/config' \ +'etc/usermin/commands/config' \ +'etc/usermin/htaccess-htpasswd/config' \ +'etc/usermin/forward/config' \ +'etc/usermin/telnet/config' \ +'etc/usermin/tunnel/config' \ +'etc/usermin/updown/config' \ +'etc/usermin/procmail/config' \ +'etc/usermin/fetchmail/config' \ +'etc/usermin/changepass/config' \ +'etc/usermin/language/config' \ +'etc/usermin/postgresql/config' \ +'etc/usermin/usermount/config' \ +) +install=usermin.install +source=(http://downloads.sourceforge.net/sourceforge/webadmin/$pkgname-$pkgver.tar.gz + usermin.rc + usermin.service + ftp://ftp.archlinux.org/other/usermin/usermin-config.tar.bz2) + +package() { + cd "$srcdir"/$pkgname-$pkgver + + # remove modules we do not support + + #remove config files from other distros + rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') + + # remove caldera theme + rm -rf caldera + + # remove init-scripts from other distros + rm usermin-init + rm usermin-daemon + + # setting perl path + (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - + + # create dirs + mkdir -p "$pkgdir"/opt/usermin + mkdir -p "$pkgdir"/var/log/usermin + mkdir -p "$pkgdir"/etc/usermin + + # install pam stuff + install -D -m 644 usermin-pam "$pkgdir"/etc/pam.d/usermin + + # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work! + rm os_list.txt + echo 'Parabola GNU/Linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt + + # copy stuff to right dirs + cd "$srcdir"/$pkgname-$pkgver + cp -rp * "$pkgdir"/opt/usermin + cd "$srcdir"/usermin-config + cp -rfp * "$pkgdir"/opt/usermin + + # define parameters for setup.sh + config_dir="$pkgdir"/etc/usermin + var_dir="$pkgdir"/var/log/usermin + perl=/usr/bin/perl + autoos=1 + port=20000 + login=root + crypt="XXX" + ssl=1 + atboot=0 + nostart=1 + nochown=1 + autothird=1 + nouninstall=1 + noperlpath=1 + atbootyn=n + tempdir="$pkgdir"/tmp + export config_dir var_dir perl autoos port tempdir ssl nochown autothird nouninstall nostart noperlpath atbootyn login crypt + + # Fix setup.sh + sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/usermin/setup.sh + "$pkgdir"/opt/usermin/setup.sh + + # Fixup the config files to use their real locations + sed -i 's:^pidfile=.*$:pidfile=/var/run/usermin.pid:' "$pkgdir"/etc/usermin/miniserv.conf + find "$pkgdir"/etc/usermin -type f -exec sed -i "s:$pkgdir::g" {} \; + + # make it only accessible by localhost + echo 'allow=127.0.0.1' >> "$pkgdir"/etc/usermin/miniserv.conf + + # enable user and password login + sed -i -e '/localauth/d' "$pkgdir"/etc/usermin/miniserv.conf + + #install systemd service file + install -D -m 644 "$srcdir"/usermin.service "$pkgdir"/usr/lib/systemd/system/usermin.service + + #install rc file + install -D -m 755 "$srcdir"/usermin.rc "$pkgdir"/etc/rc.d/usermin + + # delete temp dir + rm -r "$pkgdir"/tmp + #install license + install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/usermin/LICENCE +} +md5sums=('d29c9fdebab14c168c33bde8906efe21' + 'cfef4490cd1ef9517c0b39a7bd75c968' + 'a5bd5e5ee779f8a3cf3d776ca77ee36e' + 'ec37a79f948f778224550930d2a7ca07') diff --git a/libre/usermin/usermin.install b/libre/usermin/usermin.install new file mode 100644 index 000000000..3ace10ea2 --- /dev/null +++ b/libre/usermin/usermin.install @@ -0,0 +1,34 @@ +# arg 1: the new package version +post_install() { + local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :) + crypt=${crypt//\\/\\\\} + crypt=${crypt//\//\\\/} + sed -i "s/root:XXX/root:${crypt}/" /etc/usermin/miniserv.users +cat << EOF +Note: +==> It is not allowed to install 3rd party modules, or delete existing modules. +==> Please write your own PKGBUILDS for 3rd party modules and additional themes. +Setup: +==> To make usermin start at boot time, add usermin to rc.conf daemons +==> Point your web browser to http://localhost:20000 to use usermin. +==> To change the modules setup please use webmin. + +==> The access is restricted to localhost, if you want to connect from other locations +==> change /etc/usermin/miniserv.conf to something like that: allow=127.0.0.1 +==> If you want to have ssl encryption please install 'perl-net-ssleay' additional. +EOF +# fix man module + cd /opt/usermin/man + gzip -df $(find . -name '*.gz') +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +pre_remove() { + # uninstall unzipped files + rm -r /opt/usermin/man +} diff --git a/libre/usermin/usermin.rc b/libre/usermin/usermin.rc new file mode 100644 index 000000000..af365780a --- /dev/null +++ b/libre/usermin/usermin.rc @@ -0,0 +1,44 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +start=/etc/usermin/start +stop=/etc/usermin/stop +lockfile=/var/lock/usermin + +case "$1" in +'start') + stat_busy "Starting Usermin daemon" + $start >/dev/null 2>&1 /dev/null 2>&1 + stat_done + else + stat_fail +fi +;; + +'stop') + stat_busy "Stopping Usermin daemon" + $stop >/dev/null 2>&1 +pkgname=webmin +pkgver=1.620 +pkgrel=1.1 +pkgdesc="a web-based interface for system administration, Parabola rebranded" +arch=(i686 x86_64 mips64el) +license=('custom:webmin') +url="http://www.webmin.com/" +depends=('perl' 'perl-perl4-corelibs') +makedepends=('perl-net-ssleay') +backup=('etc/webmin/miniserv.conf' 'etc/webmin/miniserv.users' 'etc/webmin/config' 'etc/webmin/webmin.cats' \ +'etc/webmin/pacman/config' \ +'etc/webmin/at/config' \ +'etc/webmin/acl/config' \ +'etc/webmin/lvm/config' \ +'etc/webmin/net/config' \ +'etc/webmin/nis/config' \ +'etc/webmin/pam/config' \ +'etc/webmin/cron/config' \ +'etc/webmin/file/config' \ +'etc/webmin/grub/config' \ +'etc/webmin/init/config' \ +'etc/webmin/ipfw/config' \ +'etc/webmin/lilo/config' \ +'etc/webmin/proc/config' \ +'etc/webmin/raid/config' \ +'etc/webmin/spam/config' \ +'etc/webmin/sshd/config' \ +'etc/webmin/time/config' \ +'etc/webmin/cluster-passwd/config' \ +'etc/webmin/software/config' \ +'etc/webmin/webminlog/config' \ +'etc/webmin/cluster-webmin/config' \ +'etc/webmin/bind8/config' \ +'etc/webmin/dhcpd/config' \ +'etc/webmin/fdisk/config' \ +'etc/webmin/mount/config' \ +'etc/webmin/mysql/config' \ +'etc/webmin/quota/config' \ +'etc/webmin/samba/config' \ +'etc/webmin/shell/config' \ +'etc/webmin/squid/config' \ +'etc/webmin/adsl-client/config' \ +'etc/webmin/servers/config' \ +'etc/webmin/cluster-shell/config' \ +'etc/webmin/bandwidth/config' \ +'etc/webmin/ppp-client/config' \ +'etc/webmin/lpadmin/config' \ +'etc/webmin/apache/config' \ +'etc/webmin/firewall/config' \ +'etc/webmin/stunnel/config' \ +'etc/webmin/burner/config' \ +'etc/webmin/exports/config' \ +'etc/webmin/backup-config/config' \ +'etc/webmin/custom/config' \ +'etc/webmin/htaccess-htpasswd/config' \ +'etc/webmin/logrotate/config' \ +'etc/webmin/format/config' \ +'etc/webmin/fsdump/config' \ +'etc/webmin/passwd/config' \ +'etc/webmin/cluster-useradmin/config' \ +'etc/webmin/cluster-software/config' \ +'etc/webmin/cluster-copy/config' \ +'etc/webmin/cluster-cron/config' \ +'etc/webmin/telnet/config' \ +'etc/webmin/status/config' \ +'etc/webmin/syslog/config' \ +'etc/webmin/updown/config' \ +'etc/webmin/usermin/config' \ +'etc/webmin/webmin/config' \ +'etc/webmin/xinetd/config' \ +'etc/webmin/openslp/config' \ +'etc/webmin/procmail/config' \ +'etc/webmin/fetchmail/config' \ +'etc/webmin/postgresql/config' \ +'etc/webmin/useradmin/config' \ +'etc/webmin/mailboxes/config' \ +'etc/webmin/inittab/config' \ +'etc/webmin/change-user/config' \ +'etc/webmin/postfix/config' \ +'etc/webmin/proftpd/config' \ +'etc/webmin/pserver/config' \ +'etc/webmin/dnsadmin/config' ) +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.service) +options=(!strip) + +package() { + # NOTE: USE --asroot build option to avoid fakeroot error! + cd "$srcdir"/$pkgname-$pkgver + # add patches from webmin.com + #for i in ../*.wbm + #do tar xvf $i + #done + #for i in ../*.wbt + #do tar xvf $i + #done + # delete stuff that's not needed + rm -f mount/freebsd-mounts* + rm -f mount/openbsd-mounts* + rm -f mount/macos-mounts* + + # remove modules we do not support + rm -rf {bacula-backup,ldap-useradmin,mon,sentry,frox,jabber,majordomo,qmail,sendmail,sarg,wuftpd,webalizer,inetd,ipsec,pap,pptp-client,pptp-server,shorewall,smart-status,vgetty,heartbeat,cfengine,cpan,sgiexports,hpuxexports,qmailadmin,bsdexports,dfsadmin} + + #remove config files from other distros + rm -f $(find . ! -name 'config-generic-linux' ! -name 'config-\*-linux' ! -name 'config-lib.pl' -name 'config-*') + + # remove caldera theme + rm -rf caldera + + # remove init-scripts from other distros + rm webmin-gentoo-init + rm webmin-init + rm webmin-caldera-init + rm webmin-daemon + + # remove update stuff to avoid problems with updating webmin,modules and themes without pacman + rm -f webmin/{update.cgi,update.pl,update_sched.cgi,upgrade.cgi,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} + rm -f usermin/{upgrade.cgi,update.cgi,update.pl,edit_upgrade.cgi,install_mod.cgi,delete_mod.cgi,install_theme.cgi} + + # remove modules add because we don't want files installed without pacman control + rm -f webmin/{install_mod.cgi,delete_mod.cgi} + + # setting perl path + (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - + + # create dirs + mkdir -p "$pkgdir"/opt/webmin + mkdir -p "$pkgdir"/var/log/webmin + mkdir -p "$pkgdir"/etc/webmin + + # install pam stuff + install -D -m 644 webmin-pam "$pkgdir"/etc/pam.d/webmin + + # remove other distros and add only Parabola GNU/Linux-libre don't change next line else it will not work! + rm os_list.txt + echo 'Parabola GNU/linux-libre Any version generic-linux * -d "/etc/pacman.d"' >> os_list.txt + + # Add rc.conf support to boot and shutdown menu and lock editing of this module + cd init/ + sed -i -e 's:^local_down=.*:local_down=Parabola GNU/Linux-libre RC.CONF,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') + sed -i -e 's:^local_script=.*:local_script=Parabola GNU/Linux-libre RC.LOCAL,3,None:g' $(find . ! -name 'config.info.pl' -name 'config.info*') + sed -i -e 's:^index_downscript=.*:index_downscript=Parabola GNU/Linux-libre RC.CONF:g' lang/* + sed -i -e 's:^index_script=.*:index_script=Parabola GNU/Linux-libre RC.LOCAL:g' lang/* + sed -i -e 's:^noconfig=0:noconfig=1:g' defaultacl + + # Add pacman menu + cd "$srcdir"/$pkgname-$pkgver + cp -rf custom/ pacman + cp -rf mscstyle3/custom mscstyle3/pacman + sed -i -e 's:^noconfig=0:noconfig=1:g' -e 's:^edit=1:edit=0:g' pacman/defaultacl + sed -i -e '/desc/d' -e '/longdesc/d' pacman/module.info + sed -i -e 's:^name=Custom:name=Pacman:g' pacman/module.info + echo 'category=system' >> pacman/module.info + echo 'desc=Pacman' >> pacman/module.info + sed -i -e 's:^index_title=.*:index_title=Pacman:g' pacman/lang/* + + # copy stuff to right dirs + cd "$srcdir"/$pkgname-$pkgver + cp -rp * "$pkgdir"/opt/webmin + cd "$srcdir"/webmin-config + cp -rfp * "$pkgdir"/opt/webmin + + # define parameters for setup.sh + config_dir="$pkgdir"/etc/webmin + var_dir="$pkgdir"/var/log/webmin + perl=/usr/bin/perl + autoos=1 + port=10000 + login=root + crypt="XXX" + ssl=1 + atboot=0 + nostart=1 + nochown=1 + autothird=1 + nouninstall=1 + noperlpath=1 + atbootyn=n + tempdir="$pkgdir"/tmp + export config_dir var_dir perl autoos port tempdir login crypt ssl nochown autothird nouninstall nostart noperlpath atbootyn + + # Fix setup.sh + sed -i -e 's:read atbootyn::g' -e 's:exit 13::g' "$pkgdir"/opt/webmin/setup.sh + "$pkgdir"/opt/webmin/setup.sh + + # Fixup the config files to use their real locations + sed -i 's:^pidfile=.*$:pidfile=/var/run/webmin.pid:' "$pkgdir"/etc/webmin/miniserv.conf + find "$pkgdir"/etc/webmin -type f -exec sed -i "s:$pkgdir::g" {} \; + + # make it only accessible by localhost + echo 'allow=127.0.0.1' >> "$pkgdir"/etc/webmin/miniserv.conf + + # install pacman menu + cd "$srcdir"/webmin-pacman/config + cp -rfp * "$pkgdir"/etc/webmin/pacman + + #install rc file + install -D -m 755 "$srcdir"/webmin.rc "$pkgdir"/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 "$pkgdir"/tmp + # change sticky bit + chmod 0644 $pkgdir/opt/webmin/man/config-generic-linux + # install license + install -m 644 -D "$srcdir"/$pkgname-$pkgver/LICENCE "$pkgdir"/usr/share/licenses/webmin/LICENCE +} +md5sums=('e93bc5057a5b7d7e31ecb2bb228d7044' + 'b0b3e3fb231a12e60165b6b4d604dcfa' + 'bfebb75bb94029b48c46b7f1ba1aa811' + 'c77dfcd621b417a7826d25f56a1e60ae' + 'fc29ecb6a5cd8c278abe054e60381095') diff --git a/libre/webmin/webmin.install b/libre/webmin/webmin.install new file mode 100644 index 000000000..efdd9291d --- /dev/null +++ b/libre/webmin/webmin.install @@ -0,0 +1,35 @@ +# arg 1: the new package version +post_install() { + local crypt=$(grep "^root:" ${ROOT}/etc/shadow | cut -f 2 -d :) + crypt=${crypt//\\/\\\\} + crypt=${crypt//\//\\\/} + sed -i "s/root:XXX/root:${crypt}/" /etc/webmin/miniserv.users + +cat << EOF +Note: +==> It is not allowed to install 3rd party modules, or delete existing modules. +==> Please write your own PKGBUILDS for 3rd party modules and additional themes. +Setup: +==> To make webmin start at boot time, add webmin to rc.conf daemons +==> Point your web browser to http://localhost:10000 to use webmin. +==> The access is restricted to localhost, if you want to connect from other locations +==> change /etc/webmin/miniserv.conf to something like that: allow=127.0.0.1 +==> If you want to have ssl encryption please install 'perl-net-ssleay' additional. +EOF +# fix man module + cd /opt/webmin/man + for i in $(find . -name '*.gz'); do + gzip -df $i + done +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +pre_remove() { + # uninstall unzipped files + rm -r /opt/webmin/man +} diff --git a/libre/webmin/webmin.rc b/libre/webmin/webmin.rc new file mode 100644 index 000000000..6aac8941d --- /dev/null +++ b/libre/webmin/webmin.rc @@ -0,0 +1,46 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +start=/etc/webmin/start +stop=/etc/webmin/stop +lockfile=/var/lock/webmin + +case "$1" in +'start') + stat_busy "Starting Webmin daemon" + $start >/dev/null 2>&1 /dev/null 2>&1 + add_daemon webmin + stat_done + else + stat_fail +fi +;; + +'stop') + stat_busy "Stopping Webmin daemon" + $stop >/dev/null 2>&1 +# Contributor: Tobias Kieslich + +pkgname=xsp +pkgver=2.10.2 +pkgrel=4.1 +pkgdesc="A simple webserver based on mono - provides ASP.NET support, Parabola rebranded" +arch=(i686 x86_64 mips64el) +license=('custom') +url="http://www.go-mono.com" +depends=('mono>=2.10.2' 'sqlite') +options=(!makeflags) +install=${pkgname}.install +source=(http://download.mono-project.com/sources/xsp/xsp-2.10.2.tar.bz2 + ${pkgname}.rc.d ${pkgname}.conf.d ${pkgname}.webapp ${pkgname}.service) + +build() { + # get rid of that .wapi errors; thanks to brice + export MONO_SHARED_DIR=${srcdir}/src/weird + mkdir -p "${MONO_SHARED_DIR}" + # import pathes + # build + cd ${srcdir}/${pkgname}-${pkgver} + #sed -i 's|/bin/sh|\0\nexport MONO_PATH=${MONO_PATH}:/opt/mono/lib/mono/1.0|' scripts/script.in + ./configure --prefix=/usr --sysconfdir=/etc + make || return 1 + # tweak the xsp shellscript to grab system dll's + for script in scripts/*2; do + sed -i 's|/usr/lib/mono/1.0|/usr/lib/mono/2.0|' $script + done + #destdir related bugfixes + sed -i 's|mkdir \$(datadir)|mkdir $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile + sed -i 's|gif \$(datadir)|gif $(DESTDIR)$(datadir)|' test/2.0/treeview/Makefile +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir}/ install + # move test files from share to arch' default html home + mkdir -p ${pkgdir}/srv/http/html + mv ${pkgdir}/usr/lib/xsp/test ${pkgdir}/srv/http/html/xsp + rm -rf ${pkgdir}/usr/share + chown -R http:http ${pkgdir}/srv/http/html/${pkgname} + + # install a deamon + install -D -m755 ${srcdir}/${pkgname}.rc.d \ + ${pkgdir}/etc/rc.d/${pkgname} + # install a deamon configurationfile + install -D -m644 ${srcdir}/$pkgname.conf.d \ + ${pkgdir}/etc/conf.d/${pkgname} + # install a xsp configuration home + install -D -m644 ${srcdir}/${pkgname}.webapp \ + ${pkgdir}/etc/${pkgname}/${pkgname}.webapp + install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + # install systemd service file + install -D -m644 ${srcdir}/${pkgname}.service \ + ${pkgdir}/usr/lib/systemd/system/xsp.service +} +md5sums=('4fe62fc95ad5dc136d8a7f3299d523b6' + '9575bd7d6f64d51ba05bdd6370665858' + '35d921df0fefc30f47a438c95d420efc' + 'c917c07f68b945691506c29750db482f' + '9d83bd36d209f8d36a11dfbc4fa50819') diff --git a/libre/xsp/xsp.conf.d b/libre/xsp/xsp.conf.d new file mode 100644 index 000000000..b100baef1 --- /dev/null +++ b/libre/xsp/xsp.conf.d @@ -0,0 +1,10 @@ +# xsp options + + +# note that is just the helping app for mod_mono if you like production like +# quality +# xsp is for ASP testing mainly -- read the manpage for xsp to know what +# options are available. Parabola will provide xsp configured by a .webapp +# configuration file which rests in /etc/xsp + +XSP_PARAMS="--appconfigdir /etc/xsp" diff --git a/libre/xsp/xsp.install b/libre/xsp/xsp.install new file mode 100644 index 000000000..d2cc5955a --- /dev/null +++ b/libre/xsp/xsp.install @@ -0,0 +1,37 @@ +# arg 1: the new package version +post_install() { + cat << EOM + +--> xsp is just the helping app for mod_mono if you like a production like +--> server. xsp itself is for ASP testing mainly -- read the manpage for xsp +--> to know which options are available. +--> Parabola will provide xsp configured by a .webapp configuration file +--> which rests in /etc/xsp. Just put your other webapp files there to let +--> xsp pick them up. +--> xsp is commandline based configuration is done in /etc/conf.d/xsp. Set all +--> your arguments there. Don't forget that you can run xsp from the console +--> as oridinary user, which is safer and for testing absolutely sufficient!! + +--> You can run the testpages simply by starting the server and calling + http://localhost:8080 +--> from your browser's location bar + + +EOM +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + /bin/true +} + +# arg 1: the old package version +post_remove() { + /bin/true +} diff --git a/libre/xsp/xsp.rc.d b/libre/xsp/xsp.rc.d new file mode 100644 index 000000000..b4fcda15c --- /dev/null +++ b/libre/xsp/xsp.rc.d @@ -0,0 +1,40 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +# source application-specific settings +[ -f /etc/conf.d/xsp ] && . /etc/conf.d/xsp + +PID=`pidof -o %PPID /usr/bin/mono` +case "$1" in + start) + stat_busy "Starting Xsp Daemon" + if [ -z "$PID" ]; then + /usr/bin/xsp $XSP_PARAMS --nonstop &> /dev/null & + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + add_daemon xsp + stat_done + fi + ;; + stop) + stat_busy "Stopping Xsp Daemon" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon xsp + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/libre/xsp/xsp.service b/libre/xsp/xsp.service new file mode 100644 index 000000000..36b802e21 --- /dev/null +++ b/libre/xsp/xsp.service @@ -0,0 +1,8 @@ +[Unit] +Description=XSP Web Server + +[Service] +ExecStart=/usr/bin/xsp --appconfigdir /etc/xsp --nonstop + +[Install] +WantedBy=multi-user.target diff --git a/libre/xsp/xsp.webapp b/libre/xsp/xsp.webapp new file mode 100644 index 000000000..a685dd171 --- /dev/null +++ b/libre/xsp/xsp.webapp @@ -0,0 +1,8 @@ + + + Root + / + /srv/http/html/xsp + localhost + + -- cgit v1.2.3-54-g00ecf From d1d93fafb9ef98fdd0c9a5a486c179c03cbbfb33 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Apr 2013 01:16:16 -0700 Subject: Tue Apr 23 01:16:16 PDT 2013 --- community/activity-log-manager/PKGBUILD | 10 +- community/almanah/PKGBUILD | 9 +- community/almanah/eds-3.8.patch | 2609 ++++++ community/apvlv/PKGBUILD | 29 +- community/apvlv/apvlv.desktop | 17 + community/apvlv/apvlv.install | 7 + community/audit/PKGBUILD | 6 +- community/cinnamon-control-center/PKGBUILD | 25 +- .../cinnamon-control-center/gnomerrlabeler.patch | 766 ++ community/cinnamon-control-center/idle-delay.patch | 71 + community/cinnamon-screensaver/PKGBUILD | 16 +- .../cinnamon-screensaver/cinnamon-screensaver.pam | 2 +- .../fix-dbus-compatibility.patch | 245 +- community/cinnamon-screensaver/gnome-autogen.sh | 538 -- community/cinnamon/PKGBUILD | 47 +- community/cinnamon/cinnamon.install | 18 - community/cinnamon/fix-keyboard-settings.patch | 83 - community/cinnamon/gnome-3.8.patch | 3669 ++++++++ community/clinica/PKGBUILD | 6 +- community/couchdb/PKGBUILD | 4 +- community/cython/PKGBUILD | 6 +- community/denemo/PKGBUILD | 4 +- community/elinks/PKGBUILD | 34 +- community/freewrl/PKGBUILD | 4 +- community/gedit-plugins/PKGBUILD | 14 +- community/giggle/PKGBUILD | 33 +- community/giggle/gtksourceview3.7.patch | 36 + community/gitg/PKGBUILD | 34 +- community/gitg/gitg.install | 16 +- community/gnome-applets/01_battstat_upower.patch | 622 ++ community/gnome-applets/PKGBUILD | 68 +- .../gnome-applets/disable-gweather-applet.patch | 12 + community/gnome-applets/fix-autoconf.patch | 12 + .../gnome-applets/gnome-applets-cpupower.patch | 12 + community/gnome-packagekit/PKGBUILD | 6 +- .../0001-Add-the-GNOME-Flashback-session.patch | 95 + .../gnome-panel/18_fix_force_quit_applet.patch | 98 + community/gnome-panel/PKGBUILD | 100 +- .../gnome-panel/drop-gweather-xml-include.patch | 10 + community/gnome-panel/fix-autoconf.patch | 11 + community/gnome-panel/gnome-desktop-3.8.patch | 199 + community/gnome-panel/gnome-panel.install | 14 +- community/gnome-panel/logout-hang-workaround.patch | 15 + community/gnome-phone-manager/PKGBUILD | 12 +- .../gnome-phone-manager-0.68-eds.patch | 164 +- community/gnome-screensaver/PKGBUILD | 41 +- community/gnome-screensaver/fix-autoconf.patch | 12 + .../gnome-screensaver/gnome-screensaver.install | 7 - community/gnome-screensaver/gnome-screensaver.pam | 4 +- .../gnome-screensaver/move-desktop-file.patch | 34 + community/gnome-settings-daemon-compat/PKGBUILD | 61 + .../draw-background-unconditionally.patch | 162 + .../flashback-rename.patch | 18 + .../remove-libgsd-dependency.patch | 160 + .../sessionisactive-port.patch | 73 + .../standalone-background-helper.patch | 437 + ...edia-keys-Use-logind-for-suspending-and-r.patch | 1476 ---- community/gnome-settings-daemon-updates/PKGBUILD | 18 +- community/gnote/PKGBUILD | 6 +- community/gtksourceviewmm/PKGBUILD | 4 +- community/gtranslator/PKGBUILD | 28 +- community/gwibber/PKGBUILD | 6 +- community/ktoblzcheck/PKGBUILD | 6 +- community/metacity/PKGBUILD | 50 +- community/metacity/enable_compositing.patch | 12 + community/metacity/fix_force_quit.patch | 222 + community/metacity/fix_shadows.patch | 39 + community/muffin/PKGBUILD | 14 +- community/nemiver/PKGBUILD | 9 +- community/nemiver/nemiver.install | 15 - community/nemo/PKGBUILD | 33 +- community/nemo/remove-desktop-background.patch | 964 +++ community/nemo/tracker-0.16.patch | 33 + community/nemo/use-terminal-config.patch | 45 - community/notion/PKGBUILD | 58 +- community/shotwell/PKGBUILD | 6 +- community/synapse/PKGBUILD | 8 +- community/ubuntuone-client-gnome/PKGBUILD | 15 +- .../disable-gsd-plugin.patch | 21 + community/virtualbox-modules-lts/PKGBUILD | 4 +- community/virtualbox-modules/PKGBUILD | 4 +- community/xdebug/PKGBUILD | 10 +- community/xsettings-client/PKGBUILD | 8 +- community/zeitgeist-datahub/PKGBUILD | 29 - core/dirmngr/PKGBUILD | 4 +- ...-Make-gtester-report-work-with-Python-3.x.patch | 60 + core/glib2/PKGBUILD | 49 +- core/gnupg/PKGBUILD | 4 +- core/gpgme/PKGBUILD | 10 +- core/libksba/PKGBUILD | 8 +- core/libusbx/PKGBUILD | 6 +- core/perl/PKGBUILD | 7 +- ...nvfiles-do-not-skip-lines-following-empty.patch | 167 - ...-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch | 35 - ...-avoid-creating-stale-session-state-files.patch | 48 - ...stname-ensure-that-glibc-s-assert-is-used.patch | 36 + core/systemd/PKGBUILD | 20 +- extra/anjuta-extras/PKGBUILD | 6 +- extra/anjuta/PKGBUILD | 40 +- extra/anjuta/anjuta-glade.xml.diff | 101 + extra/anjuta/fix-compile-error.patch | 24 + extra/at-spi2-atk/PKGBUILD | 9 +- extra/at-spi2-atk/at-spi2-atk.install | 11 - extra/at-spi2-core/PKGBUILD | 8 +- extra/atk/PKGBUILD | 6 +- extra/baobab/PKGBUILD | 8 +- extra/bijiben/PKGBUILD | 28 + extra/bijiben/bijiben.install | 13 + extra/brasero/PKGBUILD | 21 +- extra/brasero/use-mpegaudioparse.patch | 53 - extra/brltty/PKGBUILD | 44 +- extra/brltty/brltty | 68 - extra/brltty/brltty.conf | 2 - extra/caribou/PKGBUILD | 17 +- extra/cheese/PKGBUILD | 13 +- extra/clutter-gst/PKGBUILD | 4 +- extra/clutter-gtk/PKGBUILD | 6 +- extra/clutter/PKGBUILD | 15 +- extra/cogl/PKGBUILD | 11 +- extra/dconf/PKGBUILD | 8 +- extra/devhelp/PKGBUILD | 18 +- extra/devhelp/devhelp.install | 16 +- extra/ekiga/PKGBUILD | 5 +- extra/empathy/PKGBUILD | 23 +- extra/eog-plugins/PKGBUILD | 9 +- extra/eog/PKGBUILD | 18 +- extra/epiphany/PKGBUILD | 12 +- extra/evince/PKGBUILD | 22 +- extra/evolution-data-server/PKGBUILD | 8 +- extra/evolution-ews/PKGBUILD | 8 +- extra/evolution/PKGBUILD | 18 +- extra/five-or-more/PKGBUILD | 36 + extra/five-or-more/five-or-more.install | 35 + extra/folks/PKGBUILD | 17 +- extra/fontconfig/29-replace-bitmap-fonts.conf | 47 +- extra/fontconfig/PKGBUILD | 26 +- extra/fontconfig/git_fixes.diff | 732 ++ extra/four-in-a-row/PKGBUILD | 32 + extra/four-in-a-row/four-in-a-row.install | 13 + extra/gcalctool/PKGBUILD | 30 - extra/gcalctool/gcalctool.install | 11 - extra/gconf-editor/PKGBUILD | 5 +- extra/gcr/PKGBUILD | 10 +- extra/gdk-pixbuf2/PKGBUILD | 8 +- extra/gdl/PKGBUILD | 6 +- extra/gdm/PKGBUILD | 67 +- extra/gdm/git-fixes.patch | 9067 -------------------- extra/gdm/maintain-FamilyLocal-cookie.patch | 124 - extra/gedit/PKGBUILD | 22 +- extra/ghex/PKGBUILD | 10 +- extra/gjs/PKGBUILD | 24 +- extra/glade/PKGBUILD | 8 +- extra/glib-networking/PKGBUILD | 25 +- extra/glib-perl/PKGBUILD | 10 +- extra/glibmm/PKGBUILD | 6 +- extra/gnome-bluetooth/PKGBUILD | 10 +- extra/gnome-bluetooth/gnome-bluetooth.install | 1 - extra/gnome-calculator/PKGBUILD | 32 + extra/gnome-calculator/gnome-calculator.install | 11 + extra/gnome-chess/PKGBUILD | 32 + extra/gnome-chess/gnome-chess.install | 13 + extra/gnome-clocks/PKGBUILD | 49 + extra/gnome-clocks/gnome-clocks.install | 13 + extra/gnome-color-manager/PKGBUILD | 12 +- extra/gnome-contacts/PKGBUILD | 10 +- extra/gnome-control-center/PKGBUILD | 42 +- extra/gnome-control-center/pulse3.0.patch | 25 - extra/gnome-desktop/PKGBUILD | 10 +- extra/gnome-dictionary/PKGBUILD | 6 +- extra/gnome-disk-utility/PKGBUILD | 28 +- extra/gnome-documents/PKGBUILD | 24 +- extra/gnome-font-viewer/PKGBUILD | 8 +- extra/gnome-games/PKGBUILD | 37 - extra/gnome-games/gnome-games.install | 122 - extra/gnome-keyring/PKGBUILD | 6 +- extra/gnome-klotski/PKGBUILD | 32 + extra/gnome-klotski/gnome-klotski.install | 13 + extra/gnome-mahjongg/PKGBUILD | 32 + extra/gnome-mahjongg/gnome-mahjongg.install | 13 + extra/gnome-menus/PKGBUILD | 23 +- extra/gnome-menus/calculator.patch | 41 + extra/gnome-menus/menus.patch | 25 - extra/gnome-mines/PKGBUILD | 32 + extra/gnome-mines/gnome-mines.install | 13 + extra/gnome-nettool/PKGBUILD | 13 +- extra/gnome-nettool/ldns.patch | 21 - extra/gnome-nibbles/PKGBUILD | 36 + extra/gnome-nibbles/gnome-nibbles.install | 40 + extra/gnome-online-accounts/PKGBUILD | 6 +- extra/gnome-photos/PKGBUILD | 33 + extra/gnome-photos/gnome-photos.install | 12 + extra/gnome-power-manager/PKGBUILD | 15 +- extra/gnome-robots/PKGBUILD | 36 + extra/gnome-robots/gnome-robots.install | 47 + extra/gnome-screenshot/PKGBUILD | 8 +- extra/gnome-search-tool/PKGBUILD | 7 +- extra/gnome-session/PKGBUILD | 23 +- .../gnome-session-3.3.1-llvmpipe.patch | 9 - ...edia-keys-Use-logind-for-suspending-and-r.patch | 1476 ---- extra/gnome-settings-daemon/PKGBUILD | 30 +- extra/gnome-shell/PKGBUILD | 25 +- ...-mess-up-the-modal-stack-when-the-focus-a.patch | 29 - extra/gnome-system-log/PKGBUILD | 8 +- extra/gnome-system-monitor/PKGBUILD | 10 +- extra/gnome-terminal/PKGBUILD | 36 +- extra/gnome-terminal/gnome-terminal.install | 12 +- extra/gnome-tetravex/PKGBUILD | 32 + extra/gnome-tetravex/gnome-tetravex.install | 13 + extra/gnome-themes-standard/PKGBUILD | 8 +- extra/gnome-user-share/PKGBUILD | 11 +- extra/gnome-weather/PKGBUILD | 33 + extra/gnome-weather/gnome-weather.install | 11 + extra/gobject-introspection/PKGBUILD | 6 +- extra/grilo-plugins/PKGBUILD | 14 +- extra/gssdp/PKGBUILD | 14 +- extra/gthumb/PKGBUILD | 22 +- extra/gtk2-perl/PKGBUILD | 6 +- extra/gtk3/PKGBUILD | 13 +- extra/gtkmm3/PKGBUILD | 6 +- extra/gtksourceview3/PKGBUILD | 6 +- extra/gucharmap/PKGBUILD | 8 +- extra/gupnp-av/PKGBUILD | 19 +- extra/gupnp-dlna/PKGBUILD | 30 +- extra/gupnp-igd/PKGBUILD | 26 +- extra/gupnp/PKGBUILD | 19 +- extra/gvfs/PKGBUILD | 49 +- extra/gvfs/fix-paranoia-include.patch | 11 - extra/iagno/PKGBUILD | 32 + extra/iagno/iagno.install | 13 + extra/java7-openjdk/PKGBUILD | 39 +- extra/js/PKGBUILD | 48 +- extra/js/js185-destdir.patch | 15 - extra/js185/PKGBUILD | 40 + extra/kdeadmin/PKGBUILD | 4 +- extra/libchamplain/PKGBUILD | 6 +- extra/libgda/PKGBUILD | 8 +- extra/libgdata/PKGBUILD | 8 +- extra/libgee/PKGBUILD | 33 +- extra/libgee06/PKGBUILD | 29 + extra/libgnome-keyring/PKGBUILD | 8 +- extra/libgweather/PKGBUILD | 8 +- extra/liblouis/PKGBUILD | 10 +- extra/liboauth/PKGBUILD | 6 +- extra/libpeas/PKGBUILD | 23 +- extra/libpeas/js17.patch | 24 + extra/libqmi/PKGBUILD | 32 + extra/librsvg/PKGBUILD | 8 +- extra/libsecret/PKGBUILD | 6 +- extra/libsigc++/PKGBUILD | 8 +- extra/libsocialweb/PKGBUILD | 14 +- extra/libsoup/PKGBUILD | 55 +- extra/libzapojit/PKGBUILD | 6 +- extra/lightsoff/PKGBUILD | 32 + extra/lightsoff/lightsoff.install | 13 + extra/live-media/PKGBUILD | 6 +- extra/mash/PKGBUILD | 6 +- extra/modemmanager/PKGBUILD | 44 +- extra/modemmanager/modem-manager.service | 14 - extra/modemmanager/modemmanager.install | 12 + extra/mousetweaks/PKGBUILD | 8 +- extra/mutter/PKGBUILD | 8 +- extra/nautilus-sendto/PKGBUILD | 15 +- extra/nautilus-sendto/nautilus-sendto.install | 12 +- extra/nautilus/PKGBUILD | 48 +- extra/network-manager-applet/PKGBUILD | 14 +- extra/networkmanager/PKGBUILD | 18 +- extra/notification-daemon/PKGBUILD | 18 +- extra/oxygen-gtk2/PKGBUILD | 6 +- extra/oxygen-gtk3/PKGBUILD | 6 +- extra/p11-kit/PKGBUILD | 11 +- extra/pango-perl/PKGBUILD | 8 +- extra/pango/PKGBUILD | 6 +- extra/polkit/PKGBUILD | 11 +- extra/pygobject/PKGBUILD | 44 +- extra/qtwebkit/PKGBUILD | 6 +- extra/quadrapassel/PKGBUILD | 32 + extra/quadrapassel/quadrapassel.install | 13 + extra/rest/PKGBUILD | 20 +- ...t-pane-plugin-when-webkit-isn-t-available.patch | 37 - extra/rhythmbox/PKGBUILD | 39 +- extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch | 76 - extra/rygel/PKGBUILD | 42 +- extra/seahorse/PKGBUILD | 6 +- extra/seed/GLib.js | 282 + extra/seed/PKGBUILD | 15 +- extra/sip/PKGBUILD | 6 +- extra/sound-juicer/PKGBUILD | 24 +- extra/sushi/PKGBUILD | 8 +- extra/swell-foop/PKGBUILD | 32 + extra/swell-foop/swell-foop.install | 13 + extra/tali/PKGBUILD | 36 + extra/tali/tali.install | 34 + extra/tomboy/PKGBUILD | 7 +- extra/totem-plparser/PKGBUILD | 10 +- extra/totem/PKGBUILD | 16 +- extra/tracker/PKGBUILD | 28 +- extra/udisks2/PKGBUILD | 8 +- extra/vala/PKGBUILD | 6 +- extra/vinagre/PKGBUILD | 6 +- extra/vino/PKGBUILD | 8 +- extra/vte3/PKGBUILD | 6 +- extra/webkitgtk/PKGBUILD | 60 +- extra/webkitgtk/python3.patch | 20 + extra/webkitgtk2/PKGBUILD | 40 + extra/yelp/PKGBUILD | 6 +- extra/zeitgeist/PKGBUILD | 50 +- extra/zenity/PKGBUILD | 6 +- libre/cgminer-libre/PKGBUILD | 17 +- libre/django-countries/PKGBUILD | 26 - libre/python2-cssmin-fredj/PKGBUILD | 34 + libre/python2-django-countries/PKGBUILD | 32 + libre/rp-pppoe-libre/PKGBUILD | 38 +- libre/soundkonverter-libre/PKGBUILD | 6 +- pcr/netatalk/PKGBUILD | 35 +- pcr/netatalk/netatalk.changelog | 25 + pcr/netatalk/netatalk.install | 7 +- 316 files changed, 15108 insertions(+), 15415 deletions(-) create mode 100644 community/almanah/eds-3.8.patch create mode 100644 community/apvlv/apvlv.desktop create mode 100644 community/apvlv/apvlv.install create mode 100644 community/cinnamon-control-center/gnomerrlabeler.patch create mode 100644 community/cinnamon-control-center/idle-delay.patch delete mode 100644 community/cinnamon-screensaver/gnome-autogen.sh delete mode 100644 community/cinnamon/fix-keyboard-settings.patch create mode 100644 community/cinnamon/gnome-3.8.patch create mode 100644 community/giggle/gtksourceview3.7.patch create mode 100644 community/gnome-applets/01_battstat_upower.patch create mode 100644 community/gnome-applets/disable-gweather-applet.patch create mode 100644 community/gnome-applets/fix-autoconf.patch create mode 100644 community/gnome-applets/gnome-applets-cpupower.patch create mode 100644 community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch create mode 100644 community/gnome-panel/18_fix_force_quit_applet.patch create mode 100644 community/gnome-panel/drop-gweather-xml-include.patch create mode 100644 community/gnome-panel/fix-autoconf.patch create mode 100644 community/gnome-panel/gnome-desktop-3.8.patch create mode 100644 community/gnome-panel/logout-hang-workaround.patch create mode 100644 community/gnome-screensaver/fix-autoconf.patch delete mode 100644 community/gnome-screensaver/gnome-screensaver.install create mode 100644 community/gnome-screensaver/move-desktop-file.patch create mode 100644 community/gnome-settings-daemon-compat/PKGBUILD create mode 100644 community/gnome-settings-daemon-compat/draw-background-unconditionally.patch create mode 100644 community/gnome-settings-daemon-compat/flashback-rename.patch create mode 100644 community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch create mode 100644 community/gnome-settings-daemon-compat/sessionisactive-port.patch create mode 100644 community/gnome-settings-daemon-compat/standalone-background-helper.patch delete mode 100644 community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch create mode 100644 community/metacity/enable_compositing.patch create mode 100644 community/metacity/fix_force_quit.patch create mode 100644 community/metacity/fix_shadows.patch delete mode 100644 community/nemiver/nemiver.install create mode 100644 community/nemo/remove-desktop-background.patch create mode 100644 community/nemo/tracker-0.16.patch delete mode 100644 community/nemo/use-terminal-config.patch create mode 100644 community/ubuntuone-client-gnome/disable-gsd-plugin.patch delete mode 100644 community/zeitgeist-datahub/PKGBUILD create mode 100644 core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch delete mode 100644 core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch delete mode 100644 core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch delete mode 100644 core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch create mode 100644 core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch create mode 100644 extra/anjuta/anjuta-glade.xml.diff create mode 100644 extra/anjuta/fix-compile-error.patch delete mode 100644 extra/at-spi2-atk/at-spi2-atk.install create mode 100644 extra/bijiben/PKGBUILD create mode 100644 extra/bijiben/bijiben.install delete mode 100644 extra/brasero/use-mpegaudioparse.patch delete mode 100755 extra/brltty/brltty delete mode 100644 extra/brltty/brltty.conf create mode 100644 extra/five-or-more/PKGBUILD create mode 100644 extra/five-or-more/five-or-more.install create mode 100644 extra/fontconfig/git_fixes.diff create mode 100644 extra/four-in-a-row/PKGBUILD create mode 100644 extra/four-in-a-row/four-in-a-row.install delete mode 100644 extra/gcalctool/PKGBUILD delete mode 100644 extra/gcalctool/gcalctool.install delete mode 100644 extra/gdm/git-fixes.patch delete mode 100644 extra/gdm/maintain-FamilyLocal-cookie.patch create mode 100644 extra/gnome-calculator/PKGBUILD create mode 100644 extra/gnome-calculator/gnome-calculator.install create mode 100644 extra/gnome-chess/PKGBUILD create mode 100644 extra/gnome-chess/gnome-chess.install create mode 100644 extra/gnome-clocks/PKGBUILD create mode 100644 extra/gnome-clocks/gnome-clocks.install delete mode 100644 extra/gnome-control-center/pulse3.0.patch delete mode 100644 extra/gnome-games/PKGBUILD delete mode 100644 extra/gnome-games/gnome-games.install create mode 100644 extra/gnome-klotski/PKGBUILD create mode 100644 extra/gnome-klotski/gnome-klotski.install create mode 100644 extra/gnome-mahjongg/PKGBUILD create mode 100644 extra/gnome-mahjongg/gnome-mahjongg.install create mode 100644 extra/gnome-menus/calculator.patch delete mode 100644 extra/gnome-menus/menus.patch create mode 100644 extra/gnome-mines/PKGBUILD create mode 100644 extra/gnome-mines/gnome-mines.install delete mode 100644 extra/gnome-nettool/ldns.patch create mode 100644 extra/gnome-nibbles/PKGBUILD create mode 100644 extra/gnome-nibbles/gnome-nibbles.install create mode 100644 extra/gnome-photos/PKGBUILD create mode 100644 extra/gnome-photos/gnome-photos.install create mode 100644 extra/gnome-robots/PKGBUILD create mode 100644 extra/gnome-robots/gnome-robots.install delete mode 100644 extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch delete mode 100644 extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch delete mode 100644 extra/gnome-shell/main-Dont-mess-up-the-modal-stack-when-the-focus-a.patch create mode 100644 extra/gnome-tetravex/PKGBUILD create mode 100644 extra/gnome-tetravex/gnome-tetravex.install create mode 100644 extra/gnome-weather/PKGBUILD create mode 100644 extra/gnome-weather/gnome-weather.install delete mode 100644 extra/gvfs/fix-paranoia-include.patch create mode 100644 extra/iagno/PKGBUILD create mode 100644 extra/iagno/iagno.install delete mode 100644 extra/js/js185-destdir.patch create mode 100644 extra/js185/PKGBUILD create mode 100644 extra/libgee06/PKGBUILD create mode 100644 extra/libpeas/js17.patch create mode 100644 extra/libqmi/PKGBUILD create mode 100644 extra/lightsoff/PKGBUILD create mode 100644 extra/lightsoff/lightsoff.install delete mode 100644 extra/modemmanager/modem-manager.service create mode 100644 extra/modemmanager/modemmanager.install create mode 100644 extra/quadrapassel/PKGBUILD create mode 100644 extra/quadrapassel/quadrapassel.install delete mode 100644 extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch delete mode 100644 extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch create mode 100644 extra/seed/GLib.js create mode 100644 extra/swell-foop/PKGBUILD create mode 100644 extra/swell-foop/swell-foop.install create mode 100644 extra/tali/PKGBUILD create mode 100644 extra/tali/tali.install create mode 100644 extra/webkitgtk/python3.patch create mode 100644 extra/webkitgtk2/PKGBUILD delete mode 100644 libre/django-countries/PKGBUILD create mode 100644 libre/python2-cssmin-fredj/PKGBUILD create mode 100644 libre/python2-django-countries/PKGBUILD (limited to 'community/nemo/PKGBUILD') diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD index 1d860b203..6b7fbaddb 100644 --- a/community/activity-log-manager/PKGBUILD +++ b/community/activity-log-manager/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 79218 2012-11-01 09:45:30Z bgyorgy $ +# $Id: PKGBUILD 88673 2013-04-21 22:16:39Z heftig $ # Maintainer: Balló György # Contributor: Ner0 pkgname=activity-log-manager pkgver=0.9.4 -pkgrel=3 +pkgrel=4 pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist" arch=('i686' 'x86_64') url="https://launchpad.net/activity-log-manager" license=('GPL2') -depends=('gtk3' 'libgee' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') +depends=('gtk3' 'libgee06' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') install=$pkgname.install source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz @@ -27,10 +27,10 @@ build() { # Fix docdir location sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in} - # Update language files - echo 'af ar ast be bg bn bs ca ca@valencia cs da de el eo es et eu fi fr gd gl he hi hr hu id it ja km ko ku lt lv mi ms my nb nl oc pl pt ro ru se si sk sl sr sv ta te ug uk uz vi zh_CN zh_HK zh_TW' >po/LINGUAS + # Install updated language files rename $pkgname- '' ../po/$pkgname-*.po mv -f -t po ../po/* + printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS # Fix crash with GTK+ 3.6 # https://bugs.launchpad.net/activity-log-manager/+bug/1058037 diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD index 9bf7cba30..905ac9983 100644 --- a/community/almanah/PKGBUILD +++ b/community/almanah/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87238 2013-03-28 21:27:02Z bgyorgy $ +# $Id: PKGBUILD 88674 2013-04-21 22:16:40Z heftig $ # Maintainer: Balló György pkgname=almanah pkgver=0.10.1 -pkgrel=1 +pkgrel=2 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" @@ -12,13 +12,18 @@ depends=('evolution-data-server' 'gtkspell3' 'libcryptui' 'xdg-utils') makedepends=('intltool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + eds-3.8.patch update-gtkspell3-support.patch) sha256sums=('122789c1baea1713102b200c0401d25395ec177a66ae22635d3ae2fecc1f08bd' + '2407cb2cc11e61b7863bf20fc13d4614a3384e8cb7c5b534f1e3ce7a3afb2d2d' '60fedd6be05ef2619c3b50539b9fdc717480e4f03a2920d8b68b09e63dc7e7db') build() { cd "$srcdir/$pkgname-$pkgver" + # Port to evolution-data-server 3.8 + patch -Np1 -i "$srcdir/eds-3.8.patch" + # Port to the new gtkspell3 patch -Np1 -i "$srcdir/update-gtkspell3-support.patch" diff --git a/community/almanah/eds-3.8.patch b/community/almanah/eds-3.8.patch new file mode 100644 index 000000000..dea51eb74 --- /dev/null +++ b/community/almanah/eds-3.8.patch @@ -0,0 +1,2609 @@ +From e481f5abdb46d41ac00ee3393332e92f605b55e7 Mon Sep 17 00:00:00 2001 +From: Matthew Barnes +Date: Thu, 13 Dec 2012 14:16:58 +0000 +Subject: Bug 687229 - Embed ESourceSelector widget from libedataserverui + +Evolution developers are merging libedataserverui back into Evolution. +Drop the libedataserverui dependency and embed the ECellRendererColor +and ESourceSelector widgets from libedataserverui in event-factories. + +See also: +https://mail.gnome.org/archives/distributor-list/2012-December/msg00000.html +--- +diff --git a/configure.ac b/configure.ac +index a529568..b89ba74 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -83,7 +83,7 @@ AC_SUBST(STANDARD_CFLAGS) + AC_SUBST(STANDARD_LIBS) + + dnl Evolution +-PKG_CHECK_MODULES(EVO, libecal-1.2 libedataserver-1.2 libedataserverui-3.0, have_evo=yes, have_evo=no) ++PKG_CHECK_MODULES(EVO, libecal-1.2 >= 3.5.91 libedataserver-1.2, have_evo=yes, have_evo=no) + if test "x$have_evo" = "xyes"; then + AC_DEFINE(HAVE_EVO, 1, [Defined if libecal-1.2 is installed]) + fi +diff --git a/src/Makefile.am b/src/Makefile.am +index 0de37e3..740c9f2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,6 +52,10 @@ almanah_SOURCES += \ + event-factories/calendar-debug.h \ + event-factories/calendar-sources.c \ + event-factories/calendar-sources.h \ ++ event-factories/e-cell-renderer-color.c \ ++ event-factories/e-cell-renderer-color.h \ ++ event-factories/e-source-selector.c \ ++ event-factories/e-source-selector.h \ + events/calendar-appointment.c \ + events/calendar-appointment.h \ + events/calendar-task.c \ +diff --git a/src/event-factories/calendar-sources.c b/src/event-factories/calendar-sources.c +index 217327d..9451a0d 100644 +--- a/src/event-factories/calendar-sources.c ++++ b/src/event-factories/calendar-sources.c +@@ -32,7 +32,8 @@ + #define HANDLE_LIBICAL_MEMORY + #include + #include +-#include ++ ++#include "e-source-selector.h" + + #undef CALENDAR_ENABLE_DEBUG + #include "calendar-debug.h" +diff --git a/src/event-factories/e-cell-renderer-color.c b/src/event-factories/e-cell-renderer-color.c +new file mode 100644 +index 0000000..748bea5 +--- /dev/null ++++ b/src/event-factories/e-cell-renderer-color.c +@@ -0,0 +1,237 @@ ++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ ++/* e-cell-renderer-color.c ++ * ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU Lesser General Public ++ * License as published by the Free Software Foundation. ++ * ++ * 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 Lesser 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. ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include "e-cell-renderer-color.h" ++ ++#include ++#include ++ ++#define E_CELL_RENDERER_COLOR_GET_PRIVATE(obj) \ ++ (G_TYPE_INSTANCE_GET_PRIVATE \ ++ ((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorPrivate)) ++ ++enum { ++ PROP_0, ++ PROP_COLOR ++}; ++ ++struct _ECellRendererColorPrivate { ++ GdkColor *color; ++}; ++ ++G_DEFINE_TYPE ( ++ ECellRendererColor, ++ e_cell_renderer_color, ++ GTK_TYPE_CELL_RENDERER) ++ ++static void ++cell_renderer_color_get_size (GtkCellRenderer *cell, ++ GtkWidget *widget, ++ const GdkRectangle *cell_area, ++ gint *x_offset, ++ gint *y_offset, ++ gint *width, ++ gint *height) ++{ ++ gint color_width = 16; ++ gint color_height = 16; ++ gint calc_width; ++ gint calc_height; ++ gfloat xalign; ++ gfloat yalign; ++ guint xpad; ++ guint ypad; ++ ++ g_object_get ( ++ cell, "xalign", &xalign, "yalign", &yalign, ++ "xpad", &xpad, "ypad", &ypad, NULL); ++ ++ calc_width = (gint) xpad * 2 + color_width; ++ calc_height = (gint) ypad * 2 + color_height; ++ ++ if (cell_area && color_width > 0 && color_height > 0) { ++ if (x_offset) { ++ *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? ++ (1.0 - xalign) : xalign) * ++ (cell_area->width - calc_width)); ++ *x_offset = MAX (*x_offset, 0); ++ } ++ ++ if (y_offset) { ++ *y_offset =(yalign * ++ (cell_area->height - calc_height)); ++ *y_offset = MAX (*y_offset, 0); ++ } ++ } else { ++ if (x_offset) *x_offset = 0; ++ if (y_offset) *y_offset = 0; ++ } ++ ++ if (width) ++ *width = calc_width; ++ ++ if (height) ++ *height = calc_height; ++} ++ ++static void ++cell_renderer_color_render (GtkCellRenderer *cell, ++ cairo_t *cr, ++ GtkWidget *widget, ++ const GdkRectangle *background_area, ++ const GdkRectangle *cell_area, ++ GtkCellRendererState flags) ++{ ++ ECellRendererColorPrivate *priv; ++ GdkRectangle pix_rect; ++ GdkRectangle draw_rect; ++ guint xpad; ++ guint ypad; ++ ++ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cell); ++ ++ if (priv->color == NULL) ++ return; ++ ++ cell_renderer_color_get_size ( ++ cell, widget, cell_area, ++ &pix_rect.x, &pix_rect.y, ++ &pix_rect.width, &pix_rect.height); ++ ++ g_object_get (cell, "xpad", &xpad, "ypad", &ypad, NULL); ++ ++ pix_rect.x += cell_area->x + xpad; ++ pix_rect.y += cell_area->y + ypad; ++ pix_rect.width -= xpad * 2; ++ pix_rect.height -= ypad * 2; ++ ++ if (!gdk_rectangle_intersect (cell_area, &pix_rect, &draw_rect)) ++ return; ++ ++ gdk_cairo_set_source_color (cr, priv->color); ++ cairo_rectangle (cr, pix_rect.x, pix_rect.y, draw_rect.width, draw_rect.height); ++ ++ cairo_fill (cr); ++} ++ ++static void ++cell_renderer_color_set_property (GObject *object, ++ guint property_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ ECellRendererColorPrivate *priv; ++ ++ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); ++ ++ switch (property_id) { ++ case PROP_COLOR: ++ if (priv->color != NULL) ++ gdk_color_free (priv->color); ++ priv->color = g_value_dup_boxed (value); ++ return; ++ } ++ ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); ++} ++ ++static void ++cell_renderer_color_get_property (GObject *object, ++ guint property_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ ECellRendererColorPrivate *priv; ++ ++ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); ++ ++ switch (property_id) { ++ case PROP_COLOR: ++ g_value_set_boxed (value, priv->color); ++ return; ++ } ++ ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); ++} ++ ++static void ++cell_renderer_color_finalize (GObject *object) ++{ ++ ECellRendererColorPrivate *priv; ++ ++ priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (object); ++ ++ if (priv->color != NULL) ++ gdk_color_free (priv->color); ++ ++ /* Chain up to parent's finalize() method. */ ++ G_OBJECT_CLASS (e_cell_renderer_color_parent_class)->finalize (object); ++} ++ ++static void ++e_cell_renderer_color_class_init (ECellRendererColorClass *class) ++{ ++ GObjectClass *object_class; ++ GtkCellRendererClass *cell_class; ++ ++ g_type_class_add_private (class, sizeof (ECellRendererColorPrivate)); ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->set_property = cell_renderer_color_set_property; ++ object_class->get_property = cell_renderer_color_get_property; ++ object_class->finalize = cell_renderer_color_finalize; ++ ++ cell_class = GTK_CELL_RENDERER_CLASS (class); ++ cell_class->get_size = cell_renderer_color_get_size; ++ cell_class->render = cell_renderer_color_render; ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_COLOR, ++ g_param_spec_boxed ( ++ "color", ++ "Color Info", ++ "The color to render", ++ GDK_TYPE_COLOR, ++ G_PARAM_READWRITE)); ++} ++ ++static void ++e_cell_renderer_color_init (ECellRendererColor *cellcolor) ++{ ++ cellcolor->priv = E_CELL_RENDERER_COLOR_GET_PRIVATE (cellcolor); ++ ++ g_object_set (cellcolor, "xpad", 4, NULL); ++} ++ ++/** ++ * e_cell_renderer_color_new: ++ * ++ * Since: 2.22 ++ **/ ++GtkCellRenderer * ++e_cell_renderer_color_new (void) ++{ ++ return g_object_new (E_TYPE_CELL_RENDERER_COLOR, NULL); ++} +diff --git a/src/event-factories/e-cell-renderer-color.h b/src/event-factories/e-cell-renderer-color.h +new file mode 100644 +index 0000000..0e0da70 +--- /dev/null ++++ b/src/event-factories/e-cell-renderer-color.h +@@ -0,0 +1,75 @@ ++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ ++/* e-cell-renderer-color.h ++ * ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of version 2 of the GNU Lesser General Public ++ * License as published by the Free Software Foundation. ++ * ++ * 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 Lesser 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. ++ */ ++ ++#ifndef _E_CELL_RENDERER_COLOR_H_ ++#define _E_CELL_RENDERER_COLOR_H_ ++ ++#include ++ ++/* Standard GObject macros */ ++#define E_TYPE_CELL_RENDERER_COLOR \ ++ (e_cell_renderer_color_get_type ()) ++#define E_CELL_RENDERER_COLOR(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST \ ++ ((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColor)) ++#define E_CELL_RENDERER_COLOR_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_CAST \ ++ ((cls), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorClass)) ++#define E_IS_CELL_RENDERER_COLOR(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE \ ++ ((obj), E_TYPE_CELL_RENDERER_COLOR)) ++#define E_IS_CELL_RENDERER_COLOR_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_TYPE ((cls), E_TYPE_CELL_RENDERER_COLOR)) ++#define E_CELL_RENDERER_COLOR_GET_CLASS(obj) \ ++ (G_TYPE_INSTANCE_GET_CLASS \ ++ ((obj), E_TYPE_CELL_RENDERER_COLOR, ECellRendererColorClass)) ++ ++G_BEGIN_DECLS ++ ++typedef struct _ECellRendererColor ECellRendererColor; ++typedef struct _ECellRendererColorClass ECellRendererColorClass; ++typedef struct _ECellRendererColorPrivate ECellRendererColorPrivate; ++ ++/** ++ * ECellRendererColor: ++ * ++ * Since: 2.22 ++ **/ ++struct _ECellRendererColor { ++ GtkCellRenderer parent; ++ ECellRendererColorPrivate *priv; ++}; ++ ++struct _ECellRendererColorClass { ++ GtkCellRendererClass parent_class; ++ ++ /* Padding for future expansion */ ++ void (*_gtk_reserved1) (void); ++ void (*_gtk_reserved2) (void); ++ void (*_gtk_reserved3) (void); ++ void (*_gtk_reserved4) (void); ++}; ++ ++GType e_cell_renderer_color_get_type (void); ++GtkCellRenderer *e_cell_renderer_color_new (void); ++ ++G_END_DECLS ++ ++#endif /* _E_CELL_RENDERER_COLOR_H_ */ +diff --git a/src/event-factories/e-source-selector.c b/src/event-factories/e-source-selector.c +new file mode 100644 +index 0000000..925d9cd +--- /dev/null ++++ b/src/event-factories/e-source-selector.c +@@ -0,0 +1,2080 @@ ++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ ++/* e-source-selector.c ++ * ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser 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 Lesser General Public ++ * License along with this program; if not, write to the ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ * Author: Ettore Perazzoli ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++ ++#include "e-cell-renderer-color.h" ++#include "e-source-selector.h" ++ ++#define E_SOURCE_SELECTOR_GET_PRIVATE(obj) \ ++ (G_TYPE_INSTANCE_GET_PRIVATE \ ++ ((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelectorPrivate)) ++ ++typedef struct _AsyncContext AsyncContext; ++ ++struct _ESourceSelectorPrivate { ++ ESourceRegistry *registry; ++ GHashTable *source_index; ++ gchar *extension_name; ++ ++ GtkTreeRowReference *saved_primary_selection; ++ ++ /* ESource -> GSource */ ++ GHashTable *pending_writes; ++ GMainContext *main_context; ++ ++ gboolean toggled_last; ++ gboolean select_new; ++ gboolean show_colors; ++ gboolean show_toggles; ++}; ++ ++struct _AsyncContext { ++ ESourceSelector *selector; ++ ESource *source; ++}; ++ ++enum { ++ PROP_0, ++ PROP_EXTENSION_NAME, ++ PROP_PRIMARY_SELECTION, ++ PROP_REGISTRY, ++ PROP_SHOW_COLORS, ++ PROP_SHOW_TOGGLES ++}; ++ ++enum { ++ SELECTION_CHANGED, ++ PRIMARY_SELECTION_CHANGED, ++ POPUP_EVENT, ++ DATA_DROPPED, ++ NUM_SIGNALS ++}; ++ ++enum { ++ COLUMN_NAME, ++ COLUMN_COLOR, ++ COLUMN_ACTIVE, ++ COLUMN_SHOW_COLOR, ++ COLUMN_SHOW_TOGGLE, ++ COLUMN_WEIGHT, ++ COLUMN_SOURCE, ++ NUM_COLUMNS ++}; ++ ++static guint signals[NUM_SIGNALS]; ++ ++G_DEFINE_TYPE (ESourceSelector, e_source_selector, GTK_TYPE_TREE_VIEW) ++ ++/* ESafeToggleRenderer does not emit 'toggled' signal ++ * on 'activate' when mouse is not over the toggle. */ ++ ++typedef GtkCellRendererToggle ECellRendererSafeToggle; ++typedef GtkCellRendererToggleClass ECellRendererSafeToggleClass; ++ ++/* Forward Declarations */ ++GType e_cell_renderer_safe_toggle_get_type (void); ++ ++G_DEFINE_TYPE ( ++ ECellRendererSafeToggle, ++ e_cell_renderer_safe_toggle, ++ GTK_TYPE_CELL_RENDERER_TOGGLE) ++ ++static gboolean ++safe_toggle_activate (GtkCellRenderer *cell, ++ GdkEvent *event, ++ GtkWidget *widget, ++ const gchar *path, ++ const GdkRectangle *background_area, ++ const GdkRectangle *cell_area, ++ GtkCellRendererState flags) ++{ ++ gboolean point_in_cell_area = TRUE; ++ ++ if (event->type == GDK_BUTTON_PRESS && cell_area != NULL) { ++ cairo_region_t *region; ++ ++ region = cairo_region_create_rectangle (cell_area); ++ point_in_cell_area = cairo_region_contains_point ( ++ region, event->button.x, event->button.y); ++ cairo_region_destroy (region); ++ } ++ ++ if (!point_in_cell_area) ++ return FALSE; ++ ++ return GTK_CELL_RENDERER_CLASS ( ++ e_cell_renderer_safe_toggle_parent_class)->activate ( ++ cell, event, widget, path, background_area, cell_area, flags); ++} ++ ++static void ++e_cell_renderer_safe_toggle_class_init (ECellRendererSafeToggleClass *class) ++{ ++ GtkCellRendererClass *cell_renderer_class; ++ ++ cell_renderer_class = GTK_CELL_RENDERER_CLASS (class); ++ cell_renderer_class->activate = safe_toggle_activate; ++} ++ ++static void ++e_cell_renderer_safe_toggle_init (ECellRendererSafeToggle *obj) ++{ ++} ++ ++static GtkCellRenderer * ++e_cell_renderer_safe_toggle_new (void) ++{ ++ return g_object_new (e_cell_renderer_safe_toggle_get_type (), NULL); ++} ++ ++static void ++clear_saved_primary_selection (ESourceSelector *selector) ++{ ++ gtk_tree_row_reference_free (selector->priv->saved_primary_selection); ++ selector->priv->saved_primary_selection = NULL; ++} ++ ++static void ++async_context_free (AsyncContext *async_context) ++{ ++ if (async_context->selector != NULL) ++ g_object_unref (async_context->selector); ++ ++ if (async_context->source != NULL) ++ g_object_unref (async_context->source); ++ ++ g_slice_free (AsyncContext, async_context); ++} ++ ++static void ++pending_writes_destroy_source (GSource *source) ++{ ++ g_source_destroy (source); ++ g_source_unref (source); ++} ++ ++static void ++source_selector_write_done_cb (GObject *source_object, ++ GAsyncResult *result, ++ gpointer user_data) ++{ ++ ESource *source; ++ ESourceSelector *selector; ++ GError *error = NULL; ++ ++ source = E_SOURCE (source_object); ++ selector = E_SOURCE_SELECTOR (user_data); ++ ++ e_source_write_finish (source, result, &error); ++ ++ /* FIXME Display the error in the selector somehow? */ ++ if (error != NULL) { ++ g_warning ("%s: %s", G_STRFUNC, error->message); ++ g_error_free (error); ++ } ++ ++ g_object_unref (selector); ++} ++ ++static gboolean ++source_selector_write_idle_cb (gpointer user_data) ++{ ++ AsyncContext *async_context = user_data; ++ GHashTable *pending_writes; ++ ++ /* XXX This operation is not cancellable. */ ++ e_source_write ( ++ async_context->source, NULL, ++ source_selector_write_done_cb, ++ g_object_ref (async_context->selector)); ++ ++ pending_writes = async_context->selector->priv->pending_writes; ++ g_hash_table_remove (pending_writes, async_context->source); ++ ++ return FALSE; ++} ++ ++static void ++source_selector_cancel_write (ESourceSelector *selector, ++ ESource *source) ++{ ++ GHashTable *pending_writes; ++ ++ /* Cancel any pending writes for this ESource so as not ++ * to overwrite whatever change we're being notified of. */ ++ pending_writes = selector->priv->pending_writes; ++ g_hash_table_remove (pending_writes, source); ++} ++ ++static void ++source_selector_update_row (ESourceSelector *selector, ++ ESource *source) ++{ ++ GHashTable *source_index; ++ ESourceExtension *extension = NULL; ++ GtkTreeRowReference *reference; ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ const gchar *extension_name; ++ const gchar *display_name; ++ gboolean selected; ++ ++ source_index = selector->priv->source_index; ++ reference = g_hash_table_lookup (source_index, source); ++ ++ /* This function runs when ANY ESource in the registry changes. ++ * If the ESource is not in our tree model then return silently. */ ++ if (reference == NULL) ++ return; ++ ++ /* If we do have a row reference, it should be valid. */ ++ g_return_if_fail (gtk_tree_row_reference_valid (reference)); ++ ++ model = gtk_tree_row_reference_get_model (reference); ++ path = gtk_tree_row_reference_get_path (reference); ++ gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_path_free (path); ++ ++ display_name = e_source_get_display_name (source); ++ ++ extension_name = e_source_selector_get_extension_name (selector); ++ selected = e_source_selector_source_is_selected (selector, source); ++ ++ if (e_source_has_extension (source, extension_name)) ++ extension = e_source_get_extension (source, extension_name); ++ ++ if (extension != NULL) { ++ GdkColor color; ++ const gchar *color_spec = NULL; ++ gboolean show_color = FALSE; ++ gboolean show_toggle; ++ ++ show_color = ++ E_IS_SOURCE_SELECTABLE (extension) && ++ e_source_selector_get_show_colors (selector); ++ ++ if (show_color) ++ color_spec = e_source_selectable_get_color ( ++ E_SOURCE_SELECTABLE (extension)); ++ ++ if (color_spec != NULL && *color_spec != '\0') ++ show_color = gdk_color_parse (color_spec, &color); ++ ++ show_toggle = e_source_selector_get_show_toggles (selector); ++ ++ gtk_tree_store_set ( ++ GTK_TREE_STORE (model), &iter, ++ COLUMN_NAME, display_name, ++ COLUMN_COLOR, show_color ? &color : NULL, ++ COLUMN_ACTIVE, selected, ++ COLUMN_SHOW_COLOR, show_color, ++ COLUMN_SHOW_TOGGLE, show_toggle, ++ COLUMN_WEIGHT, PANGO_WEIGHT_NORMAL, ++ COLUMN_SOURCE, source, ++ -1); ++ } else { ++ gtk_tree_store_set ( ++ GTK_TREE_STORE (model), &iter, ++ COLUMN_NAME, display_name, ++ COLUMN_COLOR, NULL, ++ COLUMN_ACTIVE, FALSE, ++ COLUMN_SHOW_COLOR, FALSE, ++ COLUMN_SHOW_TOGGLE, FALSE, ++ COLUMN_WEIGHT, PANGO_WEIGHT_BOLD, ++ COLUMN_SOURCE, source, ++ -1); ++ } ++} ++ ++static gboolean ++source_selector_traverse (GNode *node, ++ ESourceSelector *selector) ++{ ++ ESource *source; ++ GHashTable *source_index; ++ GtkTreeRowReference *reference = NULL; ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ ++ /* Skip the root node. */ ++ if (G_NODE_IS_ROOT (node)) ++ return FALSE; ++ ++ source_index = selector->priv->source_index; ++ ++ model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector)); ++ ++ if (node->parent != NULL && node->parent->data != NULL) ++ reference = g_hash_table_lookup ( ++ source_index, node->parent->data); ++ ++ if (gtk_tree_row_reference_valid (reference)) { ++ GtkTreeIter parent; ++ ++ path = gtk_tree_row_reference_get_path (reference); ++ gtk_tree_model_get_iter (model, &parent, path); ++ gtk_tree_path_free (path); ++ ++ gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent); ++ } else ++ gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL); ++ ++ source = E_SOURCE (node->data); ++ ++ path = gtk_tree_model_get_path (model, &iter); ++ reference = gtk_tree_row_reference_new (model, path); ++ g_hash_table_insert (source_index, g_object_ref (source), reference); ++ gtk_tree_path_free (path); ++ ++ source_selector_update_row (selector, source); ++ ++ return FALSE; ++} ++ ++static void ++source_selector_save_expanded (GtkTreeView *tree_view, ++ GtkTreePath *path, ++ GQueue *queue) ++{ ++ GtkTreeModel *model; ++ GtkTreeIter iter; ++ ESource *source; ++ ++ model = gtk_tree_view_get_model (tree_view); ++ gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ g_queue_push_tail (queue, source); ++} ++ ++static void ++source_selector_build_model (ESourceSelector *selector) ++{ ++ ESourceRegistry *registry; ++ GQueue queue = G_QUEUE_INIT; ++ GHashTable *source_index; ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ ESource *selected; ++ const gchar *extension_name; ++ GNode *root; ++ ++ tree_view = GTK_TREE_VIEW (selector); ++ ++ registry = e_source_selector_get_registry (selector); ++ extension_name = e_source_selector_get_extension_name (selector); ++ ++ /* Make sure we have what we need to build the model, since ++ * this can get called early in the initialization phase. */ ++ if (registry == NULL || extension_name == NULL) ++ return; ++ ++ source_index = selector->priv->source_index; ++ selected = e_source_selector_ref_primary_selection (selector); ++ ++ /* Save expanded sources to restore later. */ ++ gtk_tree_view_map_expanded_rows ( ++ tree_view, (GtkTreeViewMappingFunc) ++ source_selector_save_expanded, &queue); ++ ++ model = gtk_tree_view_get_model (tree_view); ++ gtk_tree_store_clear (GTK_TREE_STORE (model)); ++ ++ g_hash_table_remove_all (source_index); ++ ++ root = e_source_registry_build_display_tree (registry, extension_name); ++ ++ g_node_traverse ( ++ root, G_PRE_ORDER, G_TRAVERSE_ALL, -1, ++ (GNodeTraverseFunc) source_selector_traverse, ++ selector); ++ ++ e_source_registry_free_display_tree (root); ++ ++ /* Restore previously expanded sources. */ ++ while (!g_queue_is_empty (&queue)) { ++ GtkTreeRowReference *reference; ++ ESource *source; ++ ++ source = g_queue_pop_head (&queue); ++ reference = g_hash_table_lookup (source_index, source); ++ ++ if (gtk_tree_row_reference_valid (reference)) { ++ GtkTreePath *path; ++ ++ path = gtk_tree_row_reference_get_path (reference); ++ gtk_tree_view_expand_to_path (tree_view, path); ++ gtk_tree_path_free (path); ++ } ++ ++ g_object_unref (source); ++ } ++ ++ /* Restore the primary selection. */ ++ if (selected != NULL) { ++ e_source_selector_set_primary_selection (selector, selected); ++ g_object_unref (selected); ++ } ++ ++ /* Make sure we have a primary selection. If not, pick one. */ ++ selected = e_source_selector_ref_primary_selection (selector); ++ if (selected == NULL) { ++ selected = e_source_registry_ref_default_for_extension_name ( ++ registry, extension_name); ++ e_source_selector_set_primary_selection (selector, selected); ++ } ++ g_object_unref (selected); ++} ++ ++static void ++source_selector_expand_to_source (ESourceSelector *selector, ++ ESource *source) ++{ ++ GHashTable *source_index; ++ GtkTreeRowReference *reference; ++ GtkTreePath *path; ++ ++ source_index = selector->priv->source_index; ++ reference = g_hash_table_lookup (source_index, source); ++ ++ /* If the ESource is not in our tree model then return silently. */ ++ if (reference == NULL) ++ return; ++ ++ /* If we do have a row reference, it should be valid. */ ++ g_return_if_fail (gtk_tree_row_reference_valid (reference)); ++ ++ /* Expand the tree view to the path containing the ESource */ ++ path = gtk_tree_row_reference_get_path (reference); ++ gtk_tree_view_expand_to_path (GTK_TREE_VIEW (selector), path); ++ gtk_tree_path_free (path); ++} ++ ++static void ++source_selector_source_added_cb (ESourceRegistry *registry, ++ ESource *source, ++ ESourceSelector *selector) ++{ ++ source_selector_build_model (selector); ++ ++ source_selector_expand_to_source (selector, source); ++} ++ ++static void ++source_selector_source_changed_cb (ESourceRegistry *registry, ++ ESource *source, ++ ESourceSelector *selector) ++{ ++ source_selector_cancel_write (selector, source); ++ ++ source_selector_update_row (selector, source); ++} ++ ++static void ++source_selector_source_removed_cb (ESourceRegistry *registry, ++ ESource *source, ++ ESourceSelector *selector) ++{ ++ source_selector_build_model (selector); ++} ++ ++static void ++source_selector_source_enabled_cb (ESourceRegistry *registry, ++ ESource *source, ++ ESourceSelector *selector) ++{ ++ source_selector_build_model (selector); ++ ++ source_selector_expand_to_source (selector, source); ++} ++ ++static void ++source_selector_source_disabled_cb (ESourceRegistry *registry, ++ ESource *source, ++ ESourceSelector *selector) ++{ ++ source_selector_build_model (selector); ++} ++ ++static gboolean ++same_source_name_exists (ESourceSelector *selector, ++ const gchar *display_name) ++{ ++ GHashTable *source_index; ++ GHashTableIter iter; ++ gpointer key; ++ ++ source_index = selector->priv->source_index; ++ g_hash_table_iter_init (&iter, source_index); ++ ++ while (g_hash_table_iter_next (&iter, &key, NULL)) { ++ ESource *source = E_SOURCE (key); ++ const gchar *source_name; ++ ++ source_name = e_source_get_display_name (source); ++ if (g_strcmp0 (display_name, source_name) == 0) ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++static gboolean ++selection_func (GtkTreeSelection *selection, ++ GtkTreeModel *model, ++ GtkTreePath *path, ++ gboolean path_currently_selected, ++ ESourceSelector *selector) ++{ ++ ESource *source; ++ GtkTreeIter iter; ++ const gchar *extension_name; ++ ++ if (selector->priv->toggled_last) { ++ selector->priv->toggled_last = FALSE; ++ return FALSE; ++ } ++ ++ if (path_currently_selected) ++ return TRUE; ++ ++ if (!gtk_tree_model_get_iter (model, &iter, path)) ++ return FALSE; ++ ++ extension_name = e_source_selector_get_extension_name (selector); ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ ++ if (!e_source_has_extension (source, extension_name)) { ++ g_object_unref (source); ++ return FALSE; ++ } ++ ++ clear_saved_primary_selection (selector); ++ ++ g_object_unref (source); ++ ++ return TRUE; ++} ++ ++static void ++text_cell_edited_cb (ESourceSelector *selector, ++ const gchar *path_string, ++ const gchar *new_name) ++{ ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ ESource *source; ++ ++ tree_view = GTK_TREE_VIEW (selector); ++ model = gtk_tree_view_get_model (tree_view); ++ path = gtk_tree_path_new_from_string (path_string); ++ ++ gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ gtk_tree_path_free (path); ++ ++ if (new_name == NULL || *new_name == '\0') ++ return; ++ ++ if (same_source_name_exists (selector, new_name)) ++ return; ++ ++ e_source_set_display_name (source, new_name); ++ ++ e_source_selector_queue_write (selector, source); ++} ++ ++static void ++cell_toggled_callback (GtkCellRendererToggle *renderer, ++ const gchar *path_string, ++ ESourceSelector *selector) ++{ ++ ESource *source; ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ ++ model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector)); ++ path = gtk_tree_path_new_from_string (path_string); ++ ++ if (!gtk_tree_model_get_iter (model, &iter, path)) { ++ gtk_tree_path_free (path); ++ return; ++ } ++ ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ ++ if (e_source_selector_source_is_selected (selector, source)) ++ e_source_selector_unselect_source (selector, source); ++ else ++ e_source_selector_select_source (selector, source); ++ ++ selector->priv->toggled_last = TRUE; ++ ++ gtk_tree_path_free (path); ++ ++ g_object_unref (source); ++} ++ ++static void ++selection_changed_callback (GtkTreeSelection *selection, ++ ESourceSelector *selector) ++{ ++ g_signal_emit (selector, signals[PRIMARY_SELECTION_CHANGED], 0); ++ g_object_notify (G_OBJECT (selector), "primary-selection"); ++} ++ ++static void ++source_selector_set_extension_name (ESourceSelector *selector, ++ const gchar *extension_name) ++{ ++ g_return_if_fail (extension_name != NULL); ++ g_return_if_fail (selector->priv->extension_name == NULL); ++ ++ selector->priv->extension_name = g_strdup (extension_name); ++} ++ ++static void ++source_selector_set_registry (ESourceSelector *selector, ++ ESourceRegistry *registry) ++{ ++ g_return_if_fail (E_IS_SOURCE_REGISTRY (registry)); ++ g_return_if_fail (selector->priv->registry == NULL); ++ ++ selector->priv->registry = g_object_ref (registry); ++} ++ ++static void ++source_selector_set_property (GObject *object, ++ guint property_id, ++ const GValue *value, ++ GParamSpec *pspec) ++{ ++ switch (property_id) { ++ case PROP_EXTENSION_NAME: ++ source_selector_set_extension_name ( ++ E_SOURCE_SELECTOR (object), ++ g_value_get_string (value)); ++ return; ++ ++ case PROP_PRIMARY_SELECTION: ++ e_source_selector_set_primary_selection ( ++ E_SOURCE_SELECTOR (object), ++ g_value_get_object (value)); ++ return; ++ ++ case PROP_REGISTRY: ++ source_selector_set_registry ( ++ E_SOURCE_SELECTOR (object), ++ g_value_get_object (value)); ++ return; ++ ++ case PROP_SHOW_COLORS: ++ e_source_selector_set_show_colors ( ++ E_SOURCE_SELECTOR (object), ++ g_value_get_boolean (value)); ++ return; ++ ++ case PROP_SHOW_TOGGLES: ++ e_source_selector_set_show_toggles ( ++ E_SOURCE_SELECTOR (object), ++ g_value_get_boolean (value)); ++ return; ++ } ++ ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); ++} ++ ++static void ++source_selector_get_property (GObject *object, ++ guint property_id, ++ GValue *value, ++ GParamSpec *pspec) ++{ ++ switch (property_id) { ++ case PROP_EXTENSION_NAME: ++ g_value_set_string ( ++ value, ++ e_source_selector_get_extension_name ( ++ E_SOURCE_SELECTOR (object))); ++ return; ++ ++ case PROP_PRIMARY_SELECTION: ++ g_value_take_object ( ++ value, ++ e_source_selector_ref_primary_selection ( ++ E_SOURCE_SELECTOR (object))); ++ return; ++ ++ case PROP_REGISTRY: ++ g_value_set_object ( ++ value, ++ e_source_selector_get_registry ( ++ E_SOURCE_SELECTOR (object))); ++ return; ++ ++ case PROP_SHOW_COLORS: ++ g_value_set_boolean ( ++ value, ++ e_source_selector_get_show_colors ( ++ E_SOURCE_SELECTOR (object))); ++ return; ++ ++ case PROP_SHOW_TOGGLES: ++ g_value_set_boolean ( ++ value, ++ e_source_selector_get_show_toggles ( ++ E_SOURCE_SELECTOR (object))); ++ return; ++ } ++ ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); ++} ++ ++static void ++source_selector_dispose (GObject *object) ++{ ++ ESourceSelectorPrivate *priv; ++ ++ priv = E_SOURCE_SELECTOR_GET_PRIVATE (object); ++ ++ if (priv->registry != NULL) { ++ g_signal_handlers_disconnect_matched ( ++ priv->registry, ++ G_SIGNAL_MATCH_DATA, ++ 0, 0, NULL, NULL, object); ++ g_object_unref (priv->registry); ++ priv->registry = NULL; ++ } ++ ++ g_hash_table_remove_all (priv->source_index); ++ g_hash_table_remove_all (priv->pending_writes); ++ ++ clear_saved_primary_selection (E_SOURCE_SELECTOR (object)); ++ ++ /* Chain up to parent's dispose() method. */ ++ G_OBJECT_CLASS (e_source_selector_parent_class)->dispose (object); ++} ++ ++static void ++source_selector_finalize (GObject *object) ++{ ++ ESourceSelectorPrivate *priv; ++ ++ priv = E_SOURCE_SELECTOR_GET_PRIVATE (object); ++ ++ g_hash_table_destroy (priv->source_index); ++ g_hash_table_destroy (priv->pending_writes); ++ ++ g_free (priv->extension_name); ++ ++ if (priv->main_context != NULL) ++ g_main_context_unref (priv->main_context); ++ ++ /* Chain up to parent's finalize() method. */ ++ G_OBJECT_CLASS (e_source_selector_parent_class)->finalize (object); ++} ++ ++static void ++source_selector_constructed (GObject *object) ++{ ++ ESourceRegistry *registry; ++ ESourceSelector *selector; ++ ++ selector = E_SOURCE_SELECTOR (object); ++ registry = e_source_selector_get_registry (selector); ++ ++ g_signal_connect ( ++ registry, "source-added", ++ G_CALLBACK (source_selector_source_added_cb), selector); ++ ++ g_signal_connect ( ++ registry, "source-changed", ++ G_CALLBACK (source_selector_source_changed_cb), selector); ++ ++ g_signal_connect ( ++ registry, "source-removed", ++ G_CALLBACK (source_selector_source_removed_cb), selector); ++ ++ g_signal_connect ( ++ registry, "source-enabled", ++ G_CALLBACK (source_selector_source_enabled_cb), selector); ++ ++ g_signal_connect ( ++ registry, "source-disabled", ++ G_CALLBACK (source_selector_source_disabled_cb), selector); ++ ++ source_selector_build_model (selector); ++ ++ gtk_tree_view_expand_all (GTK_TREE_VIEW (selector)); ++} ++ ++static gboolean ++source_selector_button_press_event (GtkWidget *widget, ++ GdkEventButton *event) ++{ ++ ESourceSelector *selector; ++ GtkWidgetClass *widget_class; ++ GtkTreePath *path; ++ ESource *source = NULL; ++ ESource *primary; ++ gboolean right_click = FALSE; ++ gboolean triple_click = FALSE; ++ gboolean row_exists; ++ gboolean res = FALSE; ++ ++ selector = E_SOURCE_SELECTOR (widget); ++ ++ selector->priv->toggled_last = FALSE; ++ ++ /* Triple-clicking a source selects it exclusively. */ ++ ++ if (event->button == 3 && event->type == GDK_BUTTON_PRESS) ++ right_click = TRUE; ++ else if (event->button == 1 && event->type == GDK_3BUTTON_PRESS) ++ triple_click = TRUE; ++ else ++ goto chainup; ++ ++ row_exists = gtk_tree_view_get_path_at_pos ( ++ GTK_TREE_VIEW (widget), event->x, event->y, ++ &path, NULL, NULL, NULL); ++ ++ /* Get the source/group */ ++ if (row_exists) { ++ GtkTreeModel *model; ++ GtkTreeIter iter; ++ ++ model = gtk_tree_view_get_model (GTK_TREE_VIEW (widget)); ++ ++ gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ } ++ ++ if (source == NULL) ++ goto chainup; ++ ++ primary = e_source_selector_ref_primary_selection (selector); ++ if (source != primary) ++ e_source_selector_set_primary_selection (selector, source); ++ if (primary != NULL) ++ g_object_unref (primary); ++ ++ if (right_click) ++ g_signal_emit ( ++ widget, signals[POPUP_EVENT], 0, source, event, &res); ++ ++ if (triple_click) { ++ e_source_selector_select_exclusive (selector, source); ++ res = TRUE; ++ } ++ ++ g_object_unref (source); ++ ++ return res; ++ ++chainup: ++ ++ /* Chain up to parent's button_press_event() method. */ ++ widget_class = GTK_WIDGET_CLASS (e_source_selector_parent_class); ++ return widget_class->button_press_event (widget, event); ++} ++ ++static void ++source_selector_drag_leave (GtkWidget *widget, ++ GdkDragContext *context, ++ guint time_) ++{ ++ GtkTreeView *tree_view; ++ GtkTreeViewDropPosition pos; ++ ++ tree_view = GTK_TREE_VIEW (widget); ++ pos = GTK_TREE_VIEW_DROP_BEFORE; ++ ++ gtk_tree_view_set_drag_dest_row (tree_view, NULL, pos); ++} ++ ++static gboolean ++source_selector_drag_motion (GtkWidget *widget, ++ GdkDragContext *context, ++ gint x, ++ gint y, ++ guint time_) ++{ ++ ESource *source = NULL; ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreePath *path = NULL; ++ GtkTreeIter iter; ++ GtkTreeViewDropPosition pos; ++ GdkDragAction action = 0; ++ ++ tree_view = GTK_TREE_VIEW (widget); ++ model = gtk_tree_view_get_model (tree_view); ++ ++ if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL)) ++ goto exit; ++ ++ if (!gtk_tree_model_get_iter (model, &iter, path)) ++ goto exit; ++ ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ ++ if (!e_source_get_writable (source)) ++ goto exit; ++ ++ pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE; ++ gtk_tree_view_set_drag_dest_row (tree_view, path, pos); ++ ++ if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE) ++ action = GDK_ACTION_MOVE; ++ else ++ action = gdk_drag_context_get_suggested_action (context); ++ ++exit: ++ if (path != NULL) ++ gtk_tree_path_free (path); ++ ++ if (source != NULL) ++ g_object_unref (source); ++ ++ gdk_drag_status (context, action, time_); ++ ++ return TRUE; ++} ++ ++static gboolean ++source_selector_drag_drop (GtkWidget *widget, ++ GdkDragContext *context, ++ gint x, ++ gint y, ++ guint time_) ++{ ++ ESource *source; ++ ESourceSelector *selector; ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreePath *path; ++ GtkTreeIter iter; ++ const gchar *extension_name; ++ gboolean drop_zone; ++ gboolean valid; ++ ++ tree_view = GTK_TREE_VIEW (widget); ++ model = gtk_tree_view_get_model (tree_view); ++ ++ if (!gtk_tree_view_get_path_at_pos ( ++ tree_view, x, y, &path, NULL, NULL, NULL)) ++ return FALSE; ++ ++ valid = gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_path_free (path); ++ g_return_val_if_fail (valid, FALSE); ++ ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ ++ selector = E_SOURCE_SELECTOR (widget); ++ extension_name = e_source_selector_get_extension_name (selector); ++ drop_zone = e_source_has_extension (source, extension_name); ++ ++ g_object_unref (source); ++ ++ return drop_zone; ++} ++ ++static void ++source_selector_drag_data_received (GtkWidget *widget, ++ GdkDragContext *context, ++ gint x, ++ gint y, ++ GtkSelectionData *selection_data, ++ guint info, ++ guint time_) ++{ ++ ESource *source = NULL; ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreePath *path = NULL; ++ GtkTreeIter iter; ++ GdkDragAction action; ++ gboolean delete; ++ gboolean success = FALSE; ++ ++ tree_view = GTK_TREE_VIEW (widget); ++ model = gtk_tree_view_get_model (tree_view); ++ ++ action = gdk_drag_context_get_selected_action (context); ++ delete = (action == GDK_ACTION_MOVE); ++ ++ if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL)) ++ goto exit; ++ ++ if (!gtk_tree_model_get_iter (model, &iter, path)) ++ goto exit; ++ ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ ++ if (!e_source_get_writable (source)) ++ goto exit; ++ ++ g_signal_emit ( ++ widget, signals[DATA_DROPPED], 0, selection_data, ++ source, gdk_drag_context_get_selected_action (context), ++ info, &success); ++ ++exit: ++ if (path != NULL) ++ gtk_tree_path_free (path); ++ ++ if (source != NULL) ++ g_object_unref (source); ++ ++ gtk_drag_finish (context, success, delete, time_); ++} ++ ++static gboolean ++source_selector_popup_menu (GtkWidget *widget) ++{ ++ ESourceSelector *selector; ++ ESource *source; ++ gboolean res = FALSE; ++ ++ selector = E_SOURCE_SELECTOR (widget); ++ source = e_source_selector_ref_primary_selection (selector); ++ g_signal_emit (selector, signals[POPUP_EVENT], 0, source, NULL, &res); ++ ++ if (source != NULL) ++ g_object_unref (source); ++ ++ return res; ++} ++ ++static gboolean ++source_selector_test_collapse_row (GtkTreeView *tree_view, ++ GtkTreeIter *iter, ++ GtkTreePath *path) ++{ ++ ESourceSelectorPrivate *priv; ++ GtkTreeSelection *selection; ++ GtkTreeModel *model; ++ GtkTreeIter child_iter; ++ ++ priv = E_SOURCE_SELECTOR_GET_PRIVATE (tree_view); ++ ++ /* Clear this because something else has been clicked on now */ ++ priv->toggled_last = FALSE; ++ ++ if (priv->saved_primary_selection) ++ return FALSE; ++ ++ selection = gtk_tree_view_get_selection (tree_view); ++ ++ if (!gtk_tree_selection_get_selected (selection, &model, &child_iter)) ++ return FALSE; ++ ++ if (gtk_tree_store_is_ancestor (GTK_TREE_STORE (model), iter, &child_iter)) { ++ GtkTreeRowReference *reference; ++ GtkTreePath *child_path; ++ ++ child_path = gtk_tree_model_get_path (model, &child_iter); ++ reference = gtk_tree_row_reference_new (model, child_path); ++ priv->saved_primary_selection = reference; ++ gtk_tree_path_free (child_path); ++ } ++ ++ return FALSE; ++} ++ ++static void ++source_selector_row_expanded (GtkTreeView *tree_view, ++ GtkTreeIter *iter, ++ GtkTreePath *path) ++{ ++ ESourceSelectorPrivate *priv; ++ GtkTreeModel *model; ++ GtkTreePath *child_path; ++ GtkTreeIter child_iter; ++ ++ priv = E_SOURCE_SELECTOR_GET_PRIVATE (tree_view); ++ ++ if (!priv->saved_primary_selection) ++ return; ++ ++ model = gtk_tree_view_get_model (tree_view); ++ ++ child_path = gtk_tree_row_reference_get_path ( ++ priv->saved_primary_selection); ++ gtk_tree_model_get_iter (model, &child_iter, child_path); ++ ++ if (gtk_tree_store_is_ancestor (GTK_TREE_STORE (model), iter, &child_iter)) { ++ GtkTreeSelection *selection; ++ ++ selection = gtk_tree_view_get_selection (tree_view); ++ gtk_tree_selection_select_iter (selection, &child_iter); ++ ++ clear_saved_primary_selection (E_SOURCE_SELECTOR (tree_view)); ++ } ++ ++ gtk_tree_path_free (child_path); ++} ++ ++static gboolean ++source_selector_get_source_selected (ESourceSelector *selector, ++ ESource *source) ++{ ++ ESourceSelectable *extension; ++ const gchar *extension_name; ++ gboolean selected = TRUE; ++ ++ extension_name = e_source_selector_get_extension_name (selector); ++ ++ if (!e_source_has_extension (source, extension_name)) ++ return FALSE; ++ ++ extension = e_source_get_extension (source, extension_name); ++ ++ if (E_IS_SOURCE_SELECTABLE (extension)) ++ selected = e_source_selectable_get_selected (extension); ++ ++ return selected; ++} ++ ++static void ++source_selector_set_source_selected (ESourceSelector *selector, ++ ESource *source, ++ gboolean selected) ++{ ++ ESourceSelectable *extension; ++ const gchar *extension_name; ++ ++ extension_name = e_source_selector_get_extension_name (selector); ++ ++ if (!e_source_has_extension (source, extension_name)) ++ return; ++ ++ extension = e_source_get_extension (source, extension_name); ++ ++ if (!E_IS_SOURCE_SELECTABLE (extension)) ++ return; ++ ++ if (selected != e_source_selectable_get_selected (extension)) { ++ e_source_selectable_set_selected (extension, selected); ++ e_source_selector_queue_write (selector, source); ++ } ++} ++ ++static gboolean ++ess_bool_accumulator (GSignalInvocationHint *ihint, ++ GValue *out, ++ const GValue *in, ++ gpointer data) ++{ ++ gboolean v_boolean; ++ ++ v_boolean = g_value_get_boolean (in); ++ g_value_set_boolean (out, v_boolean); ++ ++ return !v_boolean; ++} ++ ++static void ++e_source_selector_class_init (ESourceSelectorClass *class) ++{ ++ GObjectClass *object_class; ++ GtkWidgetClass *widget_class; ++ GtkTreeViewClass *tree_view_class; ++ ++ g_type_class_add_private (class, sizeof (ESourceSelectorPrivate)); ++ ++ object_class = G_OBJECT_CLASS (class); ++ object_class->set_property = source_selector_set_property; ++ object_class->get_property = source_selector_get_property; ++ object_class->dispose = source_selector_dispose; ++ object_class->finalize = source_selector_finalize; ++ object_class->constructed = source_selector_constructed; ++ ++ widget_class = GTK_WIDGET_CLASS (class); ++ widget_class->button_press_event = source_selector_button_press_event; ++ widget_class->drag_leave = source_selector_drag_leave; ++ widget_class->drag_motion = source_selector_drag_motion; ++ widget_class->drag_drop = source_selector_drag_drop; ++ widget_class->drag_data_received = source_selector_drag_data_received; ++ widget_class->popup_menu = source_selector_popup_menu; ++ ++ tree_view_class = GTK_TREE_VIEW_CLASS (class); ++ tree_view_class->test_collapse_row = source_selector_test_collapse_row; ++ tree_view_class->row_expanded = source_selector_row_expanded; ++ ++ class->get_source_selected = source_selector_get_source_selected; ++ class->set_source_selected = source_selector_set_source_selected; ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_EXTENSION_NAME, ++ g_param_spec_string ( ++ "extension-name", ++ NULL, ++ NULL, ++ NULL, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT_ONLY | ++ G_PARAM_STATIC_STRINGS)); ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_PRIMARY_SELECTION, ++ g_param_spec_object ( ++ "primary-selection", ++ NULL, ++ NULL, ++ E_TYPE_SOURCE, ++ G_PARAM_READWRITE | ++ G_PARAM_STATIC_STRINGS)); ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_REGISTRY, ++ g_param_spec_object ( ++ "registry", ++ NULL, ++ NULL, ++ E_TYPE_SOURCE_REGISTRY, ++ G_PARAM_READWRITE | ++ G_PARAM_CONSTRUCT_ONLY | ++ G_PARAM_STATIC_STRINGS)); ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_SHOW_COLORS, ++ g_param_spec_boolean ( ++ "show-colors", ++ NULL, ++ NULL, ++ TRUE, ++ G_PARAM_READWRITE | ++ G_PARAM_STATIC_STRINGS)); ++ ++ g_object_class_install_property ( ++ object_class, ++ PROP_SHOW_TOGGLES, ++ g_param_spec_boolean ( ++ "show-toggles", ++ NULL, ++ NULL, ++ TRUE, ++ G_PARAM_READWRITE | ++ G_PARAM_STATIC_STRINGS)); ++ ++ signals[SELECTION_CHANGED] = g_signal_new ( ++ "selection-changed", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (ESourceSelectorClass, selection_changed), ++ NULL, NULL, NULL, ++ G_TYPE_NONE, 0); ++ ++ /* XXX Consider this signal deprecated. Connect ++ * to "notify::primary-selection" instead. */ ++ signals[PRIMARY_SELECTION_CHANGED] = g_signal_new ( ++ "primary-selection-changed", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (ESourceSelectorClass, primary_selection_changed), ++ NULL, NULL, NULL, ++ G_TYPE_NONE, 0); ++ ++ signals[POPUP_EVENT] = g_signal_new ( ++ "popup-event", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (ESourceSelectorClass, popup_event), ++ ess_bool_accumulator, NULL, NULL, ++ G_TYPE_BOOLEAN, 2, G_TYPE_OBJECT, ++ GDK_TYPE_EVENT | G_SIGNAL_TYPE_STATIC_SCOPE); ++ ++ signals[DATA_DROPPED] = g_signal_new ( ++ "data-dropped", ++ G_OBJECT_CLASS_TYPE (object_class), ++ G_SIGNAL_RUN_LAST, ++ G_STRUCT_OFFSET (ESourceSelectorClass, data_dropped), ++ NULL, NULL, NULL, ++ G_TYPE_BOOLEAN, 4, ++ GTK_TYPE_SELECTION_DATA | G_SIGNAL_TYPE_STATIC_SCOPE, ++ E_TYPE_SOURCE, ++ GDK_TYPE_DRAG_ACTION, ++ G_TYPE_UINT); ++} ++ ++static void ++e_source_selector_init (ESourceSelector *selector) ++{ ++ GHashTable *pending_writes; ++ GtkTreeViewColumn *column; ++ GtkTreeSelection *selection; ++ GtkCellRenderer *renderer; ++ GtkTreeStore *tree_store; ++ GtkTreeView *tree_view; ++ ++ pending_writes = g_hash_table_new_full ( ++ (GHashFunc) g_direct_hash, ++ (GEqualFunc) g_direct_equal, ++ (GDestroyNotify) g_object_unref, ++ (GDestroyNotify) pending_writes_destroy_source); ++ ++ selector->priv = E_SOURCE_SELECTOR_GET_PRIVATE (selector); ++ ++ selector->priv->pending_writes = pending_writes; ++ ++ selector->priv->main_context = g_main_context_get_thread_default (); ++ if (selector->priv->main_context != NULL) ++ g_main_context_ref (selector->priv->main_context); ++ ++ tree_view = GTK_TREE_VIEW (selector); ++ ++ gtk_tree_view_set_search_column (tree_view, COLUMN_SOURCE); ++ gtk_tree_view_set_enable_search (tree_view, TRUE); ++ ++ selector->priv->toggled_last = FALSE; ++ selector->priv->select_new = FALSE; ++ selector->priv->show_colors = TRUE; ++ selector->priv->show_toggles = TRUE; ++ ++ selector->priv->source_index = g_hash_table_new_full ( ++ (GHashFunc) e_source_hash, ++ (GEqualFunc) e_source_equal, ++ (GDestroyNotify) g_object_unref, ++ (GDestroyNotify) gtk_tree_row_reference_free); ++ ++ tree_store = gtk_tree_store_new ( ++ NUM_COLUMNS, ++ G_TYPE_STRING, /* COLUMN_NAME */ ++ GDK_TYPE_COLOR, /* COLUMN_COLOR */ ++ G_TYPE_BOOLEAN, /* COLUMN_ACTIVE */ ++ G_TYPE_BOOLEAN, /* COLUMN_SHOW_COLOR */ ++ G_TYPE_BOOLEAN, /* COLUMN_SHOW_TOGGLE */ ++ G_TYPE_INT, /* COLUMN_WEIGHT */ ++ E_TYPE_SOURCE); /* COLUMN_SOURCE */ ++ ++ gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (tree_store)); ++ ++ column = gtk_tree_view_column_new (); ++ gtk_tree_view_append_column (tree_view, column); ++ ++ renderer = e_cell_renderer_color_new (); ++ g_object_set ( ++ G_OBJECT (renderer), "mode", ++ GTK_CELL_RENDERER_MODE_ACTIVATABLE, NULL); ++ gtk_tree_view_column_pack_start (column, renderer, FALSE); ++ gtk_tree_view_column_add_attribute ( ++ column, renderer, "color", COLUMN_COLOR); ++ gtk_tree_view_column_add_attribute ( ++ column, renderer, "visible", COLUMN_SHOW_COLOR); ++ ++ renderer = e_cell_renderer_safe_toggle_new (); ++ gtk_tree_view_column_pack_start (column, renderer, FALSE); ++ gtk_tree_view_column_add_attribute ( ++ column, renderer, "active", COLUMN_ACTIVE); ++ gtk_tree_view_column_add_attribute ( ++ column, renderer, "visible", COLUMN_SHOW_TOGGLE); ++ g_signal_connect ( ++ renderer, "toggled", ++ G_CALLBACK (cell_toggled_callback), selector); ++ ++ renderer = gtk_cell_renderer_text_new (); ++ g_object_set ( ++ G_OBJECT (renderer), ++ "ellipsize", PANGO_ELLIPSIZE_END, NULL); ++ g_signal_connect_swapped ( ++ renderer, "edited", ++ G_CALLBACK (text_cell_edited_cb), selector); ++ gtk_tree_view_column_pack_start (column, renderer, TRUE); ++ gtk_tree_view_column_set_attributes ( ++ column, renderer, ++ "text", COLUMN_NAME, ++ "weight", COLUMN_WEIGHT, ++ NULL); ++ ++ selection = gtk_tree_view_get_selection (tree_view); ++ gtk_tree_selection_set_select_function ( ++ selection, (GtkTreeSelectionFunc) ++ selection_func, selector, NULL); ++ g_signal_connect_object ( ++ selection, "changed", ++ G_CALLBACK (selection_changed_callback), ++ G_OBJECT (selector), 0); ++ ++ gtk_tree_view_set_headers_visible (tree_view, FALSE); ++} ++ ++/** ++ * e_source_selector_new: ++ * @registry: an #ESourceRegistry ++ * @extension_name: the name of an #ESource extension ++ * ++ * Displays a list of sources from @registry having an extension named ++ * @extension_name. The sources are grouped by backend or groupware ++ * account, which are described by the parent source. ++ * ++ * Returns: a new #ESourceSelector ++ **/ ++GtkWidget * ++e_source_selector_new (ESourceRegistry *registry, ++ const gchar *extension_name) ++{ ++ g_return_val_if_fail (E_IS_SOURCE_REGISTRY (registry), NULL); ++ g_return_val_if_fail (extension_name != NULL, NULL); ++ ++ return g_object_new ( ++ E_TYPE_SOURCE_SELECTOR, "registry", registry, ++ "extension-name", extension_name, NULL); ++} ++ ++/** ++ * e_source_selector_get_registry: ++ * @selector: an #ESourceSelector ++ * ++ * Returns the #ESourceRegistry that @selector is getting sources from. ++ * ++ * Returns: an #ESourceRegistry ++ * ++ * Since: 3.6 ++ **/ ++ESourceRegistry * ++e_source_selector_get_registry (ESourceSelector *selector) ++{ ++ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); ++ ++ return selector->priv->registry; ++} ++ ++/** ++ * e_source_selector_get_extension_name: ++ * @selector: an #ESourceSelector ++ * ++ * Returns the extension name used to filter which sources are displayed. ++ * ++ * Returns: the #ESource extension name ++ * ++ * Since: 3.6 ++ **/ ++const gchar * ++e_source_selector_get_extension_name (ESourceSelector *selector) ++{ ++ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); ++ ++ return selector->priv->extension_name; ++} ++ ++/** ++ * e_source_selector_get_show_colors: ++ * @selector: an #ESourceSelector ++ * ++ * Returns whether colors are shown next to data sources. ++ * ++ * Returns: %TRUE if colors are being shown ++ * ++ * Since: 3.6 ++ **/ ++gboolean ++e_source_selector_get_show_colors (ESourceSelector *selector) ++{ ++ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE); ++ ++ return selector->priv->show_colors; ++} ++ ++/** ++ * e_source_selector_set_show_colors: ++ * @selector: an #ESourceSelector ++ * @show_colors: whether to show colors ++ * ++ * Sets whether to show colors next to data sources. ++ * ++ * Since: 3.6 ++ **/ ++void ++e_source_selector_set_show_colors (ESourceSelector *selector, ++ gboolean show_colors) ++{ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ ++ if ((show_colors ? 1 : 0) == (selector->priv->show_colors ? 1 : 0)) ++ return; ++ ++ selector->priv->show_colors = show_colors; ++ ++ g_object_notify (G_OBJECT (selector), "show-colors"); ++ ++ source_selector_build_model (selector); ++} ++ ++/** ++ * e_source_selector_get_show_toggles: ++ * @selector: an #ESourceSelector ++ * ++ * Returns whether toggles are shown next to data sources. ++ * ++ * Returns: %TRUE if toggles are being shown ++ * ++ * Since: 3.6 ++ **/ ++gboolean ++e_source_selector_get_show_toggles (ESourceSelector *selector) ++{ ++ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE); ++ ++ return selector->priv->show_toggles; ++} ++ ++/** ++ * e_source_selector_set_show_toggles: ++ * @selector: an #ESourceSelector ++ * @show_toggles: whether to show toggles ++ * ++ * Sets whether to show toggles next to data sources. ++ * ++ * Since: 3.6 ++ **/ ++void ++e_source_selector_set_show_toggles (ESourceSelector *selector, ++ gboolean show_toggles) ++{ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ ++ if ((show_toggles ? 1 : 0) == (selector->priv->show_toggles ? 1 : 0)) ++ return; ++ ++ selector->priv->show_toggles = show_toggles; ++ ++ g_object_notify (G_OBJECT (selector), "show-toggles"); ++ ++ source_selector_build_model (selector); ++} ++ ++/* Helper for e_source_selector_get_selection() */ ++static gboolean ++source_selector_check_selected (GtkTreeModel *model, ++ GtkTreePath *path, ++ GtkTreeIter *iter, ++ gpointer user_data) ++{ ++ ESource *source; ++ ++ struct { ++ ESourceSelector *selector; ++ GSList *list; ++ } *closure = user_data; ++ ++ gtk_tree_model_get (model, iter, COLUMN_SOURCE, &source, -1); ++ ++ if (e_source_selector_source_is_selected (closure->selector, source)) ++ closure->list = g_slist_prepend (closure->list, source); ++ else ++ g_object_unref (source); ++ ++ return FALSE; ++} ++ ++/** ++ * e_source_selector_get_selection: ++ * @selector: an #ESourceSelector ++ * ++ * Get the list of selected sources, i.e. those that were enabled through the ++ * corresponding checkboxes in the tree. ++ * ++ * Returns: A list of the ESources currently selected. The sources will ++ * be in the same order as they appear on the screen, and the list should be ++ * freed using e_source_selector_free_selection(). ++ **/ ++GSList * ++e_source_selector_get_selection (ESourceSelector *selector) ++{ ++ struct { ++ ESourceSelector *selector; ++ GSList *list; ++ } closure; ++ ++ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); ++ ++ closure.selector = selector; ++ closure.list = NULL; ++ ++ gtk_tree_model_foreach ( ++ gtk_tree_view_get_model (GTK_TREE_VIEW (selector)), ++ (GtkTreeModelForeachFunc) source_selector_check_selected, ++ &closure); ++ ++ return g_slist_reverse (closure.list); ++} ++ ++/** ++ * e_source_list_free_selection: ++ * @list: A selection list returned by e_source_selector_get_selection(). ++ * ++ * Free the selection list. ++ **/ ++void ++e_source_selector_free_selection (GSList *list) ++{ ++ g_slist_foreach (list, (GFunc) g_object_unref, NULL); ++ g_slist_free (list); ++} ++ ++/** ++ * e_source_selector_set_select_new: ++ * @selector: An #ESourceSelector widget ++ * @state: A gboolean ++ * ++ * Set whether or not to select new sources added to @selector. ++ **/ ++void ++e_source_selector_set_select_new (ESourceSelector *selector, ++ gboolean state) ++{ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ ++ selector->priv->select_new = state; ++} ++ ++/** ++ * e_source_selector_select_source: ++ * @selector: An #ESourceSelector widget ++ * @source: An #ESource. ++ * ++ * Select @source in @selector. ++ **/ ++void ++e_source_selector_select_source (ESourceSelector *selector, ++ ESource *source) ++{ ++ ESourceSelectorClass *class; ++ GtkTreeRowReference *reference; ++ GHashTable *source_index; ++ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ g_return_if_fail (E_IS_SOURCE (source)); ++ ++ /* Make sure the ESource is in our tree model. */ ++ source_index = selector->priv->source_index; ++ reference = g_hash_table_lookup (source_index, source); ++ g_return_if_fail (gtk_tree_row_reference_valid (reference)); ++ ++ class = E_SOURCE_SELECTOR_GET_CLASS (selector); ++ g_return_if_fail (class->set_source_selected != NULL); ++ ++ class->set_source_selected (selector, source, TRUE); ++ ++ g_signal_emit (selector, signals[SELECTION_CHANGED], 0); ++} ++ ++/** ++ * e_source_selector_unselect_source: ++ * @selector: An #ESourceSelector widget ++ * @source: An #ESource. ++ * ++ * Unselect @source in @selector. ++ **/ ++void ++e_source_selector_unselect_source (ESourceSelector *selector, ++ ESource *source) ++{ ++ ESourceSelectorClass *class; ++ GtkTreeRowReference *reference; ++ GHashTable *source_index; ++ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ g_return_if_fail (E_IS_SOURCE (source)); ++ ++ /* Make sure the ESource is in our tree model. */ ++ source_index = selector->priv->source_index; ++ reference = g_hash_table_lookup (source_index, source); ++ g_return_if_fail (gtk_tree_row_reference_valid (reference)); ++ ++ class = E_SOURCE_SELECTOR_GET_CLASS (selector); ++ g_return_if_fail (class->set_source_selected != NULL); ++ ++ class->set_source_selected (selector, source, FALSE); ++ ++ g_signal_emit (selector, signals[SELECTION_CHANGED], 0); ++} ++ ++/** ++ * e_source_selector_select_exclusive: ++ * @selector: An #ESourceSelector widget ++ * @source: An #ESource. ++ * ++ * Select @source in @selector and unselect all others. ++ * ++ * Since: 2.30 ++ **/ ++void ++e_source_selector_select_exclusive (ESourceSelector *selector, ++ ESource *source) ++{ ++ ESourceSelectorClass *class; ++ GHashTable *source_index; ++ GHashTableIter iter; ++ gpointer key; ++ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ g_return_if_fail (E_IS_SOURCE (source)); ++ ++ class = E_SOURCE_SELECTOR_GET_CLASS (selector); ++ g_return_if_fail (class->set_source_selected != NULL); ++ ++ source_index = selector->priv->source_index; ++ g_hash_table_iter_init (&iter, source_index); ++ ++ while (g_hash_table_iter_next (&iter, &key, NULL)) { ++ gboolean selected = e_source_equal (key, source); ++ class->set_source_selected (selector, key, selected); ++ } ++ ++ g_signal_emit (selector, signals[SELECTION_CHANGED], 0); ++} ++ ++/** ++ * e_source_selector_source_is_selected: ++ * @selector: An #ESourceSelector widget ++ * @source: An #ESource. ++ * ++ * Check whether @source is selected in @selector. ++ * ++ * Returns: %TRUE if @source is currently selected, %FALSE otherwise. ++ **/ ++gboolean ++e_source_selector_source_is_selected (ESourceSelector *selector, ++ ESource *source) ++{ ++ ESourceSelectorClass *class; ++ GtkTreeRowReference *reference; ++ GHashTable *source_index; ++ ++ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), FALSE); ++ g_return_val_if_fail (E_IS_SOURCE (source), FALSE); ++ ++ /* Make sure the ESource is in our tree model. */ ++ source_index = selector->priv->source_index; ++ reference = g_hash_table_lookup (source_index, source); ++ g_return_val_if_fail (gtk_tree_row_reference_valid (reference), FALSE); ++ ++ class = E_SOURCE_SELECTOR_GET_CLASS (selector); ++ g_return_val_if_fail (class->get_source_selected != NULL, FALSE); ++ ++ return class->get_source_selected (selector, source); ++} ++ ++/** ++ * e_source_selector_edit_primary_selection: ++ * @selector: An #ESourceSelector widget ++ * ++ * Allows the user to rename the primary selected source by opening an ++ * entry box directly in @selector. ++ * ++ * Since: 2.26 ++ **/ ++void ++e_source_selector_edit_primary_selection (ESourceSelector *selector) ++{ ++ GtkTreeRowReference *reference; ++ GtkTreeSelection *selection; ++ GtkTreeViewColumn *column; ++ GtkCellRenderer *renderer; ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreePath *path = NULL; ++ GtkTreeIter iter; ++ GList *list; ++ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ ++ tree_view = GTK_TREE_VIEW (selector); ++ column = gtk_tree_view_get_column (tree_view, 0); ++ reference = selector->priv->saved_primary_selection; ++ selection = gtk_tree_view_get_selection (tree_view); ++ ++ if (reference != NULL) ++ path = gtk_tree_row_reference_get_path (reference); ++ else if (gtk_tree_selection_get_selected (selection, &model, &iter)) ++ path = gtk_tree_model_get_path (model, &iter); ++ ++ if (path == NULL) ++ return; ++ ++ /* XXX Because we stuff three renderers in a single column, ++ * we have to manually hunt for the text renderer. */ ++ renderer = NULL; ++ list = gtk_cell_layout_get_cells (GTK_CELL_LAYOUT (column)); ++ while (list != NULL) { ++ renderer = list->data; ++ if (GTK_IS_CELL_RENDERER_TEXT (renderer)) ++ break; ++ list = g_list_delete_link (list, list); ++ } ++ g_list_free (list); ++ ++ /* Make the text cell renderer editable, but only temporarily. ++ * We don't want editing to be activated by simply clicking on ++ * the source name. Too easy for accidental edits to occur. */ ++ g_object_set (renderer, "editable", TRUE, NULL); ++ gtk_tree_view_expand_to_path (tree_view, path); ++ gtk_tree_view_set_cursor_on_cell ( ++ tree_view, path, column, renderer, TRUE); ++ g_object_set (renderer, "editable", FALSE, NULL); ++ ++ gtk_tree_path_free (path); ++} ++ ++/** ++ * e_source_selector_ref_primary_selection: ++ * @selector: An #ESourceSelector widget ++ * ++ * Get the primary selected source. The primary selection is the one that is ++ * highlighted through the normal #GtkTreeView selection mechanism (as opposed ++ * to the "normal" selection, which is the set of source whose checkboxes are ++ * checked). ++ * ++ * The returned #ESource is referenced for thread-safety and must be ++ * unreferenced with g_object_unref() when finished with it. ++ * ++ * Returns: The selected source. ++ * ++ * Since: 3.6 ++ **/ ++ESource * ++e_source_selector_ref_primary_selection (ESourceSelector *selector) ++{ ++ ESource *source; ++ GtkTreeRowReference *reference; ++ GtkTreeSelection *selection; ++ GtkTreeView *tree_view; ++ GtkTreeModel *model; ++ GtkTreeIter iter; ++ const gchar *extension_name; ++ gboolean have_iter = FALSE; ++ ++ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); ++ ++ tree_view = GTK_TREE_VIEW (selector); ++ model = gtk_tree_view_get_model (tree_view); ++ selection = gtk_tree_view_get_selection (tree_view); ++ ++ reference = selector->priv->saved_primary_selection; ++ ++ if (gtk_tree_row_reference_valid (reference)) { ++ GtkTreePath *path; ++ ++ path = gtk_tree_row_reference_get_path (reference); ++ have_iter = gtk_tree_model_get_iter (model, &iter, path); ++ gtk_tree_path_free (path); ++ } ++ ++ if (!have_iter) ++ have_iter = gtk_tree_selection_get_selected ( ++ selection, NULL, &iter); ++ ++ if (!have_iter) ++ return NULL; ++ ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ ++ extension_name = e_source_selector_get_extension_name (selector); ++ ++ if (!e_source_has_extension (source, extension_name)) { ++ g_object_unref (source); ++ return NULL; ++ } ++ ++ return source; ++} ++ ++/** ++ * e_source_selector_set_primary_selection: ++ * @selector: an #ESourceSelector widget ++ * @source: an #ESource to select ++ * ++ * Highlights @source in @selector. The highlighted #ESource is called ++ * the primary selection. ++ * ++ * Do not confuse this function with e_source_selector_select_source(), ++ * which activates the check box next to an #ESource's display name in ++ * @selector. This function does not alter the check box. ++ **/ ++void ++e_source_selector_set_primary_selection (ESourceSelector *selector, ++ ESource *source) ++{ ++ GHashTable *source_index; ++ GtkTreeRowReference *reference; ++ GtkTreeSelection *selection; ++ GtkTreeView *tree_view; ++ GtkTreePath *child_path; ++ GtkTreePath *parent_path; ++ const gchar *extension_name; ++ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ g_return_if_fail (E_IS_SOURCE (source)); ++ ++ tree_view = GTK_TREE_VIEW (selector); ++ selection = gtk_tree_view_get_selection (tree_view); ++ ++ source_index = selector->priv->source_index; ++ reference = g_hash_table_lookup (source_index, source); ++ ++ /* XXX Maybe we should return a success/fail boolean? */ ++ if (!gtk_tree_row_reference_valid (reference)) ++ return; ++ ++ extension_name = e_source_selector_get_extension_name (selector); ++ ++ /* Return silently if attempting to select a parent node ++ * lacking the expected extension (e.g. On This Computer). */ ++ if (!e_source_has_extension (source, extension_name)) ++ return; ++ ++ /* We block the signal because this all needs to be atomic */ ++ g_signal_handlers_block_matched ( ++ selection, G_SIGNAL_MATCH_FUNC, ++ 0, 0, NULL, selection_changed_callback, NULL); ++ gtk_tree_selection_unselect_all (selection); ++ g_signal_handlers_unblock_matched ( ++ selection, G_SIGNAL_MATCH_FUNC, ++ 0, 0, NULL, selection_changed_callback, NULL); ++ ++ clear_saved_primary_selection (selector); ++ ++ child_path = gtk_tree_row_reference_get_path (reference); ++ ++ parent_path = gtk_tree_path_copy (child_path); ++ gtk_tree_path_up (parent_path); ++ ++ if (gtk_tree_view_row_expanded (tree_view, parent_path)) { ++ gtk_tree_selection_select_path (selection, child_path); ++ } else { ++ selector->priv->saved_primary_selection = ++ gtk_tree_row_reference_copy (reference); ++ g_signal_emit (selector, signals[PRIMARY_SELECTION_CHANGED], 0); ++ g_object_notify (G_OBJECT (selector), "primary-selection"); ++ } ++ ++ gtk_tree_path_free (child_path); ++ gtk_tree_path_free (parent_path); ++} ++ ++/** ++ * e_source_selector_ref_source_by_path: ++ * @selector: an #ESourceSelector ++ * @path: a #GtkTreePath ++ * ++ * Returns the #ESource object at @path, or %NULL if @path is invalid. ++ * ++ * The returned #ESource is referenced for thread-safety and must be ++ * unreferenced with g_object_unref() when finished with it. ++ * ++ * Returns: the #ESource object at @path, or %NULL ++ * ++ * Since: 3.6 ++ **/ ++ESource * ++e_source_selector_ref_source_by_path (ESourceSelector *selector, ++ GtkTreePath *path) ++{ ++ ESource *source = NULL; ++ GtkTreeModel *model; ++ GtkTreeIter iter; ++ ++ g_return_val_if_fail (E_IS_SOURCE_SELECTOR (selector), NULL); ++ g_return_val_if_fail (path != NULL, NULL); ++ ++ model = gtk_tree_view_get_model (GTK_TREE_VIEW (selector)); ++ ++ if (gtk_tree_model_get_iter (model, &iter, path)) ++ gtk_tree_model_get (model, &iter, COLUMN_SOURCE, &source, -1); ++ ++ return source; ++} ++ ++/** ++ * e_source_selector_queue_write: ++ * @selector: an #ESourceSelecetor ++ * @source: an #ESource with changes to be written ++ * ++ * Queues a main loop idle callback to write changes to @source back to ++ * the D-Bus registry service. ++ * ++ * Since: 3.6 ++ **/ ++void ++e_source_selector_queue_write (ESourceSelector *selector, ++ ESource *source) ++{ ++ GSource *idle_source; ++ GHashTable *pending_writes; ++ GMainContext *main_context; ++ AsyncContext *async_context; ++ ++ g_return_if_fail (E_IS_SOURCE_SELECTOR (selector)); ++ g_return_if_fail (E_IS_SOURCE (source)); ++ ++ main_context = selector->priv->main_context; ++ pending_writes = selector->priv->pending_writes; ++ ++ idle_source = g_hash_table_lookup (pending_writes, source); ++ if (idle_source != NULL && !g_source_is_destroyed (idle_source)) ++ return; ++ ++ async_context = g_slice_new0 (AsyncContext); ++ async_context->selector = g_object_ref (selector); ++ async_context->source = g_object_ref (source); ++ ++ /* Set a higher priority so this idle source runs before our ++ * source_selector_cancel_write() signal handler, which will ++ * cancel this idle source. Cancellation is the right thing ++ * to do when receiving changes from OTHER registry clients, ++ * but we don't want to cancel our own changes. ++ * ++ * XXX This might be an argument for using etags. ++ */ ++ idle_source = g_idle_source_new (); ++ g_hash_table_insert ( ++ pending_writes, ++ g_object_ref (source), ++ g_source_ref (idle_source)); ++ g_source_set_callback ( ++ idle_source, ++ source_selector_write_idle_cb, ++ async_context, ++ (GDestroyNotify) async_context_free); ++ g_source_set_priority (idle_source, G_PRIORITY_HIGH_IDLE); ++ g_source_attach (idle_source, main_context); ++ g_source_unref (idle_source); ++} ++ +diff --git a/src/event-factories/e-source-selector.h b/src/event-factories/e-source-selector.h +new file mode 100644 +index 0000000..b6d3770 +--- /dev/null ++++ b/src/event-factories/e-source-selector.h +@@ -0,0 +1,137 @@ ++/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ ++/* e-source-selector.h ++ * ++ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser 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 Lesser General Public ++ * License along with this program; if not, write to the ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ * Author: Ettore Perazzoli ++ */ ++ ++#ifndef E_SOURCE_SELECTOR_H ++#define E_SOURCE_SELECTOR_H ++ ++#include ++#include ++ ++/* Standard GObject macros */ ++#define E_TYPE_SOURCE_SELECTOR \ ++ (e_source_selector_get_type ()) ++#define E_SOURCE_SELECTOR(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST \ ++ ((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelector)) ++#define E_SOURCE_SELECTOR_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_CAST \ ++ ((cls), E_TYPE_SOURCE_SELECTOR, ESourceSelectorClass)) ++#define E_IS_SOURCE_SELECTOR(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE \ ++ ((obj), E_TYPE_SOURCE_SELECTOR)) ++#define E_IS_SOURCE_SELECTOR_CLASS(cls) \ ++ (G_TYPE_CHECK_CLASS_TYPE \ ++ ((cls), E_TYPE_SOURCE_SELECTOR)) ++#define E_SOURCE_SELECTOR_GET_CLASS(obj) \ ++ (G_TYPE_INSTANCE_GET_CLASS \ ++ ((obj), E_TYPE_SOURCE_SELECTOR, ESourceSelectorClass)) ++ ++G_BEGIN_DECLS ++ ++typedef struct _ESourceSelector ESourceSelector; ++typedef struct _ESourceSelectorClass ESourceSelectorClass; ++typedef struct _ESourceSelectorPrivate ESourceSelectorPrivate; ++ ++struct _ESourceSelector { ++ GtkTreeView parent; ++ ESourceSelectorPrivate *priv; ++}; ++ ++struct _ESourceSelectorClass { ++ GtkTreeViewClass parent_class; ++ ++ /* Methods */ ++ gboolean (*get_source_selected) (ESourceSelector *selector, ++ ESource *source); ++ void (*set_source_selected) (ESourceSelector *selector, ++ ESource *source, ++ gboolean selected); ++ ++ /* Signals */ ++ void (*selection_changed) (ESourceSelector *selector); ++ void (*primary_selection_changed) ++ (ESourceSelector *selector); ++ gboolean (*popup_event) (ESourceSelector *selector, ++ ESource *primary, ++ GdkEventButton *event); ++ gboolean (*data_dropped) (ESourceSelector *selector, ++ GtkSelectionData *data, ++ ESource *destination, ++ GdkDragAction action, ++ guint target_info); ++ ++ gpointer padding1; ++ gpointer padding2; ++ gpointer padding3; ++}; ++ ++GType e_source_selector_get_type (void); ++GtkWidget * e_source_selector_new (ESourceRegistry *registry, ++ const gchar *extension_name); ++ESourceRegistry * ++ e_source_selector_get_registry (ESourceSelector *selector); ++const gchar * e_source_selector_get_extension_name ++ (ESourceSelector *selector); ++gboolean e_source_selector_get_show_colors ++ (ESourceSelector *selector); ++void e_source_selector_set_show_colors ++ (ESourceSelector *selector, ++ gboolean show_colors); ++gboolean e_source_selector_get_show_toggles ++ (ESourceSelector *selector); ++void e_source_selector_set_show_toggles ++ (ESourceSelector *selector, ++ gboolean show_toggles); ++void e_source_selector_select_source (ESourceSelector *selector, ++ ESource *source); ++void e_source_selector_unselect_source ++ (ESourceSelector *selector, ++ ESource *source); ++void e_source_selector_select_exclusive ++ (ESourceSelector *selector, ++ ESource *source); ++gboolean e_source_selector_source_is_selected ++ (ESourceSelector *selector, ++ ESource *source); ++GSList * e_source_selector_get_selection (ESourceSelector *selector); ++void e_source_selector_free_selection ++ (GSList *list); ++void e_source_selector_set_select_new ++ (ESourceSelector *selector, ++ gboolean state); ++void e_source_selector_edit_primary_selection ++ (ESourceSelector *selector); ++ESource * e_source_selector_ref_primary_selection ++ (ESourceSelector *selector); ++void e_source_selector_set_primary_selection ++ (ESourceSelector *selector, ++ ESource *source); ++ESource * e_source_selector_ref_source_by_path ++ (ESourceSelector *selector, ++ GtkTreePath *path); ++void e_source_selector_queue_write (ESourceSelector *selector, ++ ESource *source); ++ ++G_END_DECLS ++ ++#endif /* E_SOURCE_SELECTOR_H */ +-- +cgit v0.9.1 diff --git a/community/apvlv/PKGBUILD b/community/apvlv/PKGBUILD index a0bca90b3..065bf30fa 100644 --- a/community/apvlv/PKGBUILD +++ b/community/apvlv/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 79519 2012-11-06 16:27:50Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 88809 2013-04-22 20:09:44Z jsteel $ +# Maintainer: Jonathan Steel +# Contributor: Bartłomiej Piotrowski # Contributor: Brad Fanella # Contributor: Stefan Husmann # Contributor: tocer.deng pkgname=apvlv pkgver=0.1.4.20121023 -pkgrel=1 -pkgdesc='A PDF Viewer which behaves like Vim' +pkgrel=3 +pkgdesc='A PDF Viewer, which behaves like Vim' arch=('i686' 'x86_64') url="http://naihe2010.github.com/apvlv/" license=('GPL') -depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre') +depends=('gtk2' 'cairo' 'poppler-glib' 'djvulibre' 'desktop-file-utils') makedepends=('cmake' 'libwebkit') -source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('f222fc4b09b15358eb4e7f996ba810d6') +install=$pkgname.install +source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.xz + $pkgname.desktop) +backup=(etc/apvlvrc) +md5sums=('f222fc4b09b15358eb4e7f996ba810d6' + '54478fecb54f36d1c44d8fdc233ddbac') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir"/$pkgname-$pkgver mkdir -p build cd build @@ -25,11 +30,15 @@ build() { cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DAPVLV_WITH_UMD=no .. + make } package() { - cd $srcdir/$pkgname-$pkgver/build + cd "$srcdir"/$pkgname-$pkgver/build + + make DESTDIR="$pkgdir"/ install - make DESTDIR=$pkgdir/ install + install -Dm644 "$srcdir"/$pkgname.desktop \ + "$pkgdir"/usr/share/applications/$pkgname.desktop } diff --git a/community/apvlv/apvlv.desktop b/community/apvlv/apvlv.desktop new file mode 100644 index 000000000..2f6ebd398 --- /dev/null +++ b/community/apvlv/apvlv.desktop @@ -0,0 +1,17 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=apvlv +Comment=A minimalistic document viewer +Comment[de]=Ein minimalistischer Dokumenten-Betrachter +Comment[fr]=Un visionneur de document minimaliste +Comment[ru]=Минималистичный просмотрщик документов +Comment[tr]=Minimalist bir belge görüntüleyicisi +Comment[es_CL]=Un visor de documentos minimalista +Comment[uk_UA]=Легкий переглядач документів +Comment[it]=Un visualizzatore di documenti minimalista +Comment[pl]=Minimalistyczna przeglądarka dokumentów +Exec=apvlv %f +Terminal=false +Categories=Office;Viewer; +MimeType=application/pdf;application/postscript;application/eps;application/x-eps;image/eps;image/x-eps;image/vnd.djvu; diff --git a/community/apvlv/apvlv.install b/community/apvlv/apvlv.install new file mode 100644 index 000000000..5384f9c85 --- /dev/null +++ b/community/apvlv/apvlv.install @@ -0,0 +1,7 @@ +post_install() { + update-desktop-database -q +} + +post_remove() { + post_install +} diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD index 11d84fd02..b2160ddb0 100644 --- a/community/audit/PKGBUILD +++ b/community/audit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82354 2013-01-16 08:38:43Z mtorromeo $ +# $Id: PKGBUILD 88732 2013-04-22 07:51:09Z mtorromeo $ # Maintainer: Massimiliano Torromeo # Contributor: Connor Behan # Contributor: henning mueller pkgname=audit -pkgver=2.2.2 +pkgver=2.2.3 pkgrel=1 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.' url=http://people.redhat.com/sgrubb/$pkgname @@ -59,7 +59,7 @@ package() { sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf } -sha256sums=('8bc2b45a5f08f5df6cebcd5543f24b7e68e28b64da4b23f08de2c6616384302b' +sha256sums=('2fc8f97020121593f516dc011ef61f39043c4cea9b2cb9ab3849bf9e41dedf02' '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5' '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007' '6adadb405bebe99bb6a50e80e7c1a356996626e135d566283448fe4019fff3a4') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index d187b373f..c303de52b 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88411 2013-04-17 07:47:53Z faidoc $ +# $Id: PKGBUILD 88800 2013-04-22 12:29:37Z bgyorgy $ # Maintainer: Alexandre Filgueira @@ -6,23 +6,33 @@ pkgname=cinnamon-control-center pkgver=1.7.3 -pkgrel=1 +pkgrel=3 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') -depends=('cinnamon' 'cheese' 'libgtop' 'network-manager-applet') +depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet') optdepends=('mesa-demos: provides glxinfo for graphics information' 'gnome-color-manager: for color management tasks') -makedepends=('intltool' 'gnome-common' 'libgnomekbd') +makedepends=('intltool' 'gnome-common') url="https://github.com/linuxmint/cinnamon-control-center" install=cinnamon-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz") -sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" + "gnomerrlabeler.patch" + "idle-delay.patch") +sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be' + '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6' + '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') build() { cd $pkgname-$pkgver + # Build fix for GNOME 3.8 + patch -Np1 -i "$srcdir/gnomerrlabeler.patch" + + # Runtime fix for GNOME 3.8 + patch -Np1 -i "$srcdir/idle-delay.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ @@ -48,9 +58,6 @@ package() { make -C shell DESTDIR="$pkgdir" uninstall make -C shell DESTDIR="$pkgdir" install-libLTLIBRARIES - # Remove Region panel, because it's not compatible with gnome-settings-daemon 3.6 - make -C panels/region DESTDIR="$pkgdir" uninstall - # Remove broken desktop files rm -R "$pkgdir/usr/share/applications" rm -R "$pkgdir/etc" diff --git a/community/cinnamon-control-center/gnomerrlabeler.patch b/community/cinnamon-control-center/gnomerrlabeler.patch new file mode 100644 index 000000000..b763078ba --- /dev/null +++ b/community/cinnamon-control-center/gnomerrlabeler.patch @@ -0,0 +1,766 @@ +diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c +--- cinnamon-control-center-1.7.3.orig/panels/display/cc-display-panel.c 2013-04-15 16:04:38.000000000 +0200 ++++ cinnamon-control-center-1.7.3/panels/display/cc-display-panel.c 2013-04-22 03:46:53.499944701 +0200 +@@ -31,12 +31,13 @@ + #define GNOME_DESKTOP_USE_UNSTABLE_API + #include + #include +-#include + #include + #include + #include + #include + ++#include "cc-rr-labeler.h" ++ + CC_PANEL_REGISTER (CcDisplayPanel, cc_display_panel) + + #define DISPLAY_PANEL_PRIVATE(o) \ +@@ -75,7 +76,7 @@ + { + GnomeRRScreen *screen; + GnomeRRConfig *current_configuration; +- GnomeRRLabeler *labeler; ++ CcRRLabeler *labeler; + GnomeRROutputInfo *current_output; + + GSettings *clock_settings; +@@ -200,7 +201,7 @@ + g_signal_handler_disconnect (GTK_WIDGET (self), self->priv->focus_id_hide); + } + +- gnome_rr_labeler_hide (self->priv->labeler); ++ cc_rr_labeler_hide (self->priv->labeler); + g_object_unref (self->priv->labeler); + + G_OBJECT_CLASS (cc_display_panel_parent_class)->finalize (object); +@@ -293,16 +294,16 @@ + self->priv->current_output = NULL; + + if (self->priv->labeler) { +- gnome_rr_labeler_hide (self->priv->labeler); ++ cc_rr_labeler_hide (self->priv->labeler); + g_object_unref (self->priv->labeler); + } + +- self->priv->labeler = gnome_rr_labeler_new (self->priv->current_configuration); ++ self->priv->labeler = cc_rr_labeler_new (self->priv->current_configuration); + + if (cc_panel_get_shell (CC_PANEL (self)) == NULL) +- gnome_rr_labeler_hide (self->priv->labeler); ++ cc_rr_labeler_hide (self->priv->labeler); + else +- gnome_rr_labeler_show (self->priv->labeler); ++ cc_rr_labeler_show (self->priv->labeler); + + select_current_output_from_dialog_position (self); + +@@ -2594,9 +2595,9 @@ + if (self->priv->labeler == NULL) + return; + if (gtk_window_has_toplevel_focus (window)) +- gnome_rr_labeler_show (self->priv->labeler); ++ cc_rr_labeler_show (self->priv->labeler); + else +- gnome_rr_labeler_hide (self->priv->labeler); ++ cc_rr_labeler_hide (self->priv->labeler); + } + + static void +@@ -2606,9 +2607,9 @@ + if (CC_DISPLAY_PANEL(widget)->priv->labeler == NULL) + return; + if (gtk_widget_get_visible (widget)) { +- gnome_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); ++ cc_rr_labeler_show (CC_DISPLAY_PANEL (widget)->priv->labeler); + } else { +- gnome_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); ++ cc_rr_labeler_hide (CC_DISPLAY_PANEL (widget)->priv->labeler); + } + } + +diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c +--- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.c 1970-01-01 01:00:00.000000000 +0100 ++++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.c 2013-04-22 03:42:12.379900127 +0200 +@@ -0,0 +1,601 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- ++ * ++ * cc-rr-labeler.c - Utility to label monitors to identify them ++ * while they are being configured. ++ * ++ * Copyright 2008, Novell, Inc. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library 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 ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ * Author: Federico Mena-Quintero ++ */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#include "cc-rr-labeler.h" ++ ++struct _CcRRLabelerPrivate { ++ GnomeRRConfig *config; ++ ++ int num_outputs; ++ ++ GdkRGBA *palette; ++ GtkWidget **windows; ++ ++ GdkScreen *screen; ++ Atom workarea_atom; ++}; ++ ++enum { ++ PROP_0, ++ PROP_CONFIG, ++ PROP_LAST ++}; ++ ++G_DEFINE_TYPE (CcRRLabeler, cc_rr_labeler, G_TYPE_OBJECT); ++ ++static void cc_rr_labeler_finalize (GObject *object); ++static void setup_from_config (CcRRLabeler *labeler); ++ ++static GdkFilterReturn ++screen_xevent_filter (GdkXEvent *xevent, ++ GdkEvent *event, ++ CcRRLabeler *labeler) ++{ ++ XEvent *xev; ++ ++ xev = (XEvent *) xevent; ++ ++ if (xev->type == PropertyNotify && ++ xev->xproperty.atom == labeler->priv->workarea_atom) { ++ /* update label positions */ ++ if (labeler->priv->windows != NULL) { ++ cc_rr_labeler_hide (labeler); ++ cc_rr_labeler_show (labeler); ++ } ++ } ++ ++ return GDK_FILTER_CONTINUE; ++} ++ ++static void ++cc_rr_labeler_init (CcRRLabeler *labeler) ++{ ++ GdkWindow *gdkwindow; ++ ++ labeler->priv = G_TYPE_INSTANCE_GET_PRIVATE (labeler, GNOME_TYPE_RR_LABELER, CcRRLabelerPrivate); ++ ++ labeler->priv->workarea_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), ++ "_NET_WORKAREA", ++ True); ++ ++ labeler->priv->screen = gdk_screen_get_default (); ++ /* code is not really designed to handle multiple screens so *shrug* */ ++ gdkwindow = gdk_screen_get_root_window (labeler->priv->screen); ++ gdk_window_add_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler); ++ gdk_window_set_events (gdkwindow, gdk_window_get_events (gdkwindow) | GDK_PROPERTY_CHANGE_MASK); ++} ++ ++static void ++cc_rr_labeler_set_property (GObject *gobject, guint property_id, const GValue *value, GParamSpec *param_spec) ++{ ++ CcRRLabeler *self = CC_RR_LABELER (gobject); ++ ++ switch (property_id) { ++ case PROP_CONFIG: ++ self->priv->config = GNOME_RR_CONFIG (g_value_dup_object (value)); ++ return; ++ default: ++ G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, property_id, param_spec); ++ } ++} ++ ++static GObject * ++cc_rr_labeler_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_properties) ++{ ++ CcRRLabeler *self = (CcRRLabeler*) G_OBJECT_CLASS (cc_rr_labeler_parent_class)->constructor (type, n_construct_properties, construct_properties); ++ ++ setup_from_config (self); ++ ++ return (GObject*) self; ++} ++ ++static void ++cc_rr_labeler_class_init (CcRRLabelerClass *klass) ++{ ++ GObjectClass *object_class; ++ ++ g_type_class_add_private (klass, sizeof (CcRRLabelerPrivate)); ++ ++ object_class = (GObjectClass *) klass; ++ ++ object_class->set_property = cc_rr_labeler_set_property; ++ object_class->finalize = cc_rr_labeler_finalize; ++ object_class->constructor = cc_rr_labeler_constructor; ++ ++ g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_object ("config", ++ "Configuration", ++ "RandR configuration to label", ++ GNOME_TYPE_RR_CONFIG, ++ G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | ++ G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)); ++} ++ ++static void ++cc_rr_labeler_finalize (GObject *object) ++{ ++ CcRRLabeler *labeler; ++ GdkWindow *gdkwindow; ++ ++ labeler = CC_RR_LABELER (object); ++ ++ gdkwindow = gdk_screen_get_root_window (labeler->priv->screen); ++ gdk_window_remove_filter (gdkwindow, (GdkFilterFunc) screen_xevent_filter, labeler); ++ ++ if (labeler->priv->config != NULL) { ++ g_object_unref (labeler->priv->config); ++ } ++ ++ if (labeler->priv->windows != NULL) { ++ cc_rr_labeler_hide (labeler); ++ g_free (labeler->priv->windows); ++ } ++ ++ g_free (labeler->priv->palette); ++ ++ G_OBJECT_CLASS (cc_rr_labeler_parent_class)->finalize (object); ++} ++ ++static int ++count_outputs (GnomeRRConfig *config) ++{ ++ int i; ++ GnomeRROutputInfo **outputs = gnome_rr_config_get_outputs (config); ++ ++ for (i = 0; outputs[i] != NULL; i++) ++ ; ++ ++ return i; ++} ++ ++static void ++make_palette (CcRRLabeler *labeler) ++{ ++ /* The idea is that we go around an hue color wheel. We want to start ++ * at red, go around to green/etc. and stop at blue --- because magenta ++ * is evil. Eeeeek, no magenta, please! ++ * ++ * Purple would be nice, though. Remember that we are watered down ++ * (i.e. low saturation), so that would be like Like berries with cream. ++ * Mmmmm, berries. ++ */ ++ double start_hue; ++ double end_hue; ++ int i; ++ ++ g_assert (labeler->priv->num_outputs > 0); ++ ++ labeler->priv->palette = g_new (GdkRGBA, labeler->priv->num_outputs); ++ ++ start_hue = 0.0; /* red */ ++ end_hue = 2.0/3; /* blue */ ++ ++ for (i = 0; i < labeler->priv->num_outputs; i++) { ++ double h, s, v; ++ double r, g, b; ++ ++ h = start_hue + (end_hue - start_hue) / labeler->priv->num_outputs * i; ++ s = 1.0 / 3; ++ v = 1.0; ++ ++ gtk_hsv_to_rgb (h, s, v, &r, &g, &b); ++ ++ labeler->priv->palette[i].red = r; ++ labeler->priv->palette[i].green = g; ++ labeler->priv->palette[i].blue = b; ++ labeler->priv->palette[i].alpha = 1.0; ++ } ++} ++ ++static void ++rounded_rectangle (cairo_t *cr, ++ gint x, ++ gint y, ++ gint width, ++ gint height, ++ gint x_radius, ++ gint y_radius) ++{ ++ gint x1, x2; ++ gint y1, y2; ++ gint xr1, xr2; ++ gint yr1, yr2; ++ ++ x1 = x; ++ x2 = x1 + width; ++ y1 = y; ++ y2 = y1 + height; ++ ++ x_radius = MIN (x_radius, width / 2.0); ++ y_radius = MIN (y_radius, width / 2.0); ++ ++ xr1 = x_radius; ++ xr2 = x_radius / 2.0; ++ yr1 = y_radius; ++ yr2 = y_radius / 2.0; ++ ++ cairo_move_to (cr, x1 + xr1, y1); ++ cairo_line_to (cr, x2 - xr1, y1); ++ cairo_curve_to (cr, x2 - xr2, y1, x2, y1 + yr2, x2, y1 + yr1); ++ cairo_line_to (cr, x2, y2 - yr1); ++ cairo_curve_to (cr, x2, y2 - yr2, x2 - xr2, y2, x2 - xr1, y2); ++ cairo_line_to (cr, x1 + xr1, y2); ++ cairo_curve_to (cr, x1 + xr2, y2, x1, y2 - yr2, x1, y2 - yr1); ++ cairo_line_to (cr, x1, y1 + yr1); ++ cairo_curve_to (cr, x1, y1 + yr2, x1 + xr2, y1, x1 + xr1, y1); ++ cairo_close_path (cr); ++} ++ ++#define LABEL_WINDOW_EDGE_THICKNESS 2 ++#define LABEL_WINDOW_PADDING 12 ++/* Look for panel-corner in: ++ * http://git.gnome.org/browse/gnome-shell/tree/data/theme/gnome-shell.css ++ * to match the corner radius */ ++#define LABEL_CORNER_RADIUS 6 + LABEL_WINDOW_EDGE_THICKNESS ++ ++static void ++label_draw_background_and_frame (GtkWidget *widget, cairo_t *cr, gboolean for_shape) ++{ ++ GdkRGBA shape_color = { 0, 0, 0, 1 }; ++ GdkRGBA *rgba; ++ GtkAllocation allocation; ++ ++ rgba = g_object_get_data (G_OBJECT (widget), "rgba"); ++ gtk_widget_get_allocation (widget, &allocation); ++ ++ cairo_save (cr); ++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); ++ ++ /* edge outline */ ++ if (for_shape) ++ gdk_cairo_set_source_rgba (cr, &shape_color); ++ else ++ cairo_set_source_rgba (cr, 0, 0, 0, 0.5); ++ ++ rounded_rectangle (cr, ++ LABEL_WINDOW_EDGE_THICKNESS / 2.0, ++ LABEL_WINDOW_EDGE_THICKNESS / 2.0, ++ allocation.width - LABEL_WINDOW_EDGE_THICKNESS, ++ allocation.height - LABEL_WINDOW_EDGE_THICKNESS, ++ LABEL_CORNER_RADIUS, LABEL_CORNER_RADIUS); ++ cairo_set_line_width (cr, LABEL_WINDOW_EDGE_THICKNESS); ++ cairo_stroke (cr); ++ ++ /* fill */ ++ if (for_shape) { ++ gdk_cairo_set_source_rgba (cr, &shape_color); ++ } else { ++ rgba->alpha = 0.75; ++ gdk_cairo_set_source_rgba (cr, rgba); ++ } ++ ++ rounded_rectangle (cr, ++ LABEL_WINDOW_EDGE_THICKNESS, ++ LABEL_WINDOW_EDGE_THICKNESS, ++ allocation.width - LABEL_WINDOW_EDGE_THICKNESS * 2, ++ allocation.height - LABEL_WINDOW_EDGE_THICKNESS * 2, ++ LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0, ++ LABEL_CORNER_RADIUS - LABEL_WINDOW_EDGE_THICKNESS / 2.0); ++ cairo_fill (cr); ++ ++ cairo_restore (cr); ++} ++ ++static void ++maybe_update_shape (GtkWidget *widget) ++{ ++ cairo_t *cr; ++ cairo_surface_t *surface; ++ cairo_region_t *region; ++ ++ /* fallback to XShape only for non-composited clients */ ++ if (gtk_widget_is_composited (widget)) { ++ gtk_widget_shape_combine_region (widget, NULL); ++ return; ++ } ++ ++ surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget), ++ CAIRO_CONTENT_COLOR_ALPHA, ++ gtk_widget_get_allocated_width (widget), ++ gtk_widget_get_allocated_height (widget)); ++ ++ cr = cairo_create (surface); ++ label_draw_background_and_frame (widget, cr, TRUE); ++ cairo_destroy (cr); ++ ++ region = gdk_cairo_region_create_from_surface (surface); ++ gtk_widget_shape_combine_region (widget, region); ++ ++ cairo_surface_destroy (surface); ++ cairo_region_destroy (region); ++} ++ ++static gboolean ++label_window_draw_event_cb (GtkWidget *widget, cairo_t *cr, gpointer data) ++{ ++ if (gtk_widget_is_composited (widget)) { ++ /* clear any content */ ++ cairo_save (cr); ++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); ++ cairo_set_source_rgba (cr, 0, 0, 0, 0); ++ cairo_paint (cr); ++ cairo_restore (cr); ++ } ++ ++ maybe_update_shape (widget); ++ label_draw_background_and_frame (widget, cr, FALSE); ++ ++ return FALSE; ++} ++ ++static void ++position_window (CcRRLabeler *labeler, ++ GtkWidget *window, ++ int x, ++ int y) ++{ ++ GdkRectangle workarea; ++ GdkRectangle monitor; ++ int monitor_num; ++ ++ monitor_num = gdk_screen_get_monitor_at_point (labeler->priv->screen, x, y); ++ gdk_screen_get_monitor_workarea (labeler->priv->screen, monitor_num, &workarea); ++ gdk_screen_get_monitor_geometry (labeler->priv->screen, ++ monitor_num, ++ &monitor); ++ gdk_rectangle_intersect (&monitor, &workarea, &workarea); ++ ++ gtk_window_move (GTK_WINDOW (window), workarea.x, workarea.y); ++} ++ ++static void ++label_window_realize_cb (GtkWidget *widget) ++{ ++ cairo_region_t *region; ++ ++ /* make the whole window ignore events */ ++ region = cairo_region_create (); ++ gtk_widget_input_shape_combine_region (widget, region); ++ cairo_region_destroy (region); ++ ++ maybe_update_shape (widget); ++} ++ ++static void ++label_window_composited_changed_cb (GtkWidget *widget, CcRRLabeler *labeler) ++{ ++ if (gtk_widget_get_realized (widget)) ++ maybe_update_shape (widget); ++} ++ ++static GtkWidget * ++create_label_window (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba) ++{ ++ GtkWidget *window; ++ GtkWidget *widget; ++ char *str; ++ const char *display_name; ++ GdkRGBA black = { 0, 0, 0, 1.0 }; ++ int x, y; ++ GdkScreen *screen; ++ GdkVisual *visual; ++ ++ window = gtk_window_new (GTK_WINDOW_POPUP); ++ gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_TOOLTIP); ++ gtk_window_set_resizable (GTK_WINDOW (window), FALSE); ++ gtk_widget_set_app_paintable (window, TRUE); ++ screen = gtk_widget_get_screen (window); ++ visual = gdk_screen_get_rgba_visual (screen); ++ ++ if (visual != NULL) ++ gtk_widget_set_visual (window, visual); ++ ++ gtk_container_set_border_width (GTK_CONTAINER (window), LABEL_WINDOW_PADDING + LABEL_WINDOW_EDGE_THICKNESS); ++ ++ /* This is semi-dangerous. The color is part of the labeler->palette ++ * array. Note that in cc_rr_labeler_finalize(), we are careful to ++ * free the palette only after we free the windows. ++ */ ++ g_object_set_data (G_OBJECT (window), "rgba", rgba); ++ ++ g_signal_connect (window, "draw", ++ G_CALLBACK (label_window_draw_event_cb), labeler); ++ g_signal_connect (window, "realize", ++ G_CALLBACK (label_window_realize_cb), labeler); ++ g_signal_connect (window, "composited-changed", ++ G_CALLBACK (label_window_composited_changed_cb), labeler); ++ ++ if (gnome_rr_config_get_clone (labeler->priv->config)) { ++ /* Keep this string in sync with gnome-control-center/capplets/display/xrandr-capplet.c:get_display_name() */ ++ ++ /* Translators: this is the feature where what you see on your ++ * laptop's screen is the same as your external projector. ++ * Here, "Mirrored" is being used as an adjective. For example, ++ * the Spanish translation could be "Pantallas en Espejo". ++ */ ++ display_name = _("Mirrored Displays"); ++ } else ++ display_name = gnome_rr_output_info_get_display_name (output); ++ ++ str = g_strdup_printf ("%s", display_name); ++ widget = gtk_label_new (NULL); ++ gtk_label_set_markup (GTK_LABEL (widget), str); ++ g_free (str); ++ ++ /* Make the label explicitly black. We don't want it to follow the ++ * theme's colors, since the label is always shown against a light ++ * pastel background. See bgo#556050 ++ */ ++ gtk_widget_override_color (widget, ++ gtk_widget_get_state_flags (widget), ++ &black); ++ ++ gtk_container_add (GTK_CONTAINER (window), widget); ++ ++ /* Should we center this at the top edge of the monitor, instead of using the upper-left corner? */ ++ gnome_rr_output_info_get_geometry (output, &x, &y, NULL, NULL); ++ position_window (labeler, window, x, y); ++ ++ gtk_widget_show_all (window); ++ ++ return window; ++} ++ ++static void ++setup_from_config (CcRRLabeler *labeler) ++{ ++ labeler->priv->num_outputs = count_outputs (labeler->priv->config); ++ ++ make_palette (labeler); ++ ++ cc_rr_labeler_show (labeler); ++} ++ ++/** ++ * cc_rr_labeler_new: ++ * @config: Configuration of the screens to label ++ * ++ * Create a GUI element that will display colored labels on each connected monitor. ++ * This is useful when users are required to identify which monitor is which, e.g. for ++ * for configuring multiple monitors. ++ * The labels will be shown by default, use cc_rr_labeler_hide to hide them. ++ * ++ * Returns: A new #CcRRLabeler ++ */ ++CcRRLabeler * ++cc_rr_labeler_new (GnomeRRConfig *config) ++{ ++ g_return_val_if_fail (GNOME_IS_RR_CONFIG (config), NULL); ++ ++ return g_object_new (GNOME_TYPE_RR_LABELER, "config", config, NULL); ++} ++ ++/** ++ * cc_rr_labeler_show: ++ * @labeler: A #CcRRLabeler ++ * ++ * Show the labels. ++ */ ++void ++cc_rr_labeler_show (CcRRLabeler *labeler) ++{ ++ int i; ++ gboolean created_window_for_clone; ++ GnomeRROutputInfo **outputs; ++ ++ g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); ++ ++ if (labeler->priv->windows != NULL) ++ return; ++ ++ labeler->priv->windows = g_new (GtkWidget *, labeler->priv->num_outputs); ++ ++ created_window_for_clone = FALSE; ++ ++ outputs = gnome_rr_config_get_outputs (labeler->priv->config); ++ ++ for (i = 0; i < labeler->priv->num_outputs; i++) { ++ if (!created_window_for_clone && gnome_rr_output_info_is_active (outputs[i])) { ++ labeler->priv->windows[i] = create_label_window (labeler, outputs[i], labeler->priv->palette + i); ++ ++ if (gnome_rr_config_get_clone (labeler->priv->config)) ++ created_window_for_clone = TRUE; ++ } else ++ labeler->priv->windows[i] = NULL; ++ } ++} ++ ++/** ++ * cc_rr_labeler_hide: ++ * @labeler: A #CcRRLabeler ++ * ++ * Hide ouput labels. ++ */ ++void ++cc_rr_labeler_hide (CcRRLabeler *labeler) ++{ ++ int i; ++ CcRRLabelerPrivate *priv; ++ ++ g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); ++ ++ priv = labeler->priv; ++ ++ if (priv->windows == NULL) ++ return; ++ ++ for (i = 0; i < priv->num_outputs; i++) ++ if (priv->windows[i] != NULL) { ++ gtk_widget_destroy (priv->windows[i]); ++ priv->windows[i] = NULL; ++ } ++ g_free (priv->windows); ++ priv->windows = NULL; ++} ++ ++/** ++ * cc_rr_labeler_get_rgba_for_output: ++ * @labeler: A #CcRRLabeler ++ * @output: Output device (i.e. monitor) to query ++ * @rgba_out: (out): Color of selected monitor. ++ * ++ * Get the color used for the label on a given output (monitor). ++ */ ++void ++cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out) ++{ ++ int i; ++ GnomeRROutputInfo **outputs; ++ ++ g_return_if_fail (GNOME_IS_RR_LABELER (labeler)); ++ g_return_if_fail (GNOME_IS_RR_OUTPUT_INFO (output)); ++ g_return_if_fail (rgba_out != NULL); ++ ++ outputs = gnome_rr_config_get_outputs (labeler->priv->config); ++ ++ for (i = 0; i < labeler->priv->num_outputs; i++) ++ if (outputs[i] == output) { ++ *rgba_out = labeler->priv->palette[i]; ++ return; ++ } ++ ++ g_warning ("trying to get the color for unknown GnomeOutputInfo %p; returning magenta!", output); ++ ++ rgba_out->red = 1.0; ++ rgba_out->green = 0; ++ rgba_out->blue = 1.0; ++ rgba_out->alpha = 1.0; ++} +diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h +--- cinnamon-control-center-1.7.3.orig/panels/display/cc-rr-labeler.h 1970-01-01 01:00:00.000000000 +0100 ++++ cinnamon-control-center-1.7.3/panels/display/cc-rr-labeler.h 2013-04-22 03:42:12.383233540 +0200 +@@ -0,0 +1,64 @@ ++/* gnome-rr-labeler.h - Utility to label monitors to identify them ++ * while they are being configured. ++ * ++ * Copyright 2008, Novell, Inc. ++ * ++ * This file is part of the Gnome Library. ++ * ++ * The Gnome Library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Library General Public License as ++ * published by the Free Software Foundation; either version 2 of the ++ * License, or (at your option) any later version. ++ * ++ * The Gnome Library 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 ++ * Library General Public License for more details. ++ * ++ * You should have received a copy of the GNU Library General Public ++ * License along with the Gnome Library; see the file COPYING.LIB. If not, ++ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301, USA. ++ * ++ * Author: Federico Mena-Quintero ++ */ ++ ++#ifndef CC_RR_LABELER_H ++#define CC_RR_LABELER_H ++ ++#define GNOME_DESKTOP_USE_UNSTABLE_API ++#include ++ ++#define GNOME_TYPE_RR_LABELER (cc_rr_labeler_get_type ()) ++#define CC_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GNOME_TYPE_RR_LABELER, CcRRLabeler)) ++#define CC_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GNOME_TYPE_RR_LABELER, CcRRLabelerClass)) ++#define GNOME_IS_RR_LABELER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GNOME_TYPE_RR_LABELER)) ++#define GNOME_IS_RR_LABELER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_RR_LABELER)) ++#define CC_RR_LABELER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GNOME_TYPE_RR_LABELER, CcRRLabelerClass)) ++ ++typedef struct _CcRRLabeler CcRRLabeler; ++typedef struct _CcRRLabelerClass CcRRLabelerClass; ++typedef struct _CcRRLabelerPrivate CcRRLabelerPrivate; ++ ++struct _CcRRLabeler { ++ GObject parent; ++ ++ /*< private >*/ ++ CcRRLabelerPrivate *priv; ++}; ++ ++struct _CcRRLabelerClass { ++ GObjectClass parent_class; ++}; ++ ++GType cc_rr_labeler_get_type (void); ++ ++CcRRLabeler *cc_rr_labeler_new (GnomeRRConfig *config); ++ ++void cc_rr_labeler_show (CcRRLabeler *labeler); ++ ++void cc_rr_labeler_hide (CcRRLabeler *labeler); ++ ++void cc_rr_labeler_get_rgba_for_output (CcRRLabeler *labeler, GnomeRROutputInfo *output, GdkRGBA *rgba_out); ++ ++#endif +diff -Naur cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am cinnamon-control-center-1.7.3/panels/display/Makefile.am +--- cinnamon-control-center-1.7.3.orig/panels/display/Makefile.am 2013-04-15 16:04:38.000000000 +0200 ++++ cinnamon-control-center-1.7.3/panels/display/Makefile.am 2013-04-22 03:42:12.376566715 +0200 +@@ -19,6 +19,8 @@ + display-module.c \ + cc-display-panel.c \ + cc-display-panel.h \ ++ cc-rr-labeler.c \ ++ cc-rr-labeler.h \ + scrollarea.c \ + scrollarea.h \ + $(MARSHALFILES) diff --git a/community/cinnamon-control-center/idle-delay.patch b/community/cinnamon-control-center/idle-delay.patch new file mode 100644 index 000000000..7434018f5 --- /dev/null +++ b/community/cinnamon-control-center/idle-delay.patch @@ -0,0 +1,71 @@ +diff -Naur cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c +--- cinnamon-control-center-1.7.3.orig/panels/power/cc-power-panel.c 2013-04-15 16:04:38.000000000 +0200 ++++ cinnamon-control-center-1.7.3/panels/power/cc-power-panel.c 2013-04-22 05:04:26.466092668 +0200 +@@ -1068,26 +1068,6 @@ + G_CALLBACK (combo_enum_changed_cb), + self); + +- value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-ac-action"); +- widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, +- "combobox_lid_ac")); +- disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget)); +- set_value_for_combo (GTK_COMBO_BOX (widget), value); +- g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-ac-action"); +- g_signal_connect (widget, "changed", +- G_CALLBACK (combo_enum_changed_cb), +- self); +- +- value = g_settings_get_enum (self->priv->gsd_settings, "lid-close-battery-action"); +- widget = GTK_WIDGET (gtk_builder_get_object (self->priv->builder, +- "combobox_lid_battery")); +- disable_unavailable_combo_items (self, GTK_COMBO_BOX (widget)); +- set_value_for_combo (GTK_COMBO_BOX (widget), value); +- g_object_set_data (G_OBJECT(widget), "_gsettings_key", "lid-close-battery-action"); +- g_signal_connect (widget, "changed", +- G_CALLBACK (combo_enum_changed_cb), +- self); +- + widget = WID (self->priv->builder, "vbox_power"); + gtk_widget_reparent (widget, (GtkWidget *) self); + +diff -Naur cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c +--- cinnamon-control-center-1.7.3.orig/panels/screen/cc-screen-panel.c 2013-04-15 16:04:38.000000000 +0200 ++++ cinnamon-control-center-1.7.3/panels/screen/cc-screen-panel.c 2013-04-22 14:15:28.440488342 +0200 +@@ -351,10 +351,6 @@ + 1, &value, + -1); + +- /* set both battery and ac keys */ +- g_settings_set_int (self->priv->gsd_settings, "sleep-display-ac", value); +- g_settings_set_int (self->priv->gsd_settings, "sleep-display-battery", value); +- + set_idle_delay_from_dpms (self, value); + } + +@@ -384,7 +380,7 @@ + { + GtkTreeIter iter; + GtkTreeModel *model; +- gint value; ++ guint value; + gint value_tmp, value_prev; + gboolean ret; + guint i; +@@ -399,7 +395,7 @@ + i = 0; + + /* try to make the UI match the AC setting */ +- value = g_settings_get_int (self->priv->gsd_settings, "sleep-display-ac"); ++ g_settings_get (self->priv->session_settings, "idle-delay", "u", &value); + do + { + gtk_tree_model_get (model, &iter, +@@ -510,7 +506,7 @@ + /* bind the auto dim checkbox */ + widget = WID ("screen_auto_reduce_checkbutton"); + g_settings_bind (self->priv->gsd_settings, +- "idle-dim-battery", ++ "idle-dim", + widget, "active", + G_SETTINGS_BIND_DEFAULT); + diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD index ae1e35a1e..6b80d2ca0 100644 --- a/community/cinnamon-screensaver/PKGBUILD +++ b/community/cinnamon-screensaver/PKGBUILD @@ -5,7 +5,7 @@ pkgname=cinnamon-screensaver pkgver=1.7.1 -pkgrel=5 +pkgrel=6 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." arch=('i686' 'x86_64') license=('GPL') @@ -18,26 +18,19 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensav cinnamon-screensaver.desktop cinnamon2d-screensaver.desktop cinnamon-screensaver.pam - gnome-autogen.sh configure.patch fix-dbus-compatibility.patch) - sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1' '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa' '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a' - '99457b683c2e766a8c09a75ca906e3e00db6d294bb204a2e7a2a05c2e6b1d77e' - '827276b01e658afb8045fb0dcbebb54f679ef47dac482f4399e1839369277ccc' + 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' 'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a' - '9013004395a401e99ce6685abb8319eb1e9ddd888c4fa6a7e45729fb93d285d1') + '50fa77bafc666f1aa32945a6d06d4e7c5e50bce1d98738de74075fb634cf6197') build() { cd $pkgname-$pkgver - cp ${srcdir}/gnome-autogen.sh . - sed -i 's/\ --warn-all\ --warn-error//' src/Makefile.am - sed -i 's/gnome-autogen.sh/.\/gnome-autogen.sh/g' autogen.sh - chmod +x gnome-autogen.sh - + # Fix build with automake 1.13 patch -uNp2 -r- -i ${srcdir}/configure.patch # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes @@ -47,7 +40,6 @@ build() { --libexecdir=/usr/lib/cinnamon-screensaver \ --localstatedir=/var \ --with-mit-ext --with-systemd - make } diff --git a/community/cinnamon-screensaver/cinnamon-screensaver.pam b/community/cinnamon-screensaver/cinnamon-screensaver.pam index fd8d42d03..8d3baf085 100644 --- a/community/cinnamon-screensaver/cinnamon-screensaver.pam +++ b/community/cinnamon-screensaver/cinnamon-screensaver.pam @@ -1,3 +1,3 @@ #%PAM-1.0 -auth required pam_unix_auth.so nullok +auth substack system-login -auth optional pam_gnome_keyring.so diff --git a/community/cinnamon-screensaver/fix-dbus-compatibility.patch b/community/cinnamon-screensaver/fix-dbus-compatibility.patch index fa53f6fac..d4c27a0b1 100644 --- a/community/cinnamon-screensaver/fix-dbus-compatibility.patch +++ b/community/cinnamon-screensaver/fix-dbus-compatibility.patch @@ -1,8 +1,20 @@ +From e43385126cf6f5187f98f940b8c04c3e99202b0b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +Date: Thu, 28 Feb 2013 05:45:12 +0100 +Subject: [PATCH 1/4] Fix crashing and compatibility with gnome-screensaver's + D-Bus interface + +--- + src/cinnamon-screensaver-command.c | 4 ++-- + src/gs-listener-dbus.c | 10 ++++++++-- + src/gs-manager.c | 14 +++++++++++--- + 3 files changed, 21 insertions(+), 7 deletions(-) + diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c index 4267bd0..5c90916 100644 --- a/src/cinnamon-screensaver-command.c +++ b/src/cinnamon-screensaver-command.c -@@ -311,11 +311,11 @@ do_command (GDBusConnection *connection) +@@ -311,11 +311,11 @@ if (do_lock) { if (g_strcmp0 (away_message, "DEFAULT") == 0) { @@ -20,7 +32,7 @@ diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c index 2a98aee..6dbf12d 100644 --- a/src/gs-listener-dbus.c +++ b/src/gs-listener-dbus.c -@@ -653,6 +653,8 @@ do_introspect (DBusConnection *connection, +@@ -653,6 +653,8 @@ enum { xml = g_string_append (xml, " \n" " \n" @@ -29,7 +41,7 @@ index 2a98aee..6dbf12d 100644 " \n" " \n" " \n" -@@ -744,6 +746,10 @@ listener_dbus_handle_session_message (DBusConnection *connection, +@@ -744,6 +746,10 @@ enum { g_return_val_if_fail (message != NULL, DBUS_HANDLER_RESULT_NOT_YET_HANDLED); if (dbus_message_is_method_call (message, GS_SERVICE, "Lock")) { @@ -40,7 +52,7 @@ index 2a98aee..6dbf12d 100644 return listener_lock (listener, connection, message); } if (dbus_message_is_method_call (message, GS_SERVICE, "Quit")) { -@@ -906,7 +912,7 @@ listener_dbus_handle_system_message (DBusConnection *connection, +@@ -906,7 +912,7 @@ enum { } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_SESSION_INTERFACE, "Lock")) { if (_listener_message_path_is_our_session (listener, message)) { gs_debug ("systemd requested session lock"); @@ -49,7 +61,7 @@ index 2a98aee..6dbf12d 100644 } return DBUS_HANDLER_RESULT_HANDLED; -@@ -948,7 +954,7 @@ listener_dbus_handle_system_message (DBusConnection *connection, +@@ -948,7 +954,7 @@ enum { } else if (dbus_message_is_signal (message, CK_SESSION_INTERFACE, "Lock")) { if (_listener_message_path_is_our_session (listener, message)) { gs_debug ("ConsoleKit requested session lock"); @@ -62,7 +74,7 @@ diff --git a/src/gs-manager.c b/src/gs-manager.c index 1544921..bc09cb9 100644 --- a/src/gs-manager.c +++ b/src/gs-manager.c -@@ -1275,10 +1275,18 @@ void +@@ -1275,10 +1275,18 @@ enum { gs_manager_set_away_message (GSManager *manager, const char *message) { @@ -84,3 +96,224 @@ index 1544921..bc09cb9 100644 for (l = manager->priv->windows; l; l = l->next) { gs_window_set_away_message (l->data, manager->priv->away_message); } +-- +1.8.1.6 + + +From 4db01451afbb246213f483805f81a77c4c7371a3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +Date: Fri, 1 Mar 2013 05:17:46 +0100 +Subject: [PATCH 2/4] Update dbus document with the new LockMessage method + +--- + doc/dbus-interface.html | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/doc/dbus-interface.html b/doc/dbus-interface.html +index faff26c..c9f95ba 100644 +--- a/doc/dbus-interface.html ++++ b/doc/dbus-interface.html +@@ -2,6 +2,8 @@ +
+

Version 1.7.1

Table of Contents

1. DBUS Interface
Introduction
Methods
+ Lock ++
++ LockMessage +
+ Cycle +
+@@ -30,6 +32,8 @@ + AuthenticationRequestEnd +
Examples

Chapter1.DBUS Interface

Table of Contents

Introduction
Methods
+ Lock ++
++ LockMessage +
+ Cycle +
+@@ -70,7 +74,11 @@ + Lock +

+ Request that the screen be locked. +-

++

++ LockMessage ++

++ Request that the screen be locked, and set an away message. ++

DirectionTypeDescription
instringthe away message

+ Cycle +

+ Request that the screen saver theme be restarted and, if applicable, +-- +1.8.1.6 + + +From 7141e8ce04921ab6d46648cba20c691b8d8f8e0b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +Date: Sat, 2 Mar 2013 08:11:45 +0100 +Subject: [PATCH 3/4] Revert "Fixed away_message shown as "(null)" (using a + prefix to explicitly mark custom away messages)" + +This reverts commit bf1f42b9f9a673091b0f7bf1118781b2d95c88fd. +--- + src/cinnamon-screensaver-command.c | 9 +------- + src/gs-window-x11.c | 43 ++++++++++++-------------------------- + 2 files changed, 14 insertions(+), 38 deletions(-) + +diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c +index 5c90916..dbcac8a 100644 +--- a/src/cinnamon-screensaver-command.c ++++ b/src/cinnamon-screensaver-command.c +@@ -310,14 +310,7 @@ + } + + if (do_lock) { +- if (g_strcmp0 (away_message, "DEFAULT") == 0) { +- reply = screensaver_send_message_string (connection, "LockMessage", away_message); +- } +- else { +- gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message); +- reply = screensaver_send_message_string (connection, "LockMessage", custom_message); +- g_free (custom_message); +- } ++ reply = screensaver_send_message_string (connection, "LockMessage", away_message); + if (reply == NULL) { + g_message ("Did not receive a reply from the screensaver."); + goto done; +diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c +index 6858509..0e3bb6f 100644 +--- a/src/gs-window-x11.c ++++ b/src/gs-window-x11.c +@@ -2132,38 +2132,21 @@ enum { + return utf8_name; + } + +-static gchar * +-str_replace(const char *string, const char *delimiter, const char *replacement) +-{ +- gchar **split; +- gchar *ret; +- g_return_val_if_fail(string != NULL, NULL); +- g_return_val_if_fail(delimiter != NULL, NULL); +- g_return_val_if_fail(replacement != NULL, NULL); +- split = g_strsplit(string, delimiter, 0); +- ret = g_strjoinv(replacement, split); +- g_strfreev(split); +- return ret; +-} +- + static void + update_clock (GSWindow *window) +-{ +- char *markup; +- char *away_message; +- +- if (window->priv->away_message != NULL && g_str_has_prefix (window->priv->away_message, "CUSTOM###") && g_strcmp0(window->priv->away_message, "") != 0) { +- away_message = str_replace(window->priv->away_message, "CUSTOM###", ""); +- away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), away_message); +- } +- else { +- away_message = g_strdup_printf (_("%s"), window->priv->default_message); +- } +- +- markup = g_strdup_printf ("%s\n%s", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message); +- gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup); +- g_free (markup); +- g_free (away_message); ++{ ++ char *markup; ++ char *away_message; ++ if (g_strcmp0(window->priv->away_message, "DEFAULT") == 0 || g_strcmp0(window->priv->away_message, "") == 0) { ++ away_message = g_strdup_printf (_("%s"), window->priv->default_message); ++ } ++ else { ++ away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), window->priv->away_message); ++ } ++ markup = g_strdup_printf ("%s\n%s", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message); ++ gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup); ++ g_free (markup); ++ g_free (away_message); + } + + static void +-- +1.8.1.6 + + +From 1ed6a959746e115a7f33de2134921c6572185ebd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= +Date: Sat, 2 Mar 2013 08:13:04 +0100 +Subject: [PATCH 4/4] Simplify away message handling + +--- + src/cinnamon-screensaver-command.c | 19 ++++++++++++------- + src/gs-window-x11.c | 7 +++---- + 2 files changed, 15 insertions(+), 11 deletions(-) + +diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c +index dbcac8a..4836f81 100644 +--- a/src/cinnamon-screensaver-command.c ++++ b/src/cinnamon-screensaver-command.c +@@ -41,7 +41,7 @@ + static gboolean do_query = FALSE; + static gboolean do_time = FALSE; + +-static gchar *away_message = "DEFAULT"; ++static gchar *away_message; + + static GOptionEntry entries [] = { + { "exit", 0, 0, G_OPTION_ARG_NONE, &do_quit, +@@ -114,7 +114,7 @@ + static GDBusMessage * + screensaver_send_message_string (GDBusConnection *connection, + const char *name, +- gboolean value) ++ gchar *value) + { + GDBusMessage *message, *reply; + GError *error; +@@ -310,12 +310,17 @@ + } + + if (do_lock) { +- reply = screensaver_send_message_string (connection, "LockMessage", away_message); +- if (reply == NULL) { +- g_message ("Did not receive a reply from the screensaver."); +- goto done; ++ if (away_message) { ++ reply = screensaver_send_message_string (connection, "LockMessage", away_message); ++ if (reply == NULL) { ++ g_message ("Did not receive a reply from the screensaver."); ++ goto done; ++ } ++ g_object_unref (reply); ++ } else { ++ reply = screensaver_send_message_void (connection, "Lock", FALSE); ++ g_assert (reply == NULL); + } +- g_object_unref (reply); + } + + if (do_activate) { +diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c +index 0e3bb6f..22f5471 100644 +--- a/src/gs-window-x11.c ++++ b/src/gs-window-x11.c +@@ -2137,11 +2137,10 @@ enum { + { + char *markup; + char *away_message; +- if (g_strcmp0(window->priv->away_message, "DEFAULT") == 0 || g_strcmp0(window->priv->away_message, "") == 0) { +- away_message = g_strdup_printf (_("%s"), window->priv->default_message); +- } +- else { ++ if (window->priv->away_message && g_strcmp0(window->priv->away_message, "") != 0) { + away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), window->priv->away_message); ++ } else { ++ away_message = g_strdup_printf (_("%s"), window->priv->default_message); + } + markup = g_strdup_printf ("%s\n%s", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message); + gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup); +-- +1.8.1.6 + diff --git a/community/cinnamon-screensaver/gnome-autogen.sh b/community/cinnamon-screensaver/gnome-autogen.sh deleted file mode 100644 index 2467a1de2..000000000 --- a/community/cinnamon-screensaver/gnome-autogen.sh +++ /dev/null @@ -1,538 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -#name of package -test "$PKG_NAME" || PKG_NAME=Package -test "$srcdir" || srcdir=. - -# default version requirements ... -test "$REQUIRED_AUTOCONF_VERSION" || REQUIRED_AUTOCONF_VERSION=2.53 -test "$REQUIRED_AUTOMAKE_VERSION" || REQUIRED_AUTOMAKE_VERSION=1.9 -test "$REQUIRED_LIBTOOL_VERSION" || REQUIRED_LIBTOOL_VERSION=1.4.3 -test "$REQUIRED_GETTEXT_VERSION" || REQUIRED_GETTEXT_VERSION=0.10.40 -test "$REQUIRED_GLIB_GETTEXT_VERSION" || REQUIRED_GLIB_GETTEXT_VERSION=2.2.0 -test "$REQUIRED_INTLTOOL_VERSION" || REQUIRED_INTLTOOL_VERSION=0.25 -test "$REQUIRED_PKG_CONFIG_VERSION" || REQUIRED_PKG_CONFIG_VERSION=0.14.0 -test "$REQUIRED_GTK_DOC_VERSION" || REQUIRED_GTK_DOC_VERSION=1.0 -test "$REQUIRED_DOC_COMMON_VERSION" || REQUIRED_DOC_COMMON_VERSION=2.3.0 -test "$REQUIRED_GNOME_DOC_UTILS_VERSION" || REQUIRED_GNOME_DOC_UTILS_VERSION=0.4.2 - -# a list of required m4 macros. Package can set an initial value -test "$REQUIRED_M4MACROS" || REQUIRED_M4MACROS= -test "$FORBIDDEN_M4MACROS" || FORBIDDEN_M4MACROS= - -# Not all echo versions allow -n, so we check what is possible. This test is -# based on the one in autoconf. -ECHO_C= -ECHO_N= -case `echo -n x` in --n*) - case `echo 'x\c'` in - *c*) ;; - *) ECHO_C='\c';; - esac;; -*) - ECHO_N='-n';; -esac - -# some terminal codes ... -if tty < /dev/null 1>/dev/null 2>&1; then - boldface="`tput bold 2>/dev/null`" - normal="`tput sgr0 2>/dev/null`" -else - boldface= - normal= -fi -printbold() { - echo $ECHO_N "$boldface" $ECHO_C - echo "$@" - echo $ECHO_N "$normal" $ECHO_C -} -printerr() { - echo "$@" >&2 -} - -# Usage: -# compare_versions MIN_VERSION ACTUAL_VERSION -# returns true if ACTUAL_VERSION >= MIN_VERSION -compare_versions() { - ch_min_version=$1 - ch_actual_version=$2 - ch_status=0 - IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="." - set $ch_actual_version - for ch_min in $ch_min_version; do - ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes - if [ -z "$ch_min" ]; then break; fi - if [ -z "$ch_cur" ]; then ch_status=1; break; fi - if [ $ch_cur -gt $ch_min ]; then break; fi - if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi - done - IFS="$ch_save_IFS" - return $ch_status -} - -# Usage: -# version_check PACKAGE VARIABLE CHECKPROGS MIN_VERSION SOURCE -# checks to see if the package is available -version_check() { - vc_package=$1 - vc_variable=$2 - vc_checkprogs=$3 - vc_min_version=$4 - vc_source=$5 - vc_status=1 - - vc_checkprog=`eval echo "\\$$vc_variable"` - if [ -n "$vc_checkprog" ]; then - printbold "using $vc_checkprog for $vc_package" - return 0 - fi - - if test "x$vc_package" = "xautomake" -a "x$vc_min_version" = "x1.4"; then - vc_comparator="=" - else - vc_comparator=">=" - fi - printbold "checking for $vc_package $vc_comparator $vc_min_version..." - for vc_checkprog in $vc_checkprogs; do - echo $ECHO_N " testing $vc_checkprog... " $ECHO_C - if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then - vc_actual_version=`$vc_checkprog --version | head -n 1 | \ - sed 's/^.*[ ]\([0-9.]*[a-z]*\).*$/\1/'` - if compare_versions $vc_min_version $vc_actual_version; then - echo "found $vc_actual_version" - # set variables - eval "$vc_variable=$vc_checkprog; \ - ${vc_variable}_VERSION=$vc_actual_version" - vc_status=0 - break - else - echo "too old (found version $vc_actual_version)" - fi - else - echo "not found." - fi - done - if [ "$vc_status" != 0 ]; then - printerr "***Error***: You must have $vc_package $vc_comparator $vc_min_version installed" - printerr " to build $PKG_NAME. Download the appropriate package for" - printerr " from your distribution or get the source tarball at" - printerr " $vc_source" - printerr - exit $vc_status - fi - return $vc_status -} - -# Usage: -# require_m4macro filename.m4 -# adds filename.m4 to the list of required macros -require_m4macro() { - case "$REQUIRED_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) REQUIRED_M4MACROS="$REQUIRED_M4MACROS $1" ;; - esac -} - -forbid_m4macro() { - case "$FORBIDDEN_M4MACROS" in - $1\ * | *\ $1\ * | *\ $1) ;; - *) FORBIDDEN_M4MACROS="$FORBIDDEN_M4MACROS $1" ;; - esac -} - -# Usage: -# add_to_cm_macrodirs dirname -# Adds the dir to $cm_macrodirs, if it's not there yet. -add_to_cm_macrodirs() { - case $cm_macrodirs in - "$1 "* | *" $1 "* | *" $1") ;; - *) cm_macrodirs="$cm_macrodirs $1";; - esac -} - -# Usage: -# print_m4macros_error -# Prints an error message saying that autoconf macros were misused -print_m4macros_error() { - printerr "***Error***: some autoconf macros required to build $PKG_NAME" - printerr " were not found in your aclocal path, or some forbidden" - printerr " macros were found. Perhaps you need to adjust your" - printerr " ACLOCAL_FLAGS?" - printerr -} - -# Usage: -# check_m4macros -# Checks that all the requested macro files are in the aclocal macro path -# Uses REQUIRED_M4MACROS and ACLOCAL variables. -check_m4macros() { - # construct list of macro directories - cm_macrodirs=`$ACLOCAL --print-ac-dir` - # aclocal also searches a version specific dir, eg. /usr/share/aclocal-1.9 - # but it contains only Automake's own macros, so we can ignore it. - - # Read the dirlist file, supported by Automake >= 1.7. - # If AUTOMAKE was defined, no version was detected. - if [ -z "$AUTOMAKE_VERSION" ] || compare_versions 1.7 $AUTOMAKE_VERSION && [ -s $cm_macrodirs/dirlist ]; then - cm_dirlist=`sed 's/[ ]*#.*//;/^$/d' $cm_macrodirs/dirlist` - if [ -n "$cm_dirlist" ] ; then - for cm_dir in $cm_dirlist; do - if [ -d $cm_dir ]; then - add_to_cm_macrodirs $cm_dir - fi - done - fi - fi - - # Parse $ACLOCAL_FLAGS - set - $ACLOCAL_FLAGS - while [ $# -gt 0 ]; do - if [ "$1" = "-I" ]; then - add_to_cm_macrodirs "$2" - shift - fi - shift - done - - cm_status=0 - if [ -n "$REQUIRED_M4MACROS" ]; then - printbold "Checking for required M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $REQUIRED_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - # The macro dir in Cygwin environments may contain a file - # called dirlist containing other directories to look in. - if [ -f "$cm_dir/dirlist" ]; then - for cm_otherdir in `cat $cm_dir/dirlist`; do - if [ -f "$cm_otherdir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - fi - done - if $cm_macrofound; then - : - else - printerr " $cm_macro not found" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi - if [ -n "$FORBIDDEN_M4MACROS" ]; then - printbold "Checking for forbidden M4 macros..." - # check that each macro file is in one of the macro dirs - for cm_macro in $FORBIDDEN_M4MACROS; do - cm_macrofound=false - for cm_dir in $cm_macrodirs; do - if [ -f "$cm_dir/$cm_macro" ]; then - cm_macrofound=true - break - fi - done - if $cm_macrofound; then - printerr " $cm_macro found (should be cleared from macros dir)" - cm_status=1 - fi - done - fi - if [ "$cm_status" != 0 ]; then - print_m4macros_error - exit $cm_status - fi -} - -# try to catch the case where the macros2/ directory hasn't been cleared out. -forbid_m4macro gnome-cxx-check.m4 - -want_libtool=false -want_gettext=false -want_glib_gettext=false -want_intltool=false -want_pkg_config=false -want_gtk_doc=false -want_gnome_doc_utils=false -want_maintainer_mode=false - -find_configure_files() { - configure_ac= - if test -f "$1/configure.ac"; then - configure_ac="$1/configure.ac" - elif test -f "$1/configure.in"; then - configure_ac="$1/configure.in" - fi - if test "x$configure_ac" != x; then - echo "$configure_ac" - # TODO We have not detected the right autoconf yet! - autoconf -t 'AC_CONFIG_SUBDIRS:$1' "$configure_ac" | while read dir; do - find_configure_files "$1/$dir" - done - fi -} - -configure_files="`find_configure_files $srcdir`" - -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - continue - fi - if grep "^A[CM]_PROG_LIBTOOL" $configure_ac >/dev/null || - grep "^LT_INIT" $configure_ac >/dev/null; then - want_libtool=true - fi - if grep "^AM_GNU_GETTEXT" $configure_ac >/dev/null; then - want_gettext=true - fi - if grep "^AM_GLIB_GNU_GETTEXT" $configure_ac >/dev/null; then - want_glib_gettext=true - fi - if grep "^AC_PROG_INTLTOOL" $configure_ac >/dev/null || - grep "^IT_PROG_INTLTOOL" $configure_ac >/dev/null; then - want_intltool=true - fi - if grep "^PKG_CHECK_MODULES" $configure_ac >/dev/null; then - want_pkg_config=true - fi - if grep "^GTK_DOC_CHECK" $configure_ac >/dev/null; then - want_gtk_doc=true - fi - if grep "^GNOME_DOC_INIT" $configure_ac >/dev/null; then - want_gnome_doc_utils=true - fi - - # check that AM_MAINTAINER_MODE is used - if grep "^AM_MAINTAINER_MODE" $configure_ac >/dev/null; then - want_maintainer_mode=true - fi - - if grep "^YELP_HELP_INIT" $configure_ac >/dev/null; then - require_m4macro yelp.m4 - fi - - # check to make sure gnome-common macros can be found ... - if grep "^GNOME_COMMON_INIT" $configure_ac >/dev/null || - grep "^GNOME_DEBUG_CHECK" $configure_ac >/dev/null || - grep "^GNOME_MAINTAINER_MODE_DEFINES" $configure_ac >/dev/null; then - require_m4macro gnome-common.m4 - fi - if grep "^GNOME_COMPILE_WARNINGS" $configure_ac >/dev/null || - grep "^GNOME_CXX_WARNINGS" $configure_ac >/dev/null; then - require_m4macro gnome-compiler-flags.m4 - fi - if grep "^GNOME_CODE_COVERAGE" $configure_ac >/dev/null; then - require_m4macro gnome-code-coverage.m4 - fi -done - -#tell Mandrake autoconf wrapper we want autoconf 2.5x, not 2.13 -WANT_AUTOCONF_2_5=1 -export WANT_AUTOCONF_2_5 -version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' $REQUIRED_AUTOCONF_VERSION \ - "http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz" -AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` - -case $REQUIRED_AUTOMAKE_VERSION in - 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.13 automake-1.12" ;; - 1.13*) automake_progs="automake-1.13" ;; -esac -version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ - "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" -ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/` - -if $want_libtool; then - version_check libtool LIBTOOLIZE "libtoolize glibtoolize" $REQUIRED_LIBTOOL_VERSION \ - "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz" - require_m4macro libtool.m4 -fi - -if $want_gettext; then - version_check gettext GETTEXTIZE gettextize $REQUIRED_GETTEXT_VERSION \ - "http://ftp.gnu.org/pub/gnu/gettext/gettext-$REQUIRED_GETTEXT_VERSION.tar.gz" - require_m4macro gettext.m4 -fi - -if $want_glib_gettext; then - version_check glib-gettext GLIB_GETTEXTIZE glib-gettextize $REQUIRED_GLIB_GETTEXT_VERSION \ - "ftp://ftp.gtk.org/pub/gtk/v2.2/glib-$REQUIRED_GLIB_GETTEXT_VERSION.tar.gz" - require_m4macro glib-gettext.m4 -fi - -if $want_intltool; then - version_check intltool INTLTOOLIZE intltoolize $REQUIRED_INTLTOOL_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/intltool/" - require_m4macro intltool.m4 -fi - -if $want_pkg_config; then - version_check pkg-config PKG_CONFIG pkg-config $REQUIRED_PKG_CONFIG_VERSION \ - "'http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-$REQUIRED_PKG_CONFIG_VERSION.tar.gz" - require_m4macro pkg.m4 -fi - -if $want_gtk_doc; then - version_check gtk-doc GTKDOCIZE gtkdocize $REQUIRED_GTK_DOC_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/" - require_m4macro gtk-doc.m4 -fi - -if $want_gnome_doc_utils; then - version_check gnome-doc-utils GNOME_DOC_PREPARE gnome-doc-prepare $REQUIRED_GNOME_DOC_UTILS_VERSION \ - "http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/" -fi - -if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - version_check gnome-common DOC_COMMON gnome-doc-common \ - $REQUIRED_DOC_COMMON_VERSION " " -fi - -check_m4macros - -if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then - printerr "**Warning**: I am going to run \`configure' with no arguments." - printerr "If you wish to pass any to it, please specify them on the" - printerr \`$0\'" command line." - printerr -fi - -topdir=`pwd` -for configure_ac in $configure_files; do - dirname=`dirname $configure_ac` - basename=`basename $configure_ac` - if [ -f $dirname/NO-AUTO-GEN ]; then - echo skipping $dirname -- flagged as no auto-gen - elif [ ! -w $dirname ]; then - echo skipping $dirname -- directory is read only - else - printbold "Processing $configure_ac" - cd $dirname - - # Note that the order these tools are called should match what - # autoconf's "autoupdate" package does. See bug 138584 for - # details. - - # programs that might install new macros get run before aclocal - if grep "^A[CM]_PROG_LIBTOOL" $basename >/dev/null || - grep "^LT_INIT" $basename >/dev/null; then - printbold "Running $LIBTOOLIZE..." - $LIBTOOLIZE --force --copy || exit 1 - fi - - if grep "^AM_GLIB_GNU_GETTEXT" $basename >/dev/null; then - printbold "Running $GLIB_GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GLIB_GETTEXTIZE --force --copy || exit 1 - elif grep "^AM_GNU_GETTEXT" $basename >/dev/null; then - if grep "^AM_GNU_GETTEXT_VERSION" $basename > /dev/null; then - printbold "Running autopoint..." - autopoint --force || exit 1 - else - printbold "Running $GETTEXTIZE... Ignore non-fatal messages." - echo "no" | $GETTEXTIZE --force --copy || exit 1 - fi - fi - - if grep "^AC_PROG_INTLTOOL" $basename >/dev/null || - grep "^IT_PROG_INTLTOOL" $basename >/dev/null; then - printbold "Running $INTLTOOLIZE..." - $INTLTOOLIZE --force --copy --automake || exit 1 - fi - if grep "^GTK_DOC_CHECK" $basename >/dev/null; then - printbold "Running $GTKDOCIZE..." - $GTKDOCIZE --copy || exit 1 - fi - - if [ "x$USE_COMMON_DOC_BUILD" = "xyes" ]; then - printbold "Running gnome-doc-common..." - gnome-doc-common --copy || exit 1 - fi - if grep "^GNOME_DOC_INIT" $basename >/dev/null; then - printbold "Running $GNOME_DOC_PREPARE..." - $GNOME_DOC_PREPARE --force --copy || exit 1 - fi - - # Now run aclocal to pull in any additional macros needed - - # if the AC_CONFIG_MACRO_DIR() macro is used, pass that - # directory to aclocal. - m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q` - if [ -n "$m4dir" ]; then - m4dir="-I $m4dir" - fi - printbold "Running $ACLOCAL..." - $ACLOCAL $m4dir $ACLOCAL_FLAGS || exit 1 - - if grep "GNOME_AUTOGEN_OBSOLETE" aclocal.m4 >/dev/null; then - printerr "*** obsolete gnome macros were used in $configure_ac" - fi - - # Now that all the macros are sorted, run autoconf and autoheader ... - printbold "Running $AUTOCONF..." - $AUTOCONF || exit 1 - if grep "^A[CM]_CONFIG_HEADER" $basename >/dev/null; then - printbold "Running $AUTOHEADER..." - $AUTOHEADER || exit 1 - # this prevents automake from thinking config.h.in is out of - # date, since autoheader doesn't touch the file if it doesn't - # change. - test -f config.h.in && touch config.h.in - fi - - # Finally, run automake to create the makefiles ... - printbold "Running $AUTOMAKE..." - if [ -f COPYING ]; then - cp -pf COPYING COPYING.autogen_bak - fi - if [ -f INSTALL ]; then - cp -pf INSTALL INSTALL.autogen_bak - fi - if [ $REQUIRED_AUTOMAKE_VERSION != 1.4 ]; then - $AUTOMAKE --gnu --add-missing --copy -Wno-portability || exit 1 - else - $AUTOMAKE --gnu --add-missing --copy || exit 1 - fi - if [ -f COPYING.autogen_bak ]; then - cmp COPYING COPYING.autogen_bak > /dev/null || cp -pf COPYING.autogen_bak COPYING - rm -f COPYING.autogen_bak - fi - if [ -f INSTALL.autogen_bak ]; then - cmp INSTALL INSTALL.autogen_bak > /dev/null || cp -pf INSTALL.autogen_bak INSTALL - rm -f INSTALL.autogen_bak - fi - - cd "$topdir" - fi -done - -conf_flags="" - -if $want_maintainer_mode; then - conf_flags="--enable-maintainer-mode" -fi - -if test x$NOCONFIGURE = x; then - printbold Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME || exit 1 -else - echo Skipping configure process. -fi diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index f4fecd1a7..a16839508 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87446 2013-03-31 19:54:32Z faidoc $ +# $Id: PKGBUILD 88709 2013-04-22 00:29:56Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') @@ -13,8 +13,9 @@ url="http://cinnamon.linuxmint.com/" license=('GPL2') depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' - 'gnome-themes-standard' 'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus' - 'python2-gconf' 'python2-imaging' 'python2-pyinotify' 'python2-lxml' 'webkitgtk3') + 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg' + 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging' + 'python2-pyinotify' 'python2-lxml' 'webkitgtk3') makedepends=('gnome-common' 'intltool') optdepends=('cinnamon-control-center: extended configurations for Cinnamon' 'cinnamon-screensaver: lock screen' @@ -26,15 +27,21 @@ install=${pkgname}.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver" "keyboard_applet.patch" "fix-control-center-check.patch" - "fix-keyboard-settings.patch") -md5sums=('c733e2a2280508aecf3ee010587e6743' + "gnome-3.8.patch") +md5sums=('95260dc968ca9be32c265b35df2dd49d' '2b1ece84416c3e4de030be15f1774d82' 'c3f25b06d345d9d36c197cd96e08f496' - 'c36138eddde544b5c27b66d19451e7a5') + 'cf2efbe1a5c48e1be53a0e8e4b7c3181') build() { cd ${srcdir}/linuxmint-Cinnamon* + # Python2 fix + sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \ + files/usr/bin/$pkgname-menu-editor \ + files/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py + find -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + # Fix Keyboard applet # https://github.com/linuxmint/Cinnamon/issues/1337 patch -Np1 -i ${srcdir}/keyboard_applet.patch @@ -42,9 +49,8 @@ build() { # Check for the cc-panel path, not for the unneeded binary patch -Np1 -i ${srcdir}/fix-control-center-check.patch - # Fix Keyboard settings (https://bugs.archlinux.org/task/34472) - patch -Np1 -i ${srcdir}/fix-keyboard-settings.patch - + # https://github.com/linuxmint/Cinnamon/pull/1888 + patch -Np1 -i ${srcdir}/gnome-3.8.patch ./autogen.sh --prefix=/usr \ --sysconfdir=/etc \ @@ -54,31 +60,10 @@ build() { --disable-schemas-compile \ --enable-compile-warnings=yes \ --with-session-tracking=systemd - make } package() { cd ${srcdir}/linuxmint-Cinnamon* make DESTDIR="${pkgdir}" install - - # Install autostart files for gnome-fallback-mount-helper - install -Dm644 /etc/xdg/autostart/gnome-fallback-mount-helper.desktop \ - "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon.desktop" - sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon/' \ - "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon.desktop" - - install -Dm644 /etc/xdg/autostart/gnome-fallback-mount-helper.desktop \ - "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon2d.desktop" - sed -i 's/^AutostartCondition=.*/AutostartCondition=GNOME3 if-session cinnamon2d/' \ - "${pkgdir}/etc/xdg/autostart/gnome-fallback-mount-helper-cinnamon2d.desktop" - - # Python2 fix - sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \ - "${pkgdir}/usr/bin/$pkgname-menu-editor" \ - "${pkgdir}/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py" - - find "${pkgdir}" -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' } - - diff --git a/community/cinnamon/cinnamon.install b/community/cinnamon/cinnamon.install index 901fd95c9..326aa98a2 100644 --- a/community/cinnamon/cinnamon.install +++ b/community/cinnamon/cinnamon.install @@ -2,28 +2,10 @@ post_install() { glib-compile-schemas usr/share/glib-2.0/schemas } -pre_upgrade() { - if [ -f /usr/share/gconf/schemas/cinnamon.schemas ]; then - gconfpkg --uninstall cinnamon - fi - - if [ "$(vercmp 1.6.7-6 "$2")" -eq 1 ]; then - if [[ -h '/usr/lib/libgnome-desktop-3.so.2' ]]; then - if [[ $(uname -m) == 'i686' ]]; then - unlink /usr/lib/libgnome-desktop-3.so.2 - fi - fi - fi -} - post_upgrade() { post_install } -pre_remove() { - pre_upgrade -} - post_remove() { post_install } diff --git a/community/cinnamon/fix-keyboard-settings.patch b/community/cinnamon/fix-keyboard-settings.patch deleted file mode 100644 index b606939c9..000000000 --- a/community/cinnamon/fix-keyboard-settings.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 034f9c886a4b08e214193576b11fb97ba3d62922 Mon Sep 17 00:00:00 2001 -From: Lusito -Date: Sun, 10 Mar 2013 21:01:07 +0100 -Subject: [PATCH] fix for broken keyboard settings - ---- - files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py | 2 +- - files/usr/lib/cinnamon-settings/modules/cs_keyboard.py | 12 ++++++------ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py b/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py -index b8842fe..cdccf46 100644 ---- a/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py -+++ b/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py -@@ -9,7 +9,7 @@ - import gettext - from gi.repository import Gio, Gtk, GObject, Gdk - from gi.repository import GdkPixbuf --# import gconf -+ from gi.repository import GConf - import json - import dbus - import time -diff --git a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py -index 27a75ae..1ea8fd9 100644 ---- a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py -+++ b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py -@@ -8,7 +8,7 @@ - gettext.install("cinnamon", "/usr/share/cinnamon/locale") - - # Keybindings page - check if we need to store custom --# keybindings to gsettings key as well as gconf (In Mint 14 this is changed) -+# keybindings to gsettings key as well as GConf (In Mint 14 this is changed) - CUSTOM_KEYS_BASENAME = "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings" - CUSTOM_KEYS_SCHEMA = "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding" - CUSTOM_KEYBINDINGS_GSETTINGS = False -@@ -160,7 +160,7 @@ def __init__(self, content_box): - first_run_completed = schema.get_boolean("custom-keybindings-to-3-6") - - if CUSTOM_KEYBINDINGS_GSETTINGS and not first_run_completed: -- gclient = gconf.client_get_default() -+ gclient = GConf.Client.get_default() - path = "/desktop/gnome/keybindings" - subdirs = gclient.all_dirs(path) - for subdir in subdirs: -@@ -251,7 +251,7 @@ def setBinding(self, index, val): - self.writeSettings() - - def writeSettings(self): -- gclient = gconf.client_get_default() -+ gclient = GConf.Client.get_default() - gclient.set_string(self.path + "/name", self.label) - gclient.set_string(self.path + "/action", self.action) - gclient.set_string(self.path + "/binding", self.entries[0]) -@@ -537,7 +537,7 @@ def loadCustoms(self): - for category in self.main_store: - if category.int_name is "custom": - category.clear() -- gclient = gconf.client_get_default() -+ gclient = GConf.Client.get_default() - path = "/desktop/gnome/keybindings" - subdirs = gclient.all_dirs(path) - for subdir in subdirs: -@@ -645,7 +645,7 @@ def onAddCustomButtonClicked(self, button): - dialog.destroy() - return - -- gclient = gconf.client_get_default() -+ gclient = GConf.Client.get_default() - path = "/desktop/gnome/keybindings/custom" - i = 0 - while gclient.dir_exists(path + str(i)): -@@ -670,7 +670,7 @@ def onRemoveCustomButtonClicked(self, button): - keybindings, iter = self.kb_tree.get_selection().get_selected() - if iter: - keybinding = keybindings[iter][1] -- gclient = gconf.client_get_default() -+ gclient = GConf.Client.get_default() - if gclient.dir_exists(keybinding.path): - gclient.unset(keybinding.path + "/name") - gclient.unset(keybinding.path + "/action") --- -1.8.1.5 diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch new file mode 100644 index 000000000..61cd9180f --- /dev/null +++ b/community/cinnamon/gnome-3.8.patch @@ -0,0 +1,3669 @@ +From f4020d3960fa96a101bdb1c3ac1e1a452dbbf48c Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Fri, 19 Apr 2013 13:19:50 -0400 +Subject: [PATCH 01/15] Disable XInput on cinnamon startup (for 3.8 compat) + This has no effect on < 1.14 clutter + +--- + src/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/main.c b/src/main.c +index 418fb60..ac90d91 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -260,6 +260,7 @@ + meta_plugin_type_register (gnome_cinnamon_plugin_get_type ()); + + /* Prevent meta_init() from causing gtk to load gail and at-bridge */ ++ g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE); + g_setenv ("NO_GAIL", "1", TRUE); + g_setenv ("NO_AT_BRIDGE", "1", TRUE); + meta_init (); +-- +1.8.1.6 + + +From cc68659ecdd9e43128ec2b4555479f930c0d1ccd Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Fri, 19 Apr 2013 13:21:40 -0400 +Subject: [PATCH 02/15] Explain change + +--- + src/main.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/main.c b/src/main.c +index ac90d91..9d37975 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -257,10 +257,12 @@ + + g_option_context_free (ctx); + ++ /* Disable XInput extension - required for 3.8 compatibility */ ++ g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE); ++ + meta_plugin_type_register (gnome_cinnamon_plugin_get_type ()); + + /* Prevent meta_init() from causing gtk to load gail and at-bridge */ +- g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE); + g_setenv ("NO_GAIL", "1", TRUE); + g_setenv ("NO_AT_BRIDGE", "1", TRUE); + meta_init (); +-- +1.8.1.6 + + +From f3777b3b2733b965bd348c7175ee67ee268aee06 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Tue, 16 Apr 2013 17:01:30 -0400 +Subject: [PATCH 03/15] Add backgroundManager - this is needed for gnome 3.8 + compatibility, as gnome-settings-daemon no longer handles the desktop + background. + +--- + configure.ac | 7 +- + data/org.cinnamon.gschema.xml.in | 71 +++- + .../cinnamon-settings/modules/cs_backgrounds.py | 31 +- + js/ui/main.js | 3 +- + src/Makefile.am | 2 + + src/cinnamon-background-manager.c | 411 +++++++++++++++++++++ + src/cinnamon-background-manager.h | 57 +++ + 7 files changed, 562 insertions(+), 20 deletions(-) + create mode 100644 src/cinnamon-background-manager.c + create mode 100644 src/cinnamon-background-manager.h + +diff --git a/configure.ac b/configure.ac +index 0aa47c5..a2a9479 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -68,6 +68,7 @@ GTK_MIN_VERSION=3.0.0 + GIO_MIN_VERSION=2.29.10 + POLKIT_MIN_VERSION=0.100 + STARTUP_NOTIFICATION_MIN_VERSION=0.11 ++GNOME_DESKTOP_MIN_VERSION=3.0.0 + + # Collect more than 20 libraries for a prize! + PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION +@@ -82,7 +83,8 @@ PKG_CHECK_MODULES(CINNAMON, gio-2.0 >= $GIO_MIN_VERSION + gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_MIN_VERSION + libcanberra + polkit-agent-1 >= $POLKIT_MIN_VERSION xfixes +- libnm-glib libnm-util gnome-keyring-1) ++ libnm-glib libnm-util gnome-keyring-1 ++ gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION) + + PKG_CHECK_MODULES(CINNAMON_PERF_HELPER, gtk+-3.0 gio-2.0) + +@@ -106,7 +108,8 @@ AC_CHECK_FUNCS(JS_NewGlobalObject XFixesCreatePointerBarrier) + CFLAGS=$saved_CFLAGS + LIBS=$saved_LIBS + +-PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3.0 >= 2.90.0 x11) ++PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 ++ gnome-desktop-3.0 >= GNOME_DESKTOP_MIN_VERSION x11) + PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0) + PKG_CHECK_MODULES(TRAY, gtk+-3.0) + PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) +diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in +index ffbad92..6f55477 100644 +--- a/data/org.cinnamon.gschema.xml.in ++++ b/data/org.cinnamon.gschema.xml.in +@@ -720,6 +720,23 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + "wallpaper" +@@ -750,8 +767,60 @@ + This key defines the delay for the slideshow. + + ++ ++ true ++ <_summary>Draw Desktop Background ++ <_description>Have GNOME draw the desktop background. ++ ++ ++ 'zoom' ++ <_summary>Picture Options ++ <_description> ++ Determines how the image set by wallpaper_filename is rendered. ++ Possible values are "none", "wallpaper", "centered", "scaled", ++ "stretched", "zoom", "spanned". ++ ++ ++ ++ 'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml' ++ <_summary>Picture URI ++ <_description> ++ URI to use for the background image. Not that the backend only supports ++ local (file://) URIs. ++ ++ ++ ++ ++ 100 ++ <_summary>Picture Opacity ++ <_description> ++ Opacity with which to draw the background picture. ++ ++ ++ ++ '#023c88' ++ <_summary>Primary Color ++ <_description> ++ Left or Top color when drawing gradients, or the solid color. ++ ++ ++ ++ '#5789ca' ++ <_summary>Secondary Color ++ <_description> ++ Right or Bottom color when drawing gradients, not used for solid color. ++ ++ ++ ++ 'solid' ++ <_summary>Color Shading Type ++ <_description> ++ How to shade the background color. Possible values are "horizontal", ++ "vertical", and "solid". ++ ++ + +- ++ + + + "" +diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py +index f964aed..4a38c84 100644 +--- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py ++++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py +@@ -232,11 +232,11 @@ def getFirstFileFromBackgroundXml(self, filename): + + + class BackgroundWallpaperPane (Gtk.VBox): +- def __init__(self, sidepage, gnome_background_schema): ++ def __init__(self, sidepage, cinnamon_background_schema): + Gtk.VBox.__init__(self) + self.set_spacing(5) + +- self._gnome_background_schema = gnome_background_schema ++ self._cinnamon_background_schema = cinnamon_background_schema + self._sidepage = sidepage + + scw = Gtk.ScrolledWindow() +@@ -263,15 +263,15 @@ def _on_selection_changed(self, iconview): + if wallpaper: + for key in wallpaper: + if key == "filename": +- self._gnome_background_schema.set_string("picture-uri", "file://" + wallpaper[key]) ++ self._cinnamon_background_schema.set_string("picture-uri", "file://" + wallpaper[key]) + elif key == "pcolor": +- self._gnome_background_schema.set_string("primary-color", wallpaper[key]) ++ self._cinnamon_background_schema.set_string("primary-color", wallpaper[key]) + elif key == "scolor": +- self._gnome_background_schema.set_string("secondary-color", wallpaper[key]) ++ self._cinnamon_background_schema.set_string("secondary-color", wallpaper[key]) + elif key == "shade_type": +- self._gnome_background_schema.set_string("color-shading-type", wallpaper[key]) ++ self._cinnamon_background_schema.set_string("color-shading-type", wallpaper[key]) + elif key == "options": +- self._gnome_background_schema.set_string("picture-options", wallpaper[key]) ++ self._cinnamon_background_schema.set_string("picture-options", wallpaper[key]) + if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""): + self._sidepage.remove_wallpaper_button.set_sensitive(True) + +@@ -364,7 +364,7 @@ def run(self): + return res + + class BackgroundSlideshowPane(Gtk.Table): +- def __init__(self, sidepage, gnome_background_schema, cinnamon_background_schema): ++ def __init__(self, sidepage, cinnamon_background_schema): + Gtk.Table.__init__(self) + self.set_col_spacings(5) + self.set_row_spacings(5) +@@ -445,12 +445,11 @@ def _do_update_list(self, folder, recursive, delay, transition_duration = 0): + f = open(filename, "w") + f.write(xml_data) + f.close() +- Gio.Settings("org.gnome.desktop.background").set_string("picture-uri", "file://" + filename) ++ Gio.Settings("org.cinnamon.background").set_string("picture-uri", "file://" + filename) + + class BackgroundSidePage (SidePage): + def __init__(self, name, icon, keywords, advanced, content_box): + SidePage.__init__(self, name, icon, keywords, advanced, content_box) +- self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background") + self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background") + self._add_wallpapers_dialog = AddWallpapersDialog() + +@@ -515,8 +514,8 @@ def build(self, advanced): + self.mainbox.set_visible_window(False) + self.content_box.pack_start(self.mainbox, True, True, 3) + +- self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema) +- self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema) ++ self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema) ++ self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema) + if self._cinnamon_background_schema["mode"] == "slideshow": + self.mainbox.add(self.slideshow_pane) + else: +@@ -536,21 +535,21 @@ def build(self, advanced): + l = Gtk.Label(_("Picture aspect")) + l.set_alignment(0, 0.5) + advanced_options_box.pack_start(l, False, False, 0) +- self.picture_options = GSettingsComboBox("", "org.gnome.desktop.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS) ++ self.picture_options = GSettingsComboBox("", "org.cinnamon.background", "picture-options", None, BACKGROUND_PICTURE_OPTIONS) + advanced_options_box.pack_start(self.picture_options, False, False, 0) + + l = Gtk.Label(_("Gradient")) + l.set_alignment(0, 0.5) + advanced_options_box.pack_start(l, False, False, 0) +- self.color_shading_type = GSettingsComboBox("", "org.gnome.desktop.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES) ++ self.color_shading_type = GSettingsComboBox("", "org.cinnamon.background", "color-shading-type", None, BACKGROUND_COLOR_SHADING_TYPES) + advanced_options_box.pack_start(self.color_shading_type, False, False, 0) + + hbox = Gtk.HBox() + l = Gtk.Label(_("Colors")) + hbox.pack_start(l, False, False, 2) +- self.primary_color = GSettingsColorChooser("org.gnome.desktop.background", "primary-color", None) ++ self.primary_color = GSettingsColorChooser("org.cinnamon.background", "primary-color", None) + hbox.pack_start(self.primary_color, False, False, 2) +- self.secondary_color = GSettingsColorChooser("org.gnome.desktop.background", "secondary-color", None) ++ self.secondary_color = GSettingsColorChooser("org.cinnamon.background", "secondary-color", None) + hbox.pack_start(self.secondary_color, False, False, 2) + advanced_options_box.pack_start(hbox, False, False, 0) + self.content_box.show_all() +diff --git a/js/ui/main.js b/js/ui/main.js +index 11920a4..5cae372 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -86,6 +86,7 @@ let _cssStylesheet = null; + let dynamicWorkspaces = null; + let nWorks = null; + let tracker = null; ++let backgroundManager = null; + let desktopShown; + + let workspace_names = []; +@@ -214,7 +215,7 @@ function start() { + // be predictable anyways. + tracker = Cinnamon.WindowTracker.get_default(); + Cinnamon.AppUsage.get_default(); +- ++ backgroundManager = Cinnamon.BackgroundManager.get_default(); + // The stage is always covered so Clutter doesn't need to clear it; however + // the color is used as the default contents for the Muffin root background + // actor so set it anyways. +diff --git a/src/Makefile.am b/src/Makefile.am +index 51413aa..6efce18 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -105,6 +105,7 @@ cinnamon_public_headers_h = \ + cinnamon-app-system.h \ + cinnamon-app-usage.h \ + cinnamon-arrow.h \ ++ cinnamon-background-manager.h \ + cinnamon-doc-system.h \ + cinnamon-embedded-window.h \ + cinnamon-generic-container.h \ +@@ -142,6 +143,7 @@ libcinnamon_la_SOURCES = \ + cinnamon-app-system.c \ + cinnamon-app-usage.c \ + cinnamon-arrow.c \ ++ cinnamon-background-manager.c \ + cinnamon-doc-system.c \ + cinnamon-embedded-window.c \ + cinnamon-generic-container.c \ +diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c +new file mode 100644 +index 0000000..9d95250 +--- /dev/null ++++ b/src/cinnamon-background-manager.c +@@ -0,0 +1,411 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright © 2001 Ximian, Inc. ++ * Copyright (C) 2007 William Jon McCann ++ * Copyright 2007 Red Hat, Inc. ++ * ++ * 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. ++ * ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#define GNOME_DESKTOP_USE_UNSTABLE_API ++#include ++#include ++ ++#include "cinnamon-background-manager.h" ++ ++#define CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerPrivate)) ++ ++struct CinnamonBackgroundManagerPrivate ++{ ++ GSettings *settings; ++ GnomeBG *bg; ++ ++ GnomeBGCrossfade *fade; ++ ++ GDBusProxy *proxy; ++ guint proxy_signal_id; ++}; ++ ++static void cinnamon_background_manager_class_init (CinnamonBackgroundManagerClass *klass); ++static void cinnamon_background_manager_init (CinnamonBackgroundManager *background_manager); ++static void cinnamon_background_manager_finalize (GObject *object); ++ ++static void setup_bg (CinnamonBackgroundManager *manager); ++static void connect_screen_signals (CinnamonBackgroundManager *manager); ++ ++G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT) ++ ++static gpointer manager_object = NULL; ++ ++static gboolean ++dont_draw_background (CinnamonBackgroundManager *manager) ++{ ++ return !g_settings_get_boolean (manager->priv->settings, ++ "draw-background"); ++} ++ ++static void ++on_crossfade_finished (CinnamonBackgroundManager *manager) ++{ ++ g_object_unref (manager->priv->fade); ++ manager->priv->fade = NULL; ++} ++ ++static void ++draw_background (CinnamonBackgroundManager *manager, ++ gboolean use_crossfade) ++{ ++ GdkDisplay *display; ++ int n_screens; ++ int i; ++ ++ display = gdk_display_get_default (); ++ n_screens = gdk_display_get_n_screens (display); ++ ++ for (i = 0; i < n_screens; ++i) { ++ GdkScreen *screen; ++ GdkWindow *root_window; ++ cairo_surface_t *surface; ++ ++ screen = gdk_display_get_screen (display, i); ++ ++ root_window = gdk_screen_get_root_window (screen); ++ ++ surface = gnome_bg_create_surface (manager->priv->bg, ++ root_window, ++ gdk_screen_get_width (screen), ++ gdk_screen_get_height (screen), ++ TRUE); ++ ++ if (use_crossfade) { ++ ++ if (manager->priv->fade != NULL) { ++ g_object_unref (manager->priv->fade); ++ } ++ ++ manager->priv->fade = gnome_bg_set_surface_as_root_with_crossfade (screen, surface); ++ g_signal_connect_swapped (manager->priv->fade, "finished", ++ G_CALLBACK (on_crossfade_finished), ++ manager); ++ } else { ++ gnome_bg_set_surface_as_root (screen, surface); ++ } ++ ++ cairo_surface_destroy (surface); ++ } ++} ++ ++static void ++on_bg_transitioned (GnomeBG *bg, ++ CinnamonBackgroundManager *manager) ++{ ++ draw_background (manager, FALSE); ++} ++ ++static gboolean ++settings_change_event_cb (GSettings *settings, ++ gpointer keys, ++ gint n_keys, ++ CinnamonBackgroundManager *manager) ++{ ++ gnome_bg_load_from_preferences (manager->priv->bg, ++ manager->priv->settings); ++ return FALSE; ++} ++ ++static void ++on_screen_size_changed (GdkScreen *screen, ++ CinnamonBackgroundManager *manager) ++{ ++ draw_background (manager, FALSE); ++} ++ ++static void ++watch_bg_preferences (CinnamonBackgroundManager *manager) ++{ ++ g_signal_connect (manager->priv->settings, ++ "change-event", ++ G_CALLBACK (settings_change_event_cb), ++ manager); ++} ++ ++static void ++on_bg_changed (GnomeBG *bg, ++ CinnamonBackgroundManager *manager) ++{ ++ draw_background (manager, TRUE); ++} ++ ++static void ++setup_bg (CinnamonBackgroundManager *manager) ++{ ++ g_return_if_fail (manager->priv->bg == NULL); ++ ++ manager->priv->bg = gnome_bg_new (); ++ ++ g_signal_connect (manager->priv->bg, ++ "changed", ++ G_CALLBACK (on_bg_changed), ++ manager); ++ ++ g_signal_connect (manager->priv->bg, ++ "transitioned", ++ G_CALLBACK (on_bg_transitioned), ++ manager); ++ ++ connect_screen_signals (manager); ++ watch_bg_preferences (manager); ++ gnome_bg_load_from_preferences (manager->priv->bg, ++ manager->priv->settings); ++} ++ ++static void ++setup_bg_and_draw_background (CinnamonBackgroundManager *manager) ++{ ++ setup_bg (manager); ++ draw_background (manager, FALSE); ++} ++ ++static void ++disconnect_session_manager_listener (CinnamonBackgroundManager *manager) ++{ ++ if (manager->priv->proxy && manager->priv->proxy_signal_id) { ++ g_signal_handler_disconnect (manager->priv->proxy, ++ manager->priv->proxy_signal_id); ++ manager->priv->proxy_signal_id = 0; ++ } ++} ++ ++static void ++on_session_manager_signal (GDBusProxy *proxy, ++ const gchar *sender_name, ++ const gchar *signal_name, ++ GVariant *parameters, ++ gpointer user_data) ++{ ++ CinnamonBackgroundManager *manager = CINNAMON_BACKGROUND_MANAGER (user_data); ++ ++ if (g_strcmp0 (signal_name, "SessionRunning") == 0) { ++ setup_bg_and_draw_background (manager); ++ disconnect_session_manager_listener (manager); ++ } ++} ++ ++static void ++draw_background_after_session_loads (CinnamonBackgroundManager *manager) ++{ ++ GError *error = NULL; ++ GDBusProxyFlags flags; ++ ++ flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | ++ G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; ++ manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, ++ flags, ++ NULL, /* GDBusInterfaceInfo */ ++ "org.gnome.SessionManager", ++ "/org/gnome/SessionManager", ++ "org.gnome.SessionManager", ++ NULL, /* GCancellable */ ++ &error); ++ if (manager->priv->proxy == NULL) { ++ g_warning ("Could not listen to session manager: %s", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy, ++ "g-signal", ++ G_CALLBACK (on_session_manager_signal), ++ manager); ++} ++ ++ ++static void ++disconnect_screen_signals (CinnamonBackgroundManager *manager) ++{ ++ GdkDisplay *display; ++ int i; ++ int n_screens; ++ ++ display = gdk_display_get_default (); ++ n_screens = gdk_display_get_n_screens (display); ++ ++ for (i = 0; i < n_screens; ++i) { ++ GdkScreen *screen; ++ screen = gdk_display_get_screen (display, i); ++ g_signal_handlers_disconnect_by_func (screen, ++ G_CALLBACK (on_screen_size_changed), ++ manager); ++ } ++} ++ ++static void ++connect_screen_signals (CinnamonBackgroundManager *manager) ++{ ++ GdkDisplay *display; ++ int i; ++ int n_screens; ++ ++ display = gdk_display_get_default (); ++ n_screens = gdk_display_get_n_screens (display); ++ ++ for (i = 0; i < n_screens; ++i) { ++ GdkScreen *screen; ++ screen = gdk_display_get_screen (display, i); ++ g_signal_connect (screen, ++ "monitors-changed", ++ G_CALLBACK (on_screen_size_changed), ++ manager); ++ g_signal_connect (screen, ++ "size-changed", ++ G_CALLBACK (on_screen_size_changed), ++ manager); ++ } ++} ++ ++static void ++draw_background_changed (GSettings *settings, ++ const char *key, ++ CinnamonBackgroundManager *manager) ++{ ++ if (dont_draw_background (manager) == FALSE) ++ setup_bg_and_draw_background (manager); ++} ++ ++gboolean ++cinnamon_background_manager_start (CinnamonBackgroundManager *manager) ++{ ++ manager->priv->settings = g_settings_new ("org.cinnamon.background"); ++ g_signal_connect (manager->priv->settings, "changed::draw-background", ++ G_CALLBACK (draw_background_changed), manager); ++ ++ setup_bg_and_draw_background (manager); ++ //draw_background_after_session_loads (manager); ++ ++ ++ return TRUE; ++} ++ ++void ++cinnamon_background_manager_stop (CinnamonBackgroundManager *manager) ++{ ++ CinnamonBackgroundManagerPrivate *p = manager->priv; ++ ++ g_debug ("Stopping background manager"); ++ ++ disconnect_screen_signals (manager); ++ ++ if (manager->priv->proxy) { ++ disconnect_session_manager_listener (manager); ++ g_object_unref (manager->priv->proxy); ++ } ++ ++ g_signal_handlers_disconnect_by_func (manager->priv->settings, ++ settings_change_event_cb, ++ manager); ++ ++ if (p->settings != NULL) { ++ g_object_unref (p->settings); ++ p->settings = NULL; ++ } ++ ++ if (p->bg != NULL) { ++ g_object_unref (p->bg); ++ p->bg = NULL; ++ } ++} ++ ++/** ++ * cinnamon_background_manager_get_default: ++ * ++ * Return Value: (transfer none): The global #CinnamonBackgroundManager singleton ++ */ ++CinnamonBackgroundManager * ++cinnamon_background_manager_get_default () ++{ ++ static CinnamonBackgroundManager *instance = NULL; ++ ++ if (instance == NULL) ++ instance = g_object_new (CINNAMON_TYPE_BACKGROUND_MANAGER, NULL); ++ ++ return instance; ++} ++ ++static GObject * ++cinnamon_background_manager_constructor (GType type, ++ guint n_construct_properties, ++ GObjectConstructParam *construct_properties) ++{ ++ CinnamonBackgroundManager *background_manager; ++ ++ background_manager = CINNAMON_BACKGROUND_MANAGER (G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->constructor (type, ++ n_construct_properties, ++ construct_properties)); ++ ++ return G_OBJECT (background_manager); ++} ++ ++static void ++cinnamon_background_manager_class_init (CinnamonBackgroundManagerClass *klass) ++{ ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ object_class->constructor = cinnamon_background_manager_constructor; ++ object_class->finalize = cinnamon_background_manager_finalize; ++ ++ g_type_class_add_private (klass, sizeof (CinnamonBackgroundManagerPrivate)); ++} ++ ++static void ++cinnamon_background_manager_init (CinnamonBackgroundManager *manager) ++{ ++ manager->priv = CINNAMON_BACKGROUND_MANAGER_GET_PRIVATE (manager); ++ cinnamon_background_manager_start (manager); ++} ++ ++static void ++cinnamon_background_manager_finalize (GObject *object) ++{ ++ CinnamonBackgroundManager *background_manager; ++ ++ g_return_if_fail (object != NULL); ++ g_return_if_fail (CINNAMON_IS_BACKGROUND_MANAGER (object)); ++ ++ background_manager = CINNAMON_BACKGROUND_MANAGER (object); ++ ++ g_return_if_fail (background_manager->priv != NULL); ++ ++ G_OBJECT_CLASS (cinnamon_background_manager_parent_class)->finalize (object); ++} +diff --git a/src/cinnamon-background-manager.h b/src/cinnamon-background-manager.h +new file mode 100644 +index 0000000..9a56e32 +--- /dev/null ++++ b/src/cinnamon-background-manager.h +@@ -0,0 +1,57 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2007 William Jon McCann ++ * ++ * 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. ++ * ++ */ ++ ++#ifndef __CINNAMON_BACKGROUND_MANAGER_H ++#define __CINNAMON_BACKGROUND_MANAGER_H ++ ++#include ++ ++G_BEGIN_DECLS ++ ++#define CINNAMON_TYPE_BACKGROUND_MANAGER (cinnamon_background_manager_get_type ()) ++#define CINNAMON_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManager)) ++#define CINNAMON_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass)) ++#define CINNAMON_IS_BACKGROUND_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CINNAMON_TYPE_BACKGROUND_MANAGER)) ++#define CINNAMON_IS_BACKGROUND_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), CINNAMON_TYPE_BACKGROUND_MANAGER)) ++#define CINNAMON_BACKGROUND_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), CINNAMON_TYPE_BACKGROUND_MANAGER, CinnamonBackgroundManagerClass)) ++ ++typedef struct CinnamonBackgroundManagerPrivate CinnamonBackgroundManagerPrivate; ++ ++typedef struct ++{ ++ GObject parent; ++ CinnamonBackgroundManagerPrivate *priv; ++} CinnamonBackgroundManager; ++ ++typedef struct ++{ ++ GObjectClass parent_class; ++} CinnamonBackgroundManagerClass; ++ ++GType cinnamon_background_manager_get_type (void); ++ ++CinnamonBackgroundManager *cinnamon_background_manager_get_default (void); ++ ++gboolean cinnamon_background_manager_start (CinnamonBackgroundManager *manager); ++void cinnamon_background_manager_stop (CinnamonBackgroundManager *manager); ++ ++G_END_DECLS ++ ++#endif /* __CINNAMON_BACKGROUND_MANAGER_H */ +-- +1.8.1.6 + + +From 590a48961f2c7a1b18fb914a1d7212ffcdf03017 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Tue, 16 Apr 2013 18:28:16 -0400 +Subject: [PATCH 04/15] Change default background + +--- + data/org.cinnamon.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in +index 6f55477..35b0972 100644 +--- a/data/org.cinnamon.gschema.xml.in ++++ b/data/org.cinnamon.gschema.xml.in +@@ -782,7 +782,7 @@ + + + +- 'file://@datadir@/themes/Adwaita/backgrounds/adwaita-timed.xml' ++ 'file:///usr/share/backgrounds/linuxmint/default_background.jpg' + <_summary>Picture URI + <_description> + URI to use for the background image. Not that the backend only supports +-- +1.8.1.6 + + +From ac8b0954c7506ae88059e488539f88d55329f070 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Tue, 16 Apr 2013 18:41:16 -0400 +Subject: [PATCH 05/15] Use distro-agnostic background.. + +--- + data/org.cinnamon.gschema.xml.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in +index 35b0972..0d01089 100644 +--- a/data/org.cinnamon.gschema.xml.in ++++ b/data/org.cinnamon.gschema.xml.in +@@ -782,7 +782,7 @@ + + + +- 'file:///usr/share/backgrounds/linuxmint/default_background.jpg' ++ 'file:///usr/share/themes/Adwaita/backgrounds/adwaita-timed.xml' + <_summary>Picture URI + <_description> + URI to use for the background image. Not that the backend only supports +-- +1.8.1.6 + + +From 81dbccb60231744999463a5b84c7c36358570929 Mon Sep 17 00:00:00 2001 +From: dalcde +Date: Mon, 15 Apr 2013 18:34:48 +0800 +Subject: [PATCH 06/15] [GDbus] Port DBus to GDBus (AltLinux patch) + +--- + .../applets/brightness@cinnamon.org/applet.js | 39 ++-- + .../cinnamon/applets/power@cinnamon.org/applet.js | 102 +++++---- + .../cinnamon/applets/sound@cinnamon.org/applet.js | 244 +++++---------------- + .../cinnamon/applets/xrandr@cinnamon.org/applet.js | 19 +- + js/misc/gnomeSession.js | 147 ++++--------- + js/misc/modemManager.js | 79 ++++--- + js/misc/screenSaver.js | 89 ++++---- + js/ui/appletManager.js | 1 - + js/ui/automountManager.js | 106 +++++---- + js/ui/autorunManager.js | 27 +-- + js/ui/calendar.js | 71 +++--- + js/ui/cinnamonDBus.js | 96 ++++---- + js/ui/endSessionDialog.js | 79 ++++--- + js/ui/keyboard.js | 48 ++-- + js/ui/layout.js | 14 +- + js/ui/magnifierDBus.js | 134 +++++++---- + js/ui/main.js | 6 - + js/ui/messageTray.js | 13 +- + js/ui/notificationDaemon.js | 193 ++++++++-------- + js/ui/scripting.js | 34 ++- + 20 files changed, 688 insertions(+), 853 deletions(-) + +diff --git a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js +index 9cbda80..9087b25 100644 +--- a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js +@@ -5,7 +5,6 @@ const St = imports.gi.St; + const PopupMenu = imports.ui.popupMenu; + const GLib = imports.gi.GLib; + const Gio = imports.gi.Gio; +-const DBus = imports.dbus; + + /* constants */ + const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power"; +@@ -14,24 +13,25 @@ const DimSettingsBattery = "idle-dim-battery"; + const PowerBusName = 'org.gnome.SettingsDaemon'; + const PowerObjectPath = '/org/gnome/SettingsDaemon/Power'; + +-/* DBus interface */ +-const PowerManagerInterface = { +- name: 'org.gnome.SettingsDaemon.Power.Screen', +- methods: +- [ +- { name: 'GetPercentage', inSignature: '', outSignature: 'u' }, +- { name: 'SetPercentage', inSignature: 'u', outSignature: 'u' }, +- { name: 'StepUp', inSignature: '', outSignature: 'u' }, +- { name: 'StepDown', inSignature: '', outSignature: 'u' }, +- ], +- signals: +- [ +- { name: 'Changed', inSignature: '', outSignature: '' }, +- ] +-}; ++const PowerManagerInterface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; + + /* DBus magic */ +-let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface); ++const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface); + + /* TextImageMenuItem taken from sound@cinnamon.org applet */ + let icon_path = "/usr/share/cinnamon/theme/"; +@@ -100,7 +100,7 @@ MyApplet.prototype = { + Applet.IconApplet.prototype._init.call(this, orientation, panel_height); + + try { +- this._proxy = new PowerManagerProxy(DBus.session, PowerBusName, PowerObjectPath); ++ this._proxy = new PowerManagerProxy(Gio.DBus.session, PowerBusName, PowerObjectPath); + + this.menuManager = new PopupMenu.PopupMenuManager(this); + this.menu = new Applet.AppletPopupMenu(this, orientation); +@@ -137,7 +137,8 @@ MyApplet.prototype = { + this.menu.addMenuItem(this._settingsMenu); + + //get notified +- this._proxy.connect('Changed', Lang.bind(this, this._getBrightness)); ++ this._proxy.connectSignal('Changed', Lang.bind(this, this._getBrightness)); ++ + this.actor.connect('scroll-event', Lang.bind(this, this._onScrollEvent)); + } else { + this.set_applet_tooltip(_("Brightness")); +diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +index c342fe7..b6b2bcd 100644 +--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +@@ -1,6 +1,5 @@ + const Applet = imports.ui.applet; + const Gio = imports.gi.Gio; +-const DBus = imports.dbus; + const Lang = imports.lang; + const St = imports.gi.St; + const PopupMenu = imports.ui.popupMenu; +@@ -42,34 +41,46 @@ const LabelDisplay = { + TIME: 'time' + }; + +-const PowerManagerInterface = { +- name: 'org.gnome.SettingsDaemon.Power', +- methods: [ +- { name: 'GetDevices', inSignature: '', outSignature: 'a(susdut)' }, +- { name: 'GetPrimaryDevice', inSignature: '', outSignature: '(susdut)' }, +- ], +- signals: [ +- { name: 'PropertiesChanged', inSignature: 's,a{sv},a[s]' }, +- ], +- properties: [ +- { name: 'Icon', signature: 's', access: 'read' }, +- ] +-}; +-let PowerManagerProxy = DBus.makeProxyClass(PowerManagerInterface); +- +-const SettingsManagerInterface = { +- name: 'org.freedesktop.DBus.Properties', +- methods: [ +- { name: 'Get', inSignature: 's,s', outSignature: 'v' }, +- { name: 'GetAll', inSignature: 's', outSignature: 'a{sv}' }, +- { name: 'Set', inSignature: 's,s,v', outSignature: '' } +- ], +- signals: [ +- {name: 'PropertiesChanged', inSignature:'s,a{sv},a[s]', outSignature:''} +- ] +-}; +- +-let SettingsManagerProxy = DBus.makeProxyClass(SettingsManagerInterface); ++const PowerManagerInterface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; ++ ++const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface); ++ ++const SettingsManagerInterface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; ++ ++const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface); + + function DeviceItem() { + this._init.apply(this, arguments); +@@ -143,11 +154,11 @@ MyApplet.prototype = { + this.menuManager = new PopupMenu.PopupMenuManager(this); + this.menu = new Applet.AppletPopupMenu(this, orientation); + this.menuManager.addMenu(this.menu); +- +- this.set_applet_icon_symbolic_name('battery-missing'); +- this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH); +- this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH); +- ++ ++ //this.set_applet_icon_symbolic_name('battery-missing'); ++ this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); ++ this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); ++ + let icon = this.actor.get_children()[0]; + this.actor.remove_actor(icon); + let box = new St.BoxLayout({ name: 'batteryBox' }); +@@ -306,18 +317,19 @@ MyApplet.prototype = { + this._devicesChanged(); + }, + +- _devicesChanged: function() { +- this.set_applet_icon_symbolic_name('battery-missing'); +- this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) { +- if (icon) { +- let gicon = Gio.icon_new_for_string(icon); +- this._applet_icon.gicon = gicon; +- this.actor.show(); +- } else { +- this.menu.close(); +- this.actor.hide(); +- } +- })); ++ ++ _devicesChanged: function() { ++ this.set_applet_icon_symbolic_name('battery-missing'); ++ let icon = this._proxy.Icon; ++ if (icon) { ++ let gicon = Gio.icon_new_for_string(icon); ++ this.setGIcon(gicon); ++ this.actor.show(); ++ } else { ++ this.menu.close(); ++ this.actor.hide(); ++ } ++ + this._readPrimaryDevice(); + this._readOtherDevices(); + this._updateLabel(); +diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +index 1113b1e..5bfaf26 100644 +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -1,7 +1,6 @@ + const Applet = imports.ui.applet; + const Mainloop = imports.mainloop; + const Gio = imports.gi.Gio; +-const DBus = imports.dbus; + const Lang = imports.lang; + const Cinnamon = imports.gi.Cinnamon; + const Clutter = imports.gi.Clutter; +@@ -12,90 +11,45 @@ const Gvc = imports.gi.Gvc; + const Pango = imports.gi.Pango; + const Tooltips = imports.ui.tooltips; + +-const PropIFace = { +- name: 'org.freedesktop.DBus.Properties', +- signals: [{ name: 'PropertiesChanged', +- inSignature: 'a{sv}'}] +-}; +- +-const MediaServer2IFace = { +- name: 'org.mpris.MediaPlayer2', +- methods: [{ name: 'Raise', +- inSignature: '', +- outSignature: '' }, +- { name: 'Quit', +- inSignature: '', +- outSignature: '' }], +- properties: [{ name: 'CanRaise', +- signature: 'b', +- access: 'read'}, +- { name: 'CanQuit', +- signature: 'b', +- access: 'read'}], +-}; +- +-const MediaServer2PlayerIFace = { +- name: 'org.mpris.MediaPlayer2.Player', +- methods: [{ name: 'PlayPause', +- inSignature: '', +- outSignature: '' }, +- { name: 'Pause', +- inSignature: '', +- outSignature: '' }, +- { name: 'Play', +- inSignature: '', +- outSignature: '' }, +- { name: 'Stop', +- inSignature: '', +- outSignature: '' }, +- { name: 'Next', +- inSignature: '', +- outSignature: '' }, +- { name: 'Previous', +- inSignature: '', +- outSignature: '' }, +- { name: 'SetPosition', +- inSignature: 'a{ov}', +- outSignature: '' }], +- properties: [{ name: 'Metadata', +- signature: 'a{sv}', +- access: 'read'}, +- { name: 'Shuffle', +- signature: 'b', +- access: 'readwrite'}, +- { name: 'Rate', +- signature: 'd', +- access: 'readwrite'}, +- { name: 'LoopStatus', +- signature: 'b', +- access: 'readwrite'}, +- { name: 'Volume', +- signature: 'd', +- access: 'readwrite'}, +- { name: 'PlaybackStatus', +- signature: 's', +- access: 'read'}, +- { name: 'Position', +- signature: 'x', +- access: 'read'}, +- { name: 'CanGoNext', +- signature: 'b', +- access: 'read'}, +- { name: 'CanGoPrevious', +- signature: 'b', +- access: 'read'}, +- { name: 'CanPlay', +- signature: 'b', +- access: 'read'}, +- { name: 'CanPause', +- signature: 'b', +- access: 'read'}, +- { name: 'CanSeek', +- signature: 'b', +- access: 'read'}], +- signals: [{ name: 'Seeked', +- inSignature: 'x' }] +-}; ++const PropIFace = ++ ++ ++ ++; ++ ++const MediaServer2IFace = ++ ++ ++ ++ ++; ++ ++const MediaServer2PlayerIFace = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; + + /* global values */ + let icon_path = "/usr/share/cinnamon/theme/"; +@@ -112,120 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */ + const ICON_SIZE = 28; + + +-function Prop() { +- this._init.apply(this, arguments); ++var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace); ++function Prop(owner, initCallback, cancellable) { ++ return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); + } + +-Prop.prototype = { +- _init: function(owner) { +- DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this); +- } ++var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace); ++function MediaServer2(owner, initCallback, cancellable) { ++ return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); + } +-DBus.proxifyPrototype(Prop.prototype, PropIFace) + +-function MediaServer2() { +- this._init.apply(this, arguments); +-} +- +-MediaServer2.prototype = { +- _init: function(owner) { +- DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this); +- }, +- getRaise: function(callback) { +- this.GetRemote('CanRaise', Lang.bind(this, +- function(raise, ex) { +- if (!ex) +- callback(this, raise); +- })); +- }, +- getQuit: function(callback) { +- this.GetRemote('CanQuit', Lang.bind(this, +- function(quit, ex) { +- if (!ex) +- callback(this, quit); +- })); +- } +-} +-DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace) +- +-function MediaServer2Player() { +- this._init.apply(this, arguments); +-} +- +-MediaServer2Player.prototype = { +- _init: function(owner) { +- this._owner = owner; +- DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this); +- }, +- getMetadata: function(callback) { +- this.GetRemote('Metadata', Lang.bind(this, +- function(metadata, ex) { +- if (!ex) +- callback(this, metadata); +- })); +- }, +- getPlaybackStatus: function(callback) { +- this.GetRemote('PlaybackStatus', Lang.bind(this, +- function(status, ex) { +- if (!ex) +- callback(this, status); +- })); +- }, +- getRate: function(callback) { +- this.GetRemote('Rate', Lang.bind(this, +- function(rate, ex) { +- if (!ex) +- callback(this, rate); +- })); +- }, +- getPosition: function(callback) { +- this.GetRemote('Position', Lang.bind(this, +- function(position, ex) { +- if (!ex) +- callback(this, position); +- })); +- }, +- getShuffle: function(callback) { +- this.GetRemote('Shuffle', Lang.bind(this, +- function(shuffle, ex) { +- if (!ex) +- callback(this, shuffle); +- })); +- }, +- setShuffle: function(value) { +- this.SetRemote('Shuffle', value); +- }, +- getVolume: function(callback) { +- this.GetRemote('Volume', Lang.bind(this, +- function(volume, ex) { +- if (!ex) +- callback(this, volume); +- })); +- }, +- setVolume: function(value) { +- this.SetRemote('Volume', parseFloat(value)); +- }, +- getRepeat: function(callback) { +- this.GetRemote('LoopStatus', Lang.bind(this, +- function(repeat, ex) { +- if (!ex) { +- if (repeat == "None") +- repeat = false +- else +- repeat = true +- callback(this, repeat); +- } +- })); +- }, +- setRepeat: function(value) { +- if (value) +- value = "Playlist" +- else +- value = "None" +- this.SetRemote('LoopStatus', value); +- } ++var MediaServer2PlayerProxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2PlayerIFace); ++function MediaServer2Player(owner, initCallback, cancellable) { ++ return new MediaServer2PlayerProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); + } +-DBus.proxifyPrototype(MediaServer2Player.prototype, MediaServer2PlayerIFace) + + function TrackInfo() { + this._init.apply(this, arguments); +@@ -715,7 +569,7 @@ MyApplet.prototype = { + this._players = {}; + // watch players + for (var p=0; p ++ ++ ++ ++ ++; ++ ++const XRandr2 = Gio.DBusProxy.makeProxyWrapper(XRandr2Iface); + + function MyApplet(orientation, panel_height) { + this._init(orientation, panel_height); +@@ -48,7 +49,7 @@ MyApplet.prototype = { + this.menu = new Applet.AppletPopupMenu(this, orientation); + this.menuManager.addMenu(this.menu); + +- this._proxy = new XRandr2(DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR'); ++ this._proxy = new XRandr2(Gio.DBus.session, 'org.gnome.SettingsDaemon', '/org/gnome/SettingsDaemon/XRANDR'); + + try { + this._screen = new GnomeDesktop.RRScreen({ gdk_screen: Gdk.Screen.get_default() }); +diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js +index a2b61fd..e21d3a8 100644 +--- a/js/misc/gnomeSession.js ++++ b/js/misc/gnomeSession.js +@@ -1,20 +1,18 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +-const DBus = imports.dbus; ++const Gio = imports.gi.Gio; + const Lang = imports.lang; + const Signals = imports.signals; + +-const PresenceIface = { +- name: 'org.gnome.SessionManager.Presence', +- methods: [{ name: 'SetStatus', +- inSignature: 'u', +- outSignature: '' }], +- properties: [{ name: 'status', +- signature: 'u', +- access: 'readwrite' }], +- signals: [{ name: 'StatusChanged', +- inSignature: 'u' }] +-}; ++const PresenceIface = ++ ++ ++ ++ ++ ++ ++ ++; + + const PresenceStatus = { + AVAILABLE: 0, +@@ -23,104 +21,37 @@ const PresenceStatus = { + IDLE: 3 + }; + +-function Presence() { +- this._init(); ++var PresenceProxy = Gio.DBusProxy.makeProxyWrapper(PresenceIface); ++function Presence(initCallback, cancellable) { ++ return new PresenceProxy(Gio.DBus.session, 'org.gnome.SessionManager', ++ '/org/gnome/SessionManager/Presence', initCallback, cancellable); + } + +-Presence.prototype = { +- _init: function() { +- DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager/Presence', this); +- }, +- +- getStatus: function(callback) { +- this.GetRemote('status', Lang.bind(this, +- function(status, ex) { +- if (!ex) +- callback(this, status); +- })); +- }, +- +- setStatus: function(status) { +- this.SetStatusRemote(status); +- } +-}; +-DBus.proxifyPrototype(Presence.prototype, PresenceIface); +- +-// Note inhibitors are immutable objects, so they don't +-// change at runtime (changes always come in the form +-// of new inhibitors) +-const InhibitorIface = { +- name: 'org.gnome.SessionManager.Inhibitor', +- properties: [{ name: 'app_id', +- signature: 's', +- access: 'readonly' }, +- { name: 'client_id', +- signature: 's', +- access: 'readonly' }, +- { name: 'reason', +- signature: 's', +- access: 'readonly' }, +- { name: 'flags', +- signature: 'u', +- access: 'readonly' }, +- { name: 'toplevel_xid', +- signature: 'u', +- access: 'readonly' }, +- { name: 'cookie', +- signature: 'u', +- access: 'readonly' }], +-}; +- +-function Inhibitor(objectPath) { +- this._init(objectPath); ++const InhibitorIface = ++ ++ ++ ++ ++ ++ ++; ++ ++var InhibitorProxy = Gio.DBusProxy.makeProxyWrapper(InhibitorIface); ++function Inhibitor(objectPath, initCallback, cancellable) { ++ return new InhibitorProxy(Gio.DBus.session, 'org.gnome.SessionManager', objectPath, initCallback, cancellable); + } + +-Inhibitor.prototype = { +- _init: function(objectPath) { +- DBus.session.proxifyObject(this, +- 'org.gnome.SessionManager', +- objectPath); +- this.isLoaded = false; +- this._loadingPropertiesCount = InhibitorIface.properties.length; +- for (let i = 0; i < InhibitorIface.properties.length; i++) { +- let propertyName = InhibitorIface.properties[i].name; +- this.GetRemote(propertyName, Lang.bind(this, +- function(value, exception) { +- if (exception) +- return; +- +- this[propertyName] = value; +- this._loadingPropertiesCount--; +- +- if (this._loadingPropertiesCount == 0) { +- this.isLoaded = true; +- this.emit('is-loaded'); +- } +- })); +- } +- }, +-}; +-DBus.proxifyPrototype(Inhibitor.prototype, InhibitorIface); +-Signals.addSignalMethods(Inhibitor.prototype); +- +- +-// Not the full interface, only the methods we use +-const SessionManagerIface = { +- name: 'org.gnome.SessionManager', +- methods: [ +- { name: 'Logout', inSignature: 'u', outSignature: '' }, +- { name: 'Shutdown', inSignature: '', outSignature: '' }, +- { name: 'CanShutdown', inSignature: '', outSignature: 'b' } +- ] +-}; +- +-function SessionManager() { +- this._init(); ++const SessionManagerIface = ++ ++ ++ ++ ++ ++ ++ ++; ++ ++var SessionManagerProxy = Gio.DBusProxy.makeProxyWrapper(SessionManagerIface); ++function SessionManager(initCallback, cancellable) { ++ return new SessionManagerProxy(Gio.DBus.session, 'org.gnome.SessionManager', '/org/gnome/SessionManager', initCallback, cancellable); + } +- +-SessionManager.prototype = { +- _init: function() { +- DBus.session.proxifyObject(this, 'org.gnome.SessionManager', '/org/gnome/SessionManager'); +- } +-}; +-DBus.proxifyPrototype(SessionManager.prototype, SessionManagerIface); +\ No newline at end of file +diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js +index befd142..f35f925 100644 +--- a/js/misc/modemManager.js ++++ b/js/misc/modemManager.js +@@ -1,6 +1,6 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +-const DBus = imports.dbus; ++const Gio = imports.gi.Gio; + const Lang = imports.lang; + const Cinnamon = imports.gi.Cinnamon; + const Signals = imports.signals; +@@ -8,33 +8,43 @@ const Signals = imports.signals; + // The following are not the complete interfaces, just the methods we need + // (or may need in the future) + +-const ModemGsmNetworkInterface = { +- name: 'org.freedesktop.ModemManager.Modem.Gsm.Network', +- methods: [ +- { name: 'GetRegistrationInfo', inSignature: '', outSignature: 'uss' }, +- { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' } +- ], +- properties: [ +- { name: 'AccessTechnology', signature: 'u', access: 'read' } +- ], +- signals: [ +- { name: 'SignalQuality', inSignature: 'u' }, +- { name: 'RegistrationInfo', inSignature: 'uss' } +- ] +-}; +-const ModemGsmNetworkProxy = DBus.makeProxyClass(ModemGsmNetworkInterface); +- +-const ModemCdmaInterface = { +- name: 'org.freedesktop.ModemManager.Modem.Cdma', +- methods: [ +- { name: 'GetSignalQuality', inSignature: '', outSignature: 'u' }, +- { name: 'GetServingSystem', inSignature: '', outSignature: 'usu' } +- ], +- signals: [ +- { name: 'SignalQuality', inSignature: 'u' } +- ] +-}; +-const ModemCdmaProxy = DBus.makeProxyClass(ModemCdmaInterface); ++const ModemGsmNetworkInterface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; ++ ++const ModemGsmNetworkProxy = Gio.DBusProxy.makeProxyWrapper(ModemGsmNetworkInterface); ++ ++const ModemCdmaInterface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; ++ ++const ModemCdmaProxy = Gio.DBusProxy.makeProxyWrapper(ModemCdmaInterface); + + let _providersTable; + function _getProvidersTable() { +@@ -50,17 +60,17 @@ function ModemGsm() { + + ModemGsm.prototype = { + _init: function(path) { +- this._proxy = new ModemGsmNetworkProxy(DBus.system, 'org.freedesktop.ModemManager', path); ++ this._proxy = new ModemGsmNetworkProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path); + + this.signal_quality = 0; + this.operator_name = null; + + // Code is duplicated because the function have different signatures +- this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) { ++ this._proxy.connectSignal('SignalQuality', Lang.bind(this, function(proxy, sender, [quality]) { + this.signal_quality = quality; + this.emit('notify::signal-quality'); + })); +- this._proxy.connect('RegistrationInfo', Lang.bind(this, function(proxy, status, code, name) { ++ this._proxy.connectSignal('RegistrationInfo', Lang.bind(this, function(proxy, sender, [status, code, name]) { + this.operator_name = this._findOperatorName(name, code); + this.emit('notify::operator-name'); + })); +@@ -154,12 +164,13 @@ function ModemCdma() { + } + + ModemCdma.prototype = { +- _init: function(path) { +- this._proxy = new ModemCdmaProxy(DBus.system, 'org.freedesktop.ModemManager', path); ++ _init: function(path) { ++ this._proxy = new ModemCdmaProxy(Gio.DBus.system, 'org.freedesktop.ModemManager', path); + + this.signal_quality = 0; + this.operator_name = null; +- this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, quality) { ++ this._proxy.connect('SignalQuality', Lang.bind(this, function(proxy, sender, params) { ++ this.signal_quality = params[0]; + this.signal_quality = quality; + this.emit('notify::signal-quality'); + +diff --git a/js/misc/screenSaver.js b/js/misc/screenSaver.js +index c471856..aec883f 100644 +--- a/js/misc/screenSaver.js ++++ b/js/misc/screenSaver.js +@@ -1,53 +1,48 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +-const DBus = imports.dbus; + const Lang = imports.lang; +- +-const ScreenSaverIface = { +- name: 'org.gnome.ScreenSaver', +- methods: [{ name: 'GetActive', +- inSignature: '', +- outSignature: 'b' }, +- { name: 'Lock', +- inSignature: '' }, +- { name: 'SetActive', +- inSignature: 'b' }], +- signals: [{ name: 'ActiveChanged', +- inSignature: 'b' }] +-}; ++const Gio = imports.gi.Gio; ++ ++const ScreenSaverIface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; ++ ++const ScreenSaverInfo = Gio.DBusInterfaceInfo.new_for_xml(ScreenSaverIface); + + function ScreenSaverProxy() { +- this._init(); ++ var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session, ++ g_interface_name: ScreenSaverInfo.name, ++ g_interface_info: ScreenSaverInfo, ++ g_name: 'org.gnome.ScreenSaver', ++ g_object_path: '/org/gnome/ScreenSaver', ++ g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START | ++ Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) }); ++ self.init(null); ++ self.screenSaverActive = false; ++ ++ self.connectSignal('ActiveChanged', function(proxy, senderName, [isActive]) { ++ self.screenSaverActive = isActive; ++ }); ++ self.connect('notify::g-name-owner', function() { ++ if (self.g_name_owner) { ++ self.GetActiveRemote(function(result, excp) { ++ if (result) { ++ let [isActive] = result; ++ self.screenSaverActive = isActive; ++ } ++ }); ++ } else ++ self.screenSaverActive = false; ++ }); ++ ++ return self; + } +- +-ScreenSaverProxy.prototype = { +- _init: function() { +- DBus.session.proxifyObject(this, +- 'org.gnome.ScreenSaver', +- '/org/gnome/ScreenSaver'); +- +- DBus.session.watch_name('org.gnome.ScreenSaver', +- false, // do not launch a name-owner if none exists +- Lang.bind(this, this._onSSAppeared), +- Lang.bind(this, this._onSSVanished)); +- +- this.screenSaverActive = false; +- this.connect('ActiveChanged', +- Lang.bind(this, this._onActiveChanged)); +- }, +- +- _onSSAppeared: function(owner) { +- this.GetActiveRemote(Lang.bind(this, function(isActive) { +- this.screenSaverActive = isActive; +- })) +- }, +- +- _onSSVanished: function(oldOwner) { +- this.screenSaverActive = false; +- }, +- +- _onActiveChanged: function(object, isActive) { +- this.screenSaverActive = isActive; +- } +-}; +-DBus.proxifyPrototype(ScreenSaverProxy.prototype, ScreenSaverIface); +diff --git a/js/ui/appletManager.js b/js/ui/appletManager.js +index abf8136..830d80d 100644 +--- a/js/ui/appletManager.js ++++ b/js/ui/appletManager.js +@@ -7,7 +7,6 @@ const Cinnamon = imports.gi.Cinnamon; + const Main = imports.ui.main; + const Applet = imports.ui.applet; + const Extension = imports.ui.extension; +-const DBus = imports.dbus; + + // Maps uuid -> metadata object + var appletMeta; +diff --git a/js/ui/automountManager.js b/js/ui/automountManager.js +index fa73bfe..f29f9f3 100644 +--- a/js/ui/automountManager.js ++++ b/js/ui/automountManager.js +@@ -1,7 +1,6 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + + const Lang = imports.lang; +-const DBus = imports.dbus; + const Mainloop = imports.mainloop; + const Gio = imports.gi.Gio; + const Params = imports.misc.params; +@@ -15,63 +14,57 @@ const SETTING_ENABLE_AUTOMOUNT = 'automount'; + + const AUTORUN_EXPIRE_TIMEOUT_SECS = 10; + +-const ConsoleKitSessionIface = { +- name: 'org.freedesktop.ConsoleKit.Session', +- methods: [{ name: 'IsActive', +- inSignature: '', +- outSignature: 'b' }], +- signals: [{ name: 'ActiveChanged', +- inSignature: 'b' }] +-}; ++const ConsoleKitSessionIface = ++ ++ ++ ++ ++ ++ ++; + +-const ConsoleKitSessionProxy = DBus.makeProxyClass(ConsoleKitSessionIface); ++const ConsoleKitSessionProxy = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface); + +-const ConsoleKitManagerIface = { +- name: 'org.freedesktop.ConsoleKit.Manager', +- methods: [{ name: 'GetCurrentSession', +- inSignature: '', +- outSignature: 'o' }] +-}; ++const ConsoleKitManagerIface = ++ ++ ++ ++; + +-function ConsoleKitManager() { +- this._init(); +-}; +- +-ConsoleKitManager.prototype = { +- _init: function() { +- this.sessionActive = true; +- +- DBus.system.proxifyObject(this, +- 'org.freedesktop.ConsoleKit', +- '/org/freedesktop/ConsoleKit/Manager'); ++const ConsoleKitManagerInfo = Gio.DBusInterfaceInfo.new_for_xml(ConsoleKitManagerIface); + +- DBus.system.watch_name('org.freedesktop.ConsoleKit', +- false, // do not launch a name-owner if none exists +- Lang.bind(this, this._onManagerAppeared), +- Lang.bind(this, this._onManagerVanished)); +- }, +- +- _onManagerAppeared: function(owner) { +- this.GetCurrentSessionRemote(Lang.bind(this, this._onCurrentSession)); +- }, +- +- _onManagerVanished: function(oldOwner) { +- this.sessionActive = true; +- }, +- +- _onCurrentSession: function(session) { +- this._ckSession = new ConsoleKitSessionProxy(DBus.system, 'org.freedesktop.ConsoleKit', session); +- +- this._ckSession.connect +- ('ActiveChanged', Lang.bind(this, function(object, isActive) { +- this.sessionActive = isActive; +- })); +- this._ckSession.IsActiveRemote(Lang.bind(this, function(isActive) { +- this.sessionActive = isActive; +- })); ++function ConsoleKitManager() { ++ var self = new Gio.DBusProxy({ g_connection: Gio.DBus.system, ++ g_interface_name: ConsoleKitManagerInfo.name, ++ g_interface_info: ConsoleKitManagerInfo, ++ g_name: 'org.freedesktop.ConsoleKit', ++ g_object_path: '/org/freedesktop/ConsoleKit/Manager', ++ g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START | ++ Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) }); ++ ++ self._updateSessionActive = function() { ++ if (self.g_name_owner) { ++ self.GetCurrentSessionRemote(function([session]) { ++ self._ckSession = new ConsoleKitSessionProxy(Gio.DBus.system, 'org.freedesktop.ConsoleKit', session); ++ ++ self._ckSession.connectSignal('ActiveChanged', function(object, senderName, [isActive]) { ++ self.sessionActive = isActive; ++ }); ++ self._ckSession.IsActiveRemote(function([isActive]) { ++ self.sessionActive = isActive; ++ }); ++ }); ++ } else { ++ self.sessionActive = true; ++ } + } +-}; +-DBus.proxifyPrototype(ConsoleKitManager.prototype, ConsoleKitManagerIface); ++ self.connect('notify::g-name-owner', ++ Lang.bind(self, self._updateSessionActive)); ++ ++ self._updateSessionActive(); ++ self.init(null); ++ return self; ++} + + function AutomountManager() { + this._init(); +@@ -85,9 +78,8 @@ AutomountManager.prototype = { + this.ckListener = new ConsoleKitManager(); + + this._ssProxy = new ScreenSaver.ScreenSaverProxy(); +- this._ssProxy.connect('ActiveChanged', +- Lang.bind(this, +- this._screenSaverActiveChanged)); ++ this._ssProxy.connectSignal('ActiveChanged', ++ Lang.bind(this, this._screenSaverActiveChanged)); + + this._volumeMonitor = Gio.VolumeMonitor.get(); + +@@ -110,7 +102,7 @@ AutomountManager.prototype = { + Mainloop.idle_add(Lang.bind(this, this._startupMountAll)); + }, + +- _screenSaverActiveChanged: function(object, isActive) { ++ _screenSaverActiveChanged: function(object, senderName, [isActive]) { + if (!isActive) { + this._volumeQueue.forEach(Lang.bind(this, function(volume) { + this._checkAndMountVolume(volume); +diff --git a/js/ui/autorunManager.js b/js/ui/autorunManager.js +index 02cd4da..99b6fbe 100644 +--- a/js/ui/autorunManager.js ++++ b/js/ui/autorunManager.js +@@ -1,7 +1,6 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + + const Lang = imports.lang; +-const DBus = imports.dbus; + const Gio = imports.gi.Gio; + const St = imports.gi.St; + +@@ -61,25 +60,19 @@ function startAppForMount(app, mount) { + + /******************************************/ + +-const HotplugSnifferIface = { +- name: 'org.Cinnamon.HotplugSniffer', +- methods: [{ name: 'SniffURI', +- inSignature: 's', +- outSignature: 'as' }] +-}; +- +-const HotplugSniffer = function() { +- this._init(); +-}; ++const HotplugSnifferIface = ++ ++ ++ ++ ++; + +-HotplugSniffer.prototype = { +- _init: function() { +- DBus.session.proxifyObject(this, ++const HotplugSnifferProxy = Gio.DBusProxy.makeProxyWrapper(HotplugSnifferIface); ++function HotplugSniffer() { ++ return new HotplugSnifferProxy(Gio.DBus.session, + 'org.Cinnamon.HotplugSniffer', + '/org/Cinnamon/HotplugSniffer'); +- }, +-}; +-DBus.proxifyPrototype(HotplugSniffer.prototype, HotplugSnifferIface); ++} + + function ContentTypeDiscoverer(callback) { + this._init(callback); +diff --git a/js/ui/calendar.js b/js/ui/calendar.js +index ff4777a..a97e2a9 100644 +--- a/js/ui/calendar.js ++++ b/js/ui/calendar.js +@@ -1,6 +1,5 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +-const DBus = imports.dbus; + const Clutter = imports.gi.Clutter; + const Gio = imports.gi.Gio; + const Lang = imports.lang; +@@ -194,30 +193,34 @@ EmptyEventSource.prototype = { + }; + Signals.addSignalMethods(EmptyEventSource.prototype); + +-const CalendarServerIface = { +- name: 'org.Cinnamon.CalendarServer', +- methods: [{ name: 'GetEvents', +- inSignature: 'xxb', +- outSignature: 'a(sssbxxa{sv})' }], +- signals: [{ name: 'Changed', +- inSignature: '' }] +-}; +- +-const CalendarServer = function () { +- this._init(); +-}; +- +-CalendarServer.prototype = { +- _init: function() { +- DBus.session.proxifyObject(this, 'org.Cinnamon.CalendarServer', '/org/Cinnamon/CalendarServer'); +- } +-}; +- +-DBus.proxifyPrototype(CalendarServer.prototype, CalendarServerIface); ++const CalendarServerIface = ++ ++ ++ ++ ++ ++ ++ ++; ++ ++const CalendarServerInfo = Gio.DBusInterfaceInfo.new_for_xml(CalendarServerIface); ++ ++function CalendarServer() { ++ var self = new Gio.DBusProxy({ g_connection: Gio.DBus.session, ++ g_interface_name: CalendarServerInfo.name, ++ g_interface_info: CalendarServerInfo, ++ g_name: 'org.Cinnamon.CalendarServer', ++ g_object_path: '/org/Cinnamon/CalendarServer', ++ g_flags: (Gio.DBusProxyFlags.DO_NOT_AUTO_START | ++ Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES) }); ++ ++ self.init(null); ++ return self; ++} + + // an implementation that reads data from a session bus service +-function DBusEventSource(owner) { +- this._init(owner); ++function DBusEventSource() { ++ this._init(); + } + + function _datesEqual(a, b) { +@@ -240,16 +243,18 @@ function _dateIntervalsOverlap(a0, a1, b0, b1) + + + DBusEventSource.prototype = { +- _init: function(owner) { ++ _init: function() { + this._resetCache(); + +- this._dbusProxy = new CalendarServer(owner); +- this._dbusProxy.connect('Changed', Lang.bind(this, this._onChanged)); ++ this._dbusProxy = new CalendarServer(); ++ this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged)); + +- DBus.session.watch_name('org.Cinnamon.CalendarServer', +- false, // do not launch a name-owner if none exists +- Lang.bind(this, this._onNameAppeared), +- Lang.bind(this, this._onNameVanished)); ++ this._dbusProxy.connect('notify::g-name-owner', Lang.bind(this, function() { ++ if (this._dbusProxy.g_name_owner) ++ this._onNameAppeared(); ++ else ++ this._onNameVanished(); ++ })); + }, + + _resetCache: function() { +@@ -272,7 +277,7 @@ DBusEventSource.prototype = { + this._loadEvents(false); + }, + +- _onEventsReceived: function(appointments) { ++ _onEventsReceived: function([appointments]) { + let newEvents = []; + if (appointments != null) { + for (let n = 0; n < appointments.length; n++) { +@@ -295,9 +300,9 @@ DBusEventSource.prototype = { + + _loadEvents: function(forceReload) { + if (this._curRequestBegin && this._curRequestEnd){ +- let callFlags = 0; ++ let callFlags = Gio.DBusCallFlags.NO_AUTO_START; + if (forceReload) +- callFlags |= DBus.CALL_FLAG_START; ++ callFlags = Gio.DBusCallFlags.NONE; + this._dbusProxy.GetEventsRemote(this._curRequestBegin.getTime() / 1000, + this._curRequestEnd.getTime() / 1000, + forceReload, +diff --git a/js/ui/cinnamonDBus.js b/js/ui/cinnamonDBus.js +index 600e92f..5d4eb1c 100644 +--- a/js/ui/cinnamonDBus.js ++++ b/js/ui/cinnamonDBus.js +@@ -1,7 +1,7 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +-const DBus = imports.dbus; + const Lang = imports.lang; ++const Gio = imports.gi.Gio; + + const Config = imports.misc.config; + const Flashspot = imports.ui.flashspot; +@@ -9,48 +9,53 @@ const Main = imports.ui.main; + const AppletManager = imports.ui.appletManager; + const DeskletManager = imports.ui.deskletManager; + +-const CinnamonIface = { +- name: 'org.Cinnamon', +- methods: [{ name: 'Eval', +- inSignature: 's', +- outSignature: 'bs' +- }, +- { name: 'ScreenshotArea', +- inSignature: 'biiiibs', +- outSignature: '' +- }, +- { name: 'ScreenshotWindow', +- inSignature: 'bbbs', +- outSignature: '' +- }, +- { name: 'Screenshot', +- inSignature: 'bbs', +- outSignature: '' +- }, +- { +- name: 'FlashArea', +- inSignature: 'iiii', +- outSignature: '' +- }, +- { +- name: 'highlightApplet', +- inSignature: 'sb', +- outSignature: '' +- }, +- { +- name: 'activateCallback', +- inSignature: 'ssb', +- outSignature: '' +- } +- ], +- signals: [], +- properties: [{ name: 'OverviewActive', +- signature: 'b', +- access: 'readwrite' }, +- { name: 'CinnamonVersion', +- signature: 's', +- access: 'read' }] +-}; ++ ++const CinnamonIface = ++ ++ ++ ++ ++ ++ ++include_cursor ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++include_cursor ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; + + function Cinnamon() { + this._init(); +@@ -58,7 +63,8 @@ function Cinnamon() { + + Cinnamon.prototype = { + _init: function() { +- DBus.session.exportObject('/org/Cinnamon', this); ++ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(CinnamonIface, this); ++ this._dbusImpl.export(Gio.DBus.session, '/org/Cinnamon'); + }, + + /** +@@ -215,5 +221,3 @@ Cinnamon.prototype = { + CinnamonVersion: Config.PACKAGE_VERSION + }; + +-DBus.conformExport(Cinnamon.prototype, CinnamonIface); +- +diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js +index e909f5f..4f1f7d0 100644 +--- a/js/ui/endSessionDialog.js ++++ b/js/ui/endSessionDialog.js +@@ -18,19 +18,19 @@ + * 02110-1335, USA. + */ + +-const DBus = imports.dbus; + const Lang = imports.lang; + const Signals = imports.signals; + + const AccountsService = imports.gi.AccountsService; + const Clutter = imports.gi.Clutter; ++const Gio = imports.gi.Gio; + const GLib = imports.gi.GLib; + const Gtk = imports.gi.Gtk; + const Pango = imports.gi.Pango; + const St = imports.gi.St; + const Cinnamon = imports.gi.Cinnamon; + +-const GnomeSession = imports.misc.gnomeSession ++const GnomeSession = imports.misc.gnomeSession; + const ModalDialog = imports.ui.modalDialog; + const Tweener = imports.ui.tweener; + +@@ -40,20 +40,20 @@ const _ITEM_ICON_SIZE = 48; + const _DIALOG_ICON_SIZE = 32; + + const GSM_SESSION_MANAGER_LOGOUT_FORCE = 2; +- +-const EndSessionDialogIface = { +- name: 'org.gnome.SessionManager.EndSessionDialog', +- methods: [{ name: 'Open', +- inSignature: 'uuuao', +- outSignature: '' +- } +- ], +- signals: [{ name: 'Canceled', +- inSignature: '', +- }], +- properties: [] +-}; +- ++const EndSessionDialogIface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; ++ + const logoutDialogContent = { + subjectWithUser: _("Log Out %s"), + subject: _("Log Out"), +@@ -230,8 +230,6 @@ function _setLabelText(label, text) { + function EndSessionDialog() { + if (_endSessionDialog == null) { + this._init(); +- DBus.session.exportObject('/org/gnome/SessionManager/EndSessionDialog', +- this); + _endSessionDialog = this; + } + +@@ -328,6 +326,9 @@ EndSessionDialog.prototype = { + if (this._applicationList.get_children().length == 0) + scrollView.hide(); + })); ++ ++ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(EndSessionDialogIface, this); ++ this._dbusImpl.export(Gio.DBus.session, '/org/gnome/SessionManager/EndSessionDialog'); + }, + + _onDestroy: function() { +@@ -442,25 +443,19 @@ EndSessionDialog.prototype = { + + close: function() { + ModalDialog.ModalDialog.prototype.close.call(this); +- DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog', +- 'org.gnome.SessionManager.EndSessionDialog', +- 'Closed', '', []); ++ this._dbusImpl.emit_signal('Closed', null); + }, + + cancel: function() { + this._stopTimer(); +- DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog', +- 'org.gnome.SessionManager.EndSessionDialog', +- 'Canceled', '', []); ++ this._dbusImpl.emit_signal('Canceled', null); + this.close(global.get_current_time()); + }, + + _confirm: function(signal) { + this._fadeOutDialog(); + this._stopTimer(); +- DBus.session.emit_signal('/org/gnome/SessionManager/EndSessionDialog', +- 'org.gnome.SessionManager.EndSessionDialog', +- signal, '', []); ++ this._dbusImpl.emit_signal(signal, null); + }, + + _onOpened: function() { +@@ -512,39 +507,41 @@ EndSessionDialog.prototype = { + this._updateContent(); + }, + +- OpenAsync: function(type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths, callback) { ++ OpenAsync: function(parameters, invocation) { ++ let [type, timestamp, totalSecondsToStayOpen, inhibitorObjectPaths] = parameters; + this._totalSecondsToStayOpen = totalSecondsToStayOpen; + this._inhibitors = []; + this._applicationList.destroy_children(); + this._type = type; + +- if (!(this._type in DialogContent)) +- throw new DBus.DBusError('org.Cinnamon.ModalDialog.TypeError', +- "Unknown dialog type requested"); ++ if (!(this._type in DialogContent)) { ++ invocation.report_dbus_error('org.Cinnamon.ModalDialog.TypeError', ++ "Unknown dialog type requested"); ++ return; ++ } + + for (let i = 0; i < inhibitorObjectPaths.length; i++) { +- let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i]); ++ let inhibitor = new GnomeSession.Inhibitor(inhibitorObjectPaths[i], Lang.bind(this, function(proxy, error) { ++ this._onInhibitorLoaded(proxy); ++ })); + +- inhibitor.connect('is-loaded', +- Lang.bind(this, function() { +- this._onInhibitorLoaded(inhibitor); +- })); + this._inhibitors.push(inhibitor); + } + + this._updateButtons(); + +- if (!this.open(timestamp)) +- throw new DBus.DBusError('org.Cinnamon.ModalDialog.GrabError', +- "Cannot grab pointer and keyboard"); ++ if (!this.open(timestamp)) { ++ invocation.report_dbus_error('org.Cinnamon.ModalDialog.GrabError', ++ "Cannot grab pointer and keyboard"); ++ return; ++ } + + this._updateContent(); + + let signalId = this.connect('opened', + Lang.bind(this, function() { +- callback(); ++ invocation.return_value(null); + this.disconnect(signalId); + })); + } + }; +-DBus.conformExport(EndSessionDialog.prototype, EndSessionDialogIface); +diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js +index f55cf93..69edb51 100644 +--- a/js/ui/keyboard.js ++++ b/js/ui/keyboard.js +@@ -2,7 +2,6 @@ + + const Caribou = imports.gi.Caribou; + const Clutter = imports.gi.Clutter; +-const DBus = imports.dbus; + const Gdk = imports.gi.Gdk; + const Gio = imports.gi.Gio; + const GLib = imports.gi.GLib; +@@ -38,28 +37,27 @@ const PRETTY_KEYS = { + 'Alt_L': 'Alt' + }; + +-const CaribouKeyboardIface = { +- name: 'org.gnome.Caribou.Keyboard', +- methods: [ { name: 'Show', +- inSignature: 'u', +- outSignature: '' +- }, +- { name: 'Hide', +- inSignature: 'u', +- outSignature: '' +- }, +- { name: 'SetCursorLocation', +- inSignature: 'iiii', +- outSignature: '' +- }, +- { name: 'SetEntryLocation', +- inSignature: 'iiii', +- outSignature: '' +- } ], +- properties: [ { name: 'Name', +- signature: 's', +- access: 'read' } ] +-}; ++const CaribouKeyboardIface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; + + function Key() { + this._init.apply(this, arguments); +@@ -199,7 +197,8 @@ function Keyboard() { + + Keyboard.prototype = { + _init: function () { +- DBus.session.exportObject('/org/gnome/Caribou/Keyboard', this); ++ this._impl = Gio.DBusExportedObject.wrapJSObject(CaribouKeyboardIface, this); ++ this._impl.export(Gio.DBus.session, '/org/gnome/Caribou/Keyboard'); + + this.actor = null; + +@@ -541,7 +540,6 @@ Keyboard.prototype = { + return 'cinnamon'; + } + }; +-DBus.conformExport(Keyboard.prototype, CaribouKeyboardIface); + + function KeyboardSource() { + this._init.apply(this, arguments); +diff --git a/js/ui/layout.js b/js/ui/layout.js +index 76303b9..b97459e 100644 +--- a/js/ui/layout.js ++++ b/js/ui/layout.js +@@ -488,12 +488,14 @@ Chrome.prototype = { + + this._screenSaverActive = false; + this._screenSaverProxy = new ScreenSaver.ScreenSaverProxy(); +- this._screenSaverProxy.connect('ActiveChanged', Lang.bind(this, this._onScreenSaverActiveChanged)); +- this._screenSaverProxy.GetActiveRemote(Lang.bind(this, +- function(result, err) { +- if (!err) +- this._onScreenSaverActiveChanged(this._screenSaverProxy, result); +- })); ++ this._screenSaverProxy.connectSignal('ActiveChanged', Lang.bind(this, function(proxy, senderName, [isActive]) { ++ this._onScreenSaverActiveChanged(isActive); ++ })); ++ this._screenSaverProxy.GetActiveRemote(Lang.bind(this, function(result, err) { ++ if (!err) ++ this._onScreenSaverActiveChanged(result[0]); ++ })); ++ + + this._relayout(); + }, +diff --git a/js/ui/magnifierDBus.js b/js/ui/magnifierDBus.js +index 72bba26..4d21797 100644 +--- a/js/ui/magnifierDBus.js ++++ b/js/ui/magnifierDBus.js +@@ -1,6 +1,6 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +-const DBus = imports.dbus; ++const Gio = imports.gi.Gio; + const Main = imports.ui.main; + + const MAG_SERVICE_NAME = 'org.gnome.Magnifier'; +@@ -10,47 +10,85 @@ const ZOOM_SERVICE_PATH = '/org/gnome/Magnifier/ZoomRegion'; + + // Subset of gnome-mag's Magnifier dbus interface -- to be expanded. See: + // http://git.gnome.org/browse/gnome-mag/tree/xml/...Magnifier.xml +-const MagnifierIface = { +- name: MAG_SERVICE_NAME, +- methods: [ +- { name: 'setActive', inSignature: 'b', outSignature: '' }, +- { name: 'isActive', inSignature: '', outSignature: 'b' }, +- { name: 'showCursor', inSignature: '', outSignature: '' }, +- { name: 'hideCursor', inSignature: '', outSignature: '' }, +- { name: 'createZoomRegion', inSignature: 'ddaiai', outSignature: 'o' }, +- { name: 'addZoomRegion', inSignature: 'o', outSignature: 'b' }, +- { name: 'getZoomRegions', inSignature: '', outSignature: 'ao' }, +- { name: 'clearAllZoomRegions', inSignature: '', outSignature: '' }, +- { name: 'fullScreenCapable', inSignature: '', outSignature: 'b' }, +- +- { name: 'setCrosswireSize', inSignature: 'i', outSignature: '' }, +- { name: 'getCrosswireSize', inSignature: '', outSignature: 'i' }, +- { name: 'setCrosswireLength', inSignature: 'i', outSignature: '' }, +- { name: 'getCrosswireLength', inSignature: '', outSignature: 'i' }, +- { name: 'setCrosswireClip', inSignature: 'b', outSignature: '' }, +- { name: 'getCrosswireClip', inSignature: '', outSignature: 'b' }, +- { name: 'setCrosswireColor', inSignature: 'u', outSignature: '' }, +- { name: 'getCrosswireColor', inSignature: '', outSignature: 'u' } +- ], +- signals: [], +- properties: [] +-}; ++const MagnifierIface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; + + // Subset of gnome-mag's ZoomRegion dbus interface -- to be expanded. See: + // http://git.gnome.org/browse/gnome-mag/tree/xml/...ZoomRegion.xml +-const ZoomRegionIface = { +- name: ZOOM_SERVICE_NAME, +- methods: [ +- { name: 'setMagFactor', inSignature: 'dd', outSignature: ''}, +- { name: 'getMagFactor', inSignature: '', outSignature: 'dd' }, +- { name: 'setRoi', inSignature: 'ai', outSignature: '' }, +- { name: 'getRoi', inSignature: '', outSignature: 'ai' }, +- { name: 'shiftContentsTo', inSignature: 'ii', outSignature: 'b' }, +- { name: 'moveResize', inSignature: 'ai', outSignature: '' } +- ], +- signals: [], +- properties: [] +-}; ++const ZoomRegionIface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; + + // For making unique ZoomRegion DBus proxy object paths of the form: + // '/org/gnome/Magnifier/ZoomRegion/zoomer0', +@@ -64,7 +102,9 @@ function CinnamonMagnifier() { + CinnamonMagnifier.prototype = { + _init: function() { + this._zoomers = {}; +- DBus.session.exportObject(MAG_SERVICE_PATH, this); ++ ++ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(MagnifierIface, this); ++ this._dbusImpl.export(Gio.DBus.session, MAG_SERVICE_PATH); + }, + + /** +@@ -195,10 +235,10 @@ CinnamonMagnifier.prototype = { + Main.magnifier.clearAllZoomRegions(); + for (let objectPath in this._zoomers) { + let proxyAndZoomer = this._zoomers[objectPath]; ++ proxyAndZoomer.proxy.destroy(); + proxyAndZoomer.proxy = null; + proxyAndZoomer.zoomRegion = null; + delete this._zoomers[objectPath]; +- DBus.session.unexportObject(proxyAndZoomer); + } + this._zoomers = {}; + }, +@@ -300,8 +340,9 @@ function CinnamonMagnifierZoomRegion(zoomerObjectPath, zoomRegion) { + CinnamonMagnifierZoomRegion.prototype = { + _init: function(zoomerObjectPath, zoomRegion) { + this._zoomRegion = zoomRegion; +- DBus.session.proxifyObject(this, ZOOM_SERVICE_NAME, zoomerObjectPath); +- DBus.session.exportObject(zoomerObjectPath, this); ++ ++ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(ZoomRegionIface, this); ++ this._dbusImpl.export(Gio.DBus.session, zoomerObjectPath); + }, + + /** +@@ -376,8 +417,9 @@ CinnamonMagnifierZoomRegion.prototype = { + moveResize: function(viewPort) { + let viewRect = { x: viewPort[0], y: viewPort[1], width: viewPort[2] - viewPort[0], height: viewPort[3] - viewPort[1] }; + this._zoomRegion.setViewPort(viewRect); ++ }, ++ ++ destroy: function() { ++ this._dbusImpl.unexport(); + } + }; +- +-DBus.conformExport(CinnamonMagnifier.prototype, MagnifierIface); +-DBus.conformExport(CinnamonMagnifierZoomRegion.prototype, ZoomRegionIface); +diff --git a/js/ui/main.js b/js/ui/main.js +index 5cae372..180db5c 100644 +--- a/js/ui/main.js ++++ b/js/ui/main.js +@@ -1,7 +1,6 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + + const Clutter = imports.gi.Clutter; +-const DBus = imports.dbus; + const Gio = imports.gi.Gio; + const GLib = imports.gi.GLib; + const Gtk = imports.gi.Gtk; +@@ -199,11 +198,6 @@ function start() { + + cinnamonDBusService = new CinnamonDBus.Cinnamon(); + lookingGlassDBusService = new LookingGlassDBus.CinnamonLookingGlass(); +- // Force a connection now; dbus.js will do this internally +- // if we use its name acquisition stuff but we aren't right +- // now; to do so we'd need to convert from its async calls +- // back into sync ones. +- DBus.session.flush(); + + // Ensure CinnamonWindowTracker and CinnamonAppUsage are initialized; this will + // also initialize CinnamonAppSystem first. CinnamonAppSystem +diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js +index 18d6615..8bed028 100644 +--- a/js/ui/messageTray.js ++++ b/js/ui/messageTray.js +@@ -1388,12 +1388,17 @@ function MessageTray() { + + MessageTray.prototype = { + _init: function() { +- this._presence = new GnomeSession.Presence(); ++ this._presence = new GnomeSession.Presence(Lang.bind(this, function(proxy, error) { ++ this._onStatusChanged(proxy.status); ++ })); ++ + this._userStatus = GnomeSession.PresenceStatus.AVAILABLE; + this._busy = false; + this._backFromAway = false; +- this._presence.connect('StatusChanged', Lang.bind(this, this._onStatusChanged)); +- this._presence.getStatus(Lang.bind(this, this._onStatusChanged)); ++ this._presence.connectSignal('StatusChanged', Lang.bind(this, function(proxy, senderName, [status]) { ++ this._onStatusChanged(status); ++ })); ++ + + this._notificationBin = new St.Bin(); + this._notificationBin.hide(); +@@ -1548,7 +1553,7 @@ MessageTray.prototype = { + this._updateState(); + }, + +- _onStatusChanged: function(presence, status) { ++ _onStatusChanged: function(status) { + this._backFromAway = (this._userStatus == GnomeSession.PresenceStatus.IDLE && this._userStatus != status); + this._userStatus = status; + +diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js +index bee8ffd..b037e07 100644 +--- a/js/ui/notificationDaemon.js ++++ b/js/ui/notificationDaemon.js +@@ -1,7 +1,7 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + + const Clutter = imports.gi.Clutter; +-const DBus = imports.dbus; ++const Gio = imports.gi.Gio; + const GLib = imports.gi.GLib; + const Lang = imports.lang; + const Cinnamon = imports.gi.Cinnamon; +@@ -14,49 +14,52 @@ const Params = imports.misc.params; + + let nextNotificationId = 1; + +-// Should really be defined in dbus.js +-const BusIface = { +- name: 'org.freedesktop.DBus', +- methods: [{ name: 'GetConnectionUnixProcessID', +- inSignature: 's', +- outSignature: 'i' }] +-}; +- +-const Bus = function () { +- this._init(); +-}; +- +-Bus.prototype = { +- _init: function() { +- DBus.session.proxifyObject(this, 'org.freedesktop.DBus', '/org/freedesktop/DBus'); +- } +-}; ++// Should really be defined in Gio.js ++const BusIface = ++ ++ ++ ++ ++; ++ ++var BusProxy = Gio.DBusProxy.makeProxyWrapper(BusIface); ++function Bus() { ++ return new BusProxy(Gio.DBus.session, 'org.freedesktop.DBus', '/org/freedesktop/DBus'); ++} + +-DBus.proxifyPrototype(Bus.prototype, BusIface); +- +-const NotificationDaemonIface = { +- name: 'org.freedesktop.Notifications', +- methods: [{ name: 'Notify', +- inSignature: 'susssasa{sv}i', +- outSignature: 'u' +- }, +- { name: 'CloseNotification', +- inSignature: 'u', +- outSignature: '' +- }, +- { name: 'GetCapabilities', +- inSignature: '', +- outSignature: 'as' +- }, +- { name: 'GetServerInformation', +- inSignature: '', +- outSignature: 'ssss' +- }], +- signals: [{ name: 'NotificationClosed', +- inSignature: 'uu' }, +- { name: 'ActionInvoked', +- inSignature: 'us' }] +-}; ++const NotificationDaemonIface = ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++; + + const NotificationClosedReason = { + EXPIRED: 1, +@@ -88,7 +91,8 @@ function NotificationDaemon() { + + NotificationDaemon.prototype = { + _init: function() { +- DBus.session.exportObject('/org/freedesktop/Notifications', this); ++ this._dbusImpl = Gio.DBusExportedObject.wrapJSObject(NotificationDaemonIface, this); ++ this._dbusImpl.export(Gio.DBus.session, '/org/freedesktop/Notifications'); + + this._sources = []; + this._senderToPid = {}; +@@ -213,8 +217,8 @@ NotificationDaemon.prototype = { + return source; + }, + +- Notify: function(appName, replacesId, icon, summary, body, +- actions, hints, timeout) { ++ NotifyAsync: function(params, invocation) { ++ let [appName, replacesId, icon, summary, body, actions, hints, timeout] = params; + let id; + + let rewrites = rewriteRules[appName]; +@@ -257,51 +261,55 @@ NotificationDaemon.prototype = { + } + this._notifications[id] = ndata; + +- let sender = DBus.getCurrentMessageContext().sender; ++ let sender = invocation.get_sender(); + let pid = this._senderToPid[sender]; + + let source = this._getSource(appName, pid, ndata, sender, null); + + if (source) { + this._notifyForSource(source, ndata); +- return id; ++ return invocation.return_value(GLib.Variant.new('(u)', [id])); + } + + if (replacesId) { + // There's already a pending call to GetConnectionUnixProcessID, + // which will see the new notification data when it finishes, + // so we don't have to do anything. +- return id; ++ return invocation.return_value(GLib.Variant.new('(u)', [id])); + } + +- this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, +- function (pid, ex) { +- // The app may have updated or removed the notification +- ndata = this._notifications[id]; +- if (!ndata) +- return; +- +- source = this._getSource(appName, pid, ndata, sender, null); +- +- // We only store sender-pid entries for persistent sources. +- // Removing the entries once the source is destroyed +- // would result in the entries associated with transient +- // sources removed once the notification is shown anyway. +- // However, keeping these pairs would mean that we would +- // possibly remove an entry associated with a persistent +- // source when a transient source for the same sender is +- // distroyed. +- if (!source.isTransient) { +- this._senderToPid[sender] = pid; +- source.connect('destroy', Lang.bind(this, +- function() { +- delete this._senderToPid[sender]; +- })); +- } +- this._notifyForSource(source, ndata); +- })); ++ this._busProxy.GetConnectionUnixProcessIDRemote(sender, Lang.bind(this, function (result, excp) { ++ // The app may have updated or removed the notification ++ ndata = this._notifications[id]; ++ if (!ndata) ++ return; + +- return id; ++ if (excp) { ++ logError(excp, 'Call to GetConnectionUnixProcessID failed'); ++ return; ++ } ++ ++ let [pid] = result; ++ source = this._getSource(appName, pid, ndata, sender); ++ ++ // We only store sender-pid entries for persistent sources. ++ // Removing the entries once the source is destroyed ++ // would result in the entries associated with transient ++ // sources removed once the notification is shown anyway. ++ // However, keeping these pairs would mean that we would ++ // possibly remove an entry associated with a persistent ++ // source when a transient source for the same sender is ++ // distroyed. ++ if (!source.isTransient) { ++ this._senderToPid[sender] = pid; ++ source.connect('destroy', Lang.bind(this, function() { ++ delete this._senderToPid[sender]; ++ })); ++ } ++ this._notifyForSource(source, ndata); ++ })); ++ ++ return invocation.return_value(GLib.Variant.new('(u)', [id])); + }, + + _notifyForSource: function(source, ndata) { +@@ -441,17 +449,13 @@ NotificationDaemon.prototype = { + }, + + _emitNotificationClosed: function(id, reason) { +- DBus.session.emit_signal('/org/freedesktop/Notifications', +- 'org.freedesktop.Notifications', +- 'NotificationClosed', 'uu', +- [id, reason]); ++ this._dbusImpl.emit_signal('NotificationClosed', ++ GLib.Variant.new('(uu)', [id, reason])); + }, + + _emitActionInvoked: function(id, action) { +- DBus.session.emit_signal('/org/freedesktop/Notifications', +- 'org.freedesktop.Notifications', +- 'ActionInvoked', 'us', +- [id, action]); ++ this._dbusImpl.emit_signal('ActionInvoked', ++ GLib.Variant.new('(us)', [id, action])); + }, + + _onTrayIconAdded: function(o, icon) { +@@ -465,8 +469,6 @@ NotificationDaemon.prototype = { + } + }; + +-DBus.conformExport(NotificationDaemon.prototype, NotificationDaemonIface); +- + function Source(title, pid, sender, trayIcon) { + this._init(title, pid, sender, trayIcon); + } +@@ -481,15 +483,12 @@ Source.prototype = { + + this.pid = pid; + if (sender) +- // TODO: dbus-glib implementation of watch_name() doesn’t return an id to be used for +- // unwatch_name() or implement unwatch_name(), however when we move to using GDBus implementation, +- // we should save the id here and call unwatch_name() with it in destroy(). +- // Moving to GDBus is the work in progress: https://bugzilla.gnome.org/show_bug.cgi?id=648651 +- // and https://bugzilla.gnome.org/show_bug.cgi?id=622921 . +- DBus.session.watch_name(sender, +- false, +- null, +- Lang.bind(this, this._onNameVanished)); ++ this._nameWatcherId = Gio.DBus.session.watch_name(sender, ++ Gio.BusNameWatcherFlags.NONE, ++ null, ++ Lang.bind(this, this._onNameVanished)); ++ else ++ this._nameWatcherId = 0; + + this._setApp(); + if (this.app) +@@ -596,6 +595,10 @@ Source.prototype = { + }, + + destroy: function() { ++ if (this._nameWatcherId) { ++ Gio.DBus.session.unwatch_name(this._nameWatcherId); ++ this._nameWatcherId = 0; ++ } + MessageTray.Source.prototype.destroy.call(this); + } + }; +diff --git a/js/ui/scripting.js b/js/ui/scripting.js +index 42c4f6d..9163d29 100644 +--- a/js/ui/scripting.js ++++ b/js/ui/scripting.js +@@ -1,6 +1,5 @@ + // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- + +-const DBus = imports.dbus; + const Gio = imports.gi.Gio; + const Mainloop = imports.mainloop; + const Meta = imports.gi.Meta; +@@ -70,24 +69,21 @@ function waitLeisure() { + }; + } + +-const PerfHelperIface = { +- name: 'org.Cinnamon.PerfHelper', +- methods: [{ name: 'CreateWindow', inSignature: 'iibb', outSignature: '' }, +- { name: 'WaitWindows', inSignature: '', outSignature: '' }, +- { name: 'DestroyWindows', inSignature: '', outSignature: ''}] +-}; +- +-const PerfHelper = function () { +- this._init(); +-}; +- +-PerfHelper.prototype = { +- _init: function() { +- DBus.session.proxifyObject(this, 'org.Cinnamon.PerfHelper', '/org/Cinnamon/PerfHelper'); +- } +-}; +- +-DBus.proxifyPrototype(PerfHelper.prototype, PerfHelperIface); ++const PerfHelperIface = ++ ++ ++ ++ ++ ++ ++ ++ ++; ++ ++var PerfHelperProxy = Gio.DBusProxy.makeProxyWrapper(PerfHelperIface); ++function PerfHelper() { ++ return new PerfHelperProxy(Gio.DBus.session, 'org.gnome.Shell.PerfHelper', '/org/gnome/Shell/PerfHelper'); ++} + + let _perfHelper = null; + function _getPerfHelper() { +-- +1.8.1.6 + + +From d85e078c0ed09a8b9f8d3ea2ebec1043b6d150c1 Mon Sep 17 00:00:00 2001 +From: dalcde +Date: Tue, 16 Apr 2013 16:58:30 +0800 +Subject: [PATCH 07/15] [GDBus][Sound/Power Applet] Fix dbus port issues + +--- + .../cinnamon/applets/power@cinnamon.org/applet.js | 2 +- + .../cinnamon/applets/sound@cinnamon.org/applet.js | 83 ++++++++++------------ + 2 files changed, 37 insertions(+), 48 deletions(-) + +diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +index b6b2bcd..fad39ab 100644 +--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +@@ -212,7 +212,7 @@ MyApplet.prototype = { + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); + this.menu.addSettingsAction(_("Power Settings"), 'power'); + +- this._smProxy.connect('PropertiesChanged', Lang.bind(this, this._devicesChanged)); ++ this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged)); + this._devicesChanged(); + } + catch (e) { +diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +index 5bfaf26..52b8cde 100644 +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -37,7 +37,7 @@ const MediaServer2PlayerIFace = + + + +- ++ + + + +@@ -256,23 +256,20 @@ Player.prototype = { + this._trackControls.set_child(this.controls); + this.addActor(this._trackControls); + +- this._mediaServer.getRaise(Lang.bind(this, function(sender, raise) { +- if (raise) { +- this._raiseButton = new ControlButton('go-up', +- Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); })); +- this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player")); +- this.controls.add_actor(this._raiseButton.getActor()); +- } +- })); +- +- this._mediaServer.getQuit(Lang.bind(this, function(sender, quit) { +- if (quit) { +- this._quitButton = new ControlButton('window-close', +- Lang.bind(this, function () { this._mediaServer.QuitRemote(); })); +- this.controls.add_actor(this._quitButton.getActor()); +- this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player")); +- } +- })); ++ let CanRaise = this._mediaServer.CanRaise; ++ let CanQuit = this._mediaServer.CanQuit; ++ if (CanRaise) { ++ this._raiseButton = new ControlButton('go-up', ++ Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); })); ++ this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player")); ++ this.controls.add_actor(this._raiseButton.getActor()); ++ } ++ if (CanQuit) { ++ this._quitButton = new ControlButton('window-close', ++ Lang.bind(this, function () { this._mediaServer.QuitRemote(); })); ++ this.controls.add_actor(this._quitButton.getActor()); ++ this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player")); ++ } + + /* this players don't support seek */ + if (support_seek.indexOf(this._name) == -1) +@@ -283,14 +280,14 @@ Player.prototype = { + this._currentTime = 0; + this._getPosition(); + +- this._prop.connect('PropertiesChanged', Lang.bind(this, function(sender, iface, value) { ++ this._prop.connectSignal('PropertiesChanged', Lang.bind(this, function(sender, iface, value) { + if (value["PlaybackStatus"]) +- this._setStatus(iface, value["PlaybackStatus"]); ++ this._setStatus(value["PlaybackStatus"]); + if (value["Metadata"]) +- this._setMetadata(iface, value["Metadata"]); ++ this._setMetadata(value["Metadata"]); + })); + +- this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) { ++ this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { + this._setPosition(sender, value); + })); + +@@ -315,19 +312,17 @@ Player.prototype = { + }, + + _getPosition: function() { +- this._mediaServerPlayer.getPosition(Lang.bind(this, +- this._setPosition +- )); ++ this._setPosition(this._mediaServerPlayer.Position); + Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); + }, + +- _setMetadata: function(sender, metadata) { ++ _setMetadata: function(metadata) { + if (metadata["mpris:length"]) { + // song length in secs +- this._songLength = metadata["mpris:length"] / 1000000; ++ this._songLength = metadata["mpris:length"].unpack() / 1000000; + // FIXME upstream + if (this._name == "quodlibet") +- this._songLength = metadata["mpris:length"] / 1000; ++ this._songLength = metadata["mpris:length"].unpack() / 1000; + // reset timer + this._stopTimer(); + if (this._playerStatus == "Playing") +@@ -338,15 +333,15 @@ Player.prototype = { + this._stopTimer(); + } + if (metadata["xesam:artist"]) +- this._artist.setLabel(metadata["xesam:artist"].toString()); ++ this._artist.setLabel(metadata["xesam:artist"].unpack()); + else + this._artist.setLabel(_("Unknown Artist")); + if (metadata["xesam:album"]) +- this._album.setLabel(metadata["xesam:album"].toString()); ++ this._album.setLabel(metadata["xesam:album"].unpack()); + else + this._album.setLabel(_("Unknown Album")); + if (metadata["xesam:title"]) +- this._title.setLabel(metadata["xesam:title"].toString()); ++ this._title.setLabel(metadata["xesam:title"].unpack()); + else + this._title.setLabel(_("Unknown Title")); + /*if (metadata["mpris:trackid"]) { +@@ -359,8 +354,8 @@ Player.prototype = { + + let change = false; + if (metadata["mpris:artUrl"]) { +- if (this._trackCoverFile != metadata["mpris:artUrl"].toString()) { +- this._trackCoverFile = metadata["mpris:artUrl"].toString(); ++ if (this._trackCoverFile != metadata["mpris:artUrl"].unpack()) { ++ this._trackCoverFile = metadata["mpris:artUrl"].unpack(); + change = true; + } + } +@@ -392,12 +387,10 @@ Player.prototype = { + }, + + _getMetadata: function() { +- this._mediaServerPlayer.getMetadata(Lang.bind(this, +- this._setMetadata +- )); ++ this._setMetadata(this._mediaServerPlayer.Metadata); + }, + +- _setStatus: function(sender, status) { ++ _setStatus: function(status) { + this._playerStatus = status; + if (status == "Playing") { + this._playButton.setIcon("media-playback-pause"); +@@ -416,15 +409,11 @@ Player.prototype = { + }, + + _getStatus: function() { +- this._mediaServerPlayer.getPlaybackStatus(Lang.bind(this, +- this._setStatus +- )); ++ this._setStatus(this._mediaServerPlayer.PlaybackStatus); + }, + + _updateRate: function() { +- this._mediaServerPlayer.getRate(Lang.bind(this, function(sender, rate) { +- this._rate = rate; +- })); ++ this._rate = this._mediaServerPlayer.Rate; + }, + + _updateTimer: function() { +@@ -569,7 +558,7 @@ MyApplet.prototype = { + this._players = {}; + // watch players + for (var p=0; p +Date: Fri, 19 Apr 2013 19:09:18 -0400 +Subject: [PATCH 08/15] Fix gicon error - power applet + +--- + files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +index fad39ab..3a13eab 100644 +--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +@@ -323,7 +323,7 @@ MyApplet.prototype = { + let icon = this._proxy.Icon; + if (icon) { + let gicon = Gio.icon_new_for_string(icon); +- this.setGIcon(gicon); ++ this._applet_icon.gicon = gicon + this.actor.show(); + } else { + this.menu.close(); +-- +1.8.1.6 + + +From 3d78b5c929e7e3b0ee24d4b537492740e7bebf2f Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Fri, 19 Apr 2013 19:44:33 -0400 +Subject: [PATCH 09/15] Remove unused + +--- + src/cinnamon-background-manager.c | 34 ---------------------------------- + 1 file changed, 34 deletions(-) + +diff --git a/src/cinnamon-background-manager.c b/src/cinnamon-background-manager.c +index 9d95250..67427ed 100644 +--- a/src/cinnamon-background-manager.c ++++ b/src/cinnamon-background-manager.c +@@ -66,8 +66,6 @@ struct CinnamonBackgroundManagerPrivate + + G_DEFINE_TYPE (CinnamonBackgroundManager, cinnamon_background_manager, G_TYPE_OBJECT) + +-static gpointer manager_object = NULL; +- + static gboolean + dont_draw_background (CinnamonBackgroundManager *manager) + { +@@ -223,36 +221,6 @@ struct CinnamonBackgroundManagerPrivate + } + + static void +-draw_background_after_session_loads (CinnamonBackgroundManager *manager) +-{ +- GError *error = NULL; +- GDBusProxyFlags flags; +- +- flags = G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES | +- G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START; +- manager->priv->proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, +- flags, +- NULL, /* GDBusInterfaceInfo */ +- "org.gnome.SessionManager", +- "/org/gnome/SessionManager", +- "org.gnome.SessionManager", +- NULL, /* GCancellable */ +- &error); +- if (manager->priv->proxy == NULL) { +- g_warning ("Could not listen to session manager: %s", +- error->message); +- g_error_free (error); +- return; +- } +- +- manager->priv->proxy_signal_id = g_signal_connect (manager->priv->proxy, +- "g-signal", +- G_CALLBACK (on_session_manager_signal), +- manager); +-} +- +- +-static void + disconnect_screen_signals (CinnamonBackgroundManager *manager) + { + GdkDisplay *display; +@@ -312,8 +280,6 @@ struct CinnamonBackgroundManagerPrivate + G_CALLBACK (draw_background_changed), manager); + + setup_bg_and_draw_background (manager); +- //draw_background_after_session_loads (manager); +- + + return TRUE; + } +-- +1.8.1.6 + + +From d08b882470b135591fb99bd9ff7c63619fcaea82 Mon Sep 17 00:00:00 2001 +From: dalcde +Date: Sat, 20 Apr 2013 15:42:13 +0800 +Subject: [PATCH 10/15] [GDBus][Power applet] Some fixes and cleanup + +--- + .../cinnamon/applets/power@cinnamon.org/applet.js | 52 ++++++---------------- + 1 file changed, 14 insertions(+), 38 deletions(-) + +diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +index 3a13eab..5f81d91 100644 +--- a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js +@@ -48,40 +48,11 @@ const PowerManagerInterface = + + + +- +- +- +- +- + + ; + + const PowerManagerProxy = Gio.DBusProxy.makeProxyWrapper(PowerManagerInterface); + +-const SettingsManagerInterface = +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +-; +- +-const SettingsManagerProxy = Gio.DBusProxy.makeProxyWrapper(SettingsManagerInterface); +- + function DeviceItem() { + this._init.apply(this, arguments); + } +@@ -156,8 +127,16 @@ MyApplet.prototype = { + this.menuManager.addMenu(this.menu); + + //this.set_applet_icon_symbolic_name('battery-missing'); +- this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); +- this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); ++ this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH, ++ Lang.bind(this, function(proxy, error) { ++ if (error) { ++ global.log(error.message); ++ ++ return; ++ } ++ this._proxy.connect('g-properties-changed', Lang.bind(this, this._devicesChanged)); ++ this._devicesChanged(); ++ })); + + let icon = this.actor.get_children()[0]; + this.actor.remove_actor(icon); +@@ -211,9 +190,6 @@ MyApplet.prototype = { + + this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); + this.menu.addSettingsAction(_("Power Settings"), 'power'); +- +- this._smProxy.connectSignal('PropertiesChanged', Lang.bind(this, this._devicesChanged)); +- this._devicesChanged(); + } + catch (e) { + global.logError(e); +@@ -245,14 +221,14 @@ MyApplet.prototype = { + }, + + _readPrimaryDevice: function() { +- this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(device, error) { ++ this._proxy.GetPrimaryDeviceRemote(Lang.bind(this, function(result, error) { + if (error) { + this._hasPrimary = false; + this._primaryDeviceId = null; + this._batteryItem.actor.hide(); + return; + } +- let [device_id, device_type, icon, percentage, state, seconds] = device; ++ let [[device_id, device_type, icon, percentage, state, seconds]] = result; + if (device_type == UPDeviceType.BATTERY) { + this._hasPrimary = true; + let time = Math.round(seconds / 60); +@@ -290,7 +266,7 @@ MyApplet.prototype = { + }, + + _readOtherDevices: function() { +- this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) { ++ this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) { + this._deviceItems.forEach(function(i) { i.destroy(); }); + this._deviceItems = []; + +@@ -336,7 +312,7 @@ MyApplet.prototype = { + }, + + _updateLabel: function() { +- this._proxy.GetDevicesRemote(Lang.bind(this, function(devices, error) { ++ this._proxy.GetDevicesRemote(Lang.bind(this, function([devices], error) { + if (error) { + this._mainLabel.set_text(""); + return; +-- +1.8.1.6 + + +From c93e9746b321ad6d0aa38ec28c15fe7b3f18f8f7 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Sat, 20 Apr 2013 10:59:54 -0400 +Subject: [PATCH 11/15] Move CLUTTER_DISABLE_XINPUT to session startup file + +--- + files/usr/bin/gnome-session-cinnamon | 2 +- + src/main.c | 3 --- + 2 files changed, 1 insertion(+), 4 deletions(-) + +diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon +index 315f135..56c37f5 100755 +--- a/files/usr/bin/gnome-session-cinnamon ++++ b/files/usr/bin/gnome-session-cinnamon +@@ -1,3 +1,3 @@ + #! /bin/sh +-exec gnome-session --session cinnamon "$@" ++exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@" + +diff --git a/src/main.c b/src/main.c +index 9d37975..418fb60 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -257,9 +257,6 @@ + + g_option_context_free (ctx); + +- /* Disable XInput extension - required for 3.8 compatibility */ +- g_setenv ("CLUTTER_DISABLE_XINPUT", "1", TRUE); +- + meta_plugin_type_register (gnome_cinnamon_plugin_get_type ()); + + /* Prevent meta_init() from causing gtk to load gail and at-bridge */ +-- +1.8.1.6 + + +From de1719e63518884cad6c9d63d508f737eab35d49 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Sat, 20 Apr 2013 12:23:29 -0400 +Subject: [PATCH 12/15] Add Xinput disable to cinnamon2d + +--- + files/usr/bin/cinnamon2d | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/files/usr/bin/cinnamon2d b/files/usr/bin/cinnamon2d +index 1eced99..7f42517 100755 +--- a/files/usr/bin/cinnamon2d ++++ b/files/usr/bin/cinnamon2d +@@ -1,2 +1,2 @@ + #!/bin/bash +-CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@ ++CLUTTER_DISABLE_XINPUT=1 CLUTTER_PAINT=disable-clipped-redraws:disable-culling LIBGL_ALWAYS_SOFTWARE=1 CINNAMON_SOFTWARE_RENDERING=1 CINNAMON_SLOWDOWN_FACTOR=0.0001 MUFFIN_NO_SHADOWS=1 CLUTTER_DEFAULT_FPS=15 cinnamon $@ +-- +1.8.1.6 + + +From 15d57d1c15f34d44b23f74b21929d996d4465afb Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Sat, 20 Apr 2013 12:29:43 -0400 +Subject: [PATCH 13/15] Fix session file + +--- + files/usr/bin/gnome-session-cinnamon | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/files/usr/bin/gnome-session-cinnamon b/files/usr/bin/gnome-session-cinnamon +index 56c37f5..31c9eff 100755 +--- a/files/usr/bin/gnome-session-cinnamon ++++ b/files/usr/bin/gnome-session-cinnamon +@@ -1,3 +1,3 @@ + #! /bin/sh +-exec CLUTTER_DISABLE_XINPUT=1 gnome-session --session cinnamon "$@" ++CLUTTER_DISABLE_XINPUT=1 exec gnome-session --session cinnamon "$@" + +-- +1.8.1.6 + + +From 03436393c322fd97d8216c3481d28cd34833c656 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Sat, 20 Apr 2013 12:36:45 -0400 +Subject: [PATCH 14/15] Add cinnamon3d command + +--- + files/usr/bin/cinnamon3d | 2 ++ + 1 file changed, 2 insertions(+) + create mode 100644 files/usr/bin/cinnamon3d + +diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d +new file mode 100644 +index 0000000..4891783 +--- /dev/null ++++ b/files/usr/bin/cinnamon3d +@@ -0,0 +1,2 @@ ++#!/bin/bash ++CLUTTER_DISABLE_XINPUT=1 cinnamon $@ +-- +1.8.1.6 + + +From 850da270967622b95be9e0c5edd8e230eb4be5a1 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Sat, 20 Apr 2013 12:37:26 -0400 +Subject: [PATCH 15/15] Fix perms + +--- + files/usr/bin/cinnamon3d | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + mode change 100644 => 100755 files/usr/bin/cinnamon3d + +diff --git a/files/usr/bin/cinnamon3d b/files/usr/bin/cinnamon3d +old mode 100644 +new mode 100755 +-- +1.8.1.6 + diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD index 54794584f..e7ec9d64e 100644 --- a/community/clinica/PKGBUILD +++ b/community/clinica/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 78165 2012-10-16 15:57:54Z bgyorgy $ +# $Id: PKGBUILD 88675 2013-04-21 22:16:41Z heftig $ # Maintainer: Giovanni Scafora # Contributor: Gianmarco Brocchi pkgname=clinica pkgver=0.2.1 -pkgrel=5 +pkgrel=6 pkgdesc="Simple medical records manager" arch=('i686' 'x86_64') url="https://launchpad.net/clinica-project" license=('GPL3') -depends=('libgee' 'libpeas' 'dconf') +depends=('libgee06' 'libpeas' 'dconf') makedepends=('vala' 'intltool' 'python') optdepends=('python2-gobject: for Agenzia del Farmaco plugin') install=clinica.install diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index c6dd92e95..d60f4c930 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87877 2013-04-08 12:24:37Z spupykin $ +# $Id: PKGBUILD 88676 2013-04-21 22:16:43Z heftig $ # Maintainer: Sergej Pupykin # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua # Contributor: Michael Fellinger pkgname=couchdb pkgver=1.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" diff --git a/community/cython/PKGBUILD b/community/cython/PKGBUILD index d90482aa5..52bea4ed9 100644 --- a/community/cython/PKGBUILD +++ b/community/cython/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83887 2013-02-06 11:39:48Z spupykin $ +# $Id: PKGBUILD 88776 2013-04-22 10:14:05Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Igor Scabini pkgname=('cython' 'cython2') pkgbase=cython -pkgver=0.18 +pkgver=0.19 pkgrel=1 pkgdesc="C-Extensions for Python " arch=(i686 x86_64) @@ -12,7 +12,7 @@ url="http://www.cython.org" license=('APACHE') makedepends=('python-distribute' 'python2-distribute') source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('6a72d14e72f3df597b34ac326152f8d2') +md5sums=('76989337dee4cf7afdcb5cde514423f8') build() { true diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD index d48e7169f..bd1162ece 100644 --- a/community/denemo/PKGBUILD +++ b/community/denemo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87840 2013-04-08 09:20:17Z spupykin $ +# $Id: PKGBUILD 88689 2013-04-21 22:17:06Z heftig $ # Maintainer: Sergej Pupykin # Contributor: Philipp Sandhaus # Contributor: Robert Emil Berge @@ -6,7 +6,7 @@ pkgname=denemo pkgver=1.0.0 -pkgrel=1 +pkgrel=3 pkgdesc="A music score editor" arch=('i686' 'x86_64') url="http://www.denemo.org" diff --git a/community/elinks/PKGBUILD b/community/elinks/PKGBUILD index 6b6f6cd7a..2b9d1139c 100644 --- a/community/elinks/PKGBUILD +++ b/community/elinks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81104 2012-12-12 00:47:30Z eric $ +# $Id: PKGBUILD 88677 2013-04-21 22:16:44Z heftig $ # Maintainer: Kyle Keen # Maintainer: Sergej Pupykin # Maintainer: Andrea Scarpino @@ -8,39 +8,19 @@ pkgname=elinks pkgver=0.13 _commit="9313aae9062e1d9ff084858fa6844259cd8237d6" -pkgrel=11 +pkgrel=12 pkgdesc="An advanced and well-established feature-rich text mode web browser." arch=("i686" "x86_64") url="http://elinks.or.cz" license=('GPL') -depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js' +depends=('bzip2' 'expat>=2.0' 'gpm>=1.20.4' 'openssl' 'lua51' 'libidn' 'js185' 'gc' 'tre') makedepends=('git') -source=() -md5sums=() - -__gitroot="http://elinks.cz/elinks.git" -__gitname="elinks" +source=("git+http://elinks.cz/elinks.git#commit=$_commit") +md5sums=('SKIP') build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d $__gitname ] ; then - cd $__gitname && git pull origin - msg "The local files are updated." - else - git clone $__gitroot - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$__gitname-build" - git clone "$srcdir/$__gitname" "$srcdir/$__gitname-build" - cd "$srcdir/$__gitname-build" - git checkout "$_commit" - + cd elinks [ -x configure ] || sh autogen.sh ./configure --prefix=/usr --mandir=/usr/share/man \ --sysconfdir=/etc \ @@ -51,7 +31,7 @@ build() { } package() { - cd "$srcdir/$__gitname-build" + cd elinks make DESTDIR="$pkgdir" install rm -f "$pkgdir/usr/share/locale/locale.alias" diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD index ec562da65..a5eddbbe9 100644 --- a/community/freewrl/PKGBUILD +++ b/community/freewrl/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78928 2012-10-27 23:44:21Z ebelanger $ +# $Id: PKGBUILD 88678 2013-04-21 22:16:45Z heftig $ # Maintainer: Sergej Pupykin # Contributor: Sergej Pupykin pkgname=freewrl pkgver=1.22.13.1 _pkgver=1.22.13 -pkgrel=3 +pkgrel=4 pkgdesc="VRML viewer" arch=('i686' 'x86_64') url="http://freewrl.sourceforge.net/" diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD index 9db934a71..161682e5a 100644 --- a/community/gedit-plugins/PKGBUILD +++ b/community/gedit-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79119 2012-10-30 23:06:21Z heftig $ +# $Id: PKGBUILD 88687 2013-04-21 22:17:03Z heftig $ # Maintainer: Ionut Biru # Contributor: Alexander Rødseth # Contributor: Hugo Doria @@ -6,20 +6,20 @@ # Contributor: zhuqin pkgname=gedit-plugins -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="Plugins for gedit" -arch=('x86_64' 'i686') -license=('GPL') +arch=(x86_64 i686) +license=(GPL) url="http://live.gnome.org/GeditPlugins" -depends=('gedit' 'dbus-python') +depends=(gedit python-dbus) +makedepends=(intltool gnome-doc-utils vte3) optdepends=('gucharmap: for charmap plugin' 'vte3: for embedded terminal') -makedepends=('intltool' 'gnome-doc-utils' 'vte3') options=('!libtool' '!emptydirs') install=gedit-plugins.install source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('c5e92830e6029110bf1117bd9f31b23a9ad907210b8cb37039772f5bfcf6d174') +sha256sums=('659d379f9edfbba2db37522991c734c5d50e03eb1f70985e978d93a718273141') build() { cd $pkgname-$pkgver diff --git a/community/giggle/PKGBUILD b/community/giggle/PKGBUILD index dc22aa950..13b652f78 100644 --- a/community/giggle/PKGBUILD +++ b/community/giggle/PKGBUILD @@ -1,31 +1,40 @@ -# $Id: PKGBUILD 79629 2012-11-09 09:55:35Z ibiru $ +# $Id: PKGBUILD 88688 2013-04-21 22:17:05Z heftig $ # Maintainer : Ionut Biru # Contributor: neodreams pkgname=giggle pkgver=0.7 -pkgrel=1 +pkgrel=2 pkgdesc="Git repository viewer" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://live.gnome.org/giggle" -license=('GPL') -depends=('git' 'gtksourceview3' 'vte3') -makedepends=('intltool' 'itstool') -source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz) +license=(GPL) +depends=(git gtksourceview3 vte3 desktop-file-utils hicolor-icon-theme) +makedepends=(intltool itstool) options=(!libtool) install=giggle.install -sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59') +source=(http://ftp.gnome.org/pub/GNOME/sources/giggle/0.7/$pkgname-$pkgver.tar.xz + gtksourceview3.7.patch) +sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59' + 'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37') -build() { +prepare() { cd $pkgname-$pkgver + patch -Np1 -i ../gtksourceview3.7.patch +} - ./configure \ - --prefix=/usr +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr make } -package() { +check() { cd $pkgname-$pkgver + make check +} +package() { + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/community/giggle/gtksourceview3.7.patch b/community/giggle/gtksourceview3.7.patch new file mode 100644 index 000000000..eb86cdeef --- /dev/null +++ b/community/giggle/gtksourceview3.7.patch @@ -0,0 +1,36 @@ +From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b Mon Sep 17 00:00:00 2001 +From: Dominique Leuenberger +Date: Wed, 03 Apr 2013 20:26:17 +0000 +Subject: Directly include gtksourcebuffer.h + +Until gtksourceview 3.7, it was included indirectly by gtksourceview.h. + +https://bugzilla.gnome.org/show_bug.cgi?id=697220 +--- +diff --git a/src/giggle-diff-view.c b/src/giggle-diff-view.c +index 3ded28d..ff6bbe3 100644 +--- a/src/giggle-diff-view.c ++++ b/src/giggle-diff-view.c +@@ -29,6 +29,8 @@ + #include + #include + ++#include ++ + typedef struct GiggleDiffViewPriv GiggleDiffViewPriv; + typedef struct GiggleDiffViewFile GiggleDiffViewFile; + typedef struct GiggleDiffViewHunk GiggleDiffViewHunk; +diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c +index 130af4a..517858d 100644 +--- a/src/giggle-view-file.c ++++ b/src/giggle-view-file.c +@@ -40,6 +40,7 @@ + + #include + #include ++#include + + #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT (giggle_view_file_snapshot_get_type ()) + #define GIGGLE_VIEW_FILE_SNAPSHOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot)) +-- +cgit v0.9.1 diff --git a/community/gitg/PKGBUILD b/community/gitg/PKGBUILD index 1bb606e4e..68d902e4f 100644 --- a/community/gitg/PKGBUILD +++ b/community/gitg/PKGBUILD @@ -1,36 +1,28 @@ -# $Id: PKGBUILD 57270 2011-10-25 06:09:22Z ebelanger $ -# Maintainer: Brad Fanella -# Contributor: Blaž Tomžič -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Christoph Zeiler -# Contributor: M Rawash -# Contributor: DonVla +# $Id: PKGBUILD 88690 2013-04-21 22:17:07Z heftig $ +# Maintainer: Eric Bélanger pkgname=gitg -pkgver=0.2.5 +pkgver=0.2.7 pkgrel=1 pkgdesc='A GIT repository viewer based on GTK+' arch=('i686' 'x86_64') -url='http://trac.novowork.com/gitg/' +url='https://git.gnome.org/browse/gitg/' license=('GPL') -depends=('dconf' 'gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \ +depends=('gtksourceview3' 'git' 'desktop-file-utils' 'gsettings-desktop-schemas' \ 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') -install="${pkgname}.install" -source=("ftp://ftp.gnome.org/pub/GNOME/sources/gitg/0.2/${pkgname}-${pkgver}.tar.xz") -sha256sums=('d3dfff65834d8371d43b2e91926af1421f8ec2128580dfeceb6925b6b1ce6d8c') +install=gitg.install +source=(ftp://ftp.gnome.org/pub/GNOME/sources/gitg/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha1sums=('7b1428819666e4797d64dc94bb1624d5e7b75e6a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure \ - --prefix=/usr - make + 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/community/gitg/gitg.install b/community/gitg/gitg.install index 7b356a632..4b90c879e 100644 --- a/community/gitg/gitg.install +++ b/community/gitg/gitg.install @@ -1,19 +1,13 @@ -# Maintainer: Brad Fanella -# Contributor: DonVla -# gitg install file - post_install() { - 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 + 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 $1 + post_install $1 } 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_install $1 } diff --git a/community/gnome-applets/01_battstat_upower.patch b/community/gnome-applets/01_battstat_upower.patch new file mode 100644 index 000000000..fa31e720b --- /dev/null +++ b/community/gnome-applets/01_battstat_upower.patch @@ -0,0 +1,622 @@ +From 18a2f4aa3ba2c8c9fc3718b15a9ab366fdd35f05 Mon Sep 17 00:00:00 2001 +From: Joachim Breitner +Date: Mon, 5 Jul 2010 12:20:04 +0200 +Subject: [PATCH] [battstat applet] upower support + +As HAL is being deprecated, the battstat applet is adjusted to talk to +upower, using libupower-glib. (Bug #607254) +--- + battstat/Makefile.am | 6 +- + battstat/battstat-upower.c | 330 +++++++++++++++++++++++++++++++++++++++++ + battstat/battstat-upower.h | 33 ++++ + battstat/battstat_applet.c | 7 +- + battstat/docs/C/battstat.xml | 18 ++- + battstat/docs/de/battstat.xml | 22 +++- + battstat/docs/eu/battstat.xml | 20 ++- + battstat/power-management.c | 66 +++++++-- + configure.in | 22 +++ + 9 files changed, 493 insertions(+), 31 deletions(-) + create mode 100644 battstat/battstat-upower.c + create mode 100644 battstat/battstat-upower.h + +Index: gnome-applets-3.4.1/battstat/Makefile.am +=================================================================== +--- gnome-applets-3.4.1.orig/battstat/Makefile.am 2012-04-13 19:02:29.000000000 +0200 ++++ gnome-applets-3.4.1/battstat/Makefile.am 2012-04-19 00:28:17.246029051 +0200 +@@ -27,6 +27,7 @@ + $(GNOME_APPLETS_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ + $(HAL_CFLAGS) \ ++ $(UPOWER_CFLAGS) \ + $(APMINC) \ + $(ACPIINC) \ + $(WARN_CFLAGS) \ +@@ -48,13 +49,17 @@ + acpi-freebsd.c \ + acpi-freebsd.h \ + battstat-hal.c \ +- battstat-hal.h ++ battstat-hal.h \ ++ battstat-upower.c \ ++ battstat-upower.h + + + battstat_applet_2_LDADD = \ + $(GNOME_APPLETS_LIBS) \ + $(LIBNOTIFY_LIBS) \ + $(HAL_LIBS) \ ++ $(UPOWER_LIBS) \ ++ $(LIBM) \ + $(APMLIB) + + schemasdir = @GCONF_SCHEMA_FILE_DIR@ +Index: gnome-applets-3.4.1/battstat/battstat-upower.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-applets-3.4.1/battstat/battstat-upower.c 2012-04-19 00:28:17.246029051 +0200 +@@ -0,0 +1,301 @@ ++/* ++ * Copyright (C) 2010 by Joachim Breitner ++ * ++ * Based on battstat-hal.c: ++ * Copyright (C) 2005 by Ryan Lortie ++ * ++ * 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 Street #330, Boston, MA 02111-1307, USA. ++ * ++ * $Id$ ++ */ ++ ++#include ++ ++#ifdef HAVE_UPOWER ++ ++#include ++#include ++ ++#include "battstat-upower.h" ++ ++static UpClient *upc; ++static void (*status_updated_callback) (void); ++ ++ ++/* status_updated_callback() can not be called directly because at the time of ++ * the device-remove signal, the device is not actually removed from the list ++ * of devices known to the up_client object (see libupower-glib/up-client.c in ++ * upower). Waiting for the next idle timer works around this issue and has has ++ * the additionaly benefit of possibly running status_updated_callback only ++ * once when several events happen very soon after each other. ++ */ ++static gboolean status_update_scheduled; ++ ++static gboolean ++update_status_idle (gpointer junk) ++{ ++ if (status_updated_callback) ++ status_updated_callback (); ++ ++ return status_update_scheduled = FALSE; ++} ++ ++static void ++schedule_status_callback (void) ++{ ++ if (status_update_scheduled) ++ return; ++ ++ status_update_scheduled = TRUE; ++ g_idle_add (update_status_idle, NULL); ++} ++ ++static void ++device_cb (UpClient *client, UpDevice *device, gpointer user_data) { ++ schedule_status_callback(); ++} ++ ++/* ---- public functions ---- */ ++ ++char * ++battstat_upower_initialise (void (*callback) (void)) ++{ ++ status_updated_callback = callback; ++ ++ if( upc != NULL ) ++ return g_strdup( "Already initialised!" ); ++ ++ if( (upc = up_client_new() ) == NULL ) ++ goto error_out; ++ ++ if (! up_client_enumerate_devices_sync( upc, NULL, NULL ) ) { ++ goto error_shutdownclient; ++ } ++ ++ g_signal_connect_after( upc, "device-changed", device_cb, NULL ); ++ g_signal_connect_after( upc, "device-added", device_cb, NULL ); ++ g_signal_connect_after( upc, "device-removed", device_cb, NULL ); ++ ++ return NULL; ++ ++error_shutdownclient: ++ g_object_unref( upc ); ++ upc = NULL; ++ ++error_out: ++ return "Can not initialize upower"; ++} ++ ++void ++battstat_upower_cleanup( void ) ++{ ++ if( upc == NULL ) ++ return; ++ ++ g_object_unref( upc ); ++ upc = NULL; ++} ++ ++#include "battstat.h" ++ ++/* This function currently exists to allow the multiple batteries supported ++ * by the upower backend to appear as a single composite battery device (since ++ * at the current time this is all that battstat supports). ++ * ++ * This entire function is filled with logic to make multiple batteries ++ * appear as one "composite" battery. Comments included as appropriate. ++ * ++ * For more information about some of the assumptions made in the following ++ * code please see the following mailing list post and the resulting thread: ++ * ++ * http://lists.freedesktop.org/archives/hal/2005-July/002841.html ++ */ ++void ++battstat_upower_get_battery_info( BatteryStatus *status ) ++{ ++ ++ GPtrArray *devices = up_client_get_devices( upc ); ++ ++ /* The calculation to get overall percentage power remaining is as follows: ++ * ++ * Sum( Current charges ) / Sum( Full Capacities ) ++ * ++ * We can't just take an average of all of the percentages since this ++ * doesn't deal with the case that one battery might have a larger ++ * capacity than the other. ++ * ++ * In order to do this calculation, we need to keep a running total of ++ * current charge and full capacities. ++ */ ++ double current_charge_total = 0, full_capacity_total = 0; ++ ++ /* Record the time remaining as reported by upower. This is used in the event ++ * that the system has exactly one battery (since, then, upower is capable ++ * of providing an accurate time remaining report and we should trust it.) ++ */ ++ gint64 remaining_time = 0; ++ ++ /* The total (dis)charge rate of the system is the sum of the rates of ++ * the individual batteries. ++ */ ++ double rate_total = 0; ++ ++ /* We need to know if we should report the composite battery as present ++ * at all. The logic is that if at least one actual battery is installed ++ * then the composite battery will be reported to exist. ++ */ ++ int present = 0; ++ ++ /* We need to know if we are on AC power or not. Eventually, we can look ++ * at the AC adaptor upower devices to determine that. For now, we assume that ++ * if any battery is discharging then we must not be on AC power. Else, by ++ * default, we must be on AC. ++ */ ++ int on_ac_power = 1; ++ ++ /* Finally, we consider the composite battery to be "charging" if at least ++ * one of the actual batteries in the system is charging. ++ */ ++ int charging = 0; ++ ++ /* For each physical battery bay... */ ++ int i; ++ for( i = 0; i < devices->len; i++ ) ++ { ++ UpDevice *upd = g_ptr_array_index( devices, i ); ++ ++ int type, state; ++ double current_charge, full_capacity, rate; ++ gint64 time_to_full, time_to_empty; ++ ++ g_object_get( upd, ++ "kind", &type, ++ "state", &state, ++ "energy", ¤t_charge, ++ "energy-full", &full_capacity, ++ "energy-rate", &rate, ++ "time-to-full", &time_to_full, ++ "time-to-empty", &time_to_empty, ++ NULL ); ++ ++ /* Only count batteries here */ ++ ++ if (type != UP_DEVICE_KIND_BATTERY) ++ continue; ++ ++ /* At least one battery present -> composite battery is present. */ ++ present++; ++ ++ /* At least one battery charging -> composite battery is charging. */ ++ if( state == UP_DEVICE_STATE_CHARGING ) ++ charging = 1; ++ ++ /* At least one battery is discharging -> we're not on AC. */ ++ if( state == UP_DEVICE_STATE_DISCHARGING ) ++ on_ac_power = 0; ++ ++ /* Sum the totals for current charge, design capacity, (dis)charge rate. */ ++ current_charge_total += current_charge; ++ full_capacity_total += full_capacity; ++ rate_total += rate; ++ ++ /* Record remaining time too, incase this is the only battery. */ ++ remaining_time = (state == UP_DEVICE_STATE_DISCHARGING ? time_to_empty : time_to_full); ++ } ++ ++ if( !present || full_capacity_total <= 0 || (charging && !on_ac_power) ) ++ { ++ /* Either no battery is present or something has gone horribly wrong. ++ * In either case we must return that the composite battery is not ++ * present. ++ */ ++ status->present = FALSE; ++ status->percent = 0; ++ status->minutes = -1; ++ status->on_ac_power = TRUE; ++ status->charging = FALSE; ++ ++ g_ptr_array_unref( devices ); ++ return; ++ } ++ ++ /* Else, our composite battery is present. */ ++ status->present = TRUE; ++ ++ /* As per above, overall charge is: ++ * ++ * Sum( Current charges ) / Sum( Full Capacities ) ++ */ ++ status->percent = ( current_charge_total / full_capacity_total ) * 100.0 + 0.5; ++ ++ if( present == 1 ) ++ { ++ /* In the case of exactly one battery, report the time remaining figure ++ * from upower directly since it might have come from an authorative source ++ * (ie: the PMU or APM subsystem). ++ * ++ * upower gives remaining time in seconds with a 0 to mean that the ++ * remaining time is unknown. Battstat uses minutes and -1 for ++ * unknown time remaining. ++ */ ++ ++ if( remaining_time == 0 ) ++ status->minutes = -1; ++ else ++ status->minutes = (remaining_time + 30) / 60; ++ } ++ /* Rest of cases to deal with multiple battery systems... */ ++ else if( !on_ac_power && rate_total != 0 ) ++ { ++ /* Then we're discharging. Calculate time remaining until at zero. */ ++ ++ double remaining; ++ ++ remaining = current_charge_total; ++ remaining /= rate_total; ++ status->minutes = (int) floor( remaining * 60.0 + 0.5 ); ++ } ++ else if( charging && rate_total != 0 ) ++ { ++ /* Calculate time remaining until charged. For systems with more than ++ * one battery, this code is very approximate. The assumption is that if ++ * one battery reaches full charge before the other that the other will ++ * start charging faster due to the increase in available power (similar ++ * to how a laptop will charge faster if you're not using it). ++ */ ++ ++ double remaining; ++ ++ remaining = full_capacity_total - current_charge_total; ++ if( remaining < 0 ) ++ remaining = 0; ++ remaining /= rate_total; ++ ++ status->minutes = (int) floor( remaining * 60.0 + 0.5 ); ++ } ++ else ++ { ++ /* On AC power and not charging -or- rate is unknown. */ ++ status->minutes = -1; ++ } ++ ++ /* These are simple and well-explained above. */ ++ status->charging = charging; ++ status->on_ac_power = on_ac_power; ++ ++ g_ptr_array_unref( devices ); ++} ++ ++#endif /* HAVE_UPOWER */ +Index: gnome-applets-3.4.1/battstat/battstat-upower.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-applets-3.4.1/battstat/battstat-upower.h 2012-04-19 00:28:17.254029051 +0200 +@@ -0,0 +1,33 @@ ++/* ++ * Copyright (C) 2010 by Joachim Breitner ++ * ++ * Based on battstat-hal.h: ++ * Copyright (C) 2005 by Ryan Lortie ++ * ++ * 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 Street #330, Boston, MA 02111-1307, USA. ++ * ++ * $Id$ ++ */ ++ ++#ifndef _battstat_upower_h_ ++#define _battstat_upower_h_ ++ ++char *battstat_upower_initialise (void (*) (void)); ++void battstat_upower_cleanup (void); ++ ++#include "battstat.h" ++void battstat_upower_get_battery_info (BatteryStatus *status); ++ ++#endif /* _battstat_upower_h_ */ +Index: gnome-applets-3.4.1/battstat/battstat_applet.c +=================================================================== +--- gnome-applets-3.4.1.orig/battstat/battstat_applet.c 2012-04-13 19:02:29.000000000 +0200 ++++ gnome-applets-3.4.1/battstat/battstat_applet.c 2012-04-19 00:28:17.254029051 +0200 +@@ -1188,9 +1188,12 @@ + + char *comments = g_strdup_printf ("%s\n\n%s", + _("This utility shows the status of your laptop battery."), +- power_management_using_hal () ? ++ power_management_using_upower () ? ++ /* true */ _("upower backend enabled.") : ++ (power_management_using_hal () ? + /* true */ _("HAL backend enabled.") : +- /* false */ _("Legacy (non-HAL) backend enabled.")); ++ /* false */ _("Legacy (non-HAL) backend enabled.") ++ )); + + gtk_show_about_dialog( NULL, + "version", VERSION, +Index: gnome-applets-3.4.1/battstat/docs/C/battstat.xml +=================================================================== +--- gnome-applets-3.4.1.orig/battstat/docs/C/battstat.xml 2012-04-15 15:49:58.000000000 +0200 ++++ gnome-applets-3.4.1/battstat/docs/C/battstat.xml 2012-04-19 00:28:17.254029051 +0200 +@@ -226,10 +226,13 @@ + Power Management Backends + + +- The battery monitor supports a number of power management backends. If it +- is available, the monitor will attempt to use the freedesktop.org +- HAL (Hardware Abstraction +- Layer). If it is unavailable or unsupported on your platform, the ++ The battery monitor supports a number of power management backends. ++ If it is available, the monitor will attempt to use the freedesktop.org ++ upower interface. ++ If it is unavailable or unsupported on your platform, it will fall back ++ to the freedesktop.org ++ HAL (Hardware ++ Abstraction Layer). If that is also not availble, the + battery monitor will attempt direct access to the power management system. + + +@@ -410,10 +413,10 @@ + + Determining the backend + +- If you are using the Hardware Abstraction Layer +- (see ) then that will be +- indicated in the about dialog by placing a star next to the author of the +- HAL backend. ++ If you are using the upower interface, or the the Hardware ++ Abstraction Layer (see ) then ++ that will be indicated in the about dialog by placing a star next to the ++ author of the HAL backend. +

+ Check you're using the HAL backend + +Index: gnome-applets-3.4.1/battstat/power-management.c +=================================================================== +--- gnome-applets-3.4.1.orig/battstat/power-management.c 2012-04-13 19:02:29.000000000 +0200 ++++ gnome-applets-3.4.1/battstat/power-management.c 2012-04-19 00:28:17.254029051 +0200 +@@ -41,6 +41,7 @@ + + #include "battstat.h" + #include "battstat-hal.h" ++#include "battstat-upower.h" + + #define ERR_ACPID _("Can't access ACPI events in /var/run/acpid.socket! " \ + "Make sure the ACPI subsystem is working and " \ +@@ -66,6 +67,9 @@ + #ifdef HAVE_HAL + static int using_hal; + #endif ++#ifdef HAVE_UPOWER ++static int using_upower; ++#endif + + /* + * What follows is a series of platform-specific apm_readinfo functions +@@ -390,6 +394,14 @@ + return NULL; + } + ++#ifdef HAVE_UPOWER ++ if( using_upower ) ++ { ++ battstat_upower_get_battery_info( status ); ++ return NULL; ++ } ++#endif ++ + #ifdef HAVE_HAL + if( using_hal ) + { +@@ -430,27 +442,36 @@ + const char * + power_management_initialise (int no_hal, void (*callback) (void)) + { ++ char *err; ++ err = g_strdup( ":(" ); + #ifdef __linux__ + struct stat statbuf; + #endif +-#ifdef HAVE_HAL +- char *err; ++#ifdef HAVE_UPOWER ++ err = battstat_upower_initialise (callback); + +- if( no_hal ) +- err = g_strdup( ":(" ); +- else +- err = battstat_hal_initialise (callback); +- +- +- if( err == NULL ) /* HAL is up */ ++ if( err == NULL ) /* UPOWER is up */ + { + pm_initialised = 1; +- using_hal = TRUE; ++ using_upower = TRUE; + return NULL; ++ } ++#endif ++ ++#ifdef HAVE_HAL ++ if(! no_hal ) { ++ err = battstat_hal_initialise (callback); ++ ++ if( err == NULL ) /* HAL is up */ ++ { ++ pm_initialised = 1; ++ using_hal = TRUE; ++ return NULL; ++ } + } +- else +- /* fallback to legacy methods */ +- g_free( err ); ++ ++ /* fallback to legacy methods */ ++ g_free( err ); + #endif + + #ifdef __linux__ +@@ -498,6 +519,15 @@ + void + power_management_cleanup( void ) + { ++#ifdef HAVE_UPOWER ++ if( using_upower ) ++ { ++ battstat_upower_cleanup(); ++ pm_initialised = 1; ++ return; ++ } ++#endif ++ + #ifdef HAVE_HAL + if( using_hal ) + { +@@ -525,6 +555,16 @@ + } + + int ++power_management_using_upower( void ) ++{ ++#ifdef HAVE_UPOWER ++ return using_upower; ++#else ++ return 0; ++#endif ++} ++ ++int + power_management_using_hal( void ) + { + #ifdef HAVE_HAL +Index: gnome-applets-3.4.1/configure.in +=================================================================== +--- gnome-applets-3.4.1.orig/configure.in 2012-04-15 15:45:36.000000000 +0200 ++++ gnome-applets-3.4.1/configure.in 2012-04-19 00:28:17.254029051 +0200 +@@ -23,6 +23,7 @@ + LIBWNCK_REQUIRED=2.91.0 + LIBNOTIFY_REQUIRED=0.7 + HAL_REQUIRED=0.5.3 ++UPOWER_REQUIRED=0.9.4 + DBUS_REQUIRED=1.1.2 + DBUS_GLIB_REQUIRED=0.74 + PYGOBJECT_REQUIRED=2.26 +@@ -223,6 +224,30 @@ + AC_SUBST(HAL_CFLAGS) + AC_SUBST(HAL_LIBS) + ++dnl -- check for libupower-glib (optional) -------------------------------------------- ++UPOWER_CFLAGS= ++UPOWER_LIBS= ++AC_ARG_WITH(upower,[ --without-upower build without upower support]) ++ ++if test "x$with_upower" != xno; then ++ PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED, ++ HAVE_UPOWER="yes", ++ HAVE_UPOWER="no") ++ ++ LT_LIB_M ++ if test "x$HAVE_UPOWER" = "xyes"; then ++ AC_DEFINE(HAVE_UPOWER, 1, [UPOWER available]) ++ fi ++else ++ AC_MSG_WARN(["upower support disabled"]) ++fi ++ ++AC_SUBST(UPOWER_CFLAGS) ++AC_SUBST(UPOWER_LIBS) ++AC_SUBST(LIBM) ++ ++ ++ + dnl -- check for gucharmap (optional) ----------------------------------------- + + PKG_CHECK_MODULES([GUCHARMAP],[gucharmap-2.90 >= $GUCHARMAP3_REQUIRED], +@@ -739,5 +764,6 @@ + Using DBUS: $HAVE_DBUS + Using NetworkManager: $HAVE_NETWORKMANAGER + Using HAL: $HAVE_HAL ++ Using UPOWER: $HAVE_UPOWER + Enabling IPv6: $have_ipv6 + " >&2 diff --git a/community/gnome-applets/PKGBUILD b/community/gnome-applets/PKGBUILD index 59699512e..193c879af 100644 --- a/community/gnome-applets/PKGBUILD +++ b/community/gnome-applets/PKGBUILD @@ -1,35 +1,61 @@ -# $Id: PKGBUILD 87904 2013-04-08 14:47:20Z heftig $ -# Maintainer: Jan de Groot +# $Id: PKGBUILD 88683 2013-04-21 22:16:53Z heftig $ +# Maintainer: Balló György +# Contributor: Jan de Groot pkgname=gnome-applets pkgver=3.5.92 -pkgrel=1 -pkgdesc="GNOME Applets" -arch=(i686 x86_64) +pkgrel=3 +pkgdesc="Small applications for the GNOME panel" +arch=('i686' 'x86_64') license=('GPL') -depends=('gnome-panel' 'libgtop' 'gucharmap' 'libnotify') -makedepends=('gnome-doc-utils' 'intltool' 'gnome-settings-daemon' 'networkmanager') -options=(!emptydirs) -url="http://www.gnome.org" -install=gnome-applets.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83') +depends=('cpupower' 'gucharmap' 'gstreamer0.10-base-plugins' 'gnome-panel' 'libgtop' 'upower') +makedepends=('gnome-common' 'gnome-doc-utils' 'intltool' 'networkmanager' 'rarian') +url="https://live.gnome.org/GnomeApplets" +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + gnome-applets-cpupower.patch + disable-gweather-applet.patch + fix-autoconf.patch + 01_battstat_upower.patch) +sha256sums=('f6178cb702a39a4103fcb97e9a266bf6d05f05ac5064818f119c023d76170e83' + '942276d7cc18224d9f5b1b57314746ad4d713ee0dcf4aedb25fa72e92db75e65' + '47f6b477c0f76ebb1e8ffc6fe9bd2fac9ac7f511f059cf4bb2687f8425bfb4a8' + '0acd58aee458345e378d5f77256e04b13e3a4c06b166aac390a92309b864e8a4' + '364c9264c76721b42e85eecc48443852ead1bd730d9de937dd2ae00889db836a') build() { cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/gnome-applets \ - --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-schemas-install \ - --without-hal + + sed -i 's@^#!.*python$@#!/usr/bin/python2@' invest-applet/invest/* + + # Use cpupower instead of cpufreq + patch -Np1 -i "$srcdir/gnome-applets-cpupower.patch" + + # Add UPower support + patch -Np1 -i "$srcdir/01_battstat_upower.patch" + + # Disable gweather applet, because it's not compatible with libgweather 3.8 + patch -Np1 -i "$srcdir/disable-gweather-applet.patch" + + # Fix build + patch -Np1 -i "$srcdir/fix-autoconf.patch" + + # Turn off unneeded warnings + CFLAGS="$CFLAGS -w" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static --disable-schemas-install --disable-scrollkeeper \ + --enable-mixer-applet \ + PYTHON=/usr/bin/python2 make } package() { cd "$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install + make 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 + mkdir -m755 -p "$pkgdir/usr/share/gconf/schemas" + gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas + rm -r "$pkgdir"/etc/gconf } diff --git a/community/gnome-applets/disable-gweather-applet.patch b/community/gnome-applets/disable-gweather-applet.patch new file mode 100644 index 000000000..26f7e4d6b --- /dev/null +++ b/community/gnome-applets/disable-gweather-applet.patch @@ -0,0 +1,12 @@ +diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in +--- gnome-applets-3.5.92.orig/configure.in 2012-09-20 03:07:34.000000000 +0200 ++++ gnome-applets-3.5.92/configure.in 2013-04-09 10:39:54.214243015 +0200 +@@ -251,7 +251,7 @@ + + dnl -- check for libgweather (required for gweather applet) ------------------ + build_libgweather_applets=false +-PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED, ++PKG_CHECK_MODULES(LIBGWEATHER, gweather-3.0 >= $GWEATHER_REQUIRED gweather-3.0 <= 3.7, + build_libgweather_applets=true, + AC_MSG_WARN([libgweather not found. Not building the weather applet.])) + AC_SUBST(LIBGWEATHER_CFLAGS) diff --git a/community/gnome-applets/fix-autoconf.patch b/community/gnome-applets/fix-autoconf.patch new file mode 100644 index 000000000..fc36c743c --- /dev/null +++ b/community/gnome-applets/fix-autoconf.patch @@ -0,0 +1,12 @@ +diff -Naur gnome-applets-3.5.92.orig/configure.in gnome-applets-3.5.92/configure.in +--- gnome-applets-3.5.92.orig/configure.in 2012-09-20 03:07:34.000000000 +0200 ++++ gnome-applets-3.5.92/configure.in 2013-04-09 09:48:48.427334056 +0200 +@@ -4,7 +4,7 @@ + AC_INIT(gnome-applets, 3.5.92) + AC_PREREQ(2.59) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar]) + AC_CONFIG_MACRO_DIR(m4) + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/community/gnome-applets/gnome-applets-cpupower.patch b/community/gnome-applets/gnome-applets-cpupower.patch new file mode 100644 index 000000000..134a617fc --- /dev/null +++ b/community/gnome-applets/gnome-applets-cpupower.patch @@ -0,0 +1,12 @@ +diff -up gnome-applets-3.1.90/configure.in.cpupower gnome-applets-3.1.90/configure.in +--- gnome-applets-3.1.90/configure.in.cpupower 2011-08-31 18:49:00.628945807 -0400 ++++ gnome-applets-3.1.90/configure.in 2011-08-31 18:49:17.397946966 -0400 +@@ -518,7 +518,7 @@ AC_CHECK_HEADER(cpufreq.h, have_libcpufr + LIBCPUFREQ_LIBS= + if test "x$have_libcpufreq" = "xyes"; then + AC_DEFINE([HAVE_LIBCPUFREQ], [1], [Have libcpufreq.]) +- LIBCPUFREQ_LIBS=-lcpufreq ++ LIBCPUFREQ_LIBS=-lcpupower + fi + AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes) + AC_SUBST(LIBCPUFREQ_LIBS) diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD index 85972a329..cb8d4df7e 100644 --- a/community/gnome-packagekit/PKGBUILD +++ b/community/gnome-packagekit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 85932 2013-03-09 04:07:22Z jconder $ +# $Id: PKGBUILD 88703 2013-04-21 22:24:13Z heftig $ # Maintainer: Jonathan Conder pkgname=gnome-packagekit -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ optdepends=('polkit-gnome: required for privileged actions' options=('!emptydirs' '!libtool') install="$pkgname.install" source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") -sha256sums=('2db1069324cb85d8704bd1ffbbea3c29d57ba7b0d710f45f6563fd963517ef40') +sha256sums=('fe0a6368ee5a67419c9332a3b0031ecf1e3e92aa2fe0eb30aa4273f6224d070a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch new file mode 100644 index 000000000..2c90a9fe2 --- /dev/null +++ b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch @@ -0,0 +1,95 @@ +From a5b951654b856d899e8c6a4116b4ccc4f18aac91 Mon Sep 17 00:00:00 2001 +From: Jeremy Bicha +Date: Sun, 24 Feb 2013 17:22:29 -0500 +Subject: [PATCH] Add the GNOME Flashback session + +This was removed from gnome-session 3.7.4 so let's it add it back here +(under new name) + +https://bugzilla.gnome.org/show_bug.cgi?id=694625 +--- + data/Makefile.am | 18 +++++++++++++++++- + data/gnome-flashback.desktop.in | 7 +++++++ + data/gnome-flashback.session.desktop.in | 3 +++ + po/POTFILES.in | 2 ++ + 4 files changed, 29 insertions(+), 1 deletion(-) + create mode 100644 data/gnome-flashback.desktop.in + create mode 100644 data/gnome-flashback.session.desktop.in + +diff --git a/data/Makefile.am b/data/Makefile.am +index 83f82e2..84e1954 100644 +--- a/data/Makefile.am ++++ b/data/Makefile.am +@@ -30,17 +30,33 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml) + + @GSETTINGS_RULES@ + ++sessiondir = $(datadir)/gnome-session/sessions ++session_in_files = gnome-flashback.session.desktop.in ++session_DATA = $(session_in_files:.session.desktop.in=.session) ++ ++xsessiondir = $(datadir)/xsessions ++xsession_in_files = gnome-flashback.desktop.in ++xsession_DATA = $(xsession_in_files:.desktop.in=.desktop) ++ ++%.session: %.session.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ ++ ++@INTLTOOL_DESKTOP_RULE@ ++ + default_layoutdir = $(datadir)/gnome-panel + default_layout_DATA = panel-default-layout.layout + + EXTRA_DIST = \ + $(gsettings_schemas_in_in) \ ++ $(session_in_files) \ ++ $(xsession_in_files) \ + $(default_layout_DATA) + + CLEANFILES = \ + $(gsettings__enum_file) \ + $(gsettings_SCHEMAS_in) \ + $(gsettings_SCHEMAS) \ +- *.gschema.valid ++ *.gschema.valid \ ++ $(session_DATA) \ ++ $(xsession_DATA) + + -include $(top_srcdir)/git.mk +diff --git a/data/gnome-flashback.desktop.in b/data/gnome-flashback.desktop.in +new file mode 100644 +index 0000000..4856f75 +--- /dev/null ++++ b/data/gnome-flashback.desktop.in +@@ -0,0 +1,7 @@ ++[Desktop Entry] ++_Name=GNOME Flashback ++_Comment=This session logs you into GNOME with the traditional panel ++Exec=gnome-session --session=gnome-flashback ++TryExec=gnome-session ++Icon= ++Type=Application +diff --git a/data/gnome-flashback.session.desktop.in b/data/gnome-flashback.session.desktop.in +new file mode 100644 +index 0000000..c012c58 +--- /dev/null ++++ b/data/gnome-flashback.session.desktop.in +@@ -0,0 +1,3 @@ ++[GNOME Session] ++_Name=GNOME Flashback ++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;notification-daemon; +diff --git a/po/POTFILES.in b/po/POTFILES.in +index bc65c4c..a6aa6c7 100644 +--- a/po/POTFILES.in ++++ b/po/POTFILES.in +@@ -23,6 +23,8 @@ applets/wncklet/window-menu.c + applets/wncklet/wncklet.c + applets/wncklet/workspace-switcher.c + [type: gettext/glade]applets/wncklet/workspace-switcher.ui ++data/gnome-flashback.desktop.in ++data/gnome-flashback.session.desktop.in + data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in + data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in + data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in +-- +1.7.10.4 + diff --git a/community/gnome-panel/18_fix_force_quit_applet.patch b/community/gnome-panel/18_fix_force_quit_applet.patch new file mode 100644 index 000000000..8a72c9262 --- /dev/null +++ b/community/gnome-panel/18_fix_force_quit_applet.patch @@ -0,0 +1,98 @@ +Description: Fix Force-Quit panel applet + This patch implements handling of XInput2 extension events in the applet. + Without this patch, the applet fails to recognize such events (either mouse + click for killing application, or escape key for exiting), hence freezing the + desktop. + . + Also fix the event mask in call of gdk_device_grab() for keyboard. +Author: Sébastien Villemot +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698740 +Forwarded: no +Last-Update: 2013-01-28 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/gnome-panel/panel-force-quit.c ++++ b/gnome-panel/panel-force-quit.c +@@ -32,6 +32,8 @@ + #include + #include + ++#include ++ + #include "panel-icon-names.h" + #include "panel-stock-icons.h" + +@@ -246,22 +248,23 @@ + + static void + handle_button_press_event (GtkWidget *popup, +- XKeyEvent *event) ++ Display *display, ++ Window subwindow) + { + Window window; + + remove_popup (popup); + +- if (event->subwindow == None) ++ if (subwindow == None) + return; + + if (wm_state_atom == None) +- wm_state_atom = XInternAtom (event->display, "WM_STATE", FALSE); ++ wm_state_atom = XInternAtom (display, "WM_STATE", FALSE); + +- window = find_managed_window (event->display, event->subwindow); ++ window = find_managed_window (display, subwindow); + + if (window != None) { +- if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (event->display), window)) ++ if (!gdk_x11_window_lookup_for_display (gdk_x11_lookup_xdisplay (display), window)) + kill_window_question ((gpointer) window); + } + } +@@ -272,10 +275,12 @@ + GtkWidget *popup) + { + XEvent *xevent = (XEvent *) gdk_xevent; ++ XIEvent *xiev; ++ XIDeviceEvent *xidev; + + switch (xevent->type) { + case ButtonPress: +- handle_button_press_event (popup, &xevent->xkey); ++ handle_button_press_event (popup, xevent->xbutton.display, xevent->xbutton.subwindow); + return GDK_FILTER_REMOVE; + case KeyPress: + if (xevent->xkey.keycode == XKeysymToKeycode (xevent->xany.display, XK_Escape)) { +@@ -283,6 +288,21 @@ + return GDK_FILTER_REMOVE; + } + break; ++ case GenericEvent: ++ xiev = (XIEvent *) xevent->xcookie.data; ++ xidev = (XIDeviceEvent *) xiev; ++ switch (xiev->evtype) { ++ case XI_KeyPress: ++ if (xidev->detail == XKeysymToKeycode (xevent->xany.display, XK_Escape)) { ++ remove_popup (popup); ++ return GDK_FILTER_REMOVE; ++ } ++ break; ++ case XI_ButtonPress: ++ handle_button_press_event (popup, xidev->display, xidev->child); ++ return GDK_FILTER_REMOVE; ++ } ++ break; + default: + break; + } +@@ -331,7 +351,7 @@ + + status = gdk_device_grab (keyboard, root, + GDK_OWNERSHIP_NONE, FALSE, +- GDK_KEY_PRESS | GDK_KEY_RELEASE, ++ GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK, + NULL, time); + if (status != GDK_GRAB_SUCCESS) { + g_warning ("Keyboard grab failed\n"); diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD index 664bc7945..e490594e4 100644 --- a/community/gnome-panel/PKGBUILD +++ b/community/gnome-panel/PKGBUILD @@ -1,38 +1,84 @@ -# $Id: PKGBUILD 87902 2013-04-08 14:46:15Z heftig $ -# Maintainer: Jan de Groot +# $Id: PKGBUILD 88684 2013-04-21 22:16:57Z heftig $ +# Maintainer: Balló György +# Contributor: Jan de Groot -pkgname=gnome-panel +pkgbase=gnome-panel +pkgname=('gnome-panel' 'gnome-flashback-session') pkgver=3.6.2 -pkgrel=1 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL') -pkgdesc="The GNOME Panel" -url="http://www.gnome.org" -depends=('gnome-menus' 'gnome-desktop' 'evolution-data-server' 'librsvg' 'libwnck3' 'libsm' 'dconf' - 'gconf' 'telepathy-glib') -makedepends=('yelp-tools' 'intltool' 'gobject-introspection' 'networkmanager' 'libcanberra') -install=gnome-panel.install -groups=('gnome') -provides=("gnome-panel-bonobo=${pkgver}") -options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079') +pkgdesc="Legacy GNOME panel" +url="https://live.gnome.org/GnomePanel" +depends=('dconf' 'evolution-data-server' 'gconf' 'gnome-desktop' 'gnome-menus' 'librsvg' + 'libwnck3' 'telepathy-glib') +makedepends=('gobject-introspection' 'intltool' 'yelp-tools' 'networkmanager' 'gnome-common') +install=$pkgbase.install +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz + gnome-desktop-3.8.patch + drop-gweather-xml-include.patch + 18_fix_force_quit_applet.patch + logout-hang-workaround.patch + 0001-Add-the-GNOME-Flashback-session.patch + fix-autoconf.patch) +sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079' + '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c' + 'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305' + '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775' + 'e98391114fe618d3c9530cd5ad88e5d0d0e3b62890e4494f7db6a76ec3613a47' + 'f313791d246749f18764ad4af13c4efe54483bc327fab371c47f9fbfc25b20a9' + '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71') build() { - cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --libexecdir=/usr/lib/gnome-panel \ - --disable-scrollkeeper \ - --disable-schemas-compile + cd "$pkgbase-$pkgver" + + # Port to gnome-desktop 3.8 + patch -Np1 -i "$srcdir/gnome-desktop-3.8.patch" + + # Fix build with libgweather 3.8 + patch -Np0 -i "$srcdir/drop-gweather-xml-include.patch" + + # Fix force quit applet to avoid freeze + patch -Np1 -i "$srcdir/18_fix_force_quit_applet.patch" + + # Apply a workaround to avoid hang on logout for 15-20 sec + patch -Np1 -i "$srcdir/logout-hang-workaround.patch" + + # Add GNOME Flashback session + # https://bugzilla.gnome.org/show_bug.cgi?id=694625 + patch -Np1 -i "$srcdir/0001-Add-the-GNOME-Flashback-session.patch" + + # Fix build + patch -Np1 -i "$srcdir/fix-autoconf.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgbase \ + --disable-static --disable-schemas-compile \ + PYTHON=/usr/bin/python2 make } -package() { - cd "$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install +package_gnome-panel() { + cd "$pkgbase-$pkgver" + make DESTDIR="$pkgdir" install + + # Remove unneeded script + rm "$pkgdir/usr/lib/gnome-panel/gnome-panel-add" + + # Split out the session files + rm -r "$pkgdir"/usr/share/{gnome-session,xsessions} +} + +package_gnome-flashback-session() { + pkgdesc="Shell for Gnome 3 which was initially called Gnome Fallback" + url="https://live.gnome.org/GnomeFlashback" + depends=('gnome-screensaver' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' + 'gnome-settings-daemon-compat' 'gnome-themes-standard' 'metacity' 'nautilus' + 'notification-daemon' 'polkit-gnome') + 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 + cd "$pkgbase-$pkgver" + make -C data DESTDIR="$pkgdir" install-sessionDATA + make -C data DESTDIR="$pkgdir" install-xsessionDATA } diff --git a/community/gnome-panel/drop-gweather-xml-include.patch b/community/gnome-panel/drop-gweather-xml-include.patch new file mode 100644 index 000000000..3b3a559f0 --- /dev/null +++ b/community/gnome-panel/drop-gweather-xml-include.patch @@ -0,0 +1,10 @@ +--- applets/clock/clock.c.orig 2012-12-25 14:38:00.101601746 -0600 ++++ applets/clock/clock.c 2012-12-25 14:38:30.331443803 -0600 +@@ -54,7 +54,6 @@ + #define GNOME_DESKTOP_USE_UNSTABLE_API + #include + +-#include + #include + #include + #include diff --git a/community/gnome-panel/fix-autoconf.patch b/community/gnome-panel/fix-autoconf.patch new file mode 100644 index 000000000..17d9e025c --- /dev/null +++ b/community/gnome-panel/fix-autoconf.patch @@ -0,0 +1,11 @@ +diff -Naur gnome-panel-3.6.2.orig/configure.ac gnome-panel-3.6.2/configure.ac +--- gnome-panel-3.6.2.orig/configure.ac 2012-11-12 18:51:14.000000000 +0100 ++++ gnome-panel-3.6.2/configure.ac 2013-04-10 14:50:14.132509059 +0200 +@@ -1,6 +1,6 @@ + AC_INIT([gnome-panel], [3.6.2], + [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar -Wno-portability]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + diff --git a/community/gnome-panel/gnome-desktop-3.8.patch b/community/gnome-panel/gnome-desktop-3.8.patch new file mode 100644 index 000000000..3c8823cd2 --- /dev/null +++ b/community/gnome-panel/gnome-desktop-3.8.patch @@ -0,0 +1,199 @@ +diff -Naur gnome-panel-3.6.2.orig/applets/clock/calendar-window.c gnome-panel-3.6.2/applets/clock/calendar-window.c +--- gnome-panel-3.6.2.orig/applets/clock/calendar-window.c 2012-11-12 18:35:17.000000000 +0100 ++++ gnome-panel-3.6.2/applets/clock/calendar-window.c 2013-04-08 23:10:30.451012763 +0200 +@@ -42,9 +42,6 @@ + #include + #include + +-#define GNOME_DESKTOP_USE_UNSTABLE_API +-#include +- + #include "calendar-window.h" + + #include "clock.h" +@@ -168,6 +165,13 @@ + return; + } + ++ /* FIXME: reintroduce terminal support if a proper GAppInfo port of gnome-panel is ever done */ ++ if (terminal) { ++ g_printerr ("Terminal-based calendar/tasks applications are no longer supported, sorry. " ++ "Please configure a different application.\n"); ++ return; ++ } ++ + command_line = g_find_program_in_path (program); + if (command_line == NULL) { + g_printerr ("Cannot launch calendar/tasks application: %s in path\n", program); +@@ -189,9 +193,6 @@ + screen = gtk_widget_get_screen (calwin->priv->calendar); + error = NULL; + +- if (terminal) +- gnome_desktop_prepend_terminal_to_vector (&argc, &argv); +- + display = gdk_screen_make_display_name (screen); + + result = g_spawn_async (NULL, /* working directory */ +diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c +--- gnome-panel-3.6.2.orig/gnome-panel/panel-run-dialog.c 2012-11-12 18:35:17.000000000 +0100 ++++ gnome-panel-3.6.2/gnome-panel/panel-run-dialog.c 2013-04-08 23:10:52.408175181 +0200 +@@ -25,6 +25,7 @@ + * Havoc Pennington + * George Lebl + * Mark McLoughlin ++ * Tom Tromey (Copyright (C) 1998) + */ + + #include +@@ -42,8 +43,6 @@ + #include + #include + +-#include +- + #include + #include + #include +@@ -335,6 +334,132 @@ + */ + } + ++ ++/** ++ * panel_run_dialog_prepend_terminal_to_vector: ++ * @argc: a pointer to the vector size ++ * @argv: a pointer to the vector ++ * ++ * Description: Prepends a terminal (either the one configured as default in ++ * the user's GNOME setup, or one of the common xterm emulators) to the passed ++ * in vector, modifying it in the process. The vector should be allocated with ++ * #g_malloc, as this will #g_free the original vector. Also all elements must ++ * have been allocated separately. That is the standard glib/GNOME way of ++ * doing vectors however. If the integer that @argc points to is negative, the ++ * size will first be computed. Also note that passing in pointers to a vector ++ * that is empty, will just create a new vector for you. ++ **/ ++/* TODO: throw out this function if there ever is a proper GAppInfo port */ ++static void ++panel_run_dialog_prepend_terminal_to_vector (int *argc, char ***argv) ++{ ++ char **real_argv; ++ int real_argc; ++ int i, j; ++ char **term_argv = NULL; ++ int term_argc = 0; ++ GSettings *settings; ++ ++ gchar *terminal = NULL; ++ ++ char **the_argv; ++ ++ g_return_if_fail (argc != NULL); ++ g_return_if_fail (argv != NULL); ++ ++ /* sanity */ ++ if(*argv == NULL) ++ *argc = 0; ++ ++ the_argv = *argv; ++ ++ /* compute size if not given */ ++ if (*argc < 0) { ++ for (i = 0; the_argv[i] != NULL; i++) ++ ; ++ *argc = i; ++ } ++ ++ settings = g_settings_new ("org.gnome.desktop.default-applications.terminal"); ++ terminal = g_settings_get_string (settings, "exec"); ++ ++ if (terminal) { ++ gchar *command_line; ++ gchar *exec_flag; ++ ++ exec_flag = g_settings_get_string (settings, "exec-arg"); ++ ++ if (exec_flag == NULL) ++ command_line = g_strdup (terminal); ++ else ++ command_line = g_strdup_printf ("%s %s", terminal, ++ exec_flag); ++ ++ g_shell_parse_argv (command_line, ++ &term_argc, ++ &term_argv, ++ NULL /* error */); ++ ++ g_free (command_line); ++ g_free (exec_flag); ++ g_free (terminal); ++ } ++ ++ g_object_unref (settings); ++ ++ if (term_argv == NULL) { ++ char *check; ++ ++ term_argc = 2; ++ term_argv = g_new0 (char *, 3); ++ ++ check = g_find_program_in_path ("gnome-terminal"); ++ if (check != NULL) { ++ term_argv[0] = check; ++ /* Note that gnome-terminal takes -x and ++ * as -e in gnome-terminal is broken we use that. */ ++ term_argv[1] = g_strdup ("-x"); ++ } else { ++ if (check == NULL) ++ check = g_find_program_in_path ("nxterm"); ++ if (check == NULL) ++ check = g_find_program_in_path ("color-xterm"); ++ if (check == NULL) ++ check = g_find_program_in_path ("rxvt"); ++ if (check == NULL) ++ check = g_find_program_in_path ("xterm"); ++ if (check == NULL) ++ check = g_find_program_in_path ("dtterm"); ++ if (check == NULL) { ++ g_warning (_("Cannot find a terminal, using " ++ "xterm, even if it may not work")); ++ check = g_strdup ("xterm"); ++ } ++ term_argv[0] = check; ++ term_argv[1] = g_strdup ("-e"); ++ } ++ } ++ ++ real_argc = term_argc + *argc; ++ real_argv = g_new (char *, real_argc + 1); ++ ++ for (i = 0; i < term_argc; i++) ++ real_argv[i] = term_argv[i]; ++ ++ for (j = 0; j < *argc; j++, i++) ++ real_argv[i] = (char *)the_argv[j]; ++ ++ real_argv[i] = NULL; ++ ++ g_free (*argv); ++ *argv = real_argv; ++ *argc = real_argc; ++ ++ /* we use g_free here as we sucked all the inner strings ++ * out from it into real_argv */ ++ g_free (term_argv); ++} ++ + static gboolean + panel_run_dialog_launch_command (PanelRunDialog *dialog, + const char *command, +@@ -354,7 +479,7 @@ + screen = gtk_window_get_screen (GTK_WINDOW (dialog->run_dialog)); + + if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dialog->terminal_checkbox))) +- gnome_desktop_prepend_terminal_to_vector (&argc, &argv); ++ panel_run_dialog_prepend_terminal_to_vector (&argc, &argv); + + display = gdk_screen_make_display_name (screen); + diff --git a/community/gnome-panel/gnome-panel.install b/community/gnome-panel/gnome-panel.install index 0f9324937..f7e8c46ac 100644 --- a/community/gnome-panel/gnome-panel.install +++ b/community/gnome-panel/gnome-panel.install @@ -1,24 +1,12 @@ -pkgname=gnome-panel - post_install() { - 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 -} - post_upgrade() { post_install } -pre_remove() { - gconfpkg --uninstall $pkgname -} - post_remove() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + post_install } diff --git a/community/gnome-panel/logout-hang-workaround.patch b/community/gnome-panel/logout-hang-workaround.patch new file mode 100644 index 000000000..0b13e35b6 --- /dev/null +++ b/community/gnome-panel/logout-hang-workaround.patch @@ -0,0 +1,15 @@ +diff -Naur gnome-panel-3.6.2.orig/gnome-panel/panel-session.c gnome-panel-3.6.2/gnome-panel/panel-session.c +--- gnome-panel-3.6.2.orig/gnome-panel/panel-session.c 2012-09-03 17:41:42.000000000 +0200 ++++ gnome-panel-3.6.2/gnome-panel/panel-session.c 2013-04-11 00:59:42.125864185 +0200 +@@ -69,11 +69,6 @@ + + egg_sm_client_set_mode (mode); + +- client = egg_sm_client_get (); +- +- g_signal_connect (client, "quit", +- G_CALLBACK (panel_session_handle_quit), NULL); +- + /* We don't want the WM to try and save/restore our + * window position */ + gdk_x11_set_sm_client_id (NULL); diff --git a/community/gnome-phone-manager/PKGBUILD b/community/gnome-phone-manager/PKGBUILD index a84445874..9cb5ee7da 100644 --- a/community/gnome-phone-manager/PKGBUILD +++ b/community/gnome-phone-manager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87900 2013-04-08 14:45:13Z heftig $ +# $Id: PKGBUILD 88702 2013-04-21 22:24:11Z heftig $ # Maintainer: Roman Kyrylych pkgname=gnome-phone-manager -pkgver=0.68 -pkgrel=3 +pkgver=0.69 +pkgrel=1 pkgdesc="Control your mobile phone from your GNOME desktop." arch=('i686' 'x86_64') url="http://live.gnome.org/PhoneManager" @@ -12,10 +12,10 @@ depends=('evolution-data-server' 'gnokii' 'gnome-bluetooth' 'gnome-icon-theme' ' makedepends=('intltool') options=('!emptydirs' '!libtool') install=gnome-phone-manager.install -source=(ftp://ftp.archlinux.org/other/gnome-phone-manager/gnome-phone-manager-0.68-git20121019.tar.xz +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz gnome-phone-manager-0.68-eds.patch) -sha256sums=('885dfa80989c633a5ae8b118c9b7c903e18e44f0e9fc89e6a9bae05da87c9b15' - '98d5c2d3034081eebbaa0dac85f53dcc40c8970114f5711aff8c37bab2931a66') +sha256sums=('35e038ea3afaacdf451046e87af876096cf1520efc04fc3f5b63ea22e0297175' + '232a72108836ddd46d329993d166c38550e2923f161b4dc814d75af4ed5ccc79') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch index 2a36de13a..924201196 100644 --- a/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch +++ b/community/gnome-phone-manager/gnome-phone-manager-0.68-eds.patch @@ -1,7 +1,94 @@ -diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.c b/cut-n-paste/e-contact-entry/e-contact-entry.c -index dc8e2e3..d95e5b9 100644 ---- a/cut-n-paste/e-contact-entry/e-contact-entry.c -+++ b/cut-n-paste/e-contact-entry/e-contact-entry.c +diff -up gnome-phone-manager-0.68/configure.eds gnome-phone-manager-0.68/configure +--- gnome-phone-manager-0.68/configure.eds 2012-10-30 15:03:19.515929969 -0400 ++++ gnome-phone-manager-0.68/configure 2012-10-30 15:03:54.979862209 -0400 +@@ -13939,12 +13939,12 @@ if test -n "$PHONEMGR_CFLAGS"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- \$GNOME_BLUETOOTH_REQS \$evo_pc_file libedataserverui-3.0 ++ \$GNOME_BLUETOOTH_REQS \$evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + \""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + ") 2>&5 + ac_status=$? +@@ -13952,7 +13952,7 @@ if test -n "$PHONEMGR_CFLAGS"; then + test $ac_status = 0; }; then + pkg_cv_PHONEMGR_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + " 2>/dev/null` + else +@@ -13967,12 +13967,12 @@ if test -n "$PHONEMGR_LIBS"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- \$GNOME_BLUETOOTH_REQS \$evo_pc_file libedataserverui-3.0 ++ \$GNOME_BLUETOOTH_REQS \$evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + \""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + ") 2>&5 + ac_status=$? +@@ -13980,7 +13980,7 @@ if test -n "$PHONEMGR_LIBS"; then + test $ac_status = 0; }; then + pkg_cv_PHONEMGR_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + " 2>/dev/null` + else +@@ -14004,13 +14004,13 @@ fi + if test $_pkg_short_errors_supported = yes; then + PHONEMGR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + " 2>&1` + else + PHONEMGR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + " 2>&1` + fi +@@ -14019,7 +14019,7 @@ fi + + as_fn_error $? "Package requirements (gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + ) were not met: + +diff -up gnome-phone-manager-0.68/configure.in.eds gnome-phone-manager-0.68/configure.in +--- gnome-phone-manager-0.68/configure.in.eds 2012-10-30 15:03:24.151921087 -0400 ++++ gnome-phone-manager-0.68/configure.in 2012-10-30 15:03:33.865897797 -0400 +@@ -47,7 +47,7 @@ PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobje + + PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.31.0 + libcanberra-gtk3 gconf-2.0 +- $GNOME_BLUETOOTH_REQS $evo_pc_file libedataserverui-3.0 ++ $GNOME_BLUETOOTH_REQS $evo_pc_file + gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 + ) + +diff -up gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c.eds gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c +--- gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c.eds 2012-07-29 22:06:12.000000000 -0400 ++++ gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.c 2012-10-30 15:02:47.177996584 -0400 @@ -38,11 +38,6 @@ #include #include @@ -32,7 +119,7 @@ index dc8e2e3..d95e5b9 100644 /* A list of EntryLookup structs we are searching */ GList *lookup_entries; /* Number of characters to start searching at */ -@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact *contact) +@@ -227,7 +222,7 @@ e_contact_entry_display_func (EContact * emails = e_contact_get (contact, E_CONTACT_EMAIL); for (l = emails; l != NULL; l = l->next) { item = g_new0 (EContactEntyItem, 1); @@ -41,7 +128,7 @@ index dc8e2e3..d95e5b9 100644 item->display_string = g_strdup_printf ("%s <%s>", (char*)e_contact_get_const (contact, E_CONTACT_NAME_OR_ORG), item->identifier); items = g_list_prepend (items, item); -@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data) +@@ -276,22 +271,13 @@ view_contacts_added_cb (EBook *book, GLi return; photo = e_contact_get (contact, E_CONTACT_PHOTO); @@ -64,7 +151,7 @@ index dc8e2e3..d95e5b9 100644 pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); if (pixbuf) { -@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GList *contacts, gpointer user_data) +@@ -339,16 +325,15 @@ view_contacts_added_cb (EBook *book, GLi * The query on the EBookView has completed. */ static void @@ -83,7 +170,7 @@ index dc8e2e3..d95e5b9 100644 } /** -@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus status, EBookView *book_view, gpointer clo +@@ -373,8 +358,8 @@ bookview_cb (EBook *book, EBookStatus st lookup->bookview = book_view; g_object_add_weak_pointer ((GObject*)book_view, (gpointer*)&lookup->bookview); @@ -94,7 +181,7 @@ index dc8e2e3..d95e5b9 100644 e_book_view_start (book_view); } -@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) +@@ -396,6 +381,7 @@ entry_changed_cb (GtkEditable *editable, if (lookup->bookview) { e_book_view_stop (lookup->bookview); g_object_unref (lookup->bookview); @@ -102,7 +189,7 @@ index dc8e2e3..d95e5b9 100644 } } -@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) +@@ -410,7 +396,7 @@ entry_changed_cb (GtkEditable *editable, if (!lookup->open) continue; @@ -111,7 +198,7 @@ index dc8e2e3..d95e5b9 100644 g_signal_emit (entry, signals[ERROR], 0, _("Cannot create searchable view.")); } } -@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus status, gpointer data) +@@ -458,11 +444,12 @@ book_opened_cb (EBook *book, EBookStatus */ void @@ -127,7 +214,7 @@ index dc8e2e3..d95e5b9 100644 g_return_if_fail (E_IS_CONTACT_ENTRY (entry)); -@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContactEntry *entry, +@@ -471,58 +458,48 @@ e_contact_entry_set_source_list (EContac g_list_foreach (entry->priv->lookup_entries, (GFunc)lookup_entry_free, NULL); g_list_free (entry->priv->lookup_entries); } @@ -174,23 +261,24 @@ index dc8e2e3..d95e5b9 100644 - uri = g_strdup_printf("%s/%s", e_source_group_peek_base_uri (group), e_source_peek_relative_uri (source)); - e_source_set_absolute_uri (s, uri); - g_free (uri); -+ for (link = list; link != NULL; link = g_list_next (link)) { -+ ESource *source = E_SOURCE (link->data); -+ EntryLookup *lookup; - +- - /* Now add those to the lookup entries list */ - lookup = g_new0 (EntryLookup, 1); - lookup->entry = entry; - lookup->status = E_BOOK_ERROR_OK; - lookup->open = FALSE; ++ for (link = list; link != NULL; link = g_list_next (link)) { ++ ESource *source = E_SOURCE (link->data); ++ EntryLookup *lookup; + +- if ((lookup->book = e_book_new (s, &error)) == NULL) { +- /* TODO handle this better, fire the error signal I guess */ + /* Now add those to the lookup entries list */ + lookup = g_new0 (EntryLookup, 1); + lookup->entry = entry; + lookup->status = E_BOOK_ERROR_OK; + lookup->open = FALSE; - -- if ((lookup->book = e_book_new (s, &error)) == NULL) { -- /* TODO handle this better, fire the error signal I guess */ ++ + if ((lookup->book = e_book_new (source, &error)) == NULL) { + /* TODO handle this better, fire the error signal I guess */ + if (error) { @@ -212,7 +300,7 @@ index dc8e2e3..d95e5b9 100644 } } -@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContactEntry *entry, +@@ -530,12 +507,12 @@ e_contact_entry_set_source_list (EContac g_signal_emit (entry, signals[STATE_CHANGE], 0, FALSE); } @@ -228,7 +316,7 @@ index dc8e2e3..d95e5b9 100644 } void -@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *object, guint property_id, const GValue * +@@ -601,8 +578,8 @@ e_contact_entry_set_property (GObject *o entry = E_CONTACT_ENTRY (object); switch (property_id) { @@ -239,7 +327,7 @@ index dc8e2e3..d95e5b9 100644 break; case PROP_COMPLETE_LENGTH: e_contact_entry_set_complete_length (entry, g_value_get_int (value)); -@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *object, guint property_id, GValue *value, +@@ -620,8 +597,8 @@ e_contact_entry_get_property (GObject *o entry = E_CONTACT_ENTRY (object); switch (property_id) { @@ -250,7 +338,7 @@ index dc8e2e3..d95e5b9 100644 break; case PROP_COMPLETE_LENGTH: g_value_set_int (value, e_contact_entry_get_complete_length (entry)); -@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *object) +@@ -644,7 +621,7 @@ e_contact_entry_finalize (GObject *objec g_list_free (entry->priv->lookup_entries); g_object_unref (entry->priv->completion); g_object_unref (entry->priv->store); @@ -259,7 +347,7 @@ index dc8e2e3..d95e5b9 100644 if (entry->priv->display_destroy) { entry->priv->display_destroy (entry->priv->display_func); -@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *object) +@@ -657,7 +634,7 @@ e_contact_entry_finalize (GObject *objec static void reset_search_fields (EContactEntry *entry) { @@ -268,7 +356,7 @@ index dc8e2e3..d95e5b9 100644 g_free (entry->priv->search_fields); entry->priv->search_fields = g_new0 (EContactField, G_N_ELEMENTS (fields)); -@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntryClass *klass) +@@ -716,9 +693,9 @@ e_contact_entry_class_init (EContactEntr object_class->finalize = e_contact_entry_finalize; /* Properties */ @@ -289,10 +377,9 @@ index dc8e2e3..d95e5b9 100644 } if (lookup->book) { g_object_unref (lookup->book); -diff --git a/cut-n-paste/e-contact-entry/e-contact-entry.h b/cut-n-paste/e-contact-entry/e-contact-entry.h -index bf6b39b..6fedef7 100644 ---- a/cut-n-paste/e-contact-entry/e-contact-entry.h -+++ b/cut-n-paste/e-contact-entry/e-contact-entry.h +diff -up gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h.eds gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h +--- gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h.eds 2012-07-29 22:06:12.000000000 -0400 ++++ gnome-phone-manager-0.68/cut-n-paste/e-contact-entry/e-contact-entry.h 2012-10-30 15:02:47.177996584 -0400 @@ -23,10 +23,8 @@ #ifndef CONTACT_ENTRY_H #define CONTACT_ENTRY_H @@ -316,10 +403,9 @@ index bf6b39b..6fedef7 100644 void e_contact_entry_set_complete_length(EContactEntry *entry, int length); int e_contact_entry_get_complete_length(EContactEntry *entry); -diff --git a/libgsm/phonemgr-utils.c b/libgsm/phonemgr-utils.c -index 4e62e10..baef34f 100644 ---- a/libgsm/phonemgr-utils.c -+++ b/libgsm/phonemgr-utils.c +diff -up gnome-phone-manager-0.68/libgsm/phonemgr-utils.c.eds gnome-phone-manager-0.68/libgsm/phonemgr-utils.c +--- gnome-phone-manager-0.68/libgsm/phonemgr-utils.c.eds 2012-07-29 22:06:12.000000000 -0400 ++++ gnome-phone-manager-0.68/libgsm/phonemgr-utils.c 2012-10-30 15:02:47.177996584 -0400 @@ -27,7 +27,7 @@ #include #include @@ -329,21 +415,19 @@ index 4e62e10..baef34f 100644 #include #include -diff --git a/src/e-phone-entry.c b/src/e-phone-entry.c -index 5d25622..38f4c2f 100644 ---- a/src/e-phone-entry.c -+++ b/src/e-phone-entry.c -@@ -31,8 +31,7 @@ +diff -up gnome-phone-manager-0.68/src/e-phone-entry.c.eds gnome-phone-manager-0.68/src/e-phone-entry.c +--- gnome-phone-manager-0.68/src/e-phone-entry.c.eds 2012-07-29 22:06:12.000000000 -0400 ++++ gnome-phone-manager-0.68/src/e-phone-entry.c 2012-10-30 15:04:13.471829767 -0400 +@@ -31,8 +31,6 @@ #include #include -#include -#include -+#include #include "e-phone-entry.h" #define CONTACT_FORMAT "%s (%s)" -@@ -181,25 +180,25 @@ e_phone_entry_finalize (GObject *object) +@@ -181,25 +179,25 @@ e_phone_entry_finalize (GObject *object) } static void diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD index 909802f6b..0c64c1d6d 100644 --- a/community/gnome-screensaver/PKGBUILD +++ b/community/gnome-screensaver/PKGBUILD @@ -1,37 +1,44 @@ -# $Id: PKGBUILD 87889 2013-04-08 14:39:56Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) +# $Id: PKGBUILD 88685 2013-04-21 22:16:59Z heftig $ +# Maintainer: Balló György +# Contributor: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-screensaver pkgver=3.6.1 -pkgrel=1 -pkgdesc="Screensaver designed to integrate well with the GNOME desktop." +pkgrel=3 +pkgdesc="Legacy GNOME screensaver" arch=('i686' 'x86_64') license=('GPL') url="http://live.gnome.org/GnomeScreensaver" backup=(etc/pam.d/gnome-screensaver) -depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop' 'gsettings-desktop-schemas' 'libsystemd') -makedepends=('pkgconfig' 'intltool' 'libxss') -groups=('gnome') -options=(!emptydirs) -install=gnome-screensaver.install +depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop') +makedepends=('intltool' 'gnome-common') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - gnome-screensaver.pam) + gnome-screensaver.pam + move-desktop-file.patch + fix-autoconf.patch) sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0' - 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') + 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' + '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974' + 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb') build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/gnome-screensaver \ - --localstatedir=/var \ - --with-mit-ext --with-systemd + cd "$pkgname-$pkgver" + # Upstream patch that moves gnome-screensaver desktop file out of autostart + patch -Np1 -i "$srcdir/move-desktop-file.patch" + + # Fix build + patch -Np1 -i "$srcdir/fix-autoconf.patch" + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --with-mit-ext make } package() { - cd $pkgname-$pkgver + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -Dm644 ../gnome-screensaver.pam "$pkgdir/etc/pam.d/gnome-screensaver" } diff --git a/community/gnome-screensaver/fix-autoconf.patch b/community/gnome-screensaver/fix-autoconf.patch new file mode 100644 index 000000000..653b42bc8 --- /dev/null +++ b/community/gnome-screensaver/fix-autoconf.patch @@ -0,0 +1,12 @@ +diff -Naur gnome-screensaver-3.6.1.orig/configure.ac gnome-screensaver-3.6.1/configure.ac +--- gnome-screensaver-3.6.1.orig/configure.ac 2012-10-16 04:28:59.000000000 +0200 ++++ gnome-screensaver-3.6.1/configure.ac 2013-04-10 14:24:44.844833193 +0200 +@@ -10,7 +10,7 @@ + AM_INIT_AUTOMAKE([1.10 no-dist-gzip dist-xz tar-ustar]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AM_MAINTAINER_MODE([enable]) + diff --git a/community/gnome-screensaver/gnome-screensaver.install b/community/gnome-screensaver/gnome-screensaver.install deleted file mode 100644 index d1a42c6ce..000000000 --- a/community/gnome-screensaver/gnome-screensaver.install +++ /dev/null @@ -1,7 +0,0 @@ -pkgname=gnome-screensaver - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - gconfpkg --uninstall ${pkgname} - fi -} diff --git a/community/gnome-screensaver/gnome-screensaver.pam b/community/gnome-screensaver/gnome-screensaver.pam index 453dae646..8d3baf085 100644 --- a/community/gnome-screensaver/gnome-screensaver.pam +++ b/community/gnome-screensaver/gnome-screensaver.pam @@ -1,3 +1,3 @@ #%PAM-1.0 -auth required pam_unix_auth.so nullok -auth optional pam_gnome_keyring.so +auth substack system-login +-auth optional pam_gnome_keyring.so diff --git a/community/gnome-screensaver/move-desktop-file.patch b/community/gnome-screensaver/move-desktop-file.patch new file mode 100644 index 000000000..d918405ad --- /dev/null +++ b/community/gnome-screensaver/move-desktop-file.patch @@ -0,0 +1,34 @@ +From 1940dc6bc8ad5ee2c029714efb1276c05ca80bd4 Mon Sep 17 00:00:00 2001 +From: Tim Lunn +Date: Thu, 18 Oct 2012 23:08:56 +0000 +Subject: move gnome-screensaver desktop file out of autostart + +https://bugzilla.gnome.org/show_bug.cgi?id=683060 +--- +diff --git a/src/Makefile.am b/src/Makefile.am +index 1dd5d46..97ffa07 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -47,7 +47,7 @@ noinst_PROGRAMS = \ + test-window \ + $(NULL) + +-desktopdir = $(sysconfdir)/xdg/autostart ++desktopdir = $(datadir)/applications + desktop_in_files = gnome-screensaver.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + @INTLTOOL_DESKTOP_RULE@ +diff --git a/src/gnome-screensaver.desktop.in.in b/src/gnome-screensaver.desktop.in.in +index fae80c4..82d6d6f 100644 +--- a/src/gnome-screensaver.desktop.in.in ++++ b/src/gnome-screensaver.desktop.in.in +@@ -5,7 +5,6 @@ _Comment=Launch screensaver and locker program + Icon=preferences-desktop-screensaver + Exec=gnome-screensaver + OnlyShowIn=GNOME; +-AutostartCondition=GNOME3 if-session gnome-fallback + NoDisplay=true + X-GNOME-Autostart-Phase=Application + X-GNOME-Autostart-Notify=true +-- +cgit v0.9.1 diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD new file mode 100644 index 000000000..314d38cd1 --- /dev/null +++ b/community/gnome-settings-daemon-compat/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 88700 2013-04-21 22:24:08Z heftig $ +# Maintainer: Balló György +# Contributor: Jan Alexander Steffens (heftig) + +pkgname=gnome-settings-daemon-compat +_pkgname=gnome-settings-daemon +pkgver=3.6.4 +pkgrel=1 +pkgdesc="Compatibility package that provides background and mount helpers for the Gnome Flashback session" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gnome-desktop') +makedepends=('docbook-xsl' 'ibus' 'intltool' 'libcanberra' 'libnotify' 'libpulse' 'libwacom' 'nss' 'upower' 'xf86-input-wacom') +url="https://live.gnome.org/GnomeFlashback" +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz + standalone-background-helper.patch + draw-background-unconditionally.patch + sessionisactive-port.patch + flashback-rename.patch + remove-libgsd-dependency.patch) +sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' + '4c2206b9654bd2b2729297870696c87906e2386b492bae1052b94148e5ea370f' + '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a' + '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915' + '57c66068f06599ea682325e9f5b92b751d8f0a4322b53371698f8539f709b101' + '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c') + +build() { + cd $_pkgname-$pkgver + + # Build background helper as a stand alone binary + patch -Np1 -i ../standalone-background-helper.patch + + # Always draw background + patch -Np1 -i ../draw-background-unconditionally.patch + + # Port to gnome-session's SessionIsActive property + patch -Np1 -i ../sessionisactive-port.patch + + # Remove libgsd dependency + patch -Np1 -i ../remove-libgsd-dependency.patch + + # GNOME Fallback renamed to Flashback + patch -Np1 -i ../flashback-rename.patch + + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$_pkgname \ + --disable-static --enable-systemd + + # https://bugzilla.gnome.org/show_bug.cgi?id=656231 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make -C plugins/automount + make -C plugins/background +} + +package() { + cd $_pkgname-$pkgver + make -C plugins/automount DESTDIR="$pkgdir" install + make -C plugins/background DESTDIR="$pkgdir" install +} diff --git a/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch new file mode 100644 index 000000000..c279420de --- /dev/null +++ b/community/gnome-settings-daemon-compat/draw-background-unconditionally.patch @@ -0,0 +1,162 @@ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c 2013-04-10 16:33:15.858860586 +0200 +@@ -69,110 +69,6 @@ + + static gpointer manager_object = NULL; + +-static gboolean +-dont_draw_background (GsdBackgroundManager *manager) +-{ +- return !g_settings_get_boolean (manager->priv->settings, +- "draw-background"); +-} +- +-static gboolean +-nautilus_is_drawing_background (GsdBackgroundManager *manager) +-{ +- Atom window_id_atom; +- Window nautilus_xid; +- Atom actual_type; +- int actual_format; +- unsigned long nitems; +- unsigned long bytes_after; +- unsigned char *data; +- Atom wmclass_atom; +- gboolean running; +- gint error; +- gboolean show_desktop_icons; +- +- show_desktop_icons = g_settings_get_boolean (manager->priv->settings, +- "show-desktop-icons"); +- if (! show_desktop_icons) { +- return FALSE; +- } +- +- window_id_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), +- "NAUTILUS_DESKTOP_WINDOW_ID", True); +- +- if (window_id_atom == None) { +- return FALSE; +- } +- +- XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), +- GDK_ROOT_WINDOW (), +- window_id_atom, +- 0, +- 1, +- False, +- XA_WINDOW, +- &actual_type, +- &actual_format, +- &nitems, +- &bytes_after, +- &data); +- +- if (data != NULL) { +- nautilus_xid = *(Window *) data; +- XFree (data); +- } else { +- return FALSE; +- } +- +- if (actual_type != XA_WINDOW) { +- return FALSE; +- } +- if (actual_format != 32) { +- return FALSE; +- } +- +- wmclass_atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLASS", False); +- +- gdk_error_trap_push (); +- +- XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), +- nautilus_xid, +- wmclass_atom, +- 0, +- 24, +- False, +- XA_STRING, +- &actual_type, +- &actual_format, +- &nitems, +- &bytes_after, +- &data); +- +- error = gdk_error_trap_pop (); +- +- if (error == BadWindow) { +- return FALSE; +- } +- +- if (actual_type == XA_STRING && +- nitems == 24 && +- bytes_after == 0 && +- actual_format == 8 && +- data != NULL && +- !strcmp ((char *)data, "desktop_window") && +- !strcmp ((char *)data + strlen ((char *)data) + 1, "Nautilus")) { +- running = TRUE; +- } else { +- running = FALSE; +- } +- +- if (data != NULL) { +- XFree (data); +- } +- +- return running; +-} +- + static void + on_crossfade_finished (GsdBackgroundManager *manager) + { +@@ -189,11 +85,6 @@ + int i; + + +- if (nautilus_is_drawing_background (manager) || +- dont_draw_background (manager)) { +- return; +- } +- + gnome_settings_profile_start (NULL); + + display = gdk_display_get_default (); +@@ -408,8 +299,7 @@ + const char *key, + GsdBackgroundManager *manager) + { +- if (dont_draw_background (manager) == FALSE) +- setup_bg_and_draw_background (manager); ++ setup_bg_and_draw_background (manager); + } + + gboolean +@@ -422,24 +312,8 @@ + gnome_settings_profile_start (NULL); + + manager->priv->settings = g_settings_new ("org.gnome.desktop.background"); +- g_signal_connect (manager->priv->settings, "changed::draw-background", +- G_CALLBACK (draw_background_changed), manager); + +- /* If this is set, nautilus will draw the background and is +- * almost definitely in our session. however, it may not be +- * running yet (so is_nautilus_running() will fail). so, on +- * startup, just don't do anything if this key is set so we +- * don't waste time setting the background only to have +- * nautilus overwrite it. +- */ +- show_desktop_icons = g_settings_get_boolean (manager->priv->settings, +- "show-desktop-icons"); +- +- if (!show_desktop_icons) { +- setup_bg (manager); +- } else { +- draw_background_after_session_loads (manager); +- } ++ setup_bg (manager); + + gnome_settings_profile_end (NULL); + diff --git a/community/gnome-settings-daemon-compat/flashback-rename.patch b/community/gnome-settings-daemon-compat/flashback-rename.patch new file mode 100644 index 000000000..2aaa9ce22 --- /dev/null +++ b/community/gnome-settings-daemon-compat/flashback-rename.patch @@ -0,0 +1,18 @@ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-10 16:58:35.356800871 +0200 +@@ -9,4 +9,4 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback ++AutostartCondition=GNOME3 if-session gnome-flashback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 15:57:02.136341000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 16:58:57.593982808 +0200 +@@ -9,4 +9,4 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback ++AutostartCondition=GNOME3 if-session gnome-flashback diff --git a/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch new file mode 100644 index 000000000..b843ac2ce --- /dev/null +++ b/community/gnome-settings-daemon-compat/remove-libgsd-dependency.patch @@ -0,0 +1,160 @@ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c +--- gnome-settings-daemon-3.6.4.orig/plugins/automount/gsd-automount-manager.c 2013-04-10 17:19:51.796298000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/automount/gsd-automount-manager.c 2013-04-10 17:31:27.382311947 +0200 +@@ -28,13 +28,43 @@ + #include + #include + +-#include "gnome-settings-profile.h" +-#include "gnome-settings-session.h" + #include "gsd-automount-manager.h" + #include "gsd-autorun.h" + + #define GSD_AUTOMOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_AUTOMOUNT_MANAGER, GsdAutomountManagerPrivate)) + ++#define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" ++#define GNOME_SESSION_DBUS_OBJECT "/org/gnome/SessionManager" ++#define GNOME_SESSION_DBUS_INTERFACE "org.gnome.SessionManager" ++ ++GDBusProxy * ++get_session_proxy (void) ++{ ++ static GDBusProxy *session_proxy; ++ GError *error = NULL; ++ ++ if (session_proxy != NULL) { ++ g_object_ref (session_proxy); ++ } else { ++ session_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, ++ G_DBUS_PROXY_FLAGS_NONE, ++ NULL, ++ GNOME_SESSION_DBUS_NAME, ++ GNOME_SESSION_DBUS_OBJECT, ++ GNOME_SESSION_DBUS_INTERFACE, ++ NULL, ++ &error); ++ if (error) { ++ g_warning ("Failed to connect to the session manager: %s", error->message); ++ g_error_free (error); ++ } else { ++ g_object_add_weak_pointer (G_OBJECT (session_proxy), (gpointer*)&session_proxy); ++ } ++ } ++ ++ return session_proxy; ++} ++ + struct GsdAutomountManagerPrivate + { + GSettings *settings; +@@ -315,7 +345,7 @@ + static void + do_initialize_session (GsdAutomountManager *manager) + { +- manager->priv->session = gnome_settings_session_get_session_proxy (); ++ manager->priv->session = get_session_proxy (); + g_signal_connect (manager->priv->session, "g-properties-changed", + G_CALLBACK (session_props_changed), manager); + session_props_changed (manager->priv->session, NULL, NULL, manager); +@@ -490,13 +520,10 @@ + GError **error) + { + g_debug ("Starting automounting manager"); +- gnome_settings_profile_start (NULL); + + manager->priv->settings = g_settings_new ("org.gnome.desktop.media-handling"); + setup_automounter (manager); + +- gnome_settings_profile_end (NULL); +- + return TRUE; + } + +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/automount/Makefile.am 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/automount/Makefile.am 2013-04-10 17:33:09.697997021 +0200 +@@ -8,7 +8,6 @@ + gsd-autorun.h + + gnome_fallback_mount_helper_CPPFLAGS = \ +- -I$(top_srcdir)/gnome-settings-daemon \ + -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ + $(AM_CPPFLAGS) + +@@ -20,8 +19,7 @@ + gnome_fallback_mount_helper_LDADD = \ + $(SETTINGS_PLUGIN_LIBS) \ + $(SYSTEMD_LIBS) \ +- $(AUTOMOUNT_LIBS) \ +- $(top_builddir)/gnome-settings-daemon/libgsd.la ++ $(AUTOMOUNT_LIBS) + + autostartdir = $(sysconfdir)/xdg/autostart + autostart_in_files = gnome-fallback-mount-helper.desktop.in +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-manager.c 2013-04-10 17:19:51.792965000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-manager.c 2013-04-10 17:22:46.930334951 +0200 +@@ -42,7 +42,6 @@ + #include + #include + +-#include "gnome-settings-profile.h" + #include "gsd-background-manager.h" + + #define GSD_BACKGROUND_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_BACKGROUND_MANAGER, GsdBackgroundManagerPrivate)) +@@ -85,8 +84,6 @@ + int i; + + +- gnome_settings_profile_start (NULL); +- + display = gdk_display_get_default (); + n_screens = gdk_display_get_n_screens (display); + +@@ -121,8 +118,6 @@ + + cairo_surface_destroy (surface); + } +- +- gnome_settings_profile_end (NULL); + } + + static void +@@ -309,14 +304,11 @@ + gboolean show_desktop_icons; + + g_debug ("Starting background manager"); +- gnome_settings_profile_start (NULL); + + manager->priv->settings = g_settings_new ("org.gnome.desktop.background"); + + setup_bg (manager); + +- gnome_settings_profile_end (NULL); +- + return TRUE; + } + +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am 2013-04-10 17:43:32.768975155 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am 2013-04-10 17:43:19.115328380 +0200 +@@ -6,18 +6,16 @@ + gsd-background-manager.h + + gnome_fallback_background_helper_CPPFLAGS = \ +- -I$(top_srcdir)/gnome-settings-daemon \ + -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ + $(AM_CPPFLAGS) + + gnome_fallback_background_helper_CFLAGS = \ + $(SETTINGS_PLUGIN_CFLAGS) \ + $(BACKGROUND_CFLAGS) + + gnome_fallback_background_helper_LDADD = \ + $(SETTINGS_PLUGIN_LIBS) \ +- $(BACKGROUND_LIBS) \ +- $(top_builddir)/gnome-settings-daemon/libgsd.la ++ $(BACKGROUND_LIBS) + + autostartdir = $(sysconfdir)/xdg/autostart + autostart_in_files = gnome-fallback-background-helper.desktop.in diff --git a/community/gnome-settings-daemon-compat/sessionisactive-port.patch b/community/gnome-settings-daemon-compat/sessionisactive-port.patch new file mode 100644 index 000000000..dc5fd260e --- /dev/null +++ b/community/gnome-settings-daemon-compat/sessionisactive-port.patch @@ -0,0 +1,73 @@ +From 32b0b2d85629ae765543df1d940a5ca3c37dcec1 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Tue, 06 Nov 2012 22:47:05 +0000 +Subject: [wip] Port to gnome-session's SessionIsActive property + +Rather than maintaining the systemd code here, monitor gnome-session's +SessionIsActive property. This allows us to drop the compile-time +dependency on systemd. + +The power plugin is declared dependent on systemd at runtime, but the +rest of the code should operate in more "basic functionality" mode. +--- +(limited to 'plugins/automount') + +diff --git a/plugins/automount/gsd-automount-manager.c b/plugins/automount/gsd-automount-manager.c +index 7912f19..d8e9e07 100644 +--- a/plugins/automount/gsd-automount-manager.c ++++ b/plugins/automount/gsd-automount-manager.c +@@ -42,7 +42,7 @@ struct GsdAutomountManagerPrivate + GVolumeMonitor *volume_monitor; + unsigned int automount_idle_id; + +- GnomeSettingsSession *session; ++ GDBusProxy *session; + gboolean session_is_active; + gboolean screensaver_active; + guint ss_watch_id; +@@ -288,17 +288,21 @@ mount_added_callback (GVolumeMonitor *monitor, + + + static void +-session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointer user_data) ++session_props_changed (GDBusProxy *session, GVariant *v, char **props, gpointer user_data) + { + GsdAutomountManager *manager = user_data; + GsdAutomountManagerPrivate *p = manager->priv; ++ GVariant *active_v = NULL; ++ gboolean is_active; + +- if (gnome_settings_session_get_state (session) == GNOME_SETTINGS_SESSION_STATE_ACTIVE) { +- p->session_is_active = TRUE; +- } +- else { +- p->session_is_active = FALSE; +- } ++ active_v = g_dbus_proxy_get_cached_property (session, "SessionIsActive"); ++ if (!active_v) ++ return; ++ ++ g_variant_get (active_v, "b", &is_active); ++ g_variant_unref (active_v); ++ g_printerr ("AUTOMOUNT: session is active: %d -> %d\n", p->session_is_active, is_active); ++ p->session_is_active = is_active; + + if (!p->session_is_active) { + if (p->volume_queue != NULL) { +@@ -311,10 +315,10 @@ session_state_changed (GnomeSettingsSession *session, GParamSpec *pspec, gpointe + static void + do_initialize_session (GsdAutomountManager *manager) + { +- manager->priv->session = gnome_settings_session_new (); +- g_signal_connect (manager->priv->session, "notify::state", +- G_CALLBACK (session_state_changed), manager); +- session_state_changed (manager->priv->session, NULL, manager); ++ manager->priv->session = gnome_settings_session_get_session_proxy (); ++ g_signal_connect (manager->priv->session, "g-properties-changed", ++ G_CALLBACK (session_props_changed), manager); ++ session_props_changed (manager->priv->session, NULL, NULL, manager); + } + + #define SCREENSAVER_NAME "org.gnome.ScreenSaver" +-- +cgit v0.9.1 diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch new file mode 100644 index 000000000..ccbd18f9b --- /dev/null +++ b/community/gnome-settings-daemon-compat/standalone-background-helper.patch @@ -0,0 +1,437 @@ +diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in +--- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-04-10 17:39:36.446882275 +0200 +@@ -2,7 +2,6 @@ + + + +- + + + +@@ -45,18 +44,6 @@ + <_summary>Priority to use for this plugin + <_description>Priority to use for this plugin in gnome-settings-daemon startup queue + +- +- +- +- true +- <_summary>Activation of this plugin +- <_description>Whether this plugin would be activated by gnome-settings-daemon or not +- +- +- 97 +- <_summary>Priority to use for this plugin +- <_description>Priority to use for this plugin in gnome-settings-daemon startup queue +- + + + +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in +--- gnome-settings-daemon-3.6.4.orig/plugins/background/background.gnome-settings-plugin.in 2012-04-07 15:21:20.000000000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/background.gnome-settings-plugin.in 1970-01-01 01:00:00.000000000 +0100 +@@ -1,8 +0,0 @@ +-[GNOME Settings Plugin] +-Module=background +-IAge=0 +-_Name=Background +-_Description=Background plugin +-Authors= +-Copyright=Copyright © 2007 +-Website= +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.c 2013-04-10 17:39:36.450215685 +0200 +@@ -0,0 +1,65 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2010 Red Hat, Inc. ++ * ++ * 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 ++ * ++ * Author: Tomas Bzatek ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++#include ++ ++#include "gsd-background-manager.h" ++ ++int ++main (int argc, ++ char **argv) ++{ ++ GMainLoop *loop; ++ GsdBackgroundManager *manager; ++ GError *error = NULL; ++ ++ g_type_init (); ++ gtk_init (&argc, &argv); ++ ++ bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++ textdomain (GETTEXT_PACKAGE); ++ ++ loop = g_main_loop_new (NULL, FALSE); ++ manager = gsd_background_manager_new (); ++ ++ gsd_background_manager_start (manager, &error); ++ ++ if (error != NULL) { ++ g_printerr ("Unable to start the background manager: %s", ++ error->message); ++ ++ g_error_free (error); ++ _exit (1); ++ } ++ ++ g_main_loop_run (loop); ++ ++ gsd_background_manager_stop (manager); ++ g_main_loop_unref (loop); ++ ++ return 0; ++} +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 17:39:36.450215685 +0200 +@@ -0,0 +1,12 @@ ++[Desktop Entry] ++_Name=Background Helper ++_Comment=Draw desktop background ++Exec=@LIBEXECDIR@/gnome-fallback-background-helper ++Icon=desktop ++Terminal=false ++Type=Application ++Categories= ++NoDisplay=true ++OnlyShowIn=GNOME;Unity; ++X-GNOME-Autostart-Notify=true ++AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.c 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,104 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2007 William Jon McCann +- * +- * 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, 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. +- * +- */ +- +-#include "config.h" +- +-#include +-#include +- +-#include "gnome-settings-plugin.h" +-#include "gsd-background-plugin.h" +-#include "gsd-background-manager.h" +- +-struct GsdBackgroundPluginPrivate { +- GsdBackgroundManager *manager; +-}; +- +-#define GSD_BACKGROUND_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginPrivate)) +- +-GNOME_SETTINGS_PLUGIN_REGISTER (GsdBackgroundPlugin, gsd_background_plugin) +- +-static void +-gsd_background_plugin_init (GsdBackgroundPlugin *plugin) +-{ +- plugin->priv = GSD_BACKGROUND_PLUGIN_GET_PRIVATE (plugin); +- +- g_debug ("GsdBackgroundPlugin initializing"); +- +- plugin->priv->manager = gsd_background_manager_new (); +-} +- +-static void +-gsd_background_plugin_finalize (GObject *object) +-{ +- GsdBackgroundPlugin *plugin; +- +- g_return_if_fail (object != NULL); +- g_return_if_fail (GSD_IS_BACKGROUND_PLUGIN (object)); +- +- g_debug ("GsdBackgroundPlugin finalizing"); +- +- plugin = GSD_BACKGROUND_PLUGIN (object); +- +- g_return_if_fail (plugin->priv != NULL); +- +- if (plugin->priv->manager != NULL) { +- g_object_unref (plugin->priv->manager); +- } +- +- G_OBJECT_CLASS (gsd_background_plugin_parent_class)->finalize (object); +-} +- +-static void +-impl_activate (GnomeSettingsPlugin *plugin) +-{ +- gboolean res; +- GError *error; +- +- g_debug ("Activating background plugin"); +- +- error = NULL; +- res = gsd_background_manager_start (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager, &error); +- if (! res) { +- g_warning ("Unable to start background manager: %s", error->message); +- g_error_free (error); +- } +-} +- +-static void +-impl_deactivate (GnomeSettingsPlugin *plugin) +-{ +- g_debug ("Deactivating background plugin"); +- gsd_background_manager_stop (GSD_BACKGROUND_PLUGIN (plugin)->priv->manager); +-} +- +-static void +-gsd_background_plugin_class_init (GsdBackgroundPluginClass *klass) +-{ +- GObjectClass *object_class = G_OBJECT_CLASS (klass); +- GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass); +- +- object_class->finalize = gsd_background_plugin_finalize; +- +- plugin_class->activate = impl_activate; +- plugin_class->deactivate = impl_deactivate; +- +- g_type_class_add_private (klass, sizeof (GsdBackgroundPluginPrivate)); +-} +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gsd-background-plugin.h 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/background/gsd-background-plugin.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,59 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2007 William Jon McCann +- * +- * 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, 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. +- * +- */ +- +-#ifndef __GSD_BACKGROUND_PLUGIN_H__ +-#define __GSD_BACKGROUND_PLUGIN_H__ +- +-#include +-#include +-#include +- +-#include "gnome-settings-plugin.h" +- +-G_BEGIN_DECLS +- +-#define GSD_TYPE_BACKGROUND_PLUGIN (gsd_background_plugin_get_type ()) +-#define GSD_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPlugin)) +-#define GSD_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass)) +-#define GSD_IS_BACKGROUND_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_BACKGROUND_PLUGIN)) +-#define GSD_IS_BACKGROUND_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_BACKGROUND_PLUGIN)) +-#define GSD_BACKGROUND_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_BACKGROUND_PLUGIN, GsdBackgroundPluginClass)) +- +-typedef struct GsdBackgroundPluginPrivate GsdBackgroundPluginPrivate; +- +-typedef struct +-{ +- GnomeSettingsPlugin parent; +- GsdBackgroundPluginPrivate *priv; +-} GsdBackgroundPlugin; +- +-typedef struct +-{ +- GnomeSettingsPluginClass parent_class; +-} GsdBackgroundPluginClass; +- +-GType gsd_background_plugin_get_type (void) G_GNUC_CONST; +- +-/* All the plugins must implement this function */ +-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module); +- +-G_END_DECLS +- +-#endif /* __GSD_BACKGROUND_PLUGIN_H__ */ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am gnome-settings-daemon-3.6.4/plugins/background/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/background/Makefile.am 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/background/Makefile.am 2013-04-10 17:40:20.117885180 +0200 +@@ -1,80 +1,34 @@ +-NULL = ++libexec_PROGRAMS = gnome-fallback-background-helper + +-plugin_name = background ++gnome_fallback_background_helper_SOURCES = \ ++ gnome-fallback-background-helper.c \ ++ gsd-background-manager.c \ ++ gsd-background-manager.h + +-libexec_PROGRAMS = gsd-test-background +- +-gsd_test_background_SOURCES = \ +- test-background.c \ +- gsd-background-manager.h \ +- gsd-background-manager.c \ +- $(NULL) +- +-gsd_test_background_CPPFLAGS = \ ++gnome_fallback_background_helper_CPPFLAGS = \ + -I$(top_srcdir)/gnome-settings-daemon \ +- -I$(top_srcdir)/plugins/common \ + -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ + $(AM_CPPFLAGS) + +-gsd_test_background_CFLAGS = \ +- $(PLUGIN_CFLAGS) \ ++gnome_fallback_background_helper_CFLAGS = \ + $(SETTINGS_PLUGIN_CFLAGS) \ +- $(BACKGROUND_CFLAGS) \ +- $(AM_CFLAGS) +- +-gsd_test_background_LDADD = \ +- $(top_builddir)/gnome-settings-daemon/libgsd.la \ +- $(SETTINGS_PLUGIN_LIBS) \ +- $(BACKGROUND_LIBS) \ +- $(NULL) +- +-plugin_LTLIBRARIES = \ +- libbackground.la \ +- $(NULL) +- +-libbackground_la_SOURCES = \ +- gsd-background-plugin.h \ +- gsd-background-plugin.c \ +- gsd-background-manager.h \ +- gsd-background-manager.c \ +- $(NULL) ++ $(BACKGROUND_CFLAGS) + +-libbackground_la_CPPFLAGS = \ +- -I$(top_srcdir)/gnome-settings-daemon \ +- -I$(top_srcdir)/plugins/background/libbackground \ +- -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ +- $(AM_CPPFLAGS) +- +-libbackground_la_CFLAGS = \ +- $(SETTINGS_PLUGIN_CFLAGS) \ +- $(BACKGROUND_CFLAGS) \ +- $(AM_CFLAGS) +- +-libbackground_la_LDFLAGS = \ +- $(GSD_PLUGIN_LDFLAGS) \ +- $(NULL) +- +-libbackground_la_LIBADD = \ ++gnome_fallback_background_helper_LDADD = \ + $(SETTINGS_PLUGIN_LIBS) \ + $(BACKGROUND_LIBS) \ +- $(NULL) +- +-plugin_in_files = \ +- background.gnome-settings-plugin.in \ +- $(NULL) ++ $(top_builddir)/gnome-settings-daemon/libgsd.la + +-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) ++autostartdir = $(sysconfdir)/xdg/autostart ++autostart_in_files = gnome-fallback-background-helper.desktop.in ++autostart_in_in_files = gnome-fallback-background-helper.desktop.in.in ++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) + +-EXTRA_DIST = \ +- $(plugin_in_files) \ +- $(NULL) ++$(autostart_in_files): $(autostart_in_in_files) ++ @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ + +-CLEANFILES = \ +- $(plugin_DATA) \ +- $(NULL) ++@INTLTOOL_DESKTOP_RULE@ + +-DISTCLEANFILES = \ +- $(plugin_DATA) \ +- $(NULL) ++EXTRA_DIST = $(autostart_in_in_files) + +-@GSD_INTLTOOL_PLUGIN_RULE@ ++CLEANFILES = $(autostart_DATA) $(autostart_in_files) +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c gnome-settings-daemon-3.6.4/plugins/background/test-background.c +--- gnome-settings-daemon-3.6.4.orig/plugins/background/test-background.c 2012-06-01 22:02:53.000000000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/test-background.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,7 +0,0 @@ +-#define NEW gsd_background_manager_new +-#define START gsd_background_manager_start +-#define STOP gsd_background_manager_stop +-#define MANAGER GsdBackgroundManager +-#include "gsd-background-manager.h" +- +-#include "test-plugin.h" +diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in +--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/po/POTFILES.in 2013-04-10 17:39:36.450215685 +0200 +@@ -21,9 +21,9 @@ + [type: gettext/glade]plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui + [type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in + plugins/automount/gnome-fallback-mount-helper.desktop.in.in ++plugins/automount/gnome-fallback-background-helper.desktop.in.in + plugins/automount/gsd-automount-manager.c + plugins/automount/gsd-autorun.c +-[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in + [type: gettext/ini]plugins/clipboard/clipboard.gnome-settings-plugin.in + [type: gettext/ini]plugins/color/color.gnome-settings-plugin.in + plugins/color/gsd-color-manager.c +diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip +--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip 2012-04-07 18:58:07.000000000 +0200 ++++ gnome-settings-daemon-3.6.4/po/POTFILES.skip 2013-04-10 17:39:36.453549095 +0200 +@@ -20,6 +20,7 @@ + data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in + data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in + data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in ++plugins/automount/gnome-fallback-background-helper.desktop.in + plugins/automount/gnome-fallback-mount-helper.desktop.in + plugins/power/org.gnome.settings-daemon.plugins.power.policy.in + plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in diff --git a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch deleted file mode 100644 index ceee6db82..000000000 --- a/community/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ /dev/null @@ -1,1476 +0,0 @@ -From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Fri, 21 Sep 2012 11:56:53 +0100 -Subject: [PATCH] power and media-keys: Use logind for suspending and - rebooting the system - -Use the new logind features to suspend and resume but making sure we opt out -of logind handling the sleep and power keys, and also inhibiting for lid close -auto-suspend if there is an external monitor connected. - -Also use a delay inihibit for logind so that we can do actions on suspend like -blanking the screen using the screensaver and also poking the screensaver on -resume. - -https://bugzilla.gnome.org/show_bug.cgi?id=680689 - -Conflicts: - plugins/power/gsd-power-manager.c ---- - plugins/common/Makefile.am | 4 +- - plugins/common/gsd-power-helper.c | 203 -------- - plugins/common/gsd-power-helper.h | 35 -- - plugins/media-keys/gsd-media-keys-manager.c | 156 +++++-- - plugins/power/gsd-power-manager.c | 697 +++++++++++++++++++--------- - 5 files changed, 594 insertions(+), 501 deletions(-) - delete mode 100644 plugins/common/gsd-power-helper.c - delete mode 100644 plugins/common/gsd-power-helper.h - -diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am -index 7e50db4..b0e907c 100644 ---- a/plugins/common/Makefile.am -+++ b/plugins/common/Makefile.am -@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \ - gsd-keygrab.c \ - gsd-keygrab.h \ - gsd-input-helper.c \ -- gsd-input-helper.h \ -- gsd-power-helper.c \ -- gsd-power-helper.h -+ gsd-input-helper.h - - libcommon_la_CPPFLAGS = \ - $(AM_CPPFLAGS) -diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c -deleted file mode 100644 -index 27d0eda..0000000 ---- a/plugins/common/gsd-power-helper.c -+++ /dev/null -@@ -1,203 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2012 Bastien Nocera -- * -- * 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. -- * -- */ -- --#include "config.h" -- --#include "gsd-power-helper.h" -- --#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" --#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" --#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -- --#define CONSOLEKIT_DBUS_NAME "org.freedesktop.ConsoleKit" --#define CONSOLEKIT_DBUS_PATH_MANAGER "/org/freedesktop/ConsoleKit/Manager" --#define CONSOLEKIT_DBUS_INTERFACE_MANAGER "org.freedesktop.ConsoleKit.Manager" -- --#ifdef HAVE_SYSTEMD --static void --systemd_stop (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "PowerOff", -- g_variant_new ("(b)", FALSE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --static void --systemd_suspend (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "Suspend", -- g_variant_new ("(b)", TRUE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --static void --systemd_hibernate (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "Hibernate", -- g_variant_new ("(b)", TRUE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --#else /* HAVE_SYSTEMD */ -- --static void --consolekit_stop_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GVariant *result; -- GError *error = NULL; -- -- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), -- res, -- &error); -- if (result == NULL) { -- g_warning ("couldn't stop using ConsoleKit: %s", -- error->message); -- g_error_free (error); -- } else { -- g_variant_unref (result); -- } --} -- --static void --consolekit_stop (void) --{ -- GError *error = NULL; -- GDBusProxy *proxy; -- -- /* power down the machine in a safe way */ -- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -- NULL, -- CONSOLEKIT_DBUS_NAME, -- CONSOLEKIT_DBUS_PATH_MANAGER, -- CONSOLEKIT_DBUS_INTERFACE_MANAGER, -- NULL, &error); -- if (proxy == NULL) { -- g_warning ("cannot connect to ConsoleKit: %s", -- error->message); -- g_error_free (error); -- return; -- } -- g_dbus_proxy_call (proxy, -- "Stop", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- consolekit_stop_cb, NULL); -- g_object_unref (proxy); --} --static void --upower_sleep_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GVariant *result; -- GError *error = NULL; -- -- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), -- res, -- &error); -- if (result == NULL) { -- g_warning ("couldn't sleep using UPower: %s", -- error->message); -- g_error_free (error); -- } else { -- g_variant_unref (result); -- } --} -- --static void --upower_suspend (GDBusProxy *upower_proxy) --{ -- g_dbus_proxy_call (upower_proxy, -- "Suspend", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- upower_sleep_cb, NULL); --} -- --static void --upower_hibernate (GDBusProxy *upower_proxy) --{ -- g_dbus_proxy_call (upower_proxy, -- "Hibernate", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- upower_sleep_cb, NULL); --} --#endif /* HAVE_SYSTEMD */ -- --void --gsd_power_suspend (GDBusProxy *upower_proxy) --{ --#ifdef HAVE_SYSTEMD -- systemd_suspend (); --#else -- upower_suspend (upower_proxy); --#endif --} -- --void --gsd_power_poweroff (void) --{ --#ifdef HAVE_SYSTEMD -- systemd_stop (); --#else -- consolekit_stop (); --#endif --} -- --void --gsd_power_hibernate (GDBusProxy *upower_proxy) --{ --#ifdef HAVE_SYSTEMD -- systemd_hibernate (); --#else -- upower_hibernate (upower_proxy); --#endif --} -diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h -deleted file mode 100644 -index e3be14f..0000000 ---- a/plugins/common/gsd-power-helper.h -+++ /dev/null -@@ -1,35 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2012 Bastien Nocera -- * -- * 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. -- */ -- --#ifndef __GSD_POWER_HELPER_H --#define __GSD_POWER_HELPER_H -- --#include -- --G_BEGIN_DECLS -- --#include -- --void gsd_power_suspend (GDBusProxy *upower_proxy); --void gsd_power_hibernate (GDBusProxy *upower_proxy); --void gsd_power_poweroff (void); -- --G_END_DECLS -- --#endif /* __GSD_POWER_HELPER_H */ -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index 9c84d7f..a2f277e 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_GUDEV - #include -@@ -51,7 +52,6 @@ - #include "shortcuts-list.h" - #include "gsd-osd-window.h" - #include "gsd-input-helper.h" --#include "gsd-power-helper.h" - #include "gsd-enums.h" - - #include -@@ -105,6 +105,10 @@ static const gchar introspection_xml[] = - #define KEY_CURRENT_INPUT_SOURCE "current" - #define KEY_INPUT_SOURCES "sources" - -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+ - #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) - - typedef struct { -@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate - - /* Power stuff */ - GSettings *power_settings; -- GDBusProxy *upower_proxy; - GDBusProxy *power_screen_proxy; - GDBusProxy *power_keyboard_proxy; - -+ /* systemd stuff */ -+ GDBusProxy *logind_proxy; -+ gint inhibit_keys_fd; -+ - /* Multihead stuff */ - GdkScreen *current_screen; - GSList *screens; -@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) - } - - static void -+power_action_suspend (GsdMediaKeysManager *manager) -+{ -+#ifndef HAVE_SYSTEMD -+ g_warning ("no systemd support"); -+ return; -+#endif -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Suspend", -+ g_variant_new ("(b)", TRUE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ manager->priv->bus_cancellable, -+ NULL, NULL); -+} -+ -+static void -+power_action_hibernate (GsdMediaKeysManager *manager) -+{ -+#ifndef HAVE_SYSTEMD -+ g_warning ("no systemd support"); -+ return; -+#endif -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Hibernate", -+ g_variant_new ("(b)", TRUE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ manager->priv->bus_cancellable, -+ NULL, NULL); -+} -+ -+static void - do_config_power_action (GsdMediaKeysManager *manager, - const gchar *config_key) - { -@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager, - config_key); - switch (action_type) { - case GSD_POWER_ACTION_SUSPEND: -- gsd_power_suspend (manager->priv->upower_proxy); -+ power_action_suspend (manager); - break; - case GSD_POWER_ACTION_INTERACTIVE: - case GSD_POWER_ACTION_SHUTDOWN: - gnome_session_shutdown (manager); - break; - case GSD_POWER_ACTION_HIBERNATE: -- gsd_power_hibernate (manager->priv->upower_proxy); -+ power_action_hibernate (manager); - break; - case GSD_POWER_ACTION_BLANK: - case GSD_POWER_ACTION_NOTHING: -@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - } - #endif /* HAVE_GUDEV */ - -+ g_clear_object (&priv->logind_proxy); - if (priv->settings) { - g_object_unref (priv->settings); - priv->settings = NULL; -@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - priv->power_keyboard_proxy = NULL; - } - -- if (priv->upower_proxy) { -- g_object_unref (priv->upower_proxy); -- priv->upower_proxy = NULL; -- } -- - if (priv->cancellable != NULL) { - g_cancellable_cancel (priv->cancellable); - g_object_unref (priv->cancellable); -@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass) - } - - static void -+inhibit_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit keypresses: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_keys_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void - gsd_media_keys_manager_init (GsdMediaKeysManager *manager) - { -+ GError *error; -+ GDBusConnection *bus; -+ -+ error = NULL; - manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager); -+ -+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); -+ if (bus == NULL) { -+ g_warning ("Failed to connect to system bus: %s", -+ error->message); -+ g_error_free (error); -+ return; -+ } -+ -+ manager->priv->logind_proxy = -+ g_dbus_proxy_new_sync (bus, -+ 0, -+ NULL, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ NULL, -+ &error); -+ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("Failed to connect to systemd: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ g_object_unref (bus); -+ -+ g_debug ("Adding system inhibitors for power keys"); -+ manager->priv->inhibit_keys_fd = -1; -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "handle-power-key:handle-suspend-key:handle-hibernate-key", -+ g_get_user_name (), -+ "GNOME handling keypresses", -+ "block"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_done, -+ manager); -+ - } - - static void -@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object) - - if (media_keys_manager->priv->start_idle_id != 0) - g_source_remove (media_keys_manager->priv->start_idle_id); -+ if (media_keys_manager->priv->inhibit_keys_fd != -1) -+ close (media_keys_manager->priv->inhibit_keys_fd); - - G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object); - } -@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject *source_object, - } - - static void --upower_ready_cb (GObject *source_object, -- GAsyncResult *res, -- GsdMediaKeysManager *manager) --{ -- GError *error = NULL; -- -- manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error); -- if (manager->priv->upower_proxy == NULL) { -- g_warning ("Failed to get proxy for upower: %s", -- error->message); -- g_error_free (error); -- } --} -- --static void - power_screen_ready_cb (GObject *source_object, - GAsyncResult *res, - GsdMediaKeysManager *manager) -@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager) - manager->priv->bus_cancellable, - (GAsyncReadyCallback) on_bus_gotten, - manager); -- -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.UPower", -- "/org/freedesktop/UPower", -- "org.freedesktop.UPower", -- NULL, -- (GAsyncReadyCallback) upower_ready_cb, -- manager); - } - - GsdMediaKeysManager * -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 1c594d8..bb7224c 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -1,7 +1,7 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 William Jon McCann -- * Copyright (C) 2011 Richard Hughes -+ * Copyright (C) 2011-2012 Richard Hughes - * Copyright (C) 2011 Ritesh Khadgaray - * - * This program is free software; you can redistribute it and/or modify -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include -@@ -43,7 +44,6 @@ - #include "gnome-settings-session.h" - #include "gsd-enums.h" - #include "gsd-power-manager.h" --#include "gsd-power-helper.h" - - #define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" - #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager" -@@ -78,6 +78,10 @@ - #define GSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */ - #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */ - -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+ - /* Keep this in sync with gnome-shell */ - #define SCREENSAVER_FADE_TIME 10 /* seconds */ - -@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate - ca_context *canberra_context; - ca_proplist *critical_alert_loop_props; - guint32 critical_alert_timeout_id; -- GDBusProxy *screensaver_proxy; - GDBusProxy *session_proxy; - GDBusProxy *session_presence_proxy; - GpmIdletime *idletime; - GsdPowerIdleMode current_idle_mode; -- guint lid_close_safety_timer_id; - GtkStatusIcon *status_icon; - guint xscreensaver_watchdog_timer_id; - gboolean is_virtual_machine; -+ -+ /* systemd stuff */ -+ GDBusProxy *logind_proxy; -+ gint inhibit_lid_switch_fd; -+ gboolean inhibit_lid_switch_taken; -+ gint inhibit_suspend_fd; -+ gboolean inhibit_suspend_taken; -+ guint inhibit_lid_switch_timer_id; - }; - - enum { -@@ -218,8 +228,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); - static gchar *engine_get_summary (GsdPowerManager *manager); - static void do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type); - static void do_lid_closed_action (GsdPowerManager *manager); --static void lock_screensaver (GsdPowerManager *manager); --static void kill_lid_close_safety_timer (GsdPowerManager *manager); -+static void uninhibit_lid_switch (GsdPowerManager *manager); -+static gboolean external_monitor_is_connected (GnomeRRScreen *screen); - - G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) - -@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void) - } - - static void -+action_poweroff (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "PowerOff", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void -+action_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Suspend", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void -+action_hibernate (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Hibernate", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void - do_power_action_type (GsdPowerManager *manager, - GsdPowerActionType action_type) - { -@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager, - - switch (action_type) { - case GSD_POWER_ACTION_SUSPEND: -- gsd_power_suspend (manager->priv->upower_proxy); -+ action_suspend (manager); - break; - case GSD_POWER_ACTION_INTERACTIVE: - gnome_session_shutdown (); - break; - case GSD_POWER_ACTION_HIBERNATE: -- gsd_power_hibernate (manager->priv->upower_proxy); -+ action_hibernate (manager); - break; - case GSD_POWER_ACTION_SHUTDOWN: - /* this is only used on critically low battery where - * hibernate is not available and is marginally better - * than just powering down the computer mid-write */ -- gsd_power_poweroff (); -+ action_poweroff (manager); - break; - case GSD_POWER_ACTION_BLANK: - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager, - return ret; - } - --static void --do_lid_open_action (GsdPowerManager *manager) --{ -- gboolean ret; -- GError *error = NULL; -- -- /* play a sound, using sounds from the naming spec */ -- ca_context_play (manager->priv->canberra_context, 0, -- CA_PROP_EVENT_ID, "lid-open", -- /* TRANSLATORS: this is the sound description */ -- CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), -- NULL); -- -- /* ensure we turn the panel back on after lid open */ -- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_ON, -- &error); -- if (!ret) { -- g_warning ("failed to turn the panel on after lid open: %s", -- error->message); -- g_clear_error (&error); -- } -- -- /* only toggle keyboard if present and already toggled off */ -- if (manager->priv->upower_kdb_proxy != NULL && -- manager->priv->kbd_brightness_old != -1) { -- ret = upower_kbd_toggle (manager, &error); -- if (!ret) { -- g_warning ("failed to turn the kbd backlight on: %s", -- error->message); -- g_error_free (error); -- } -- } -- -- kill_lid_close_safety_timer (manager); --} -- - static gboolean --is_on (GnomeRROutput *output) -+inhibit_lid_switch_timer_cb (GsdPowerManager *manager) - { -- GnomeRRCrtc *crtc; -- -- crtc = gnome_rr_output_get_crtc (output); -- if (!crtc) -- return FALSE; -- return gnome_rr_crtc_get_current_mode (crtc) != NULL; --} -- --static gboolean --non_laptop_outputs_are_all_off (GnomeRRScreen *screen) --{ -- GnomeRROutput **outputs; -- int i; -- -- outputs = gnome_rr_screen_list_outputs (screen); -- for (i = 0; outputs[i] != NULL; i++) { -- if (gnome_rr_output_is_laptop (outputs[i])) -- continue; -- -- if (is_on (outputs[i])) -- return FALSE; -+ if (!external_monitor_is_connected (manager->priv->x11_screen) || -+ g_settings_get_boolean (manager->priv->settings, -+ "lid-close-suspend-with-external-monitor")) { -+ g_debug ("no external monitors for a while; uninhibiting lid close"); -+ uninhibit_lid_switch (manager); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ return G_SOURCE_REMOVE; - } - -- return TRUE; --} -- --/* Timeout callback used to check conditions when the laptop's lid is closed but -- * the machine is not suspended yet. We try to suspend again, so that the laptop -- * won't overheat if placed in a backpack. -- */ --static gboolean --lid_close_safety_timer_cb (GsdPowerManager *manager) --{ -- manager->priv->lid_close_safety_timer_id = 0; -- -- g_debug ("lid has been closed for a while; trying to suspend again"); -- do_lid_closed_action (manager); -- -- return FALSE; -+ g_debug ("external monitor still there; trying again later"); -+ return G_SOURCE_CONTINUE; - } - - /* Sets up a timer to be triggered some seconds after closing the laptop lid -@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) - * again in the timeout handler to see if we can suspend then. - */ - static void --setup_lid_close_safety_timer (GsdPowerManager *manager) -+setup_inhibit_lid_switch_timer (GsdPowerManager *manager) - { -- if (manager->priv->lid_close_safety_timer_id != 0) -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_debug ("lid close safety timer already set up"); - return; -+ } -+ -+ g_debug ("setting up lid close safety timer"); - -- manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, -- (GSourceFunc) lid_close_safety_timer_cb, -+ manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, -+ (GSourceFunc) inhibit_lid_switch_timer_cb, - manager); -- g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer"); -+ g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer"); - } - - static void --kill_lid_close_safety_timer (GsdPowerManager *manager) -+restart_inhibit_lid_switch_timer (GsdPowerManager *manager) - { -- if (manager->priv->lid_close_safety_timer_id != 0) { -- g_source_remove (manager->priv->lid_close_safety_timer_id); -- manager->priv->lid_close_safety_timer_id = 0; -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_debug ("restarting lid close safety timer"); -+ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ setup_inhibit_lid_switch_timer (manager); - } - } - - static void --suspend_with_lid_closed (GsdPowerManager *manager) -+do_lid_open_action (GsdPowerManager *manager) - { - gboolean ret; - GError *error = NULL; -- GsdPowerActionType action_type; - -- /* maybe lock the screen if the lid is closed */ -- lock_screensaver (manager); -- -- /* we have different settings depending on AC state */ -- if (up_client_get_on_battery (manager->priv->up_client)) { -- action_type = g_settings_get_enum (manager->priv->settings, -- "lid-close-battery-action"); -- } else { -- action_type = g_settings_get_enum (manager->priv->settings, -- "lid-close-ac-action"); -- } -- -- /* check we won't melt when the lid is closed */ -- if (action_type != GSD_POWER_ACTION_SUSPEND && -- action_type != GSD_POWER_ACTION_HIBERNATE) { -- if (up_client_get_lid_force_sleep (manager->priv->up_client)) { -- g_warning ("to prevent damage, now forcing suspend"); -- do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND); -- return; -- } -- } -+ /* play a sound, using sounds from the naming spec */ -+ ca_context_play (manager->priv->canberra_context, 0, -+ CA_PROP_EVENT_ID, "lid-open", -+ /* TRANSLATORS: this is the sound description */ -+ CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), -+ NULL); - -- /* ensure we turn the panel back on after resume */ -+ /* ensure we turn the panel back on after lid open */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_OFF, -+ GNOME_RR_DPMS_ON, - &error); - if (!ret) { -- g_warning ("failed to turn the panel off after lid close: %s", -+ g_warning ("failed to turn the panel on after lid open: %s", - error->message); - g_clear_error (&error); - } - -- /* only toggle keyboard if present and not already toggled */ -- if (manager->priv->upower_kdb_proxy && -- manager->priv->kbd_brightness_old == -1) { -+ /* only toggle keyboard if present and already toggled off */ -+ if (manager->priv->upower_kdb_proxy != NULL && -+ manager->priv->kbd_brightness_old != -1) { - ret = upower_kbd_toggle (manager, &error); - if (!ret) { -- g_warning ("failed to turn the kbd backlight off: %s", -+ g_warning ("failed to turn the kbd backlight on: %s", - error->message); - g_error_free (error); - } - } -- -- do_power_action_type (manager, action_type); - } - - static void - do_lid_closed_action (GsdPowerManager *manager) - { -+ gboolean ret; -+ GError *error = NULL; -+ - /* play a sound, using sounds from the naming spec */ - ca_context_play (manager->priv->canberra_context, 0, - CA_PROP_EVENT_ID, "lid-close", -@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager) - CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), - NULL); - -+ /* turn the panel off if the lid is closed (mainly for Dells...) */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_OFF, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel off after lid close: %s", -+ error->message); -+ g_error_free (error); -+ } -+ - /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */ - gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */ - -- /* perform policy action */ -- if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor") -- || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) { -- g_debug ("lid is closed; suspending or hibernating"); -- suspend_with_lid_closed (manager); -- } else { -- g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active"); -- setup_lid_close_safety_timer (manager); -- } -+ restart_inhibit_lid_switch_timer (manager); - } - -- - static void - up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - { -@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - if (manager->priv->lid_is_closed == tmp) - return; - manager->priv->lid_is_closed = tmp; -+ g_debug ("up changed: lid is now %s", tmp ? "closed" : "open"); - - /* fake a keypress */ - if (tmp) -@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) - } - - static void --sleep_cb_screensaver_proxy_ready_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GError *error = NULL; -- GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -- -- manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); -- if (manager->priv->screensaver_proxy == NULL) { -- g_warning ("Could not connect to gnome-screensaver: %s", -- error->message); -- g_error_free (error); -- return; -- } -- -- /* Finish the upower_notify_sleep_cb() call by locking the screen */ -- g_debug ("gnome-screensaver activated, doing gnome-screensaver lock"); -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "Lock", -- NULL, G_DBUS_CALL_FLAGS_NONE, -1, -- NULL, NULL, NULL); --} -- --static void - idle_dbus_signal_cb (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, -@@ -3477,75 +3442,38 @@ out: - } - - static void --lock_screensaver (GsdPowerManager *manager) -+lock_screensaver (GsdPowerManager *manager, -+ GSourceFunc done_cb) - { - gboolean do_lock; - - do_lock = g_settings_get_boolean (manager->priv->settings_screensaver, - "lock-enabled"); -- if (!do_lock) -+ if (!do_lock && done_cb) { -+ done_cb (manager); - return; -- -- if (manager->priv->screensaver_proxy != NULL) { -- g_debug ("doing gnome-screensaver lock"); -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "Lock", -- NULL, G_DBUS_CALL_FLAGS_NONE, -1, -- NULL, NULL, NULL); -- } else { -- /* connect to the screensaver first */ -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, -- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -- NULL, -- GS_DBUS_NAME, -- GS_DBUS_PATH, -- GS_DBUS_INTERFACE, -- NULL, -- sleep_cb_screensaver_proxy_ready_cb, -- manager); -- } --} -- --static void --upower_notify_sleep_cb (UpClient *client, -- UpSleepKind sleep_kind, -- GsdPowerManager *manager) --{ -- lock_screensaver (manager); --} -- --static void --upower_notify_resume_cb (UpClient *client, -- UpSleepKind sleep_kind, -- GsdPowerManager *manager) --{ -- gboolean ret; -- GError *error = NULL; -- -- /* this displays the unlock dialogue so the user doesn't have -- * to move the mouse or press any key before the window comes up */ -- if (manager->priv->screensaver_proxy != NULL) { -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "SimulateUserActivity", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, NULL, NULL); - } - -- /* close existing notifications on resume, the system power -- * state is probably different now */ -- notify_close_if_showing (manager->priv->notification_low); -- notify_close_if_showing (manager->priv->notification_discharging); -- -- /* ensure we turn the panel back on after resume */ -- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_ON, -- &error); -- if (!ret) { -- g_warning ("failed to turn the panel on after resume: %s", -- error->message); -- g_error_free (error); -- } -+ g_dbus_connection_call (manager->priv->connection, -+ GS_DBUS_NAME, -+ GS_DBUS_PATH, -+ GS_DBUS_INTERFACE, -+ "Lock", -+ NULL, NULL, -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ NULL, NULL, NULL); -+ -+ /* Wait until gnome-shell shield animation is done -+ * -+ * FIXME: the shell should mark the lock as active -+ * when the shield is down, then we could wait for -+ * that. This would also fix the problem that we wait -+ * needlessly when the shell has already locked the -+ * screen because it is initiating the suspend. -+ * -+ * https://bugzilla.gnome.org/show_bug.cgi?id=685053 -+ */ -+ g_timeout_add (500, done_cb, manager); - } - - static void -@@ -3755,6 +3683,287 @@ out: - return ret; - } - -+static void -+inhibit_lid_switch_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit lid switch: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_lid_switch_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void -+inhibit_lid_switch (GsdPowerManager *manager) -+{ -+ GVariant *params; -+ -+ if (manager->priv->inhibit_lid_switch_taken) { -+ g_debug ("already inhibited lid-switch"); -+ return; -+ } -+ g_debug ("Adding lid switch system inhibitor"); -+ manager->priv->inhibit_lid_switch_taken = TRUE; -+ -+ params = g_variant_new ("(ssss)", -+ "handle-lid-switch", -+ g_get_user_name (), -+ "Multiple displays attached", -+ "block"); -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ params, -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_lid_switch_done, -+ manager); -+} -+ -+static void -+uninhibit_lid_switch (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_lid_switch_fd == -1) { -+ g_debug ("no lid-switch inhibitor"); -+ return; -+ } -+ g_debug ("Removing lid switch system inhibitor"); -+ close (manager->priv->inhibit_lid_switch_fd); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_lid_switch_taken = FALSE; -+} -+ -+static void -+inhibit_suspend_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit suspend: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_suspend_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+/* We take a delay inhibitor here, which causes logind to send a -+ * PrepareToSleep signal, which gives us a chance to lock the screen -+ * and do some other preparations. -+ */ -+static void -+inhibit_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_suspend_taken) { -+ g_debug ("already inhibited lid-switch"); -+ return; -+ } -+ g_debug ("Adding suspend delay inhibitor"); -+ manager->priv->inhibit_suspend_taken = TRUE; -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "sleep", -+ g_get_user_name (), -+ "GNOME needs to lock the screen", -+ "delay"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_suspend_done, -+ manager); -+} -+ -+static void -+uninhibit_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_suspend_fd == -1) { -+ g_debug ("no suspend delay inhibitor"); -+ return; -+ } -+ g_debug ("Removing suspend delay inhibitor"); -+ close (manager->priv->inhibit_suspend_fd); -+ manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = FALSE; -+} -+ -+static gboolean -+randr_output_is_on (GnomeRROutput *output) -+{ -+ GnomeRRCrtc *crtc; -+ -+ crtc = gnome_rr_output_get_crtc (output); -+ if (!crtc) -+ return FALSE; -+ return gnome_rr_crtc_get_current_mode (crtc) != NULL; -+} -+ -+static gboolean -+external_monitor_is_connected (GnomeRRScreen *screen) -+{ -+ GnomeRROutput **outputs; -+ guint i; -+ -+ if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS)) -+ return TRUE; -+ -+ /* see if we have more than one screen plugged in */ -+ outputs = gnome_rr_screen_list_outputs (screen); -+ for (i = 0; outputs[i] != NULL; i++) { -+ if (randr_output_is_on (outputs[i]) && -+ !gnome_rr_output_is_laptop (outputs[i])) -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static void -+on_randr_event (GnomeRRScreen *screen, gpointer user_data) -+{ -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ -+ /* when a second monitor is plugged in, we take the -+ * handle-lid-switch inhibitor lock of logind to prevent -+ * it from suspending. -+ * -+ * Uninhibiting is done in the inhibit_lid_switch_timer, -+ * since we want to give users a few seconds when unplugging -+ * and replugging an external monitor, not suspend right away. -+ */ -+ if (external_monitor_is_connected (screen) && -+ !g_settings_get_boolean (manager->priv->settings, -+ "lid-close-suspend-with-external-monitor")) { -+ inhibit_lid_switch (manager); -+ setup_inhibit_lid_switch_timer (manager); -+ } -+ else { -+ restart_inhibit_lid_switch_timer (manager); -+ } -+} -+ -+static gboolean -+screen_lock_done_cb (gpointer data) -+{ -+ GsdPowerManager *manager = data; -+ -+ /* lift the delay inhibit, so logind can proceed */ -+ uninhibit_suspend (manager); -+ -+ return FALSE; -+} -+ -+static void -+handle_suspend_actions (GsdPowerManager *manager) -+{ -+ gboolean ret; -+ GError *error = NULL; -+ -+ /* ensure we turn the panel back on after resume */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_ON, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel on after resume: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ lock_screensaver (manager, screen_lock_done_cb); -+} -+ -+static void -+handle_resume_actions (GsdPowerManager *manager) -+{ -+ gboolean ret; -+ GError *error = NULL; -+ -+ /* this displays the unlock dialogue so the user doesn't have -+ * to move the mouse or press any key before the window comes up */ -+ g_dbus_connection_call (manager->priv->connection, -+ GS_DBUS_NAME, -+ GS_DBUS_PATH, -+ GS_DBUS_INTERFACE, -+ "SimulateUserActivity", -+ NULL, NULL, -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ NULL, NULL, NULL); -+ -+ /* close existing notifications on resume, the system power -+ * state is probably different now */ -+ notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (manager->priv->notification_discharging); -+ -+ /* ensure we turn the panel back on after resume */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_ON, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel on after resume: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ /* set up the delay again */ -+ inhibit_suspend (manager); -+} -+ -+static void -+logind_proxy_signal_cb (GDBusProxy *proxy, -+ const gchar *sender_name, -+ const gchar *signal_name, -+ GVariant *parameters, -+ gpointer user_data) -+{ -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ gboolean is_about_to_suspend; -+ -+ if (g_strcmp0 (signal_name, "PrepareForSleep") != 0) -+ return; -+ g_variant_get (parameters, "(b)", &is_about_to_suspend); -+ if (is_about_to_suspend) { -+ handle_suspend_actions (manager); -+ } else { -+ handle_resume_actions (manager); -+ } -+} -+ - gboolean - gsd_power_manager_start (GsdPowerManager *manager, - GError **error) -@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager, - g_debug ("Starting power manager"); - gnome_settings_profile_start (NULL); - -+ manager->priv->logind_proxy = -+ g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -+ 0, -+ NULL, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ NULL, -+ error); -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return FALSE; -+ } -+ g_signal_connect (manager->priv->logind_proxy, "g-signal", -+ G_CALLBACK (logind_proxy_signal_cb), -+ manager); -+ /* Set up a delay inhibitor to be informed about suspend attempts */ -+ inhibit_suspend (manager); -+ - /* track the active session */ - manager->priv->session = gnome_settings_session_new (); - g_signal_connect (manager->priv->session, "notify::state", -@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager, - G_CALLBACK (engine_settings_key_changed_cb), manager); - manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver"); - manager->priv->up_client = up_client_new (); -- g_signal_connect (manager->priv->up_client, "notify-sleep", -- G_CALLBACK (upower_notify_sleep_cb), manager); -- g_signal_connect (manager->priv->up_client, "notify-resume", -- G_CALLBACK (upower_notify_resume_cb), manager); - manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client); - g_signal_connect (manager->priv->up_client, "device-added", - G_CALLBACK (engine_device_added_cb), manager); -@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - G_CALLBACK (idle_idletime_reset_cb), manager); - g_signal_connect (manager->priv->idletime, "alarm-expired", - G_CALLBACK (idle_idletime_alarm_expired_cb), manager); -+ g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); -+ /* set up initial state */ -+ on_randr_event (manager->priv->x11_screen, manager); - - /* ensure the default dpms timeouts are cleared */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) - { - g_debug ("Stopping power manager"); - -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ } -+ - if (manager->priv->bus_cancellable != NULL) { - g_cancellable_cancel (manager->priv->bus_cancellable); - g_object_unref (manager->priv->bus_cancellable); -@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) - manager->priv->introspection_data = NULL; - } - -- kill_lid_close_safety_timer (manager); -- - g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); - - g_clear_object (&manager->priv->connection); -@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) - g_clear_object (&manager->priv->settings); - g_clear_object (&manager->priv->settings_screensaver); - g_clear_object (&manager->priv->up_client); -+ -+ if (manager->priv->inhibit_lid_switch_fd != -1) { -+ close (manager->priv->inhibit_lid_switch_fd); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_lid_switch_taken = FALSE; -+ } -+ if (manager->priv->inhibit_suspend_fd != -1) { -+ close (manager->priv->inhibit_suspend_fd); -+ manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = FALSE; -+ } -+ -+ g_clear_object (&manager->priv->logind_proxy); - g_clear_object (&manager->priv->x11_screen); - - g_ptr_array_unref (manager->priv->devices_array); -@@ -3980,6 +4223,8 @@ static void - gsd_power_manager_init (GsdPowerManager *manager) - { - manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_suspend_fd = -1; - } - - static void --- -1.8.0 - diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD index e4125e240..ba4a392af 100644 --- a/community/gnome-settings-daemon-updates/PKGBUILD +++ b/community/gnome-settings-daemon-updates/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82410 2013-01-16 23:40:08Z jconder $ +# $Id: PKGBUILD 88701 2013-04-21 22:24:09Z heftig $ # Maintainer: Jonathan Conder _pkgname=gnome-settings-daemon pkgname=$_pkgname-updates -pkgver=3.6.4 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 pkgdesc="Updates plugin for the GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') @@ -14,28 +14,20 @@ 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" - '0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch' 'arch.patch') -sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' - 'dbea64c93db308cbcae52cf0c512986c6f07a0bd5023b0641255416af863011e' +sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee' '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') build() { cd "$srcdir/$_pkgname-$pkgver" - patch -Np1 -i "$srcdir/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch" patch -Np1 -i "$srcdir/arch.patch" - aclocal - autoconf - automake --add-missing ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ --libexecdir=/usr/lib/gnome-settings-daemon \ - --disable-static \ - --enable-systemd \ - --disable-ibus + --disable-static #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool diff --git a/community/gnote/PKGBUILD b/community/gnote/PKGBUILD index 761cdf404..90582160b 100644 --- a/community/gnote/PKGBUILD +++ b/community/gnote/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82837 2013-01-24 20:04:23Z ioni $ +# $Id: PKGBUILD 88699 2013-04-21 22:24:06Z heftig $ # Maintainer: Ionut Biru # Contributor: uastasi pkgname=gnote -pkgver=3.6.2 +pkgver=3.8.0 pkgrel=1 pkgdesc="A note taking application." arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'boost') options=('!libtool') install=gnote.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('38f3b069874658f281445e04b8376d946580e4a5e39620f7e30fdd8216d46c1e') +sha256sums=('603e2cc8782f910a5b4fdfd3588d955d59f0f4ddcd5685d1f2feadb955e0e9e6') build() { cd $pkgname-$pkgver diff --git a/community/gtksourceviewmm/PKGBUILD b/community/gtksourceviewmm/PKGBUILD index 208e12cbb..1b7d00a51 100644 --- a/community/gtksourceviewmm/PKGBUILD +++ b/community/gtksourceviewmm/PKGBUILD @@ -1,10 +1,10 @@ -#$Id: PKGBUILD 82071 2013-01-07 09:40:20Z arodseth $ +#$Id: PKGBUILD 88691 2013-04-21 22:17:11Z heftig $ # Maintainer: Alexander Rødseth # Contributor: Ionut Biru pkgname=gtksourceviewmm pkgver=3.2.0 -pkgrel=2 +pkgrel=4 pkgdesc='C++ bindings for the gtksourceview library' arch=('x86_64' 'i686') url='http://projects.gnome.org/gtksourceviewmm/' diff --git a/community/gtranslator/PKGBUILD b/community/gtranslator/PKGBUILD index 82881fd7c..6c4e2d718 100644 --- a/community/gtranslator/PKGBUILD +++ b/community/gtranslator/PKGBUILD @@ -1,31 +1,31 @@ -# $Id: PKGBUILD 87242 2013-03-28 21:28:56Z bgyorgy $ +# $Id: PKGBUILD 88692 2013-04-21 22:17:13Z heftig $ # Maintainer: Jaroslav Lichtblau +# Maintainer: Alexander Rødseth # Contributor: Hugo Doria # Contributor: Christer Solskogen (solskogen@carebears.mine.nu) pkgname=gtranslator pkgver=2.91.6 -pkgrel=3 -pkgdesc="An enhanced gettext po file editor for the GNOME" -arch=('i686' 'x86_64') -url="http://projects.gnome.org/gtranslator/" +pkgrel=4 +pkgdesc='Enhanced gettext po file editor for the GNOME' +arch=('x86_64' 'i686') +url='http://projects.gnome.org/gtranslator/' license=('GPL') depends=('desktop-file-utils' 'gdl' 'gettext' 'gtksourceview3' 'gtkspell3' 'iso-codes' 'libgda' 'libpeas' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'dconf') makedepends=('intltool' 'itstool' 'gnome-doc-utils' 'gucharmap' 'json-glib' 'gnome-common' 'yelp-tools') 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.91/$pkgname-$pkgver.tar.xz - gtkspell3-port.patch) +install="$pkgname.install" +source=("http://ftp.acc.umu.se/pub/GNOME/sources/$pkgname/2.91/$pkgname-$pkgver.tar.xz" + 'gtkspell3-port.patch') sha256sums=('a1fd4b17b1f32cc7223a31d34e34f95b20acc7b5a23768351a34ff0b7a4bcdf6' '29afb55c692869cbd47d0181ddd93acdd53f5b236ebabd9a96a983da66d4cb9d') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - # Port to the new gtkspell3 + # port to the new gtkspell3 patch -Np1 -i "$srcdir/gtkspell3-port.patch" autoreconf -fi @@ -34,7 +34,9 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR=${pkgdir} install + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/community/gwibber/PKGBUILD b/community/gwibber/PKGBUILD index 378218f5d..6bf243222 100644 --- a/community/gwibber/PKGBUILD +++ b/community/gwibber/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 87240 2013-03-28 21:28:09Z bgyorgy $ +# $Id: PKGBUILD 88679 2013-04-21 22:16:47Z heftig $ # Maintainer: Balló György pkgname=gwibber pkgver=3.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" arch=('i686' 'x86_64') url="http://gwibber.com/" license=('GPL') -depends=('libgee' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') +depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') makedepends=('intltool' 'vala') options=('!libtool') install=$pkgname.install diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD index 22fa63751..f898512e5 100644 --- a/community/ktoblzcheck/PKGBUILD +++ b/community/ktoblzcheck/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80490 2012-11-22 19:42:25Z spupykin $ +# $Id: PKGBUILD 88778 2013-04-22 10:14:34Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Philipp Sandhaus pkgname=ktoblzcheck -pkgver=1.40 +pkgver=1.41 pkgrel=1 pkgdesc="A library to check account numbers and bank codes of German banks" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('gcc-libs' 'python') optdepends=('perl') source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz ktoblzcheck-python3.patch) -md5sums=('fe29ec3ef8b48adf0302fd9d2607580b' +md5sums=('48f6d0086d780d1c101b17b5b63706f3' 'a81a697bb3aaeffb7fac0ad7d9166e3f') build() { diff --git a/community/metacity/PKGBUILD b/community/metacity/PKGBUILD index 4919a27eb..5955d5b88 100644 --- a/community/metacity/PKGBUILD +++ b/community/metacity/PKGBUILD @@ -1,30 +1,46 @@ -# $Id: PKGBUILD 87887 2013-04-08 14:38:04Z heftig $ -# Maintainer: Jan de Groot +# $Id: PKGBUILD 88686 2013-04-21 22:17:01Z heftig $ +# Maintainer: Balló György +# Contributor: Jan de Groot pkgname=metacity pkgver=2.34.13 -pkgrel=1 -pkgdesc="A window manager for GNOME" -arch=(i686 x86_64) +pkgrel=4 +pkgdesc="Legacy GNOME window manager" +arch=('i686' 'x86_64') license=('GPL') -depends=('dconf' 'gtk2' 'gsettings-desktop-schemas' 'libcanberra' 'libgtop' 'libsm' 'startup-notification' 'zenity') -makedepends=('intltool' 'yelp-tools') -url="http://www.gnome.org" -groups=('gnome') -options=('!libtool' '!emptydirs') +depends=('dconf' 'libcanberra' 'libgtop' 'gsettings-desktop-schemas' 'gtk2' 'startup-notification' 'zenity') +makedepends=('intltool' 'itstool') +url="https://live.gnome.org/Metacity" +options=('!libtool') install=metacity.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - fix_compositing_startup.patch) + fix_compositing_startup.patch + fix_force_quit.patch + fix_shadows.patch + enable_compositing.patch) sha256sums=('8cf4dbf0da0a6f36357ce7db7f829ec685908a7792453c662fb8184572b91075' - '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2') + '5094a0ffe3eb8289ed752829877c2e1b743eddf938ad3fc92fb4574b42765ae2' + '917760ac3375894ebb4052dfc7c8dff1ac556fb81033d7a7caf02123ceede50d' + 'a0981477e9b3fd108fd03b7637bfd1f17a1f6cb13ec703d86b424b55076096f3' + 'e53c1c20e19cd3d94d05d08045c7a9a373ce52051928ccc69bf3068081f30f9a') build() { cd "$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/fix_compositing_startup.patch" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/metacity \ - --localstatedir=/var --disable-static \ - --disable-schemas-compile + + # https://bugzilla.gnome.org/show_bug.cgi?id=658036 + patch -Np1 -i "$srcdir/fix_compositing_startup.patch" + + # https://bugzilla.gnome.org/show_bug.cgi?id=687938 + patch -Np1 -i "$srcdir/fix_force_quit.patch" + + # https://bugzilla.gnome.org/show_bug.cgi?id=648340 + patch -Np1 -i "$srcdir/fix_shadows.patch" + + # Enable compositing by default (required for the desktop rendering feature of nautilus) + patch -Np1 -i "$srcdir/enable_compositing.patch" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ + --disable-static --disable-schemas-compile make } diff --git a/community/metacity/enable_compositing.patch b/community/metacity/enable_compositing.patch new file mode 100644 index 000000000..3c5f09666 --- /dev/null +++ b/community/metacity/enable_compositing.patch @@ -0,0 +1,12 @@ +diff -Naur metacity-2.34.13.orig/src/org.gnome.metacity.gschema.xml.in metacity-2.34.13/src/org.gnome.metacity.gschema.xml.in +--- metacity-2.34.13.orig/src/org.gnome.metacity.gschema.xml.in 2012-02-15 18:31:44.000000000 +0100 ++++ metacity-2.34.13/src/org.gnome.metacity.gschema.xml.in 2013-04-10 20:14:39.837033219 +0200 +@@ -3,7 +3,7 @@ + + +- false ++ true + <_summary>Compositing Manager + <_description> + Determines whether Metacity is a compositing manager. diff --git a/community/metacity/fix_force_quit.patch b/community/metacity/fix_force_quit.patch new file mode 100644 index 000000000..020f427c4 --- /dev/null +++ b/community/metacity/fix_force_quit.patch @@ -0,0 +1,222 @@ +diff -Naur metacity-2.34.13.orig/src/core/delete.c metacity-2.34.13/src/core/delete.c +--- metacity-2.34.13.orig/src/core/delete.c 2011-11-10 15:14:34.000000000 +0100 ++++ metacity-2.34.13/src/core/delete.c 2012-11-08 21:36:48.373976906 +0100 +@@ -90,23 +90,41 @@ + return; + } + +- window_title = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL); ++ /* This is to get a better string if the title isn't representable ++ * in the locale encoding; actual conversion to UTF-8 is done inside ++ * meta_show_dialog */ ++ ++ if (window->title && window->title[0]) ++ { ++ tmp = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL); ++ if (tmp == NULL) ++ window_title = NULL; ++ else ++ window_title = window->title; ++ g_free (tmp); ++ } ++ else ++ { ++ window_title = NULL; ++ } + + /* Translators: %s is a window title */ +- tmp = g_strdup_printf (_("%s is not responding."), +- window_title); ++ if (window_title) ++ tmp = g_markup_printf_escaped (_("%s is not responding."), ++ window_title); ++ else ++ tmp = g_strdup (_("Application is not responding.")); ++ + window_content = g_strdup_printf ( + "%s\n\n%s", + tmp, + _("You may choose to wait a short while for it to " + "continue or force the application to quit entirely.")); + +- g_free (window_title); +- + dialog_pid = + meta_show_dialog ("--question", +- window_content, 0, +- window->screen->number, ++ window_content, NULL, ++ window->screen->screen_name, + _("_Wait"), _("_Force Quit"), window->xwindow, + NULL, NULL); + +diff -Naur metacity-2.34.13.orig/src/core/session.c metacity-2.34.13/src/core/session.c +--- metacity-2.34.13.orig/src/core/session.c 2011-11-10 15:14:34.000000000 +0100 ++++ metacity-2.34.13/src/core/session.c 2012-11-08 21:35:56.896216322 +0100 +@@ -1809,7 +1809,7 @@ + "and will have to be restarted manually next time " + "you log in."), + "240", +- meta_screen_get_screen_number (meta_get_display()->active_screen), ++ meta_get_display()->active_screen->screen_name, + NULL, NULL, + None, + columns, +diff -Naur metacity-2.34.13.orig/src/core/util.c metacity-2.34.13/src/core/util.c +--- metacity-2.34.13.orig/src/core/util.c 2011-11-10 15:14:34.000000000 +0100 ++++ metacity-2.34.13/src/core/util.c 2012-11-08 21:36:41.373828115 +0100 +@@ -538,11 +538,30 @@ + } + } + ++/* Command line arguments are passed in the locale encoding; in almost ++ * all cases, we'd hope that is UTF-8 and no conversion is necessary. ++ * If it's not UTF-8, then it's possible that the message isn't ++ * representable in the locale encoding. ++ */ ++static void ++append_argument (GPtrArray *args, ++ const char *arg) ++{ ++ char *locale_arg = g_locale_from_utf8 (arg, -1, NULL, NULL, NULL); ++ ++ /* This is cheesy, but it's better to have a few ???'s in the dialog ++ * for an unresponsive application than no dialog at all appear */ ++ if (!locale_arg) ++ locale_arg = g_strdup ("???"); ++ ++ g_ptr_array_add (args, locale_arg); ++} ++ + GPid + meta_show_dialog (const char *type, + const char *message, + const char *timeout, +- const gint screen_number, ++ const char *display, + const char *ok_text, + const char *cancel_text, + const int transient_for, +@@ -550,61 +569,58 @@ + GSList *entries) + { + GError *error = NULL; +- char *screen_number_text = g_strdup_printf("%d", screen_number); + GSList *tmp; +- int i=0; + GPid child_pid; +- const char **argvl = g_malloc(sizeof (char*) * +- (17 + +- g_slist_length (columns)*2 + +- g_slist_length (entries))); +- +- argvl[i++] = "zenity"; +- argvl[i++] = type; +- argvl[i++] = "--screen"; +- argvl[i++] = screen_number_text; +- argvl[i++] = "--class"; +- argvl[i++] = "metacity-dialog"; +- argvl[i++] = "--title"; ++ GPtrArray *args; ++ ++ args = g_ptr_array_new (); ++ ++ append_argument (args, "zenity"); ++ append_argument (args, type); ++ append_argument (args, "--display"); ++ append_argument (args, display); ++ append_argument (args, "--class"); ++ append_argument (args, "metaicty-dialog"); ++ append_argument (args, "--title"); + /* Translators: This is the title used on dialog boxes */ +- argvl[i++] = _("Metacity"); +- argvl[i++] = "--text"; +- argvl[i++] = message; +- ++ append_argument (args, _("Metacity")); ++ append_argument (args, "--text"); ++ append_argument (args, message); ++ + if (timeout) + { +- argvl[i++] = "--timeout"; +- argvl[i++] = timeout; ++ append_argument (args, "--timeout"); ++ append_argument (args, timeout); + } + + if (ok_text) + { +- argvl[i++] = "--ok-label"; +- argvl[i++] = ok_text; ++ append_argument (args, "--ok-label"); ++ append_argument (args, ok_text); + } + + if (cancel_text) + { +- argvl[i++] = "--cancel-label"; +- argvl[i++] = cancel_text; ++ append_argument (args, "--cancel-label"); ++ append_argument (args, cancel_text); + } +- ++ + tmp = columns; + while (tmp) + { +- argvl[i++] = "--column"; +- argvl[i++] = tmp->data; ++ append_argument (args, "--column"); ++ append_argument (args, tmp->data); + tmp = tmp->next; + } + + tmp = entries; + while (tmp) + { +- argvl[i++] = tmp->data; ++ append_argument (args, tmp->data); + tmp = tmp->next; + } +- +- argvl[i] = NULL; ++ ++ g_ptr_array_add (args, NULL); /* NULL-terminate */ + + if (transient_for) + { +@@ -615,7 +631,7 @@ + + g_spawn_async ( + "/", +- (gchar**) argvl, /* ugh */ ++ (gchar**) args->pdata, + NULL, + G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, + NULL, NULL, +@@ -626,8 +642,7 @@ + if (transient_for) + unsetenv ("WINDOWID"); + +- g_free (argvl); +- g_free (screen_number_text); ++ g_ptr_array_free (args, TRUE); + + if (error) + { +diff -Naur metacity-2.34.13.orig/src/include/util.h metacity-2.34.13/src/include/util.h +--- metacity-2.34.13.orig/src/include/util.h 2011-11-10 15:14:34.000000000 +0100 ++++ metacity-2.34.13/src/include/util.h 2012-11-08 21:36:27.206860608 +0100 +@@ -99,9 +99,9 @@ + void meta_free_gslist_and_elements (GSList *list_to_deep_free); + + GPid meta_show_dialog (const char *type, +- const char *title, + const char *message, +- gint timeout, ++ const char *timeout, ++ const char *display, + const char *ok_text, + const char *cancel_text, + const int transient_for, diff --git a/community/metacity/fix_shadows.patch b/community/metacity/fix_shadows.patch new file mode 100644 index 000000000..8d4bf9939 --- /dev/null +++ b/community/metacity/fix_shadows.patch @@ -0,0 +1,39 @@ +diff -Naur metacity-2.34.13.orig/src/compositor/compositor-xrender.c metacity-2.34.13/src/compositor/compositor-xrender.c +--- metacity-2.34.13.orig/src/compositor/compositor-xrender.c 2011-11-10 15:14:34.000000000 +0100 ++++ metacity-2.34.13/src/compositor/compositor-xrender.c 2012-11-09 13:51:42.492411570 +0100 +@@ -905,35 +905,6 @@ + } + } + +- /* Never put a shadow around shaped windows */ +- if (cw->shaped) { +- meta_verbose ("Window has no shadow as it is shaped\n"); +- return FALSE; +- } +- +- /* Don't put shadow around DND icon windows */ +- if (cw->type == META_COMP_WINDOW_DND || +- cw->type == META_COMP_WINDOW_DESKTOP) { +- meta_verbose ("Window has no shadow as it is DND or Desktop\n"); +- return FALSE; +- } +- +- if (cw->mode != WINDOW_ARGB) { +- meta_verbose ("Window has shadow as it is not ARGB\n"); +- return TRUE; +- } +- +- if (cw->type == META_COMP_WINDOW_MENU || +- cw->type == META_COMP_WINDOW_DROP_DOWN_MENU) { +- meta_verbose ("Window has shadow as it is a menu\n"); +- return TRUE; +- } +- +- if (cw->type == META_COMP_WINDOW_TOOLTIP) { +- meta_verbose ("Window has shadow as it is a tooltip\n"); +- return TRUE; +- } +- + meta_verbose ("Window has no shadow as it fell through\n"); + return FALSE; + } diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index e77f3c76d..8732424f9 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85924 2013-03-09 00:51:47Z faidoc $ +# $Id: PKGBUILD 88697 2013-04-21 22:24:03Z heftig $ # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') @@ -11,20 +11,16 @@ url="https://github.com/linuxmint/muffin" license=('GPL') depends=('libsm' 'clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ 'libcanberra' 'startup-notification' 'zenity' 'dconf') -makedepends=('intltool' 'gnome-doc-utils') -provides=('muffin-wm') -conflicts=('muffin-wm') -replaces=('muffin-wm') +makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver") -md5sums=('c39cd212959c7de8f834abe9e3fee8da') +md5sums=('30e329da6af10e825dace490f13e445f') build() { cd linuxmint-muffin-* - autoreconf -vfi - PYTHON=python2 ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ + PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make } diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 8c6f3a4e7..1c36a5330 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 82907 2013-01-25 12:43:46Z arodseth $ +# $Id: PKGBUILD 88693 2013-04-21 22:17:15Z heftig $ # Maintainer: Alexander Rødseth # Contributor: jordz pkgname=nemiver pkgver=0.9.4 -pkgrel=1 +pkgrel=2 pkgdesc='C/C++ debugger for GNOME' arch=('x86_64' 'i686') license=('GPL') url='http://www.gnome.org/projects/nemiver/' -depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas' 'itstool') -makedepends=('boost' 'intltool' 'gnome-doc-utils') -install=nemiver.install +depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas') +makedepends=('boost' 'intltool' 'itstool') source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") options=('!libtool' '!emptydirs') sha256sums=('12cc5b6092ba720f2524f59928bee4d736e5e5ffeeffb6fd06f99695f17d683f') diff --git a/community/nemiver/nemiver.install b/community/nemiver/nemiver.install deleted file mode 100644 index f6a1886e7..000000000 --- a/community/nemiver/nemiver.install +++ /dev/null @@ -1,15 +0,0 @@ -post_upgrade() { - 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_install() { - post_upgrade -} - -post_remove() { - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 778009bb6..f2b15964c 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,33 +1,39 @@ -# $Id: PKGBUILD 86851 2013-03-22 21:28:54Z faidoc $ +# $Id: PKGBUILD 88773 2013-04-22 09:44:29Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=1.7.2 -pkgrel=1 +pkgver=1.7.3 +pkgrel=2 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" license=('GPL') depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2' - 'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql') + 'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' + 'cinnamon') makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common') optdepends=('gksu: Open as Root') -provides=('nemo-fm') -replaces=('nemo-fm') -conflicts=('nemo-fm') options=('!emptydirs' '!libtool') install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" - "use-terminal-config.patch") -md5sums=('809cf58f472a9e5de628a763d441b246' - '6cca080cc8fe3df7e725c0f8cd5fa485') + "tracker-0.16.patch" + "remove-desktop-background.patch") +md5sums=('04c021da543e2562b712107c2be9a8c2' + '9e170cc74eee901634b3367b06a209c6' + '700b595dfcf06e39f9dc3bdb7c81e086') build() { cd linuxmint-nemo-* - # Read the default terminal app from GSettings - patch -Np1 -i ../use-terminal-config.patch + # Python2 fix + sed -i 's/bin\/python/bin\/python2/g' files/usr/share/nemo/actions/myaction.py + + # https://github.com/linuxmint/nemo/pull/258 + patch -Np1 -i ../tracker-0.16.patch + + # https://github.com/linuxmint/nemo/pull/263 + patch -Np1 -i ../remove-desktop-background.patch ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ @@ -43,7 +49,4 @@ package() { cd linuxmint-nemo-* make DESTDIR="$pkgdir/" install - - # Python2 fix - sed -i 's/bin\/python/bin\/python2/g' "${pkgdir}/usr/share/nemo/actions/myaction.py" } diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch new file mode 100644 index 000000000..793d5650c --- /dev/null +++ b/community/nemo/remove-desktop-background.patch @@ -0,0 +1,964 @@ +From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 15 Apr 2013 18:44:35 -0400 +Subject: [PATCH 1/4] Don't render the background. Need to fix selected icon + style + +--- + src/nemo-desktop-icon-view.c | 18 +++--------------- + src/nemo-desktop-window.c | 15 ++++++++++++++- + 2 files changed, 17 insertions(+), 16 deletions(-) + +diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c +index b903c5b..37cd8cb 100644 +--- a/src/nemo-desktop-icon-view.c ++++ b/src/nemo-desktop-icon-view.c +@@ -243,16 +243,6 @@ struct NemoDesktopIconViewDetails + static void + real_begin_loading (NemoView *object) + { +- NemoIconContainer *icon_container; +- NemoDesktopIconView *view; +- +- view = NEMO_DESKTOP_ICON_VIEW (object); +- +- icon_container = get_icon_container (view); +- if (view->details->background == NULL) { +- view->details->background = nemo_desktop_background_new (icon_container); +- } +- + NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object); + } + +@@ -298,11 +288,6 @@ struct NemoDesktopIconViewDetails + nemo_view_update_menus, + icon_view); + +- if (icon_view->details->background != NULL) { +- g_object_unref (icon_view->details->background); +- icon_view->details->background = NULL; +- } +- + G_OBJECT_CLASS (nemo_desktop_icon_view_parent_class)->dispose (object); + } + +@@ -652,6 +637,9 @@ struct NemoDesktopIconViewDetails + G_CALLBACK (nemo_view_update_menus), + desktop_icon_view); + ++ GdkRGBA transparent = { 0, 0, 0, 0 }; ++ gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent); ++ + have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL; + } + +diff --git a/src/nemo-desktop-window.c b/src/nemo-desktop-window.c +index 9c80c62..2d5c4e8 100644 +--- a/src/nemo-desktop-window.c ++++ b/src/nemo-desktop-window.c +@@ -97,6 +97,7 @@ struct NemoDesktopWindowDetails { + g_signal_connect_swapped (nemo_preferences, "changed::" NEMO_PREFERENCES_DESKTOP_IS_HOME_DIR, + G_CALLBACK (nemo_desktop_window_update_directory), + window); ++ + } + + static void +@@ -189,6 +190,12 @@ struct NemoDesktopWindowDetails { + /* Chain up to realize our children */ + GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->map (widget); + gdk_window_lower (gtk_widget_get_window (widget)); ++ ++ GdkWindow *window; ++ GdkRGBA transparent = { 0, 0, 0, 0 }; ++ ++ window = gtk_widget_get_window (widget); ++ gdk_window_set_background_rgba (window, &transparent); + } + + static void +@@ -254,6 +261,7 @@ struct NemoDesktopWindowDetails { + { + NemoDesktopWindow *window; + NemoDesktopWindowDetails *details; ++ GdkVisual *visual; + + window = NEMO_DESKTOP_WINDOW (widget); + details = window->details; +@@ -261,7 +269,12 @@ struct NemoDesktopWindowDetails { + /* Make sure we get keyboard events */ + gtk_widget_set_events (widget, gtk_widget_get_events (widget) + | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK); +- ++ ++ visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget)); ++ if (visual) { ++ gtk_widget_set_visual (widget, visual); ++ } ++ + /* Do the work of realizing. */ + GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget); + +-- +1.8.1.5 + + +From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 15 Apr 2013 20:03:03 -0400 +Subject: [PATCH 2/4] Remove nemo-desktop-background, the desktop window makes + a transparent background and just uses the existing rendered background from + muffin/g-s-d + +--- + libnemo-private/Makefile.am | 2 - + libnemo-private/nemo-desktop-background.c | 578 ------------------------------ + libnemo-private/nemo-desktop-background.h | 65 ---- + src/nemo-desktop-icon-view.c | 26 +- + 4 files changed, 13 insertions(+), 658 deletions(-) + delete mode 100644 libnemo-private/nemo-desktop-background.c + delete mode 100644 libnemo-private/nemo-desktop-background.h + +diff --git a/libnemo-private/Makefile.am b/libnemo-private/Makefile.am +index 3b46318..5fd797c 100644 +--- a/libnemo-private/Makefile.am ++++ b/libnemo-private/Makefile.am +@@ -81,8 +81,6 @@ libnemo_private_la_SOURCES = \ + nemo-debug.h \ + nemo-default-file-icon.c \ + nemo-default-file-icon.h \ +- nemo-desktop-background.c \ +- nemo-desktop-background.h \ + nemo-desktop-directory-file.c \ + nemo-desktop-directory-file.h \ + nemo-desktop-directory.c \ +diff --git a/libnemo-private/nemo-desktop-background.c b/libnemo-private/nemo-desktop-background.c +deleted file mode 100644 +index f8dc979..0000000 +--- a/libnemo-private/nemo-desktop-background.c ++++ /dev/null +@@ -1,578 +0,0 @@ +-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +- +-/* +- * nemo-desktop-background.c: Helper object to handle desktop background +- * changes. +- * +- * Copyright (C) 2000 Eazel, Inc. +- * Copyright (C) 2010 Cosimo Cecchi +- * +- * 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., 51 Franklin Street - Suite 500, +- * Boston, MA 02110-1335, USA. +- * +- * Authors: Darin Adler +- * Cosimo Cecchi +- */ +- +-#include +- +-#include "nemo-desktop-background.h" +- +-#include +-#include +- +-#include "nemo-global-preferences.h" +- +-#define GNOME_DESKTOP_USE_UNSTABLE_API +-#include +-#include +- +-#include +-#include +- +-static void init_fade (NemoDesktopBackground *self); +-static void free_fade (NemoDesktopBackground *self); +-static void queue_background_change (NemoDesktopBackground *self); +- +-static NemoDesktopBackground *singleton = NULL; +- +-G_DEFINE_TYPE (NemoDesktopBackground, nemo_desktop_background, G_TYPE_OBJECT); +- +-enum { +- PROP_WIDGET = 1, +- NUM_PROPERTIES, +-}; +- +-struct NemoDesktopBackgroundDetails { +- +- GtkWidget *widget; +- GnomeBG *bg; +- +- /* Realized data: */ +- cairo_surface_t *background_surface; +- GnomeBGCrossfade *fade; +- int background_entire_width; +- int background_entire_height; +- GdkColor default_color; +- +- /* Desktop screen size watcher */ +- gulong screen_size_handler; +- /* Desktop monitors configuration watcher */ +- gulong screen_monitors_handler; +- guint change_idle_id; +-}; +- +- +-static gboolean +-background_settings_change_event_cb (GSettings *settings, +- gpointer keys, +- gint n_keys, +- gpointer user_data); +- +- +-static void +-free_fade (NemoDesktopBackground *self) +-{ +- if (self->details->fade != NULL) { +- g_object_unref (self->details->fade); +- self->details->fade = NULL; +- } +-} +- +-static void +-free_background_surface (NemoDesktopBackground *self) +-{ +- cairo_surface_t *surface; +- +- surface = self->details->background_surface; +- if (surface != NULL) { +- cairo_surface_destroy (surface); +- self->details->background_surface = NULL; +- } +-} +- +-static void +-nemo_desktop_background_finalize (GObject *object) +-{ +- NemoDesktopBackground *self; +- +- self = NEMO_DESKTOP_BACKGROUND (object); +- +- g_signal_handlers_disconnect_by_func (gnome_background_preferences, +- background_settings_change_event_cb, +- self); +- +- free_background_surface (self); +- free_fade (self); +- +- g_clear_object (&self->details->bg); +- +- G_OBJECT_CLASS (nemo_desktop_background_parent_class)->finalize (object); +-} +- +-static void +-nemo_desktop_background_unrealize (NemoDesktopBackground *self) +-{ +- free_background_surface (self); +- +- self->details->background_entire_width = 0; +- self->details->background_entire_height = 0; +- self->details->default_color.red = 0xffff; +- self->details->default_color.green = 0xffff; +- self->details->default_color.blue = 0xffff; +-} +- +-static void +-nemo_desktop_background_set_image_uri (NemoDesktopBackground *self, +- const char *image_uri) +-{ +- char *filename; +- +- if (image_uri != NULL) { +- filename = g_filename_from_uri (image_uri, NULL, NULL); +- } +- else { +- filename = NULL; +- } +- +- gnome_bg_set_filename (self->details->bg, filename); +- +- g_free (filename); +-} +- +-static void +-init_fade (NemoDesktopBackground *self) +-{ +- GtkWidget *widget; +- gboolean do_fade; +- +- widget = self->details->widget; +- +- if (widget == NULL || !gtk_widget_get_realized (widget)) +- return; +- +- do_fade = g_settings_get_boolean (nemo_desktop_preferences, +- NEMO_PREFERENCES_DESKTOP_BACKGROUND_FADE); +- +- if (!do_fade) { +- return; +- } +- +- if (self->details->fade == NULL) { +- GdkWindow *window; +- GdkScreen *screen; +- int old_width, old_height, width, height; +- +- /* If this was the result of a screen size change, +- * we don't want to crossfade +- */ +- window = gtk_widget_get_window (widget); +- old_width = gdk_window_get_width (window); +- old_height = gdk_window_get_height (window); +- +- screen = gtk_widget_get_screen (widget); +- width = gdk_screen_get_width (screen); +- height = gdk_screen_get_height (screen); +- +- if (old_width == width && old_height == height) { +- self->details->fade = gnome_bg_crossfade_new (width, height); +- g_signal_connect_swapped (self->details->fade, +- "finished", +- G_CALLBACK (free_fade), +- self); +- } +- } +- +- if (self->details->fade != NULL && !gnome_bg_crossfade_is_started (self->details->fade)) { +- cairo_surface_t *start_surface; +- +- if (self->details->background_surface == NULL) { +- start_surface = gnome_bg_get_surface_from_root (gtk_widget_get_screen (widget)); +- } else { +- start_surface = cairo_surface_reference (self->details->background_surface); +- } +- gnome_bg_crossfade_set_start_surface (self->details->fade, +- start_surface); +- cairo_surface_destroy (start_surface); +- } +-} +- +-static void +-screen_size_changed (GdkScreen *screen, +- NemoDesktopBackground *self) +-{ +- queue_background_change (self); +-} +- +-static gboolean +-nemo_desktop_background_ensure_realized (NemoDesktopBackground *self) +-{ +- int entire_width; +- int entire_height; +- GdkScreen *screen; +- GdkWindow *window; +- +- screen = gtk_widget_get_screen (self->details->widget); +- entire_height = gdk_screen_get_height (screen); +- entire_width = gdk_screen_get_width (screen); +- +- /* If the window size is the same as last time, don't update */ +- if (entire_width == self->details->background_entire_width && +- entire_height == self->details->background_entire_height) { +- return FALSE; +- } +- +- free_background_surface (self); +- +- window = gtk_widget_get_window (self->details->widget); +- self->details->background_surface = gnome_bg_create_surface (self->details->bg, +- window, +- entire_width, entire_height, +- TRUE); +- +- /* We got the surface and everything, so we don't care about a change +- that is pending (unless things actually change after this time) */ +- g_object_set_data (G_OBJECT (self), +- "ignore-pending-change", GINT_TO_POINTER (TRUE)); +- +- self->details->background_entire_width = entire_width; +- self->details->background_entire_height = entire_height; +- +- return TRUE; +-} +- +-static void +-on_fade_finished (GnomeBGCrossfade *fade, +- GdkWindow *window, +- gpointer user_data) +-{ +- NemoDesktopBackground *self = user_data; +- +- nemo_desktop_background_ensure_realized (self); +- gnome_bg_set_surface_as_root (gdk_window_get_screen (window), +- self->details->background_surface); +-} +- +-static gboolean +-fade_to_surface (NemoDesktopBackground *self, +- GdkWindow *window, +- cairo_surface_t *surface) +-{ +- if (self->details->fade == NULL) { +- return FALSE; +- } +- +- if (!gnome_bg_crossfade_set_end_surface (self->details->fade, +- surface)) { +- return FALSE; +- } +- +- if (!gnome_bg_crossfade_is_started (self->details->fade)) { +- gnome_bg_crossfade_start (self->details->fade, window); +- g_signal_connect (self->details->fade, +- "finished", +- G_CALLBACK (on_fade_finished), self); +- } +- +- return gnome_bg_crossfade_is_started (self->details->fade); +-} +- +-static void +-nemo_desktop_background_set_up_widget (NemoDesktopBackground *self) +-{ +- GdkWindow *window; +- gboolean in_fade = FALSE; +- GtkWidget *widget; +- +- widget = self->details->widget; +- +- if (!gtk_widget_get_realized (widget)) { +- return; +- } +- +- nemo_desktop_background_ensure_realized (self); +- window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); +- +- in_fade = fade_to_surface (self, window, +- self->details->background_surface); +- +- if (!in_fade) { +- cairo_pattern_t *pattern; +- +- pattern = cairo_pattern_create_for_surface (self->details->background_surface); +- gdk_window_set_background_pattern (window, pattern); +- cairo_pattern_destroy (pattern); +- +- gnome_bg_set_surface_as_root (gtk_widget_get_screen (widget), +- self->details->background_surface); +- } +-} +- +-static gboolean +-background_changed_cb (NemoDesktopBackground *self) +-{ +- self->details->change_idle_id = 0; +- +- nemo_desktop_background_unrealize (self); +- nemo_desktop_background_set_up_widget (self); +- +- gtk_widget_queue_draw (self->details->widget); +- +- return FALSE; +-} +- +-static void +-queue_background_change (NemoDesktopBackground *self) +-{ +- if (self->details->change_idle_id != 0) { +- g_source_remove (self->details->change_idle_id); +- } +- +- self->details->change_idle_id = +- g_idle_add ((GSourceFunc) background_changed_cb, self); +-} +- +-static void +-nemo_desktop_background_changed (GnomeBG *bg, +- gpointer user_data) +-{ +- NemoDesktopBackground *self; +- +- self = user_data; +- init_fade (self); +- queue_background_change (self); +-} +- +-static void +-nemo_desktop_background_transitioned (GnomeBG *bg, +- gpointer user_data) +-{ +- NemoDesktopBackground *self; +- +- self = user_data; +- free_fade (self); +- queue_background_change (self); +-} +- +-static void +-widget_realize_cb (GtkWidget *widget, +- gpointer user_data) +-{ +- GdkScreen *screen; +- NemoDesktopBackground *self = user_data; +- +- screen = gtk_widget_get_screen (widget); +- +- if (self->details->screen_size_handler > 0) { +- g_signal_handler_disconnect (screen, +- self->details->screen_size_handler); +- } +- self->details->screen_size_handler = +- g_signal_connect (screen, "size_changed", +- G_CALLBACK (screen_size_changed), self); +- +- if (self->details->screen_monitors_handler > 0) { +- g_signal_handler_disconnect (screen, +- self->details->screen_monitors_handler); +- } +- self->details->screen_monitors_handler = +- g_signal_connect (screen, "monitors-changed", +- G_CALLBACK (screen_size_changed), self); +- nemo_desktop_background_set_up_widget (self); +-} +- +-static void +-widget_unrealize_cb (GtkWidget *widget, +- gpointer user_data) +-{ +- NemoDesktopBackground *self = user_data; +- +- if (self->details->screen_size_handler > 0) { +- g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)), +- self->details->screen_size_handler); +- self->details->screen_size_handler = 0; +- } +- if (self->details->screen_monitors_handler > 0) { +- g_signal_handler_disconnect (gtk_widget_get_screen (GTK_WIDGET (widget)), +- self->details->screen_monitors_handler); +- self->details->screen_monitors_handler = 0; +- } +-} +- +-static void +-on_widget_destroyed (GtkWidget *widget, +- gpointer user_data) +-{ +- NemoDesktopBackground *self = user_data; +- +- if (self->details->change_idle_id != 0) { +- g_source_remove (self->details->change_idle_id); +- self->details->change_idle_id = 0; +- } +- +- free_fade (self); +- self->details->widget = NULL; +-} +- +-static gboolean +-background_change_event_idle_cb (NemoDesktopBackground *self) +-{ +- gnome_bg_load_from_preferences (self->details->bg, +- gnome_background_preferences); +- +- g_object_unref (self); +- +- return FALSE; +-} +- +-static gboolean +-background_settings_change_event_cb (GSettings *settings, +- gpointer keys, +- gint n_keys, +- gpointer user_data) +-{ +- NemoDesktopBackground *self = user_data; +- +- /* Need to defer signal processing otherwise +- * we would make the dconf backend deadlock. +- */ +- g_idle_add ((GSourceFunc) background_change_event_idle_cb, +- g_object_ref (self)); +- +- return FALSE; +-} +- +-static void +-nemo_desktop_background_constructed (GObject *obj) +-{ +- NemoDesktopBackground *self; +- GtkWidget *widget; +- +- self = NEMO_DESKTOP_BACKGROUND (obj); +- +- if (G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed != NULL) { +- G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructed (obj); +- } +- +- widget = self->details->widget; +- +- g_assert (widget != NULL); +- +- g_signal_connect_object (widget, "destroy", +- G_CALLBACK (on_widget_destroyed), self, 0); +- g_signal_connect_object (widget, "realize", +- G_CALLBACK (widget_realize_cb), self, 0); +- g_signal_connect_object (widget, "unrealize", +- G_CALLBACK (widget_unrealize_cb), self, 0); +- +- gnome_bg_load_from_preferences (self->details->bg, +- gnome_background_preferences); +- +- /* Let's receive batch change events instead of every single one */ +- g_signal_connect (gnome_background_preferences, +- "change-event", +- G_CALLBACK (background_settings_change_event_cb), +- self); +- +- queue_background_change (self); +-} +- +-static void +-nemo_desktop_background_set_property (GObject *object, +- guint property_id, +- const GValue *value, +- GParamSpec *pspec) +-{ +- NemoDesktopBackground *self; +- +- self = NEMO_DESKTOP_BACKGROUND (object); +- +- switch (property_id) { +- case PROP_WIDGET: +- self->details->widget = g_value_get_object (value); +- break; +- default: +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); +- break; +- } +-} +- +-static GObject * +-nemo_desktop_background_constructor (GType type, +- guint n_construct_params, +- GObjectConstructParam *construct_params) +-{ +- GObject *retval; +- +- if (singleton != NULL) { +- return g_object_ref (singleton); +- } +- +- retval = G_OBJECT_CLASS (nemo_desktop_background_parent_class)->constructor +- (type, n_construct_params, construct_params); +- +- singleton = NEMO_DESKTOP_BACKGROUND (retval); +- g_object_add_weak_pointer (retval, (gpointer) &singleton); +- +- return retval; +-} +- +-static void +-nemo_desktop_background_class_init (NemoDesktopBackgroundClass *klass) +-{ +- GObjectClass *object_class; +- GParamSpec *pspec; +- +- object_class = G_OBJECT_CLASS (klass); +- object_class->finalize = nemo_desktop_background_finalize; +- object_class->set_property = nemo_desktop_background_set_property; +- object_class->constructor = nemo_desktop_background_constructor; +- object_class->constructed = nemo_desktop_background_constructed; +- +- pspec = g_param_spec_object ("widget", "The widget for this background", +- "The widget that gets its background set", +- NEMO_TYPE_ICON_CONTAINER, +- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS); +- g_object_class_install_property (object_class, PROP_WIDGET, pspec); +- +- g_type_class_add_private (klass, sizeof (NemoDesktopBackgroundDetails)); +-} +- +-static void +-nemo_desktop_background_init (NemoDesktopBackground *self) +-{ +- self->details = +- G_TYPE_INSTANCE_GET_PRIVATE (self, +- NEMO_TYPE_DESKTOP_BACKGROUND, +- NemoDesktopBackgroundDetails); +- +- self->details->bg = gnome_bg_new (); +- self->details->default_color.red = 0xffff; +- self->details->default_color.green = 0xffff; +- self->details->default_color.blue = 0xffff; +- +- g_signal_connect (self->details->bg, "changed", +- G_CALLBACK (nemo_desktop_background_changed), self); +- g_signal_connect (self->details->bg, "transitioned", +- G_CALLBACK (nemo_desktop_background_transitioned), self); +-} +- +-NemoDesktopBackground * +-nemo_desktop_background_new (NemoIconContainer *container) +-{ +- return g_object_new (NEMO_TYPE_DESKTOP_BACKGROUND, +- "widget", container, +- NULL); +-} +diff --git a/libnemo-private/nemo-desktop-background.h b/libnemo-private/nemo-desktop-background.h +deleted file mode 100644 +index 8755cb1..0000000 +--- a/libnemo-private/nemo-desktop-background.h ++++ /dev/null +@@ -1,65 +0,0 @@ +-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */ +- +-/* +- * nemo-desktop-background.c: Helper object to handle desktop background +- * changes. +- * +- * Copyright (C) 2000 Eazel, Inc. +- * Copyright (C) 2010 Cosimo Cecchi +- * +- * 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., 51 Franklin Street - Suite 500, +- * Boston, MA 02110-1335, USA. +- * +- * Authors: Darin Adler +- * Cosimo Cecchi +- */ +- +-#ifndef __NAUTILIUS_DESKTOP_BACKGROUND_H__ +-#define __NAUTILIUS_DESKTOP_BACKGROUND_H__ +- +-#include +- +-#include "nemo-icon-container.h" +- +-typedef struct NemoDesktopBackground NemoDesktopBackground; +-typedef struct NemoDesktopBackgroundClass NemoDesktopBackgroundClass; +- +-#define NEMO_TYPE_DESKTOP_BACKGROUND nemo_desktop_background_get_type() +-#define NEMO_DESKTOP_BACKGROUND(obj) \ +- (G_TYPE_CHECK_INSTANCE_CAST ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackground)) +-#define NEMO_DESKTOP_BACKGROUND_CLASS(klass) \ +- (G_TYPE_CHECK_CLASS_CAST ((klass), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass)) +-#define NEMO_IS_DESKTOP_BACKGROUND(obj) \ +- (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NEMO_TYPE_DESKTOP_BACKGROUND)) +-#define NEMO_IS_DESKTOP_BACKGROUND_CLASS(klass) \ +- (G_TYPE_CHECK_CLASS_TYPE ((klass), NEMO_TYPE_DESKTOP_BACKGROUND)) +-#define NEMO_DESKTOP_BACKGROUND_GET_CLASS(obj) \ +- (G_TYPE_INSTANCE_GET_CLASS ((obj), NEMO_TYPE_DESKTOP_BACKGROUND, NemoDesktopBackgroundClass)) +- +-GType nemo_desktop_background_get_type (void); +-NemoDesktopBackground * nemo_desktop_background_new (NemoIconContainer *container); +- +-typedef struct NemoDesktopBackgroundDetails NemoDesktopBackgroundDetails; +- +-struct NemoDesktopBackground { +- GObject parent; +- NemoDesktopBackgroundDetails *details; +-}; +- +-struct NemoDesktopBackgroundClass { +- GObjectClass parent_class; +-}; +- +-#endif /* __NAUTILIUS_DESKTOP_BACKGROUND_H__ */ +diff --git a/src/nemo-desktop-icon-view.c b/src/nemo-desktop-icon-view.c +index 37cd8cb..5dec8b5 100644 +--- a/src/nemo-desktop-icon-view.c ++++ b/src/nemo-desktop-icon-view.c +@@ -41,7 +41,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -76,8 +75,6 @@ struct NemoDesktopIconViewDetails + gulong delayed_init_signal; + guint reload_desktop_timeout; + gboolean pending_rescan; +- +- NemoDesktopBackground *background; + }; + + static void default_zoom_level_changed (gpointer user_data); +@@ -240,12 +237,6 @@ struct NemoDesktopIconViewDetails + return GDK_FILTER_CONTINUE; + } + +-static void +-real_begin_loading (NemoView *object) +-{ +- NEMO_VIEW_CLASS (nemo_desktop_icon_view_parent_class)->begin_loading (object); +-} +- + static const char * + real_get_id (NemoView *view) + { +@@ -300,7 +291,6 @@ struct NemoDesktopIconViewDetails + + G_OBJECT_CLASS (class)->dispose = nemo_desktop_icon_view_dispose; + +- vclass->begin_loading = real_begin_loading; + vclass->merge_menus = real_merge_menus; + vclass->update_menus = real_update_menus; + vclass->get_view_id = real_get_id; +@@ -428,6 +418,17 @@ struct NemoDesktopIconViewDetails + desktop_icon_view); + } + ++static void ++desktop_icon_container_realize (GtkWidget *widget, ++ NemoDesktopIconView *desktop_icon_view) ++{ ++ GdkWindow *bin_window; ++ GdkRGBA transparent = { 0, 0, 0, 0 }; ++ ++ bin_window = gtk_layout_get_bin_window (GTK_LAYOUT (widget)); ++ gdk_window_set_background_rgba (bin_window, &transparent); ++} ++ + static NemoZoomLevel + get_default_zoom_level (void) + { +@@ -614,6 +615,8 @@ struct NemoDesktopIconViewDetails + + g_signal_connect_object (icon_container, "middle_click", + G_CALLBACK (nemo_desktop_icon_view_handle_middle_click), desktop_icon_view, 0); ++ g_signal_connect_object (icon_container, "realize", ++ G_CALLBACK (desktop_icon_container_realize), desktop_icon_view, 0); + g_signal_connect_object (desktop_icon_view, "realize", + G_CALLBACK (realized_callback), desktop_icon_view, 0); + g_signal_connect_object (desktop_icon_view, "unrealize", +@@ -637,9 +640,6 @@ struct NemoDesktopIconViewDetails + G_CALLBACK (nemo_view_update_menus), + desktop_icon_view); + +- GdkRGBA transparent = { 0, 0, 0, 0 }; +- gtk_widget_override_background_color (GTK_WIDGET (icon_container), GTK_STATE_FLAG_NORMAL, &transparent); +- + have_cinnamon_settings = g_find_program_in_path ("cinnamon-settings") != NULL; + } + +-- +1.8.1.5 + + +From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 15 Apr 2013 20:14:40 -0400 +Subject: [PATCH 3/4] Forgot an include + +--- + libnemo-private/nemo-icon-dnd.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/libnemo-private/nemo-icon-dnd.c b/libnemo-private/nemo-icon-dnd.c +index 017c6a7..2ed073c 100644 +--- a/libnemo-private/nemo-icon-dnd.c ++++ b/libnemo-private/nemo-icon-dnd.c +@@ -52,7 +52,6 @@ + #include + #include + +-#include + #include + #include + #include +-- +1.8.1.5 + + +From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Tue, 16 Apr 2013 18:00:01 -0400 +Subject: [PATCH 4/4] Change to use cinnamon background keys + +--- + libnemo-private/nemo-global-preferences.c | 2 +- + libnemo-private/nemo-global-preferences.h | 2 +- + src/nemo-places-sidebar.c | 2 +- + src/nemo-view.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c +index d3ad20a..336afc3 100644 +--- a/libnemo-private/nemo-global-preferences.c ++++ b/libnemo-private/nemo-global-preferences.c +@@ -76,7 +76,7 @@ + nemo_desktop_preferences = g_settings_new("org.nemo.desktop"); + nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); + gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); +- gnome_background_preferences = g_settings_new("org.gnome.desktop.background"); ++ cinnamon_background_preferences = g_settings_new("org.cinnamon.background"); + gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); + gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); + } +diff --git a/libnemo-private/nemo-global-preferences.h b/libnemo-private/nemo-global-preferences.h +index 2b9c56a..c1ec61a 100644 +--- a/libnemo-private/nemo-global-preferences.h ++++ b/libnemo-private/nemo-global-preferences.h +@@ -226,7 +226,7 @@ enum + GSettings *nemo_tree_sidebar_preferences; + GSettings *nemo_window_state; + GSettings *gnome_lockdown_preferences; +-GSettings *gnome_background_preferences; ++GSettings *cinnamon_background_preferences; + GSettings *gnome_media_handling_preferences; + GSettings *gnome_terminal_preferences; + +diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c +index a0bc4d4..ca32193 100644 +--- a/src/nemo-places-sidebar.c ++++ b/src/nemo-places-sidebar.c +@@ -3825,7 +3825,7 @@ static void expand_or_collapse_category (NemoPlacesSidebar *sidebar, + bookmarks_popup_menu_detach_cb, + sidebar); + +- g_signal_handlers_disconnect_by_func (gnome_background_preferences, ++ g_signal_handlers_disconnect_by_func (cinnamon_background_preferences, + desktop_setting_changed_callback, + sidebar); + +diff --git a/src/nemo-view.c b/src/nemo-view.c +index ab03b44..3ece32a 100644 +--- a/src/nemo-view.c ++++ b/src/nemo-view.c +@@ -6945,7 +6945,7 @@ static void slot_changed_pane (NemoWindowSlot *slot, + + uri = nemo_file_info_get_uri (file); + +- g_settings_set_string (gnome_background_preferences, ++ g_settings_set_string (cinnamon_background_preferences, + "picture-uri", uri); + g_free (uri); + } +-- +1.8.1.5 + diff --git a/community/nemo/tracker-0.16.patch b/community/nemo/tracker-0.16.patch new file mode 100644 index 000000000..49964678d --- /dev/null +++ b/community/nemo/tracker-0.16.patch @@ -0,0 +1,33 @@ +From 88459a57ac2fcf06400ade5c6d0189bf1aa2334d Mon Sep 17 00:00:00 2001 +From: Nick Black +Date: Fri, 12 Apr 2013 17:10:46 -0400 +Subject: [PATCH] build with tracker 0.16 + +--- + configure.in | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/configure.in b/configure.in +index ec72f73..21afbe4 100644 +--- a/configure.in ++++ b/configure.in +@@ -249,11 +249,13 @@ AC_ARG_ENABLE(tracker, + + build_tracker=no + if test "x$enable_tracker" != "xno"; then +- PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14, ++ PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.16, + [build_tracker=yes], +- [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12, ++ [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.14, ++ [build_tracker=yes], ++ [PKG_CHECK_MODULES(TRACKER, tracker-sparql-0.12, + [build_tracker=yes], +- [build_tracker=no])]) ++ [build_tracker=no])])]) + if test "x$build_tracker" = "xyes"; then + AC_DEFINE(ENABLE_TRACKER, 1, [Define to enable Tracker support]) + fi +-- +1.8.1.5 + diff --git a/community/nemo/use-terminal-config.patch b/community/nemo/use-terminal-config.patch deleted file mode 100644 index a6af75d48..000000000 --- a/community/nemo/use-terminal-config.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c ---- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.c 2013-02-19 17:30:18.000000000 +0100 -+++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.c 2013-03-04 04:05:13.472897136 +0100 -@@ -77,5 +77,6 @@ - nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); - gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); - gnome_background_preferences = g_settings_new("org.gnome.desktop.background"); -- gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); -+ gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); -+ gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); - } -diff -Naur linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h ---- linuxmint-nemo-63f7b44.orig/libnemo-private/nemo-global-preferences.h 2013-02-19 17:30:18.000000000 +0100 -+++ linuxmint-nemo-63f7b44/libnemo-private/nemo-global-preferences.h 2013-03-04 04:49:20.581767625 +0100 -@@ -211,6 +211,9 @@ - #define GNOME_DESKTOP_MEDIA_HANDLING_AUTOMOUNT_OPEN "automount-open" - #define GNOME_DESKTOP_MEDIA_HANDLING_AUTORUN "autorun-never" - -+/* Terminal */ -+#define GNOME_DESKTOP_TERMINAL_EXEC "exec" -+ - void nemo_global_preferences_init (void); - char *nemo_global_preferences_get_default_folder_viewer_preference_as_iid (void); - -@@ -224,6 +227,7 @@ - GSettings *gnome_lockdown_preferences; - GSettings *gnome_background_preferences; - GSettings *gnome_media_handling_preferences; -+GSettings *gnome_terminal_preferences; - - G_END_DECLS - -diff -Naur linuxmint-nemo-63f7b44.orig/src/nemo-view.c linuxmint-nemo-63f7b44/src/nemo-view.c ---- linuxmint-nemo-63f7b44.orig/src/nemo-view.c 2013-02-19 17:30:18.000000000 +0100 -+++ linuxmint-nemo-63f7b44/src/nemo-view.c 2013-03-04 04:14:47.222310992 +0100 -@@ -6716,7 +6716,8 @@ - open_in_terminal (gchar *location) - { - gchar *argv[2]; -- argv[0] = "x-terminal-emulator"; -+ argv[0] = g_settings_get_string (gnome_terminal_preferences, -+ GNOME_DESKTOP_TERMINAL_EXEC); - argv[1] = NULL; - g_spawn_async(location, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL); - } diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD index 7baeaa3d5..a94cee35b 100644 --- a/community/notion/PKGBUILD +++ b/community/notion/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81125 2012-12-12 00:49:36Z eric $ +# $Id: PKGBUILD 88793 2013-04-22 10:31:24Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com # Contributor: aunoor pkgname=notion -pkgver=20121114 +pkgver=20130422 pkgrel=1 pkgdesc="Tabbed tiling, window manager. Fork of Ion3" url="http://sourceforge.net/projects/notion/" @@ -16,51 +16,41 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr' 'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra') provides=('libtu' 'libextl') changelog=ChangleLog -_gitroots=("git://notion.git.sourceforge.net/gitroot/notion/notion" - "git://notion.git.sourceforge.net/gitroot/notion/libtu" - "git://notion.git.sourceforge.net/gitroot/notion/libextl" - "git://notion.git.sourceforge.net/gitroot/notion/notion-doc" - "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" - "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" - "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" - "git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux" - "git://notion.git.sourceforge.net/gitroot/notion/contrib") -md5sums=() -md5sums=() +source=("git://notion.git.sourceforge.net/gitroot/notion/notion" + "git://notion.git.sourceforge.net/gitroot/notion/libtu" + "git://notion.git.sourceforge.net/gitroot/notion/libextl" + "git://notion.git.sourceforge.net/gitroot/notion/notion-doc" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents" + "git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr" + "git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux" + "git://notion.git.sourceforge.net/gitroot/notion/contrib") +md5sums=('SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') build() { cd ${srcdir} - # git clone - for _gitroot in ${_gitroots[@]}; do - msg "Connecting to the git repository..." - _gitname=`basename ${_gitroot}` - if [ -d ${srcdir}/${_gitname} ]; then - pushd ${srcdir}/${_gitname} - git pull origin - popd - else - git clone --depth 1 ${_gitroot} - fi - msg "GIT checkout done or server timeout" - done - - # copy to notion-build - rm -rf ${srcdir}/notion-build - cp -r ${srcdir}/notion ${srcdir}/notion-build for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do - cp -r ${srcdir}/$i ${srcdir}/notion-build/ + cp -r ${srcdir}/$i ${srcdir}/notion/ done # build notion - cd ${srcdir}/notion-build + cd ${srcdir}/notion msg "Starting make..." sed -e 's/^\(PREFIX=\).*$/\1\/usr/' \ -e 's/^\(ETCDIR=\).*$/\1\/etc\/notion/' \ -e 's/^\(LUA_DIR=\).*$/\1\/usr/' \ -e 's/^\(X11_PREFIX=\).*/\1\/usr/' \ -i system-autodetect.mk - make INCLUDES=-I${srcdir}/notion-build + make INCLUDES=-I${srcdir}/notion # build doc and modules for i in mod_xinerama mod_xkbevents mod_xrandr; do @@ -71,7 +61,7 @@ build() { } package() { - cd ${srcdir}/notion-build + cd ${srcdir}/notion # notion make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion install diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index c196db66f..7726c625c 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 87716 2013-04-05 10:40:18Z spupykin $ +# $Id: PKGBUILD 88680 2013-04-21 22:16:49Z heftig $ # Maintainer: Sergej Pupykin # Maintainer : Ionut Biru # Contributor: Joeny Ang pkgname=shotwell pkgver=0.14.1 -pkgrel=1 +pkgrel=3 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('libgee' 'libwebkit3' 'libgexiv2' 'libraw' 'rest' +depends=('libgee06' 'libwebkit3' 'libgexiv2' 'libraw' 'rest' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib' 'gst-plugins-base' 'libgphoto2') makedepends=('intltool' 'vala>=0.17.2' 'libunique3') diff --git a/community/synapse/PKGBUILD b/community/synapse/PKGBUILD index c54dbcd3a..c6a3accf1 100644 --- a/community/synapse/PKGBUILD +++ b/community/synapse/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 81698 2012-12-27 01:23:31Z fyan $ +# $Id: PKGBUILD 88681 2013-04-21 22:16:50Z heftig $ # Maintainer: Felix Yan # Contributor: Alessio Sergi pkgname=synapse pkgver=0.2.10 -pkgrel=3 +pkgrel=5 pkgdesc="A semantic file launcher" arch=('i686' 'x86_64') url="https://launchpad.net/synapse-project" license=('GPL3') -depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee' 'libnotify' \ +depends=('gtkhotkey' 'hicolor-icon-theme' 'json-glib' 'libgee06' 'libnotify' \ 'libunique' 'libzeitgeist' 'rest' 'xdg-utils') makedepends=('intltool' 'vala') optdepends=('banshee: banshee plugin' 'bc: calculator plugin' 'devhelp: documentation plugin' 'gnome-screensaver: screensaver plugin' - 'gnome-utils: dictionary plugin' + 'gnome-dictionary: dictionary plugin' 'openssh: ssh plugin' 'pastebinit: pastebin plugin' 'rhythmbox: rhythmbox plugin' diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD index d3cbd7d1a..c1c9c1c7b 100644 --- a/community/ubuntuone-client-gnome/PKGBUILD +++ b/community/ubuntuone-client-gnome/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 87514 2013-04-02 00:47:12Z bgyorgy $ +# $Id: PKGBUILD 88682 2013-04-21 22:16:52Z heftig $ # Maintainer: Balló György pkgname=ubuntuone-client-gnome pkgver=4.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client-gnome" license=('GPL') depends=('nautilus' 'gconf' 'ubuntuone-client') makedepends=('intltool' 'gnome-settings-daemon') -optdepends=('gnome-settings-daemon: shows a warning when Ubuntu One runs out of space') options=('!libtool') install=$pkgname.install -source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef') +source=(https://launchpad.net/ubuntuone-client-gnome/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz + disable-gsd-plugin.patch) +md5sums=('e2f5e4ef6f4eca6ffcf838b3aa46c3ef' + 'e2b1b677844c3b61530f3653808b6644') build() { cd "$srcdir/$pkgname-$pkgver" + # Disable gsd plugin, as it's not compatible with gnome-settings-daemon 3.8 + patch -Np1 -i "$srcdir/disable-gsd-plugin.patch" + + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --disable-schemas-compile make diff --git a/community/ubuntuone-client-gnome/disable-gsd-plugin.patch b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch new file mode 100644 index 000000000..2199536e2 --- /dev/null +++ b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch @@ -0,0 +1,21 @@ +diff -Naur ubuntuone-client-gnome-4.2.0.orig/configure.ac ubuntuone-client-gnome-4.2.0/configure.ac +--- ubuntuone-client-gnome-4.2.0.orig/configure.ac 2013-03-26 20:48:40.000000000 +0100 ++++ ubuntuone-client-gnome-4.2.0/configure.ac 2013-04-09 22:26:38.135983473 +0200 +@@ -5,7 +5,7 @@ + AC_CONFIG_SRCDIR([config.h.in]) + + AM_INIT_AUTOMAKE([1.10 foreign]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + + m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + +diff -Naur ubuntuone-client-gnome-4.2.0.orig/Makefile.am ubuntuone-client-gnome-4.2.0/Makefile.am +--- ubuntuone-client-gnome-4.2.0.orig/Makefile.am 2013-03-21 18:13:58.000000000 +0100 ++++ ubuntuone-client-gnome-4.2.0/Makefile.am 2013-04-09 22:22:05.109626589 +0200 +@@ -1,4 +1,4 @@ +-SUBDIRS = gsd nautilus po ++SUBDIRS = nautilus po + + # Shut libtoolize up + ACLOCAL_AMFLAGS = -I m4 diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index dd6ecae95..4dba9fb7f 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88157 2013-04-12 15:58:47Z seblu $ +# $Id: PKGBUILD 88762 2013-04-22 09:40:39Z tpowa $ # Maintainer: Bartłomiej Piotrowski # Contributor: Ionut Biru # Contributor: Sébastien Luttringer @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') pkgver=4.2.12 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 3941dbe84..7d2e3f867 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88161 2013-04-12 16:17:46Z seblu $ +# $Id: PKGBUILD 88763 2013-04-22 09:42:07Z tpowa $ # Maintainer: Ionut Biru # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.12 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/xdebug/PKGBUILD b/community/xdebug/PKGBUILD index 505bd2f59..d35adfd72 100644 --- a/community/xdebug/PKGBUILD +++ b/community/xdebug/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88528 2013-04-19 10:32:46Z spupykin $ +# $Id: PKGBUILD 88795 2013-04-22 10:32:02Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jonathan Wiersma # Contributor: Jonathan Wiersma @@ -6,7 +6,7 @@ pkgname=xdebug pkgver=2.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="PHP debugging extension" arch=('i686' 'x86_64') url="http://www.xdebug.org" @@ -22,8 +22,6 @@ md5sums=('5687bca6270b9668721090d780c7c966' '68de800943369d4c76bdf7eb35c8463b') build() { - local PHPVER=`php -r 'echo phpversion();'` - cd $srcdir/$pkgname-$pkgver phpize ./configure --prefix=/usr --enable-xdebug @@ -35,12 +33,14 @@ build() { } package() { + local PHPVER=`php -r 'echo phpversion();'` + cd $srcdir/$pkgname-$pkgver/debugclient make DESTDIR=$pkgdir install cd $srcdir/$pkgname-$pkgver if [ "$PHPVER" \< "5.3.0" ] ; then - install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/xdebug.so + install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so install -D -m 644 $srcdir/xdebug-5.2.ini $pkgdir/etc/php/conf.d/xdebug.ini else install -D -m 744 modules/xdebug.so $pkgdir/usr/lib/php/modules/xdebug.so diff --git a/community/xsettings-client/PKGBUILD b/community/xsettings-client/PKGBUILD index afef330ad..d314d7aa4 100644 --- a/community/xsettings-client/PKGBUILD +++ b/community/xsettings-client/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 65273 2012-02-20 12:44:47Z spupykin $ +# $Id: PKGBUILD 88791 2013-04-22 10:19:12Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Alois Belaska @@ -11,12 +11,16 @@ license=('GPL') url="http://matchbox-project.org" depends=('libx11') options=('!libtool') -source=(http://matchbox-project.org/sources/optional-dependencies/Xsettings-client-$pkgver.tar.gz) +source=(http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-$pkgver.tar.gz) md5sums=('c14aa9db6c097e0306dac97fb7da1add') build() { cd $srcdir/Xsettings-client-$pkgver ./configure --prefix=/usr make +} + +package() { + cd $srcdir/Xsettings-client-$pkgver make DESTDIR=$pkgdir install } diff --git a/community/zeitgeist-datahub/PKGBUILD b/community/zeitgeist-datahub/PKGBUILD deleted file mode 100644 index 535899a65..000000000 --- a/community/zeitgeist-datahub/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 79124 2012-10-30 23:06:48Z heftig $ -# Maintainer: Balló György -# Contributor: Leontius Adhika Pradhana -# Contributor: Ner0 - -pkgname=zeitgeist-datahub -pkgver=0.9.5 -pkgrel=2 -pkgdesc="Provides passive plugins which insert events into Zeitgeist" -arch=('i686' 'x86_64') -url="https://launchpad.net/zeitgeist-datahub" -license=('GPL3') -depends=('libzeitgeist' 'json-glib' 'gtk2' 'telepathy-glib' 'zeitgeist') -makedepends=('intltool' 'vala') -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('b2b76b82b67363c45e5fe4f39a172775') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/core/dirmngr/PKGBUILD b/core/dirmngr/PKGBUILD index 40e0c74fc..1a623548b 100644 --- a/core/dirmngr/PKGBUILD +++ b/core/dirmngr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155870 2012-04-08 07:13:40Z tpowa $ +# $Id: PKGBUILD 183488 2013-04-22 09:10:15Z tpowa $ # Maintainer: Tobias Powalowski pkgname=dirmngr pkgver=1.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="A daemon to handle CRL and certificate requests" arch=('i686' 'x86_64') license=('GPL') diff --git a/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch new file mode 100644 index 000000000..b4ce93e83 --- /dev/null +++ b/core/glib2/0001-Make-gtester-report-work-with-Python-3.x.patch @@ -0,0 +1,60 @@ +From 3d81e0a414ecb876f2429c0108a685152bd4ee54 Mon Sep 17 00:00:00 2001 +From: Jan de Groot +Date: Thu, 21 Mar 2013 20:47:57 +0100 +Subject: [PATCH] Make gtester-report work with Python 3.x: - fix indentations + (tabs to spaces) - Replace print with print(), still works with Python 2.x + +--- + glib/gtester-report | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/glib/gtester-report b/glib/gtester-report +index 0fcdd9a..00296ea 100755 +--- a/glib/gtester-report ++++ b/glib/gtester-report +@@ -308,20 +308,20 @@ class HTMLReportWriter(ReportWriter): + if binary.success_cases: + oklink = 'href="javascript:toggle_display (\'ResultTable\', \'tr\', \'b%u_\', \'success\')"' % self.bcounter + if real_cases != 0: +- self.oprint ('ER\n' % erlink) +- self.oprint ('OK\n' % oklink) +- self.oprint ('\n') +- perc = binary.success_cases * 100.0 / real_cases +- pcolor = { +- 100 : 'bgcolor="lightgreen"', +- 0 : 'bgcolor="red"', +- }.get (int (perc), 'bgcolor="yellow"') +- self.oprint ('%.2f%%\n' % (pcolor, perc)) +- self.oprint ('\n') ++ self.oprint ('ER\n' % erlink) ++ self.oprint ('OK\n' % oklink) ++ self.oprint ('\n') ++ perc = binary.success_cases * 100.0 / real_cases ++ pcolor = { ++ 100 : 'bgcolor="lightgreen"', ++ 0 : 'bgcolor="red"', ++ }.get (int (perc), 'bgcolor="yellow"') ++ self.oprint ('%.2f%%\n' % (pcolor, perc)) ++ self.oprint ('\n') + else: +- self.oprint ('Empty\n') +- self.oprint ('\n') +- self.oprint ('\n') ++ self.oprint ('Empty\n') ++ self.oprint ('\n') ++ self.oprint ('\n') + for tc in binary.testcases: + self.handle_testcase (tc, binary) + def handle_totals (self): +@@ -466,7 +466,7 @@ def parse_opts(): + " Needs python-subunit]") + options, files = parser.parse_args() + if options.version: +- print parser.epilog ++ print(parser.epilog) + return None, None + if len(files) != 1: + parser.error("Must supply a log file to parse.") +-- +1.8.2 + diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 9a79b47ed..d277d9892 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 172097 2012-11-28 10:31:12Z jgc $ +# $Id: PKGBUILD 183313 2013-04-21 22:06:25Z heftig $ # Maintainer: Jan de Groot -pkgname=glib2 -pkgver=2.34.3 +pkgbase=glib2 +pkgname=(glib2 glib2-docs) +pkgver=2.36.1 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64) -license=('LGPL') -depends=('pcre' 'libffi') -makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml') -optdepends=('python2: for gdbus-codegen') -options=('!libtool' '!docs' '!emptydirs') +makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml' 'pcre' 'libffi' 'elfutils') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz revert-warn-glib-compile-schemas.patch) -sha256sums=('855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7' +sha256sums=('7de37586794e92c024feebe5d306bf5f245fef4803c3666af1ae8dac6ee10b24' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') build() { cd glib-$pkgver - patch -Rp1 -i "$srcdir/revert-warn-glib-compile-schemas.patch" + patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --libdir=/usr/lib \ --sysconfdir=/etc \ --with-pcre=system \ @@ -27,12 +24,40 @@ build() { make } -package() { +check() { + cd glib-$pkgver + #make -k check || : +} + +package_glib2() { + depends=('pcre' 'libffi') + optdepends=('python2: for gdbus-codegen and gtester-report' + 'elfutils: gresource inspection tool') + options=('!docs' '!libtool' '!emptydirs') + license=('LGPL') + cd glib-$pkgver make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install for _i in "$pkgdir/usr/share/bash-completion/completions/"*; do chmod -x "$_i" done - sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|" "$pkgdir"/usr/bin/gdbus-codegen + + # Our gdb does not ship the required python modules, so remove it + rm -rf "$pkgdir/usr/share/gdb/" +} + +package_glib2-docs() { + pkgdesc="Documentation for glib2" + conflicts=('gobject2-docs') + replaces=('gobject2-docs') + license=('custom') + options=('docs' '!emptydirs') + + cd glib-$pkgver/docs + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/glib2-docs" + install -m644 reference/COPYING "${pkgdir}/usr/share/licenses/glib2-docs/" + + rm -rf "${pkgdir}/usr/share/man" } diff --git a/core/gnupg/PKGBUILD b/core/gnupg/PKGBUILD index db0e5dd2e..31081061f 100644 --- a/core/gnupg/PKGBUILD +++ b/core/gnupg/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178149 2013-02-17 00:23:25Z bisson $ +# $Id: PKGBUILD 183489 2013-04-22 09:10:16Z tpowa $ # Maintainer: Gaetan Bisson # Contributor: Tobias Powalowski # Contributor: Andreas Radke @@ -6,7 +6,7 @@ pkgname=gnupg pkgver=2.0.19 -pkgrel=6 +pkgrel=7 pkgdesc='Complete and free implementation of the OpenPGP standard' url='http://www.gnupg.org/' license=('GPL') diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD index 2a97025bd..2893dac39 100644 --- a/core/gpgme/PKGBUILD +++ b/core/gpgme/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180087 2013-03-16 12:44:18Z tpowa $ +# $Id: PKGBUILD 183490 2013-04-22 09:10:17Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: Roman Kyrylych # Contributor: Sarah Hay pkgname=gpgme -pkgver=1.3.2 +pkgver=1.4.0 pkgrel=1 pkgdesc="A C wrapper library for GnuPG" arch=('i686' 'x86_64') @@ -14,12 +14,12 @@ depends=('libgpg-error' 'pth' 'gnupg>=2') install=${pkgname}.install options=('!libtool' '!emptydirs') source=(ftp://ftp.gnupg.org/gcrypt/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('326fe97077141713f0930aa87949a287' - '4849bea218571c5ab6094d77049bd5d7') +md5sums=('a0f93aba6d8a831ba14905085027f2f9' + 'SKIP') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --disable-gpgsm-test make } diff --git a/core/libksba/PKGBUILD b/core/libksba/PKGBUILD index 2d9c74a2d..e4378f847 100644 --- a/core/libksba/PKGBUILD +++ b/core/libksba/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177036 2013-02-05 00:36:51Z allan $ +# $Id: PKGBUILD 183487 2013-04-22 09:10:14Z tpowa $ # Maintainer: # Contributor: Damir Perisa pkgname=libksba -pkgver=1.2.0 -pkgrel=3 +pkgver=1.3.0 +pkgrel=1 pkgdesc="A CMS and X.509 access library" arch=(i686 x86_64) license=('GPL') @@ -29,4 +29,4 @@ package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install } -md5sums=('e797f370b69b4dc776499d6a071ae137') +md5sums=('cd86fad9c9d360b2cf80449f8a4a4075') diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD index c1d1daf32..fea42b7ac 100644 --- a/core/libusbx/PKGBUILD +++ b/core/libusbx/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 168151 2012-10-06 11:21:13Z tpowa $ +# $Id: PKGBUILD 183491 2013-04-22 09:10:18Z tpowa $ # Maintainer: Tobias Powalowski pkgname=libusbx -pkgver=1.0.14 +pkgver=1.0.15 pkgrel=1 depends=('glibc') pkgdesc="Library that provides generic access to USB device" @@ -13,7 +13,7 @@ options=(!libtool) replaces=('libusb1' 'libusb') provides=("libusb=$pkgver") conflicts=("libusb") -md5sums=('0a6a75edb4b4eae7dc82c1dd71ddc470') +md5sums=('0fa83bfd8845893b9b28a921297606d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 29693141f..ce3d5ac29 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182787 2013-04-15 10:15:37Z bluewind $ +# $Id: PKGBUILD 183473 2013-04-21 22:15:16Z bluewind $ # Maintainer: Florian Pritz # Contributor: Angel Velasquez # Contributor: kevin @@ -7,7 +7,7 @@ pkgname=perl pkgver=5.16.3 -pkgrel=2 +pkgrel=3 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -39,6 +39,9 @@ build() { patch -i "$srcdir/cgi-cr-escaping.diff" -p1 patch -i "$srcdir/CVE-2012-6329.patch" -p1 + # Fix FS#34531; in perl upstream >= 5.17.9 + sed -i "s/Is_dos/is_dos/" cpan/Pod-Perldoc/lib/Pod/Perldoc.pm + if [ "${CARCH}" = "x86_64" ]; then # for x86_64 arch_opts="-Dcccdlflags='-fPIC'" diff --git a/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch b/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch deleted file mode 100644 index c245ce1e2..000000000 --- a/core/systemd/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch +++ /dev/null @@ -1,167 +0,0 @@ -From d3b6d0c21ea5a0d15ec6dbd8b8d179138b7463bc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sat, 13 Apr 2013 20:22:53 -0400 -Subject: [PATCH] fileio: in envfiles, do not skip lines following empty lines - -https://bugs.freedesktop.org/show_bug.cgi?id=63477 ---- - src/binfmt/binfmt.c | 2 +- - src/journal/catalog.c | 2 +- - src/modules-load/modules-load.c | 2 +- - src/shared/conf-parser.c | 2 +- - src/shared/install.c | 2 +- - src/shared/util.h | 2 +- - src/sysctl/sysctl.c | 2 +- - src/test/test-unit-file.c | 31 +++++++++++++++++++++++++++++++ - 8 files changed, 38 insertions(+), 7 deletions(-) - -diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c -index 9ca1e60..5a42b3d 100644 ---- a/src/binfmt/binfmt.c -+++ b/src/binfmt/binfmt.c -@@ -110,7 +110,7 @@ static int apply_file(const char *path, bool ignore_enoent) { - p = strstrip(l); - if (!*p) - continue; -- if (strchr(COMMENTS, *p)) -+ if (strchr(COMMENTS "\n", *p)) - continue; - - k = apply_rule(p); -diff --git a/src/journal/catalog.c b/src/journal/catalog.c -index ebf0622..7681af6 100644 ---- a/src/journal/catalog.c -+++ b/src/journal/catalog.c -@@ -180,7 +180,7 @@ int catalog_import_file(Hashmap *h, struct strbuf *sb, const char *path) { - continue; - } - -- if (strchr(COMMENTS, line[0])) -+ if (strchr(COMMENTS "\n", line[0])) - continue; - - if (empty_line && -diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c -index 9ee2603..b3f7af0 100644 ---- a/src/modules-load/modules-load.c -+++ b/src/modules-load/modules-load.c -@@ -206,7 +206,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent - l = strstrip(line); - if (!*l) - continue; -- if (strchr(COMMENTS, *l)) -+ if (strchr(COMMENTS "\n", *l)) - continue; - - k = load_module(ctx, l); -diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index fbacf98..fea2e56 100644 ---- a/src/shared/conf-parser.c -+++ b/src/shared/conf-parser.c -@@ -174,7 +174,7 @@ static int parse_line( - if (!*l) - return 0; - -- if (strchr(COMMENTS, *l)) -+ if (strchr(COMMENTS "\n", *l)) - return 0; - - if (startswith(l, ".include ")) { -diff --git a/src/shared/install.c b/src/shared/install.c -index f9d223e..71e0433 100644 ---- a/src/shared/install.c -+++ b/src/shared/install.c -@@ -1699,7 +1699,7 @@ int unit_file_query_preset(UnitFileScope scope, const char *name) { - if (!*l) - continue; - -- if (strchr(COMMENTS, *l)) -+ if (strchr(COMMENTS "\n", *l)) - continue; - - if (first_word(l, "enable")) { -diff --git a/src/shared/util.h b/src/shared/util.h -index 99ec0a3..ad97536 100644 ---- a/src/shared/util.h -+++ b/src/shared/util.h -@@ -52,7 +52,7 @@ union dirent_storage { - #define WHITESPACE " \t\n\r" - #define NEWLINE "\n\r" - #define QUOTES "\"\'" --#define COMMENTS "#;\n" -+#define COMMENTS "#;" - - #define FORMAT_BYTES_MAX 8 - -diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c -index e0ba78a..db18dd9 100644 ---- a/src/sysctl/sysctl.c -+++ b/src/sysctl/sysctl.c -@@ -149,7 +149,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno - if (!*p) - continue; - -- if (strchr(COMMENTS, *p)) -+ if (strchr(COMMENTS "\n", *p)) - continue; - - value = strchr(p, '='); -diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c -index 3cf8463..1bf11e6 100644 ---- a/src/test/test-unit-file.c -+++ b/src/test/test-unit-file.c -@@ -199,6 +199,17 @@ static void test_config_parse_exec(void) { - "#--nouser-config \\\n" \ - "normal=line" - -+#define env_file_4 \ -+ "# Generated\n" \ -+ "\n" \ -+ "HWMON_MODULES=\"coretemp f71882fg\"\n" \ -+ "\n" \ -+ "# For compatibility reasons\n" \ -+ "\n" \ -+ "MODULE_0=coretemp\n" \ -+ "MODULE_1=f71882fg" -+ -+ - static void test_load_env_file_1(void) { - char _cleanup_strv_free_ **data = NULL; - int r; -@@ -251,6 +262,25 @@ static void test_load_env_file_3(void) { - unlink(name); - } - -+static void test_load_env_file_4(void) { -+ char _cleanup_strv_free_ **data = NULL; -+ int r; -+ -+ char name[] = "/tmp/test-load-env-file.XXXXXX"; -+ int _cleanup_close_ fd = mkstemp(name); -+ assert(fd >= 0); -+ assert_se(write(fd, env_file_4, sizeof(env_file_4)) == sizeof(env_file_4)); -+ -+ r = load_env_file(name, NULL, &data); -+ assert(r == 0); -+ assert(streq(data[0], "HWMON_MODULES=coretemp f71882fg")); -+ assert(streq(data[1], "MODULE_0=coretemp")); -+ assert(streq(data[2], "MODULE_1=f71882fg")); -+ assert(data[3] == NULL); -+ unlink(name); -+} -+ -+ - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wnonnull" - -@@ -327,6 +357,7 @@ int main(int argc, char *argv[]) { - test_load_env_file_1(); - test_load_env_file_2(); - test_load_env_file_3(); -+ test_load_env_file_4(); - test_install_printf(); - - return 0; --- -1.8.2.1 - diff --git a/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch b/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch deleted file mode 100644 index 19edce5f4..000000000 --- a/core/systemd/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d378991747d67fff1d4dc39e7fb2bc8f49f1b561 Mon Sep 17 00:00:00 2001 -From: Mirco Tischler -Date: Sat, 13 Apr 2013 01:03:49 +0200 -Subject: [PATCH] journal: fix broken tags _SOURCE_REALTIME_TIMESTAMP and - _MACHINE_ID - ---- - src/journal/journald-server.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 53e3830..be84323 100644 ---- a/src/journal/journald-server.c -+++ b/src/journal/journald-server.c -@@ -538,7 +538,7 @@ static void dispatch_message_real( - char pid[sizeof("_PID=") + DECIMAL_STR_MAX(ucred->pid)], - uid[sizeof("_UID=") + DECIMAL_STR_MAX(ucred->uid)], - gid[sizeof("_GID=") + DECIMAL_STR_MAX(ucred->gid)], -- source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=" + DECIMAL_STR_MAX(usec_t))], -+ source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)], - boot_id[sizeof("_BOOT_ID=") + 32] = "_BOOT_ID=", - machine_id[sizeof("_MACHINE_ID=") + 32] = "_MACHINE_ID="; - -@@ -699,7 +699,7 @@ static void dispatch_message_real( - - r = sd_id128_get_machine(&id); - if (r >= 0) { -- sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID") - 1); -+ sd_id128_to_string(id, machine_id + sizeof("_MACHINE_ID=") - 1); - IOVEC_SET_STRING(iovec[n++], machine_id); - } - --- -1.8.2.1 - diff --git a/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch b/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch deleted file mode 100644 index 9cac29b77..000000000 --- a/core/systemd/0001-logind-avoid-creating-stale-session-state-files.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 50fb97935d689a520251b2d543599be14bdfd0ed Mon Sep 17 00:00:00 2001 -From: Fedora systemd team -Date: Wed, 10 Apr 2013 09:49:24 +0200 -Subject: [PATCH] logind: avoid creating stale session state files - -There were old session state files accumulating in /run/systemd/session. -They confused e.g. "reboot", which thought there were still users logged -in. The files got created like this: - -session_stop(Session *s) -> - ... - unlink(s->state_file); - ... - seat_set_active(s->seat, NULL) -> - session_save(...); /* re-creates the state file we just - unlinked */ - -Fix it simply by clearing the s->started flag earlier to prevent -any further writes of the state file (session_save() checks the flag). ---- - src/login/logind-session.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/login/logind-session.c b/src/login/logind-session.c -index 508336d..e2f41d3 100644 ---- a/src/login/logind-session.c -+++ b/src/login/logind-session.c -@@ -710,6 +710,8 @@ int session_stop(Session *s) { - if (s->started) - session_send_signal(s, false); - -+ s->started = false; -+ - if (s->seat) { - if (s->seat->active == s) - seat_set_active(s->seat, NULL); -@@ -721,8 +723,6 @@ int session_stop(Session *s) { - user_send_changed(s->user, "Sessions\0"); - user_save(s->user); - -- s->started = false; -- - return r; - } - --- -1.8.2.1 - diff --git a/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch b/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch new file mode 100644 index 000000000..24dd6d766 --- /dev/null +++ b/core/systemd/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch @@ -0,0 +1,36 @@ +From 1e335af70f29d1a1e9c132338aa35b8971934441 Mon Sep 17 00:00:00 2001 +From: Dave Reisner +Date: Fri, 19 Apr 2013 16:31:25 -0400 +Subject: [PATCH] nss-myhostname: ensure that glibc's assert is used + +--- + src/nss-myhostname/nss-myhostname.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c +index 16ccb3e..8699098 100644 +--- a/src/nss-myhostname/nss-myhostname.c ++++ b/src/nss-myhostname/nss-myhostname.c +@@ -25,7 +25,6 @@ + #include + #include + #include +-#include + #include + #include + #include +@@ -35,6 +34,11 @@ + #include "macro.h" + #include "util.h" + ++/* Ensure that glibc's assert is used. We cannot use assert from macro.h, as ++ * libnss_myhostname will be linked into arbitrary programs which will, in turn ++ * attempt to write to the journal via log_dispatch() */ ++#include ++ + /* We use 127.0.0.2 as IPv4 address. This has the advantage over + * 127.0.0.1 that it can be translated back to the local hostname. For + * IPv6 we use ::1 which unfortunately will not translate back to the +-- +1.8.2.1 + diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 360aec4fd..9ba7c9f71 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,7 +3,7 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=201 +pkgver=202 pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" @@ -16,17 +16,13 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' - '0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch' - '0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch' - '0001-logind-avoid-creating-stale-session-state-files.patch' + '0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch' 'use-split-usr-path.patch') -md5sums=('3e758392ff0e9206b3f7ee252b4a654b' +md5sums=('3136c6912d3ee1f6d4deb16234783731' 'e99e9189aa2f6084ac28b8ddf605aeb8' 'fb37e34ea006c79be1c54cbb0f803414' 'df69615503ad293c9ddf9d8b7755282d' - 'd575a29ca735944aa45126ab9d3087a5' - '8170482f10bb0420770a64dce23975bc' - 'b1355aae98071e83fca27549a0ac3def' + '3090c0b9b19b76731b4cf9c01c10c534' '76bf83fe34c5b40533abc5dc940576a6') prepare() { @@ -35,9 +31,7 @@ prepare() { # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - patch -Np1 <"$srcdir/0001-fileio-in-envfiles-do-not-skip-lines-following-empty.patch" - patch -Np1 <"$srcdir/0001-journal-fix-broken-tags-_SOURCE_REALTIME_TIMESTAMP-a.patch" - patch -Np1 <"$srcdir/0001-logind-avoid-creating-stale-session-state-files.patch" + patch -Np1 <"$srcdir/0001-nss-myhostname-ensure-that-glibc-s-assert-is-used.patch" } build() { @@ -67,7 +61,9 @@ package_systemd() { pkgdesc="system and service manager" depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'pam' 'util-linux' 'xz') - provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver") + provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" + 'libgudev-1.0.so' 'libsystemd-daemon.so' 'libsystemd-id128.so' + 'libsystemd-journal.so' 'libsystemd-login.so' 'libudev.so') replaces=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') conflicts=('libsystemd' 'nss-myhostname' 'systemd-tools' 'udev') optdepends=('cryptsetup: required for encrypted block devices' diff --git a/extra/anjuta-extras/PKGBUILD b/extra/anjuta-extras/PKGBUILD index 4a3a1bc49..ebcdc4acd 100644 --- a/extra/anjuta-extras/PKGBUILD +++ b/extra/anjuta-extras/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169845 2012-10-30 22:23:48Z heftig $ +# $Id: PKGBUILD 183329 2013-04-21 22:08:26Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=anjuta-extras -pkgver=3.6.0 +pkgver=3.8.0 pkgrel=1 pkgdesc="Anjuta Integrated Development Environment extra plugins" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ install=anjuta-extras.install url="http://www.anjuta.org/" source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('69df64e6e13a6e0683ebaee5a26ee9b9368eda9ed157607d1e6935b52d7f0b9c') +sha256sums=('115c2f51017aa51edc6bfc7a2d2084e26b29d3df353ed2a92e40f9e3ae28a761') build() { cd $pkgname-$pkgver diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD index b84a86c2c..e9e5fadfb 100644 --- a/extra/anjuta/PKGBUILD +++ b/extra/anjuta/PKGBUILD @@ -1,30 +1,42 @@ -# $Id: PKGBUILD 180677 2013-03-25 19:13:50Z bpiotrowski $ +# $Id: PKGBUILD 183314 2013-04-21 22:06:32Z heftig $ # Maintainer: Andreas Radke # Contributor: Harley Laue pkgbase=anjuta pkgname=('libanjuta' 'anjuta') -pkgver=3.6.2 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 pkgdesc="GNOME Integrated Development Environment (IDE)" -arch=('i686' 'x86_64') -license=('GPL') -makedepends=('vte3' 'gdl' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf' 'gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool') +arch=(i686 x86_64) +license=(GPL) +makedepends=(gdl vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf + gtk-doc yelp-tools gnome-common intltool gobject-introspection itstool gjs + python) url="http://www.anjuta.org/" -source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) options=('!libtool' '!emptydirs') -sha256sums=('2cf44120dcf22c4f4f25bbc65d3641c206e627776ab0f3a37ff0059844d581a2') +source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + fix-compile-error.patch anjuta-glade.xml.diff) +sha256sums=('ef5d8a5032d4c2025e1870bef044fa025f01096a86f8f226eb178688a960c5b9' + 'd072af4c1c52ce65f84026b83baa642a9bcfa06b10913b356b5cd99d98931b1d' + 'e480c41a92198c9158f7d66f248b83464e6d0745d5756dae581b204d5439cc4d') build() { cd "$pkgbase-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var + + patch -Np1 -i ../fix-compile-error.patch + patch -Np1 -i ../anjuta-glade.xml.diff + + # Bump vala version + sed -i '/vala/s/-0\.18/-0.20/' configure.ac + + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --enable-glade-catalog --enable-compile-warnings=minimum make } package_libanjuta(){ pkgdesc="Anjuta runtime library" - depends=('gdl') + depends=(gdl) conflicts=('anjuta<3.4.4') cd "$pkgbase-$pkgver/libanjuta" @@ -35,7 +47,8 @@ package_libanjuta(){ package_anjuta(){ pkgdesc="GNOME Integrated Development Environment (IDE)" - depends=('libanjuta' 'vte3' 'autogen' 'devhelp' 'glade' 'libgda' 'subversion' 'gnome-icon-theme' 'vala' 'dconf') + depends=(libanjuta vte3 autogen devhelp glade libgda subversion gnome-icon-theme vala dconf) + groups=('gnome-extra') install=anjuta.install @@ -44,7 +57,4 @@ package_anjuta(){ cd libanjuta make -j1 DESTDIR="$pkgdir" uninstall - - sed -i "1s|#!/usr/bin/python$|&2|" \ - $pkgdir/usr/share/anjuta/project/{pygtk,python}/src/main.py } diff --git a/extra/anjuta/anjuta-glade.xml.diff b/extra/anjuta/anjuta-glade.xml.diff new file mode 100644 index 000000000..a33c530e5 --- /dev/null +++ b/extra/anjuta/anjuta-glade.xml.diff @@ -0,0 +1,101 @@ +diff -u -rN anjuta-3.8.1/libanjuta/anjuta-glade.xml anjuta-3.8.0/libanjuta/anjuta-glade.xml +--- anjuta-3.8.1/libanjuta/anjuta-glade.xml 1970-01-01 01:00:00.000000000 +0100 ++++ anjuta-3.8.0/libanjuta/anjuta-glade.xml 2012-09-26 22:53:46.000000000 +0200 +@@ -0,0 +1,97 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/extra/anjuta/fix-compile-error.patch b/extra/anjuta/fix-compile-error.patch new file mode 100644 index 000000000..bc8fa7c41 --- /dev/null +++ b/extra/anjuta/fix-compile-error.patch @@ -0,0 +1,24 @@ +diff -u -r anjuta-3.8.0/libanjuta/anjuta-token.c anjuta-3.8.0-fix/libanjuta/anjuta-token.c +--- anjuta-3.8.0/libanjuta/anjuta-token.c 2013-01-14 22:45:09.000000000 +0100 ++++ anjuta-3.8.0-fix/libanjuta/anjuta-token.c 2013-03-31 13:56:11.722332230 +0200 +@@ -329,7 +329,7 @@ + if (string == NULL) + { + /* Value doesn't contain a newline */ +- fprintf (stderr, "(%lu)", length); ++ fprintf (stderr, "(%lu)", (long unsigned)length); + } + else + { +diff -u -r anjuta-3.8.0/plugins/dir-project/dir-project.c anjuta-3.8.0-fix/plugins/dir-project/dir-project.c +--- anjuta-3.8.0/plugins/dir-project/dir-project.c 2012-11-19 00:34:57.000000000 +0100 ++++ anjuta-3.8.0-fix/plugins/dir-project/dir-project.c 2013-03-31 13:55:35.922610895 +0200 +@@ -268,7 +268,7 @@ + { + ptr++; + } while (*ptr == '?'); +- g_string_append_printf (regex, "(.{%d})", ptr - next); ++ g_string_append_printf (regex, "(.{%ld})", (long)(ptr - next)); + } + else if (*ptr == '\\') + { diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD index ca6c85c99..520ac9876 100644 --- a/extra/at-spi2-atk/PKGBUILD +++ b/extra/at-spi2-atk/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 170879 2012-11-12 21:34:54Z heftig $ +# $Id: PKGBUILD 183331 2013-04-21 22:08:29Z heftig $ # Maintainer: Ionut Biru pkgname=at-spi2-atk -pkgver=2.6.2 +pkgver=2.8.1 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') url="http://www.gnome.org" license=('GPL2') -depends=('at-spi2-core' 'libx11' 'atk' 'dconf') +depends=('at-spi2-core' 'libx11' 'atk') makedepends=('intltool') -install=at-spi2-atk.install options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('496c8432e8ab82735145f9af5d45209e9b708bf3c94e527ee091d08641a9bcfa') +sha256sums=('eb659b94fde6dc0a2f584c9121a5e6d39a4c8aa297d21d8f9032f7a8a775fd06') build() { cd $pkgname-$pkgver diff --git a/extra/at-spi2-atk/at-spi2-atk.install b/extra/at-spi2-atk/at-spi2-atk.install deleted file mode 100644 index 2ef26aaa9..000000000 --- a/extra/at-spi2-atk/at-spi2-atk.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD index 61e23ebaf..dbbdd3d22 100644 --- a/extra/at-spi2-core/PKGBUILD +++ b/extra/at-spi2-core/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 173097 2012-12-10 22:25:55Z heftig $ +# $Id: PKGBUILD 183332 2013-04-21 22:08:31Z heftig $ # Maintainer: Ionut Biru pkgname=at-spi2-core -pkgver=2.6.3 +pkgver=2.8.0 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') url="http://www.gnome.org" license=('GPL2') -depends=('dbus-core' 'glib2' 'libxtst') +depends=('dbus' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('fc4487ae46e847cfd057b329b852cf99923772ecd2ddc29f29670c9f2b15d0ea') +sha256sums=('1861a30fc7f583d5a567a0ba547db67ce9bd294f0d1c9f7403c96a10a481c458') build() { cd $pkgname-$pkgver diff --git a/extra/atk/PKGBUILD b/extra/atk/PKGBUILD index a59f6258f..969a1cfb1 100644 --- a/extra/atk/PKGBUILD +++ b/extra/atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169846 2012-10-30 22:23:52Z heftig $ +# $Id: PKGBUILD 183330 2013-04-21 22:08:28Z heftig $ # Maintainer: Jan de Groot pkgname=atk -pkgver=2.6.0 +pkgver=2.8.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) url='http://www.gtk.org/' -sha256sums=('eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f') +sha256sums=('b22519176226f3e07cf6d932b77852e6b6be4780977770704b32d0f4e0686df4') build() { cd "$pkgname-$pkgver" diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD index f9d035aa2..342f9ccfb 100644 --- a/extra/baobab/PKGBUILD +++ b/extra/baobab/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 175196 2013-01-16 11:12:55Z jgc $ +# $Id: PKGBUILD 183333 2013-04-21 22:08:32Z heftig $ # Maintainer: Ionut Biru pkgname=baobab -pkgver=3.6.4 +pkgver=3.8.1 pkgrel=1 pkgdesc="A graphical directory tree analyzer" arch=(i686 x86_64) @@ -10,10 +10,10 @@ url="http://gnome.org" license=('GPL2') depends=('dconf' 'gtk3' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection') -groups=('gnome-extra') +groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e5539558ef3411e14cb165a3e77f2d0451e984722a71a7a7d0f72fe29360cb2e') +sha256sums=('740c123cbc49f0e479a9c67d7cc7a6330b2a9d3e6a7ffde55665a1130d9209bb') build() { cd "$pkgname-$pkgver" diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD new file mode 100644 index 000000000..3deecf27b --- /dev/null +++ b/extra/bijiben/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 183334 2013-04-21 22:08:33Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=bijiben +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Write out notes, every detail matters" +arch=(i686 x86_64) +url="https://live.gnome.org/Bijiben" +license=(GPL) +depends=(libtracker-sparql clutter-gtk libzeitgeist webkitgtk3 hicolor-icon-theme desktop-file-utils) +makedepends=(intltool itstool) +options=(!emptydirs) +install=bijiben.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('a0965874c68ca8492dcffc25cbf6f51549ff4a005c1fa1d87a1d82021aae7908') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/bijiben/bijiben.install b/extra/bijiben/bijiben.install new file mode 100644 index 000000000..8b17fa3d4 --- /dev/null +++ b/extra/bijiben/bijiben.install @@ -0,0 +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 +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD index 5d6c62f84..b96d207bc 100644 --- a/extra/brasero/PKGBUILD +++ b/extra/brasero/PKGBUILD @@ -1,32 +1,35 @@ -# $Id: PKGBUILD 180254 2013-03-18 23:32:28Z jgc $ +# $Id: PKGBUILD 183335 2013-04-21 22:08:35Z heftig $ # Maintainer: Allan McRae # Maintainer: Jan de Groot # Contributor: William Rea pkgname=brasero -pkgver=3.6.1 +pkgver=3.8.0 pkgrel=2 pkgdesc="A disc burning application for Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/brasero" license=('GPL') options=('!libtool' '!emptydirs') -depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql') -makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl') +depends=('gtk3' 'gst-plugins-good' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm' 'libtracker-sparql' 'libnotify') +makedepends=('gtk-doc' 'yelp-tools' 'gnome-common' 'intltool' 'libburn' 'libisofs' 'libnautilus-extension' 'gobject-introspection' 'gconf' 'itstool' 'docbook-xsl') optdepends=('libburn: alternative back-end' 'libisofs: libburn back-end' 'dvdauthor: video project' 'vcdimager: video project') replaces=('nautilus-cd-burner') install=brasero.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - use-mpegaudioparse.patch) -sha256sums=('d293eb28dc45af3535f09cf91aa6ccc523f3f3d8b7ad3339b5e79b4acc19b932' - 'c75331d130c248edeaa68211cf96f386d86905510d09b104e4e0cd0ff4c92218') +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4') build() { cd "$pkgname-$pkgver" - patch -Np1 -i ../use-mpegaudioparse.patch + + # Update tracker dep + sed -i '/tracker/s/0\.14/0.16/' configure.ac + autoreconf -f -v -i + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-caches \ --disable-schemas-compile diff --git a/extra/brasero/use-mpegaudioparse.patch b/extra/brasero/use-mpegaudioparse.patch deleted file mode 100644 index 79c24d6a8..000000000 --- a/extra/brasero/use-mpegaudioparse.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 895777890485428a23f2e0da0e8ccd2edf624f6e Mon Sep 17 00:00:00 2001 -From: Jeremy Bicha -Date: Fri, 25 Jan 2013 03:26:10 +0000 -Subject: use mpegaudioparse gstreamer plugin instead of mp3parse - -Fix "not suitable for audio or video media" error when -attempting to create a mp3 audio project -The plugin was basically renamed for gstreamer 1.0. -Thanks tuxor for identifying the problem! - -https://bugzilla.gnome.org/show_bug.cgi?id=687886 ---- -diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c -index 1088121..7f10088 100644 ---- a/libbrasero-utils/brasero-metadata.c -+++ b/libbrasero-utils/brasero-metadata.c -@@ -1200,12 +1200,12 @@ brasero_metadata_create_mp3_pipeline (BraseroMetadata *self) - } - gst_bin_add (GST_BIN (priv->pipeline_mp3), source); - -- parse = gst_element_factory_make ("mp3parse", NULL); -+ parse = gst_element_factory_make ("mpegaudioparse", NULL); - if (!parse) { - priv->error = g_error_new (BRASERO_UTILS_ERROR, - BRASERO_UTILS_ERROR_GENERAL, - _("%s element could not be created"), -- "\"mp3parse\""); -+ "\"mpegaudioparse\""); - - g_object_unref (priv->pipeline_mp3); - priv->pipeline_mp3 = NULL; -diff --git a/plugins/transcode/burn-transcode.c b/plugins/transcode/burn-transcode.c -index a6a0f40..6861168 100644 ---- a/plugins/transcode/burn-transcode.c -+++ b/plugins/transcode/burn-transcode.c -@@ -284,13 +284,13 @@ brasero_transcode_create_pipeline_size_mp3 (BraseroTranscode *transcode, - - BRASERO_JOB_LOG (transcode, "Creating specific pipeline for MP3s"); - -- parse = gst_element_factory_make ("mp3parse", NULL); -+ parse = gst_element_factory_make ("mpegaudioparse", NULL); - if (!parse) { - g_set_error (error, - BRASERO_BURN_ERROR, - BRASERO_BURN_ERROR_GENERAL, - _("%s element could not be created"), -- "\"Mp3parse\""); -+ "\"mpegaudioparse\""); - g_object_unref (pipeline); - return FALSE; - } --- -cgit v0.9.1 diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index 1405c33f0..c86f5b324 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,49 +1,41 @@ -# $Id: PKGBUILD 180801 2013-03-26 11:49:28Z foutrelis $ +# $Id: PKGBUILD 183336 2013-04-21 22:08:36Z heftig $ # Maintainer: # Contributor: Jan de Groot # Contributor: Giovanni Scafora pkgname=brltty -pkgver=4.4 -pkgrel=4 +pkgver=4.5 +pkgrel=1 pkgdesc="Braille display driver for Linux/Unix" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://mielke.cc/brltty" -license=('GPL' 'LGPL') -depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=51.1' 'tcl' 'atk' 'pyrex') -makedepends=('bluez') +license=(GPL LGPL) +depends=(libxaw at-spi2-core gpm 'icu>=51.1' tcl atk cython) +makedepends=(bluez) optdepends=('bluez: bluetooth support') -backup=(etc/brltty.conf etc/conf.d/brltty.conf) -options=('!makeflags' '!emptydirs') +backup=(etc/brltty.conf) +options=('!emptydirs') install=brltty.install source=(http://mielke.cc/$pkgname/releases/$pkgname-$pkgver.tar.gz - 'brltty' - 'brltty.conf' - 'brltty.service') -md5sums=('8ebe96efe679f5f6ccff08928fec5b26' - '831ebaf0c56091702929c68805d20c4f' - 'a8ab8b3dd059e96e1734bc9cdcf844fc' + brltty.service) +md5sums=('7b52fa7746fed41ed344a1f75ce55951' '7acecd700b9f94d76fe4a6ad56cb0448') build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|/usr/bin/python|/usr/bin/python2|' Tables/latex-access.ctb - ./configure --prefix=/usr \ - --sysconfdir=/etc \ + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --mandir=/usr/share/man \ - --localstatedir=/var \ + --with-tables-directory=/usr/share/brltty \ --with-screen-driver=a2 \ --enable-gpm \ --disable-java-bindings \ - PYTHON=/usr/bin/python2 + --disable-static make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make INSTALL_ROOT="$pkgdir" install - install -D -m755 "$srcdir/brltty" "$pkgdir/etc/rc.d/brltty" - install -D -m644 "$srcdir/brltty.conf" "$pkgdir/etc/conf.d/brltty.conf" - install -D -m644 Documents/brltty.conf "$pkgdir/etc/brltty.conf" - install -D -m644 "$srcdir/brltty.service" "$pkgdir/usr/lib/systemd/system/brltty.service" + install -Dm644 Documents/brltty.conf "$pkgdir/etc/brltty.conf" + install -Dm644 ../brltty.service "$pkgdir/usr/lib/systemd/system/brltty.service" } diff --git a/extra/brltty/brltty b/extra/brltty/brltty deleted file mode 100755 index 5ed21a52d..000000000 --- a/extra/brltty/brltty +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -daemon_name=brltty - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name $brltty_args - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/extra/brltty/brltty.conf b/extra/brltty/brltty.conf deleted file mode 100644 index 94115e1d5..000000000 --- a/extra/brltty/brltty.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Specify any arguments to pass to brltty here. -brltty_args="" \ No newline at end of file diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD index 8a7abfab6..fec6a9ddc 100644 --- a/extra/caribou/PKGBUILD +++ b/extra/caribou/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 170864 2012-11-12 20:12:13Z heftig $ +# $Id: PKGBUILD 183337 2013-04-21 22:08:38Z heftig $ # Maintainer : Ionut Biru # Contributor: Adam Hani Schakaki pkgname=caribou -pkgver=0.4.4.2 +pkgver=0.4.10 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') url="http://live.gnome.org/Caribou" -license=('LGPL') -depends=('at-spi2-atk' 'pyatspi' 'python2-gobject' 'gtk3' 'libxklavier' 'libgee' 'clutter' 'dconf') -makedepends=('intltool' 'docbook-xsl') +license=(LGPL) +depends=(at-spi2-atk python2-atspi python2-gobject gtk3 libxklavier libgee clutter dconf) +makedepends=(intltool docbook-xsl gtk2) install=caribou.install options=(!libtool !emptydirs) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz) -sha256sums=('22fba681b3e6041494ac4fa41b8286957bade0cc6158c110fe8f3c980af6913d') +sha256sums=('6480ce3a87cf4f01dd1fb52edbb31a2aa9f5573a0860b67115c86bbcd7b17865') build() { cd $pkgname-$pkgver @@ -28,6 +28,11 @@ build() { make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD index 160a2944c..78948b2c3 100644 --- a/extra/cheese/PKGBUILD +++ b/extra/cheese/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 170886 2012-11-12 22:06:48Z heftig $ +# $Id: PKGBUILD 183338 2013-04-21 22:08:39Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=cheese -pkgver=3.6.2 +pkgver=3.8.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) license=('GPL') -depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop') -makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto') -optdepends=('nautilus-sendto: Send snapshots' - 'frei0r-plugins: More camera effects') +depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'gnome-video-effects' 'librsvg' 'gnome-desktop' 'nautilus-sendto' 'hicolor-icon-theme') +makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala') +optdepends=('frei0r-plugins: More camera effects') 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=('745262a0db7d0dbe973497a4f36dd4d85b8a42426d8f431e4b6898351ad6459e') +sha256sums=('e9f7a7855c52451cfc59ffa23962eaa5fda7c9bc629bb975f4328af061d01eeb') build() { cd $pkgname-$pkgver diff --git a/extra/clutter-gst/PKGBUILD b/extra/clutter-gst/PKGBUILD index 5535ed99d..67d7a17dd 100644 --- a/extra/clutter-gst/PKGBUILD +++ b/extra/clutter-gst/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178920 2013-02-28 18:58:26Z ioni $ +# $Id: PKGBUILD 183340 2013-04-21 22:08:41Z heftig $ # Maintainer: Jan "heftig" Steffens pkgname=clutter-gst pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD index 19dd7a35a..d09988c74 100644 --- a/extra/clutter-gtk/PKGBUILD +++ b/extra/clutter-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 175998 2013-01-25 16:33:00Z ioni $ +# $Id: PKGBUILD 183341 2013-04-21 22:08:42Z heftig $ # Maintainer: Jan de Groot pkgname=clutter-gtk -pkgver=1.4.2 +pkgver=1.4.4 pkgrel=1 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('clutter' 'gtk3') makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974') +sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e') build() { cd $pkgname-$pkgver diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD index 698f314b6..fd8b05e04 100644 --- a/extra/clutter/PKGBUILD +++ b/extra/clutter/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 169854 2012-10-30 22:24:23Z heftig $ +# $Id: PKGBUILD 183339 2013-04-21 22:08:40Z heftig $ # Maintainer: Jan de Groot # Contributor: Sergej Pupykin # Contributor: William Rea pkgname=clutter -pkgver=1.12.2 -pkgrel=1 +pkgver=1.14.2 +pkgrel=2 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') url="http://clutter-project.org/" options=('!libtool') license=('LGPL') -depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi') -makedepends=('gobject-introspection' 'mesa') +depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon') +makedepends=('gobject-introspection') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13') +sha256sums=('b2bdf7090f7ba34a69e07a58d43ff8088c81d6dbb56677ae4b103b6cba1920a8') build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr --enable-introspection + ./configure --prefix=/usr --enable-introspection \ + --enable-wayland-{backend,compositor} --enable-egl-backend --enable-evdev-input make } diff --git a/extra/cogl/PKGBUILD b/extra/cogl/PKGBUILD index 9b5159460..ce0b3dacb 100644 --- a/extra/cogl/PKGBUILD +++ b/extra/cogl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163754 2012-07-19 07:57:34Z heftig $ +# $Id: PKGBUILD 183342 2013-04-21 22:08:43Z heftig $ # Maintainer: Ionut Biru pkgname=cogl -pkgver=1.10.4 -pkgrel=1 +pkgver=1.14.0 +pkgrel=2 pkgdesc="An object oriented GL/GLES Abstraction/Utility Layer" arch=('i686' 'x86_64') url="http://www.clutter-project.org/" @@ -12,11 +12,12 @@ depends=('libdrm' 'libxext' 'libxdamage' 'libxcomposite' 'gdk-pixbuf2' 'pango') makedepends=('mesa' 'gobject-introspection') options=(!libtool !emptydirs) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0b5c9989f1d07dbda000a68640eb7ebf734513d52e3707668c41eed19991adf9') +sha256sums=('276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8') build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr + ./configure --prefix=/usr \ + --enable-wayland-egl-{platform,server} --enable-gles{1,2} make } diff --git a/extra/dconf/PKGBUILD b/extra/dconf/PKGBUILD index 7cdc809f2..d7557337a 100644 --- a/extra/dconf/PKGBUILD +++ b/extra/dconf/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 170097 2012-11-01 16:50:36Z heftig $ +# $Id: PKGBUILD 183343 2013-04-21 22:08:45Z heftig $ # Maintainer: Ionut Biru pkgname=dconf -pkgver=0.14.1 +pkgver=0.16.0 pkgrel=1 pkgdesc="A low-level configuration system." arch=(i686 x86_64) url="http://live.gnome.org/dconf" license=('LGPL2.1') depends=('glib2' 'gtk-update-icon-cache') -makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl') +makedepends=('vala' 'gtk3' 'intltool' 'docbook-xsl' 'python') optdepends=('gtk3: for dconf-editor') install=dconf.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('59c58c5eafa0ebd616287d078f4441d5342870a44634445d324e88fc0287f0b8') +sha256sums=('192d682b8e160e22506f3fac6847444013c7cdbef188d937a6ae2b357f9134bb') build() { cd "$pkgname-$pkgver" diff --git a/extra/devhelp/PKGBUILD b/extra/devhelp/PKGBUILD index d51581202..fae630d93 100644 --- a/extra/devhelp/PKGBUILD +++ b/extra/devhelp/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 170977 2012-11-14 07:19:21Z heftig $ +# $Id: PKGBUILD 183344 2013-04-21 22:08:46Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Link Dupont pkgname=devhelp -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="API documentation browser for GNOME" arch=(i686 x86_64) -license=('GPL') +license=(GPL) url="http://live.gnome.org/devhelp/" -depends=('gconf' 'webkitgtk3' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool' 'python2') +depends=(webkitgtk3 hicolor-icon-theme) +makedepends=(pkgconfig intltool python) options=('!libtool' '!emptydirs') install=devhelp.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('71c6933422bf876745fc10276a2b2ee0f8c4c4ddfe034b3f6380507725fd4e63') +sha256sums=('4548fb0b17d4716851cf044294a8ee59e72c8de97e793842faf510a6dbfd3c96') build() { cd $pkgname-$pkgver @@ -27,9 +27,5 @@ build() { package() { 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 devhelp ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas + make DESTDIR="${pkgdir}" install } diff --git a/extra/devhelp/devhelp.install b/extra/devhelp/devhelp.install index 4db5f6e5c..03f95852c 100644 --- a/extra/devhelp/devhelp.install +++ b/extra/devhelp/devhelp.install @@ -1,22 +1,18 @@ -pkgname=devhelp - post_install() { - usr/sbin/gconfpkg --install ${pkgname} - 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 } pre_upgrade() { - pre_remove + if (( $(vercmp $2 3.8.0) < 0 )); then + gconfpkg --uninstall devhelp + fi } post_upgrade() { post_install } -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD index 09602b212..52c8b2df8 100644 --- a/extra/ekiga/PKGBUILD +++ b/extra/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 181118 2013-03-31 19:16:41Z stephane $ +# $Id: PKGBUILD 183345 2013-04-21 22:08:47Z heftig $ # Maintainer: Jan de Groot # Contributor: Tom K pkgname=ekiga pkgver=4.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) @@ -13,7 +13,6 @@ depends=('opal' 'boost-libs' 'libxv' 'libnotify' 'hicolor-icon-theme' 'avahi' 'g makedepends=('intltool' 'gnome-doc-utils' 'evolution-data-server' 'boost') 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=('5f4f491c9496cf65ba057a9345d6bb0278f4eca07bcda5baeecf50bfcd9a4a3b') diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 7666e4f8f..b9c5774ea 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,35 +1,32 @@ -# $Id: PKGBUILD 175978 2013-01-25 14:51:01Z ioni $ +# $Id: PKGBUILD 183346 2013-04-21 22:08:49Z heftig $ # Maintainer: Ionut Biru pkgname=empathy -pkgver=3.6.3 +pkgver=3.8.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://live.gnome.org/Empathy" -license=('GPL2') -depends=('clutter-gst' 'clutter-gtk' 'folks' 'gcr' 'iso-codes' 'libcanberra' 'libpulse' 'webkitgtk3' 'telepathy-farstream' 'telepathy-glib' 'telepathy-logger' 'telepathy-mission-control') -makedepends=('intltool' 'itstool' 'docbook-xsl' 'nautilus-sendto') +license=(GPL2) +depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk3 telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control) +makedepends=(intltool itstool docbook-xsl python2) optdepends=('telepathy-gabble: XMPP/Jabber support' 'telepathy-idle: IRC support' 'telepathy-salut: Link-local XMPP support' 'telepathy-rakia: SIP support' - 'telepathy-haze: libpurple support' - 'nautilus-sendto: Send files from nautilus') + 'telepathy-haze: libpurple support') options=('!libtool' '!makeflags') -groups=('gnome-extra') +groups=(gnome) install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('eaae20e8e9b8660979ed7a9a65deba61d6d795c6f698e684f21c3821f042704d') +sha256sums=('45accc06e9c1711741b0f1476971c7e705b57ea0718a2b10ee66c5dd0397b917') build() { cd $pkgname-$pkgver PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/empathy \ - --disable-static \ - --disable-schemas-compile \ - --enable-gst-1.0=yes + --disable-static sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } diff --git a/extra/eog-plugins/PKGBUILD b/extra/eog-plugins/PKGBUILD index 801dcd172..8402f9795 100644 --- a/extra/eog-plugins/PKGBUILD +++ b/extra/eog-plugins/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169864 2012-10-30 22:25:02Z heftig $ +# $Id: PKGBUILD 183348 2013-04-21 22:08:51Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=eog-plugins -pkgver=3.6.1 -pkgrel=1 +pkgver=3.8.0 +pkgrel=2 pkgdesc="Plugins for Eye of Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/" @@ -12,9 +12,8 @@ depends=('eog' 'libchamplain' 'libgdata') makedepends=('intltool') install=eog-plugins.install options=('!libtool') -groups=(gnome-extra) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac') +sha256sums=('a7e4822c46654f67ef25cbc82e4c955ee84ecae92cf356e15a136032cff35e78') build() { cd $pkgname-$pkgver diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD index c26151ba6..96a256a7d 100644 --- a/extra/eog/PKGBUILD +++ b/extra/eog/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 170865 2012-11-12 20:14:53Z heftig $ +# $Id: PKGBUILD 183347 2013-04-21 22:08:50Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=eog -pkgver=3.6.2 +pkgver=3.8.0 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'libexif' 'lcms2' 'desktop-file-utils' 'exempi' 'libpeas' 'librsvg' 'gnome-icon-theme' 'dconf') -makedepends=('gtk-doc' 'intltool' 'itstool') +arch=(i686 x86_64) +license=(GPL) +depends=(gnome-desktop libexif lcms2 desktop-file-utils exempi libpeas librsvg gnome-icon-theme dconf) +makedepends=(gtk-doc intltool itstool) install=eog.install -groups=('gnome-extra') +groups=(gnome) options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5879f26a11fa7cd2fa4038e5c51d31e4959456be4fba570dcde89ed0d966ffda') +sha256sums=('0f2f6f1eb1a373b2a6f8e5627b20815e5bf13b8c856b67d8f72d2a10b6012f2b') build() { cd "$pkgname-$pkgver" - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var make } diff --git a/extra/epiphany/PKGBUILD b/extra/epiphany/PKGBUILD index 6b65b5e6a..99eac194a 100644 --- a/extra/epiphany/PKGBUILD +++ b/extra/epiphany/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 169865 2012-10-30 22:25:05Z heftig $ +# $Id: PKGBUILD 183349 2013-04-21 22:08:53Z heftig $ # Maintainer: Jan de Groot pkgname=epiphany -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." arch=('i686' 'x86_64') license=('GPL') -depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils' - 'hicolor-icon-theme' 'gcr' 'gnome-desktop') -makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') +depends=('libsoup' 'libnotify' 'gsettings-desktop-schemas' 'webkitgtk3' 'nss' 'iso-codes' 'dconf' 'desktop-file-utils' + 'hicolor-icon-theme' 'gcr' 'gnome-desktop' 'libwnck3') +makedepends=('intltool' 'gnome-doc-utils' 'startup-notification' 'gobject-introspection') options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('1b4e33e02f7653489be9c49d182be84da13348b4ad3cb4c09c643898586a6008') +sha256sums=('8c231bb1af8daf739524bd89aa44873f5936b8a849da49326427486ed825523f') build() { cd $pkgname-$pkgver diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 04e7dc001..bc6151ddc 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,25 +1,25 @@ -# $Id: PKGBUILD 179104 2013-03-03 17:28:32Z dreisner $ +# $Id: PKGBUILD 183350 2013-04-21 22:08:55Z heftig $ # Maintainer: Jan de Groot pkgname=evince -pkgver=3.6.1 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk3' 'libgxps' 'libspectre' 'gsfonts' 'poppler-glib' 'djvulibre' 'gnome-icon-theme' 't1lib' 'libgnome-keyring' 'desktop-file-utils' 'dconf' 'gsettings-desktop-schemas') -makedepends=('itstool' 'nautilus' 'texlive-bin' 'intltool' 'gobject-introspection' 'docbook-xsl') +arch=(i686 x86_64) +license=(GPL) +depends=(gtk3 libgxps libspectre gsfonts poppler-glib djvulibre gnome-icon-theme t1lib libsecret desktop-file-utils dconf gsettings-desktop-schemas) +makedepends=(itstool libnautilus-extension texlive-bin intltool gobject-introspection docbook-xsl python) optdepends=('texlive-bin: DVI support' 'gvfs: bookmark support and session saving') -groups=('gnome-extra') +groups=(gnome) install=evince.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1b87b2579d438a126391f9044611b472e9f7b5b712e40b5645b0810164bc41b5') +sha256sums=('cf136d2a025ef486c4e248e0dc134e7a9420557d9edc0df1ceb6a6330fbd4e9a') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/evince \ --disable-static --enable-nautilus \ @@ -32,6 +32,6 @@ build() { } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD index bce513ea2..d075a808d 100644 --- a/extra/evolution-data-server/PKGBUILD +++ b/extra/evolution-data-server/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179957 2013-03-13 12:28:12Z jgc $ +# $Id: PKGBUILD 183352 2013-04-21 22:08:58Z heftig $ # Maintainer: Jan de Groot pkgname=evolution-data-server -pkgver=3.6.4 +pkgver=3.8.1 pkgrel=1 pkgdesc="Centralized access to appointments and contacts" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ install=$pkgname.install url="http://www.gnome.org" license=('GPL') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('50b4ca21bc57d2fe4933ea3072bf11d5e6069d0ecaacced0bd0f55f098d09f4e') +sha256sums=('0425d8b73dcf705840cdf9fc955b3ca05b9aacc6eb2d2d97f159725be3a8b896') build() { cd "$pkgname-$pkgver" @@ -21,7 +21,7 @@ build() { --localstatedir=/var --with-openldap=yes \ --libexecdir=/usr/lib/evolution-data-server \ --with-krb5=/usr --with-libdb=/usr \ - --enable-vala-bindings + --enable-vala-bindings --disable-uoa 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 } diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD index 46addbb0b..a8de938ca 100644 --- a/extra/evolution-ews/PKGBUILD +++ b/extra/evolution-ews/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 176004 2013-01-25 17:34:07Z ioni $ +# $Id: PKGBUILD 183353 2013-04-21 22:09:00Z heftig $ # Maintainer: Ionut Biru pkgname=evolution-ews -pkgver=3.6.3 +pkgver=3.8.1 pkgrel=1 pkgdesc="MS Exchange integration through Exchange Web Services" arch=('i686' 'x86_64') @@ -12,12 +12,12 @@ 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=('d044bf8f7753d9489d65a5b94b117cef1369d78c57810125fab229368d01fec6') +sha256sums=('26fea90285189ee0e370ea04baef31bc0907d0cf400a63fafc95631111d378c9') build() { cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/evolution --disable-static + --libexecdir=/usr/lib/evolution --disable-static --with-krb5 make } diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD index dccdcd330..d0a613d92 100644 --- a/extra/evolution/PKGBUILD +++ b/extra/evolution/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 179984 2013-03-13 20:18:27Z jgc $ +# $Id: PKGBUILD 183351 2013-04-21 22:08:56Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=evolution -pkgver=3.6.4 +pkgver=3.8.1 pkgrel=1 pkgdesc="Manage your email, contacts and schedule" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-desktop' 'evolution-data-server' 'gtkhtml4' 'libcanberra' 'libpst' 'libytnef' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') -makedepends=('intltool' 'itstool' 'docbook-xsl' 'networkmanager') +arch=(i686 x86_64) +license=(GPL) +depends=(gnome-desktop evolution-data-server gtkhtml4 libcanberra libpst libytnef psmisc + desktop-file-utils hicolor-icon-theme dconf) +makedepends=(intltool itstool docbook-xsl networkmanager bogofilter spamassassin highlight) optdepends=('bogofilter: possible junk filter plugin' - 'spamassassin: possible junk filter plugin') + 'spamassassin: possible junk filter plugin' + 'highlight: text highlight plugin') 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:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('7bf7054d85b7d1bd0e62d69f15ef80dbe781f57359bf91e7c427cd93378ba4a1') +sha256sums=('89b775c5757ddf791d181c82eaee6ddc42252eb54aa2f5dc5a80ff5b9246803b') build() { cd $pkgname-$pkgver diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD new file mode 100644 index 000000000..47eefa009 --- /dev/null +++ b/extra/five-or-more/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 183355 2013-04-21 22:09:04Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=five-or-more +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Remove colored balls from the board by forming lines" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=five-or-more.install +url="https://live.gnome.org/Five%20or%20more" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('a050f472dadbb3f44e5cd5e4ab31058a6058f4ccaa03558311706ec0c052b056') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile \ + --with-scores-user=root --with-scores-group=games + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # Remove all scores, we generate them from postinstall + rm -rf "$pkgdir/var" +} diff --git a/extra/five-or-more/five-or-more.install b/extra/five-or-more/five-or-more.install new file mode 100644 index 000000000..eb9e34de3 --- /dev/null +++ b/extra/five-or-more/five-or-more.install @@ -0,0 +1,35 @@ +_scores=( + glines.Small.scores + glines.Medium.scores + glines.Large.scores +) + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then + continue + fi + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" + done +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" + done +} diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD index dfe526e68..759e81b4b 100644 --- a/extra/folks/PKGBUILD +++ b/extra/folks/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 169873 2012-10-30 22:25:29Z heftig $ +# $Id: PKGBUILD 183356 2013-04-21 22:09:07Z heftig $ # Maintainer: Ionut Biru pkgname=folks -pkgver=0.8.0 -pkgrel=1 +pkgver=0.9.1 +pkgrel=3 pkgdesc="Library to aggregates people into metacontacts" arch=(i686 x86_64) url="http://telepathy.freedesktop.org/wiki/Folks" -license=('LGPL2.1') -depends=('telepathy-glib' 'libgee' 'libxml2' 'evolution-data-server' 'libsocialweb' 'libzeitgeist') -makedepends=('gobject-introspection' 'intltool') +license=(LGPL2.1) +depends=(telepathy-glib libgee libxml2 evolution-data-server libzeitgeist libtracker-sparql) +makedepends=(gobject-introspection intltool) install=folks.install options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('8c56c7594dd502ef5877e93181136e41f4ea03de4971372a7a04e7f1492eed9d') +sha256sums=('102b1867355d16e73a837871a058dda13c74fa385908ddda1623893ab0baee4a') build() { cd "$pkgname-$pkgver" - ./configure --prefix=/usr --disable-schemas-compile + ./configure --prefix=/usr --disable-schemas-compile --enable-tracker-backend \ + --disable-libsocialweb-backend make } diff --git a/extra/fontconfig/29-replace-bitmap-fonts.conf b/extra/fontconfig/29-replace-bitmap-fonts.conf index 7ac4483c4..391ffef94 100644 --- a/extra/fontconfig/29-replace-bitmap-fonts.conf +++ b/extra/fontconfig/29-replace-bitmap-fonts.conf @@ -1,37 +1,18 @@ - - - - Helvetica - - - Arial - Liberation Sans - sans-serif - - - - - Courier - - - Courier New - Liberation Mono - monospace - - - - - Times - - - Times New Roman - Liberation Serif - serif - - + + + Helvetica + Arial + + + Times + Times New Roman + + + Courier + Courier New + diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index ab3dad32d..f051c8010 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175209 2013-01-16 17:39:36Z andyrtr $ +# $Id: PKGBUILD 183357 2013-04-21 22:09:09Z heftig $ # Maintainer: Jan de Groot pkgname=fontconfig -pkgver=2.10.2 -pkgrel=2 +pkgver=2.10.92 +pkgrel=4 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64) url="http://www.fontconfig.org/release/" @@ -12,13 +12,20 @@ depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 - 29-replace-bitmap-fonts.conf) -sha256sums=('8ea8ef56738fd95f0be611015f89614fd4dec79ddac6b3ff26bc4a8338569952' - '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc') + 29-replace-bitmap-fonts.conf git_fixes.diff) +sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22' + '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6' + '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0') + + # a nice page to test font matching: + # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html build() { cd "$srcdir/$pkgname-$pkgver" + # post release fixes + patch -Np1 -i ${srcdir}/git_fixes.diff + # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f autoreconf -fi @@ -43,12 +50,9 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - # not upstream, not in FC and not in Gentoo, this should probably go upstream - # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail" - pushd $pkgdir/etc/fonts/conf.d - ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf . - popd + ln -s ../conf.avail/29-replace-bitmap-fonts.conf \ + "$pkgdir/etc/fonts/conf.d/29-replace-bitmap-fonts.conf" #Install license install -m755 -d "$pkgdir/usr/share/licenses/$pkgname" diff --git a/extra/fontconfig/git_fixes.diff b/extra/fontconfig/git_fixes.diff new file mode 100644 index 000000000..209cba64c --- /dev/null +++ b/extra/fontconfig/git_fixes.diff @@ -0,0 +1,732 @@ +From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Mon, 01 Apr 2013 09:16:28 +0000 +Subject: Bug 62980 - matching native fonts with even :lang=en + +Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc +to deal with both strong and weak of FC_LANG as the same location in the score +--- +diff --git a/src/fcmatch.c b/src/fcmatch.c +index 68f39ae..2d7b798 100644 +--- a/src/fcmatch.c ++++ b/src/fcmatch.c +@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy { + #undef FC_OBJECT + + #undef PRI1 +-#define PRI1(n) \ +- PRI_ ## n ## _STRONG, \ +- PRI_ ## n ## _WEAK ++#define PRI1(n) \ ++ PRI_ ## n, \ ++ PRI_ ## n ## _STRONG = PRI_ ## n, \ ++ PRI_ ## n ## _WEAK = PRI_ ## n + + typedef enum _FcMatcherPriority { + PRI1(HASH), +@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority { + PRI1(FOUNDRY), + PRI1(CHARSET), + PRI_FAMILY_STRONG, +- PRI_LANG_STRONG, + PRI_POSTSCRIPT_NAME_STRONG, +- PRI_LANG_WEAK, ++ PRI1(LANG), + PRI_FAMILY_WEAK, + PRI_POSTSCRIPT_NAME_WEAK, + PRI1(SPACING), +@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + * If this node matches any language, go check + * which ones and satisfy those entries + */ +- if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 || +- nodeps[f]->score[PRI_LANG_WEAK] < 2000) ++ if (nodeps[f]->score[PRI_LANG] < 2000) + { + for (i = 0; i < nPatternLang; i++) + { +@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + } + patternLangSat[i] = FcTrue; + satisfies = FcTrue; +- /* adjust score to ensure it's not more than 10000.0 +- * which would means the lang didn't satisfy the requirements +- */ +- if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0) +- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; +- if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0) +- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; + break; + } + } +@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, + } + if (!satisfies) + { +- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; +- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; ++ nodeps[f]->score[PRI_LANG] = 10000.0; + } + } + +-- +cgit v0.9.0.2-2-gbebe +From 18bf57c70aafcad031c0b43756b754dcaf6a756a Mon Sep 17 00:00:00 2001 +From: Sebastian Freundt +Date: Sun, 07 Apr 2013 00:02:58 +0000 +Subject: build-chain, replace INCLUDES directive by AM_CPPFLAGS + +As of automake-13.1 the INCLUDES directive is no longer supported. +An automake run will return with an error. + +This changeset simply follows automake's advice to replace INCLUDES +by AM_CPPFLAGS. +--- +diff --git a/Tools.mk b/Tools.mk +index 56766da..f0fa0ec 100644 +--- a/Tools.mk ++++ b/Tools.mk +@@ -32,7 +32,7 @@ TOOL=./$(DIR)$(EXEEXT_FOR_BUILD) + + EXTRA_DIST = $(TARG) $(TMPL) $(TSRC) $(DIST) + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(builddir) \ + -I$(srcdir) \ + -I$(top_builddir)/src \ +@@ -43,7 +43,7 @@ INCLUDES = \ + $(WARN_CFLAGS) + + $(TOOL): $(TSRC) $(ALIAS_FILES) +- $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(INCLUDES) ++ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) + + $(TARG): $(TMPL) $(TSRC) $(DEPS) + $(AM_V_GEN) $(MAKE) $(TOOL) && \ +diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am +index 7f7d1b1..0e10786 100644 +--- a/fc-cache/Makefile.am ++++ b/fc-cache/Makefile.am +@@ -36,7 +36,7 @@ uninstall-local: + -$(RM) -rf "$(DESTDIR)$(fc_cachedir)" + endif + +-INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS) ++AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS) + + bin_PROGRAMS=fc-cache + +diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am +index b426723..04c1cc4 100644 +--- a/fc-cat/Makefile.am ++++ b/fc-cat/Makefile.am +@@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat + + SGML = ${FC_CAT_SRC}/fc-cat.sgml + +-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) ++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) + + bin_PROGRAMS=fc-cat + +diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am +index b2c499d..c58540e 100644 +--- a/fc-list/Makefile.am ++++ b/fc-list/Makefile.am +@@ -29,7 +29,7 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml + + bin_PROGRAMS=fc-list + +-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) ++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) + + BUILT_MANS=fc-list.1 + +diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am +index 0e9e8fd..84afb8b 100644 +--- a/fc-match/Makefile.am ++++ b/fc-match/Makefile.am +@@ -29,7 +29,7 @@ FC_MATCH_SRC=${top_srcdir}/fc-match + + SGML = ${FC_MATCH_SRC}/fc-match.sgml + +-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) ++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) + + BUILT_MANS=fc-match.1 + +diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am +index 92b0433..c456247 100644 +--- a/fc-pattern/Makefile.am ++++ b/fc-pattern/Makefile.am +@@ -29,7 +29,7 @@ FC_PATTERN_SRC=${top_srcdir}/fc-pattern + + SGML = ${FC_PATTERN_SRC}/fc-pattern.sgml + +-INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) ++AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) + + BUILT_MANS=fc-pattern.1 + +diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am +index b3ea1e6..73b3f11 100644 +--- a/fc-query/Makefile.am ++++ b/fc-query/Makefile.am +@@ -29,7 +29,7 @@ FC_QUERY_SRC=${top_srcdir}/fc-query + + SGML = ${FC_QUERY_SRC}/fc-query.sgml + +-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) ++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) + + BUILT_MANS=fc-query.1 + +diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am +index 2063405..471a42f 100644 +--- a/fc-scan/Makefile.am ++++ b/fc-scan/Makefile.am +@@ -29,7 +29,7 @@ FC_SCAN_SRC=${top_srcdir}/fc-scan + + SGML = ${FC_SCAN_SRC}/fc-scan.sgml + +-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) ++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) + + BUILT_MANS=fc-scan.1 + +diff --git a/fc-validate/Makefile.am b/fc-validate/Makefile.am +index 54edec2..782cead 100644 +--- a/fc-validate/Makefile.am ++++ b/fc-validate/Makefile.am +@@ -29,7 +29,7 @@ FC_VALIDATE_SRC=${top_srcdir}/fc-validate + + SGML = ${FC_VALIDATE_SRC}/fc-validate.sgml + +-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) ++AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) + + BUILT_MANS=fc-validate.1 + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9fd7dd8..066cc03 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -70,7 +70,7 @@ uninstall-ms-import-lib: + + endif + +-INCLUDES = \ ++AM_CPPFLAGS = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + $(FREETYPE_CFLAGS) \ +-- +cgit v0.9.0.2-2-gbebe +From 9299155b5247255d6b6687448173056c3ca8d09b Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Tue, 09 Apr 2013 02:34:35 +0000 +Subject: Ensure closing fp on error + +--- +diff --git a/src/fchash.c b/src/fchash.c +index 827b20f..4ea5f37 100644 +--- a/src/fchash.c ++++ b/src/fchash.c +@@ -220,7 +220,7 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename) + + ret = FcHashInitSHA256Digest (); + if (!ret) +- return NULL; ++ goto bail0; + + while (!feof (fp)) + { +-- +cgit v0.9.0.2-2-gbebe +From c93a8b8b54afe33e5ecf9870723543cb4058fa94 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Tue, 09 Apr 2013 03:46:30 +0000 +Subject: Obtain fonts data via FT_Face instead of opening a file directly + +--- +diff --git a/src/fcfreetype.c b/src/fcfreetype.c +index 8a037c0..1eecfdb 100644 +--- a/src/fcfreetype.c ++++ b/src/fcfreetype.c +@@ -1662,7 +1662,7 @@ FcFreeTypeQueryFace (const FT_Face face, + if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative)) + goto bail1; + +- hashstr = FcHashGetSHA256DigestFromFile (file); ++ hashstr = FcHashGetSHA256DigestFromFace (face); + if (!hashstr) + goto bail1; + if (!FcPatternAddString (pat, FC_HASH, hashstr)) +diff --git a/src/fchash.c b/src/fchash.c +index 4ea5f37..043d94b 100644 +--- a/src/fchash.c ++++ b/src/fchash.c +@@ -29,6 +29,9 @@ + #include "fcint.h" + #include + #include ++#include ++#include FT_TRUETYPE_TABLES_H ++#include FT_TRUETYPE_TAGS_H + + #define ROTRN(w, v, n) ((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n))) + #define ROTR32(v, n) ROTRN(32, v, n) +@@ -204,41 +207,50 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, + } + + FcChar8 * +-FcHashGetSHA256DigestFromFile (const FcChar8 *filename) ++FcHashGetSHA256DigestFromFace (const FT_Face face) + { +- FILE *fp = fopen ((const char *)filename, "rb"); +- char ibuf[64]; ++ char ibuf[64], *buf = NULL; + FcChar32 *ret; +- size_t len; +- struct stat st; ++ FT_Error err; ++ FT_ULong len = 0, alen, i = 0; + +- if (!fp) ++ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); ++ if (err != FT_Err_Ok) + return NULL; +- +- if (FcStat (filename, &st)) ++ alen = (len + 63) & ~63; ++ buf = malloc (alen); ++ if (!buf) ++ return NULL; ++ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len); ++ if (err != FT_Err_Ok) + goto bail0; ++ memset (&buf[len], 0, alen - len); + + ret = FcHashInitSHA256Digest (); + if (!ret) + goto bail0; + +- while (!feof (fp)) ++ while (i <= len) + { +- if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64) ++ if ((len - i) < 64) + { + long v; ++ int n; + + /* add a padding */ +- memset (&ibuf[len], 0, 64 - len); +- ibuf[len] = 0x80; +- if ((64 - len) < 9) ++ n = len - i; ++ if (n > 0) ++ memcpy (ibuf, &buf[i], n); ++ memset (&ibuf[n], 0, 64 - n); ++ ibuf[n] = 0x80; ++ if ((64 - n) < 9) + { + /* process a block once */ + FcHashComputeSHA256Digest (ret, ibuf); + memset (ibuf, 0, 64); + } + /* set input size at the end */ +- v = (long)st.st_size * 8; ++ v = len * 8; + ibuf[63 - 0] = v & 0xff; + ibuf[63 - 1] = (v >> 8) & 0xff; + ibuf[63 - 2] = (v >> 16) & 0xff; +@@ -252,14 +264,18 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename) + } + else + { +- FcHashComputeSHA256Digest (ret, ibuf); ++ FcHashComputeSHA256Digest (ret, &buf[i]); + } ++ i += 64; + } +- fclose (fp); ++ if (buf) ++ free (buf); + + return FcHashSHA256ToString (ret); + + bail0: +- fclose (fp); ++ if (buf) ++ free (buf); ++ + return NULL; + } +diff --git a/src/fcint.h b/src/fcint.h +index c45075e..703b983 100644 +--- a/src/fcint.h ++++ b/src/fcint.h +@@ -47,6 +47,8 @@ + #include "fcdeprecate.h" + #include "fcmutex.h" + #include "fcatomic.h" ++#include ++#include FT_FREETYPE_H + + #ifndef FC_CONFIG_PATH + #define FC_CONFIG_PATH "fonts.conf" +@@ -819,7 +821,7 @@ FcPrivate FcChar8 * + FcHashGetSHA256Digest (const FcChar8 *input_strings, + size_t len); + FcPrivate FcChar8 * +-FcHashGetSHA256DigestFromFile (const FcChar8 *filename); ++FcHashGetSHA256DigestFromFace (const FT_Face face); + + /* fcinit.c */ + FcPrivate FcConfig * +-- +cgit v0.9.0.2-2-gbebe +From fc5a589abad0e8285f7d95007ebda76536e8fa7d Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Tue, 09 Apr 2013 08:18:43 +0000 +Subject: Revert the previous change and rework to not export freetype API outside fcfreetype.c + +--- +diff --git a/src/fcfreetype.c b/src/fcfreetype.c +index 1eecfdb..22064b3 100644 +--- a/src/fcfreetype.c ++++ b/src/fcfreetype.c +@@ -1104,7 +1104,10 @@ FcFreeTypeQueryFace (const FT_Face face, + char psname[256]; + const char *tmp; + +- FcChar8 *hashstr; ++ FcChar8 *hashstr = NULL; ++ char *fontdata = NULL; ++ FT_Error err; ++ FT_ULong len = 0, alen; + + pat = FcPatternCreate (); + if (!pat) +@@ -1662,12 +1665,22 @@ FcFreeTypeQueryFace (const FT_Face face, + if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative)) + goto bail1; + +- hashstr = FcHashGetSHA256DigestFromFace (face); ++ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); ++ if (err != FT_Err_Ok) ++ goto bail1; ++ alen = (len + 63) & ~63; ++ fontdata = malloc (alen); ++ if (!fontdata) ++ goto bail1; ++ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); ++ if (err != FT_Err_Ok) ++ goto bail1; ++ memset (&fontdata[len], 0, alen - len); ++ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); + if (!hashstr) + goto bail1; + if (!FcPatternAddString (pat, FC_HASH, hashstr)) + goto bail1; +- free (hashstr); + + /* + * Compute the unicode coverage for the font +@@ -1756,6 +1769,10 @@ FcFreeTypeQueryFace (const FT_Face face, + bail2: + FcCharSetDestroy (cs); + bail1: ++ if (hashstr) ++ free (hashstr); ++ if (fontdata) ++ free (fontdata); + FcPatternDestroy (pat); + bail0: + return NULL; +diff --git a/src/fchash.c b/src/fchash.c +index 043d94b..1ef1e16 100644 +--- a/src/fchash.c ++++ b/src/fchash.c +@@ -29,9 +29,6 @@ + #include "fcint.h" + #include + #include +-#include +-#include FT_TRUETYPE_TABLES_H +-#include FT_TRUETYPE_TAGS_H + + #define ROTRN(w, v, n) ((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n))) + #define ROTR32(v, n) ROTRN(32, v, n) +@@ -207,40 +204,28 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, + } + + FcChar8 * +-FcHashGetSHA256DigestFromFace (const FT_Face face) ++FcHashGetSHA256DigestFromMemory (const char *fontdata, ++ size_t length) + { +- char ibuf[64], *buf = NULL; ++ char ibuf[64]; + FcChar32 *ret; +- FT_Error err; +- FT_ULong len = 0, alen, i = 0; +- +- err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); +- if (err != FT_Err_Ok) +- return NULL; +- alen = (len + 63) & ~63; +- buf = malloc (alen); +- if (!buf) +- return NULL; +- err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len); +- if (err != FT_Err_Ok) +- goto bail0; +- memset (&buf[len], 0, alen - len); ++ size_t i = 0; + + ret = FcHashInitSHA256Digest (); + if (!ret) +- goto bail0; ++ return NULL; + +- while (i <= len) ++ while (i <= length) + { +- if ((len - i) < 64) ++ if ((length - i) < 64) + { + long v; +- int n; ++ size_t n; + + /* add a padding */ +- n = len - i; ++ n = length - i; + if (n > 0) +- memcpy (ibuf, &buf[i], n); ++ memcpy (ibuf, &fontdata[i], n); + memset (&ibuf[n], 0, 64 - n); + ibuf[n] = 0x80; + if ((64 - n) < 9) +@@ -250,7 +235,7 @@ FcHashGetSHA256DigestFromFace (const FT_Face face) + memset (ibuf, 0, 64); + } + /* set input size at the end */ +- v = len * 8; ++ v = length * 8; + ibuf[63 - 0] = v & 0xff; + ibuf[63 - 1] = (v >> 8) & 0xff; + ibuf[63 - 2] = (v >> 16) & 0xff; +@@ -264,18 +249,10 @@ FcHashGetSHA256DigestFromFace (const FT_Face face) + } + else + { +- FcHashComputeSHA256Digest (ret, &buf[i]); ++ FcHashComputeSHA256Digest (ret, &fontdata[i]); + } + i += 64; + } +- if (buf) +- free (buf); + + return FcHashSHA256ToString (ret); +- +-bail0: +- if (buf) +- free (buf); +- +- return NULL; + } +diff --git a/src/fcint.h b/src/fcint.h +index 703b983..a662dbf 100644 +--- a/src/fcint.h ++++ b/src/fcint.h +@@ -47,8 +47,6 @@ + #include "fcdeprecate.h" + #include "fcmutex.h" + #include "fcatomic.h" +-#include +-#include FT_FREETYPE_H + + #ifndef FC_CONFIG_PATH + #define FC_CONFIG_PATH "fonts.conf" +@@ -821,7 +819,8 @@ FcPrivate FcChar8 * + FcHashGetSHA256Digest (const FcChar8 *input_strings, + size_t len); + FcPrivate FcChar8 * +-FcHashGetSHA256DigestFromFace (const FT_Face face); ++FcHashGetSHA256DigestFromMemory (const char *fontdata, ++ size_t length); + + /* fcinit.c */ + FcPrivate FcConfig * +-- +cgit v0.9.0.2-2-gbebe +From 77419a4dfdf41ed34dd03e74d0e4e6f89dbc65e1 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 10 Apr 2013 02:14:39 +0000 +Subject: documented FC_HASH and FC_POSTSCRIPT_NAME + +--- +diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml +index 05c5c09..a7b8530 100644 +--- a/doc/fontconfig-devel.sgml ++++ b/doc/fontconfig-devel.sgml +@@ -196,6 +196,9 @@ convenience for the application's rendering mechanism. + default value of familylang, + stylelang and fullnamelang + prgname FC_PRGNAME String Name of the running program ++ hash FC_HASH String SHA256 hash value of the font data ++ with "sha256:" prefix. ++ postscriptname FC_POSTSCRIPT_NAME String Font name in PostScript + + + +-- +cgit v0.9.0.2-2-gbebe +From 03216ccf4ca0808f9c7b9513efcaeb7f4058b575 Mon Sep 17 00:00:00 2001 +From: Akira TAGOH +Date: Wed, 10 Apr 2013 09:41:22 +0000 +Subject: Bug 63329 - make check fails: .. contents:: :depth: 2 + +Add back FcHashGetSHA256DigestFromFile() and fall back to it +when font isn't SFNT-based font because FT_Load_Sfnt_Table +fails with FT_Err_Invalid_Face_Handle. +--- +diff --git a/src/fcfreetype.c b/src/fcfreetype.c +index 22064b3..5e8990d 100644 +--- a/src/fcfreetype.c ++++ b/src/fcfreetype.c +@@ -1666,17 +1666,29 @@ FcFreeTypeQueryFace (const FT_Face face, + goto bail1; + + err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); +- if (err != FT_Err_Ok) +- goto bail1; +- alen = (len + 63) & ~63; +- fontdata = malloc (alen); +- if (!fontdata) +- goto bail1; +- err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); +- if (err != FT_Err_Ok) ++ if (err == FT_Err_Ok) ++ { ++ alen = (len + 63) & ~63; ++ fontdata = malloc (alen); ++ if (!fontdata) ++ goto bail1; ++ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); ++ if (err != FT_Err_Ok) ++ goto bail1; ++ memset (&fontdata[len], 0, alen - len); ++ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); ++ } ++ else if (err == FT_Err_Invalid_Face_Handle) ++ { ++ /* font may not support SFNT. falling back to ++ * read the font data from file directly ++ */ ++ hashstr = FcHashGetSHA256DigestFromFile (file); ++ } ++ else ++ { + goto bail1; +- memset (&fontdata[len], 0, alen - len); +- hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); ++ } + if (!hashstr) + goto bail1; + if (!FcPatternAddString (pat, FC_HASH, hashstr)) +diff --git a/src/fchash.c b/src/fchash.c +index 1ef1e16..92585a6 100644 +--- a/src/fchash.c ++++ b/src/fchash.c +@@ -204,6 +204,68 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, + } + + FcChar8 * ++FcHashGetSHA256DigestFromFile (const FcChar8 *filename) ++{ ++ FILE *fp = fopen ((const char *)filename, "rb"); ++ char ibuf[64]; ++ FcChar32 *ret; ++ size_t len; ++ struct stat st; ++ ++ if (!fp) ++ return NULL; ++ ++ if (FcStat (filename, &st)) ++ goto bail0; ++ ++ ret = FcHashInitSHA256Digest (); ++ if (!ret) ++ goto bail0; ++ ++ while (!feof (fp)) ++ { ++ if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64) ++ { ++ long v; ++ ++ /* add a padding */ ++ memset (&ibuf[len], 0, 64 - len); ++ ibuf[len] = 0x80; ++ if ((64 - len) < 9) ++ { ++ /* process a block once */ ++ FcHashComputeSHA256Digest (ret, ibuf); ++ memset (ibuf, 0, 64); ++ } ++ /* set input size at the end */ ++ v = (long)st.st_size * 8; ++ ibuf[63 - 0] = v & 0xff; ++ ibuf[63 - 1] = (v >> 8) & 0xff; ++ ibuf[63 - 2] = (v >> 16) & 0xff; ++ ibuf[63 - 3] = (v >> 24) & 0xff; ++ ibuf[63 - 4] = (v >> 32) & 0xff; ++ ibuf[63 - 5] = (v >> 40) & 0xff; ++ ibuf[63 - 6] = (v >> 48) & 0xff; ++ ibuf[63 - 7] = (v >> 56) & 0xff; ++ FcHashComputeSHA256Digest (ret, ibuf); ++ break; ++ } ++ else ++ { ++ FcHashComputeSHA256Digest (ret, ibuf); ++ } ++ } ++ fclose (fp); ++ ++ return FcHashSHA256ToString (ret); ++ ++bail0: ++ fclose (fp); ++ ++ return NULL; ++} ++ ++FcChar8 * + FcHashGetSHA256DigestFromMemory (const char *fontdata, + size_t length) + { +diff --git a/src/fcint.h b/src/fcint.h +index a662dbf..8919958 100644 +--- a/src/fcint.h ++++ b/src/fcint.h +@@ -818,6 +818,10 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s); + FcPrivate FcChar8 * + FcHashGetSHA256Digest (const FcChar8 *input_strings, + size_t len); ++ ++FcPrivate FcChar8 * ++FcHashGetSHA256DigestFromFile (const FcChar8 *filename); ++ + FcPrivate FcChar8 * + FcHashGetSHA256DigestFromMemory (const char *fontdata, + size_t length); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/four-in-a-row/PKGBUILD b/extra/four-in-a-row/PKGBUILD new file mode 100644 index 000000000..5300d1e79 --- /dev/null +++ b/extra/four-in-a-row/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183358 2013-04-21 22:09:11Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=four-in-a-row +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Make lines of the same color to win" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=four-in-a-row.install +url="https://live.gnome.org/Four-in-a-row" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('eb44c8508a7d4281df1e52c75a4dc8b31a0de108b94c0f37c4e8d99ea380019d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/four-in-a-row/four-in-a-row.install b/extra/four-in-a-row/four-in-a-row.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/four-in-a-row/four-in-a-row.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gcalctool/PKGBUILD b/extra/gcalctool/PKGBUILD deleted file mode 100644 index 7045cd6c1..000000000 --- a/extra/gcalctool/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 170921 2012-11-13 02:09:59Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Jan de Groot - -pkgname=gcalctool -pkgver=6.6.2 -pkgrel=1 -pkgdesc="GNOME Scientific calculator" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtk3' 'dconf') -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::3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e708a16cc758c3a9fcb07e9c3e45989f7d9d64e2993f440e99707fcea3e1b76c') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \ - --localstatedir=/var - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/extra/gcalctool/gcalctool.install b/extra/gcalctool/gcalctool.install deleted file mode 100644 index 2ef26aaa9..000000000 --- a/extra/gcalctool/gcalctool.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/extra/gconf-editor/PKGBUILD b/extra/gconf-editor/PKGBUILD index 43e03ae09..aad63a6e5 100644 --- a/extra/gconf-editor/PKGBUILD +++ b/extra/gconf-editor/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 170049 2012-10-31 09:09:59Z jgc $ +# $Id: PKGBUILD 183359 2013-04-21 22:09:12Z heftig $ # Maintainer: Jan de Groot pkgname=gconf-editor pkgver=3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical gconf registry editor" arch=(i686 x86_64) license=('GPL') depends=('gconf' 'hicolor-icon-theme') makedepends=('pkgconfig' 'intltool' 'gnome-doc-utils') url="http://www.gnome.org" -groups=('gnome-extra') options=(!emptydirs) install=gconf-editor.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD index bdb1d23c1..96eb71ee8 100644 --- a/extra/gcr/PKGBUILD +++ b/extra/gcr/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 170868 2012-11-12 21:20:07Z heftig $ +# $Id: PKGBUILD 183360 2013-04-21 22:09:15Z heftig $ # Maintainer: Ionut Biru pkgname=gcr -pkgver=3.6.2 -pkgrel=2 +pkgver=3.8.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') +makedepends=('intltool' 'gobject-introspection' 'python') options=(!libtool) install=gcr.install source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz 10-gcr.conf) -sha256sums=('f709db2435e3635b68d8aa212863e0a8e81b1cc33442852a5183762876c7be9b' +sha256sums=('38f158d71ce8fb14dca74928053a3edf32751e142400d1429bec5fe0f4bbb8f0' '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc') build() { diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD index d587c7832..d56a3364a 100644 --- a/extra/gdk-pixbuf2/PKGBUILD +++ b/extra/gdk-pixbuf2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 180259 2013-03-18 23:57:36Z jgc $ +# $Id: PKGBUILD 183361 2013-04-21 22:09:16Z heftig $ # Maintainer: Ionut Biru pkgname=gdk-pixbuf2 -pkgver=2.26.5 -pkgrel=2 +pkgver=2.28.1 +pkgrel=1 pkgdesc="An image loading library" arch=('i686' 'x86_64') url="http://www.gtk.org/" @@ -13,7 +13,7 @@ makedepends=('gtk-doc' 'gobject-introspection') options=('!libtool') install=gdk-pixbuf2.install source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) -sha256sums=('77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84') +sha256sums=('bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb') build() { cd gdk-pixbuf-$pkgver diff --git a/extra/gdl/PKGBUILD b/extra/gdl/PKGBUILD index 163735e0a..7c843b23c 100644 --- a/extra/gdl/PKGBUILD +++ b/extra/gdl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170733 2012-11-10 16:00:06Z heftig $ +# $Id: PKGBUILD 183362 2013-04-21 22:09:18Z heftig $ # Maintainer: Jan de Groot pkgname=gdl -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="GNOME Docking Library" arch=(i686 x86_64) @@ -12,7 +12,7 @@ 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=('e772319f1b133047f54e3c1b7e95a718168071cfef972f981337f6bf570ddf1c') +sha256sums=('c9911e9eec5a62497fff7e044ca9eaae47354658238e6b9e9a0a744f05b4ebdb') build() { cd "$pkgname-$pkgver" diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD index dcf685850..79c74ba78 100644 --- a/extra/gdm/PKGBUILD +++ b/extra/gdm/PKGBUILD @@ -1,40 +1,28 @@ -# $Id: PKGBUILD 178235 2013-02-18 16:38:26Z jgc $ +# $Id: PKGBUILD 183315 2013-04-21 22:06:33Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Jan de Groot -pkgname=gdm -pkgver=3.6.2 -pkgrel=2 +pkgbase=gdm +pkgname=(gdm libgdm) +pkgver=3.8.1.1 +pkgrel=1 pkgdesc="Gnome Display Manager" arch=(i686 x86_64) license=(GPL) url="http://www.gnome.org" -backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment - etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf) -groups=(gnome) options=('!libtool') -depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd - xorg-xrdb nss polkit-gnome xorg-server gnome-icon-theme) +depends=(gnome-shell gnome-session upower xorg-xrdb xorg-server) makedepends=(itstool intltool gnome-doc-utils gobject-introspection) -optdepends=('gnome-shell: new login interface' - 'fprintd: fingerprint authentication') -install=gdm.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - fix_external_program_directories.patch - git-fixes.patch - maintain-FamilyLocal-cookie.patch) -sha256sums=('fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9' - 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2' - '1f21838553e4b0eec12465019f11ae3166b502566b3dbefbf0cb6573d77f8031' - '59e9c1fb86e39672b61a30dd75b16f6bea6293d23356422624f445966ddeb1ed') +checkdepends=('check') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz + fix_external_program_directories.patch) +sha256sums=('16f8141040798ba00be0d718ba24cce927d6412b767d091f9ee5bf93f5800ba8' + 'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2') build() { - cd "$pkgname-$pkgver" + cd $pkgbase-$pkgver patch -Np1 -i "$srcdir/fix_external_program_directories.patch" - patch -Np1 -i "$srcdir/git-fixes.patch" - patch -Np1 -i "$srcdir/maintain-FamilyLocal-cookie.patch" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -52,14 +40,39 @@ build() { 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 -j1 # race condition building gdm-client.c, does not wait for gdm-client-glue.h + make +} + +check() { + cd $pkgbase-$pkgver + make check } -package() { - cd "$pkgname-$pkgver" +package_gdm() { + depends+=(libgdm) + optdepends=('fprintd: fingerprint authentication') + backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-environment + etc/pam.d/gdm-password etc/pam.d/gdm-smartcard etc/gdm/custom.conf + etc/gdm/Xsession + etc/gdm/PostSession/Default etc/gdm/PreSession/Default) + groups=(gnome) + install=gdm.install + + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install chmod 1770 "$pkgdir/var/log/gdm" chmod 700 "$pkgdir/var/lib/gdm/.config/dconf" rm -r "$pkgdir/var/run" "$pkgdir/var/gdm" + +### Split libgdm + make -C gui/libgdm DESTDIR="$pkgdir" uninstall +} + +package_libgdm() { + pkgdesc="GDM support library" + depends=(systemd) + + cd $pkgbase-$pkgver + make -C gui/libgdm DESTDIR="$pkgdir" install } diff --git a/extra/gdm/git-fixes.patch b/extra/gdm/git-fixes.patch deleted file mode 100644 index bf1772657..000000000 --- a/extra/gdm/git-fixes.patch +++ /dev/null @@ -1,9067 +0,0 @@ -diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c -index cff8b70..02bd414 100644 ---- a/daemon/gdm-display-access-file.c -+++ b/daemon/gdm-display-access-file.c -@@ -438,13 +438,8 @@ _get_auth_info_for_display (GdmDisplayAccessFile *file, - gdm_display_is_local (display, &is_local, NULL); - - if (is_local) { -- char localhost[HOST_NAME_MAX + 1] = ""; -- *family = FamilyLocal; -- if (gethostname (localhost, HOST_NAME_MAX) == 0) { -- *address = g_strdup (localhost); -- } else { -- *address = g_strdup ("localhost"); -- } -+ *family = FamilyWild; -+ *address = g_strdup ("localhost"); - } else { - *family = FamilyWild; - gdm_display_get_remote_hostname (display, address, NULL); -diff --git a/daemon/gdm-simple-slave.c b/daemon/gdm-simple-slave.c -index 8f5f0c6..1475671 100644 ---- a/daemon/gdm-simple-slave.c -+++ b/daemon/gdm-simple-slave.c -@@ -485,8 +485,12 @@ on_session_conversation_started (GdmSession *session, - char *username; - int delay; - -+ g_debug ("GdmSimpleSlave: session conversation started for service %s", service_name); -+ -+ if (g_strcmp0 (service_name, "gdm-autologin") != 0) { -+ return; -+ } - -- g_debug ("GdmSimpleSlave: session conversation started"); - enabled = FALSE; - gdm_slave_get_timed_login_details (GDM_SLAVE (slave), &enabled, &username, &delay); - if (! enabled) { -@@ -1567,6 +1571,14 @@ gdm_simple_slave_stop (GdmSlave *slave) - self->priv->greeter_environment = NULL; - } - -+ if (self->priv->start_session_id > 0) { -+ g_source_remove (self->priv->start_session_id); -+ self->priv->start_session_id = 0; -+ } -+ -+ g_clear_pointer (&self->priv->start_session_service_name, -+ (GDestroyNotify) g_free); -+ - if (self->priv->session_is_running) { - char *username; - -diff --git a/docs/C/index.docbook b/docs/C/index.docbook -index ca6c6ee..a7f1d75 100644 ---- a/docs/C/index.docbook -+++ b/docs/C/index.docbook -@@ -532,14 +532,16 @@ - - - The session output is piped through the GDM daemon to the -- ~/.xsession-errors file. The file is overwritten -- on each login, so logging out and logging back into the same user via -- GDM will cause any messages from the previous session to be lost. -+ ~/$XDG_CACHE_HOME/gdm/session.log -+ file which usually expands to ~/.cache/gdm/session.log. -+ The file is overwritten on each login, so logging out and logging back -+ into the same user via GDM will cause any messages from the previous -+ session to be lost. - - - - Note that if GDM can not create this file for some reason, then a -- fallback file will be created named ~/.xsession-errors.XXXXXXXX -+ fallback file will be created named ~/$XDG_CACHE_HOME/gdm/session.log.XXXXXXXX - where the XXXXXXXX are some random characters. - - -diff --git a/docs/es/es.po b/docs/es/es.po -index 5c93fb2..1fe8a6e 100644 ---- a/docs/es/es.po -+++ b/docs/es/es.po -@@ -9,16 +9,16 @@ msgid "" - msgstr "" - "Project-Id-Version: gdm-help.master\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-09-06 16:12+0000\n" --"PO-Revision-Date: 2012-09-06 18:03+0200\n" -+"POT-Creation-Date: 2012-12-01 00:31+0000\n" -+"PO-Revision-Date: 2012-12-02 20:13+0100\n" - "Last-Translator: Daniel Mustieles \n" --"Language-Team: Español \n" -+"Language-Team: Español; Castellano \n" - "Language: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"X-Generator: KBabel 1.11.4\n" --"Plural-Forms: nplurals=2; plural=(n!=1);\n" -+"X-Generator: Gtranslator 2.91.5\n" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" - - #. Put one translator per line, in the form NAME , YEAR1, YEAR2 - msgctxt "_" -@@ -900,34 +900,48 @@ msgstr "" - "valor de la pantalla, <display>.log." - - #: C/index.docbook:533(sect2/para) --msgid "" --"The session output is piped through the GDM daemon to the ~/." --"xsession-errors file. The file is overwritten on each login, so " --"logging out and logging back into the same user via GDM will cause any " --"messages from the previous session to be lost." -+#| msgid "" -+#| "The session output is piped through the GDM daemon to the ~/." -+#| "xsession-errors file. The file is overwritten on each login, " -+#| "so logging out and logging back into the same user via GDM will cause any " -+#| "messages from the previous session to be lost." -+msgid "" -+"The session output is piped through the GDM daemon to the ~/" -+"$XDG_CACHE_HOME/gdm/session.log file " -+"which usually expands to ~/.cache/gdm/session.log. The " -+"file is overwritten on each login, so logging out and logging back into the " -+"same user via GDM will cause any messages from the previous session to be " -+"lost." - msgstr "" - "La salida de la sesión se redirecciona a través del demonio de GDM al " --"archivo ~/.xsession-errors. El archivo se sobreescribe " --"con cada inicio de sesión, de tal forma que iniciar de nuevo sesión con el " --"mismo usuario a través de GDM hará que cualquier mensaje de la sesión " --"anterior se pierda." -- --#: C/index.docbook:540(sect2/para) -+"archivo ~/$XDG_CACHE_HOME/gdm/session." -+"log que generalmente se expande a ~/.cache/gdm/session." -+"log. El archivo se sobreescribe con cada inicio de sesión, de tal " -+"forma que iniciar de nuevo sesión con el mismo usuario a través de GDM hará " -+"que cualquier mensaje de la sesión anterior se pierda." -+ -+#: C/index.docbook:542(sect2/para) -+#| msgid "" -+#| "Note that if GDM can not create this file for some reason, then a " -+#| "fallback file will be created named ~/.xsession-errors." -+#| "XXXXXXXX where the XXXXXXXX are some " -+#| "random characters." - msgid "" - "Note that if GDM can not create this file for some reason, then a fallback " --"file will be created named ~/.xsession-errors.XXXXXXXX " --"where the XXXXXXXX are some random characters." -+"file will be created named ~/$XDG_CACHE_HOME/gdm/session.log.XXXXXXXX where the " -+"XXXXXXXX are some random characters." - msgstr "" --"Note que si GDM no puede crear este archivo por alguna razón, entonces se " --"creará un archivo de apoyo llamado ~/.xsession-errors.XXXXXXXX donde XXXXXX son algunos caracteres " --"aleatorios." -+"Tenga en cuneta que si GDM no puede crear este archivo por alguna razón, " -+"entonces se creará un archivo alternativo llamado ~/" -+"$XDG_CACHE_HOME/gdm/session.log.XXXXXXXX donde el " -+"archivo XXXXXXXX son algunos caracteres aleatorios." - --#: C/index.docbook:548(sect2/title) -+#: C/index.docbook:550(sect2/title) - msgid "Fast User Switching" - msgstr "Cambio rápido de usuarios" - --#: C/index.docbook:550(sect2/para) -+#: C/index.docbook:552(sect2/para) - msgid "" - "GDM allows multiple users to be logged in at the same time. After one user " - "is logged in, additional users can log in via the User Switcher on the GNOME " -@@ -945,7 +959,7 @@ msgstr "" - "predeterminada del panel. Se puede añadir usando el menú contextual del " - "panel." - --#: C/index.docbook:559(sect2/para) -+#: C/index.docbook:561(sect2/para) - msgid "" - "Note this feature is available on systems that support Virtual Terminals. " - "This feature will not function if Virtual Terminals is not available." -@@ -954,15 +968,15 @@ msgstr "" - "Terminales virtuales. Esta característica no funcionará si los Terminales " - "virtuales no están disponibles." - --#: C/index.docbook:570(sect1/title) -+#: C/index.docbook:572(sect1/title) - msgid "Security" - msgstr "Seguridad" - --#: C/index.docbook:573(sect2/title) -+#: C/index.docbook:575(sect2/title) - msgid "The GDM User And Group" - msgstr "El usuario y grupo GDM" - --#: C/index.docbook:575(sect2/para) -+#: C/index.docbook:577(sect2/para) - msgid "" - "For security reasons a dedicated user and group id are recommended for " - "proper operation. This user and group are normally \"gdm\" on most systems, " -@@ -977,7 +991,7 @@ msgstr "" - "forma que programas que interactúan con el usuario se ejecutan en una " - "«sandbox». Este usuario y grupo deberían tener privilegios limitados." - --#: C/index.docbook:584(sect2/para) -+#: C/index.docbook:586(sect2/para) - msgid "" - "The only special privilege the \"gdm\" user requires is the ability to read " - "and write Xauth files to the <var>/run/gdm " -@@ -989,7 +1003,7 @@ msgstr "" - "gdm. La carpeta <var>/run/gdm debería " - "tener un propietario root:gdm y permisos 1777." - --#: C/index.docbook:592(sect2/para) -+#: C/index.docbook:594(sect2/para) - msgid "" - "You should not, under any circumstances, configure the GDM user/group to a " - "user which a user could easily gain access to, such as the user " -@@ -1012,7 +1026,7 @@ msgstr "" - "debería configurarse para no tener contraseña ni permitir que usuarios que " - "no sean root inicien sesión en la cuenta." - --#: C/index.docbook:605(sect2/para) -+#: C/index.docbook:607(sect2/para) - msgid "" - "The GDM greeter configuration is stored in GConf. To allow the GDM user to " - "be able to write configuration, it is necessary for the \"gdm\" user to have " -@@ -1030,11 +1044,11 @@ msgstr "" - "pueden estar desactivadas si no se puede escribir información de estado en " - "la configuración de GConf." - --#: C/index.docbook:617(sect2/title) -+#: C/index.docbook:619(sect2/title) - msgid "PAM" - msgstr "PAM" - --#: C/index.docbook:619(sect2/para) -+#: C/index.docbook:621(sect2/para) - msgid "" - "GDM uses PAM for login authentication. PAM stands for Pluggable " - "Authentication Module, and is used by most programs that request " -@@ -1048,7 +1062,7 @@ msgstr "" - "diferentes comportamientos de autenticación para distintos programas (tales " - "como SSH, IGU de inicio de sesión, salvapantallas, etc.)." - --#: C/index.docbook:627(sect2/para) -+#: C/index.docbook:629(sect2/para) - msgid "" - "PAM is complicated and highly configurable, and this documentation does not " - "intend to explain this in detail. Instead, it is intended to give an " -@@ -1066,7 +1080,7 @@ msgstr "" - "de PAM para entender cómo configurar PAM y entender términos usados en esta " - "sección." - --#: C/index.docbook:637(sect2/para) -+#: C/index.docbook:639(sect2/para) - msgid "" - "PAM configuration has different, but similar, interfaces on different " - "Operating Systems, so check the pam." -@@ -1082,7 +1096,7 @@ msgstr "" - "leer la documentación de PAM y tenga cuidado con las implicaciones de " - "seguridad de cualquier cambio que intente hacer a su configuración." - --#: C/index.docbook:647(sect2/para) -+#: C/index.docbook:649(sect2/para) - msgid "" - "Note that, by default, GDM uses the \"gdm\" PAM service name for normal " - "login and the \"gdm-autologin\" PAM service name for automatic login. These " -@@ -1100,7 +1114,7 @@ msgstr "" - "característica de inicio de sesión automático puede no funcionar si el " - "servicio gdm-autologin no está definido." - --#: C/index.docbook:657(sect2/para) -+#: C/index.docbook:659(sect2/para) - msgid "" - "The PostLogin script is run before pam_open_session is " - "called, and the PreSession script is called after. This " -@@ -1113,7 +1127,7 @@ msgstr "" - "al proceso de inicio de sesión antes o después de que PAM inicialice la " - "sesión." - --#: C/index.docbook:665(sect2/para) -+#: C/index.docbook:667(sect2/para) - msgid "" - "If you wish to make GDM work with other types of authentication mechanisms " - "(such as a fingerprint or SmartCard reader), then you should implement this " -@@ -1132,7 +1146,7 @@ msgstr "" - "list@gnome.org, así que puede referirse a los archivos de " - "la lista para obtener más información." - --#: C/index.docbook:676(sect2/para) -+#: C/index.docbook:678(sect2/para) - msgid "" - "PAM does have some limitations regarding being able to work with multiple " - "types of authentication at the same time, like supporting the ability to " -@@ -1148,7 +1162,7 @@ msgstr "" - "esto funcione, y es mejor conocer cómo se soluciona comúnmente este problema " - "al establecer tal tipo de configuración." - --#: C/index.docbook:685(sect2/para) -+#: C/index.docbook:687(sect2/para) - msgid "" - "If automatic login does not work on a system, check to see if the \"gdm-" - "autologin\" PAM stack is defined in the PAM configuration. For this to work, " -@@ -1165,7 +1179,7 @@ msgstr "" - "módulo PAM lo haga, una configuración PAM para activara «gdm-autologin» " - "podría ser la siguiente:" - --#: C/index.docbook:695(sect2/screen) -+#: C/index.docbook:697(sect2/screen) - #, no-wrap - msgid "" - "\n" -@@ -1182,7 +1196,7 @@ msgstr "" - " gdm-autologin session sufficient pam_allow.so.1\n" - " gdm-autologin password sufficient pam_allow.so.1\n" - --#: C/index.docbook:703(sect2/para) -+#: C/index.docbook:705(sect2/para) - msgid "" - "The above setup will cause no lastlog entry to be generated. If a lastlog " - "entry is desired, then use the following for the session:" -@@ -1190,7 +1204,7 @@ msgstr "" - "La configuración anterior hará que no se genere información de «lastlog». Si " - "quiere una entrada de «lastlog», use lo siguiente para la sesión:" - --#: C/index.docbook:708(sect2/screen) -+#: C/index.docbook:710(sect2/screen) - #, no-wrap - msgid "" - "\n" -@@ -1199,7 +1213,7 @@ msgstr "" - "\n" - " gdm-autologin session required pam_unix_session.so.1\n" - --#: C/index.docbook:712(sect2/para) -+#: C/index.docbook:714(sect2/para) - msgid "" - "If the computer is used by several people, which makes automatic login " - "unsuitable, you may want to allow some users to log in without entering " -@@ -1218,7 +1232,7 @@ msgstr "" - "funcione el archivo de configuración PAM para el servicio «gdm» debe incluir " - "una línea así:" - --#: C/index.docbook:723(sect2/screen) -+#: C/index.docbook:725(sect2/screen) - #, no-wrap - msgid "" - "\n" -@@ -1227,11 +1241,11 @@ msgstr "" - "\n" - " gdm auth sufficient pam_succeed_if.so user ingroup nopasswdlogin\n" - --#: C/index.docbook:730(sect2/title) -+#: C/index.docbook:732(sect2/title) - msgid "utmp and wtmp" - msgstr "utmp y wtmp" - --#: C/index.docbook:732(sect2/para) -+#: C/index.docbook:734(sect2/para) - msgid "" - "GDM generates utmp and wtmp User Accounting Database entries upon session " - "login and logout. The utmp database contains user access and accounting " -@@ -1252,11 +1266,11 @@ msgstr "" - "\"help\" url=\"man:utmp\">utmp y wtmp para su sistema operativo." - --#: C/index.docbook:747(sect2/title) -+#: C/index.docbook:749(sect2/title) - msgid "Xserver Authentication Scheme" - msgstr "Esquema de autenticación del servidor X" - --#: C/index.docbook:749(sect2/para) -+#: C/index.docbook:751(sect2/para) - msgid "" - "Xserver authorization files are stored in a newly created subdirectory of " - "<var>/run/gdm at start up. These files are used " -@@ -1271,7 +1285,7 @@ msgstr "" - "sesión, de tal forma que los usuarios de una sesión no pueden fisgar sobre " - "otros." - --#: C/index.docbook:757(sect2/para) -+#: C/index.docbook:759(sect2/para) - msgid "" - "GDM only supports the MIT-MAGIC-COOKIE-1 Xserver authentication scheme. " - "Normally little is gained from the other schemes, and no effort has been " -@@ -1297,11 +1311,11 @@ msgstr "" - "problemas de seguridad. En la mayoría de los casos se debería preferir SSH " - "sobre las características XDMCP de GDM." - --#: C/index.docbook:774(sect2/title) -+#: C/index.docbook:776(sect2/title) - msgid "XDMCP Security" - msgstr "Seguridad XDMCP" - --#: C/index.docbook:776(sect2/para) -+#: C/index.docbook:778(sect2/para) - msgid "" - "Even though your display is protected by cookies, XEvents and thus " - "keystrokes typed when entering passwords will still go over the wire in " -@@ -1311,7 +1325,7 @@ msgstr "" - "pulsaciones de teclas que se introducen al escribir las contraseñas aún irán " - "sobre el cable en texto claro. Es trivial capturarlas." - --#: C/index.docbook:782(sect2/para) -+#: C/index.docbook:784(sect2/para) - msgid "" - "XDMCP is primarily useful for running thin clients such as in terminal labs. " - "Those thin clients will only ever need the network to access the server, and " -@@ -1330,11 +1344,11 @@ msgstr "" - "servidor. Este tipo de configuración nunca debería usar un concentrador no " - "gestionado u otra red que pueda ser vigilada (con un «sniffer»)." - --#: C/index.docbook:795(sect2/title) -+#: C/index.docbook:797(sect2/title) - msgid "XDMCP Access Control" - msgstr "Control de acceso XDMCP" - --#: C/index.docbook:797(sect2/para) -+#: C/index.docbook:799(sect2/para) - msgid "" - "XDMCP access control is done using TCP wrappers. It is possible to compile " - "GDM without TCP wrapper support, so this feature may not be supported on " -@@ -1344,7 +1358,7 @@ msgstr "" - "compilar GDM sin TCP wrappers ya que esta característica puede que no esté " - "soportada en algunos sistemas operativos." - --#: C/index.docbook:803(sect2/para) -+#: C/index.docbook:805(sect2/para) - msgid "" - "You should use the daemon name gdm in the <" - "etc>/hosts.allow and <etc>/hosts.deny. Por ejemplo para denegar la entrada a equipos " - "de .evil.domain , añada" - --#: C/index.docbook:810(sect2/screen) -+#: C/index.docbook:812(sect2/screen) - #, no-wrap - msgid "" - "\n" -@@ -1365,13 +1379,13 @@ msgstr "" - "\n" - "gdm: .dominio.maligno\n" - --#: C/index.docbook:813(sect2/para) -+#: C/index.docbook:815(sect2/para) - msgid "" - "to <etc>/hosts.deny. You may also need to add" - msgstr "" - "a <etc>/hosts.deny. También necesitará añadir " - --#: C/index.docbook:817(sect2/screen) -+#: C/index.docbook:819(sect2/screen) - #, no-wrap - msgid "" - "\n" -@@ -1380,7 +1394,7 @@ msgstr "" - "\n" - "gdm: .su.dominio\n" - --#: C/index.docbook:820(sect2/para) -+#: C/index.docbook:822(sect2/para) - msgid "" - "to your <etc>/hosts.allow if you normally " - "disallow all services from all hosts. See the hosts.allow(5) para más " - "detalles." - --#: C/index.docbook:829(sect2/title) -+#: C/index.docbook:831(sect2/title) - msgid "Firewall Security" - msgstr "Seguridad con cortafuegos" - --#: C/index.docbook:831(sect2/para) -+#: C/index.docbook:833(sect2/para) - msgid "" - "Even though GDM tries to outsmart potential attackers trying to take " - "advantage of XDMCP, it is still advised that you block the XDMCP port " -@@ -1413,7 +1427,7 @@ msgstr "" - "Además cada conexión remota toma muchos recursos, así que es más fácil hacer " - "una denegación de servicios a un servidor XDMCP que a un servidor web." - --#: C/index.docbook:842(sect2/para) -+#: C/index.docbook:844(sect2/para) - msgid "" - "It is also wise to block all of the Xserver ports. These are TCP ports 6000+ " - "(one for each display number) on your firewall. Note that GDM will use " -@@ -1424,7 +1438,7 @@ msgstr "" - "cortafuegos. Note que GDM usará los números de pantalla 20 y superiores para " - "los servidores flexibles bajo demanda." - --#: C/index.docbook:849(sect2/para) -+#: C/index.docbook:851(sect2/para) - msgid "" - "X is not a very safe protocol when using it over the Internet, and XDMCP is " - "even less safe." -@@ -1432,11 +1446,11 @@ msgstr "" - "X no es un protocolo muy seguro para dejarlo en la red, y XDMCP es aún menos " - "seguro." - --#: C/index.docbook:856(sect2/title) -+#: C/index.docbook:858(sect2/title) - msgid "PolicyKit" - msgstr "PolicyKit" - --#: C/index.docbook:864(sect2/para) -+#: C/index.docbook:866(sect2/para) - msgid "" - "GDM may be configured to use PolicyKit to allow the system administrator to " - "control whether the login screen should provide the shutdown and restart " -@@ -1447,7 +1461,7 @@ msgstr "" - "proporcionar los botones de apagado y reinicio en la pantalla gráfica con " - "temas." - --#: C/index.docbook:870(sect2/para) -+#: C/index.docbook:872(sect2/para) - msgid "" - "These buttons are controlled by the org.freedesktop.consolekit." - "system.stop-multiple-users and org.freedesktop." -@@ -1461,11 +1475,11 @@ msgstr "" - "puede ajustar la política para estas acciones usando la herramienta polkit-" - "gnome-authorization o el programa de línea de comandos polkit-auth." - --#: C/index.docbook:882(sect2/title) -+#: C/index.docbook:884(sect2/title) - msgid "RBAC (Role Based Access Control)" - msgstr "RBAC (Control de acceso basado en rol)" - --#: C/index.docbook:884(sect2/para) -+#: C/index.docbook:886(sect2/para) - msgid "" - "GDM may be configured to use RBAC instead of PolicyKit. In this case the " - "RBAC configuration is used to control whether the login screen should " -@@ -1476,7 +1490,7 @@ msgstr "" - "de sesión debería proporcionar los botones de apagado y reinicio en la " - "pantalla gráfica." - --#: C/index.docbook:890(sect2/para) -+#: C/index.docbook:892(sect2/para) - msgid "" - "For example, on Oracle Solaris, the \"solaris.system.shutdown\" " - "authorization is used to control this. Simply modify the /etc/" -@@ -1486,11 +1500,11 @@ msgstr "" - "usa para controlar esto. Simplemente modifique el archivo /etc/" - "user_attr para que el usuario «gdm» tenga esta autorización." - --#: C/index.docbook:903(sect1/title) -+#: C/index.docbook:905(sect1/title) - msgid "Support for ConsoleKit" - msgstr "Soporte para ConsoleKit" - --#: C/index.docbook:914(sect1/para) -+#: C/index.docbook:916(sect1/para) - msgid "" - "GDM includes support for publishing user login information with the user and " - "login session accounting framework known as ConsoleKit. ConsoleKit is able " -@@ -1505,7 +1519,7 @@ msgstr "" - "reemplazo de los archivos utmp y utmpx que están disponibles en la mayoría " - "de los sistemas Unix." - --#: C/index.docbook:922(sect1/para) -+#: C/index.docbook:924(sect1/para) - msgid "" - "When GDM is about to create a new login process for a user it will call a " - "privileged method of ConsoleKit in order to open a new session for this " -@@ -1530,7 +1544,7 @@ msgstr "" - "privilegiado está restringido por el uso de una norma de seguridad del " - "sistema de bus de mensajes D-Bus." - --#: C/index.docbook:936(sect1/para) -+#: C/index.docbook:938(sect1/para) - msgid "" - "In case a user with an existing session has authenticated at GDM and " - "requests to resume that existing session, GDM calls a privileged method of " -@@ -1545,7 +1559,7 @@ msgstr "" - "indefinidos y son específicos de la sesión. Sin embargo la mayoría de las " - "sesiones desbloquearán un salvapantallas en respuesta." - --#: C/index.docbook:945(sect1/para) -+#: C/index.docbook:947(sect1/para) - msgid "" - "When the user chooses to log out, or if GDM or the session quit unexpectedly " - "the user session will be unregistered from ConsoleKit." -@@ -1553,11 +1567,11 @@ msgstr "" - "Cuando el usuario elige salir, o si GDM o la sesión terminan de forma " - "inesperada, la sesión de usuario se desregistra de ConsoleKit." - --#: C/index.docbook:954(sect1/title) -+#: C/index.docbook:956(sect1/title) - msgid "Configuration" - msgstr "Configuración" - --#: C/index.docbook:956(sect1/para) -+#: C/index.docbook:958(sect1/para) - msgid "" - "GDM has a number of configuration interfaces. These include scripting " - "integration points, daemon configuration, greeter configuration, general " -@@ -1571,11 +1585,11 @@ msgstr "" - "gnome-settings-daemon y configuración de la sesión. Estos tipos de " - "integración se describen debajo en detalle." - --#: C/index.docbook:965(sect2/title) -+#: C/index.docbook:967(sect2/title) - msgid "Scripting Integration Points" - msgstr "Puntos de integración de scripts" - --#: C/index.docbook:967(sect2/para) -+#: C/index.docbook:969(sect2/para) - msgid "" - "The GDM script integration points can be found in the <etc>/" - "gdm/ directory:" -@@ -1583,7 +1597,7 @@ msgstr "" - "Los puntos de integración de scripts para GDM se pueden encontrar en la " - "carpeta <etc>/gdm/:" - --#: C/index.docbook:972(sect2/screen) -+#: C/index.docbook:974(sect2/screen) - #, no-wrap - msgid "" - "\n" -@@ -1600,7 +1614,7 @@ msgstr "" - "PreSession/\n" - "PostSession/\n" - --#: C/index.docbook:980(sect2/para) -+#: C/index.docbook:982(sect2/para) - msgid "" - "The Init, PostLogin, " - "PreSession, and PostSession " -@@ -1610,7 +1624,7 @@ msgstr "" - "PreSession y PostSession trabajan " - "como se describe debajo." - --#: C/index.docbook:986(sect2/para) -+#: C/index.docbook:988(sect2/para) - msgid "" - "For each type of script, the default one which will be executed is called " - "\"Default\" and is stored in a directory associated with the script type. So " -@@ -1631,7 +1645,7 @@ msgstr "" - "para esa pantalla. Por ejemplo, si existe el script <" - "Init>/:0, se ejecutará para la PANTALLA «:0»." - --#: C/index.docbook:998(sect2/para) -+#: C/index.docbook:1000(sect2/para) - msgid "" - "All of these scripts are run with root privilege and return 0 if run " - "successfully, and a non-zero return code if there was any failure that " -@@ -1645,7 +1659,7 @@ msgstr "" - "que los scripts hayan finalizado, de tal forma que si algún script se cuelga " - "hará que también se cuelgue el proceso de inicio de sesión." - --#: C/index.docbook:1006(sect2/para) -+#: C/index.docbook:1008(sect2/para) - msgid "" - "When the Xserver for the login GUI has been successfully started, but before " - "the login GUI is actually displayed, GDM will run the InitPostLogin script. This is done before any session setup " -@@ -1675,7 +1689,7 @@ msgstr "" - "de que la sesión se inicie. Por ejemplo, puede configurar la carpeta $HOME " - "del usuario, si es necesario." - --#: C/index.docbook:1023(sect2/para) -+#: C/index.docbook:1025(sect2/para) - msgid "" - "After the user session has been initialized, GDM will run the " - "PreSession script. This script is useful for doing any " -@@ -1689,7 +1703,7 @@ msgstr "" - "sesión se haya inicializado. Se puede usar para gestión de sesiones o " - "cuentes, por ejemplo." - --#: C/index.docbook:1031(sect2/para) -+#: C/index.docbook:1033(sect2/para) - msgid "" - "When a user terminates their session, GDM will run the " - "PostSession script. Note that the Xserver will have " -@@ -1700,7 +1714,7 @@ msgstr "" - "momento en el que se ejecute este script, de forma que no debe accederse a " - "él." - --#: C/index.docbook:1038(sect2/para) -+#: C/index.docbook:1040(sect2/para) - msgid "" - "Note that the PostSession script will be run even when " - "the display fails to respond due to an I/O error or similar. Thus, there is " -@@ -1711,7 +1725,7 @@ msgstr "" - "similar. Así que, no hay garantía de que funcionen las aplicaciones X " - "durante la ejecución del script." - --#: C/index.docbook:1045(sect2/para) -+#: C/index.docbook:1047(sect2/para) - msgid "" - "All of the above scripts will set the $RUNNING_UNDER_GDM environment variable to yes. If the scripts " -@@ -1725,11 +1739,11 @@ msgstr "" - "identificar cuándo GDM llama a estos scripts, de tal forma que podrá " - "ejecutar código específico cuando se use GDM." - --#: C/index.docbook:1055(sect2/title) -+#: C/index.docbook:1057(sect2/title) - msgid "Autostart Configuration" - msgstr "Configuración automática al inicio" - --#: C/index.docbook:1057(sect2/para) -+#: C/index.docbook:1059(sect2/para) - msgid "" - "The <share>/gdm/autostart/LoginWindow directory " - "contains files in the format specified by the \"FreeDesktop.org Desktop " -@@ -1744,7 +1758,7 @@ msgstr "" - "automáticamente o sólo se lancen si un valor de configuración de GConf está " - "establecido, etc." - --#: C/index.docbook:1066(sect2/para) -+#: C/index.docbook:1068(sect2/para) - msgid "" - "Any .desktop files in this directory will cause the " - "associated program to automatically start with the login GUI greeter. By " -@@ -1765,11 +1779,11 @@ msgstr "" - "valores de configuración especificados en la sección Configuración de la " - "accesibilidad están establecidos." - --#: C/index.docbook:1080(sect2/title) -+#: C/index.docbook:1082(sect2/title) - msgid "Xsession Script" - msgstr "Script Xsession" - --#: C/index.docbook:1082(sect2/para) -+#: C/index.docbook:1084(sect2/para) - msgid "" - "There is also an Xsession script located at " - "<etc>/gdm/Xsession which is called between the " -@@ -1788,11 +1802,11 @@ msgstr "" - "especificada por el archivo de sesión de escritorio que el usuario " - "seleccionó para iniciar." - --#: C/index.docbook:1095(sect2/title) -+#: C/index.docbook:1097(sect2/title) - msgid "Daemon Configuration" - msgstr "Configuración del demonio" - --#: C/index.docbook:1097(sect2/para) -+#: C/index.docbook:1099(sect2/para) - msgid "" - "The GDM daemon is configured using the <etc>/gdm/custom." - "conf file. Default values are stored in GConf in the " -@@ -1808,7 +1822,7 @@ msgstr "" - "conf ya que puede que el archivo de esquemas se sobreescriba " - "cuando el usuario actualiza su sistema con una nueva versión de GDM." - --#: C/index.docbook:1107(sect2/para) -+#: C/index.docbook:1109(sect2/para) - msgid "" - "Note that older versions of GDM supported additional configuration options " - "which are no longer supported in the latest versions of GDM." -@@ -1816,7 +1830,7 @@ msgstr "" - "Note que las versiones antiguas de GDM soportaban opciones de configuración " - "adicional que ya no se soportan en las últimas versiones de GDM." - --#: C/index.docbook:1112(sect2/para) -+#: C/index.docbook:1114(sect2/para) - msgid "" - "The <etc>/gdm/custom.conf file is in the " - "keyfile format. Keywords in brackets define group " -@@ -1830,7 +1844,7 @@ msgstr "" - "los datos después del signo igual representan su valor. Las líneas vacías o " - "las que comienzan por la marca almohadilla (#) se ignoran." - --#: C/index.docbook:1120(sect2/para) -+#: C/index.docbook:1122(sect2/para) - msgid "" - "The file <etc>/gdm/custom.conf supports the " - "\"[daemon]\", \"[security]\", and \"[xdmcp]\" group sections. Within each " -@@ -1846,7 +1860,7 @@ msgstr "" - "especificar que el usuario de ese inicio de sesión temporizado sea «usted», " - "deberá modificar el archivo para que contenga las siguientes líneas:" - --#: C/index.docbook:1130(sect2/screen) -+#: C/index.docbook:1132(sect2/screen) - #, no-wrap - msgid "" - "\n" -@@ -1859,26 +1873,26 @@ msgstr "" - "TimedLoginEnable=true\n" - "TimedLogin=usted\n" - --#: C/index.docbook:1136(sect2/para) -+#: C/index.docbook:1138(sect2/para) - msgid "A full list of supported configuration keys follow:" - msgstr "" - "A continuación está la lista completa de las claves de configuración " - "soportadas:" - --#: C/index.docbook:1141(sect3/title) -+#: C/index.docbook:1143(sect3/title) - msgid "[chooser]" - msgstr "[chooser]" - --#: C/index.docbook:1145(varlistentry/term) -+#: C/index.docbook:1147(varlistentry/term) - msgid "Multicast" - msgstr "Multicast" - --#: C/index.docbook:1147(listitem/synopsis) -+#: C/index.docbook:1149(listitem/synopsis) - #, no-wrap - msgid "Multicast=false" - msgstr "Multicast=false" - --#: C/index.docbook:1148(listitem/para) -+#: C/index.docbook:1150(listitem/para) - msgid "" - "If true and IPv6 is enabled, the chooser will send a multicast query to the " - "local network and collect responses from the hosts who have joined multicast " -@@ -1888,33 +1902,33 @@ msgstr "" - "multicast a la red local y recogerá las respuestas de los servidores que se " - "hayan unido al grupo multicast." - --#: C/index.docbook:1157(varlistentry/term) -+#: C/index.docbook:1159(varlistentry/term) - msgid "MulticastAddr" - msgstr "MulticastAddr" - --#: C/index.docbook:1159(listitem/synopsis) -+#: C/index.docbook:1161(listitem/synopsis) - #, no-wrap - msgid "MulticastAddr=ff02::1" - msgstr "MulticastAddr=ff02::1" - --#: C/index.docbook:1160(listitem/para) -+#: C/index.docbook:1162(listitem/para) - msgid "This is the Link-local multicast address." - msgstr "Esta es la dirección de enlace local multicast." - --#: C/index.docbook:1169(sect3/title) -+#: C/index.docbook:1171(sect3/title) - msgid "[daemon]" - msgstr "[daemon]" - --#: C/index.docbook:1172(varlistentry/term) -+#: C/index.docbook:1174(varlistentry/term) - msgid "TimedLoginEnable" - msgstr "TimedLoginEnable" - --#: C/index.docbook:1174(listitem/synopsis) -+#: C/index.docbook:1176(listitem/synopsis) - #, no-wrap - msgid "TimedLoginEnable=false" - msgstr "TimedLoginEnable=false" - --#: C/index.docbook:1175(listitem/para) -+#: C/index.docbook:1177(listitem/para) - msgid "" - "If the user given in TimedLogin should be logged in " - "after a number of seconds (set with TimedLoginDelay) of " -@@ -1945,16 +1959,16 @@ msgstr "" - "«Seguridad ->PAM» del manual para obtener más información, o para obtener " - "ayuda si esta característica parece no funcionar." - --#: C/index.docbook:1197(varlistentry/term) -+#: C/index.docbook:1199(varlistentry/term) - msgid "TimedLogin" - msgstr "TimedLogin" - --#: C/index.docbook:1199(listitem/synopsis) -+#: C/index.docbook:1201(listitem/synopsis) - #, no-wrap - msgid "TimedLogin=" - msgstr "TimedLogin=" - --#: C/index.docbook:1200(listitem/para) -+#: C/index.docbook:1202(listitem/para) - msgid "" - "This is the user that should be logged in after a specified number of " - "seconds of inactivity." -@@ -1962,7 +1976,7 @@ msgstr "" - "Éste es el usuario que debería iniciar sesión después de un número de " - "segundos de inactividad especificado." - --#: C/index.docbook:1204(listitem/para) C/index.docbook:1248(listitem/para) -+#: C/index.docbook:1206(listitem/para) C/index.docbook:1250(listitem/para) - msgid "" - "If the value ends with a vertical bar | (the pipe symbol), then GDM will " - "execute the program specified and use whatever value is returned on standard " -@@ -1979,16 +1993,16 @@ msgstr "" - "si el valor es «/usr/bin/getloginuser|», entonces el programa «/usr/bin/" - "getloginuser» se ejecutará para obtener la variable del usuario" - --#: C/index.docbook:1218(varlistentry/term) -+#: C/index.docbook:1220(varlistentry/term) - msgid "TimedLoginDelay" - msgstr "TimedLoginDelay" - --#: C/index.docbook:1220(listitem/synopsis) -+#: C/index.docbook:1222(listitem/synopsis) - #, no-wrap - msgid "TimedLoginDelay=30" - msgstr "TimedLoginDelay=30" - --#: C/index.docbook:1221(listitem/para) -+#: C/index.docbook:1223(listitem/para) - msgid "" - "Delay in seconds before the TimedLogin user will be " - "logged in." -@@ -1996,16 +2010,16 @@ msgstr "" - "Retardo en segundos antes de que el usuario TimedLogin " - "entre en la sesión." - --#: C/index.docbook:1229(varlistentry/term) -+#: C/index.docbook:1231(varlistentry/term) - msgid "AutomaticLoginEnable" - msgstr "AutomaticLoginEnable" - --#: C/index.docbook:1231(listitem/synopsis) -+#: C/index.docbook:1233(listitem/synopsis) - #, no-wrap - msgid "AutomaticLoginEnable=false" - msgstr "AutomaticLoginEnable=false" - --#: C/index.docbook:1232(listitem/para) -+#: C/index.docbook:1234(listitem/para) - msgid "" - "If true, the user given in AutomaticLogin should be " - "logged in immediately. This feature is like timed login with a delay of 0 " -@@ -2015,16 +2029,16 @@ msgstr "" - "filename> debería iniciar sesión inmediatamente. Esta característica es como " - "un inicio de sesión temporizado con retraso 0." - --#: C/index.docbook:1241(varlistentry/term) -+#: C/index.docbook:1243(varlistentry/term) - msgid "AutomaticLogin" - msgstr "AutomaticLogin" - --#: C/index.docbook:1243(listitem/synopsis) -+#: C/index.docbook:1245(listitem/synopsis) - #, no-wrap - msgid "AutomaticLogin=" - msgstr "AutomaticLogin=" - --#: C/index.docbook:1244(listitem/para) -+#: C/index.docbook:1246(listitem/para) - msgid "" - "This is the user that should be logged in immediately if " - "AutomaticLoginEnable is true." -@@ -2032,16 +2046,16 @@ msgstr "" - "Este es el usuario que debería iniciar sesión inmediatamente si " - "AutomaticLoginEnable está activada (true)." - --#: C/index.docbook:1262(varlistentry/term) -+#: C/index.docbook:1264(varlistentry/term) - msgid "User" - msgstr "User" - --#: C/index.docbook:1264(listitem/synopsis) -+#: C/index.docbook:1266(listitem/synopsis) - #, no-wrap - msgid "User=gdm" - msgstr "User=gdm" - --#: C/index.docbook:1265(listitem/para) -+#: C/index.docbook:1267(listitem/para) - msgid "" - "The username under which the greeter and other GUI programs are run. Refer " - "to the Group configuration key and to the \"Security-" -@@ -2052,16 +2066,16 @@ msgstr "" - "«Seguridad ->El usuario y grupo GDM» de este documento para obtener más " - "información." - --#: C/index.docbook:1275(varlistentry/term) -+#: C/index.docbook:1277(varlistentry/term) - msgid "Group" - msgstr "Group" - --#: C/index.docbook:1277(listitem/synopsis) -+#: C/index.docbook:1279(listitem/synopsis) - #, no-wrap - msgid "Group=gdm" - msgstr "Group=gdm" - --#: C/index.docbook:1278(listitem/para) -+#: C/index.docbook:1280(listitem/para) - msgid "" - "The group name under which the greeter and other GUI programs are run. Refer " - "to the User configuration key and to the \"Security->" -@@ -2072,26 +2086,26 @@ msgstr "" - "sección «Seguridad ->Usuario y grupo GDM» de este documento para obtener " - "más información." - --#: C/index.docbook:1290(sect3/title) -+#: C/index.docbook:1292(sect3/title) - msgid "Debug Options" - msgstr "Opciones de depuración" - --#: C/index.docbook:1293(variablelist/title) -+#: C/index.docbook:1295(variablelist/title) - msgid "[debug]" - msgstr "[debug]" - --#: C/index.docbook:1296(varlistentry/term) --#: C/index.docbook:1427(varlistentry/term) -+#: C/index.docbook:1298(varlistentry/term) -+#: C/index.docbook:1429(varlistentry/term) - msgid "Enable" - msgstr "Enable" - --#: C/index.docbook:1298(listitem/synopsis) --#: C/index.docbook:1429(listitem/synopsis) -+#: C/index.docbook:1300(listitem/synopsis) -+#: C/index.docbook:1431(listitem/synopsis) - #, no-wrap - msgid "Enable=false" - msgstr "Enable=false" - --#: C/index.docbook:1299(listitem/para) -+#: C/index.docbook:1301(listitem/para) - msgid "" - "To enable debugging, set the debug/Enable key to \"true\" in the " - "<etc>/gdm/custom.conf file and restart GDM. Then " -@@ -2105,24 +2119,24 @@ msgstr "" - "sistema (<var>/log/messages o <" - "var>/adm/messages dependiendo de su sistema operativo)." - --#: C/index.docbook:1314(sect3/title) -+#: C/index.docbook:1316(sect3/title) - msgid "Greeter Options" - msgstr "Opciones de la interfaz" - --#: C/index.docbook:1317(variablelist/title) -+#: C/index.docbook:1319(variablelist/title) - msgid "[greeter]" - msgstr "[greeter]" - --#: C/index.docbook:1320(varlistentry/term) -+#: C/index.docbook:1322(varlistentry/term) - msgid "IncludeAll" - msgstr "IncludeAll" - --#: C/index.docbook:1322(listitem/synopsis) -+#: C/index.docbook:1324(listitem/synopsis) - #, no-wrap - msgid "IncludeAll=true" - msgstr "IncludeAll=true" - --#: C/index.docbook:1323(listitem/para) -+#: C/index.docbook:1325(listitem/para) - msgid "" - "If true, then the face browser will show all users on the local machine. If " - "false, the face browser will only show users who have recently logged in." -@@ -2131,7 +2145,7 @@ msgstr "" - "en el equipo local. Si es falso, el examinador de rostros sólo mostrará los " - "usuarios que han iniciado sesión recientemente." - --#: C/index.docbook:1329(listitem/para) -+#: C/index.docbook:1331(listitem/para) - msgid "" - "When this key is true, GDM will call fgetpwent() to get a list of local " - "users on the system. Any users with a user id less than 500 (or 100 if " -@@ -2154,7 +2168,7 @@ msgstr "" - "() devuelve; /sbin/nologin o /bin/false se consideran «shell» no válidas " - "incluso si getusershell() las devuelve)." - --#: C/index.docbook:1343(listitem/para) -+#: C/index.docbook:1345(listitem/para) - msgid "" - "If false, then GDM more simply only displays users that have previously " - "logged in on the system (local or NIS/LDAP users) by calling the ck-" -@@ -2164,16 +2178,16 @@ msgstr "" - "iniciado sesión en el sistema (localmente o usuarios NIS/LDAP) llamando a la " - "interfaz de ConsoleKit ck-history." - --#: C/index.docbook:1352(varlistentry/term) -+#: C/index.docbook:1354(varlistentry/term) - msgid "Include" - msgstr "Include" - --#: C/index.docbook:1354(listitem/synopsis) -+#: C/index.docbook:1356(listitem/synopsis) - #, no-wrap - msgid "Include=" - msgstr "Include=" - --#: C/index.docbook:1355(listitem/para) -+#: C/index.docbook:1357(listitem/para) - msgid "" - "Set to a list of users to always include in the Face Browser. This value is " - "set to a list of users separated by commas. By default, the value is empty." -@@ -2182,16 +2196,16 @@ msgstr "" - "rostros. Este valor está establecido a una lista de usuarios separados por " - "comas. De forma predeterminada el valor está vacío." - --#: C/index.docbook:1364(varlistentry/term) -+#: C/index.docbook:1366(varlistentry/term) - msgid "Exclude" - msgstr "Exclude" - --#: C/index.docbook:1366(listitem/synopsis) -+#: C/index.docbook:1368(listitem/synopsis) - #, no-wrap - msgid "Exclude=bin,root,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,nobody4,noaccess,postgres,pvm,rpm,nfsnobody,pcap" - msgstr "Exclude=bin,root,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,nobody4,noaccess,postgres,pvm,rpm,nfsnobody,pcap" - --#: C/index.docbook:1367(listitem/para) -+#: C/index.docbook:1369(listitem/para) - msgid "" - "Set to a list of users to always exclude in the Face Browser. This value is " - "set to a list of users separated by commas. Note that the setting in the " -@@ -2206,24 +2220,24 @@ msgstr "" - "a la lista, entonces debe establecer el valor al predeterminado con los " - "valores adicionales añadidos a la lista." - --#: C/index.docbook:1381(sect3/title) -+#: C/index.docbook:1383(sect3/title) - msgid "Security Options" - msgstr "Opciones de seguridad" - --#: C/index.docbook:1384(variablelist/title) -+#: C/index.docbook:1386(variablelist/title) - msgid "[security]" - msgstr "[security]" - --#: C/index.docbook:1387(varlistentry/term) -+#: C/index.docbook:1389(varlistentry/term) - msgid "DisallowTCP" - msgstr "DisallowTCP" - --#: C/index.docbook:1389(listitem/synopsis) -+#: C/index.docbook:1391(listitem/synopsis) - #, no-wrap - msgid "DisallowTCP=true" - msgstr "DisallowTCP=true" - --#: C/index.docbook:1390(listitem/para) -+#: C/index.docbook:1392(listitem/para) - msgid "" - "If true, then always append -nolisten tcp to the " - "command line when starting attached Xservers, thus disallowing TCP " -@@ -2235,24 +2249,24 @@ msgstr "" - "deshabilitar las conexiones TCP. Esta configuración es más segura si no se " - "van a usar conexiones remotas." - --#: C/index.docbook:1402(sect3/title) -+#: C/index.docbook:1404(sect3/title) - msgid "XDCMP Support" - msgstr "Soporte XDMCP" - --#: C/index.docbook:1405(variablelist/title) -+#: C/index.docbook:1407(variablelist/title) - msgid "[xdmcp]" - msgstr "[xdmcp]" - --#: C/index.docbook:1408(varlistentry/term) -+#: C/index.docbook:1410(varlistentry/term) - msgid "DisplaysPerHost" - msgstr "DisplaysPerHost" - --#: C/index.docbook:1410(listitem/synopsis) -+#: C/index.docbook:1412(listitem/synopsis) - #, no-wrap - msgid "DisplaysPerHost=1" - msgstr "DisplaysPerHost=1" - --#: C/index.docbook:1411(listitem/para) -+#: C/index.docbook:1413(listitem/para) - msgid "" - "To prevent attackers from filling up the pending queue, GDM will only allow " - "one connection for each remote computer. If you want to provide display " -@@ -2264,7 +2278,7 @@ msgstr "" - "servicios de pantalla a equipos con más de un monitor debería incrementar " - "este valor." - --#: C/index.docbook:1418(listitem/para) -+#: C/index.docbook:1420(listitem/para) - msgid "" - "Note that the number of attached DISPLAYS allowed is not limited. Only " - "remote connections via XDMCP are limited by this configuration option." -@@ -2273,7 +2287,7 @@ msgstr "" - "conexiones remotas a través de XDMCP están limitadas por esta opción de la " - "configuración." - --#: C/index.docbook:1430(listitem/para) -+#: C/index.docbook:1432(listitem/para) - msgid "" - "Setting this to true enables XDMCP support allowing remote displays/X " - "terminals to be managed by GDM." -@@ -2281,7 +2295,7 @@ msgstr "" - "Establecer esto a true activa el soporte XDMCP permitiento que las pantallas " - "X remotas o los terminales X se gestiones por medio de GDM." - --#: C/index.docbook:1435(listitem/para) -+#: C/index.docbook:1437(listitem/para) - msgid "" - "gdm listens for requests on UDP port 177. See the Port " - "option for more information." -@@ -2289,7 +2303,7 @@ msgstr "" - "gdm escucha peticiones en el puerto UDP 177. Vea la " - "opción Puerto para más información." - --#: C/index.docbook:1440(listitem/para) -+#: C/index.docbook:1442(listitem/para) - msgid "" - "If GDM is compiled to support it, access from remote displays can be " - "controlled using the TCP Wrappers library. The service name is " -@@ -2299,7 +2313,7 @@ msgstr "" - "se puede controlar usando la biblioteca TCPWrappers. El nombre del servicio " - "es gdm" - --#: C/index.docbook:1448(para/screen) -+#: C/index.docbook:1450(para/screen) - #, no-wrap - msgid "" - "\n" -@@ -2308,7 +2322,7 @@ msgstr "" - "\n" - "gdm:.mi.dominio\n" - --#: C/index.docbook:1446(listitem/para) -+#: C/index.docbook:1448(listitem/para) - msgid "" - "You should add <_:screen-1/> to your <etc>/hosts.allow, depending on your TCP Wrappers configuration. See the hosts.allow " - "para obtener más detalles." - --#: C/index.docbook:1457(listitem/para) -+#: C/index.docbook:1459(listitem/para) - msgid "" - "Please note that XDMCP is not a particularly secure protocol and that it is " - "a good idea to block UDP port 177 on your firewall unless you really need it." -@@ -2328,16 +2342,16 @@ msgstr "" - "idea bloquear el puerto UDP 177 en su cortafuegos a no ser que realmente lo " - "necesite." - --#: C/index.docbook:1466(varlistentry/term) -+#: C/index.docbook:1468(varlistentry/term) - msgid "HonorIndirect" - msgstr "HonorIndirect" - --#: C/index.docbook:1468(listitem/synopsis) -+#: C/index.docbook:1470(listitem/synopsis) - #, no-wrap - msgid "HonorIndirect=true" - msgstr "HonorIndirect=true" - --#: C/index.docbook:1469(listitem/para) -+#: C/index.docbook:1471(listitem/para) - msgid "" - "Enables XDMCP INDIRECT choosing (i.e. remote execution of " - "gdmchooser) for X-terminals which do not supply their " -@@ -2347,16 +2361,16 @@ msgstr "" - "gdmchooser) para terminales X que no suministran su " - "propio examinador de pantallas." - --#: C/index.docbook:1478(varlistentry/term) -+#: C/index.docbook:1480(varlistentry/term) - msgid "MaxPending" - msgstr "MaxPending" - --#: C/index.docbook:1480(listitem/synopsis) -+#: C/index.docbook:1482(listitem/synopsis) - #, no-wrap - msgid "MaxPending=4" - msgstr "MaxPending=4" - --#: C/index.docbook:1481(listitem/para) -+#: C/index.docbook:1483(listitem/para) - msgid "" - "To avoid denial of service attacks, GDM has fixed size queue of pending " - "connections. Only MaxPending displays can start at the same time." -@@ -2365,7 +2379,7 @@ msgstr "" - "fijo de conexiones pendientes. Sólo pueden iniciarse a la vez MaxPending " - "pantallas." - --#: C/index.docbook:1487(listitem/para) -+#: C/index.docbook:1489(listitem/para) - msgid "" - "Please note that this parameter does not limit the number of remote displays " - "which can be managed. It only limits the number of displays initiating a " -@@ -2375,16 +2389,16 @@ msgstr "" - "puedan gestionar. Sólo limita el número de pantallas iniciando una conexión " - "simultáneamente." - --#: C/index.docbook:1496(varlistentry/term) -+#: C/index.docbook:1498(varlistentry/term) - msgid "MaxSessions" - msgstr "MaxSessions" - --#: C/index.docbook:1498(listitem/synopsis) -+#: C/index.docbook:1500(listitem/synopsis) - #, no-wrap - msgid "MaxSessions=16" - msgstr "MaxSessions=16" - --#: C/index.docbook:1499(listitem/para) -+#: C/index.docbook:1501(listitem/para) - msgid "" - "Determines the maximum number of remote display connections which will be " - "managed simultaneously. I.e. the total number of remote displays that can " -@@ -2394,16 +2408,16 @@ msgstr "" - "gestionadas simultáneamente. Ej: el número total de pantallas remotas que " - "puede usar su host." - --#: C/index.docbook:1508(varlistentry/term) -+#: C/index.docbook:1510(varlistentry/term) - msgid "MaxWait" - msgstr "MaxWait" - --#: C/index.docbook:1510(listitem/synopsis) -+#: C/index.docbook:1512(listitem/synopsis) - #, no-wrap - msgid "MaxWait=30" - msgstr "MaxWait=30" - --#: C/index.docbook:1511(listitem/para) -+#: C/index.docbook:1513(listitem/para) - msgid "" - "When GDM is ready to manage a display an ACCEPT packet is sent to it " - "containing a unique session id which will be used in future XDMCP " -@@ -2413,7 +2427,7 @@ msgstr "" - "ACCEPT a ella conteniendo un id único de sesión que será usado en las " - "conversaciones XDMCP futuras." - --#: C/index.docbook:1517(listitem/para) -+#: C/index.docbook:1519(listitem/para) - msgid "" - "GDM will then place the session id in the pending queue waiting for the " - "display to respond with a MANAGE request." -@@ -2421,7 +2435,7 @@ msgstr "" - "GDM entonces colocará el id de sesión en la cola de pendientes esperando a " - "que la pantalla responda con una petición MANAGE." - --#: C/index.docbook:1522(listitem/para) -+#: C/index.docbook:1524(listitem/para) - msgid "" - "If no response is received within MaxWait seconds, GDM will declare the " - "display dead and erase it from the pending queue freeing up the slot for " -@@ -2431,16 +2445,16 @@ msgstr "" - "la pantalla muerta y la eliminará de la cola pendiente liberando el espacio " - "para otras pantallas." - --#: C/index.docbook:1531(varlistentry/term) -+#: C/index.docbook:1533(varlistentry/term) - msgid "MaxWaitIndirect" - msgstr "MaxWaitIndirect" - --#: C/index.docbook:1533(listitem/synopsis) -+#: C/index.docbook:1535(listitem/synopsis) - #, no-wrap - msgid "MaxWaitIndirect=30" - msgstr "MaxWaitIndirect=30" - --#: C/index.docbook:1534(listitem/para) -+#: C/index.docbook:1536(listitem/para) - msgid "" - "The MaxWaitIndirect parameter determines the maximum number of seconds " - "between the time where a user chooses a host and the subsequent indirect " -@@ -2458,16 +2472,16 @@ msgstr "" - "más hosts intentando enviar solicitudes que MaxPendingIndirect." - --#: C/index.docbook:1548(varlistentry/term) -+#: C/index.docbook:1550(varlistentry/term) - msgid "PingIntervalSeconds" - msgstr "PingIntervalSeconds" - --#: C/index.docbook:1550(listitem/synopsis) -+#: C/index.docbook:1552(listitem/synopsis) - #, no-wrap - msgid "PingIntervalSeconds=60" - msgstr "PingIntervalSeconds=60" - --#: C/index.docbook:1551(listitem/para) -+#: C/index.docbook:1553(listitem/para) - msgid "" - "If the Xserver does not respond in the specified number of seconds, then the " - "connection is stopped and the session ended. When this happens the slave " -@@ -2482,7 +2496,7 @@ msgstr "" - "el tiempo de expiración si se está actualizando desde la versión 2.20 de GDM " - "y anteriores, a una versión más moderna." - --#: C/index.docbook:1560(listitem/para) -+#: C/index.docbook:1562(listitem/para) - msgid "" - "Note that GDM in the past used to have a PingInterval " - "configuration key which was also in minutes. For most purposes you'd want " -@@ -2498,16 +2512,16 @@ msgstr "" - "laboratorio), un retraso de más de 15 segundos realmente significaría que el " - "terminal se ha apagado o reiniciado y usted querría terminar la sesión." - --#: C/index.docbook:1573(varlistentry/term) -+#: C/index.docbook:1575(varlistentry/term) - msgid "Port" - msgstr "Port" - --#: C/index.docbook:1575(listitem/synopsis) -+#: C/index.docbook:1577(listitem/synopsis) - #, no-wrap - msgid "Port=177" - msgstr "Port=177" - --#: C/index.docbook:1576(listitem/para) -+#: C/index.docbook:1578(listitem/para) - msgid "" - "The UDP port number gdm should listen to for XDMCP " - "requests. Do not change this unless you know what you are doing." -@@ -2515,16 +2529,16 @@ msgstr "" - "El número de puerto UDP en el que gdm debería escuchar " - "las peticiones XDMCP. No cambie esto a no ser que sepa lo que está haciendo." - --#: C/index.docbook:1585(varlistentry/term) -+#: C/index.docbook:1587(varlistentry/term) - msgid "Willing" - msgstr "Willing" - --#: C/index.docbook:1587(listitem/synopsis) -+#: C/index.docbook:1589(listitem/synopsis) - #, no-wrap - msgid "Willing=<etc>/gdm/Xwilling" - msgstr "Willing=<etc>/gdm/Xwilling" - --#: C/index.docbook:1588(listitem/para) -+#: C/index.docbook:1590(listitem/para) - msgid "" - "When the machine sends a WILLING packet back after a QUERY it sends a string " - "that gives the current status of this server. The default message is the " -@@ -2544,11 +2558,11 @@ msgstr "" - "como mucho una vez cada 3 segundos para impedir una posible denegación de " - "servicio inundando la máquina de paquetes QUERY." - --#: C/index.docbook:1607(sect2/title) -+#: C/index.docbook:1609(sect2/title) - msgid "Simple Greeter Configuration" - msgstr "Configuración de la interfaz simple" - --#: C/index.docbook:1609(sect2/para) -+#: C/index.docbook:1611(sect2/para) - msgid "" - "The GDM default greeter is called the simple Greeter and is configured via " - "GConf. Default values are stored in GConf in the gdm-simple-" -@@ -2567,59 +2581,59 @@ msgstr "" - "gconf-editor. Las siguientes opciones de configuración " - "están soportadas:" - --#: C/index.docbook:1620(variablelist/title) -+#: C/index.docbook:1622(variablelist/title) - msgid "Greeter Configuration Keys" - msgstr "Claves de configuración de la interfaz" - --#: C/index.docbook:1623(varlistentry/term) -+#: C/index.docbook:1625(varlistentry/term) - msgid "/apps/gdm/simple-greeter/banner_message_enable" - msgstr "/apps/gdm/simple-greeter/banner_message_enable" - --#: C/index.docbook:1625(listitem/synopsis) --#: C/index.docbook:1646(listitem/synopsis) --#: C/index.docbook:1657(listitem/synopsis) --#: C/index.docbook:1722(listitem/synopsis) --#: C/index.docbook:1787(listitem/synopsis) --#: C/index.docbook:1798(listitem/synopsis) --#: C/index.docbook:1809(listitem/synopsis) --#: C/index.docbook:1820(listitem/synopsis) -+#: C/index.docbook:1627(listitem/synopsis) -+#: C/index.docbook:1648(listitem/synopsis) -+#: C/index.docbook:1659(listitem/synopsis) -+#: C/index.docbook:1724(listitem/synopsis) -+#: C/index.docbook:1789(listitem/synopsis) -+#: C/index.docbook:1800(listitem/synopsis) -+#: C/index.docbook:1811(listitem/synopsis) -+#: C/index.docbook:1822(listitem/synopsis) - #, no-wrap - msgid "false (boolean)" - msgstr "false (booleano)" - --#: C/index.docbook:1626(listitem/para) -+#: C/index.docbook:1628(listitem/para) - msgid "Controls whether the banner message text is displayed." - msgstr "Controla si se muestra o no el mensaje de texto." - --#: C/index.docbook:1633(varlistentry/term) -+#: C/index.docbook:1635(varlistentry/term) - msgid "/apps/gdm/simple-greeter/banner_message_text" - msgstr "/apps/gdm/simple-greeter/banner_message_text" - --#: C/index.docbook:1635(listitem/synopsis) -+#: C/index.docbook:1637(listitem/synopsis) - #, no-wrap - msgid "NULL (string)" - msgstr "NULL (cadena)" - --#: C/index.docbook:1636(listitem/para) -+#: C/index.docbook:1638(listitem/para) - msgid "Specifies the text banner message to show on the greeter window." - msgstr "" - "Especifica el mensaje de texto que mostrar en la ventana de la interfaz." - --#: C/index.docbook:1644(varlistentry/term) -+#: C/index.docbook:1646(varlistentry/term) - msgid "/apps/gdm/simple-greeter/disable_restart_buttons" - msgstr "/apps/gdm/simple-greeter/disable_restart_buttons" - --#: C/index.docbook:1647(listitem/para) -+#: C/index.docbook:1649(listitem/para) - msgid "Controls whether to show the restart buttons in the login window." - msgstr "" - "Controla si se deben mostrar los botones de reinicio en la ventana de " - "entrada." - --#: C/index.docbook:1655(varlistentry/term) -+#: C/index.docbook:1657(varlistentry/term) - msgid "/apps/gdm/simple-greeter/disable_user_list" - msgstr "/apps/gdm/simple-greeter/disable_user_list" - --#: C/index.docbook:1658(listitem/para) -+#: C/index.docbook:1660(listitem/para) - msgid "" - "If true, then the face browser with known users is not shown in the login " - "window." -@@ -2627,32 +2641,32 @@ msgstr "" - "Si está activada, entonces no se muestra el examinador de rostros con " - "usuarios conocidos en la ventana de inicio." - --#: C/index.docbook:1666(varlistentry/term) -+#: C/index.docbook:1668(varlistentry/term) - msgid "/apps/gdm/simple-greeter/logo_icon_name" - msgstr "/apps/gdm/simple-greeter/logo_icon_name" - --#: C/index.docbook:1668(listitem/synopsis) -+#: C/index.docbook:1670(listitem/synopsis) - #, no-wrap - msgid "computer (string)" - msgstr "computer (cadena)" - --#: C/index.docbook:1669(listitem/para) -+#: C/index.docbook:1671(listitem/para) - msgid "Set to the themed icon name to use for the greeter logo." - msgstr "" - "Establecida al nombre del tema de iconos que usar para el logotipo de la " - "interfaz." - --#: C/index.docbook:1676(varlistentry/term) -+#: C/index.docbook:1678(varlistentry/term) - msgid "/apps/gdm/simple-greeter/recent-languages" - msgstr "/apps/gdm/simple-greeter/recent-languages" - --#: C/index.docbook:1678(listitem/synopsis) --#: C/index.docbook:1700(listitem/synopsis) -+#: C/index.docbook:1680(listitem/synopsis) -+#: C/index.docbook:1702(listitem/synopsis) - #, no-wrap - msgid "[] (string list)" - msgstr "[] (lista de cadenas)" - --#: C/index.docbook:1679(listitem/para) -+#: C/index.docbook:1681(listitem/para) - msgid "" - "Set to a list of languages to be shown by default in the login window. " - "Default value is \"[]\". With the default setting only the system default " -@@ -2665,7 +2679,7 @@ msgstr "" - "«Otros...» que mostrará un diálogo emergente con una lista completa de " - "idiomas disponibles entre los que el usuario puede seleccionar." - --#: C/index.docbook:1687(listitem/para) -+#: C/index.docbook:1689(listitem/para) - msgid "" - "Users are not intended to change this setting by hand. Instead GDM keeps " - "track of any languages selected in this configuration key, and will show " -@@ -2678,11 +2692,11 @@ msgstr "" - "junto con la opción «Otros...». De esta forma los idiomas seleccionados son " - "más fáciles de seleccionar." - --#: C/index.docbook:1698(varlistentry/term) -+#: C/index.docbook:1700(varlistentry/term) - msgid "/apps/gdm/simple-greeter/recent-layouts" - msgstr "/apps/gdm/simple-greeter/recent-layouts" - --#: C/index.docbook:1701(listitem/para) -+#: C/index.docbook:1703(listitem/para) - msgid "" - "Set to a list of keyboard layouts to be shown by default in the login panel. " - "Default value is \"[]\". With the default setting only the system default " -@@ -2697,7 +2711,7 @@ msgstr "" - "una lista completa de distribuciones de teclado disponibles entre las que el " - "usuario puede seleccionar." - --#: C/index.docbook:1709(listitem/para) -+#: C/index.docbook:1711(listitem/para) - msgid "" - "Users are not intended to change this setting by hand. Instead GDM keeps " - "track of any keyboard layouts selected in this configuration key, and will " -@@ -2711,21 +2725,21 @@ msgstr "" - "esta forma las distribuciones de teclado seleccionadas son más fáciles de " - "seleccionar." - --#: C/index.docbook:1720(varlistentry/term) -+#: C/index.docbook:1722(varlistentry/term) - msgid "/apps/gdm/simple-greeter/wm_use_compiz" - msgstr "/apps/gdm/simple-greeter/wm_use_compiz" - --#: C/index.docbook:1723(listitem/para) -+#: C/index.docbook:1725(listitem/para) - msgid "" - "Controls whether compiz is used as the window manager instead of metacity." - msgstr "" - "Controla si se usa compiz como gestor de ventanas en lugar de metacity." - --#: C/index.docbook:1733(sect2/title) -+#: C/index.docbook:1735(sect2/title) - msgid "Accessibility Configuration" - msgstr "Configuración de la accesibilidad" - --#: C/index.docbook:1735(sect2/para) -+#: C/index.docbook:1737(sect2/para) - msgid "" - "This section describes the accessibility configuration options available in " - "GDM." -@@ -2733,11 +2747,11 @@ msgstr "" - "Esta sección describe las opciones de configuración de accesibilidad " - "disponibles en GDM." - --#: C/index.docbook:1741(sect3/title) -+#: C/index.docbook:1743(sect3/title) - msgid "GDM Accessibility Dialog And GConf Keys" - msgstr "Diálogo de accesibilidad y claves de GConf de GDM" - --#: C/index.docbook:1743(sect3/para) -+#: C/index.docbook:1745(sect3/para) - msgid "" - "The GDM greeter panel at the login screen displays an accessibility icon. " - "Clicking on that icon opens the GDM Accessibility Dialog. In the GDM " -@@ -2750,7 +2764,7 @@ msgstr "" - "lista de casillas de verificación para que el usuario pueda activar o " - "desactivar las tecnologías de asistencia asociadas." - --#: C/index.docbook:1750(sect3/para) -+#: C/index.docbook:1752(sect3/para) - msgid "" - "The checkboxes that correspond to the on-screen keyboard, screen magnifier " - "and screen reader assistive tools act on the three GConf keys that are " -@@ -2777,7 +2791,7 @@ msgstr "" - "estaban ejecutando en la última sesión de GDM se lanzarán automáticamente en " - "la siguiente sesión de inicio de GDM." - --#: C/index.docbook:1764(sect3/para) -+#: C/index.docbook:1766(sect3/para) - msgid "" - "The other checkboxes in the GDM Accessibility Dialog do not have " - "corresponding GConf keys because no additional program is launched to " -@@ -2792,26 +2806,26 @@ msgstr "" - "accesibilidad proporcionadas por el servidor X que siempre se está " - "ejecutando durante la sesión GDM." - --#: C/index.docbook:1774(sect3/title) -+#: C/index.docbook:1776(sect3/title) - msgid "Accessibility GConf Keys" - msgstr "Claves de accesibilidad de GConf" - --#: C/index.docbook:1776(sect3/para) -+#: C/index.docbook:1778(sect3/para) - msgid "" - "GDM offers the following GConf keys to control its accessibility features:" - msgstr "" - "GDM ofrece las siguientes claves de GConf para controlar sus características " - "de accesibilidad:" - --#: C/index.docbook:1782(variablelist/title) -+#: C/index.docbook:1784(variablelist/title) - msgid "GDM Configuration Keys" - msgstr "Claves de configuración de GDM" - --#: C/index.docbook:1785(varlistentry/term) -+#: C/index.docbook:1787(varlistentry/term) - msgid "/desktop/gnome/interface/accessibility" - msgstr "/desktop/gnome/interface/accessibility" - --#: C/index.docbook:1788(listitem/para) -+#: C/index.docbook:1790(listitem/para) - msgid "" - "Controls whether the Accessibility infrastructure will be started with the " - "GDM GUI. This is needed for many accessibility technology programs to work." -@@ -2819,11 +2833,11 @@ msgstr "" - "Controla si la infraestructura de accesibilidad se iniciará con la IGU de " - "GDM. Esto es necesario para que los programas de accesibilidad funcionen." - --#: C/index.docbook:1796(varlistentry/term) -+#: C/index.docbook:1798(varlistentry/term) - msgid "/desktop/gnome/applications/at/screen_magnifier_enabled" - msgstr "/desktop/gnome/applications/at/screen_magnifier_enabled" - --#: C/index.docbook:1799(listitem/para) -+#: C/index.docbook:1801(listitem/para) - msgid "" - "If set, then the assistive tools linked to this GConf key will be started " - "with the GDM GUI program. By default this is a screen magnifier application." -@@ -2832,11 +2846,11 @@ msgstr "" - "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma " - "predeterminada es una aplicación de magnificación de pantalla." - --#: C/index.docbook:1807(varlistentry/term) -+#: C/index.docbook:1809(varlistentry/term) - msgid "/desktop/gnome/applications/at/screen_keyboard_enabled" - msgstr "/desktop/gnome/applications/at/screen_keyboard_enabled" - --#: C/index.docbook:1810(listitem/para) -+#: C/index.docbook:1812(listitem/para) - msgid "" - "If set, then the assistive tools linked to this GConf key will be started " - "with the GDM GUI program. By default this is an on-screen keyboard " -@@ -2846,11 +2860,11 @@ msgstr "" - "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma " - "predeterminada es una aplicación de teclado en pantalla." - --#: C/index.docbook:1818(varlistentry/term) -+#: C/index.docbook:1820(varlistentry/term) - msgid "/desktop/gnome/applications/at/screen_reader_enabled" - msgstr "/desktop/gnome/applications/at/screen_reader_enabled" - --#: C/index.docbook:1821(listitem/para) -+#: C/index.docbook:1823(listitem/para) - msgid "" - "If set, then the assistive tools linked to this GConf key will be started " - "with the GDM GUI program. By default this is a screen reader application." -@@ -2859,11 +2873,11 @@ msgstr "" - "clave de GConf se iniciarán con la interfaz gráfica de GDM. De forma " - "predeterminada es una aplicación de lectura de pantalla." - --#: C/index.docbook:1832(sect3/title) -+#: C/index.docbook:1834(sect3/title) - msgid "Linking GConf Keys to Accessbility Tools" - msgstr "Enlazar las claves de GConf con herramientas de accesibilidad" - --#: C/index.docbook:1834(sect3/para) -+#: C/index.docbook:1836(sect3/para) - msgid "" - "For the screen_magnifier_enabled, the screen_keyboard_enabled, and the " - "screen_reader_enabled GConf keys, the assistive tool which gets launched " -@@ -2884,7 +2898,7 @@ msgstr "" - "esa clave de GConf en el valor AutostartCondition en el archivo de " - "escritorio. Por ejemplo, el valor podría ser uno de los siguientes:" - --#: C/index.docbook:1846(sect3/screen) -+#: C/index.docbook:1848(sect3/screen) - #, no-wrap - msgid "" - "\n" -@@ -2897,7 +2911,7 @@ msgstr "" - "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_magnifier_enabled\n" - "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_reader_enabled\n" - --#: C/index.docbook:1852(sect3/para) -+#: C/index.docbook:1854(sect3/para) - msgid "" - "When an accessibility key is true, then any program which is linked to that " - "key in a GDM autostart desktop file will be launched (unless the Hidden key " -@@ -2912,13 +2926,13 @@ msgstr "" - "herramientas de asistencia si existen archivos de escritorio múltiples con " - "esta condición AutostartCondition en la carpeta de inicio automático del GDM." - --#: C/index.docbook:1862(sect3/title) -+#: C/index.docbook:1864(sect3/title) - msgid "Example Of Modifying Accessibility Tool Configuration" - msgstr "" - "Ejemplo de modificación de la configuración de la herramienta de " - "accesibilidad" - --#: C/index.docbook:1864(sect3/para) -+#: C/index.docbook:1866(sect3/para) - msgid "" - "For example, if GNOME is distributed with GOK as the default on-screen " - "keyboard, then this could be replaced with a different program if desired. " -@@ -2933,7 +2947,7 @@ msgstr "" - "«mousetweaks» (ajustes finos del ratón) para soporte de pulsación al " - "posarse, entonces se necesita la siguiente configuración." - --#: C/index.docbook:1872(sect3/para) -+#: C/index.docbook:1874(sect3/para) - msgid "" - "Create a desktop file for onboard and a second one for mousetweaks; for " - "example, onboard.desktop and mousetweaks.desktop. These files must be placed " -@@ -2946,12 +2960,12 @@ msgstr "" - "automático del GDM y estar en el formato explicado en la sección " - "«Configuración automática al inicio» de este documento." - --#: C/index.docbook:1880(sect3/para) -+#: C/index.docbook:1882(sect3/para) - msgid "The following is an example onboard.desktop file:" - msgstr "" - "Lo siguiente es un ejemplo del archivo onboard.desktop:" - --#: C/index.docbook:1884(sect3/screen) -+#: C/index.docbook:1886(sect3/screen) - #, no-wrap - msgid "" - "\n" -@@ -2980,14 +2994,14 @@ msgstr "" - "Categories=GNOME;GTK;Accessibility;\n" - "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled\n" - --#: C/index.docbook:1898(sect3/para) -+#: C/index.docbook:1900(sect3/para) - msgid "" - "The following is an example mousetweaks.desktop file:" - msgstr "" - "Lo siguiente es un ejemplo del archivo mousetweaks.desktop:" - --#: C/index.docbook:1903(sect3/screen) -+#: C/index.docbook:1905(sect3/screen) - #, no-wrap - msgid "" - "\n" -@@ -3016,7 +3030,7 @@ msgstr "" - "Categories=GNOME;GTK;Accessibility;\n" - "AutostartCondition=GNOME /desktop/gnome/applications/at/screen_keyboard_enabled\n" - --#: C/index.docbook:1917(sect3/para) -+#: C/index.docbook:1919(sect3/para) - msgid "" - "Note the line with the AutostartCondition that links both desktop files to " - "the GConf key for the on-screen keyboard." -@@ -3024,7 +3038,7 @@ msgstr "" - "Note la línea con AutostartCondition que enlaza tanto los archivos de " - "escritorio con las claves de GConf para el teclado en pantalla." - --#: C/index.docbook:1922(sect3/para) -+#: C/index.docbook:1924(sect3/para) - msgid "" - "To disable GOK from starting, the desktop file for the GOK on-screen " - "keyboard must be removed or deactivated. Otherwise onboard and GOK would " -@@ -3039,7 +3053,7 @@ msgstr "" - "automático del GDM o añadiendo la clave de ajuste «Hidden=true» al archivo " - "gok.desktop." - --#: C/index.docbook:1930(sect3/para) -+#: C/index.docbook:1932(sect3/para) - msgid "" - "After making these changes, GOK will no longer be started when the user " - "activates the on-screen keyboard in the GDM session; but onboard and " -@@ -3049,11 +3063,11 @@ msgstr "" - "usuario inicie el teclado en pantalla en la sesión de GDM; en su lugar se " - "lanzarán el teclado en pantalla «onboard» y los ajustes finos del ratón." - --#: C/index.docbook:1939(sect2/title) -+#: C/index.docbook:1941(sect2/title) - msgid "General Session Settings" - msgstr "Ajustes generales de sesión" - --#: C/index.docbook:1948(sect2/para) -+#: C/index.docbook:1950(sect2/para) - msgid "" - "The GDM Greeter uses some of the same framework that your desktop session " - "will use. And so, it is influenced by a number of the same GConf settings. " -@@ -3070,11 +3084,11 @@ msgstr "" - "política obligatoria del sistema. GDM instala su propia política obligatoria " - "para bloquear algunos ajustes por seguridad." - --#: C/index.docbook:1959(sect2/title) -+#: C/index.docbook:1961(sect2/title) - msgid "GNOME Settings Daemon" - msgstr "Administrador de preferencias de GNOME" - --#: C/index.docbook:1972(sect2/para) -+#: C/index.docbook:1974(sect2/para) - msgid "" - "GDM enables the following gnome-settings-daemon plugins: a11y-keyboard, " - "background, sound, xsettings." -@@ -3082,7 +3096,7 @@ msgstr "" - "GDM activa los siguientes complementos de gnome-settings-daemon: a11y-" - "keyboard, background, sound, xsettings." - --#: C/index.docbook:1977(sect2/para) -+#: C/index.docbook:1979(sect2/para) - msgid "" - "These are responsible for things like the background image, font and theme " - "settings, sound events, etc." -@@ -3090,7 +3104,7 @@ msgstr "" - "Éstos son responsables de cosas como la imagen de fondo, los ajustes de " - "tipografía y tema, eventos de sonido, etc." - --#: C/index.docbook:1982(sect2/para) -+#: C/index.docbook:1984(sect2/para) - msgid "" - "Plugins can also be disabled using GConf. For example, if you want to " - "disable the sound plugin then unset the following key: /apps/gdm/" -@@ -3101,11 +3115,11 @@ msgstr "" - "/apps/gdm/simple-greeter/settings-manager-plugins/sound/active." - --#: C/index.docbook:1990(sect2/title) -+#: C/index.docbook:1992(sect2/title) - msgid "GDM Session Configuration" - msgstr "Configuración de sesión de GDM" - --#: C/index.docbook:1992(sect2/para) -+#: C/index.docbook:1994(sect2/para) - msgid "" - "GDM sessions are specified using the FreeDesktop.org Desktop Entry " - "Specification, which can be referenced at the following URL: http://www.freedesktop.org/wiki/Specifications/desktop-entry-spec." - --#: C/index.docbook:1999(sect2/para) -+#: C/index.docbook:2001(sect2/para) - msgid "" - "By default, GDM will install desktop files in the <share>/" - "xsessions directory. GDM will search the following directories in " -@@ -3139,7 +3153,7 @@ msgstr "" - "etc>/dm/ a no ser que GDM se configure para usar una carpeta " - "diferente a través de la opción «--with-dmconfdir»." - --#: C/index.docbook:2012(sect2/para) -+#: C/index.docbook:2014(sect2/para) - msgid "" - "A session can be disabled by editing the desktop file and adding a line as " - "follows: Hidden=true." -@@ -3147,7 +3161,7 @@ msgstr "" - "Se puede desactivar una sesión editando el archivo de escritorio y añadiendo " - "una como la siguiente Hidden=true." - --#: C/index.docbook:2017(sect2/para) -+#: C/index.docbook:2019(sect2/para) - msgid "" - "GDM desktop files support a GDM-specific extension, a key named \"X-GDM-" - "BypassXsession\". If the key is not specified in a desktop file, the value " -@@ -3175,11 +3189,11 @@ msgstr "" - "en el sistema o en scripts de usuario que puedan impedir que un usuario " - "pueda iniciar una sesión." - --#: C/index.docbook:2036(sect2/title) -+#: C/index.docbook:2038(sect2/title) - msgid "GDM User Session and Language Configuration" - msgstr "Sesión de usuario de GDM y configuración de idioma" - --#: C/index.docbook:2037(sect2/para) -+#: C/index.docbook:2039(sect2/para) - msgid "" - "The user's default session and language choices are stored in the " - "~/.dmrc file. When a user logs in for the first time, " -@@ -3194,7 +3208,7 @@ msgstr "" - "valor diferente al iniciar sesión. GDM recordará estos cambios para inicios " - "posteriores." - --#: C/index.docbook:2045(sect2/para) -+#: C/index.docbook:2047(sect2/para) - msgid "" - "The ~/.dmrc file is in the standard INI format. It has one section called [Desktop] " -@@ -3206,7 +3220,7 @@ msgstr "" - "que tiene dos claves: Session y Language." - --#: C/index.docbook:2052(sect2/para) -+#: C/index.docbook:2054(sect2/para) - msgid "" - "The Session key specifies the basename of the session " - ".desktop file that the user wishes to normally use " -@@ -3223,7 +3237,7 @@ msgstr "" - "usa el predeterminado del sistema. El archivo normalmente tiene la siguiente " - "apariencia:" - --#: C/index.docbook:2061(sect2/screen) -+#: C/index.docbook:2063(sect2/screen) - #, no-wrap - msgid "" - "\n" -@@ -3236,15 +3250,15 @@ msgstr "" - "Session=gnome\n" - "Language=es_ES.UTF-8\n" - --#: C/index.docbook:2073(sect1/title) -+#: C/index.docbook:2075(sect1/title) - msgid "GDM Commands" - msgstr "Comandos de GDM" - --#: C/index.docbook:2076(sect2/title) -+#: C/index.docbook:2078(sect2/title) - msgid "GDM Root User Commands" - msgstr "Comandos del administrador de GDM" - --#: C/index.docbook:2078(sect2/para) -+#: C/index.docbook:2080(sect2/para) - msgid "" - "The GDM package provides the following commands in sbindir intended to be run by the root user:" -@@ -3252,14 +3266,14 @@ msgstr "" - "El paquete GDM proporciona los siguientes comandos en sbindir con la intención de que los use el usario root:" - --#: C/index.docbook:2084(sect3/title) C/index.docbook:2099(variablelist/title) -+#: C/index.docbook:2086(sect3/title) C/index.docbook:2101(variablelist/title) - msgid "" - "gdm and gdm-binary Command Line Options" - msgstr "" - "Opciones de línea de comandos de gdm y gdm-" - "binary" - --#: C/index.docbook:2087(sect3/para) -+#: C/index.docbook:2089(sect3/para) - msgid "" - "The gdm command is really just a script which runs the " - "gdm-binary, passing along any options. Before launching " -@@ -3279,43 +3293,43 @@ msgstr "" - "si cualquiera de LC_MESSAGES o LC_ALL está establecida. gdm-binary es el demonio actual de GDM." - --#: C/index.docbook:2103(varlistentry/term) -+#: C/index.docbook:2105(varlistentry/term) - msgid "-?, --help" - msgstr "-?, --help" - --#: C/index.docbook:2105(listitem/para) -+#: C/index.docbook:2107(listitem/para) - msgid "Gives a brief overview of the command line options." - msgstr "Da un breve resumen de las opciones de línea de comandos." - --#: C/index.docbook:2112(varlistentry/term) -+#: C/index.docbook:2114(varlistentry/term) - msgid "--fatal-warnings" - msgstr "--fatal-warnings" - --#: C/index.docbook:2114(listitem/para) -+#: C/index.docbook:2116(listitem/para) - msgid "Make all warnings cause GDM to exit." - msgstr "Causa que todas las advertencias hagan que GDM salga." - --#: C/index.docbook:2121(varlistentry/term) -+#: C/index.docbook:2123(varlistentry/term) - msgid "--timed-exit" - msgstr "--timed-exit" - --#: C/index.docbook:2123(listitem/para) -+#: C/index.docbook:2125(listitem/para) - msgid "Exit after 30 seconds. Useful for debugging." - msgstr "Sale después de 30 segundos. Útil para depuración." - --#: C/index.docbook:2130(varlistentry/term) -+#: C/index.docbook:2132(varlistentry/term) - msgid "--version" - msgstr "--version" - --#: C/index.docbook:2132(listitem/para) -+#: C/index.docbook:2134(listitem/para) - msgid "Print the version of the GDM daemon." - msgstr "Imprime la versión del demonio GDM." - --#: C/index.docbook:2141(sect3/title) -+#: C/index.docbook:2143(sect3/title) - msgid "gdm-restart Command Line Options" - msgstr "Opciones de línea de comandos de gdm-restart" - --#: C/index.docbook:2143(sect3/para) -+#: C/index.docbook:2145(sect3/para) - msgid "" - "gdm-restart stops and restarts GDM by sending the GDM " - "daemon a HUP signal. This command will immediately terminate all sessions " -@@ -3325,11 +3339,11 @@ msgstr "" - "GDM una señal HUP. Este comando inmediatamente terminará todas las sesiones " - "y echará fuera a los usuarios que hayan entrado con GDM." - --#: C/index.docbook:2151(sect3/title) -+#: C/index.docbook:2153(sect3/title) - msgid "gdm-safe-restart Command Line Options" - msgstr "Opciones de línea de comandos de gdm-safe-restart" - --#: C/index.docbook:2153(sect3/para) -+#: C/index.docbook:2155(sect3/para) - msgid "" - "gdm-safe-restart stops and restarts GDM by sending the " - "GDM daemon a USR1 signal. GDM will be restarted as soon as all users log out." -@@ -3338,22 +3352,22 @@ msgstr "" - "GDM una señal USR1. GDM re reiniciará tan pronto como todos los usuarios " - "salgan." - --#: C/index.docbook:2161(sect3/title) -+#: C/index.docbook:2163(sect3/title) - msgid "gdm-stop Command Line Options" - msgstr "Opciones de línea de comandos de gdm-stop" - --#: C/index.docbook:2163(sect3/para) -+#: C/index.docbook:2165(sect3/para) - msgid "" - "gdm-stop stops GDM by sending the GDM daemon a TERM " - "signal." - msgstr "" - "gdm-stop para GDM enviando al demonio GDM una señal TERM." - --#: C/index.docbook:2174(sect1/title) -+#: C/index.docbook:2176(sect1/title) - msgid "Troubleshooting" - msgstr "Resolución de problemas" - --#: C/index.docbook:2182(sect1/para) -+#: C/index.docbook:2184(sect1/para) - msgid "" - "This section discusses helpful tips for getting GDM working. In general, if " - "you have a problem using GDM, you can submit a bug or send an email to the " -@@ -3365,7 +3379,7 @@ msgstr "" - "a la lista de correo. En la sección de introducción del documento se " - "proporciona información sobre esto." - --#: C/index.docbook:2189(sect1/para) -+#: C/index.docbook:2191(sect1/para) - msgid "" - "If GDM is failing to work properly, it is always a good idea to include " - "debug information. To enable debugging, set the debug/Enable key to \"true\" " -@@ -3393,11 +3407,11 @@ msgstr "" - "(consulte la página man de syslog)." - --#: C/index.docbook:2205(sect2/title) -+#: C/index.docbook:2207(sect2/title) - msgid "GDM Will Not Start" - msgstr "GDM no se inicia" - --#: C/index.docbook:2207(sect2/para) -+#: C/index.docbook:2209(sect2/para) - msgid "" - "There are a many problems that can cause GDM to fail to start, but this " - "section will discuss a few common problems and how to approach tracking down " -@@ -3411,7 +3425,7 @@ msgstr "" - "de error o un diálogo cuando intenta iniciarse, pero puede ser difícil " - "seguir un problema cuando GDM falla de forma silenciosa." - --#: C/index.docbook:2216(sect2/para) -+#: C/index.docbook:2218(sect2/para) - msgid "" - "First make sure that the Xserver is configured properly. The GDM " - "configuration file contains a command in the [server-Standard] section that " -@@ -3434,7 +3448,7 @@ msgstr "" - "de comandos. Si es así, modifique el comando del servidor X en el archivo de " - "configuración de GDM para que sea correcto para su sistema." - --#: C/index.docbook:2229(sect2/para) -+#: C/index.docbook:2231(sect2/para) - msgid "" - "Also make sure that the /tmp directory has reasonable " - "ownership and permissions, and that the machine's file system is not full. " -@@ -3444,11 +3458,11 @@ msgstr "" - "propiedad razonables, y que el sistema de archivos de la máquina no está " - "lleno. Estos problemas harán que GDM falle al iniciar." - --#: C/index.docbook:2240(sect1/title) -+#: C/index.docbook:2242(sect1/title) - msgid "License" - msgstr "Licencia" - --#: C/index.docbook:2241(sect1/para) -+#: C/index.docbook:2243(sect1/para) - msgid "" - "This program is free software; you can redistribute it and/or modify it " - "under the terms of the " -@@ -3462,7 +3476,7 @@ msgstr "" - "publica por la Free Software Foundation; ya sea la versión 2 de la Licencia, " - "o (a su elección) cualquier versión posterior." - --#: C/index.docbook:2249(sect1/para) -+#: C/index.docbook:2251(sect1/para) - msgid "" - "This program is distributed in the hope that it will be useful, but WITHOUT " - "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " -@@ -3474,7 +3488,7 @@ msgstr "" - "IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Vea la Licencia Pública " - "General GNU para más detalles." - --#: C/index.docbook:2263(para/address) -+#: C/index.docbook:2265(para/address) - #, no-wrap - msgid "" - "\n" -@@ -3491,7 +3505,7 @@ msgstr "" - " USA\n" - " " - --#: C/index.docbook:2255(sect1/para) -+#: C/index.docbook:2257(sect1/para) - msgid "" - "A copy of the GNU General Public License is included " - "as an appendix to the GNOME Users Guide. You may also " -diff --git a/gui/libgdm/gdm-user-switching.c b/gui/libgdm/gdm-user-switching.c -index 507dd27..c4342f2 100644 ---- a/gui/libgdm/gdm-user-switching.c -+++ b/gui/libgdm/gdm-user-switching.c -@@ -475,11 +475,13 @@ get_login_window_session_id_for_systemd (const char *seat_id, - ret = TRUE; - - out: -- for (i = 0; sessions[i]; i ++) { -- free (sessions[i]); -- } -+ if (sessions) { -+ for (i = 0; sessions[i]; i ++) { -+ free (sessions[i]); -+ } - -- free (sessions); -+ free (sessions); -+ } - - return ret; - } -diff --git a/po/fur.po b/po/fur.po -index bb89eac..8ec4a14 100644 ---- a/po/fur.po -+++ b/po/fur.po -@@ -6,116 +6,121 @@ - msgid "" - msgstr "" - "Project-Id-Version: gdm2\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2008-03-11 13:14+0100\n" --"PO-Revision-Date: 2008-03-08 15:53+0100\n" --"Last-Translator: Massimo Furlani \n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"product=gdm&keywords=I18N+L10N&component=general\n" -+"POT-Creation-Date: 2013-01-04 07:24+0000\n" -+"PO-Revision-Date: 2013-01-10 00:33+0100\n" -+"Last-Translator: Fabio Tomat \n" - "Language-Team: FRIULIAN \n" -+"Language: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "X-Poedit-Language: Friulian\n" - "X-Poedit-Country: ITALY\n" - --#: ../common/gdm-common.c:395 -+#: ../common/gdm-common.c:492 - #, c-format - msgid "/dev/urandom is not a character device" - msgstr "/dev/urandom nol è un caratar device" - --#: ../daemon/factory-slave-main.c:156 ../daemon/product-slave-main.c:156 --#: ../daemon/simple-slave-main.c:158 ../daemon/xdmcp-chooser-slave-main.c:156 --msgid "Display ID" --msgstr "Mostre ID" -- --#: ../daemon/factory-slave-main.c:156 ../daemon/product-slave-main.c:156 --#: ../daemon/simple-slave-main.c:158 ../daemon/xdmcp-chooser-slave-main.c:156 --msgid "id" --msgstr "id" -- --#: ../daemon/factory-slave-main.c:168 ../daemon/product-slave-main.c:168 --#: ../daemon/simple-slave-main.c:170 ../daemon/xdmcp-chooser-slave-main.c:168 --msgid "GNOME Display Manager Slave" --msgstr "" -- --#: ../daemon/gdm-display-access-file.c:246 -+#: ../daemon/gdm-display-access-file.c:300 - #, c-format - msgid "could not find user \"%s\" on system" - msgstr "Impussibil cjatâ l'utent \"%s\" tal sisteme" - --#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:172 --msgid "Unable to initialize login system" --msgstr "" -- --#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:204 --msgid "Unable to authenticate user" --msgstr "Impussibil autenticâ l'utent" -+#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354 -+#, fuzzy, c-format -+#| msgid "no user account available" -+msgid "No session available yet" -+msgstr "nol è pussibil doprâ nissun account user" - --#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:233 --msgid "Unable to authorize user" -+#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 -+#, fuzzy, c-format -+#| msgid "Unable to authorize user" -+msgid "Unable to look up UID of user %s" - msgstr "Impussibil autorizâ l'utent" - --#: ../daemon/gdm-factory-slave.c:281 --msgid "Unable to establish credentials" --msgstr "" -+#: ../daemon/gdm-manager.c:291 -+#, fuzzy -+#| msgid "no user account available" -+msgid "no sessions available" -+msgstr "nol è pussibil doprâ nissun account user" - --#: ../daemon/gdm-factory-slave.c:650 ../daemon/gdm-product-slave.c:394 --#: ../daemon/gdm-simple-slave.c:951 --msgid "" --"Could not start the X server (your graphical environment) due to some " --"internal error. Please contact your system administrator or check your " --"syslog to diagnose. In the meantime this display will be disabled. Please " --"restart GDM when the problem is corrected." --msgstr "" -+#: ../daemon/gdm-manager.c:352 -+#, c-format -+msgid "No sessions for %s available for reauthentication" -+msgstr "Nissune session di ri-autenticazion disponibil par %s" -+ -+#: ../daemon/gdm-manager.c:406 -+#, fuzzy, c-format -+#| msgid "unable to log session" -+msgid "Unable to find session for user %s" -+msgstr "impussibil loggasi ta session" - --#: ../daemon/gdm-server.c:244 -+#: ../daemon/gdm-manager.c:476 -+#, c-format -+msgid "Unable to find appropriate session for user %s" -+msgstr "Impussibil cjatâ la session juste par l'utent %s" -+ -+#: ../daemon/gdm-manager.c:671 -+#, fuzzy -+#| msgid "User %s doesn't exist" -+msgid "User doesn't own session" -+msgstr "L'utent %s nol esist" -+ -+#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 -+#, fuzzy -+#| msgid "no user account available" -+msgid "No session available" -+msgstr "nol è pussibil doprâ nissun account user" -+ -+#: ../daemon/gdm-server.c:273 - #, c-format - msgid "%s: failed to connect to parent display '%s'" --msgstr "" -+msgstr "%s: Falît tal conetisi al visôr pari '%s'" - --#: ../daemon/gdm-server.c:362 -+#: ../daemon/gdm-server.c:452 - #, c-format - msgid "Server was to be spawned by user %s but that user doesn't exist" - msgstr "" -+"Il server al veve di sedi inviât dal'utent %s ma chest utent a no'l esist" - --#: ../daemon/gdm-server.c:373 ../daemon/gdm-welcome-session.c:406 -+#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 - #, c-format - msgid "Couldn't set groupid to %d" --msgstr "" -+msgstr "Impussibil impostâ il grupid a %d" - --#: ../daemon/gdm-server.c:379 ../daemon/gdm-welcome-session.c:412 -+#: ../daemon/gdm-server.c:469 - #, c-format - msgid "initgroups () failed for %s" --msgstr "" -+msgstr "initgroups () falît par %s" - --#: ../daemon/gdm-server.c:385 ../daemon/gdm-welcome-session.c:418 -+#: ../daemon/gdm-server.c:475 - #, c-format - msgid "Couldn't set userid to %d" --msgstr "" -+msgstr "No puès impostâ il ID utent a %d" - --#: ../daemon/gdm-server.c:393 ../daemon/gdm-welcome-session.c:426 --msgid "Couldn't set groupid to 0" --msgstr "" -- --#: ../daemon/gdm-server.c:428 -+#: ../daemon/gdm-server.c:522 - #, c-format --msgid "%s: Could not open logfile for display %s!" --msgstr "" -+msgid "%s: Could not open log file for display %s!" -+msgstr "%s: no puès vierzi il file çoc par il visôr %s!" - --#: ../daemon/gdm-server.c:439 ../daemon/gdm-server.c:445 --#: ../daemon/gdm-server.c:451 -+#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 -+#: ../daemon/gdm-server.c:545 - #, c-format - msgid "%s: Error setting %s to %s" --msgstr "" -+msgstr "%s: Erôr configurant %s a %s" - --#: ../daemon/gdm-server.c:466 -+#: ../daemon/gdm-server.c:565 - #, c-format - msgid "%s: Server priority couldn't be set to %d: %s" --msgstr "" -+msgstr "%s: La prioritât dal server a no puès sedi impostade a %d: %s" - --#: ../daemon/gdm-server.c:618 -+#: ../daemon/gdm-server.c:722 - #, c-format - msgid "%s: Empty server command for display %s" --msgstr "" -+msgstr "%s: Al mancje il comant dal server par il visôr %s" - - #: ../daemon/gdm-session-auditor.c:90 - #, fuzzy -@@ -129,11 +134,11 @@ msgstr "Non utent:" - - #: ../daemon/gdm-session-auditor.c:95 - msgid "Hostname" --msgstr "" -+msgstr "Non Host" - - #: ../daemon/gdm-session-auditor.c:96 - msgid "The hostname" --msgstr "" -+msgstr "Il non dal Host" - - #: ../daemon/gdm-session-auditor.c:101 - #, fuzzy -@@ -142,921 +147,834 @@ msgstr "Mostre ID" - - #: ../daemon/gdm-session-auditor.c:102 - msgid "The display device" --msgstr "" -+msgstr "L'argagn dal visôr" - --#: ../daemon/gdm-session-direct.c:1446 ../daemon/gdm-session-direct.c:1464 --#, c-format --msgid "worker exited with status %d" --msgstr "" -+#: ../daemon/gdm-session.c:1183 -+msgid "Could not create authentication helper process" -+msgstr "Impussibil creâ il procès di jutori par l'autenticazion" - --#: ../daemon/gdm-session-worker.c:954 -+#: ../daemon/gdm-session-worker.c:1029 - #, c-format - msgid "error initiating conversation with authentication system - %s" --msgstr "" -+msgstr "Erôr tal tacâ la conversazion cul sisteme di autenticazion: %s" - --#: ../daemon/gdm-session-worker.c:955 -+#: ../daemon/gdm-session-worker.c:1030 - msgid "general failure" - msgstr "erôr gjenerâl" - --#: ../daemon/gdm-session-worker.c:956 -+#: ../daemon/gdm-session-worker.c:1031 - msgid "out of memory" - msgstr "fûr da memorie" - --#: ../daemon/gdm-session-worker.c:957 -+#: ../daemon/gdm-session-worker.c:1032 - msgid "application programmer error" --msgstr "" -+msgstr "erôr dal programatôr" - --#: ../daemon/gdm-session-worker.c:958 -+#: ../daemon/gdm-session-worker.c:1033 - msgid "unknown error" --msgstr "" -+msgstr "Erôr no cognossût" - --#: ../daemon/gdm-session-worker.c:965 -+#: ../daemon/gdm-session-worker.c:1040 - msgid "Username:" - msgstr "Non utent:" - --#: ../daemon/gdm-session-worker.c:971 --#, c-format --msgid "error informing authentication system of preferred username prompt - %s" --msgstr "" -- --#: ../daemon/gdm-session-worker.c:985 --#, c-format --msgid "error informing authentication system of user's hostname - %s" --msgstr "" -- --#: ../daemon/gdm-session-worker.c:1000 --#, c-format --msgid "error informing authentication system of user's console - %s" --msgstr "" -- --#: ../daemon/gdm-session-worker.c:1163 -+#: ../daemon/gdm-session-worker.c:1046 - #, c-format --msgid "no user account available" --msgstr "nol è pussibil doprâ nissun account user" -- --#: ../daemon/gdm-session-worker.c:1212 --#, c-format --msgid "user account not available on system" --msgstr "" -- --#: ../daemon/gdm-simple-slave.c:323 --msgid "Unable establish credentials" --msgstr "" -- --#: ../daemon/gdm-welcome-session.c:388 --#, c-format --msgid "User %s doesn't exist" --msgstr "L'utent %s nol esist" -- --#: ../daemon/gdm-welcome-session.c:395 --#, c-format --msgid "Group %s doesn't exist" --msgstr "Il grop %s nol esist" -- --#: ../daemon/gdm-xdmcp-display-factory.c:590 --msgid "Could not create socket!" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:856 --#, c-format --msgid "Denied XDMCP query from host %s" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1013 --#: ../daemon/gdm-xdmcp-display-factory.c:1234 --msgid "Could not extract authlist from packet" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1026 --#: ../daemon/gdm-xdmcp-display-factory.c:1249 --msgid "Error in checksum" --msgstr "Erôr tal checksum" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1500 --msgid "Bad address" --msgstr "Indiriz sbagliât" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1581 --#, c-format --msgid "%s: Could not read display address" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1589 --#, c-format --msgid "%s: Could not read display port number" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1598 --#, c-format --msgid "%s: Could not extract authlist from packet" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1618 --#, c-format --msgid "%s: Error in checksum" --msgstr "%s: Erôr tal checksum" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2120 --#, c-format --msgid "%s: Got REQUEST from banned host %s" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2130 --#: ../daemon/gdm-xdmcp-display-factory.c:2485 --#: ../daemon/gdm-xdmcp-display-factory.c:2737 --#, c-format --msgid "%s: Could not read Display Number" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2137 --#, c-format --msgid "%s: Could not read Connection Type" -+msgid "error informing authentication system of preferred username prompt: %s" - msgstr "" -+"erôr tal informâ il sisteme di autenticazion cuâl ch'al è il prompt preferît " -+"dal'utent: %s" - --#: ../daemon/gdm-xdmcp-display-factory.c:2144 -+#: ../daemon/gdm-session-worker.c:1060 - #, c-format --msgid "%s: Could not read Client Address" -+msgid "error informing authentication system of user's hostname: %s" - msgstr "" -+"erôr tal informâ il sisteme di autenticazion cuâl ch'al è il non dal host " -+"dal'utent: %s" - --#: ../daemon/gdm-xdmcp-display-factory.c:2152 -+#: ../daemon/gdm-session-worker.c:1077 - #, c-format --msgid "%s: Could not read Authentication Names" -+msgid "error informing authentication system of user's console: %s" - msgstr "" -+"erôr tal informâ il sisteme di autenticazion cuale che jè la console " -+"dal'utent: %s" - --#: ../daemon/gdm-xdmcp-display-factory.c:2161 -+#: ../daemon/gdm-session-worker.c:1101 - #, c-format --msgid "%s: Could not read Authentication Data" -+msgid "error informing authentication system of display string: %s" - msgstr "" -+"erôr tal informâ il sisteme di autenticazion cuale che jè la stringe dal " -+"visôr: %s" - --#: ../daemon/gdm-xdmcp-display-factory.c:2171 -+#: ../daemon/gdm-session-worker.c:1116 - #, c-format --msgid "%s: Could not read Authorization List" -+msgid "error informing authentication system of display xauth credentials: %s" - msgstr "" -+"erôr tal informâ il sisteme di autenticazion cualis che son lis credenziâls " -+"xauth dal visôr: %s" - --#: ../daemon/gdm-xdmcp-display-factory.c:2190 -+#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471 - #, c-format --msgid "%s: Could not read Manufacturer ID" --msgstr "" -+msgid "no user account available" -+msgstr "nol è pussibil doprâ nissun account user" - --#: ../daemon/gdm-xdmcp-display-factory.c:2217 --#, c-format --msgid "%s: Failed checksum from %s" --msgstr "" -+#: ../daemon/gdm-session-worker.c:1498 -+#, fuzzy -+#| msgid "Unable to authorize user" -+msgid "Unable to change to user" -+msgstr "Impussibil autorizâ l'utent" - --#: ../daemon/gdm-xdmcp-display-factory.c:2469 --#, c-format --msgid "%s: Got Manage from banned host %s" -+#: ../daemon/gdm-simple-slave.c:1426 -+msgid "" -+"Could not start the X server (your graphical environment) due to an internal " -+"error. Please contact your system administrator or check your syslog to " -+"diagnose. In the meantime this display will be disabled. Please restart GDM " -+"when the problem is corrected." - msgstr "" -+"Impussibil fâ partî il server X (l'ambient grafic) par cause di un erôr " -+"interni. Par plasê scrîf al to aministradôr di sisteme o controle il " -+"regjistri di sisteme (çoc di sisteme - syslog) par capî il probleme: pal " -+"moment il visôr al vignarà disabilitât. Une volte justât il probleme, " -+"reinvie GDM." - --#: ../daemon/gdm-xdmcp-display-factory.c:2478 --#: ../daemon/gdm-xdmcp-display-factory.c:2744 -+#: ../daemon/gdm-simple-slave.c:1467 - #, c-format --msgid "%s: Could not read Session ID" --msgstr "" -+msgid "Can only be called before user is logged in" -+msgstr "Al puès sedi clamât nome prime che l'utent al vedi fat l'acès." - --#: ../daemon/gdm-xdmcp-display-factory.c:2492 -+#: ../daemon/gdm-simple-slave.c:1477 - #, c-format --msgid "%s: Could not read Display Class" --msgstr "" -+msgid "Caller not GDM" -+msgstr "Clamadôr no GDM" - --#: ../daemon/gdm-xdmcp-display-factory.c:2597 --#: ../daemon/gdm-xdmcp-display-factory.c:2647 --#: ../daemon/gdm-xdmcp-display-factory.c:2653 --#, c-format --msgid "%s: Could not read address" --msgstr "" -+#: ../daemon/gdm-simple-slave.c:1530 -+msgid "User not logged in" -+msgstr "L'utent no'l à eseguît l'acès" - --#: ../daemon/gdm-xdmcp-display-factory.c:2727 -+#: ../daemon/gdm-xdmcp-chooser-slave.c:370 - #, c-format --msgid "%s: Got KEEPALIVE from banned host %s" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2816 --msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" --msgstr "GdmXdmcpDisplayFactory: No si rive a lei l'header di XDMCP!" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2822 --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:226 --msgid "XMDCP: Incorrect XDMCP version!" --msgstr "XMDCP: la version di XDMCP so je chê juste!" -+msgid "Currently, only one client can be connected at once" -+msgstr "Par cumò nome un client ae volte al puès sedi tacât" - --#: ../daemon/gdm-xdmcp-display-factory.c:2828 --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:232 --msgid "XMDCP: Unable to parse address" --msgstr "" -- --#: ../daemon/gdm-xdmcp-display-factory.c:3226 --#, c-format --msgid "Could not get server hostname: %s!" --msgstr "" -+#: ../daemon/gdm-xdmcp-display-factory.c:604 -+msgid "Could not create socket!" -+msgstr "No puès creâ socket!" - --#: ../daemon/main.c:230 ../daemon/main.c:243 -+#: ../daemon/main.c:126 ../daemon/main.c:139 - #, c-format --msgid "Cannot write PID file %s: possibly out of diskspace: %s" --msgstr "" -+msgid "Cannot write PID file %s: possibly out of disk space: %s" -+msgstr "No puès scrivi il file PID %s: forsit al è finît il spazi su disc: %s" - --#: ../daemon/main.c:263 -+#: ../daemon/main.c:166 - #, c-format - msgid "Logdir %s does not exist or isn't a directory." - msgstr "Logdir %s no esist opûr no je une directory." - --#: ../daemon/main.c:276 -+#: ../daemon/main.c:183 - #, c-format - msgid "Authdir %s does not exist. Aborting." - msgstr "Authdir %s nol esist. O voi fûr." - --#: ../daemon/main.c:280 -+#: ../daemon/main.c:187 - #, c-format - msgid "Authdir %s is not a directory. Aborting." - msgstr "Authdir %s no je une directory. O voi fûr." - --#: ../daemon/main.c:354 -+#: ../daemon/main.c:261 - #, c-format - msgid "Authdir %s is not owned by user %d, group %d. Aborting." --msgstr "" -+msgstr "Authdir %s a no jè di proprietât dal'utent %d, grup %d. O voi fûr." - --#: ../daemon/main.c:361 -+#: ../daemon/main.c:268 - #, c-format - msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." --msgstr "" -+msgstr "Authdir %s a ja permès sbagliâts %o. A varessin di sedi %o. O voi fûr." - --#: ../daemon/main.c:398 -+#: ../daemon/main.c:305 - #, c-format - msgid "Can't find the GDM user '%s'. Aborting!" - msgstr "No rivi a cjatâ l'utent '%s' di GDM. O voi fûr!" - --#: ../daemon/main.c:404 -+#: ../daemon/main.c:311 - msgid "The GDM user should not be root. Aborting!" - msgstr "L'user di GDM nol scugne jessi root. O voi fûr!" - --#: ../daemon/main.c:410 -+#: ../daemon/main.c:317 - #, c-format - msgid "Can't find the GDM group '%s'. Aborting!" - msgstr "No rivi a cjatâ il grop '%s' di GDM. O voi fûr!" - --#: ../daemon/main.c:416 -+#: ../daemon/main.c:323 - msgid "The GDM group should not be root. Aborting!" - msgstr "Il grop di GDM nol scugne jessi root. O voi fûr!" - --#: ../daemon/main.c:510 --msgid "Enable debugging code" --msgstr "" -- --#: ../daemon/main.c:511 -+#: ../daemon/main.c:434 - msgid "Make all warnings fatal" --msgstr "" -+msgstr "Fâs diventâ dutis lis avertencis fatai." - --#: ../daemon/main.c:512 --msgid "Exit after a time - for debugging" --msgstr "" -+#: ../daemon/main.c:435 -+msgid "Exit after a time (for debugging)" -+msgstr "Jes dopo un pôc (par il debug)" - --#: ../daemon/main.c:513 -+#: ../daemon/main.c:436 - msgid "Print GDM version" - msgstr "Stampe la version di GDM" - --#: ../daemon/main.c:528 -+#: ../daemon/main.c:449 - msgid "GNOME Display Manager" - msgstr "GNOME Display Manager" - - #. make sure the pid file doesn't get wiped --#: ../daemon/main.c:589 --msgid "Only root wants to run GDM" -+#: ../daemon/main.c:503 -+#, fuzzy -+#| msgid "Only root wants to run GDM" -+msgid "Only the root user can run GDM" - msgstr "Dome root al pos inviâ GDM" - --#: ../daemon/session-worker-main.c:134 -+#. Translators: worker is a helper process that does the work -+#. of starting up a session -+#: ../daemon/session-worker-main.c:150 - msgid "GNOME Display Manager Session Worker" --msgstr "" -+msgstr "Cjamadôr di session dal Gjestôr di visôr di GNOME" - --#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:148 --msgid "Select System" --msgstr "" -+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 -+msgid "Display ID" -+msgstr "Mostre ID" - --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:214 --msgid "XMCP: Could not create XDMCP buffer!" --msgstr "" -+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 -+msgid "ID" -+msgstr "ID" - --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:220 --msgid "XDMCP: Could not read XDMCP header!" --msgstr "" -+#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 -+msgid "GNOME Display Manager Slave" -+msgstr "Sclâf dal gjestôr di visôr di GNOME" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.c:808 --msgid "Accessibility Preferences" --msgstr "" -+#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 -+msgid "Login Window" -+msgstr "Barcon di acès" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:1 --msgid "Enable features that make your computer easier to use:" --msgstr "" -+#: ../data/applications/gnome-mag.desktop.in.h:1 -+msgid "GNOME Screen Magnifier" -+msgstr "Lint di ingrandiment dal visôr GNOME" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:2 --msgid "Assistive Technology Preferences" --msgstr "" -+#: ../data/applications/gnome-mag.desktop.in.h:2 -+msgid "Magnify parts of the screen" -+msgstr "Ingrandìs zonis dal visôr" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:3 --msgid "_Hear text read aloud (Reader)" --msgstr "" -+#: ../data/applications/gnome-shell.desktop.in.h:1 -+msgid "GNOME Shell" -+msgstr "GNOME Shell" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:4 --msgid "_Ignore duplicate keypresses (Bounce Keys)" --msgstr "" -+#: ../data/applications/gnome-shell.desktop.in.h:2 -+msgid "Window management and compositing" -+msgstr "Ministre e cumbine i barcons" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:5 --msgid "_Make items larger (Magnifier)" --msgstr "" -+#: ../data/applications/gok.desktop.in.h:1 -+msgid "GNOME On-Screen Keyboard" -+msgstr "Tastiere a visôr di GNOME" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:6 --msgid "_Only accept long held keypresses (Slow Keys)" --msgstr "" -+#: ../data/applications/gok.desktop.in.h:2 -+msgid "Use an on-screen keyboard" -+msgstr "Dopre une tastiere a visôr" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:7 --msgid "_Press keyboard shortcuts one key at a time (Sticky Keys)" --msgstr "" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 -+msgid "Whether or not to allow fingerprint readers for login" -+msgstr "Specifiche se permeti o no l'acès cun i letôrs di improntis digitai" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:8 --msgid "_See more contrast in colors (High Contrast)" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 -+msgid "" -+"The login screen can optionally allow users who have enrolled their " -+"fingerprints to log in using those prints." - msgstr "" -+"La schermade di acès a puès permeti, ai utents che a j an regjistrât lis " -+"improntis, di dopralis par eseguî l'acès." - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:9 --msgid "_Type without the keyboard (On-screen Keyboard)" --msgstr "" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 -+msgid "Whether or not to allow smartcard readers for login" -+msgstr "Specifiche se permeti o no l'acès cun i letôrs di smartcard" - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:10 --msgid "_Use a larger font size (Large Print)" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 -+msgid "" -+"The login screen can optionally allow users who have smartcards to log in " -+"using those smartcards." - msgstr "" -+"La schermade di acès a puès permeti, ai utents che a j an une smartcard, di " -+"doprale par eseguî l'acès." - --#: ../gui/simple-greeter/gdm-a11y-preferences-dialog.glade.h:11 --#, fuzzy --msgid "gtk-close" --msgstr "gtk-cancel" -- --#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:220 --msgid "Value" --msgstr "" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 -+msgid "Path to small image at top of user list" -+msgstr "Percors di une piçule figure insomp a le liste dai utents" - --#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:221 --msgid "percentage of time complete" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 -+msgid "" -+"The login screen can optionally show a small image at the top of its user " -+"list to provide site administrators and distributions a way to provide " -+"branding." - msgstr "" -+"La schermade di acès a puès permeti di viodi une piçule figure insomp a le " -+"liste dai utents par dâ ai ministradôrs e âs distribuzions un mût par aplicâ " -+"il lôr brand." - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1156 --msgid "Inactive Text" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 -+msgid "" -+"The fallback login screen can optionally show a small image at the top of " -+"its user list to provide site administrators and distributions a way to " -+"provide branding." - msgstr "" -+"La schermade di login di rapeç a puès permeti di viodi une piçule figure " -+"insomp a le liste dai utents par dâ ai ministradôrs e âs distribuzions un " -+"mût par aplicâ il lôr brand." - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1157 --msgid "The text to use in the label if the user hasn't picked an item yet" --msgstr "" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 -+msgid "Avoid showing user list" -+msgstr "Evite di mostrâ la liste dai utents" - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1165 --msgid "Active Text" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 -+msgid "" -+"The login screen normally shows a list of available users to log in as. This " -+"setting can be toggled to disable showing the user list." - msgstr "" -+"La schermade di acès di norme a mostre une liste dai utents disponibii par " -+"eseguî l'acès. Cheste impostazion a puès sedi cambiade par no mostrâ la " -+"liste dai utents." - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1166 --msgid "The text to use in the label if the user has picked an item" --msgstr "" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 -+msgid "Enable showing the banner message" -+msgstr "Abilite la vision de insegne" - --#: ../gui/simple-greeter/gdm-clock-widget.c:66 --msgid "%l:%M:%S %p" --msgstr "%l:%M:%S %p" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 -+msgid "Set to true to show the banner message text." -+msgstr "Imposte a VÊR par viodi il test de insegne." - --#: ../gui/simple-greeter/gdm-clock-widget.c:66 --msgid "%l:%M %p" --msgstr "%l:%M %p" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 -+msgid "Banner message text" -+msgstr "Test de insegne" - --#. translators: replace %e with %d if, when the day of the --#. * month as a decimal number is a single digit, it --#. * should begin with a 0 in your locale (e.g. "May --#. * 01" instead of "May 1"). --#. --#: ../gui/simple-greeter/gdm-clock-widget.c:72 --msgid "%a %b %e" --msgstr "%a %b %e" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 -+msgid "Text banner message to show in the login window." -+msgstr "Test de insegne di mostrâ in tal barcon di acès." - --#. translators: reverse the order of these arguments --#. * if the time should come before the --#. * date on a clock in your locale. --#. --#: ../gui/simple-greeter/gdm-clock-widget.c:77 --#, c-format --msgid "%1$s, %2$s" --msgstr "%1$s, %2$s" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 -+msgid "Disable showing the restart buttons" -+msgstr "Tapone il pipul di reinviament" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:174 --msgid "You have the Caps Lock key on." -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 -+msgid "Set to true to disable showing the restart buttons in the login window." - msgstr "" -+"Imposte a VÊR par taponâ il pipul di reinviament in tal barcon di acès." - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:278 --msgid "Automatically logging in..." --msgstr "" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 -+msgid "Number of allowed authentication failures" -+msgstr "Numar massim di faliments di autenticazion" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1121 --msgid "Select language and click Log In" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 -+msgid "" -+"The number of times a user is allowed to attempt authentication, before " -+"giving up and going back to user selection." - msgstr "" -+"Il numar di voltis che un utent al puès cirî di autenticasi, prime di " -+"rindisi e tornâ ae selezion dal'utent." - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1715 --msgid "Login Window" --msgstr "" -+#: ../gui/libgdm/gdm-user-switching.c:72 -+msgid "Unable to create transient display: " -+msgstr "Impussibil creâ il visôr transitori:" - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:1 --msgid "Authentication Dialog" --msgstr "Dialogo di autenticazion" -+#: ../gui/libgdm/gdm-user-switching.c:183 -+#: ../gui/libgdm/gdm-user-switching.c:395 -+#, fuzzy -+#| msgid "unable to log session" -+msgid "Unable to activate session: " -+msgstr "impussibil loggasi ta session" - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:2 --msgid "Computer Name" --msgstr "Nom dal computer" -+#: ../gui/libgdm/gdm-user-switching.c:344 -+#: ../gui/libgdm/gdm-user-switching.c:514 -+#, c-format -+msgid "Could not identify the current session." -+msgstr "Impussibil identificâ la session atuâl." - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:3 --msgid "Log In" --msgstr "Log In" -+#: ../gui/libgdm/gdm-user-switching.c:351 -+#, fuzzy, c-format -+#| msgid "unable to log session" -+msgid "User unable to switch sessions." -+msgstr "impussibil loggasi ta session" - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:4 --msgid "Restart" --msgstr "Torne a inviâ" -+#: ../gui/libgdm/gdm-user-switching.c:523 -+#, c-format -+msgid "Could not identify the current seat." -+msgstr "Impussibil identificâ la postazion atuâl." - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:5 --msgid "Shut Down" --msgstr "Stude" -+#: ../gui/libgdm/gdm-user-switching.c:533 -+#, c-format -+msgid "" -+"The system is unable to determine whether to switch to an existing login " -+"screen or start up a new login screen." -+msgstr "" -+"Il sisteme nol rive a capî se passâ a une schermadi di acès esistent o creâ " -+"une gnove." - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:6 --msgid "Suspend" --msgstr "Sospent" -+#: ../gui/libgdm/gdm-user-switching.c:541 -+#, c-format -+msgid "The system is unable to start up a new login screen." -+msgstr "Il sisteme a nol rive a fâ partî une gnove schermade di acès." - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:7 --msgid "Version" --msgstr "Version" -+#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 -+msgid "Select System" -+msgstr "Selezione sisteme" - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:8 -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 - #, fuzzy --msgid "gtk-disconnect" --msgstr "Disconet" -+#| msgid "XMDCP: Incorrect XDMCP version!" -+msgid "XDMCP: Could not create XDMCP buffer!" -+msgstr "XMDCP: la version di XDMCP so je chê juste!" -+ -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 -+msgid "XDMCP: Could not read XDMCP header!" -+msgstr "XDMCP: Impussibil lei l'intestazion XDMCP." - --#: ../gui/simple-greeter/gdm-greeter-login-window.glade.h:9 --msgid "page 5" --msgstr "pagjine 5" -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 -+msgid "XMDCP: Incorrect XDMCP version!" -+msgstr "XMDCP: la version di XDMCP so je chê juste!" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:503 --msgid "Panel" -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 -+msgid "XMDCP: Unable to parse address" - msgstr "" - --#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:153 --#, fuzzy --msgid "Languages" --msgstr "Manager" -+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 -+msgid "Fingerprint Authentication" -+msgstr "Autenticazion cun impronte digitâl" - --#: ../gui/simple-greeter/gdm-language-chooser-widget.c:187 --msgid "_Languages:" --msgstr "" -+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 -+msgid "Log into session with fingerprint" -+msgstr "Acedi al sisteme cun il letôr di improntis" - --#: ../gui/simple-greeter/gdm-language-chooser-widget.c:188 --#: ../gui/simple-greeter/gdm-language-option-widget.c:212 --msgid "_Language:" --msgstr "" -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 -+#, fuzzy -+#| msgid "Authentication Dialog" -+msgid "Password Authentication" -+msgstr "Dialogo di autenticazion" - --#: ../gui/simple-greeter/gdm-language-option-widget.c:180 --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:80 --#: ../gui/user-switch-applet/applet.c:1139 --msgid "Other..." --msgstr "Altri..." -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 -+msgid "Log into session with username and password" -+msgstr "Acedi al sisteme cun non utent e password" - --#: ../gui/simple-greeter/gdm-language-option-widget.c:181 --msgid "Choose a language from the full list of available languages." --msgstr "" -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 -+msgid "Log In" -+msgstr "Acès" - --#: ../gui/simple-greeter/gdm-option-widget.c:476 --msgid "Label Text" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 -+msgid "Slot ID" -+msgstr "ID dal slot" - --#: ../gui/simple-greeter/gdm-option-widget.c:477 --msgid "The text to use as a label" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 -+msgid "The slot the card is in" -+msgstr "Il slot dulà che a jè inseride la cjarte" - --#: ../gui/simple-greeter/gdm-option-widget.c:484 --msgid "Icon name" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 -+msgid "Slot Series" -+msgstr "Serie dal slot" - --#: ../gui/simple-greeter/gdm-option-widget.c:485 --msgid "The icon to use with the label" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 -+msgid "per-slot card identifier" -+msgstr "identificatôr de cjarte par slot" - --#: ../gui/simple-greeter/gdm-option-widget.c:493 --msgid "Default Item" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 -+#, fuzzy -+msgid "name" -+msgstr "Non utent:" - --#: ../gui/simple-greeter/gdm-option-widget.c:494 --msgid "The id of the default item" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 -+msgid "Module" -+msgstr "Modul" - --#: ../gui/simple-greeter/gdm-recent-option-widget.c:298 --msgid "Max Item Count" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 -+msgid "smartcard driver" -+msgstr "driver smartcard" - --#: ../gui/simple-greeter/gdm-recent-option-widget.c:299 --msgid "The maximum number of items to keep around in the list" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 -+#, fuzzy -+#| msgid "Authentication Dialog" -+msgid "Smartcard Authentication" -+msgstr "Dialogo di autenticazion" - --#: ../gui/simple-greeter/gdm-remote-login-window.c:243 --#, c-format --msgid "Remote Login (Connecting to %s...)" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 -+msgid "Log into session with smartcard" -+msgstr "Acedi al sisteme cun la smartcard" - --#: ../gui/simple-greeter/gdm-remote-login-window.c:257 --#, c-format --msgid "Remote Login (Connected to %s)" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 -+msgid "Module Path" -+msgstr "Percors dal modul" - --#: ../gui/simple-greeter/gdm-remote-login-window.c:336 --msgid "Remote Login" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 -+msgid "path to smartcard PKCS #11 driver" -+msgstr "percors dal driver de smartcard PKCS #11" - --#: ../gui/simple-greeter/gdm-session-option-widget.c:162 --msgid "_Sessions:" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 -+#, fuzzy -+msgid "received error or hang up from event source" -+msgstr "ricevût erôr o siaradure de sorgint dal'event" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 --msgid "Banner message text" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 -+#, fuzzy, c-format -+msgid "NSS security system could not be initialized" -+msgstr "il sisteme di sigurece NSS nol puès sedi fat partî" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 --msgid "Disable showing the accessibility button" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 -+#, c-format -+msgid "no suitable smartcard driver could be found" -+msgstr "nol è stât cjatât nissun driver util pe smartcard" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 --msgid "Disable showing the restart buttons" --msgstr "" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 -+#, c-format -+msgid "smartcard driver '%s' could not be loaded" -+msgstr "il driver de smartcard '%s' a nol puès sedi cjamât" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 --msgid "Enable accessibility keyboard plugin" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 -+#, c-format -+msgid "could not watch for incoming card events - %s" - msgstr "" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 --msgid "Enable on-screen keyboard" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 -+#, c-format -+msgid "encountered unexpected error while waiting for smartcard events" - msgstr "" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 --msgid "Enable screen magnifier" --msgstr "" -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 -+#, fuzzy -+#| msgid "Authentication Dialog" -+msgid "Authentication" -+msgstr "Dialogo di autenticazion" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 --msgid "Enable screen reader" --msgstr "" -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 -+msgid "Log into session" -+msgstr "Acedi al sisteme" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 --msgid "Enable showing the banner message" --msgstr "" -+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 -+msgid "Value" -+msgstr "Valôr" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 --msgid "Icon name to use for greeter logo" --msgstr "" -+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 -+msgid "percentage of time complete" -+msgstr "Percentuâl di timp completade" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 --msgid "" --"Set to TRUE to disable showing the accessibility button in the login window." --msgstr "" -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 -+msgid "Inactive Text" -+msgstr "Test inatîf" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 --msgid "Set to TRUE to disable showing the restart buttons in the login window." -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 -+msgid "The text to use in the label if the user hasn't picked an item yet" - msgstr "" -+"Test di doprâ in te etichete se l'utent nol à ancjemò sielzût un element" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 --msgid "Set to True to enable the background settings manager plugin." --msgstr "" -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 -+msgid "Active Text" -+msgstr "Test atîf" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 --msgid "Set to True to enable the on-screen keyboard." --msgstr "" -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 -+msgid "The text to use in the label if the user has picked an item" -+msgstr "Test di doprâ in te etichete se l'utent al à sielzût un element" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 --msgid "" --"Set to True to enable the plugin to manage the accessibility keyboard " --"settings." --msgstr "" -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 -+msgid "List Visible" -+msgstr "Liste visibile" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 --msgid "Set to True to enable the screen magnifier." --msgstr "" -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 -+msgid "Whether the chooser list is visible" -+msgstr "Indiche se la liste dal seletôr a jè visibile" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 --msgid "Set to True to enable the screen reader." --msgstr "" -+#. translators: This is the time format to use when both -+#. * the date and time with seconds are being shown together. -+#. -+#: ../gui/simple-greeter/gdm-clock-widget.c:70 -+#, fuzzy -+#| msgid "%l:%M:%S %p" -+msgid "%a %b %e, %l:%M:%S %p" -+msgstr "%l:%M:%S %p" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 --msgid "Set to True to enable the xsettings settings manager plugin." --msgstr "" -+#. translators: This is the time format to use when both -+#. * the date and time without seconds are being shown together. -+#. -+#: ../gui/simple-greeter/gdm-clock-widget.c:76 -+#, fuzzy -+#| msgid "%l:%M %p" -+msgid "%a %b %e, %l:%M %p" -+msgstr "%l:%M %p" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 --msgid "Set to the themed icon name to use for the greeter logo." --msgstr "" -+#. translators: This is the time format to use when there is -+#. * no date, just weekday and time with seconds. -+#. -+#: ../gui/simple-greeter/gdm-clock-widget.c:83 -+#, fuzzy -+#| msgid "%l:%M:%S %p" -+msgid "%a %l:%M:%S %p" -+msgstr "%l:%M:%S %p" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 --msgid "Set to true to show the banner message text." --msgstr "" -+#. translators: This is the time format to use when there is -+#. * no date, just weekday and time without seconds. -+#. -+#: ../gui/simple-greeter/gdm-clock-widget.c:92 -+#, fuzzy -+#| msgid "%l:%M %p" -+msgid "%a %l:%M %p" -+msgstr "%l:%M %p" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 --msgid "Text banner message to show on the login window." --msgstr "" -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 -+msgid "Automatically logging in…" -+msgstr "Acès automatic..." - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 --msgid "True if the background settings manager plugin is enabled." --msgstr "" -+#. need to wait for response from backend -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 -+msgid "Cancelling…" -+msgstr "Anulament..." - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 --msgid "True if the xsettings settings manager plugin is enabled." --msgstr "" -+#. just wait for the user to select language and stuff -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 -+msgid "Select language and click Log In" -+msgstr "Selezione la lenghe e sclice Acêt" - --#: ../gui/simple-greeter/gdm-user.c:239 --msgid "Manager" --msgstr "Manager" -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 -+msgctxt "customsession" -+msgid "Custom" -+msgstr "Personalizade" - --#: ../gui/simple-greeter/gdm-user.c:240 --msgid "The user manager object this user is controlled by." --msgstr "" -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 -+#, fuzzy -+#| msgid "unable to log session" -+msgid "Custom session" -+msgstr "impussibil loggasi ta session" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:81 --msgid "Choose a different account" --msgstr "Sielz un account diferent" -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 -+msgid "Computer Name" -+msgstr "Non dal computer" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:93 --msgid "Guest" --msgstr "Ospit" -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -+msgid "Version" -+msgstr "Version" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:94 --msgid "Login as a temporary guest" --msgstr "" -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 -+msgid "Cancel" -+msgstr "Anule" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:106 --msgid "Automatic Login" --msgstr "" -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 -+msgid "Unlock" -+msgstr "Sbloche" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:107 --msgid "Automatically login to the system after selecting options" --msgstr "" -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 -+msgid "Login" -+msgstr "Acès" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:403 --#, c-format --msgid "Log in as %s" --msgstr "" -+#: ../gui/simple-greeter/gdm-greeter-panel.c:953 -+msgid "Suspend" -+msgstr "Sospent" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:487 --msgid "Currently logged in" --msgstr "" -+#: ../gui/simple-greeter/gdm-greeter-panel.c:958 -+msgid "Restart" -+msgstr "Torne a inviâ" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:531 --#, fuzzy --msgid "_Users:" --msgstr "Non utent:" -+#: ../gui/simple-greeter/gdm-greeter-panel.c:962 -+msgid "Shut Down" -+msgstr "Stude" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:532 --#, fuzzy --msgid "_User:" --msgstr "Non utent:" -+#: ../gui/simple-greeter/gdm-greeter-panel.c:1011 -+msgid "Unknown time remaining" -+msgstr "Timp mancjant no cognossût" - --#: ../gui/user-switch-applet/applet.c:121 --msgid "Missing Required File" --msgstr "" -+#: ../gui/simple-greeter/gdm-greeter-panel.c:1033 -+msgid "Panel" -+msgstr "Panel" - --#: ../gui/user-switch-applet/applet.c:123 --#, c-format --msgid "" --"The User Selector's interfaces file, `%s', could not be opened. It is likely " --"that this application was not properly installed or configured." --msgstr "" -+#: ../gui/simple-greeter/gdm-option-widget.c:505 -+msgid "Label Text" -+msgstr "Test etichete" - --#: ../gui/user-switch-applet/applet.c:184 --msgid "" --"The User Switch Applet 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." --msgstr "" -+#: ../gui/simple-greeter/gdm-option-widget.c:506 -+msgid "The text to use as a label" -+msgstr "Il test di doprâ come etichete" - --#: ../gui/user-switch-applet/applet.c:188 --msgid "" --"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." --msgstr "" -+#: ../gui/simple-greeter/gdm-option-widget.c:513 -+msgid "Icon name" -+msgstr "Non icone" - --#: ../gui/user-switch-applet/applet.c:192 --msgid "" --"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., 51 " --"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " --msgstr "" -+#: ../gui/simple-greeter/gdm-option-widget.c:514 -+msgid "The icon to use with the label" -+msgstr "L'icone di doprâ cun l'etichete" - --#: ../gui/user-switch-applet/applet.c:206 --msgid "A menu to quickly switch between users." --msgstr "" -+#: ../gui/simple-greeter/gdm-option-widget.c:522 -+msgid "Default Item" -+msgstr "Element predefinît" - --#: ../gui/user-switch-applet/applet.c:210 --msgid "translator-credits" --msgstr "" -+#: ../gui/simple-greeter/gdm-option-widget.c:523 -+msgid "The ID of the default item" -+msgstr "Il ID dal element predefinît" - --#: ../gui/user-switch-applet/applet.c:780 -+#: ../gui/simple-greeter/gdm-remote-login-window.c:188 - #, c-format --msgid "Can't lock screen: %s" --msgstr "" -+msgid "Remote Login (Connecting to %s…)" -+msgstr "Acès a distance (Conession a %s…)" - --#: ../gui/user-switch-applet/applet.c:802 -+#: ../gui/simple-greeter/gdm-remote-login-window.c:202 - #, c-format --msgid "Can't temporarily set screensaver to blank screen: %s" --msgstr "" -- --#: ../gui/user-switch-applet/applet.c:974 --msgid "User Switch Applet" --msgstr "" -- --#: ../gui/user-switch-applet/applet.c:995 --#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:2 --msgid "User Switcher" --msgstr "" -+msgid "Remote Login (Connected to %s)" -+msgstr "Acès a distance (Conettût a %s…)" - --#: ../gui/user-switch-applet/applet.c:1092 --msgid "Unknown" --msgstr "" -+#: ../gui/simple-greeter/gdm-remote-login-window.c:281 -+msgid "Remote Login" -+msgstr "Acès a distance" - --#: ../gui/user-switch-applet/gdm-user-menu-item.c:336 -+#: ../gui/simple-greeter/gdm-session-option-widget.c:162 - #, fuzzy --msgid "User" --msgstr "Non utent:" -- --#: ../gui/user-switch-applet/gdm-user-menu-item.c:337 --msgid "The user this menu item represents." --msgstr "" -- --#: ../gui/user-switch-applet/gdm-user-menu-item.c:344 --msgid "Icon Size" --msgstr "" -- --#: ../gui/user-switch-applet/gdm-user-menu-item.c:345 --msgid "The size of the icon to use." --msgstr "" -- --#: ../gui/user-switch-applet/gdm-user-menu-item.c:351 --msgid "Indicator Size" --msgstr "" -- --#: ../gui/user-switch-applet/gdm-user-menu-item.c:352 --msgid "Size of check indicator" --msgstr "" -+#| msgid "Version" -+msgid "Session" -+msgstr "Version" - --#: ../gui/user-switch-applet/gdm-user-menu-item.c:357 --msgid "Indicator Spacing" --msgstr "" -+#: ../gui/simple-greeter/gdm-timer.c:147 -+msgid "Duration" -+msgstr "Durade" - --#: ../gui/user-switch-applet/gdm-user-menu-item.c:358 --msgid "Space between the username and the indicator" --msgstr "" -+#: ../gui/simple-greeter/gdm-timer.c:148 -+msgid "Number of seconds until timer stops" -+msgstr "Numar di seconts prime che il timer al finissi" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:1 --msgid "Multiple Logins Found" --msgstr "" -+#: ../gui/simple-greeter/gdm-timer.c:155 -+msgid "Start time" -+msgstr "Moment di inviament" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:2 --msgid "Appearance" --msgstr "" -+#: ../gui/simple-greeter/gdm-timer.c:156 -+msgid "Time the timer was started" -+msgstr "Moment che il tilmer al è stât inviât" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:3 --msgid "Continue" --msgstr "" -+#: ../gui/simple-greeter/gdm-timer.c:163 -+msgid "Is it Running?" -+msgstr "Isal in esecuzion?" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:4 --msgid "Create new logins in _nested windows" --msgstr "" -+#: ../gui/simple-greeter/gdm-timer.c:164 -+msgid "Whether the timer is currently ticking" -+msgstr "Indiche se il timer cumò al stâ lant indenant " - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:5 --msgid "Details" --msgstr "" -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 -+#, c-format -+msgid "Log in as %s" -+msgstr "Acès come %s" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:6 --msgid "Multiple Logins Found - User Switcher" --msgstr "" -+#. translators: This option prompts -+#. * the user to type in a username -+#. * manually instead of choosing from -+#. * a list. -+#. -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 -+#, fuzzy -+msgctxt "user" -+msgid "Other…" -+msgstr "Altri..." - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:7 --msgid "Options" --msgstr "" -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 -+msgid "Choose a different account" -+msgstr "Sielz un account diferent" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:8 --msgid "Some preferences have been locked by the system adminstrator." --msgstr "" -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 -+msgid "Guest" -+msgstr "Ospit" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:9 --msgid "" --"The user you want to switch to is logged in multiple times on this computer. " --"Which login do you want to switch to?" --msgstr "" -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 -+msgid "Log in as a temporary guest" -+msgstr "Acêt come ospit provisori" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:10 --msgid "Use the `people' icon for the menu title" --msgstr "" -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 -+msgid "Automatic Login" -+msgstr "Acès automatic" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:11 --msgid "Use the current user's name for the menu title" --msgstr "" -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 -+msgid "Automatically log into the system after selecting options" -+msgstr "Acedi automaticamentri al sisteme dopo vê selezionât lis opzions" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:12 --msgid "Use the word `Users' as the menu title" --msgstr "" -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 -+msgid "Currently logged in" -+msgstr "Acès bielza eseguît" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:13 --msgid "User Switcher Error" --msgstr "" -+#: ../utils/gdm-screenshot.c:43 -+msgid "Debugging output" -+msgstr "Debugging output" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:14 --msgid "User Switcher Preferences" --msgstr "" -+#: ../utils/gdm-screenshot.c:212 -+msgid "Screenshot taken" -+msgstr "Screenshot fat" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:15 --msgid "Users" --msgstr "" -+#. Option parsing -+#: ../utils/gdm-screenshot.c:279 -+msgid "Take a picture of the screen" -+msgstr "Fâs une figure dal visôr" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:16 --msgid "" --"When a new login must be created to switch users, create it in a window " --"instead of on a new screen" --msgstr "" -+#~ msgid "id" -+#~ msgstr "id" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:17 --msgid "" --"When changing to a different display, activate the screensaver for this " --"display." --msgstr "" -+#~ msgid "Unable to authenticate user" -+#~ msgstr "Impussibil autenticâ l'utent" - --#: ../gui/user-switch-applet/gdm-user-switch-applet.glade.h:18 --msgid "_Lock the screen after switching users" --msgstr "" -+#~ msgid "Group %s doesn't exist" -+#~ msgstr "Il grop %s nol esist" - --#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:1 --msgid "A menu to quickly switch between users" --msgstr "" -+#~ msgid "Error in checksum" -+#~ msgstr "Erôr tal checksum" - --#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in.h:3 --msgid "User Switcher Applet Factory" --msgstr "" -+#~ msgid "Bad address" -+#~ msgstr "Indiriz sbagliât" - --#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:1 --msgid "Edit Personal _Information" --msgstr "" -+#~ msgid "%s: Error in checksum" -+#~ msgstr "%s: Erôr tal checksum" - --#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:2 --msgid "_About" --msgstr "" -+#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" -+#~ msgstr "GdmXdmcpDisplayFactory: No si rive a lei l'header di XDMCP!" - --#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:3 --msgid "_Edit Users and Groups" --msgstr "" -+#, fuzzy -+#~ msgid "gtk-close" -+#~ msgstr "gtk-cancel" - --#: ../gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml.h:4 --msgid "_Help" --msgstr "" -+#~ msgid "%a %b %e" -+#~ msgstr "%a %b %e" - --#: ../utils/gdmflexiserver.c:59 --msgid "Send the specified protocol command to GDM" --msgstr "" -+#~ msgid "%1$s, %2$s" -+#~ msgstr "%1$s, %2$s" - --#: ../utils/gdmflexiserver.c:59 --msgid "COMMAND" --msgstr "" -+#, fuzzy -+#~ msgid "gtk-disconnect" -+#~ msgstr "Disconet" - --#: ../utils/gdmflexiserver.c:60 --msgid "Xnest mode" --msgstr "" -+#~ msgid "page 5" -+#~ msgstr "pagjine 5" - --#: ../utils/gdmflexiserver.c:61 --msgid "Do not lock current screen" --msgstr "" -+#, fuzzy -+#~ msgid "Languages" -+#~ msgstr "Manager" - --#: ../utils/gdmflexiserver.c:62 --msgid "Debugging output" --msgstr "" -+#~ msgid "Other..." -+#~ msgstr "Altri..." - --#: ../utils/gdmflexiserver.c:63 --msgid "Authenticate before running --command" --msgstr "" -+#~ msgid "Manager" -+#~ msgstr "Manager" - --#: ../utils/gdmflexiserver.c:64 --msgid "Start new flexible session; do not show popup" --msgstr "" -+#, fuzzy -+#~ msgid "_Users:" -+#~ msgstr "Non utent:" - --#: ../utils/gdmflexiserver.c:648 --msgid "Main Options" --msgstr "" -+#, fuzzy -+#~ msgid "_User:" -+#~ msgstr "Non utent:" - --#: ../utils/gdmflexiserver.c:691 --msgid "Unable to start new display" --msgstr "" -+#, fuzzy -+#~ msgid "User" -+#~ msgstr "Non utent:" - - #~ msgid "CONFIGFILE" - #~ msgstr "CONFIGFILE" - - #, fuzzy --#~ msgid "Other" --#~ msgstr "Altri..." -- --#, fuzzy - #~ msgid "Display Style" - #~ msgstr "Mostre ID" - --#~ msgid "unable to log session" --#~ msgstr "impussibil loggasi ta session" -- - #~ msgid "Manager X Settings" - #~ msgstr "Manager dai setagjos di X" - -diff --git a/po/ml.po b/po/ml.po -index ecad3a6..57b262b 100644 ---- a/po/ml.po -+++ b/po/ml.po -@@ -9,18 +9,18 @@ - msgid "" - msgstr "" - "Project-Id-Version: gdm.master.ml\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." --"cgi?product=gdm&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2012-09-15 14:28+0000\n" --"PO-Revision-Date: 2012-09-19 00:51+0000\n" --"Last-Translator: Ani Peter \n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"product=gdm&keywords=I18N+L10N&component=general\n" -+"POT-Creation-Date: 2012-10-02 17:33+0000\n" -+"PO-Revision-Date: 2012-11-27 12:11+0530\n" -+"Last-Translator: Ani Peter \n" - "Language-Team: Malayalam \n" - "Language: ml\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Lokalize 1.0\n" -+"X-Generator: Lokalize 1.5\n" - "X-DamnedLies-Scope: partial\n" - - #: ../common/gdm-common.c:492 -@@ -35,18 +35,15 @@ msgstr "സിസ്റ്റത്തില്‍ \"%s\" എന്ന ഉപയ - - #: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349 - #, c-format --#| msgid "no user account available" - msgid "No session available yet" - msgstr "സെഷന്‍ ലഭ്യമല്ല" - - #: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 - #, c-format --#| msgid "Unable to authorize user" - msgid "Unable to look up UID of user %s" - msgstr "ഉപയോക്താവു് %s-ന്റെ യുഐഡി തെരയുവാന്‍ സാധ്യമല്ല" - - #: ../daemon/gdm-manager.c:291 --#| msgid "no user account available" - msgid "no sessions available" - msgstr "സെഷനുകള്‍ ലഭ്യമല്ല" - -@@ -57,23 +54,19 @@ msgstr "വീണ്ടും ആധികാരികത ഉറപ്പാക - - #: ../daemon/gdm-manager.c:406 - #, c-format --#| msgid "Unable to open session" - msgid "Unable to find session for user %s" - msgstr "%s ഉപയോക്താവിനുള്ള സെഷന്‍ കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല" - - #: ../daemon/gdm-manager.c:476 - #, c-format --#| msgid "Unable to open session" - msgid "Unable to find appropriate session for user %s" - msgstr "ഉപയോക്താവു് %s-നു് ഉചിതമായ സെഷന്‍ കണ്ടുപിടിയ്ക്കുവാന്‍ സാധ്യമല്ല" - - #: ../daemon/gdm-manager.c:671 --#| msgid "User %s doesn't exist" - msgid "User doesn't own session" - msgstr "ഉപയോക്താവിനു് സെഷന്‍ ലഭ്യമല്ല" - - #: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 --#| msgid "no user account available" - msgid "No session available" - msgstr "സെഷനുകള്‍ ലഭ്യമല്ല" - -@@ -85,7 +78,8 @@ msgstr "%s: പേരന്റ് ഡിസ്പ്ളെ '%s'-മായി ക - #: ../daemon/gdm-server.c:452 - #, c-format - msgid "Server was to be spawned by user %s but that user doesn't exist" --msgstr "സെര്‍വര്‍ തുടങ്ങേണ്ട ഉപയോക്താവു് %s ആയിരുന്നെങ്കിലും ആ ഉപയോക്താവു് നിലവിലില്ല" -+msgstr "" -+"സെര്‍വര്‍ തുടങ്ങേണ്ട ഉപയോക്താവു് %s ആയിരുന്നെങ്കിലും ആ ഉപയോക്താവു് നിലവിലില്ല" - - #: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 - #, c-format -@@ -147,7 +141,7 @@ msgstr "ഡിസ്പ്ലെ ഡിവൈസ്" - msgid "The display device" - msgstr "ഡിസ്പ്ലെ ഡിവൈസ്" - --#: ../daemon/gdm-session.c:1177 -+#: ../daemon/gdm-session.c:1184 - msgid "Could not create authentication helper process" - msgstr "ആധികാരികതയ്ക്കുള്ള സഹായ പ്രക്രിയ തയ്യാറാക്കുവാന്‍ സാധ്യമല്ല" - -@@ -210,37 +204,40 @@ msgstr "ഉപയോക്താവിനുള്ള അക്കൌണ്ട - msgid "Unable to change to user" - msgstr "ഉപയോക്താവായി മാറുവാന്‍ സാധ്യമല്ല" - --#: ../daemon/gdm-simple-slave.c:1370 -+#: ../daemon/gdm-simple-slave.c:1381 - msgid "" - "Could not start the X server (your graphical environment) due to an internal " - "error. Please contact your system administrator or check your syslog to " - "diagnose. In the meantime this display will be disabled. Please restart GDM " - "when the problem is corrected." - msgstr "" --"ഒരു ആന്തരിക പിശക് കാരണം X സര്‍വര്‍ (നിങ്ങളുടെ ഗ്രാഫിക്കല്‍ എന്‍വയോണ്‍മെന്റ്) ആരംഭിക്കുവാനായില്ല. " --"നിങ്ങളുടെ syslog പരിശോധിക്കുന്നതിനായി ദയവായി സിസ്റ്റം അഡ്മിനിസ്ട്രേറ്ററിനെ സമീപിക്കുക. " --"ഇപ്പോള്‍ ഈ ഡിസ്പ്ലെ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതായിരിക്കും. പ്രശ്നം പരിഹരിച്ച ശേഷം ജിഡിഎം വീണ്ടും " -+"ഒരു ആന്തരിക പിശക് കാരണം X സര്‍വര്‍ (നിങ്ങളുടെ ഗ്രാഫിക്കല്‍ എന്‍വയോണ്‍മെന്റ്) " -+"ആരംഭിക്കുവാനായില്ല. " -+"നിങ്ങളുടെ syslog പരിശോധിക്കുന്നതിനായി ദയവായി സിസ്റ്റം അഡ്മിനിസ്ട്രേറ്ററിനെ " -+"സമീപിക്കുക. " -+"ഇപ്പോള്‍ ഈ ഡിസ്പ്ലെ പ്രവര്‍ത്തന രഹിതമാക്കുന്നതായിരിക്കും. പ്രശ്നം പരിഹരിച്ച " -+"ശേഷം ജിഡിഎം വീണ്ടും " - "ആരംഭിക്കുക." - --#: ../daemon/gdm-simple-slave.c:1411 -+#: ../daemon/gdm-simple-slave.c:1422 - #, c-format - msgid "Can only be called before user is logged in" - msgstr "ഉപയോക്താവു് പ്രവേശിയ്ക്കുന്നതിനു് മുമ്പു് മാത്രമേ ലഭ്യമാകുള്ളൂ" - --#: ../daemon/gdm-simple-slave.c:1421 -+#: ../daemon/gdm-simple-slave.c:1432 - #, c-format - msgid "Caller not GDM" - msgstr "കോളര്‍ ജിഡിഎം അല്ല" - --#: ../daemon/gdm-simple-slave.c:1474 --#| msgid "Currently logged in" -+#: ../daemon/gdm-simple-slave.c:1485 - msgid "User not logged in" - msgstr "ഉപയോക്താവു് പ്രവേശിച്ചിട്ടില്ല" - - #: ../daemon/gdm-xdmcp-chooser-slave.c:370 - #, c-format - msgid "Currently, only one client can be connected at once" --msgstr "നിലവില്‍, ഒരു സമയത്തു് ഒരു ക്ലയന്റ് മാത്രമേ കണക്ട് ചെയ്യുവാന്‍ സാധ്യമാകൂ" -+msgstr "" -+"നിലവില്‍, ഒരു സമയത്തു് ഒരു ക്ലയന്റ് മാത്രമേ കണക്ട് ചെയ്യുവാന്‍ സാധ്യമാകൂ" - - #: ../daemon/gdm-xdmcp-display-factory.c:604 - msgid "Could not create socket!" -@@ -249,7 +246,8 @@ msgstr "സോക്കറ്റ് നിര്‍മ്മിക്കുവ - #: ../daemon/main.c:126 ../daemon/main.c:139 - #, c-format - msgid "Cannot write PID file %s: possibly out of disk space: %s" --msgstr "%s PID ഫയല്‍ എഴുതുവാന്‍ സാധ്യമായില്ല: ഡിസ്ക്കില്‍ മതിയായ സ്ഥലം ഉണ്ടാവില്ല: %s" -+msgstr "" -+"%s PID ഫയല്‍ എഴുതുവാന്‍ സാധ്യമായില്ല: ഡിസ്ക്കില്‍ മതിയായ സ്ഥലം ഉണ്ടാവില്ല: %s" - - #: ../daemon/main.c:160 - #, c-format -@@ -269,7 +267,9 @@ msgstr "Authdir %s ഒരു ഡയറക്ടറി അല്ല. നിര് - #: ../daemon/main.c:254 - #, c-format - msgid "Authdir %s is not owned by user %d, group %d. Aborting." --msgstr "Authdir %s-യുടെ ഉടമസ്ഥന്‍ ഉപയോക്താവ് %d-ഉം, ഗ്രൂപ്പ് %d-ഉം അല്ല. നിര്‍ത്തുന്നു." -+msgstr "" -+"Authdir %s-യുടെ ഉടമസ്ഥന്‍ ഉപയോക്താവ് %d-ഉം, ഗ്രൂപ്പ് %d-ഉം അല്ല. " -+"നിര്‍ത്തുന്നു." - - #: ../daemon/main.c:261 - #, c-format -@@ -362,30 +362,70 @@ msgstr "ഗ്നോം ഓണ്‍-സ്ക്രീന്‍ കീബോര - msgid "Use an on-screen keyboard" - msgstr "ഒരു ഓണ്‍-സ്ക്രീന്‍ കീബോര്‍ഡ് ഉപയോഗിക്കുക" - --#: ../data/applications/orca-screen-reader.desktop.in.h:1 --msgid "Orca Screen Reader" --msgstr "ഓര്‍കാ സ്ക്രീന്‍ റീഡര്‍" -- --#: ../data/applications/orca-screen-reader.desktop.in.h:2 --msgid "Present on-screen information as speech or braille" --msgstr "ഓണ്‍ സ്ക്രീന്‍ വിവരങ്ങള്‍ ഒരു സംഭാഷണം അല്ലെങ്കില്‍ ബ്രെയിലി ആയി ലഭ്യമാക്കുക" -- - #: ../data/org.gnome.login-screen.gschema.xml.in.h:1 - msgid "Whether or not to allow fingerprint readers for login" - msgstr "വിരളടയാളം പരിശോദിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്" - -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 -+msgid "" -+"The login screen can optionally allow users who have enrolled their " -+"fingerprints to log in using those prints." -+msgstr "" -+"വിരളടയാളം ഉപയോഗിച്ചു് പ്രവേശിയ്ക്കുവാന്‍ അനുവാദമുള്ള ഉപയോക്താക്കളെ " -+"പ്രവേശന സ്ക്രീന്‍ അനുവദിയ്ക്കുന്നു." -+ - #: ../data/org.gnome.login-screen.gschema.xml.in.h:3 - msgid "Whether or not to allow smartcard readers for login" --msgstr "സ്മാര്‍ട്ട്കാര്‍ഡ് ഉപയോഗിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്" -+msgstr "" -+"സ്മാര്‍ട്ട്കാര്‍ഡ് ഉപയോഗിച്ചു് അകത്തുകയറാന്‍ അനുവദിയ്ക്കണോ വേണ്ടയോ എന്നു്" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 -+msgid "" -+"The login screen can optionally allow users who have smartcards to log in " -+"using those smartcards." -+msgstr "" -+"സ്മാര്‍ട്ട് കാര്‍ഡുള്ളവരെ അതുപയോഗിച്ചു് പ്രവേശിയ്ക്കുവാന്‍ പ്രവേശന സ്ക്രീന്‍ " -+"അനുവദിയ്ക്കുന്നു." - - #: ../data/org.gnome.login-screen.gschema.xml.in.h:5 - msgid "Path to small image at top of user list" --msgstr "ഉപയോക്താക്കളുടെ പട്ടികയ്ക്കു് മുകളില്‍ കാണിയ്ക്കുന്ന ചെറിയ ചിത്രത്തിനുള്ള വഴി" -+msgstr "" -+"ഉപയോക്താക്കളുടെ പട്ടികയ്ക്കു് മുകളില്‍ കാണിയ്ക്കുന്ന ചെറിയ ചിത്രത്തിനുള്ള വഴി" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 -+msgid "" -+"The login screen can optionally show a small image at the top of its user " -+"list to provide site administrators and distributions a way to provide " -+"branding." -+msgstr "" -+"സൈറ്റ് അഡ്മിനിസ്ട്രേറ്ററുകളേയും വിതരണക്കാരെയും ബ്രാണ്ടിങ് നല്‍കുന്നതിനായി " -+"പ്രവേശന സ്ക്രീനില്‍ ഉപയോക്താക്കളുടെ പട്ടികയുടെ മുകളില്‍ ഒരു ചെറിയ ചിത്രം " -+"കാണിയ്ക്കാം." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 -+msgid "" -+"The fallback login screen can optionally show a small image at the top of " -+"its user list to provide site administrators and distributions a way to " -+"provide branding." -+msgstr "" -+"സൈറ്റ് അഡ്മിനിസ്ട്രേറ്ററുകളേയും വിതരണക്കാരെയും ബ്രാണ്ടിങ് നല്‍കുന്നതിനായി " -+"ഫോള്‍ബാക്ക് പ്രവേശന സ്ക്രീനില്‍ ഉപയോക്താക്കളുടെ പട്ടികയുടെ മുകളില്‍ ഒരു ചെറിയ " -+"ചിത്രം " -+"കാണിയ്ക്കാം." - - #: ../data/org.gnome.login-screen.gschema.xml.in.h:8 - msgid "Avoid showing user list" - msgstr "ഉപയോക്താക്കളുടെ പട്ടിക കാണിയ്ക്കുന്നതൊഴിവാക്കുക" - -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 -+msgid "" -+"The login screen normally shows a list of available users to log in as. This " -+"setting can be toggled to disable showing the user list." -+msgstr "" -+"പ്രവേശന സ്ക്രീനില്‍ സാധാരണ പ്രവേശിയ്ക്കുവാന്‍ സാധ്യമായ ഉപയോക്താക്കളെ " -+"കാണിയ്ക്കുന്നു. " -+"ഈ പട്ടിക പ്രവര്‍ത്തന രഹിതമാക്കണമെങ്കില്‍ ഈ സജ്ജീകരണം ടൊഗ്ഗിള്‍ ചെയ്യാം." -+ - #: ../data/org.gnome.login-screen.gschema.xml.in.h:10 - msgid "Enable showing the banner message" - msgstr "ബാനര്‍ സന്ദേശം കാണിക്കുന്നതു് സജ്ജമാക്കുക" -@@ -404,27 +444,39 @@ msgstr "ലോഗിന്‍ ജാലകത്തില്‍ കാണിക - - #: ../data/org.gnome.login-screen.gschema.xml.in.h:14 - msgid "Disable showing the restart buttons" --msgstr "വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക" -+msgstr "" -+"വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുക" - - #: ../data/org.gnome.login-screen.gschema.xml.in.h:15 - msgid "Set to true to disable showing the restart buttons in the login window." - msgstr "" --"ലോഗില്‍ ജാലകത്തില്‍ വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനു് " -+"ലോഗില്‍ ജാലകത്തില്‍ വീണ്ടും ആരംഭിക്കുന്നതിനുള്ള ബട്ടണുകള്‍ കാണിക്കുന്നതു് " -+"പ്രവര്‍ത്തന രഹിതമാക്കുന്നതിനു് " - "true ആയി സജ്ജമാക്കുക." - -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 -+msgid "Number of allowed authentication failures" -+msgstr "എത്ര തവണ ആധികാരികത ഉറപ്പാക്കുവാന്‍ ശ്രമിയ്ക്കാം" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 -+msgid "" -+"The number of times a user is allowed to attempt authentication, before " -+"giving up and going back to user selection." -+msgstr "" -+"ഉപയോക്താവിനുള്ളതു് തെരഞ്ഞെടുക്കുന്നതിലേക്കു് പോകുന്നതിനു് മുമ്പായി, " -+"ആധികാരികത ഉറപ്പാക്കുവാന്‍ എത്ര തവണ ഉപയോക്താവു് ശ്രമിയ്ക്കുന്നു." -+ - #: ../gui/libgdm/gdm-user-switching.c:72 --#| msgid "Unable to start new display" - msgid "Unable to create transient display: " - msgstr "ട്രാന്‍സിയന്റ് പ്രദര്‍ശനം തയ്യാറാക്കുവാന്‍ സാധ്യമായില്ല:" - - #: ../gui/libgdm/gdm-user-switching.c:183 - #: ../gui/libgdm/gdm-user-switching.c:395 --#| msgid "Unable to open session" - msgid "Unable to activate session: " - msgstr "സെഷന്‍ സജീവമാക്കുവാന്‍ സാധ്യമല്ല:" - - #: ../gui/libgdm/gdm-user-switching.c:344 --#: ../gui/libgdm/gdm-user-switching.c:483 -+#: ../gui/libgdm/gdm-user-switching.c:512 - #, c-format - msgid "Could not identify the current session." - msgstr "നിലവിലുള്ള സെഷന്‍ തിരിച്ചറിയുവാന്‍ സാധ്യമായില്ല." -@@ -434,21 +486,22 @@ msgstr "നിലവിലുള്ള സെഷന്‍ തിരിച്ച - msgid "User unable to switch sessions." - msgstr "സെഷനുകള്‍ തമ്മില്‍ മാറ്റുവാന്‍ ഉപയോക്താവിനു് സാധ്യമല്ല." - --#: ../gui/libgdm/gdm-user-switching.c:492 -+#: ../gui/libgdm/gdm-user-switching.c:521 - #, c-format - msgid "Could not identify the current seat." - msgstr "നിലവിലുള്ള സീറ്റ് തിരിച്ചറിയുവാന്‍ സാധ്യമായില്ല." - --#: ../gui/libgdm/gdm-user-switching.c:502 -+#: ../gui/libgdm/gdm-user-switching.c:531 - #, c-format - msgid "" - "The system is unable to determine whether to switch to an existing login " - "screen or start up a new login screen." - msgstr "" --"നിലവിലുള്ളൊരു പ്രവേശന സ്ക്രീന്‍ അല്ലെങ്കില്‍ ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ - ഏതിലേക്കു് മാറണമെന്നു് " -+"നിലവിലുള്ളൊരു പ്രവേശന സ്ക്രീന്‍ അല്ലെങ്കില്‍ ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ - " -+"ഏതിലേക്കു് മാറണമെന്നു് " - "സിസ്റ്റത്തിനു് നിശ്ചയിയ്ക്കുവാന്‍ സാധ്യമല്ല." - --#: ../gui/libgdm/gdm-user-switching.c:510 -+#: ../gui/libgdm/gdm-user-switching.c:539 - #, c-format - msgid "The system is unable to start up a new login screen." - msgstr "ഒരു പുതിയ പ്രവേശന സ്ക്രീന്‍ ആരംഭിയ്ക്കുവാന്‍ സിസ്റ്റത്തിനു് സാധ്യമല്ല." -@@ -567,7 +620,9 @@ msgstr "വരുന്ന കാര്‍ഡ് ഇവന്റുകള്‍ - #: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 - #, c-format - msgid "encountered unexpected error while waiting for smartcard events" --msgstr "സ്മാര്‍ട്ട് കാര്‍ഡുകള്‍ക്കായി കാത്തിരിയ്ക്കുമ്പോള്‍ അപ്രതീക്ഷിതമായ പിശകുണ്ടായിരിയ്ക്കുന്നു" -+msgstr "" -+"സ്മാര്‍ട്ട് കാര്‍ഡുകള്‍ക്കായി കാത്തിരിയ്ക്കുമ്പോള്‍ അപ്രതീക്ഷിതമായ " -+"പിശകുണ്ടായിരിയ്ക്കുന്നു" - - #: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 - msgid "Authentication" -@@ -591,7 +646,8 @@ msgstr "സജീവമല്ലാത്ത വാചകം" - - #: ../gui/simple-greeter/gdm-chooser-widget.c:1466 - msgid "The text to use in the label if the user hasn't picked an item yet" --msgstr "ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടില്ല എങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം" -+msgstr "" -+"ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടില്ല എങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം" - - #: ../gui/simple-greeter/gdm-chooser-widget.c:1474 - msgid "Active Text" -@@ -599,7 +655,8 @@ msgstr "സജീവമായ വാചകം" - - #: ../gui/simple-greeter/gdm-chooser-widget.c:1475 - msgid "The text to use in the label if the user has picked an item" --msgstr "ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടുണ്ടെങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം" -+msgstr "" -+"ഉപയോക്താവു് ഒരു വസ്തു എടുത്തിട്ടുണ്ടെങ്കില്‍ ലേബലില്‍ ഉപയോഗിക്കേണ്ട വാചകം" - - #: ../gui/simple-greeter/gdm-chooser-widget.c:1484 - msgid "List Visible" -@@ -732,7 +789,8 @@ msgstr "മറ്റൊരു കമ്പ്യൂട്ടറില്‍ ന - #: ../gui/simple-greeter/gdm-remote-login-window.c:202 - #, c-format - msgid "Remote Login (Connected to %s)" --msgstr "മറ്റൊരു കമ്പ്യൂട്ടറില്‍ നിന്നുള്ള പ്രവേശനം (%s ആയി ബന്ധപ്പെട്ടിരിക്കുന്നു)" -+msgstr "" -+"മറ്റൊരു കമ്പ്യൂട്ടറില്‍ നിന്നുള്ള പ്രവേശനം (%s ആയി ബന്ധപ്പെട്ടിരിക്കുന്നു)" - - #: ../gui/simple-greeter/gdm-remote-login-window.c:281 - msgid "Remote Login" -@@ -819,6 +877,12 @@ msgstr "സ്ക്രീന്‍ഷോട്ട് എടുത്തിര - msgid "Take a picture of the screen" - msgstr "ഇപ്പോള്‍ കാണുന്ന സ്ക്രീനിന്റെ ഒരു സ്ക്രീന്‍ഷോട്ട് എടുക്കുക." - -+#~ msgid "Orca Screen Reader" -+#~ msgstr "ഓര്‍കാ സ്ക്രീന്‍ റീഡര്‍" -+ -+#~ msgid "Present on-screen information as speech or braille" -+#~ msgstr "ഓണ്‍ സ്ക്രീന്‍ വിവരങ്ങള്‍ ഒരു സംഭാഷണം അല്ലെങ്കില്‍ ബ്രെയിലി ആയി ലഭ്യമാക്കുക" -+ - #~ msgid "Unable to initialize login system" - #~ msgstr "അകത്തുകയറാനുള്ള സംവിധാനം ആരംഭിക്കുവാന്‍ സാധ്യമായില്ല" - -diff --git a/po/nl.po b/po/nl.po -index 3ca6818..dd9b68f 100644 ---- a/po/nl.po -+++ b/po/nl.po -@@ -16,15 +16,15 @@ - # Tino Meinen , 2004–2006, 2008. - # Vincent van Adrighem , 2004, 2006. - # Michiel Sikkes , 2006. --# Wouter Bolsterlee , 2006–2011. -+# Wouter Bolsterlee , 2006–2012. - # Hannie Dumoleyn , 2010–2011. - msgid "" - msgstr "" - "Project-Id-Version: gdm\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2011-08-18 21:36+0200\n" -+"POT-Creation-Date: 2012-11-22 12:25+0100\n" - "PO-Revision-Date: 2011-08-18 17:27+0200\n" --"Last-Translator: Hannie Dumoleyn \n" -+"Last-Translator: Wouter Bolsterlee \n" - "Language-Team: Dutch \n" - "Language: nl\n" - "MIME-Version: 1.0\n" -@@ -33,109 +33,96 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Lokalize 1.2\n" - --#: ../common/gdm-common.c:489 -+#: ../common/gdm-common.c:492 - #, c-format - msgid "/dev/urandom is not a character device" - msgstr "Het bestand /dev/urandom is geen tekenbestand" - --# Beeldscherm? --#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 --#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 --msgid "Display ID" --msgstr "Scherm-ID" -- --#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 --#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 --msgid "ID" --msgstr "ID" -- --#: ../daemon/factory-slave-main.c:188 ../daemon/product-slave-main.c:192 --#: ../daemon/simple-slave-main.c:192 ../daemon/xdmcp-chooser-slave-main.c:194 --msgid "GNOME Display Manager Slave" --msgstr "GDM (Gnome aanmeldbeheer) Slave" -- - #: ../daemon/gdm-display-access-file.c:300 - #, c-format - msgid "could not find user \"%s\" on system" - msgstr "kan de gebruiker '%s' niet vinden op het systeem" - --#: ../daemon/gdm-factory-slave.c:207 ../daemon/gdm-simple-slave.c:309 --msgid "Unable to initialize login system" --msgstr "kan aanmeldsysteem niet initialiseren" -+#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354 -+#, c-format -+msgid "No session available yet" -+msgstr "Nog geen sessie beschikbaar" - --#: ../daemon/gdm-factory-slave.c:241 ../daemon/gdm-simple-slave.c:347 --msgid "Unable to authenticate user" --msgstr "Kan gebruiker niet authenticeren" -+#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 -+#, c-format -+msgid "Unable to look up UID of user %s" -+msgstr "Opzoeken UID van gebruiker ‘%s’ mislukt" - --#: ../daemon/gdm-factory-slave.c:265 ../daemon/gdm-simple-slave.c:399 --msgid "Unable to authorize user" --msgstr "Kan gebruiker niet autoriseren" -+#: ../daemon/gdm-manager.c:291 -+msgid "no sessions available" -+msgstr "geen sessies beschikbaar" - --#: ../daemon/gdm-factory-slave.c:289 ../daemon/gdm-simple-slave.c:537 --msgid "Unable to establish credentials" --msgstr "Kan aanmeldgegevens niet vaststellen" -+#: ../daemon/gdm-manager.c:352 -+#, c-format -+msgid "No sessions for %s available for reauthentication" -+msgstr "Er zijn geen sessies voor ‘%s’ beschikbaar voor opnieuw aanmelden" - --#: ../daemon/gdm-factory-slave.c:314 ../daemon/gdm-simple-slave.c:575 --msgid "Unable to open session" --msgstr "Kan sessie niet openen" -+#: ../daemon/gdm-manager.c:406 -+#, c-format -+msgid "Unable to find session for user %s" -+msgstr "Kan geen sessie vinden voor gebruiker ‘%s’" - --#: ../daemon/gdm-factory-slave.c:704 ../daemon/gdm-product-slave.c:511 --#: ../daemon/gdm-simple-slave.c:1447 --msgid "" --"Could not start the X server (your graphical environment) due to an internal " --"error. Please contact your system administrator or check your syslog to " --"diagnose. In the meantime this display will be disabled. Please restart GDM " --"when the problem is corrected." --msgstr "" --"Kan de X-server (grafische omgeving) niet starten vanwege een interne fout. " --"Neem contact op met de systeembeheerder of bekijk het systeemlogboek om een " --"diagnose te maken. Dit scherm wordt in de tussentijd uitgeschakeld. Herstart " --"GDM wanneer het probleem is opgelost." -+#: ../daemon/gdm-manager.c:476 -+#, c-format -+msgid "Unable to find appropriate session for user %s" -+msgstr "Kan juiste sessie voor gebruiker ‘%s’ niet vinden" -+ -+#: ../daemon/gdm-manager.c:671 -+msgid "User doesn't own session" -+msgstr "Gebruiker is geen eigenaar van sessie" - --#: ../daemon/gdm-server.c:250 -+#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 -+msgid "No session available" -+msgstr "Geen sessie beschikbaar" -+ -+#: ../daemon/gdm-server.c:272 - #, c-format - msgid "%s: failed to connect to parent display '%s'" - msgstr "%s: kan geen verbinding maken met moederscherm '%s'" - --#: ../daemon/gdm-server.c:365 -+#: ../daemon/gdm-server.c:451 - #, c-format - msgid "Server was to be spawned by user %s but that user doesn't exist" - msgstr "" - "Server moest gestart worden als %s, maar die gebruiker bestaat helemaal niet" - --#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 --#: ../daemon/gdm-welcome-session.c:603 ../daemon/gdm-welcome-session.c:623 -+#: ../daemon/gdm-server.c:462 ../daemon/gdm-server.c:482 - #, c-format - msgid "Couldn't set groupid to %d" - msgstr "Kan groeps-ID niet instellen op %d" - --#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:609 -+#: ../daemon/gdm-server.c:468 - #, c-format - msgid "initgroups () failed for %s" - msgstr "initgroups() mislukt voor %s" - --#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:615 -+#: ../daemon/gdm-server.c:474 - #, c-format - msgid "Couldn't set userid to %d" - msgstr "Kan gebruikers-ID niet instellen op %d" - --#: ../daemon/gdm-server.c:435 -+#: ../daemon/gdm-server.c:521 - #, c-format - msgid "%s: Could not open log file for display %s!" - msgstr "%s: Kan het logboek voor scherm %s niet openen!" - --#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 --#: ../daemon/gdm-server.c:458 -+#: ../daemon/gdm-server.c:532 ../daemon/gdm-server.c:538 -+#: ../daemon/gdm-server.c:544 - #, c-format - msgid "%s: Error setting %s to %s" - msgstr "%s: Fout bij instellen van %s naar %s" - --#: ../daemon/gdm-server.c:478 -+#: ../daemon/gdm-server.c:564 - #, c-format - msgid "%s: Server priority couldn't be set to %d: %s" - msgstr "%s: Serverprioriteit kon niet worden ingesteld op %d: %s" - --#: ../daemon/gdm-server.c:631 -+#: ../daemon/gdm-server.c:720 - #, c-format - msgid "%s: Empty server command for display %s" - msgstr "%s: Lege serveropdracht voor scherm %s" -@@ -168,683 +155,670 @@ msgstr "Beeldscherm" - msgid "The display device" - msgstr "Het beeldscherm" - --#: ../daemon/gdm-session-worker.c:1070 -+#: ../daemon/gdm-session.c:1183 -+msgid "Could not create authentication helper process" -+msgstr "Aanmaken hulpproces voor authenticatie mislukt" -+ -+#: ../daemon/gdm-session-worker.c:1029 - #, c-format - msgid "error initiating conversation with authentication system - %s" - msgstr "fout bij initialisatie van communicatie met authenticatiesysteem: %s" - --#: ../daemon/gdm-session-worker.c:1071 -+#: ../daemon/gdm-session-worker.c:1030 - msgid "general failure" - msgstr "algemene fout" - --#: ../daemon/gdm-session-worker.c:1072 -+#: ../daemon/gdm-session-worker.c:1031 - msgid "out of memory" - msgstr "onvoldoende geheugen beschikbaar" - --#: ../daemon/gdm-session-worker.c:1073 -+#: ../daemon/gdm-session-worker.c:1032 - msgid "application programmer error" - msgstr "programmafout" - --#: ../daemon/gdm-session-worker.c:1074 -+#: ../daemon/gdm-session-worker.c:1033 - msgid "unknown error" - msgstr "onbekende fout" - --#: ../daemon/gdm-session-worker.c:1081 -+#: ../daemon/gdm-session-worker.c:1040 - msgid "Username:" - msgstr "Gebruikersnaam:" - --#: ../daemon/gdm-session-worker.c:1087 -+#: ../daemon/gdm-session-worker.c:1046 - #, c-format - msgid "error informing authentication system of preferred username prompt: %s" - msgstr "" - "fout bij doorgeven gewenste tekst bij het naamveld aan authenticatiesysteem: " - "%s" - --#: ../daemon/gdm-session-worker.c:1101 -+#: ../daemon/gdm-session-worker.c:1060 - #, c-format - msgid "error informing authentication system of user's hostname: %s" - msgstr "fout bij doorgeven computernaam aan authenticatiesysteem: %s" - --#: ../daemon/gdm-session-worker.c:1116 -+#: ../daemon/gdm-session-worker.c:1077 - #, c-format - msgid "error informing authentication system of user's console: %s" - msgstr "fout bij doorgeven van gebruikersconsole aan authenticatiesysteem: %s" - --#: ../daemon/gdm-session-worker.c:1129 -+#: ../daemon/gdm-session-worker.c:1101 - #, c-format - msgid "error informing authentication system of display string: %s" - msgstr "fout bij doorgeven schermnaam aan authenticatiesysteem: %s" - --#: ../daemon/gdm-session-worker.c:1144 -+#: ../daemon/gdm-session-worker.c:1116 - #, c-format - msgid "error informing authentication system of display xauth credentials: %s" - msgstr "fout bij doorgeven van xauth-gegevens aan authenticatiesysteem: %s" - --#: ../daemon/gdm-session-worker.c:1464 ../daemon/gdm-session-worker.c:1481 -+#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471 - #, c-format - msgid "no user account available" - msgstr "geen gebruikersaccount beschikbaar" - --#: ../daemon/gdm-session-worker.c:1508 -+#: ../daemon/gdm-session-worker.c:1498 - msgid "Unable to change to user" - msgstr "Kan gebruiker niet wisselen" - --#: ../daemon/gdm-welcome-session.c:553 --#, c-format --msgid "User %s doesn't exist" --msgstr "Gebruiker %s bestaat niet" -- --#: ../daemon/gdm-welcome-session.c:560 --#, c-format --msgid "Group %s doesn't exist" --msgstr "Groep %s bestaat niet" -- --#: ../daemon/gdm-xdmcp-display-factory.c:604 --msgid "Could not create socket!" --msgstr "Kan geen socket aanmaken!" -- --#: ../daemon/gdm-xdmcp-display-factory.c:873 --#, c-format --msgid "Denied XDMCP query from host %s" --msgstr "XDMCP verzoek van host %s geweigerd" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1031 --#: ../daemon/gdm-xdmcp-display-factory.c:1255 --msgid "Could not extract authlist from packet" --msgstr "Kan authlijst niet uit pakket halen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1044 --#: ../daemon/gdm-xdmcp-display-factory.c:1270 --msgid "Error in checksum" --msgstr "Fout in checksum" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1523 --msgid "Bad address" --msgstr "Foutief adres" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1607 --#, c-format --msgid "%s: Could not read display address" --msgstr "%s: Kan schermadres niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1615 --#, c-format --msgid "%s: Could not read display port number" --msgstr "%s: Kan poortnummer van scherm niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1624 --#, c-format --msgid "%s: Could not extract authlist from packet" --msgstr "%s: Kan geen authlijst uit pakket halen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1644 --#, c-format --msgid "%s: Error in checksum" --msgstr "%s: Fout in checksum" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2200 --#, c-format --msgid "%s: Got REQUEST from banned host %s" --msgstr "%s: REQUEST ontvangen van verboden host %s" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2210 --#: ../daemon/gdm-xdmcp-display-factory.c:2568 --#: ../daemon/gdm-xdmcp-display-factory.c:2822 --#, c-format --msgid "%s: Could not read Display Number" --msgstr "%s: Kan het schermnummer niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2217 --#, c-format --msgid "%s: Could not read Connection Type" --msgstr "%s: Kan het verbindingstype niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2224 --#, c-format --msgid "%s: Could not read Client Address" --msgstr "%s: Kan clientadres niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2232 --#, c-format --msgid "%s: Could not read Authentication Names" --msgstr "%s: Kan de identificatienamen niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2241 --#, c-format --msgid "%s: Could not read Authentication Data" --msgstr "%s: Kan de identificatiedata niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2251 --#, c-format --msgid "%s: Could not read Authorization List" --msgstr "%s: Kan de identificatielijst niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2270 --#, c-format --msgid "%s: Could not read Manufacturer ID" --msgstr "%s: Kan Producent-ID niet lezen" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2297 --#, c-format --msgid "%s: Failed checksum from %s" --msgstr "%s: Fout in checksum van %s" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2552 --#, c-format --msgid "%s: Got Manage from banned host %s" --msgstr "%s: 'Manage' ontvangen van verboden host %s" -+#: ../daemon/gdm-simple-slave.c:1330 -+msgid "" -+"Could not start the X server (your graphical environment) due to an internal " -+"error. Please contact your system administrator or check your syslog to " -+"diagnose. In the meantime this display will be disabled. Please restart GDM " -+"when the problem is corrected." -+msgstr "" -+"Kan de X-server (grafische omgeving) niet starten vanwege een interne fout. " -+"Neem contact op met de systeembeheerder of bekijk het systeemlogboek om een " -+"diagnose te maken. Dit scherm wordt in de tussentijd uitgeschakeld. Herstart " -+"GDM wanneer het probleem is opgelost." - --#: ../daemon/gdm-xdmcp-display-factory.c:2561 --#: ../daemon/gdm-xdmcp-display-factory.c:2829 -+#: ../daemon/gdm-simple-slave.c:1371 - #, c-format --msgid "%s: Could not read Session ID" --msgstr "%s: Kan sessie-ID niet lezen" -+msgid "Can only be called before user is logged in" -+msgstr "Kan alleen aangeroepen worden voordat de gebruiker aangemeld is" - --#: ../daemon/gdm-xdmcp-display-factory.c:2575 -+#: ../daemon/gdm-simple-slave.c:1381 - #, c-format --msgid "%s: Could not read Display Class" --msgstr "%s: Kan schermklasse niet lezen" -+msgid "Caller not GDM" -+msgstr "Aanroep niet door GDM" - --#: ../daemon/gdm-xdmcp-display-factory.c:2681 --#: ../daemon/gdm-xdmcp-display-factory.c:2731 --#: ../daemon/gdm-xdmcp-display-factory.c:2737 --#, c-format --msgid "%s: Could not read address" --msgstr "%s: Kan adres niet lezen" -+#: ../daemon/gdm-simple-slave.c:1434 -+msgid "User not logged in" -+msgstr "Gebruiker niet aangemeld" - --#: ../daemon/gdm-xdmcp-display-factory.c:2812 -+#: ../daemon/gdm-xdmcp-chooser-slave.c:368 - #, c-format --msgid "%s: Got KEEPALIVE from banned host %s" --msgstr "%s: KEEPALIVE ontvangen van verboden host %s" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2902 --msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" --msgstr "GdmXdmcpDisplayFactory: Kan XDMCP-header niet lezen!" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2908 --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 --msgid "XMDCP: Incorrect XDMCP version!" --msgstr "XDMCP: Versie van XDMCP niet goed!" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2914 --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 --msgid "XMDCP: Unable to parse address" --msgstr "XDMCP: Kan adres niet analyseren" -+msgid "Currently, only one client can be connected at once" -+msgstr "Momenteel kan slechts een gebruiker tegelijkertijd verbonden zijn" - --#: ../daemon/gdm-xdmcp-display-factory.c:3363 --#, c-format --msgid "Could not get server hostname: %s!" --msgstr "Kan de naam van de server niet vinden: %s!" -+#: ../daemon/gdm-xdmcp-display-factory.c:604 -+msgid "Could not create socket!" -+msgstr "Kan geen socket aanmaken!" - --#: ../daemon/main.c:237 ../daemon/main.c:250 -+#: ../daemon/main.c:126 ../daemon/main.c:139 - #, c-format - msgid "Cannot write PID file %s: possibly out of disk space: %s" - msgstr "" - "Kan PID-bestand %s niet beschrijven. Mogelijkerwijs is er geen vrije " - "schijfruimte meer: %s" - --#: ../daemon/main.c:271 --#, c-format --msgid "Logdir %s does not exist or isn't a directory." --msgstr "Logmap %s bestaat niet of is geen map." -- --#: ../daemon/main.c:287 --#, c-format --msgid "Authdir %s does not exist. Aborting." --msgstr "Authdir %s bestaat niet. Gestopt." -- --#: ../daemon/main.c:291 -+#: ../daemon/main.c:189 - #, c-format --msgid "Authdir %s is not a directory. Aborting." --msgstr "Authdir %s niet herkend. Gestopt." -+msgid "Failed to create ran once marker dir %s: %s" -+msgstr "Aanmaken map ‘%s’ (voor ‘ran once’-markering) mislukt: %s" - --#: ../daemon/main.c:365 -+#: ../daemon/main.c:195 - #, c-format --msgid "Authdir %s is not owned by user %d, group %d. Aborting." --msgstr "Authdir %s is geen eigendom van gebruiker %d, groep %d. Gestopt." -+msgid "Failed to create AuthDir %s: %s" -+msgstr "Aanmaken AuthDir ‘%s’ mislukt: %s" - --#: ../daemon/main.c:372 -+#: ../daemon/main.c:201 - #, c-format --msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." --msgstr "Authdir %s heeft verkeerde rechten %o. Moet %o zijn. Gestopt." -+msgid "Failed to create LogDir %s: %s" -+msgstr "Aanmaken LogDir ‘%s’ mislukt: %s" - --#: ../daemon/main.c:409 -+#: ../daemon/main.c:236 - #, c-format - msgid "Can't find the GDM user '%s'. Aborting!" - msgstr "Kan de GDM-gebruiker ‘%s’ niet vinden. Gestopt!" - --#: ../daemon/main.c:415 -+#: ../daemon/main.c:242 - msgid "The GDM user should not be root. Aborting!" - msgstr "De GDM-gebruiker mag geen root zijn. Gestopt!" - --#: ../daemon/main.c:421 -+#: ../daemon/main.c:248 - #, c-format - msgid "Can't find the GDM group '%s'. Aborting!" - msgstr "Kan GDM-groep ‘%s’ niet vinden. Gestopt!" - --#: ../daemon/main.c:427 -+#: ../daemon/main.c:254 - msgid "The GDM group should not be root. Aborting!" - msgstr "De GDM-groep mag geen root zijn. Gestopt!" - --#: ../daemon/main.c:533 -+#: ../daemon/main.c:362 - msgid "Make all warnings fatal" - msgstr "Ook stoppen bij waarschuwingen" - --#: ../daemon/main.c:534 -+#: ../daemon/main.c:363 - msgid "Exit after a time (for debugging)" - msgstr "Afsluiten na een tijdje (voor debuggen)" - --#: ../daemon/main.c:535 -+#: ../daemon/main.c:364 - msgid "Print GDM version" - msgstr "GDM-versie weergeven" - --#: ../daemon/main.c:548 -+#: ../daemon/main.c:377 - msgid "GNOME Display Manager" - msgstr "Gnome Aanmeldbeheer" - - # wil -> mag - #. make sure the pid file doesn't get wiped --#: ../daemon/main.c:614 -+#: ../daemon/main.c:425 - msgid "Only the root user can run GDM" - msgstr "Alleen root mag GDM starten" - - #. Translators: worker is a helper process that does the work - #. of starting up a session --#: ../daemon/session-worker-main.c:156 -+#: ../daemon/session-worker-main.c:150 - msgid "GNOME Display Manager Session Worker" - msgstr "GDM (Gnome aanmeldbeheer) Session worker" - --# hostsysteem/hostcomputer/computer/systeem --# het/een/. --#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 --msgid "Select System" --msgstr "Selecteer computer" -+# Beeldscherm? -+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 -+msgid "Display ID" -+msgstr "Scherm-ID" - --# BUG: XMCP aan het begin moet zijn: XDMCP --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 --msgid "XDMCP: Could not create XDMCP buffer!" --msgstr "XDMCP: Kan geen XDMCP-buffer aanmaken!" -+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 -+msgid "ID" -+msgstr "ID" - --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 --msgid "XDMCP: Could not read XDMCP header!" --msgstr "XDMCP: Kan XDMCP-header niet lezen!" -+#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 -+msgid "GNOME Display Manager Slave" -+msgstr "GDM (Gnome aanmeldbeheer) Slave" - --#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 --msgid "Value" --msgstr "Waarde" -+#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 -+msgid "Login Window" -+msgstr "Aanmeldvenster" - --#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 --msgid "percentage of time complete" --msgstr "percentage voltooide tijd" -+#: ../data/applications/gnome-shell.desktop.in.h:1 -+msgid "GNOME Shell" -+msgstr "Gnome Shell" - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 --msgid "Inactive Text" --msgstr "Inactieve tekst" -+#: ../data/applications/gnome-shell.desktop.in.h:2 -+msgid "Window management and compositing" -+msgstr "Vensterbeheer en compositing" - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 --msgid "The text to use in the label if the user hasn't picked an item yet" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 -+msgid "Whether or not to allow fingerprint readers for login" -+msgstr "Al dan niet vingerafdruklezers toestaan voor inloggen" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 -+msgid "" -+"The login screen can optionally allow users who have enrolled their " -+"fingerprints to log in using those prints." - msgstr "" --"De te gebruiken tekst in het label als de gebruiker nog geen item heeft " --"gekozen" -+"Het aanmeldvenster kan optioneel gebruikers laten inloggen middels " -+"vingerafdrukken." - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 --msgid "Active Text" --msgstr "Actieve tekst" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 -+msgid "Whether or not to allow smartcard readers for login" -+msgstr "Al dan niet smartcard-lezers toestaan voor inloggen" - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 --msgid "The text to use in the label if the user has picked an item" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 -+msgid "" -+"The login screen can optionally allow users who have smartcards to log in " -+"using those smartcards." - msgstr "" --"De te gebruiken tekst in het label als de gebruiker een item heeft gekozen" -+"Het aanmeldvenster kan optioneel gebruikers laten inloggen middels " -+"smartcards." - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 --msgid "List Visible" --msgstr "Lijst zichtbaar" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 -+msgid "Path to small image at top of user list" -+msgstr "Pad naar een kleine afbeelding boven de lijst met gebruikers" - --#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 --msgid "Whether the chooser list is visible" --msgstr "Of de kieslijst zichtbaar is" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 -+msgid "" -+"The login screen can optionally show a small image at the top of its user " -+"list to provide site administrators and distributions a way to provide " -+"branding." -+msgstr "" -+"Het aanmeldscherm kan optioneel een kleine afbeelding tonen boven de lijst " -+"met gebruikers. Dit maakt het voor beheerders en distributies mogelijk om " -+"‘branding’ toe te voegen." - --# a=verkorte weekdag --# b=verkorte maand --# d=dag van de maand (01) --# e=dag van de maand (1) --# l=uur (1-12) --# p=lokaal equivalent van AM/PM --# H=uur (0-23) --# M=minuut --#. translators: This is the time format to use when both --#. * the date and time with seconds are being shown together. --#. --#: ../gui/simple-greeter/gdm-clock-widget.c:70 --msgid "%a %b %e, %l:%M:%S %p" --msgstr "%a %e %b, %H:%M:%S" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 -+msgid "" -+"The fallback login screen can optionally show a small image at the top of " -+"its user list to provide site administrators and distributions a way to " -+"provide branding." -+msgstr "" -+"Het aanmeldscherm in terugvalmodus kan optioneel een kleine afbeelding tonen " -+"boven de lijst met gebruikers. Dit maakt het voor beheerders en distributies " -+"mogelijk om ‘branding’ toe te voegen." - --# a=verkorte weekdag --# b=verkorte maand --# d=dag van de maand (01) --# e=dag van de maand (1) --# l=uur (1-12) --# p=lokaal equivalent van AM/PM --# H=uur (0-23) --# M=minuut --#. translators: This is the time format to use when both --#. * the date and time without seconds are being shown together. --#. --#: ../gui/simple-greeter/gdm-clock-widget.c:76 --msgid "%a %b %e, %l:%M %p" --msgstr "%a %e %b, %H:%M" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 -+msgid "Avoid showing user list" -+msgstr "Tonen van lijst met gebruikers vermijden" - --# a=verkorte weekdag --# b=verkorte maand --# d=dag van de maand (01) --# e=dag van de maand (1) --# l=uur (1-12) --# p=lokaal equivalent van AM/PM --# H=uur (0-23) --# M=minuut --#. translators: This is the time format to use when there is --#. * no date, just weekday and time with seconds. --#. --#: ../gui/simple-greeter/gdm-clock-widget.c:83 --msgid "%a %l:%M:%S %p" --msgstr "%a %H:%M%S" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 -+msgid "" -+"The login screen normally shows a list of available users to log in as. This " -+"setting can be toggled to disable showing the user list." -+msgstr "" -+"Het aanmeldscherm toont normaal gesproken een lijst met beschikbare " -+"gebruikers. Deze instelling maakt het mogelijk deze lijst niet te tonen." - --# a=verkorte weekdag --# b=verkorte maand --# d=dag van de maand (01) --# e=dag van de maand (1) --# l=uur (1-12) --# p=lokaal equivalent van AM/PM --# H=uur (0-23) --# M=minuut --#. translators: This is the time format to use when there is --#. * no date, just weekday and time without seconds. --#. --#: ../gui/simple-greeter/gdm-clock-widget.c:92 --msgid "%a %l:%M %p" --msgstr "%a %H:%M" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 -+msgid "Enable showing the banner message" -+msgstr "Het welkomstbericht tonen" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:319 --msgid "Automatically logging in…" --msgstr "Automatische aanmelding…" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 -+msgid "Set to true to show the banner message text." -+msgstr "Inschakelen om het welkomstbericht te tonen." - --#. need to wait for response from backend --#: ../gui/simple-greeter/gdm-greeter-login-window.c:935 --msgid "Cancelling…" --msgstr "Afbreken…" -+# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 -+msgid "Banner message text" -+msgstr "Welkomstbericht" - --#. just wait for the user to select language and stuff --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1491 --msgid "Select language and click Log In" --msgstr "Selecteer de taal en klik op ‘Aanmelden’" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 -+msgid "Text banner message to show in the login window." -+msgstr "Tekst van het welkomstbericht in het aanmeldvenster." - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1627 --msgctxt "customsession" --msgid "Custom" --msgstr "Aangepast" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 -+msgid "Disable showing the restart buttons" -+msgstr "De herstartknoppen niet tonen" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1628 --msgid "Custom session" --msgstr "Aangepaste sessie" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 -+msgid "Set to true to disable showing the restart buttons in the login window." -+msgstr "" -+"Inschakelen om de herstartknoppen van het aanmeldvenster niet te tonen." - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:2605 --msgid "Login Window" --msgstr "Aanmeldvenster" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 -+msgid "Number of allowed authentication failures" -+msgstr "Aantal toegestane mislukte inlogpogingen" - --#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 --msgid "Cancel" --msgstr "Afbreken" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 -+msgid "" -+"The number of times a user is allowed to attempt authentication, before " -+"giving up and going back to user selection." -+msgstr "" -+"Aantal keer dat een gebruiker kan proberen in te loggen voordat teruggegaan " -+"wordt naar het kiezen van een gebruiker." - --#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 --msgid "Computer Name" --msgstr "Computernaam" -+#: ../gui/libgdm/gdm-user-switching.c:72 -+msgid "Unable to create transient display: " -+msgstr "Aanmaken nieuw ‘transient display’ mislukt: " - --#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 --msgid "Login" --msgstr "Aanmelden" -+#: ../gui/libgdm/gdm-user-switching.c:183 -+#: ../gui/libgdm/gdm-user-switching.c:395 -+msgid "Unable to activate session: " -+msgstr "Activeren sessie mislukt: " - --#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 --msgid "Unlock" --msgstr "Ontgrendelen" -+# huh? -+#: ../gui/libgdm/gdm-user-switching.c:344 -+#: ../gui/libgdm/gdm-user-switching.c:512 ../utils/gdmflexiserver.c:446 -+#: ../utils/gdmflexiserver.c:613 -+#, c-format -+msgid "Could not identify the current session." -+msgstr "Kon de huidige sessie niet identificeren." - --#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 --msgid "Version" --msgstr "Versie" -+#: ../gui/libgdm/gdm-user-switching.c:351 ../utils/gdmflexiserver.c:453 -+#, c-format -+msgid "User unable to switch sessions." -+msgstr "Gebruiker kan niet van sessie wisselen." - --# pauzestand/pauzeren --#: ../gui/simple-greeter/gdm-greeter-panel.c:907 --msgid "Suspend" --msgstr "Pauzeren" -+# huh? -+#: ../gui/libgdm/gdm-user-switching.c:521 ../utils/gdmflexiserver.c:622 -+#, c-format -+msgid "Could not identify the current seat." -+msgstr "Kon de huidige zitplaats niet identificeren." - --#: ../gui/simple-greeter/gdm-greeter-panel.c:912 --msgid "Restart" --msgstr "Herstarten" -+#: ../gui/libgdm/gdm-user-switching.c:531 ../utils/gdmflexiserver.c:632 -+#, c-format -+msgid "" -+"The system is unable to determine whether to switch to an existing login " -+"screen or start up a new login screen." -+msgstr "" -+"Het systeem kon niet bepalen of naar een bestaand aanmeldscherm geschakeld " -+"moest worden of dat er een nieuw aanmeldscherm gestart moet worden." - --#: ../gui/simple-greeter/gdm-greeter-panel.c:916 --msgid "Shut Down" --msgstr "Uitschakelen" -+#: ../gui/libgdm/gdm-user-switching.c:539 ../utils/gdmflexiserver.c:640 -+#, c-format -+msgid "The system is unable to start up a new login screen." -+msgstr "Het systeem kan geen nieuw aanmeldscherm tonen." - --#: ../gui/simple-greeter/gdm-greeter-panel.c:965 --msgid "Unknown time remaining" --msgstr "Resterende tijd onbekend" -+# hostsysteem/hostcomputer/computer/systeem -+# het/een/. -+#: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 -+msgid "Select System" -+msgstr "Selecteer computer" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:987 --msgid "Panel" --msgstr "Paneel" -+# BUG: XMCP aan het begin moet zijn: XDMCP -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:215 -+msgid "XDMCP: Could not create XDMCP buffer!" -+msgstr "XDMCP: Kan geen XDMCP-buffer aanmaken!" - --#: ../gui/simple-greeter/gdm-option-widget.c:505 --msgid "Label Text" --msgstr "Labeltekst" -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:221 -+msgid "XDMCP: Could not read XDMCP header!" -+msgstr "XDMCP: Kan XDMCP-header niet lezen!" - --#: ../gui/simple-greeter/gdm-option-widget.c:506 --msgid "The text to use as a label" --msgstr "De te gebruiken tekst voor het label" -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 -+msgid "XDMCP: Incorrect XDMCP version!" -+msgstr "XDMCP: Onjuiste XDMCP-versie!" - --#: ../gui/simple-greeter/gdm-option-widget.c:513 --msgid "Icon name" --msgstr "Pictogramnaam" -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 -+msgid "XDMCP: Unable to parse address" -+msgstr "XDMCP: Kan adres niet verwerken" - --#: ../gui/simple-greeter/gdm-option-widget.c:514 --msgid "The icon to use with the label" --msgstr "Het te gebruiken pictogram voor het label" -+# aanmeldingscontrole -+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 -+msgid "Fingerprint Authentication" -+msgstr "Vingerafdruk-authenticatie" - --#: ../gui/simple-greeter/gdm-option-widget.c:522 --msgid "Default Item" --msgstr "Standaard-item" -+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 -+msgid "Log into session with fingerprint" -+msgstr "Bij sessie aanmelden met vingerafdruk" - --#: ../gui/simple-greeter/gdm-option-widget.c:523 --msgid "The ID of the default item" --msgstr "Het ID van het standaard-item" -+# aanmeldingscontrole -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 -+msgid "Password Authentication" -+msgstr "Wachtwoordauthenticatie" - --#: ../gui/simple-greeter/gdm-recent-option-widget.c:310 --msgid "Max Item Count" --msgstr "Maximum aantal items" -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 -+msgid "Log into session with username and password" -+msgstr "Bij sessie aanmelden met gebruikersnaam en wachtwoord" - --#: ../gui/simple-greeter/gdm-recent-option-widget.c:311 --msgid "The maximum number of items to keep around in the list" --msgstr "Het maximum aantal items in de lijst" -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 -+msgid "Log In" -+msgstr "Aanmelden" - --#: ../gui/simple-greeter/gdm-remote-login-window.c:188 --#, c-format --msgid "Remote Login (Connecting to %s…)" --msgstr "Aanmelding op afstand (Verbinden met %s...)" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 -+msgid "Slot ID" -+msgstr "Slot-ID" - --#: ../gui/simple-greeter/gdm-remote-login-window.c:202 --#, c-format --msgid "Remote Login (Connected to %s)" --msgstr "Aanmelding op afstand (Verbonden met %s)" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 -+msgid "The slot the card is in" -+msgstr "Het slot waar de kaart in zit" - --#: ../gui/simple-greeter/gdm-remote-login-window.c:281 --msgid "Remote Login" --msgstr "Aanmelding op afstand" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 -+msgid "Slot Series" -+msgstr "Slot Series" - --#: ../gui/simple-greeter/gdm-session-option-widget.c:162 --msgid "Session" --msgstr "Sessies" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 -+msgid "per-slot card identifier" -+msgstr "per-slot kaartidentifier" - --# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 --msgid "Banner message text" --msgstr "Welkomstbericht" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 -+msgid "name" -+msgstr "naam" - --# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 --msgid "Banner message text when chooser is empty" --msgstr "Welkomstbericht bij lege kieslijst" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 -+msgid "Module" -+msgstr "Module" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 --msgid "Disable showing the restart buttons" --msgstr "De herstartknoppen niet tonen" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 -+msgid "smartcard driver" -+msgstr "smartcard-stuurprogramma" - --# bekende/legale --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 --msgid "Do not show known users in the login window" --msgstr "Legale gebruikers niet tonen in het aanmeldvenster" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 -+msgid "Smartcard Authentication" -+msgstr "Smartcard-authenticatie" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 --msgid "Enable accessibility keyboard plugin" --msgstr "Toetsenbordtoegankelijkheidsplug-in activeren" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 -+msgid "Log into session with smartcard" -+msgstr "Bij sessie aanmelden met smartcard" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 --msgid "Enable on-screen keyboard" --msgstr "Schermtoetsenbord inschakelen" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 -+msgid "Module Path" -+msgstr "Modulepad" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 -+msgid "path to smartcard PKCS #11 driver" -+msgstr "pad naar stuurprogramma smartcard PKCS #11" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 --msgid "Enable screen magnifier" --msgstr "Vergrootglad inschakelen" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 -+msgid "received error or hang up from event source" -+msgstr "fout ontvangen van, of opgehangen door activiteitenbron" - --# klaar voor gebruik/gereed --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 --msgid "Enable screen reader" --msgstr "Schermlezer inschakelen" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 -+#, c-format -+msgid "NSS security system could not be initialized" -+msgstr "NSS-beveiligingssysteem kon niet worden geïnitialiseerd" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 --msgid "Enable showing the banner message" --msgstr "Het welkomstbericht tonen" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 -+#, c-format -+msgid "no suitable smartcard driver could be found" -+msgstr "er is geen geschikt smartcard-stuurprogramma aangetroffen" - --# welkomstlogo/aanmeldlogo --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 --msgid "Icon name to use for greeter logo" --msgstr "Pictogramnaam voor het aanmeldlogo" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 -+#, c-format -+msgid "smartcard driver '%s' could not be loaded" -+msgstr "smartcard-stuurprogramma ‘%s’ kon niet worden geladen" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 --msgid "Recently selected languages" --msgstr "Recent gebruikte talen" -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 -+#, c-format -+msgid "could not watch for incoming card events - %s" -+msgstr "kon inkomende kaartactiviteit niet nagaan - %s" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 --msgid "Set to a list of languages to be shown by default in the login window." --msgstr "Instellen op een lijst van standaard weer te geven talen." -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 -+#, c-format -+msgid "encountered unexpected error while waiting for smartcard events" -+msgstr "onverwachte fout tegengekomen bij het wachten op smartcardactiviteiten" - --# thema van pictogramnaam/naam van het themapictogram --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 --msgid "Set to the themed icon name to use for the greeter logo." --msgstr "" --"Ingesteld op de naam van het themapictogram dat gebruikt wordt voor het " --"aanmeldlogo." -+# aanmeldingscontrole -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 -+msgid "Authentication" -+msgstr "Authenticatie" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 --msgid "Set to true to disable showing known users in the login window." -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 -+msgid "Log into session" -+msgstr "Bij sessie aanmelden" -+ -+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 -+msgid "Value" -+msgstr "Waarde" -+ -+#: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 -+msgid "percentage of time complete" -+msgstr "percentage voltooide tijd" -+ -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1465 -+msgid "Inactive Text" -+msgstr "Inactieve tekst" -+ -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1466 -+msgid "The text to use in the label if the user hasn't picked an item yet" - msgstr "" --"Inschakelen om de gebruikers van het systeem niet te tonen in het " --"aanmeldvenster." -+"De te gebruiken tekst in het label als de gebruiker nog geen item heeft " -+"gekozen" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 --msgid "Set to true to disable showing the restart buttons in the login window." -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1474 -+msgid "Active Text" -+msgstr "Actieve tekst" -+ -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1475 -+msgid "The text to use in the label if the user has picked an item" - msgstr "" --"Inschakelen om de herstartknoppen van het aanmeldvenster niet te tonen." -+"De te gebruiken tekst in het label als de gebruiker een item heeft gekozen" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 --msgid "Set to true to enable the XRandR settings manager plugin." --msgstr "Inschakelen om de plug-in voor xrandr te gebruiken." -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1484 -+msgid "List Visible" -+msgstr "Lijst zichtbaar" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 --msgid "Set to true to enable the background settings manager plugin." --msgstr "Inschakelen om achtergrondinstellingenbeheer te gebruiken." -+#: ../gui/simple-greeter/gdm-chooser-widget.c:1485 -+msgid "Whether the chooser list is visible" -+msgstr "Of de kieslijst zichtbaar is" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 --msgid "Set to true to enable the media-keys settings manager plugin." --msgstr "" --"Inschakelen om de plug-in voor het beheer van de media-toetsen te gebruiken." -+# a=verkorte weekdag -+# b=verkorte maand -+# d=dag van de maand (01) -+# e=dag van de maand (1) -+# l=uur (1-12) -+# p=lokaal equivalent van AM/PM -+# H=uur (0-23) -+# M=minuut -+#. translators: This is the time format to use when both -+#. * the date and time with seconds are being shown together. -+#. -+#: ../gui/simple-greeter/gdm-clock-widget.c:70 -+msgid "%a %b %e, %l:%M:%S %p" -+msgstr "%a %e %b, %H:%M:%S" -+ -+# a=verkorte weekdag -+# b=verkorte maand -+# d=dag van de maand (01) -+# e=dag van de maand (1) -+# l=uur (1-12) -+# p=lokaal equivalent van AM/PM -+# H=uur (0-23) -+# M=minuut -+#. translators: This is the time format to use when both -+#. * the date and time without seconds are being shown together. -+#. -+#: ../gui/simple-greeter/gdm-clock-widget.c:76 -+msgid "%a %b %e, %l:%M %p" -+msgstr "%a %e %b, %H:%M" -+ -+# a=verkorte weekdag -+# b=verkorte maand -+# d=dag van de maand (01) -+# e=dag van de maand (1) -+# l=uur (1-12) -+# p=lokaal equivalent van AM/PM -+# H=uur (0-23) -+# M=minuut -+#. translators: This is the time format to use when there is -+#. * no date, just weekday and time with seconds. -+#. -+#: ../gui/simple-greeter/gdm-clock-widget.c:83 -+msgid "%a %l:%M:%S %p" -+msgstr "%a %H:%M%S" -+ -+# a=verkorte weekdag -+# b=verkorte maand -+# d=dag van de maand (01) -+# e=dag van de maand (1) -+# l=uur (1-12) -+# p=lokaal equivalent van AM/PM -+# H=uur (0-23) -+# M=minuut -+#. translators: This is the time format to use when there is -+#. * no date, just weekday and time without seconds. -+#. -+#: ../gui/simple-greeter/gdm-clock-widget.c:92 -+msgid "%a %l:%M %p" -+msgstr "%a %H:%M" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 -+msgid "Automatically logging in…" -+msgstr "Automatische aanmelding…" -+ -+#. need to wait for response from backend -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 -+msgid "Cancelling…" -+msgstr "Afbreken…" -+ -+#. just wait for the user to select language and stuff -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 -+msgid "Select language and click Log In" -+msgstr "Selecteer de taal en klik op ‘Aanmelden’" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 -+msgctxt "customsession" -+msgid "Custom" -+msgstr "Aangepast" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 -+msgid "Custom session" -+msgstr "Aangepaste sessie" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 -+msgid "Computer Name" -+msgstr "Computernaam" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -+msgid "Version" -+msgstr "Versie" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 -+msgid "Cancel" -+msgstr "Afbreken" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 -+msgid "Unlock" -+msgstr "Ontgrendelen" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 --msgid "Set to true to enable the on-screen keyboard." --msgstr "Inschakelen om het schermtoetsenbord te gebruiken." -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 -+msgid "Login" -+msgstr "Aanmelden" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 --msgid "" --"Set to true to enable the plugin to manage the accessibility keyboard " --"settings." --msgstr "Inschakelen om de toetsenbordtoegankelijkheidsplug-in te gebruiken." -+# pauzestand/pauzeren -+#: ../gui/simple-greeter/gdm-greeter-panel.c:955 -+msgid "Suspend" -+msgstr "Pauzeren" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 --msgid "Set to true to enable the screen magnifier." --msgstr "Inschakelen om het vergrootglas te gebruiken." -+#: ../gui/simple-greeter/gdm-greeter-panel.c:960 -+msgid "Restart" -+msgstr "Herstarten" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 --msgid "Set to true to enable the screen reader." --msgstr "Inschakelen om de schermlezer te gebruiken." -+#: ../gui/simple-greeter/gdm-greeter-panel.c:964 -+msgid "Shut Down" -+msgstr "Uitschakelen" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 --msgid "Set to true to enable the sound settings manager plugin." --msgstr "" --"Inschakelen om de plug-in voor het beheer van de geluidsinstellingen te " --"gebruiken." -+#: ../gui/simple-greeter/gdm-greeter-panel.c:1013 -+msgid "Unknown time remaining" -+msgstr "Resterende tijd onbekend" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 --msgid "Set to true to enable the xsettings settings manager plugin." --msgstr "" --"Inschakelen om de plug-in voor het beheer van de xsettings-instellingen te " --"gebruiken." -+#: ../gui/simple-greeter/gdm-greeter-panel.c:1035 -+msgid "Panel" -+msgstr "Paneel" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 --msgid "Set to true to show the banner message text." --msgstr "Inschakelen om het welkomstbericht te tonen." -+#: ../gui/simple-greeter/gdm-option-widget.c:505 -+msgid "Label Text" -+msgstr "Labeltekst" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 --msgid "Set to true to use Compiz as the window manager." --msgstr "Inschakelen om compiz voor het vensterbeheer te gebruiken." -+#: ../gui/simple-greeter/gdm-option-widget.c:506 -+msgid "The text to use as a label" -+msgstr "De te gebruiken tekst voor het label" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 --msgid "" --"Text banner message to show in the login window when the user chooser is " --"empty, instead of banner_message_text." --msgstr "" --"Tekst van het welkomstbericht in het aanmeldvenster wanneer de kieslijst " --"leeg is, in plaats van banner_message_text." -+#: ../gui/simple-greeter/gdm-option-widget.c:513 -+msgid "Icon name" -+msgstr "Pictogramnaam" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 --msgid "Text banner message to show in the login window." --msgstr "Tekst van het welkomstbericht in het aanmeldvenster." -+#: ../gui/simple-greeter/gdm-option-widget.c:514 -+msgid "The icon to use with the label" -+msgstr "Het te gebruiken pictogram voor het label" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 --msgid "True if the XRandR settings manager plugin is enabled." --msgstr "Ingeschakeld als de xrandr-plug-in gebruikt wordt." -+#: ../gui/simple-greeter/gdm-option-widget.c:522 -+msgid "Default Item" -+msgstr "Standaard-item" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 --msgid "True if the background settings manager plugin is enabled." --msgstr "" --"Ingeschakeld als de plug-in voor achtergrondinstellingen gebruikt wordt." -+#: ../gui/simple-greeter/gdm-option-widget.c:523 -+msgid "The ID of the default item" -+msgstr "Het ID van het standaard-item" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 --msgid "True if the media-keys settings manager plugin is enabled." --msgstr "" --"Ingeschakeld als de plug-in voor het beheer van de media-toetsen gebruikt " --"wordt." -+#: ../gui/simple-greeter/gdm-remote-login-window.c:188 -+#, c-format -+msgid "Remote Login (Connecting to %s…)" -+msgstr "Aanmelding op afstand (Verbinden met %s...)" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 --msgid "True if the sound settings manager plugin is enabled." --msgstr "" --"Ingeschakeld als de plug-in voor het beheer van de geluidsinstellingen " --"gebruikt wordt." -+#: ../gui/simple-greeter/gdm-remote-login-window.c:202 -+#, c-format -+msgid "Remote Login (Connected to %s)" -+msgstr "Aanmelding op afstand (Verbonden met %s)" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 --msgid "True if the xsettings settings manager plugin is enabled." --msgstr "" --"Ingeschakeld als de plug-in voor xsettings-instellingen gebruikt wordt." -+#: ../gui/simple-greeter/gdm-remote-login-window.c:281 -+msgid "Remote Login" -+msgstr "Aanmelding op afstand" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 --msgid "Use Compiz as the window manager" --msgstr "Compiz gebruiken voor het vensterbeheer" -+#: ../gui/simple-greeter/gdm-session-option-widget.c:162 -+msgid "Session" -+msgstr "Sessies" - - #: ../gui/simple-greeter/gdm-timer.c:147 - msgid "Duration" -@@ -873,8 +847,8 @@ msgstr "Is het actief?" - msgid "Whether the timer is currently ticking" - msgstr "Of de teller momenteel aan het aftellen is" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:802 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 - #, c-format - msgid "Log in as %s" - msgstr "Aanmelden als %s" -@@ -884,201 +858,293 @@ msgstr "Aanmelden als %s" - #. * manually instead of choosing from - #. * a list. - #. --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 - msgctxt "user" - msgid "Other…" - msgstr "Anderen…" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 - msgid "Choose a different account" - msgstr "Kies een ander account" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 - msgid "Guest" - msgstr "Gast" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 - msgid "Log in as a temporary guest" - msgstr "Aanmelden als tijdelijke gast" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 - msgid "Automatic Login" - msgstr "Automatische aanmelding" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 - msgid "Automatically log into the system after selecting options" - msgstr "Automatisch aanmelden na het selecteren van de opties" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1358 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 - msgid "Currently logged in" - msgstr "Al aangemeld" - --# aanmeldingscontrole --#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 --msgid "Password Authentication" --msgstr "Wachtwoordauthenticatie" -+#: ../utils/gdmflexiserver.c:64 -+msgid "Only the VERSION command is supported" -+msgstr "Alleen VERSION wordt ondersteund" - --#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 --msgid "Log into session with username and password" --msgstr "Bij sessie aanmelden met gebruikersnaam en wachtwoord" -+#: ../utils/gdmflexiserver.c:64 -+msgid "COMMAND" -+msgstr "OPDRACHT" - --#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 --#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 --msgid "Log In" --msgstr "Aanmelden" -+#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 -+#: ../utils/gdmflexiserver.c:68 ../utils/gdmflexiserver.c:69 -+msgid "Ignored — retained for compatibility" -+msgstr "Genegeerd - aanwezig om compatibiliteitsredenen" - --# aanmeldingscontrole --#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 --msgid "Fingerprint Authentication" --msgstr "Vingerafdruk-authenticatie" -+#: ../utils/gdmflexiserver.c:67 ../utils/gdm-screenshot.c:43 -+msgid "Debugging output" -+msgstr "Debug-uitvoer" - --#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 --msgid "Log into session with fingerprint" --msgstr "Bij sessie aanmelden met vingerafdruk" -+#: ../utils/gdmflexiserver.c:71 -+msgid "Version of this application" -+msgstr "De versie van deze toepassing" - --#: ../gui/simple-greeter/extensions/fingerprint/org.gnome.display-manager.extensions.fingerprint.gschema.xml.in.h:1 --#: ../gui/simple-greeter/extensions/smartcard/org.gnome.display-manager.extensions.smartcard.gschema.xml.in.h:1 --msgid "Activation of this plugin" --msgstr "Activering van deze plug-in" -+#. Option parsing -+#: ../utils/gdmflexiserver.c:706 -+msgid "- New GDM login" -+msgstr "— Nieuwe GDM-login" - --#: ../gui/simple-greeter/extensions/fingerprint/org.gnome.display-manager.extensions.fingerprint.gschema.xml.in.h:2 --#: ../gui/simple-greeter/extensions/smartcard/org.gnome.display-manager.extensions.smartcard.gschema.xml.in.h:2 --msgid "Whether this plugin would be activated or not" --msgstr "Of deze plug-in wel of niet geactiveerd moet zijn" -+#: ../utils/gdmflexiserver.c:762 -+msgid "Unable to start new display" -+msgstr "Kan geen nieuw scherm starten" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 --msgid "Smartcard Authentication" --msgstr "Smartcard-authenticatie" -+#: ../utils/gdm-screenshot.c:212 -+msgid "Screenshot taken" -+msgstr "Schermafdruk gemaakt" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 --msgid "Log into session with smartcard" --msgstr "Bij sessie aanmelden met smartcard" -+#. Option parsing -+#: ../utils/gdm-screenshot.c:279 -+msgid "Take a picture of the screen" -+msgstr "Een schermafdruk maken" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 --msgid "Module Path" --msgstr "Modulepad" -+#~ msgid "Unable to initialize login system" -+#~ msgstr "kan aanmeldsysteem niet initialiseren" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 --msgid "path to smartcard PKCS #11 driver" --msgstr "pad naar stuurprogramma smartcard PKCS #11" -+#~ msgid "Unable to authenticate user" -+#~ msgstr "Kan gebruiker niet authenticeren" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 --msgid "received error or hang up from event source" --msgstr "fout ontvangen van, of opgehangen door activiteitenbron" -+#~ msgid "Unable to establish credentials" -+#~ msgstr "Kan aanmeldgegevens niet vaststellen" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 --#, c-format --msgid "NSS security system could not be initialized" --msgstr "NSS-beveiligingssysteem kon niet worden geïnitialiseerd" -+#~ msgid "Group %s doesn't exist" -+#~ msgstr "Groep %s bestaat niet" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 --#, c-format --msgid "no suitable smartcard driver could be found" --msgstr "er is geen geschikt smartcard-stuurprogramma aangetroffen" -+#~ msgid "Denied XDMCP query from host %s" -+#~ msgstr "XDMCP verzoek van host %s geweigerd" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 --#, c-format --msgid "smartcard driver '%s' could not be loaded" --msgstr "smartcard-stuurprogramma ‘%s’ kon niet worden geladen" -+#~ msgid "Could not extract authlist from packet" -+#~ msgstr "Kan authlijst niet uit pakket halen" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 --#, c-format --msgid "could not watch for incoming card events - %s" --msgstr "kon inkomende kaartactiviteit niet nagaan - %s" -+#~ msgid "Error in checksum" -+#~ msgstr "Fout in checksum" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 --#, c-format --msgid "encountered unexpected error while waiting for smartcard events" --msgstr "onverwachte fout tegengekomen bij het wachten op smartcardactiviteiten" -+#~ msgid "Bad address" -+#~ msgstr "Foutief adres" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 --msgid "Slot ID" --msgstr "Slot-ID" -+#~ msgid "%s: Could not read display address" -+#~ msgstr "%s: Kan schermadres niet lezen" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 --msgid "The slot the card is in" --msgstr "Het slot waar de kaart in zit" -+#~ msgid "%s: Could not read display port number" -+#~ msgstr "%s: Kan poortnummer van scherm niet lezen" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 --msgid "Slot Series" --msgstr "Slot Series" -+#~ msgid "%s: Could not extract authlist from packet" -+#~ msgstr "%s: Kan geen authlijst uit pakket halen" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 --msgid "per-slot card identifier" --msgstr "per-slot kaartidentifier" -+#~ msgid "%s: Error in checksum" -+#~ msgstr "%s: Fout in checksum" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 --msgid "name" --msgstr "naam" -+#~ msgid "%s: Got REQUEST from banned host %s" -+#~ msgstr "%s: REQUEST ontvangen van verboden host %s" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 --msgid "Module" --msgstr "Module" -+#~ msgid "%s: Could not read Display Number" -+#~ msgstr "%s: Kan het schermnummer niet lezen" - --#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 --msgid "smartcard driver" --msgstr "smartcard-stuurprogramma" -+#~ msgid "%s: Could not read Connection Type" -+#~ msgstr "%s: Kan het verbindingstype niet lezen" - --# aanmeldingscontrole --#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 --msgid "Authentication" --msgstr "Authenticatie" -+#~ msgid "%s: Could not read Client Address" -+#~ msgstr "%s: Kan clientadres niet lezen" - --#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 --msgid "Log into session" --msgstr "Bij sessie aanmelden" -+#~ msgid "%s: Could not read Authentication Data" -+#~ msgstr "%s: Kan de identificatiedata niet lezen" - --#: ../utils/gdmflexiserver.c:61 --msgid "Only the VERSION command is supported" --msgstr "Alleen VERSION wordt ondersteund" -+#~ msgid "%s: Could not read Authorization List" -+#~ msgstr "%s: Kan de identificatielijst niet lezen" - --#: ../utils/gdmflexiserver.c:61 --msgid "COMMAND" --msgstr "OPDRACHT" -+#~ msgid "%s: Could not read Manufacturer ID" -+#~ msgstr "%s: Kan Producent-ID niet lezen" - --#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 --#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 --msgid "Ignored — retained for compatibility" --msgstr "Genegeerd - aanwezig om compatibiliteitsredenen" -+#~ msgid "%s: Failed checksum from %s" -+#~ msgstr "%s: Fout in checksum van %s" - --#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 --msgid "Debugging output" --msgstr "Debug-uitvoer" -+#~ msgid "%s: Got Manage from banned host %s" -+#~ msgstr "%s: 'Manage' ontvangen van verboden host %s" - --#: ../utils/gdmflexiserver.c:68 --msgid "Version of this application" --msgstr "De versie van deze toepassing" -+#~ msgid "%s: Could not read Session ID" -+#~ msgstr "%s: Kan sessie-ID niet lezen" - --# huh? --#: ../utils/gdmflexiserver.c:674 --#, c-format --msgid "Could not identify the current session." --msgstr "Kon de huidige sessie niet identificeren." -+#~ msgid "%s: Could not read Display Class" -+#~ msgstr "%s: Kan schermklasse niet lezen" - --#: ../utils/gdmflexiserver.c:682 --#, c-format --msgid "User unable to switch sessions." --msgstr "Gebruiker kan niet van sessie wisselen." -+#~ msgid "%s: Could not read address" -+#~ msgstr "%s: Kan adres niet lezen" - --#. Option parsing --#: ../utils/gdmflexiserver.c:716 --msgid "- New GDM login" --msgstr "— Nieuwe GDM-login" -+#~ msgid "%s: Got KEEPALIVE from banned host %s" -+#~ msgstr "%s: KEEPALIVE ontvangen van verboden host %s" - --#: ../utils/gdmflexiserver.c:772 --msgid "Unable to start new display" --msgstr "Kan geen nieuw scherm starten" -+#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" -+#~ msgstr "GdmXdmcpDisplayFactory: Kan XDMCP-header niet lezen!" - --#: ../utils/gdm-screenshot.c:212 --msgid "Screenshot taken" --msgstr "Schermafdruk gemaakt" -+#~ msgid "Could not get server hostname: %s!" -+#~ msgstr "Kan de naam van de server niet vinden: %s!" - --#. Option parsing --#: ../utils/gdm-screenshot.c:279 --msgid "Take a picture of the screen" --msgstr "Een schermafdruk maken" -+#~ msgid "Logdir %s does not exist or isn't a directory." -+#~ msgstr "Logmap %s bestaat niet of is geen map." -+ -+#~ msgid "Authdir %s does not exist. Aborting." -+#~ msgstr "Authdir %s bestaat niet. Gestopt." -+ -+#~ msgid "Authdir %s is not a directory. Aborting." -+#~ msgstr "Authdir %s niet herkend. Gestopt." -+ -+#~ msgid "Authdir %s is not owned by user %d, group %d. Aborting." -+#~ msgstr "Authdir %s is geen eigendom van gebruiker %d, groep %d. Gestopt." -+ -+#~ msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." -+#~ msgstr "Authdir %s heeft verkeerde rechten %o. Moet %o zijn. Gestopt." -+ -+#~ msgid "Max Item Count" -+#~ msgstr "Maximum aantal items" -+ -+#~ msgid "The maximum number of items to keep around in the list" -+#~ msgstr "Het maximum aantal items in de lijst" -+ -+# flyer/banner/tijdelijk mededeling/welkomstbericht/begroetingstekst -+#~ msgid "Banner message text when chooser is empty" -+#~ msgstr "Welkomstbericht bij lege kieslijst" -+ -+# bekende/legale -+#~ msgid "Do not show known users in the login window" -+#~ msgstr "Legale gebruikers niet tonen in het aanmeldvenster" -+ -+#~ msgid "Enable accessibility keyboard plugin" -+#~ msgstr "Toetsenbordtoegankelijkheidsplug-in activeren" -+ -+#~ msgid "Enable on-screen keyboard" -+#~ msgstr "Schermtoetsenbord inschakelen" -+ -+#~ msgid "Enable screen magnifier" -+#~ msgstr "Vergrootglad inschakelen" -+ -+# klaar voor gebruik/gereed -+#~ msgid "Enable screen reader" -+#~ msgstr "Schermlezer inschakelen" -+ -+# welkomstlogo/aanmeldlogo -+#~ msgid "Icon name to use for greeter logo" -+#~ msgstr "Pictogramnaam voor het aanmeldlogo" -+ -+#~ msgid "Recently selected languages" -+#~ msgstr "Recent gebruikte talen" -+ -+#~ msgid "" -+#~ "Set to a list of languages to be shown by default in the login window." -+#~ msgstr "Instellen op een lijst van standaard weer te geven talen." -+ -+# thema van pictogramnaam/naam van het themapictogram -+#~ msgid "Set to the themed icon name to use for the greeter logo." -+#~ msgstr "" -+#~ "Ingesteld op de naam van het themapictogram dat gebruikt wordt voor het " -+#~ "aanmeldlogo." -+ -+#~ msgid "Set to true to disable showing known users in the login window." -+#~ msgstr "" -+#~ "Inschakelen om de gebruikers van het systeem niet te tonen in het " -+#~ "aanmeldvenster." -+ -+#~ msgid "Set to true to enable the XRandR settings manager plugin." -+#~ msgstr "Inschakelen om de plug-in voor xrandr te gebruiken." -+ -+#~ msgid "Set to true to enable the background settings manager plugin." -+#~ msgstr "Inschakelen om achtergrondinstellingenbeheer te gebruiken." -+ -+#~ msgid "Set to true to enable the media-keys settings manager plugin." -+#~ msgstr "" -+#~ "Inschakelen om de plug-in voor het beheer van de media-toetsen te " -+#~ "gebruiken." -+ -+#~ msgid "Set to true to enable the on-screen keyboard." -+#~ msgstr "Inschakelen om het schermtoetsenbord te gebruiken." -+ -+#~ msgid "" -+#~ "Set to true to enable the plugin to manage the accessibility keyboard " -+#~ "settings." -+#~ msgstr "Inschakelen om de toetsenbordtoegankelijkheidsplug-in te gebruiken." -+ -+#~ msgid "Set to true to enable the screen magnifier." -+#~ msgstr "Inschakelen om het vergrootglas te gebruiken." -+ -+#~ msgid "Set to true to enable the screen reader." -+#~ msgstr "Inschakelen om de schermlezer te gebruiken." -+ -+#~ msgid "Set to true to enable the sound settings manager plugin." -+#~ msgstr "" -+#~ "Inschakelen om de plug-in voor het beheer van de geluidsinstellingen te " -+#~ "gebruiken." -+ -+#~ msgid "Set to true to enable the xsettings settings manager plugin." -+#~ msgstr "" -+#~ "Inschakelen om de plug-in voor het beheer van de xsettings-instellingen " -+#~ "te gebruiken." -+ -+#~ msgid "Set to true to use Compiz as the window manager." -+#~ msgstr "Inschakelen om compiz voor het vensterbeheer te gebruiken." -+ -+#~ msgid "" -+#~ "Text banner message to show in the login window when the user chooser is " -+#~ "empty, instead of banner_message_text." -+#~ msgstr "" -+#~ "Tekst van het welkomstbericht in het aanmeldvenster wanneer de kieslijst " -+#~ "leeg is, in plaats van banner_message_text." -+ -+#~ msgid "True if the XRandR settings manager plugin is enabled." -+#~ msgstr "Ingeschakeld als de xrandr-plug-in gebruikt wordt." -+ -+#~ msgid "True if the background settings manager plugin is enabled." -+#~ msgstr "" -+#~ "Ingeschakeld als de plug-in voor achtergrondinstellingen gebruikt wordt." -+ -+#~ msgid "True if the media-keys settings manager plugin is enabled." -+#~ msgstr "" -+#~ "Ingeschakeld als de plug-in voor het beheer van de media-toetsen gebruikt " -+#~ "wordt." -+ -+#~ msgid "True if the sound settings manager plugin is enabled." -+#~ msgstr "" -+#~ "Ingeschakeld als de plug-in voor het beheer van de geluidsinstellingen " -+#~ "gebruikt wordt." -+ -+#~ msgid "True if the xsettings settings manager plugin is enabled." -+#~ msgstr "" -+#~ "Ingeschakeld als de plug-in voor xsettings-instellingen gebruikt wordt." -+ -+#~ msgid "Use Compiz as the window manager" -+#~ msgstr "Compiz gebruiken voor het vensterbeheer" -+ -+#~ msgid "Activation of this plugin" -+#~ msgstr "Activering van deze plug-in" -+ -+#~ msgid "Whether this plugin would be activated or not" -+#~ msgstr "Of deze plug-in wel of niet geactiveerd moet zijn" - - #~ msgid "AT-SPI Registry Wrapper" - #~ msgstr "AT SPI Registry Wrapper" -@@ -1086,9 +1152,6 @@ msgstr "Een schermafdruk maken" - #~ msgid "Power Manager" - #~ msgstr "Energiebeheer" - --#~ msgid "Power management daemon" --#~ msgstr "Energiebeheer-service" -- - #~ msgid "GNOME Session Acceleration Checker" - #~ msgstr "Controle van hardwareversnelling voor de Gnome-sessie" - -diff --git a/po/or.po b/po/or.po -index 9385520..0578c97 100644 ---- a/po/or.po -+++ b/po/or.po -@@ -3,15 +3,17 @@ - # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. - # - # Subhransu Behera , 2006. --# Manoj Kumar Giri , 2008, 2009, 2010, 2011. -+# Manoj Kumar Giri , 2008, 2009, 2010, 2011, 2012. - msgid "" - msgstr "" - "Project-Id-Version: or\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&component=general\n" --"POT-Creation-Date: 2011-02-17 16:55+0000\n" --"PO-Revision-Date: 2011-03-04 15:08+0530\n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"product=gdm&keywords=I18N+L10N&component=general\n" -+"POT-Creation-Date: 2012-10-02 17:33+0000\n" -+"PO-Revision-Date: 2012-11-20 19:07+0530\n" - "Last-Translator: Manoj Kumar Giri \n" --"Language-Team: Oriya \n" -+"Language-Team: Oriya \n" -+"Language: or\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -@@ -22,109 +24,105 @@ msgstr "" - "\n" - "\n" - "\n" --"X-Generator: Lokalize 1.1\n" -+"X-Generator: Lokalize 1.5\n" - --#: ../common/gdm-common.c:456 -+#: ../common/gdm-common.c:492 - #, c-format - msgid "/dev/urandom is not a character device" - msgstr "/dev/urandom ଟି ଗୋଟିଏ ସମ୍ପ୍ରତିକ ଉପକରଣ ନୁହଁ" - --#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 --#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 --msgid "Display ID" --msgstr "ID ପ୍ରଦର୍ଶନକରନ୍ତୁ" -- --#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 --#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 --msgid "ID" --msgstr "ID" -- --#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 --#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 --msgid "GNOME Display Manager Slave" --msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧୀନ" -- - #: ../daemon/gdm-display-access-file.c:300 - #, c-format - msgid "could not find user \"%s\" on system" - msgstr "ତନ୍ତ୍ରରେ ଚାଳକ \"%s\" କୁ ଖୋଜି ପାଉନାହିଁ" - --#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:325 --msgid "Unable to initialize login system" --msgstr "ଲଗଇନ ତନ୍ତ୍ରକୁ ଆରମ୍ଭକରିବାରେ ଅସମର୍ଥ" -+#: ../daemon/gdm-display.c:1315 ../daemon/gdm-display.c:1349 -+#, c-format -+#| msgid "no user account available" -+msgid "No session available yet" -+msgstr "ଏପର୍ଯ୍ୟନ୍ତ କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ" -+ -+#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 -+#, c-format -+#| msgid "Unable to authorize user" -+msgid "Unable to look up UID of user %s" -+msgstr "ବ୍ୟବହାରକାରୀ %s ର UID କୁ ଦେଖିବାରେ ଅସମର୍ଥ" -+ -+#: ../daemon/gdm-manager.c:291 -+#| msgid "no user account available" -+msgid "no sessions available" -+msgstr "କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ" - --#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:361 --msgid "Unable to authenticate user" --msgstr "ଚାଳକକୁ ବୈଧିକ୍ରୁତ କରିବାରେ ଅସମର୍ଥ" -+#: ../daemon/gdm-manager.c:352 -+#, c-format -+msgid "No sessions for %s available for reauthentication" -+msgstr "ପୁନଃ ବୈଧିକରଣ କରିବାକୁ %s ପାଇଁ କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ" - --#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:418 --msgid "Unable to authorize user" --msgstr "ଚାଳକକୁ ପ୍ରାଧିକୃତ କରିବାରେ ଅସମର୍ଥ" -+#: ../daemon/gdm-manager.c:406 -+#, c-format -+#| msgid "Unable to open session" -+msgid "Unable to find session for user %s" -+msgstr "%s ପାଇଁ ଅଧିବେଶନ ଖୋଜିବାରେ ଅସମର୍ଥ" - --#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:547 --msgid "Unable to establish credentials" --msgstr "ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ପ୍ରତିସ୍ଥାପନ କରିବାରେ ଅସମର୍ଥ" -+#: ../daemon/gdm-manager.c:476 -+#, c-format -+#| msgid "Unable to open session" -+msgid "Unable to find appropriate session for user %s" -+msgstr "ବ୍ୟବହାରକାରୀ %s ପାଇଁ ସଠିକ ଅଧିବେଶନ ଖୋଜିବାରେ ଅସମର୍ଥ" - --#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:581 --msgid "Unable to open session" --msgstr "ଅଧିବେଶନ ଖୋଲିବାରେ ଅସମର୍ଥ" -+#: ../daemon/gdm-manager.c:671 -+#| msgid "User %s doesn't exist" -+msgid "User doesn't own session" -+msgstr "ବ୍ୟବହାରକାରୀଙ୍କର ଅଧିବେଶନ ନଥାଏ" - --#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 --#: ../daemon/gdm-simple-slave.c:1259 --msgid "" --"Could not start the X server (your graphical environment) due to an internal " --"error. Please contact your system administrator or check your syslog to " --"diagnose. In the meantime this display will be disabled. Please restart GDM " --"when the problem is corrected." --msgstr "" --"କିଛି ଅନ୍ତର୍ନିହିତ କାରଣ ବଶତଃ X ସର୍ଭର (ଆପଣଙ୍କ ଆଲେଖୀକ ପରିବେଶ) କୁ ପ୍ରାରମ୍ଭ କରିପାରିଲା ନାହିଁ. ଦୟାକରି " --"ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁକିମ୍ବା ଆପଣଙ୍କ ସମସ୍ଯାର କାରଣକୁ ନିରୂପଣ କରିବା ପାଇଁ " --"ତନ୍ତ୍ରର ଲଗକୁ ଯାଞ୍ଚ କରନ୍ତୁ.ସେହି ସମୟରେ ଏହି ପ୍ରଦର୍ଶନଟି ନିଷ୍କ୍ରିୟ ହୋଇଯିବ. ଯେତେବେଳେ ସମସ୍ଯାଟି ସମଧାନ " --"ହୋଇଯିବସେତେବେଳେ ଦୟାକରି GDM କୁ ପୁନଃ ପ୍ରାରମ୍ଭ କରିବେ." -+#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 -+#| msgid "no user account available" -+msgid "No session available" -+msgstr "କୌଣସି ଅଧିବେଶନ ଉପଲବ୍ଧ ନାହିଁ" - --#: ../daemon/gdm-server.c:250 -+#: ../daemon/gdm-server.c:273 - #, c-format - msgid "%s: failed to connect to parent display '%s'" - msgstr "%s: ମୂଳ ପ୍ରଦର୍ଶନ '%s' ସହିତ ସଂଯୋଗ କରିବାରେ ଅସମର୍ଥ" - --#: ../daemon/gdm-server.c:365 -+#: ../daemon/gdm-server.c:452 - #, c-format - msgid "Server was to be spawned by user %s but that user doesn't exist" --msgstr "ଚାଳକ %s ଦ୍ୱାରା ସର୍ଭର ସୃଷ୍ଟି ହେବାର ଥିଲା କିନ୍ତୁ ସେହି ଚାଳକଟି ଅବସ୍ଥିତ ନାହିଁ" -+msgstr "" -+"ଚାଳକ %s ଦ୍ୱାରା ସର୍ଭର ସୃଷ୍ଟି ହେବାର ଥିଲା କିନ୍ତୁ ସେହି ଚାଳକଟି ଅବସ୍ଥିତ ନାହିଁ" - --#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 --#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 -+#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 - #, c-format - msgid "Couldn't set groupid to %d" - msgstr "ସମୂହ ପରିଚୟକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ" - --#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 -+#: ../daemon/gdm-server.c:469 - #, c-format - msgid "initgroups () failed for %s" - msgstr "%s ପାଇଁ initgroups () ବିଫଳ ହେଲା" - --#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 -+#: ../daemon/gdm-server.c:475 - #, c-format - msgid "Couldn't set userid to %d" - msgstr "ଚାଳକ ପରିଚୟକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ" - --#: ../daemon/gdm-server.c:435 -+#: ../daemon/gdm-server.c:522 - #, c-format - msgid "%s: Could not open log file for display %s!" - msgstr "%s: %s ପ୍ରଦର୍ଶନ ପାଇଁ ଲଗ ଫାଇଲକୁ ଖୋଲି ପାରିଲା ନାହିଁ!" - --#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 --#: ../daemon/gdm-server.c:458 -+#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 -+#: ../daemon/gdm-server.c:545 - #, c-format - msgid "%s: Error setting %s to %s" - msgstr "%s: %s କୁ %s ରେ ବିନ୍ଯାସ କରିବା ସମୟରେ ତ୍ରୁଟି" - --#: ../daemon/gdm-server.c:478 -+#: ../daemon/gdm-server.c:565 - #, c-format - msgid "%s: Server priority couldn't be set to %d: %s" - msgstr "%s: ସେବକ ଅଗ୍ରଧିକାରକୁ %d ଭାବରେ ବିନ୍ଯାସ କରିପାରିଲା ନାହିଁ: %s" - --#: ../daemon/gdm-server.c:631 -+#: ../daemon/gdm-server.c:722 - #, c-format - msgid "%s: Empty server command for display %s" - msgstr "%s: %s ପ୍ରଦର୍ଶନ ପାଇଁ ଗୋଟିଏ ଖାଲି ସେବକ ନିର୍ଦ୍ଦେଶ" -@@ -153,339 +151,374 @@ msgstr "ଯନ୍ତ୍ର ପ୍ରଦର୍ଶନକରନ୍ତୁ" - msgid "The display device" - msgstr "ପ୍ରଦର୍ଶନ ଉପକରଣ" - --#: ../daemon/gdm-session-worker.c:1289 -+#: ../daemon/gdm-session.c:1184 -+#| msgid "%s: Could not read Authentication Names" -+msgid "Could not create authentication helper process" -+msgstr "ବୈଧିକରଣ ସହାୟକ ପ୍ରକ୍ରିୟା ପ୍ରସ୍ତୁତ କରିପାରିଲା ନାହିଁ" -+ -+#: ../daemon/gdm-session-worker.c:1029 - #, c-format --msgid "error initiating conversation with authentication system: %s" --msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ର ସହିତ ତ୍ରୁଟି ଆରମ୍ଭ କରୁଥିବା ବାର୍ତ୍ତାଳାପ: %s" -+#| msgid "error initiating conversation with authentication system: %s" -+msgid "error initiating conversation with authentication system - %s" -+msgstr "ବୈଧିକରଣ ତନ୍ତ୍ର ସହିତ ତ୍ରୁଟି ଆରମ୍ଭ କରୁଥିବା ବାର୍ତ୍ତାଳାପ - %s" - --#: ../daemon/gdm-session-worker.c:1290 -+#: ../daemon/gdm-session-worker.c:1030 - msgid "general failure" - msgstr "ସାଧାରଣ ବିଫଳତା" - --#: ../daemon/gdm-session-worker.c:1291 -+#: ../daemon/gdm-session-worker.c:1031 - msgid "out of memory" - msgstr "ସ୍ମୃତି ସ୍ଥାନର ଅଭାବ" - --#: ../daemon/gdm-session-worker.c:1292 -+#: ../daemon/gdm-session-worker.c:1032 - msgid "application programmer error" - msgstr "ପ୍ରୟୋଗ ପ୍ରଗ୍ରାମ ତ୍ରୁଟି" - --#: ../daemon/gdm-session-worker.c:1293 -+#: ../daemon/gdm-session-worker.c:1033 - msgid "unknown error" - msgstr "ଅଜଣା ତ୍ରୁଟି" - --#: ../daemon/gdm-session-worker.c:1300 -+#: ../daemon/gdm-session-worker.c:1040 - msgid "Username:" - msgstr "ଚାଳକ ନାମ:" - --#: ../daemon/gdm-session-worker.c:1306 -+#: ../daemon/gdm-session-worker.c:1046 - #, c-format - msgid "error informing authentication system of preferred username prompt: %s" --msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଚାଳକନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" -+msgstr "" -+"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଚାଳକନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" - --#: ../daemon/gdm-session-worker.c:1320 -+#: ../daemon/gdm-session-worker.c:1060 - #, c-format - msgid "error informing authentication system of user's hostname: %s" --msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଆଧାରନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" -+msgstr "" -+"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ପସନ୍ଦଯୋଗ୍ୟ ଆଧାରନାମ ପଚାରିବାର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" - --#: ../daemon/gdm-session-worker.c:1335 -+#: ../daemon/gdm-session-worker.c:1077 - #, c-format - msgid "error informing authentication system of user's console: %s" - msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ଚାଳକର କୋନସୋଲର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" - --#: ../daemon/gdm-session-worker.c:1348 -+#: ../daemon/gdm-session-worker.c:1101 - #, c-format - msgid "error informing authentication system of display string: %s" - msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ ବାକ୍ୟଖଣ୍ଡ ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" - --#: ../daemon/gdm-session-worker.c:1363 -+#: ../daemon/gdm-session-worker.c:1116 - #, c-format - msgid "error informing authentication system of display xauth credentials: %s" --msgstr "ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ xauth ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକର ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" -+msgstr "" -+"ପ୍ରମାଣୀକରଣ ତନ୍ତ୍ରକୁ xauth ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକର ପ୍ରଦର୍ଶନର ସୂଚନା ଦେବାରେ ତ୍ରୁଟି: %s" - --#: ../daemon/gdm-session-worker.c:1660 ../daemon/gdm-session-worker.c:1677 -+#: ../daemon/gdm-session-worker.c:1446 ../daemon/gdm-session-worker.c:1463 - #, c-format - msgid "no user account available" - msgstr "କୌଣସି ଚାଳକ ଖାତା ଉପଲବ୍ଧ ନାହିଁ" - --#: ../daemon/gdm-session-worker.c:1704 -+#: ../daemon/gdm-session-worker.c:1490 - msgid "Unable to change to user" - msgstr "ଚାଳକକୁ ପରିବର୍ତ୍ତନ ହେବାରେ ଅସମର୍ଥ" - --#: ../daemon/gdm-welcome-session.c:549 --#, c-format --msgid "User %s doesn't exist" --msgstr "ଚାଳକ %s ଅବସ୍ଥିତ ନାହିଁ" -- --#: ../daemon/gdm-welcome-session.c:556 --#, c-format --msgid "Group %s doesn't exist" --msgstr "ସମୂହ %s ଅବସ୍ଥିତ ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:604 --msgid "Could not create socket!" --msgstr "ସକେଟ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ!" -- --#: ../daemon/gdm-xdmcp-display-factory.c:873 --#, c-format --msgid "Denied XDMCP query from host %s" --msgstr "%s ଆଧାରରୁ XDMCP ପ୍ରଶ୍ନ ପଚାରିବାରୁ ମନା କରାଗଲା" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1031 --#: ../daemon/gdm-xdmcp-display-factory.c:1255 --msgid "Could not extract authlist from packet" --msgstr "ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1044 --#: ../daemon/gdm-xdmcp-display-factory.c:1270 --msgid "Error in checksum" --msgstr "ଯାଞ୍ଚ ସମଷ୍ଟିରେ ତ୍ରୁଟି" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1523 --msgid "Bad address" --msgstr "ଖରାପ ଠିକଣା" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1607 --#, c-format --msgid "%s: Could not read display address" --msgstr "%s: ପ୍ରଦର୍ଶନ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1615 --#, c-format --msgid "%s: Could not read display port number" --msgstr "%s: ପ୍ରଦର୍ଶନ ସଂଯୋଗିକୀ ସଂଖ୍ଯା ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1624 --#, c-format --msgid "%s: Could not extract authlist from packet" --msgstr "%s: ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1644 --#, c-format --msgid "%s: Error in checksum" --msgstr "%s: ଚେକ-ଶମରେ ତ୍ରୁଟି" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2200 --#, c-format --msgid "%s: Got REQUEST from banned host %s" --msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ ନିବେଦନ ମିଳିଲା" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2210 --#: ../daemon/gdm-xdmcp-display-factory.c:2568 --#: ../daemon/gdm-xdmcp-display-factory.c:2822 --#, c-format --msgid "%s: Could not read Display Number" --msgstr "%s: ପ୍ରତର୍ଶନ ସଂଖ୍ଯାକୁ ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2217 --#, c-format --msgid "%s: Could not read Connection Type" --msgstr "%s: ସଂଯୋଗ ପ୍ରକାରକୁ ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2224 --#, c-format --msgid "%s: Could not read Client Address" --msgstr "%s: ଗ୍ରାହକ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2232 --#, c-format --msgid "%s: Could not read Authentication Names" --msgstr "%s: ବୈଧିକରଣ ନାମ ମାନଙ୍କୁ ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2241 --#, c-format --msgid "%s: Could not read Authentication Data" --msgstr "%s: ବୈଧିକରଣ ତଥ୍ଯକୁ ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2251 --#, c-format --msgid "%s: Could not read Authorization List" --msgstr "%s: ବୈଧିକରଣ ତାଲିକାକୁ ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2270 --#, c-format --msgid "%s: Could not read Manufacturer ID" --msgstr "%s: ନିର୍ମାତା ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2297 --#, c-format --msgid "%s: Failed checksum from %s" --msgstr "%s: %s ରୁ ଚେକ-ଶମ ଅସଫଳ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2552 --#, c-format --msgid "%s: Got Manage from banned host %s" --msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ Manage ପାଇଲା" -+#: ../daemon/gdm-simple-slave.c:1381 -+msgid "" -+"Could not start the X server (your graphical environment) due to an internal " -+"error. Please contact your system administrator or check your syslog to " -+"diagnose. In the meantime this display will be disabled. Please restart GDM " -+"when the problem is corrected." -+msgstr "" -+"କିଛି ଅନ୍ତର୍ନିହିତ କାରଣ ବଶତଃ X ସର୍ଭର (ଆପଣଙ୍କ ଆଲେଖୀକ ପରିବେଶ) କୁ ପ୍ରାରମ୍ଭ " -+"କରିପାରିଲା ନାହିଁ. ଦୟାକରି " -+"ଆପଣଙ୍କର ତନ୍ତ୍ର ପ୍ରଶାସକଙ୍କ ସହିତ ଯୋଗାଯୋଗ କରନ୍ତୁକିମ୍ବା ଆପଣଙ୍କ ସମସ୍ଯାର କାରଣକୁ " -+"ନିରୂପଣ କରିବା ପାଇଁ " -+"ତନ୍ତ୍ରର ଲଗକୁ ଯାଞ୍ଚ କରନ୍ତୁ.ସେହି ସମୟରେ ଏହି ପ୍ରଦର୍ଶନଟି ନିଷ୍କ୍ରିୟ ହୋଇଯିବ. " -+"ଯେତେବେଳେ ସମସ୍ଯାଟି ସମଧାନ " -+"ହୋଇଯିବସେତେବେଳେ ଦୟାକରି GDM କୁ ପୁନଃ ପ୍ରାରମ୍ଭ କରିବେ." - --#: ../daemon/gdm-xdmcp-display-factory.c:2561 --#: ../daemon/gdm-xdmcp-display-factory.c:2829 -+#: ../daemon/gdm-simple-slave.c:1422 - #, c-format --msgid "%s: Could not read Session ID" --msgstr "%s: ଅଧିବେଶନ ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ" -+msgid "Can only be called before user is logged in" -+msgstr "କେବଳ ବ୍ୟବହାରକାରୀ ଲଗଇନ ପୂର୍ବରୁ ଡ଼ାକି ପାରିବେ" - --#: ../daemon/gdm-xdmcp-display-factory.c:2575 -+#: ../daemon/gdm-simple-slave.c:1432 - #, c-format --msgid "%s: Could not read Display Class" --msgstr "%s: ପ୍ରଦର୍ଶନ ଶ୍ରେଣୀକୁ ପଢି ପାରିଲା ନାହିଁ" -+msgid "Caller not GDM" -+msgstr "କଲର GDM ନୁହଁ" - --#: ../daemon/gdm-xdmcp-display-factory.c:2681 --#: ../daemon/gdm-xdmcp-display-factory.c:2731 --#: ../daemon/gdm-xdmcp-display-factory.c:2737 --#, c-format --msgid "%s: Could not read address" --msgstr "%s: ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" -+#: ../daemon/gdm-simple-slave.c:1485 -+#| msgid "Currently logged in" -+msgid "User not logged in" -+msgstr "ବ୍ୟବହାରକାରୀ ଲଗଇନ ହୋଇ ନାହିଁ" - --#: ../daemon/gdm-xdmcp-display-factory.c:2812 -+#: ../daemon/gdm-xdmcp-chooser-slave.c:370 - #, c-format --msgid "%s: Got KEEPALIVE from banned host %s" --msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ KEEPALIVE ପାଇଲା" -+msgid "Currently, only one client can be connected at once" -+msgstr "ବର୍ତ୍ତମାନ, ଏକ ସମୟରେ କେବଳ ଗୋଟିଏ କ୍ଲାଏଣ୍ଟ ସଂଯୁକ୍ତ ହୋଇପାରିବ" - --#: ../daemon/gdm-xdmcp-display-factory.c:2902 --msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" --msgstr "GdmXdmcpDisplayFactory: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2908 --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 --msgid "XMDCP: Incorrect XDMCP version!" --msgstr "XMDCP: ଭୂଲ XDMCP ସଂସ୍କରଣ!" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2914 --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 --msgid "XMDCP: Unable to parse address" --msgstr "XMDCP: ଠିକଣା ବିଶ୍ଳେଷଣ କରିବାରେ ଅସମର୍ଥ" -- --#: ../daemon/gdm-xdmcp-display-factory.c:3359 --#, c-format --msgid "Could not get server hostname: %s!" --msgstr "ସର୍ଭର ଆଧାର ନାମକୁ ପାଇ ପାରିଲା ନାହିଁ: %s!" -+#: ../daemon/gdm-xdmcp-display-factory.c:604 -+msgid "Could not create socket!" -+msgstr "ସକେଟ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ!" - --#: ../daemon/main.c:237 ../daemon/main.c:250 -+#: ../daemon/main.c:126 ../daemon/main.c:139 - #, c-format - msgid "Cannot write PID file %s: possibly out of disk space: %s" - msgstr "PID ଫାଇଲ %s କୁ ଲେଖି ପାରିବ ନାହିଁ: ସମ୍ଭବତଃ ଡିସ୍କରେ ଖାଲି ସ୍ଥାନ ନାହିଁ: %s" - --#: ../daemon/main.c:271 -+#: ../daemon/main.c:160 - #, c-format - msgid "Logdir %s does not exist or isn't a directory." - msgstr "Logdir %s ଅବସ୍ଥିତ ନୁହେଁ କିମ୍ବା ଏହା ଗୋଟିଏ ଡିରେକ୍ଟେରି ନୁହେଁ" - --#: ../daemon/main.c:287 -+#: ../daemon/main.c:176 - #, c-format - msgid "Authdir %s does not exist. Aborting." - msgstr "Authdir %s ଅବସ୍ଥିତ ନୁହେଁ. ତେଣୁ ଏହାକୁ ପରିତ୍ଯାଗ କରୁଅଛି." - --#: ../daemon/main.c:291 -+#: ../daemon/main.c:180 - #, c-format - msgid "Authdir %s is not a directory. Aborting." - msgstr "Authdir %s ଗୋଟିଏ ଡିରେକ୍ଟୋରି ନୁହେଁ. ପରିତ୍ଯାଗ କରୁଅଛି." - --#: ../daemon/main.c:365 -+#: ../daemon/main.c:254 - #, c-format - msgid "Authdir %s is not owned by user %d, group %d. Aborting." --msgstr "Authdir %s ଟି ଚାଳକ %d, ସମୂହ %d ଦ୍ବାରା ଅଧିକ୍ରୁତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି." -+msgstr "" -+"Authdir %s ଟି ଚାଳକ %d, ସମୂହ %d ଦ୍ବାରା ଅଧିକ୍ରୁତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି." - --#: ../daemon/main.c:372 -+#: ../daemon/main.c:261 - #, c-format - msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." --msgstr "Authdir %s ନିକଟରେ ଭୂଲ ପ୍ରବେଶାନୁମତି %o ଅଛି. ଏହା %o ହେବା ଉଚିତ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି." -+msgstr "" -+"Authdir %s ନିକଟରେ ଭୂଲ ପ୍ରବେଶାନୁମତି %o ଅଛି. ଏହା %o ହେବା ଉଚିତ. ତେଣୁ ପରିତ୍ଯାଗ " -+"କରୁଅଛି." - --#: ../daemon/main.c:409 -+#: ../daemon/main.c:298 - #, c-format - msgid "Can't find the GDM user '%s'. Aborting!" - msgstr "'%s' GDM ଚାଳକକୁ ପାଇ ପାରିବ ନାହିଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!" - --#: ../daemon/main.c:415 -+#: ../daemon/main.c:304 - msgid "The GDM user should not be root. Aborting!" - msgstr "GDM ଚାଳକ ପ୍ରମୂଖ ଚାଳକ ହେବା ଉଚିତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!" - --#: ../daemon/main.c:421 -+#: ../daemon/main.c:310 - #, c-format - msgid "Can't find the GDM group '%s'. Aborting!" - msgstr "'%s' GDM ସମୂହକୁ ପାଇ ପାରିବ ନାହିଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!" - --#: ../daemon/main.c:427 -+#: ../daemon/main.c:316 - msgid "The GDM group should not be root. Aborting!" - msgstr "GDM ସମୂହ ପ୍ରମୂଖ ଚାଳକ ହେବା ଉଚିତ ନୁହେଁ. ତେଣୁ ପରିତ୍ଯାଗ କରୁଅଛି!" - --#: ../daemon/main.c:533 -+#: ../daemon/main.c:427 - msgid "Make all warnings fatal" - msgstr "ସବୁ ଚେତାବନୀଗୁଡିକୁ ମାରାତ୍ମକ କରନ୍ତୁ" - --#: ../daemon/main.c:534 -+#: ../daemon/main.c:428 - msgid "Exit after a time (for debugging)" - msgstr "ଗୋଟିଏ ସମୟ ପରେ ପ୍ରସ୍ଥାନକରନ୍ତୁ (ତ୍ରୁଟି ନିବାରଣ ପାଇଁ)" - --#: ../daemon/main.c:535 -+#: ../daemon/main.c:429 - msgid "Print GDM version" - msgstr "ଜି.ଡି.ଏମ. ସଂସ୍କରଣକୁ ମୂଦ୍ରଣ କରନ୍ତୁ" - --#: ../daemon/main.c:550 -+#: ../daemon/main.c:442 - msgid "GNOME Display Manager" - msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ" - - #. make sure the pid file doesn't get wiped --#: ../daemon/main.c:616 -+#: ../daemon/main.c:492 - msgid "Only the root user can run GDM" - msgstr "କେବଳ ପ୍ରମୂଖ ଚାଳକ GDM କୁ ଚଳାଇ ପାରିବେ" - - #. Translators: worker is a helper process that does the work - #. of starting up a session --#: ../daemon/session-worker-main.c:158 -+#: ../daemon/session-worker-main.c:150 - msgid "GNOME Display Manager Session Worker" - msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧିବେଶନ କାର୍ଯ୍ୟକର୍ତ୍ତା" - --#: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 --msgid "AT-SPI Registry Wrapper" --msgstr "AT-SPI ପଞ୍ଜିକରଣ ଆବରଣ" -- --#: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1753 --msgid "Login Window" --msgstr "ଲଗଇନ ୱିଣ୍ଡୋ" -+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 -+msgid "Display ID" -+msgstr "ID ପ୍ରଦର୍ଶନକରନ୍ତୁ" - --#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1 --msgid "Power Manager" --msgstr "ଶକ୍ତି ପରିଚାଳକ" -+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 -+msgid "ID" -+msgstr "ID" - --#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2 --msgid "Power management daemon" --msgstr "ଶକ୍ତି ପରିଚାଳନ ଡେମନ" -+#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 -+msgid "GNOME Display Manager Slave" -+msgstr "GNOME ପ୍ରଦର୍ଶନ ପରିଚାଳକ ଅଧୀନ" - --#: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 --msgid "GNOME Settings Daemon" --msgstr "GNOME ବିନ୍ୟାସ ଡେମନ" -+#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 -+msgid "Login Window" -+msgstr "ଲଗଇନ ୱିଣ୍ଡୋ" - --#: ../data/greeter-autostart/gnome-mag.desktop.in.h:1 -+#: ../data/applications/gnome-mag.desktop.in.h:1 - msgid "GNOME Screen Magnifier" - msgstr "GNOME ପରଦା ଆକାର ବର୍ଦ୍ଧନକର୍ତ୍ତା" - --#: ../data/greeter-autostart/gnome-mag.desktop.in.h:2 -+#: ../data/applications/gnome-mag.desktop.in.h:2 - msgid "Magnify parts of the screen" - msgstr "ପରଦାର ବର୍ଦ୍ଧିତ ଅଂଶ" - --#: ../data/greeter-autostart/gok.desktop.in.h:1 -+#: ../data/applications/gnome-shell.desktop.in.h:1 -+msgid "GNOME Shell" -+msgstr "GNOME ସେଲ" -+ -+#: ../data/applications/gnome-shell.desktop.in.h:2 -+#| msgid "Power management daemon" -+msgid "Window management and compositing" -+msgstr "ୱିଣ୍ଡୋ ପରିଚାଳନ ଏବଂ ମିଶ୍ରିତ" -+ -+#: ../data/applications/gok.desktop.in.h:1 - msgid "GNOME On-Screen Keyboard" - msgstr "GNOME ଅନସ୍କ୍ରିନ କି ବୋର୍ଡ" - --#: ../data/greeter-autostart/gok.desktop.in.h:2 -+#: ../data/applications/gok.desktop.in.h:2 - msgid "Use an on-screen keyboard" - msgstr "ଗୋଟିଏ ଅନସ୍କ୍ରିନ କି ବୋର୍ଡ ବ୍ୟବହାର କରନ୍ତୁ" - --#: ../data/greeter-autostart/metacity.desktop.in.h:1 --msgid "Metacity" --msgstr "Metacity" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 -+msgid "Whether or not to allow fingerprint readers for login" -+msgstr "ଅଙ୍ଗୁଳିଚିହ୍ନ ପାଠକକୁ ଲଗଇନ ପାଇଁ ଅନୁମତି ଦେବା ଉଚିତ କି ନୁହଁ" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 -+msgid "" -+"The login screen can optionally allow users who have enrolled their " -+"fingerprints to log in using those prints." -+msgstr "" -+"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ଅଙ୍ଗୁଳିଚିହ୍ନ ଦାଖଲ କରିଥିବା ବ୍ୟବହାରକାରୀମାନଙ୍କୁ ସେହି " -+"ଚିହ୍ନ ବ୍ୟବହାର କରି " -+"ଲଗଇନ କରିବାକୁ ଅନୁମତି ଦେଇଥାଏ।" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 -+msgid "Whether or not to allow smartcard readers for login" -+msgstr "ଲଗଇନ ପାଇଁ ସ୍ମାର୍ଟକାର୍ଡ ପାଠକକୁ ଅନୁମତି ଦେବା ଉଚିତ କି ନୁହଁ" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 -+msgid "" -+"The login screen can optionally allow users who have smartcards to log in " -+"using those smartcards." -+msgstr "" -+"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ବ୍ୟବହାରକାରୀମାନଙ୍କୁ ଅନୁମତି ଦେଇଥାଏ ଯାହା ପାଖରେ " -+"ଲଗଇନ ପାଇଁ ସ୍ମାର୍ଟକାର୍ଡ ଥାଏ।" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 -+msgid "Path to small image at top of user list" -+msgstr "ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ ଛୋଟ ପ୍ରତିଛବି ପାଇଁ ପଥ" - --#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1 --msgid "Orca Screen Reader" --msgstr "Orca ପରଦା ପାଠକ" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 -+msgid "" -+"The login screen can optionally show a small image at the top of its user " -+"list to provide site administrators and distributions a way to provide " -+"branding." -+msgstr "" -+"ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ ସାଇଟ ପ୍ରଶାସକ ଏବଂ " -+"ବଣ୍ଟନକାରୀମାନଙ୍କୁ " -+"ପ୍ରଦାନ କରିବା ପାଇଁ ଏକ ଛୋଟ ପ୍ରତିଛବି ଦର୍ଶାଇଥାଏ।" - --#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2 --msgid "Present on-screen information as speech or braille" --msgstr "ଅନ-ସ୍କ୍ରିନ ସୂଚନାକୁ ବାର୍ତ୍ତାଳାପ ଅଥବା ବ୍ରେଲି ଲିପିରେ ଉପସ୍ଥାପନ କରନ୍ତୁ" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 -+msgid "" -+"The fallback login screen can optionally show a small image at the top of " -+"its user list to provide site administrators and distributions a way to " -+"provide branding." -+msgstr "" -+"ଫଲବ୍ୟାକ ଲଗଇନ ପରଦା ବୈକଳ୍ପିକ ଭାବରେ ଏକ ଛୋଟ ପ୍ରତିଛବିକୁ ବ୍ୟବହାରକାରୀ ତାଲିକା ଉପରେ " -+"ସାଇଟ ପ୍ରଶାସକ ଏବଂ ବଣ୍ଟନକାରୀମାନଙ୍କୁ ପ୍ରଦାନ କରିବା ପାଇଁଦର୍ଶାଇପାରିବ।" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 -+msgid "Avoid showing user list" -+msgstr "ବ୍ୟବହାରକାରୀ ତାଲିକା ଦର୍ଶାନ୍ତୁ ନାହିଁ" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 -+msgid "" -+"The login screen normally shows a list of available users to log in as. This " -+"setting can be toggled to disable showing the user list." -+msgstr "" -+"ଲଗଇନ ପରଦା ସାଧାରଣତଃ ଉପଲବ୍ଧ ବ୍ୟବହାରକାରୀ ତାଲିକାକୁ ଲଗଇନ ପାଇଁ ଦର୍ଶାଇଥାଏ। " -+"ଏହି ସଂରଚନାକୁ ବ୍ୟବହାରକାରୀ ତାଲିକା ଦର୍ଶାଇ ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ ଆଗପଛ କରିହେବ।" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 -+msgid "Enable showing the banner message" -+msgstr "ପତାକା ସନ୍ଦେଶ ଦର୍ଶାଇବାକୁ ସକ୍ରିୟ କରନ୍ତୁ" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 -+msgid "Set to true to show the banner message text." -+msgstr "ପତାକା ସଂଦେଶ ଦର୍ଶାଇବା ପାଇଁ true ସେଟକରନ୍ତୁ." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 -+msgid "Banner message text" -+msgstr "ପତାକା ସନ୍ଦେଶ ପାଠ୍ୟ" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 -+msgid "Text banner message to show in the login window." -+msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ।" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 -+msgid "Disable showing the restart buttons" -+msgstr "ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 -+msgid "Set to true to disable showing the restart buttons in the login window." -+msgstr "" -+"ଲଗଇନ ୱିଣ୍ଡୋରେ ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ true " -+"ସେଟକରନ୍ତୁ।" - --#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 --msgid "PolicyKit Authentication Agent" --msgstr "PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 -+#| msgid "%s: Could not read Authentication Names" -+msgid "Number of allowed authentication failures" -+msgstr "ଅନୁମତିପ୍ରାପ୍ତ ବୈଧିକରଣ ବିଫଳତା ସଂଖ୍ୟା" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 -+msgid "" -+"The number of times a user is allowed to attempt authentication, before " -+"giving up and going back to user selection." -+msgstr "" -+"ତ୍ୟାଗକରିବା ପୂର୍ବରୁ ଏବଂ ବ୍ୟବହାରକାରୀ ଚୟନ କରିବା ପୂର୍ବରୁ " -+"ବ୍ୟବହାରକାରୀଙ୍କୁ ଅନୁମତି ପ୍ରାପ୍ତ ପ୍ରୟାସ ସଂଖ୍ୟା।" -+ -+#: ../gui/libgdm/gdm-user-switching.c:72 -+#| msgid "Unable to start new display" -+msgid "Unable to create transient display: " -+msgstr "ଅସ୍ଥାୟୀ ପ୍ରଦର୍ଶନୀ ନିର୍ମାଣ କରିବାରେ ଅସମର୍ଥ:" -+ -+#: ../gui/libgdm/gdm-user-switching.c:183 -+#: ../gui/libgdm/gdm-user-switching.c:395 -+#| msgid "Unable to open session" -+msgid "Unable to activate session: " -+msgstr "ଅଧିବେଶନ ସକ୍ରିୟ କରିବାରେ ଅସମର୍ଥ:" -+ -+#: ../gui/libgdm/gdm-user-switching.c:344 -+#: ../gui/libgdm/gdm-user-switching.c:512 -+#, c-format -+msgid "Could not identify the current session." -+msgstr "ପ୍ରଚଳିତ ଅଧିବେଶନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ." -+ -+#: ../gui/libgdm/gdm-user-switching.c:351 -+#, c-format -+#| msgid "Unable to open session" -+msgid "User unable to switch sessions." -+msgstr "ଅଧିବେଶନ ବଦଳାଇବାରେ ବ୍ୟବହାରକାରୀ ଅସମର୍ଥ।" -+ -+#: ../gui/libgdm/gdm-user-switching.c:521 -+#, c-format -+#| msgid "Could not identify the current session." -+msgid "Could not identify the current seat." -+msgstr "ପ୍ରଚଳିତ ସ୍ଥାନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ।" -+ -+#: ../gui/libgdm/gdm-user-switching.c:531 -+#, c-format -+msgid "" -+"The system is unable to determine whether to switch to an existing login " -+"screen or start up a new login screen." -+msgstr "" -+"ତନ୍ତ୍ର ଏକ ସ୍ଥିତବାନ ଲଗଇନ ପରଦା କିମ୍ବା ନୂତନ ଲଗଇନ ପରଦା ଆରମ୍ଭ କରିବାକୁ " -+"ନିର୍ଦ୍ଧାରଣ କରିବାରେ ଅସମର୍ଥ।" -+ -+#: ../gui/libgdm/gdm-user-switching.c:539 -+#, c-format -+msgid "The system is unable to start up a new login screen." -+msgstr "ତନ୍ତ୍ର ଏକ ନୂତନ ଲଗଇନ ପରଦା ଆରମ୍ଭ କରିବାରେ ଅସମର୍ଥ।" - - #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 - msgid "Select System" -@@ -499,6 +532,125 @@ msgstr "XDMCP: XDMCP ବଫର ସୃଷ୍ଟି କରିପାରିଲା - msgid "XDMCP: Could not read XDMCP header!" - msgstr "XDMCP: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!" - -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 -+msgid "XMDCP: Incorrect XDMCP version!" -+msgstr "XMDCP: ଭୂଲ XDMCP ସଂସ୍କରଣ!" -+ -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 -+msgid "XMDCP: Unable to parse address" -+msgstr "XMDCP: ଠିକଣା ବିଶ୍ଳେଷଣ କରିବାରେ ଅସମର୍ଥ" -+ -+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 -+#| msgid "PolicyKit Authentication Agent" -+msgid "Fingerprint Authentication" -+msgstr "ଅଙ୍ଗୁଳି ଚିହ୍ନ ବୈଧିକରଣ" -+ -+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 -+msgid "Log into session with fingerprint" -+msgstr "ଅଙ୍ଗୁଳିଚିହ୍ନ ସହାୟତାରେ ଲଗଇନ କରନ୍ତୁ" -+ -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 -+#| msgid "PolicyKit Authentication Agent" -+msgid "Password Authentication" -+msgstr "ପ୍ରବେଶ ସଂକେତ ବୈଧିକରଣ" -+ -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 -+msgid "Log into session with username and password" -+msgstr "ବ୍ୟବହାରକାରୀ ନାମ ଏବଂ ପ୍ରବେଶ ସଂକେତ ସହାୟତାରେ ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ" -+ -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 -+msgid "Log In" -+msgstr "ଲଗଇନ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 -+msgid "Slot ID" -+msgstr "ସ୍ଲଟ ID" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 -+msgid "The slot the card is in" -+msgstr "ଯେଉଁ ସ୍ଲଟରେ କାର୍ଡ ଅଛି" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 -+msgid "Slot Series" -+msgstr "ସ୍ଲଟ କ୍ରମ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 -+msgid "per-slot card identifier" -+msgstr "ସ୍ଲଟ ପ୍ରତି କାର୍ଡ ପରିଚାୟକ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 -+#| msgid "Username" -+msgid "name" -+msgstr "ନାମ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 -+msgid "Module" -+msgstr "ମଡ୍ଯୁଲ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 -+msgid "smartcard driver" -+msgstr "ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 -+msgid "Smartcard Authentication" -+msgstr "ସ୍ମାର୍ଟକାର୍ଡ ବୈଧିକରଣ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 -+msgid "Log into session with smartcard" -+msgstr "ସ୍ମାର୍ଟକାର୍ଡ ସହାୟତାରେ ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 -+msgid "Module Path" -+msgstr "ମଡ୍ଯୁଲ ପଥ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 -+msgid "path to smartcard PKCS #11 driver" -+msgstr "ସ୍ମାର୍ଟକାର୍ଡ PKCS #11 ଡ୍ରାଇଭର ପାଇଁ ପଥ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 -+msgid "received error or hang up from event source" -+msgstr "ତ୍ରୁଟି ଗ୍ରହଣ କରିଛି ଅଥବା ଘଟଣା ଉତ୍ସରୁ ବାହାରିଯାଇଛି" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 -+#, c-format -+msgid "NSS security system could not be initialized" -+msgstr "NSS ସୁରକ୍ଷା ତନ୍ତ୍ରକୁ ଆରମ୍ଭ କରିହେଲା ନାହିଁ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 -+#, c-format -+msgid "no suitable smartcard driver could be found" -+msgstr "ଉପଯୁକ୍ତ ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର ମିଳିଲା ନାହିଁ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 -+#, c-format -+msgid "smartcard driver '%s' could not be loaded" -+msgstr "ସ୍ମାର୍ଟକାର୍ଡ ଡ୍ରାଇଭର '%s' କୁ ଧାରଣ କରିହେଲା ନାହିଁ" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 -+#, c-format -+msgid "could not watch for incoming card events - %s" -+msgstr "ଆସୁଥିବା କାର୍ଡ ଘଟଣାଗୁଡ଼ିକୁ ଦେଖିପାରିଲା ନାହିଁ - %s" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 -+#, c-format -+msgid "encountered unexpected error while waiting for smartcard events" -+msgstr "" -+"ସ୍ମାର୍ଟକାର୍ଡ ଘଟଣାଗୁଡ଼ିକ ପାଇଁ ଅପେକ୍ଷା କରିଥିବା ସମୟରେ ଅପ୍ରତ୍ୟାଶିତ ତ୍ରୁଟିର " -+"ସମ୍ମୁଖିନ ହୋଇଥିଲା" -+ -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 -+#| msgid "PolicyKit Authentication Agent" -+msgid "Authentication" -+msgstr "ବୈଧିକରଣ" -+ -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 -+#| msgid "Custom session" -+msgid "Log into session" -+msgstr "ଅଧିବେଶନରେ ଲଗଇନ କରନ୍ତୁ" -+ - #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 - msgid "Value" - msgstr "ମୂଲ୍ଯ" -@@ -559,101 +711,69 @@ msgstr "%a %l:%M:%S %p" - msgid "%a %l:%M %p" - msgstr "%a %l:%M %p" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 - msgid "Automatically logging in…" - msgstr "ସ୍ବୟଂଚାଳିତ ଭାବରେ ଲଗଇନ କରୁଅଛି…" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:582 --msgid "Select language and click Log In" --msgstr "ଭାଷା ଚୟନକରନ୍ତୁ ଏବଂ ଲଗଇନ ଦବାନ୍ତୁ" -- - #. need to wait for response from backend --#: ../gui/simple-greeter/gdm-greeter-login-window.c:699 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 - msgid "Cancelling…" - msgstr "ବାତିଲ କରୁଅଛି…" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1087 -+#. just wait for the user to select language and stuff -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 -+msgid "Select language and click Log In" -+msgstr "ଭାଷା ଚୟନକରନ୍ତୁ ଏବଂ ଲଗଇନ ଦବାନ୍ତୁ" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 - msgctxt "customsession" - msgid "Custom" - msgstr "ଇଚ୍ଛାମୁତାବକ" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1088 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 - msgid "Custom session" - msgstr "ଇଚ୍ଛାମୁତାବକ ଅଧିବେଶନ" - - #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 --#| msgid "Panel" --msgid "Cancel" --msgstr "ବାତିଲ କରନ୍ତୁ" -- --#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 - msgid "Computer Name" - msgstr "କମ୍ପୁଟର ନାମ" - -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -+msgid "Version" -+msgstr "ସଂସ୍କରଣ" -+ - #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 --msgid "Login" --msgstr "ଲଗଇନ" -+msgid "Cancel" -+msgstr "ବାତିଲ କରନ୍ତୁ" - - #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 - msgid "Unlock" - msgstr "ଖୋଲନ୍ତୁ" - - #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 --msgid "Version" --msgstr "ସଂସ୍କରଣ" -+msgid "Login" -+msgstr "ଲଗଇନ" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:907 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:953 - msgid "Suspend" - msgstr "ନିଲମ୍ବନ କରନ୍ତୁ" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:912 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:958 - msgid "Restart" - msgstr "ପୂନଃପ୍ରାରମ୍ଭ କରନ୍ତୁ" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:916 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:962 - msgid "Shut Down" - msgstr "ବନ୍ଦ କରନ୍ତୁ" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:965 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:1011 - msgid "Unknown time remaining" - msgstr "କେତେ ସମୟ ବଳିଛି ଜଣାନାହିଁ" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:987 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:1033 - msgid "Panel" - msgstr "ଫଳକ" - --#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 --msgid "Languages" --msgstr "ଭାଷା" -- --#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 --msgid "_Languages:" --msgstr "ଭାଷା (_L):" -- --#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 --msgid "_Language:" --msgstr "ଭାଷା (_L):" -- --#. translators: This brings up a dialog --#. * with a list of languages to choose from --#. --#: ../gui/simple-greeter/gdm-language-option-widget.c:231 --msgctxt "language" --msgid "Other…" --msgstr "ଅନ୍ଯାନ୍ଯ…" -- --#: ../gui/simple-greeter/gdm-language-option-widget.c:232 --msgid "Choose a language from the full list of available languages." --msgstr "ଉପଲବ୍ଧ ଭାଷାଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ ଭାଷା ଚୟନ କରନ୍ତୁ." -- --#: ../gui/simple-greeter/gdm-language-option-widget.c:262 --msgid "Language" --msgstr "ଭାଷା" -- --#: ../gui/simple-greeter/gdm-languages.c:709 --msgid "Unspecified" --msgstr "ଅନିର୍ଦ୍ଦିଷ୍ଟ" -- - #: ../gui/simple-greeter/gdm-option-widget.c:505 - msgid "Label Text" - msgstr "ପାଠ୍ୟକୁ ଚିହ୍ନଟ କରନ୍ତୁ" -@@ -678,14 +798,6 @@ msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ବସ୍ତୁ" - msgid "The ID of the default item" - msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ବସ୍ତୁର ID" - --#: ../gui/simple-greeter/gdm-recent-option-widget.c:310 --msgid "Max Item Count" --msgstr "ସର୍ବାଧିକ ବସ୍ତୁ ସଂଖ୍ୟା" -- --#: ../gui/simple-greeter/gdm-recent-option-widget.c:311 --msgid "The maximum number of items to keep around in the list" --msgstr "ତାଲିକାରେ ରଖିବାକୁ ଥିବା ସର୍ବାଧିକ ସଂଖ୍ୟକ ବସ୍ତୁ" -- - #: ../gui/simple-greeter/gdm-remote-login-window.c:188 - #, c-format - msgid "Remote Login (Connecting to %s…)" -@@ -704,175 +816,32 @@ msgstr "ସୁଦୂର ଲଗଇନ" - msgid "Session" - msgstr "ଅଧିବେଶନ" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 --msgid "Banner message text" --msgstr "ପତାକା ସନ୍ଦେଶ ପାଠ୍ୟ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 --msgid "Banner message text when chooser is empty" --msgstr "ଚୟନକର୍ତ୍ତା ଖାଲିଥିବା ସମୟରେ ପତାକାର ସନ୍ଦେଶ ପାଠ୍ୟ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 --msgid "Disable showing the restart buttons" --msgstr "ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 --msgid "Do not show known users in the login window" --msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଜଣା ଚାଳକମାନଙ୍କୁ ଦର୍ଶାନ୍ତୁ ନାହିଁ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 --msgid "Enable accessibility keyboard plugin" --msgstr "ଅଭିଗମ୍ଯ କି ବୋର୍ଡ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରନ୍ତୁ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 --msgid "Enable on-screen keyboard" --msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 --msgid "Enable screen magnifier" --msgstr "ପରଦା ବର୍ଦ୍ଧନକାରୀକୁ ସକ୍ରିୟ କରନ୍ତୁ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 --msgid "Enable screen reader" --msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରନ୍ତୁ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 --msgid "Enable showing the banner message" --msgstr "ପତାକା ସନ୍ଦେଶ ଦର୍ଶାଇବାକୁ ସକ୍ରିୟ କରନ୍ତୁ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 --msgid "Icon name to use for greeter logo" --msgstr "ଧନ୍ୟବାଦ ଦାତା ପ୍ରତୀକ ବ୍ୟବହାର ହେଉଥିବା ଚିତ୍ରସଂକେତ ନାମ ପାଇଁ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 --msgid "Recently selected languages" --msgstr "ନିକଟରେ ବଛାଯାଇଥିବା ଭାଷାଗୁଡ଼ିକ" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 --msgid "Set to a list of languages to be shown by default in the login window." --msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ ଭାଷା ତାଲିକାରେ ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 --msgid "Set to the themed icon name to use for the greeter logo." --msgstr "" --"ସତ୍କାରକରିବା ପ୍ରତୀକ ଚିହ୍ନ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ବିଷୟ ବସ୍ତୁ ଲିଖିତ ଚିତ୍ର ସଂକେତ ନାମକୁ ସେଟକରନ୍ତୁ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 --msgid "Set to true to disable showing known users in the login window." --msgstr "ଜଣାଥିବା ଚାଳକମାନଙ୍କୁ ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବା ପାଇଁ ନିଷ୍କ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 --msgid "Set to true to disable showing the restart buttons in the login window." --msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୁନଃଚାଳନ ବଟନଗୁଡ଼ିକୁ ଦର୍ଶାଇବା ନିଷ୍କ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 --msgid "Set to true to enable the XRandR settings manager plugin." --msgstr "XRandR ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 --msgid "Set to true to enable the background settings manager plugin." --msgstr "ପୃଷ୍ଠଭୂମି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 --msgid "Set to true to enable the media-keys settings manager plugin." --msgstr "ସଞ୍ଚାର ମାଧ୍ଯମ-କି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 --msgid "Set to true to enable the on-screen keyboard." --msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 --msgid "" --"Set to true to enable the plugin to manage the accessibility keyboard " --"settings." --msgstr "ଅଭିଗମ୍ୟତା କି ବୋର୍ଡ ବିନ୍ୟାସକୁ ପରିଚାଳନା କରିବା ପାଇଁ ପ୍ଲଗଇନ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 --msgid "Set to true to enable the screen magnifier." --msgstr "ପରଦା ଆକାର ବର୍ଦ୍ଧକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 --msgid "Set to true to enable the screen reader." --msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 --msgid "Set to true to enable the sound settings manager plugin." --msgstr "ଧ୍ୱନୀ ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 --msgid "Set to true to enable the xsettings settings manager plugin." --msgstr "xsettings ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 --msgid "Set to true to show the banner message text." --msgstr "ପତାକା ସଂଦେଶ ଦର୍ଶାଇବା ପାଇଁ true ସେଟକରନ୍ତୁ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 --msgid "Set to true to use Compiz as the window manager." --msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 --msgid "" --"Text banner message to show in the login window when the user chooser is " --"empty, instead of banner_message_text." --msgstr "" --"banner_message_text ବ୍ୟତିତ, ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ ଯେତେବେଳେ " --"ଚାଳକ ଚୟନକର୍ତ୍ତା ଖାଲି ଥାଏ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 --msgid "Text banner message to show in the login window." --msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 --msgid "True if the XRandR settings manager plugin is enabled." --msgstr "True ଯଦି XRandR ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି।" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 --msgid "True if the background settings manager plugin is enabled." --msgstr "True ଯଦି ପୃଷ୍ଠଭୂମି ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 --msgid "True if the media-keys settings manager plugin is enabled." --msgstr "True ଯଦି ସଞ୍ଚାର ମାଧ୍ଯମ-କି ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି. " -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 --msgid "True if the sound settings manager plugin is enabled." --msgstr "True ଯଦି ଧ୍ୱନୀ ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 --msgid "True if the xsettings settings manager plugin is enabled." --msgstr "True ଯଦି xsettings ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 --msgid "Use Compiz as the window manager" --msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ" -- --#: ../gui/simple-greeter/gdm-timer.c:149 -+#: ../gui/simple-greeter/gdm-timer.c:147 - msgid "Duration" - msgstr "ଅବଧି" - --#: ../gui/simple-greeter/gdm-timer.c:150 -+#: ../gui/simple-greeter/gdm-timer.c:148 - msgid "Number of seconds until timer stops" - msgstr "ସମୟ ମାପକ ବନ୍ଦ ହେବା ପର୍ଯ୍ୟନ୍ତ ସମୟ ସେକଣ୍ଡରେ" - --#: ../gui/simple-greeter/gdm-timer.c:157 -+#: ../gui/simple-greeter/gdm-timer.c:155 - msgid "Start time" - msgstr "ପ୍ରାରମ୍ଭିକ ସମୟ" - --#: ../gui/simple-greeter/gdm-timer.c:158 -+#: ../gui/simple-greeter/gdm-timer.c:156 - msgid "Time the timer was started" - msgstr "ସମୟ ମାପକ ଆରମ୍ଭ ହୋଇଥିବା ସମୟ" - --#: ../gui/simple-greeter/gdm-timer.c:165 -+#: ../gui/simple-greeter/gdm-timer.c:163 - msgid "Is it Running?" - msgstr "ଏହା ଚାଲୁଅଛି କି?" - --#: ../gui/simple-greeter/gdm-timer.c:166 -+#: ../gui/simple-greeter/gdm-timer.c:164 - msgid "Whether the timer is currently ticking" - msgstr "ସମୟ ମାପକଟି ବର୍ତ୍ତମାନ ଟିକଟିକ କରୁଛି କି ନାହିଁ" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:194 --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:488 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 - #, c-format - msgid "Log in as %s" - msgstr "%s ଆକାରରେ ଲଗଇନ କରନ୍ତୁ" -@@ -882,70 +851,39 @@ msgstr "%s ଆକାରରେ ଲଗଇନ କରନ୍ତୁ" - #. * manually instead of choosing from - #. * a list. - #. --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:262 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 - msgctxt "user" - msgid "Other…" - msgstr "ଅନ୍ଯାନ୍ଯ…" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:263 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 - msgid "Choose a different account" - msgstr "ଗୋଟିଏ ପୃଥକ ଖାତା ଚୟନ କରନ୍ତୁ" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:277 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 - msgid "Guest" - msgstr "ଅତିଥି" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:278 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 - msgid "Log in as a temporary guest" - msgstr "ଅସ୍ଥାୟୀ ଅତିଥି ଭାବରେ ଲଗଇନ କରନ୍ତୁ" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:293 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 - msgid "Automatic Login" - msgstr "ସ୍ବୟଂଚାଳିତ ଲଗଇନ" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:294 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 - msgid "Automatically log into the system after selecting options" - msgstr "ବିକଳ୍ପଗୁଡ଼ିକୁ ବାଛିସାରିବା ପରେ ସ୍ୱୟଂଚାଳିତ ଭାବରେ ତନ୍ତ୍ରରେ ଲଗଇନ ହେବା" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1038 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 - msgid "Currently logged in" - msgstr "ବର୍ତ୍ତମାନ ଲଗଇନ ହୋଇ ସାରିଛି" - --#: ../utils/gdmflexiserver.c:61 --msgid "Only the VERSION command is supported" --msgstr "କେବଳ VERSION ନିର୍ଦ୍ଦେଶ ସମର୍ଥିତ" -- --#: ../utils/gdmflexiserver.c:61 --msgid "COMMAND" --msgstr "ନିର୍ଦ୍ଦେଶ" -- --#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 --#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 --msgid "Ignored — retained for compatibility" --msgstr "ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି — ସୁସଂଗତି ପାଇଁ ରଖାଯାଇଛି" -- --#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 -+#: ../utils/gdm-screenshot.c:43 - msgid "Debugging output" - msgstr "ନିର୍ଗମକୁ ତ୍ରୁଟିମୁକ୍ତ କରୁଅଛି" - --#: ../utils/gdmflexiserver.c:68 --msgid "Version of this application" --msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ" -- --#: ../utils/gdmflexiserver.c:675 --#, c-format --msgid "Could not identify the current session." --msgstr "ପ୍ରଚଳିତ ଅଧିବେଶନକୁ ଚିହ୍ନିପାରିଲା ନାହିଁ." -- --#. Option parsing --#: ../utils/gdmflexiserver.c:711 --msgid "- New GDM login" --msgstr "- ନୂତନ GDM ଲଗଇନ" -- --#: ../utils/gdmflexiserver.c:767 --msgid "Unable to start new display" --msgstr "ନୂତନ ପ୍ରଦର୍ଶନକୁ ପ୍ରାରମ୍ଭ କରିପାରିବ ନାହିଁ" -- - #: ../utils/gdm-screenshot.c:212 - msgid "Screenshot taken" - msgstr "ପରଦା ପ୍ରତିଛବି ଗ୍ରହଣ କରାଯାଇଛି" -@@ -955,6 +893,241 @@ msgstr "ପରଦା ପ୍ରତିଛବି ଗ୍ରହଣ କରାଯାଇ - msgid "Take a picture of the screen" - msgstr "ପରଦାର ଗୋଟିଏ ପ୍ରତିଛବି ନିଅନ୍ତୁ" - -+#~ msgid "Unable to initialize login system" -+#~ msgstr "ଲଗଇନ ତନ୍ତ୍ରକୁ ଆରମ୍ଭକରିବାରେ ଅସମର୍ଥ" -+ -+#~ msgid "Unable to authenticate user" -+#~ msgstr "ଚାଳକକୁ ବୈଧିକ୍ରୁତ କରିବାରେ ଅସମର୍ଥ" -+ -+#~ msgid "Unable to establish credentials" -+#~ msgstr "ପ୍ରମାଣପତ୍ରଗୁଡ଼ିକୁ ପ୍ରତିସ୍ଥାପନ କରିବାରେ ଅସମର୍ଥ" -+ -+#~ msgid "Group %s doesn't exist" -+#~ msgstr "ସମୂହ %s ଅବସ୍ଥିତ ନାହିଁ" -+ -+#~ msgid "Denied XDMCP query from host %s" -+#~ msgstr "%s ଆଧାରରୁ XDMCP ପ୍ରଶ୍ନ ପଚାରିବାରୁ ମନା କରାଗଲା" -+ -+#~ msgid "Could not extract authlist from packet" -+#~ msgstr "ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ" -+ -+#~ msgid "Error in checksum" -+#~ msgstr "ଯାଞ୍ଚ ସମଷ୍ଟିରେ ତ୍ରୁଟି" -+ -+#~ msgid "Bad address" -+#~ msgstr "ଖରାପ ଠିକଣା" -+ -+#~ msgid "%s: Could not read display address" -+#~ msgstr "%s: ପ୍ରଦର୍ଶନ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not read display port number" -+#~ msgstr "%s: ପ୍ରଦର୍ଶନ ସଂଯୋଗିକୀ ସଂଖ୍ଯା ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not extract authlist from packet" -+#~ msgstr "%s: ପ୍ଯାକେଟରୁ ପ୍ରାମାଣୀକ-ସୂଚୀ କୁ ନିର୍ଯ୍ଯାସ କରିପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Error in checksum" -+#~ msgstr "%s: ଚେକ-ଶମରେ ତ୍ରୁଟି" -+ -+#~ msgid "%s: Got REQUEST from banned host %s" -+#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ ନିବେଦନ ମିଳିଲା" -+ -+#~ msgid "%s: Could not read Display Number" -+#~ msgstr "%s: ପ୍ରତର୍ଶନ ସଂଖ୍ଯାକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not read Connection Type" -+#~ msgstr "%s: ସଂଯୋଗ ପ୍ରକାରକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not read Client Address" -+#~ msgstr "%s: ଗ୍ରାହକ ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not read Authentication Data" -+#~ msgstr "%s: ବୈଧିକରଣ ତଥ୍ଯକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not read Authorization List" -+#~ msgstr "%s: ବୈଧିକରଣ ତାଲିକାକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not read Manufacturer ID" -+#~ msgstr "%s: ନିର୍ମାତା ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Failed checksum from %s" -+#~ msgstr "%s: %s ରୁ ଚେକ-ଶମ ଅସଫଳ" -+ -+#~ msgid "%s: Got Manage from banned host %s" -+#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ Manage ପାଇଲା" -+ -+#~ msgid "%s: Could not read Session ID" -+#~ msgstr "%s: ଅଧିବେଶନ ପରିଚୟକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not read Display Class" -+#~ msgstr "%s: ପ୍ରଦର୍ଶନ ଶ୍ରେଣୀକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Could not read address" -+#~ msgstr "%s: ଠିକଣାକୁ ପଢି ପାରିଲା ନାହିଁ" -+ -+#~ msgid "%s: Got KEEPALIVE from banned host %s" -+#~ msgstr "%s: ନିଷେଧିତ ଆଧାର %s ରୁ KEEPALIVE ପାଇଲା" -+ -+#~ msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" -+#~ msgstr "GdmXdmcpDisplayFactory: XDMC ଶୀର୍ଷକକୁ ପଢି ପାରିଲା ନାହିଁ!" -+ -+#~ msgid "Could not get server hostname: %s!" -+#~ msgstr "ସର୍ଭର ଆଧାର ନାମକୁ ପାଇ ପାରିଲା ନାହିଁ: %s!" -+ -+#~ msgid "AT-SPI Registry Wrapper" -+#~ msgstr "AT-SPI ପଞ୍ଜିକରଣ ଆବରଣ" -+ -+#~ msgid "Power Manager" -+#~ msgstr "ଶକ୍ତି ପରିଚାଳକ" -+ -+#~ msgid "GNOME Settings Daemon" -+#~ msgstr "GNOME ବିନ୍ୟାସ ଡେମନ" -+ -+#~ msgid "Metacity" -+#~ msgstr "Metacity" -+ -+#~ msgid "Orca Screen Reader" -+#~ msgstr "Orca ପରଦା ପାଠକ" -+ -+#~ msgid "Present on-screen information as speech or braille" -+#~ msgstr "ଅନ-ସ୍କ୍ରିନ ସୂଚନାକୁ ବାର୍ତ୍ତାଳାପ ଅଥବା ବ୍ରେଲି ଲିପିରେ ଉପସ୍ଥାପନ କରନ୍ତୁ" -+ -+#~ msgid "Languages" -+#~ msgstr "ଭାଷା" -+ -+#~ msgid "_Languages:" -+#~ msgstr "ଭାଷା (_L):" -+ -+#~ msgid "_Language:" -+#~ msgstr "ଭାଷା (_L):" -+ -+#~ msgctxt "language" -+#~ msgid "Other…" -+#~ msgstr "ଅନ୍ଯାନ୍ଯ…" -+ -+#~ msgid "Choose a language from the full list of available languages." -+#~ msgstr "ଉପଲବ୍ଧ ଭାଷାଗୁଡ଼ିକର ସମ୍ପୂର୍ଣ୍ଣ ତାଲିକାରୁ ଭାଷା ଚୟନ କରନ୍ତୁ." -+ -+#~ msgid "Language" -+#~ msgstr "ଭାଷା" -+ -+#~ msgid "Unspecified" -+#~ msgstr "ଅନିର୍ଦ୍ଦିଷ୍ଟ" -+ -+#~ msgid "Max Item Count" -+#~ msgstr "ସର୍ବାଧିକ ବସ୍ତୁ ସଂଖ୍ୟା" -+ -+#~ msgid "The maximum number of items to keep around in the list" -+#~ msgstr "ତାଲିକାରେ ରଖିବାକୁ ଥିବା ସର୍ବାଧିକ ସଂଖ୍ୟକ ବସ୍ତୁ" -+ -+#~ msgid "Banner message text when chooser is empty" -+#~ msgstr "ଚୟନକର୍ତ୍ତା ଖାଲିଥିବା ସମୟରେ ପତାକାର ସନ୍ଦେଶ ପାଠ୍ୟ" -+ -+#~ msgid "Do not show known users in the login window" -+#~ msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ଜଣା ଚାଳକମାନଙ୍କୁ ଦର୍ଶାନ୍ତୁ ନାହିଁ" -+ -+#~ msgid "Enable accessibility keyboard plugin" -+#~ msgstr "ଅଭିଗମ୍ଯ କି ବୋର୍ଡ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରନ୍ତୁ" -+ -+#~ msgid "Enable on-screen keyboard" -+#~ msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରନ୍ତୁ" -+ -+#~ msgid "Enable screen magnifier" -+#~ msgstr "ପରଦା ବର୍ଦ୍ଧନକାରୀକୁ ସକ୍ରିୟ କରନ୍ତୁ" -+ -+#~ msgid "Enable screen reader" -+#~ msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରନ୍ତୁ" -+ -+#~ msgid "Icon name to use for greeter logo" -+#~ msgstr "ଧନ୍ୟବାଦ ଦାତା ପ୍ରତୀକ ବ୍ୟବହାର ହେଉଥିବା ଚିତ୍ରସଂକେତ ନାମ ପାଇଁ" -+ -+#~ msgid "Recently selected languages" -+#~ msgstr "ନିକଟରେ ବଛାଯାଇଥିବା ଭାଷାଗୁଡ଼ିକ" -+ -+#~ msgid "" -+#~ "Set to a list of languages to be shown by default in the login window." -+#~ msgstr "ଲଗଇନ ୱିଣ୍ଡୋରେ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ବାବରେ ଦର୍ଶାଇବା ପାଇଁ ଗୋଟିଏ ଭାଷା ତାଲିକାରେ ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to the themed icon name to use for the greeter logo." -+#~ msgstr "" -+#~ "ସତ୍କାରକରିବା ପ୍ରତୀକ ଚିହ୍ନ ପାଇଁ ବ୍ୟବହାର କରିବାକୁ ବିଷୟ ବସ୍ତୁ ଲିଖିତ ଚିତ୍ର ସଂକେତ ନାମକୁ ସେଟକରନ୍ତୁ." -+ -+#~ msgid "Set to true to disable showing known users in the login window." -+#~ msgstr "ଜଣାଥିବା ଚାଳକମାନଙ୍କୁ ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବା ପାଇଁ ନିଷ୍କ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to enable the XRandR settings manager plugin." -+#~ msgstr "XRandR ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to enable the background settings manager plugin." -+#~ msgstr "ପୃଷ୍ଠଭୂମି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to enable the media-keys settings manager plugin." -+#~ msgstr "ସଞ୍ଚାର ମାଧ୍ଯମ-କି ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to enable the on-screen keyboard." -+#~ msgstr "ଅନ-ସ୍କ୍ରିନ କି ବୋର୍ଡକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "" -+#~ "Set to true to enable the plugin to manage the accessibility keyboard " -+#~ "settings." -+#~ msgstr "" -+#~ "ଅଭିଗମ୍ୟତା କି ବୋର୍ଡ ବିନ୍ୟାସକୁ ପରିଚାଳନା କରିବା ପାଇଁ ପ୍ଲଗଇନ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to enable the screen magnifier." -+#~ msgstr "ପରଦା ଆକାର ବର୍ଦ୍ଧକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to enable the screen reader." -+#~ msgstr "ପରଦା ପାଠକକୁ ସକ୍ରିୟ କରିବାକୁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to enable the sound settings manager plugin." -+#~ msgstr "ଧ୍ୱନୀ ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to enable the xsettings settings manager plugin." -+#~ msgstr "xsettings ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନକୁ ସକ୍ରିୟ କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "Set to true to use Compiz as the window manager." -+#~ msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରିବା ପାଇଁ true ସେଟକରନ୍ତୁ।" -+ -+#~ msgid "" -+#~ "Text banner message to show in the login window when the user chooser is " -+#~ "empty, instead of banner_message_text." -+#~ msgstr "" -+#~ "banner_message_text ବ୍ୟତିତ, ଲଗଇନ ୱିଣ୍ଡୋରେ ଦର୍ଶାଇବାକୁ ଥିବା ପାଠ୍ୟ ପତାକା ସଂଦେଶ " -+#~ "ଯେତେବେଳେ ଚାଳକ ଚୟନକର୍ତ୍ତା ଖାଲି ଥାଏ।" -+ -+#~ msgid "True if the XRandR settings manager plugin is enabled." -+#~ msgstr "True ଯଦି XRandR ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି।" -+ -+#~ msgid "True if the background settings manager plugin is enabled." -+#~ msgstr "True ଯଦି ପୃଷ୍ଠଭୂମି ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -+ -+#~ msgid "True if the media-keys settings manager plugin is enabled." -+#~ msgstr "True ଯଦି ସଞ୍ଚାର ମାଧ୍ଯମ-କି ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି. " -+ -+#~ msgid "True if the sound settings manager plugin is enabled." -+#~ msgstr "True ଯଦି ଧ୍ୱନୀ ବିନ୍ୟାସର ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -+ -+#~ msgid "True if the xsettings settings manager plugin is enabled." -+#~ msgstr "True ଯଦି xsettings ର ବିନ୍ୟାସ ପରିଚାଳକ ପ୍ଲଗଇନଟି ସକ୍ରିୟ ଅଛି." -+ -+#~ msgid "Use Compiz as the window manager" -+#~ msgstr "Compiz କୁ ୱିଣ୍ଡୋ ପରିଚାଳକ ଭାବରେ ବ୍ୟବହାର କରନ୍ତୁ" -+ -+#~ msgid "Only the VERSION command is supported" -+#~ msgstr "କେବଳ VERSION ନିର୍ଦ୍ଦେଶ ସମର୍ଥିତ" -+ -+#~ msgid "COMMAND" -+#~ msgstr "ନିର୍ଦ୍ଦେଶ" -+ -+#~ msgid "Ignored — retained for compatibility" -+#~ msgstr "ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି — ସୁସଂଗତି ପାଇଁ ରଖାଯାଇଛି" -+ -+#~ msgid "Version of this application" -+#~ msgstr "ଏହି ପ୍ରୟୋଗର ସଂସ୍କରଣ" -+ -+#~ msgid "- New GDM login" -+#~ msgstr "- ନୂତନ GDM ଲଗଇନ" -+ - #~| msgid "Shutdown Options..." - #~ msgid "Shutdown Options…" - #~ msgstr "ବନ୍ଦ କରିବା ବିକଳ୍ପଗୁଡ଼ିକ…" -diff --git a/po/ug.po b/po/ug.po -index 8745201..01c6f0e 100644 ---- a/po/ug.po -+++ b/po/ug.po -@@ -1,118 +1,110 @@ --# Uighur translation for gdm. --# Copyright (C) 2010 gdm's COPYRIGHT HOLDER --# This file is distributed under the same license as the gdm package. --# Gheyret Kenji , 2010. --# Sahran , 2010. -+# Uyghur translation for gdm. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# Gheyret Kenji , 2013. - # - msgid "" - msgstr "" --"Project-Id-Version: gdm gnome-2-32\n" -+"Project-Id-Version: gdm\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gdm&keywords=I18N+L10N&component=general\n" --"POT-Creation-Date: 2011-03-17 13:45+0000\n" --"PO-Revision-Date: 2010-07-30 07:44+0000\n" --"Last-Translator: Sahran \n" -+"POT-Creation-Date: 2013-01-04 07:15+0000\n" -+"PO-Revision-Date: 2011-11-09 16:10+0900\n" -+"Last-Translator: Gheyret Kenji \n" - "Language-Team: Uyghur Computer Science Association \n" -+"Language: \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../common/gdm-common.c:456 -+#: ../common/gdm-common.c:492 - #, c-format - msgid "/dev/urandom is not a character device" - msgstr "/dev/urandom ھەرپ ئۈسكۈنىسى ئەمەس" - --#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 --#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 --msgid "Display ID" --msgstr "ئېكران ID سى" -- --#: ../daemon/factory-slave-main.c:178 ../daemon/product-slave-main.c:182 --#: ../daemon/simple-slave-main.c:182 ../daemon/xdmcp-chooser-slave-main.c:184 --msgid "ID" --msgstr "ID" -- --#: ../daemon/factory-slave-main.c:190 ../daemon/product-slave-main.c:194 --#: ../daemon/simple-slave-main.c:194 ../daemon/xdmcp-chooser-slave-main.c:196 --msgid "GNOME Display Manager Slave" --msgstr "GNOME ئېكران باشقۇرغۇ(ئەگەشكۈچى)" -- - #: ../daemon/gdm-display-access-file.c:300 - #, c-format - msgid "could not find user \"%s\" on system" --msgstr "سىستېمىدىن ئىشلەتكۈچى \"%s\" تېپىلمىدى" -+msgstr "سىستېمىدىن ئىشلەتكۈچى «%s» تېپىلمىدى" - --#: ../daemon/gdm-factory-slave.c:203 ../daemon/gdm-simple-slave.c:316 --msgid "Unable to initialize login system" --msgstr "كىرىش سىستېمىسىنى دەسلەپلەشتۈرگىلى بولمىدى" -+#: ../daemon/gdm-display.c:1320 ../daemon/gdm-display.c:1354 -+#, c-format -+msgid "No session available yet" -+msgstr "تېخى ئەڭگىمە يوق" - --#: ../daemon/gdm-factory-slave.c:235 ../daemon/gdm-simple-slave.c:352 --msgid "Unable to authenticate user" --msgstr "ئىشلەتكۈچىنى تونۇيالمىدى" -+#: ../daemon/gdm-manager.c:277 ../daemon/gdm-manager.c:384 -+#, c-format -+msgid "Unable to look up UID of user %s" -+msgstr "ئىشلەتكۈچى %s نىڭ كىملىكىنى تاپقىلى بولمىدى" - --#: ../daemon/gdm-factory-slave.c:257 ../daemon/gdm-simple-slave.c:409 --msgid "Unable to authorize user" --msgstr "مۇۋاپىق ئىشلەتكۈچى دەپ ھۆكۈم قىلغىلى بولمىدى" -+#: ../daemon/gdm-manager.c:291 -+msgid "no sessions available" -+msgstr "ئەڭگىمەلەر يوق" - --#: ../daemon/gdm-factory-slave.c:279 ../daemon/gdm-simple-slave.c:538 --msgid "Unable to establish credentials" --msgstr "ئىشەنچلىك ئىشلەتكۈچى دەپ قاراشقا بولمىدى" -+#: ../daemon/gdm-manager.c:352 -+#, c-format -+msgid "No sessions for %s available for reauthentication" -+msgstr "قايتا كىملىك دەلىللەش ئۈچۈن %s نىڭ ئەڭگىمەسى يوق" - --#: ../daemon/gdm-factory-slave.c:302 ../daemon/gdm-simple-slave.c:572 --msgid "Unable to open session" --msgstr "ئەڭگىمەنى باشلىغىلى بولمىدى" -+#: ../daemon/gdm-manager.c:406 -+#, c-format -+msgid "Unable to find session for user %s" -+msgstr "ئىشلەتكۈچى %s ئۈچۈن ئەڭگىمە تاپقىلى بولمىدى" - --#: ../daemon/gdm-factory-slave.c:677 ../daemon/gdm-product-slave.c:449 --#: ../daemon/gdm-simple-slave.c:1366 --msgid "" --"Could not start the X server (your graphical environment) due to an internal " --"error. Please contact your system administrator or check your syslog to " --"diagnose. In the meantime this display will be disabled. Please restart GDM " --"when the problem is corrected." --msgstr "ئىچكى خاتالىق تۈپەيلى X مۇلازىمېتىرى(گرافىكىلىق مەشغۇلات مۇھىتى)نى باشلىغىلى بولمىدى. سىستېما باشقۇرغۇچىسى بىلەن ئالاقە قىلىڭ ياكى سىستېما خاتىرىسى(syslog) نى ئېچىپ تەكشۈرۈپ كۆرۈڭ. ھازىرچە مەزكۇر ئېكران چەكلىنىدۇ. مەسىلىنى ھەل قىلغاندا GDM نى قايتا قوزغاتسىڭىز بولىدۇ." -+#: ../daemon/gdm-manager.c:476 -+#, c-format -+msgid "Unable to find appropriate session for user %s" -+msgstr "ئىشلەتكۈچى %s ئۈچۈن مۇۋاپىق ئەڭگىمە تاپقىلى بولمىدى" -+ -+#: ../daemon/gdm-manager.c:671 -+msgid "User doesn't own session" -+msgstr "ئىشلەتكۈچىنىڭ ئەڭگىمەسى يوق" - --#: ../daemon/gdm-server.c:250 -+#: ../daemon/gdm-manager.c:687 ../daemon/gdm-manager.c:768 -+msgid "No session available" -+msgstr "ئەڭگىمە يوق" -+ -+#: ../daemon/gdm-server.c:273 - #, c-format - msgid "%s: failed to connect to parent display '%s'" --msgstr "%s: ئاتا ئېكران '%s' نىڭغا باغلىنىش مەغلۇپ بولدى" -+msgstr "%s: ئاتا ئېكران ‹%s› نىڭغا باغلىنىش مەغلۇپ بولدى" - --#: ../daemon/gdm-server.c:365 -+#: ../daemon/gdm-server.c:452 - #, c-format - msgid "Server was to be spawned by user %s but that user doesn't exist" - msgstr "مۇلازىمېتىرنى ئىشلەتكۈچى %s قوزغىتىپتۇ. بىراق بۇنداق ئىشلەتكۈچى مەۋجۇت ئەمەس" - --#: ../daemon/gdm-server.c:376 ../daemon/gdm-server.c:396 --#: ../daemon/gdm-welcome-session.c:599 ../daemon/gdm-welcome-session.c:619 -+#: ../daemon/gdm-server.c:463 ../daemon/gdm-server.c:483 - #, c-format - msgid "Couldn't set groupid to %d" - msgstr "گۇرۇپپا ID سىنى %d غا تەڭشىگىلى بولمىدى" - --#: ../daemon/gdm-server.c:382 ../daemon/gdm-welcome-session.c:605 -+#: ../daemon/gdm-server.c:469 - #, c-format - msgid "initgroups () failed for %s" - msgstr "%s نى ئىجرا قىلىۋاتقاندا initgroups () مەغلۇپ بولدى" - --#: ../daemon/gdm-server.c:388 ../daemon/gdm-welcome-session.c:611 -+#: ../daemon/gdm-server.c:475 - #, c-format - msgid "Couldn't set userid to %d" - msgstr "ئىشلەتكۈچى ID سىنى %d غا تەڭشىگىلى بولمىدى" - --#: ../daemon/gdm-server.c:435 -+#: ../daemon/gdm-server.c:522 - #, c-format - msgid "%s: Could not open log file for display %s!" - msgstr "%s: ئېكران %s نىڭ خاتىرە ھۆججىتى(logfile) نى ئاچقىلى بولمىدى!" - --#: ../daemon/gdm-server.c:446 ../daemon/gdm-server.c:452 --#: ../daemon/gdm-server.c:458 -+#: ../daemon/gdm-server.c:533 ../daemon/gdm-server.c:539 -+#: ../daemon/gdm-server.c:545 - #, c-format - msgid "%s: Error setting %s to %s" - msgstr "%s: %s نى %s قا تەڭشىگىلى بولمىدى" - --#: ../daemon/gdm-server.c:478 -+#: ../daemon/gdm-server.c:565 - #, c-format - msgid "%s: Server priority couldn't be set to %d: %s" --msgstr "%s: مۇلازىمېتىر ئالدىنلىقىنى %d غا تەڭشىگىلى بولمىدى: %s" -+msgstr "%s: مۇلازىمېتىرنىڭ مەرتىۋىسىنى %d غا تەڭشىگىلى بولمىدى: %s" - --#: ../daemon/gdm-server.c:631 -+#: ../daemon/gdm-server.c:722 - #, c-format - msgid "%s: Empty server command for display %s" - msgstr "%s: ئېكران %s نىڭ مۇلازىمېتىر بۇيرۇقى قۇرۇق ئىكەن" -@@ -141,344 +133,334 @@ msgstr "كۆرسىتىش ئۈسكۈنىسى" - msgid "The display device" - msgstr "كۆرسىتىش ئۈسكۈنىسى" - --#: ../daemon/gdm-session-worker.c:1066 -+#: ../daemon/gdm-session.c:1183 -+msgid "Could not create authentication helper process" -+msgstr "كىملىك دەلىللەش ياردەمچى ئىجراسىنى قۇرغىلى بولمىدى" -+ -+#: ../daemon/gdm-session-worker.c:1029 - #, c-format --#| msgid "error initiating conversation with authentication system: %s" - msgid "error initiating conversation with authentication system - %s" - msgstr "دەلىللەش سىستېمىسى بىلەن كۆرۈشۈشتە دەسلەپلەشتۈرۈش خاتالىقى يۈز بەردى - %s" - --#: ../daemon/gdm-session-worker.c:1067 -+#: ../daemon/gdm-session-worker.c:1030 - msgid "general failure" - msgstr "ئادەتتىكى مەغلۇبىيەت" - --#: ../daemon/gdm-session-worker.c:1068 -+#: ../daemon/gdm-session-worker.c:1031 - msgid "out of memory" - msgstr "ئەسلەك يېتىشمىدى" - --#: ../daemon/gdm-session-worker.c:1069 -+#: ../daemon/gdm-session-worker.c:1032 - msgid "application programmer error" - msgstr "پروگراممىدىكى كەمتۈك" - --#: ../daemon/gdm-session-worker.c:1070 -+#: ../daemon/gdm-session-worker.c:1033 - msgid "unknown error" - msgstr "نامەلۇم خاتالىق" - --#: ../daemon/gdm-session-worker.c:1077 -+#: ../daemon/gdm-session-worker.c:1040 - msgid "Username:" - msgstr "ئىشلەتكۈچى ئاتى:" - --#: ../daemon/gdm-session-worker.c:1083 -+#: ../daemon/gdm-session-worker.c:1046 - #, c-format - msgid "error informing authentication system of preferred username prompt: %s" - msgstr "دەلىللەش سىستېمىسىدا ئىشلەتكۈچى ئاتىنى بىر تەرەپ قىلىشتا خاتالىق كۆرۈلدى: %s" - --#: ../daemon/gdm-session-worker.c:1097 -+#: ../daemon/gdm-session-worker.c:1060 - #, c-format - msgid "error informing authentication system of user's hostname: %s" - msgstr "دەلىللەش سىستېمىسىدا كومپيۇتېر ئاتىنى بىر تەرەپ قىلىشتا خاتالىق كۆرۈلدى: %s" - --#: ../daemon/gdm-session-worker.c:1112 -+#: ../daemon/gdm-session-worker.c:1077 - #, c-format - msgid "error informing authentication system of user's console: %s" - msgstr "ئىشلەتكۈچى تىزگىن سۇپىسىنى دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" - --#: ../daemon/gdm-session-worker.c:1125 -+#: ../daemon/gdm-session-worker.c:1101 - #, c-format - msgid "error informing authentication system of display string: %s" - msgstr "ھەرپ تىزمىسىنى كۆرسىتىپ دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" - --#: ../daemon/gdm-session-worker.c:1140 -+#: ../daemon/gdm-session-worker.c:1116 - #, c-format - msgid "error informing authentication system of display xauth credentials: %s" - msgstr "xauth گۇۋاھنامىنى كۆرسىتىپ دەلىللەش سىستېمىسىغا ئۇقتۇرغاندا خاتالىق كۆرۈلدى: %s" - --#: ../daemon/gdm-session-worker.c:1462 ../daemon/gdm-session-worker.c:1479 -+#: ../daemon/gdm-session-worker.c:1454 ../daemon/gdm-session-worker.c:1471 - #, c-format - msgid "no user account available" - msgstr "ئىشلەتكۈچى ھېسابى يوق" - --#: ../daemon/gdm-session-worker.c:1506 -+#: ../daemon/gdm-session-worker.c:1498 - msgid "Unable to change to user" - msgstr "ئىشلەتكۈچى ئالماشتۇرغىلى بولمىدى" - --#: ../daemon/gdm-welcome-session.c:549 --#, c-format --msgid "User %s doesn't exist" --msgstr "ئىشلەتكۈچى %s مەۋجۇت ئەمەس" -- --#: ../daemon/gdm-welcome-session.c:556 --#, c-format --msgid "Group %s doesn't exist" --msgstr "گۇرۇپپا %s مەۋجۇت ئەمەس" -- --#: ../daemon/gdm-xdmcp-display-factory.c:604 --msgid "Could not create socket!" --msgstr "socket نى قۇرغىلى بولمىدى!" -- --#: ../daemon/gdm-xdmcp-display-factory.c:873 --#, c-format --msgid "Denied XDMCP query from host %s" --msgstr "كومپيۇتېر %s دىن كەلگەن XDMCP سۈرۈشتۈرۈش تەلىپى رەت قىلىندى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1031 --#: ../daemon/gdm-xdmcp-display-factory.c:1255 --msgid "Could not extract authlist from packet" --msgstr "بوغچىدىن دەلىللەش تىزىملىكىنى يېيىپ چىقارغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1044 --#: ../daemon/gdm-xdmcp-display-factory.c:1270 --msgid "Error in checksum" --msgstr "تەكشۈرۈش خاتالىقى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1523 --msgid "Bad address" --msgstr "ئادرېس توغرا ئەمەس" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1607 --#, c-format --msgid "%s: Could not read display address" --msgstr "%s: ئېكران ئادرېسىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1615 --#, c-format --msgid "%s: Could not read display port number" --msgstr "%s: ئېكران ئېغىزىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1624 --#, c-format --msgid "%s: Could not extract authlist from packet" --msgstr "%s: بوغچىدىن دەلىللەش تىزىملىكىنى يېيىپ چىقارغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:1644 --#, c-format --msgid "%s: Error in checksum" --msgstr "%s: تەكشۈرۈشتە خاتالىق كۆرۈلدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2200 --#, c-format --msgid "%s: Got REQUEST from banned host %s" --msgstr "%s: چەكلەنگەن باش ئاپپارات %s دىن ئىلتىماس تاپشۇرۇۋالدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2210 --#: ../daemon/gdm-xdmcp-display-factory.c:2568 --#: ../daemon/gdm-xdmcp-display-factory.c:2822 --#, c-format --msgid "%s: Could not read Display Number" --msgstr "%s: ئېكران نومۇرىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2217 --#, c-format --msgid "%s: Could not read Connection Type" --msgstr "%s: باغلىنىش تىپىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2224 --#, c-format --msgid "%s: Could not read Client Address" --msgstr "%s: خېرىدار ئادرېسىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2232 --#, c-format --msgid "%s: Could not read Authentication Names" --msgstr "%s: دەلىللەش ئاتىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2241 --#, c-format --msgid "%s: Could not read Authentication Data" --msgstr "%s: دەلىللەش سانلىق-ئاساسلىرىنى ئوقۇپ چىققىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2251 --#, c-format --msgid "%s: Could not read Authorization List" --msgstr "%s: دەلىللەش تىزىملىكىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2270 --#, c-format --msgid "%s: Could not read Manufacturer ID" --msgstr "%s: ئىشلەپچىقارغۇچى ID سىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2297 --#, c-format --msgid "%s: Failed checksum from %s" --msgstr "%s: %s نى تەكشۈرۈش مەغلۇپ بولدى." -- --#: ../daemon/gdm-xdmcp-display-factory.c:2552 --#, c-format --msgid "%s: Got Manage from banned host %s" --msgstr "%s: چەكلەنگەن باش ئاپپارات %s دىن Manage تاپشۇرۇۋالدى" -+#: ../daemon/gdm-simple-slave.c:1426 -+msgid "" -+"Could not start the X server (your graphical environment) due to an internal " -+"error. Please contact your system administrator or check your syslog to " -+"diagnose. In the meantime this display will be disabled. Please restart GDM " -+"when the problem is corrected." -+msgstr "ئىچكى خاتالىق تۈپەيلى X مۇلازىمېتىرى(گرافىكىلىق مەشغۇلات مۇھىتى)نى باشلىغىلى بولمىدى. سىستېما باشقۇرغۇچىسى بىلەن ئالاقە قىلىڭ ياكى سىستېما خاتىرىسى(syslog) نى ئېچىپ تەكشۈرۈپ كۆرۈڭ. ھازىرچە مەزكۇر ئېكران چەكلىنىدۇ. مەسىلىنى ھەل قىلغاندا GDM نى قايتا قوزغاتسىڭىز بولىدۇ." - --#: ../daemon/gdm-xdmcp-display-factory.c:2561 --#: ../daemon/gdm-xdmcp-display-factory.c:2829 -+#: ../daemon/gdm-simple-slave.c:1467 - #, c-format --msgid "%s: Could not read Session ID" --msgstr "%s: ئەڭگىمە ID سىنى ئوقۇغىلى بولمىدى" -+msgid "Can only be called before user is logged in" -+msgstr "ئىشلەتكۈچى تىزىمغا كىرگەندىن كېيىن ئاندىن چاقىرغىلى بولىدۇ" - --#: ../daemon/gdm-xdmcp-display-factory.c:2575 -+#: ../daemon/gdm-simple-slave.c:1477 - #, c-format --msgid "%s: Could not read Display Class" --msgstr "%s: كۆرسىتىش دەرىجىسىنى ئوقۇغىلى بولمىدى" -+msgid "Caller not GDM" -+msgstr "چاقىرغۇچى GDM ئەمەس" - --#: ../daemon/gdm-xdmcp-display-factory.c:2681 --#: ../daemon/gdm-xdmcp-display-factory.c:2731 --#: ../daemon/gdm-xdmcp-display-factory.c:2737 --#, c-format --msgid "%s: Could not read address" --msgstr "%s: ئادرېسنى ئوقۇغىلى بولمىدى" -+#: ../daemon/gdm-simple-slave.c:1530 -+msgid "User not logged in" -+msgstr "ئىشلەتكۈچى كىرمىدى" - --#: ../daemon/gdm-xdmcp-display-factory.c:2812 -+#: ../daemon/gdm-xdmcp-chooser-slave.c:370 - #, c-format --msgid "%s: Got KEEPALIVE from banned host %s" --msgstr "%s: چەكلەنگەن كومپيۇتېر %s دىن KEEPALIVE تاپشۇرۇۋالدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2902 --msgid "GdmXdmcpDisplayFactory: Could not read XDMCP header!" --msgstr "GdmXdmcpDisplayFactory: XDMCP قېشىنى ئوقۇغىلى بولمىدى" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2908 --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 --msgid "XMDCP: Incorrect XDMCP version!" --msgstr "XDMCP: XDMCP نەشرى توغرا ئەمەس" -- --#: ../daemon/gdm-xdmcp-display-factory.c:2914 --#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 --msgid "XMDCP: Unable to parse address" --msgstr "XDMCP: ئادرېسنى پارچىلىيالمىدى" -+msgid "Currently, only one client can be connected at once" -+msgstr "نۆۋەتتە، بىر قېتىمدا پەقەت بىرلا خېرىدار باغلىنالايدۇ" - --#: ../daemon/gdm-xdmcp-display-factory.c:3359 --#, c-format --msgid "Could not get server hostname: %s!" --msgstr "مۇلازىمېتىر كومپيۇتېرىنىڭ ئاتىنى ئوقۇيالمىدى: %s!" -+#: ../daemon/gdm-xdmcp-display-factory.c:604 -+msgid "Could not create socket!" -+msgstr "socket نى قۇرغىلى بولمىدى!" - --#: ../daemon/main.c:237 ../daemon/main.c:250 -+#: ../daemon/main.c:126 ../daemon/main.c:139 - #, c-format - msgid "Cannot write PID file %s: possibly out of disk space: %s" - msgstr "PID ھۆججىتىنى %s غا يازالمىدى: دىسكا بوشلۇقى يېتىشمىگەن بولۇشى مۇمكىن: %s" - --#: ../daemon/main.c:271 -+#: ../daemon/main.c:166 - #, c-format - msgid "Logdir %s does not exist or isn't a directory." - msgstr "%s خاتىرە مۇندەرىجە(Logdir) مەۋجۇت ئەمەس ياكى مۇندەرىجە ئەمەس." - --#: ../daemon/main.c:287 -+#: ../daemon/main.c:183 - #, c-format - msgid "Authdir %s does not exist. Aborting." - msgstr "%s دەلىللەش مۇندەرىجە(Authdir) مەۋجۇت ئەمەس. توختىتىۋاتىدۇ." - --#: ../daemon/main.c:291 -+#: ../daemon/main.c:187 - #, c-format - msgid "Authdir %s is not a directory. Aborting." - msgstr "%s دەلىللەش مۇندەرىجە(Authdir) مۇندەرىجە ئەمەس. توختىتىۋاتىدۇ." - --#: ../daemon/main.c:365 -+#: ../daemon/main.c:261 - #, c-format - msgid "Authdir %s is not owned by user %d, group %d. Aborting." - msgstr "Authdir %s نىڭ ئىگىسى ئىشلەتكۈچى %d، گۇرۇپپا %d ئەمەس. توختىتىۋاتىدۇ." - --#: ../daemon/main.c:372 -+#: ../daemon/main.c:268 - #, c-format - msgid "Authdir %s has wrong permissions %o. Should be %o. Aborting." - msgstr "Authdir %s نىڭ ھوقۇقى %o توغرا ئەمەس. %o بولۇشى كېرەك ئىدى. توختىتىۋاتىدۇ." - --#: ../daemon/main.c:409 -+#: ../daemon/main.c:305 - #, c-format - msgid "Can't find the GDM user '%s'. Aborting!" --msgstr "GDM ئىشلەتكۈچىسى '%s' تېپىلمىدى. توختىتىۋاتىدۇ." -+msgstr "GDM ئىشلەتكۈچىسى ‹%s› تېپىلمىدى. توختىتىۋاتىدۇ." - --#: ../daemon/main.c:415 -+#: ../daemon/main.c:311 - msgid "The GDM user should not be root. Aborting!" - msgstr "root نى GDM ئىشلەتكۈچىسى قىلىشقا بولمايدۇ. توختىتىۋاتىدۇ." - --#: ../daemon/main.c:421 -+#: ../daemon/main.c:317 - #, c-format - msgid "Can't find the GDM group '%s'. Aborting!" --msgstr "GDM ئىشلەتكۈچىسى '%s' تېپىلمىدى. توختىتىۋاتىدۇ." -+msgstr "GDM ئىشلەتكۈچىسى ‹%s› تېپىلمىدى. توختىتىۋاتىدۇ." - --#: ../daemon/main.c:427 -+#: ../daemon/main.c:323 - msgid "The GDM group should not be root. Aborting!" - msgstr "root نى GDM گۇرۇپپىسى قىلىشقا بولمايدۇ. توختىتىۋاتىدۇ." - --#: ../daemon/main.c:533 -+#: ../daemon/main.c:434 - msgid "Make all warnings fatal" - msgstr "ھەممە ئاگاھلاندۇرۇشنى ئېغىر خاتالىققا ئۆزگەرت" - --#: ../daemon/main.c:534 -+#: ../daemon/main.c:435 - msgid "Exit after a time (for debugging)" - msgstr "بىردەمدىن كېيىن چېكىن - سازلاش ئۈچۈن" - --#: ../daemon/main.c:535 -+#: ../daemon/main.c:436 - msgid "Print GDM version" - msgstr "GDM نەشرىنى بېسىپ چىقار" - --#: ../daemon/main.c:550 -+#: ../daemon/main.c:449 - msgid "GNOME Display Manager" --msgstr "GNOME ئېكران باشقۇرغۇ(GDM)" -+msgstr "گىنوم ئېكران باشقۇرغۇ(GDM)" - - #. make sure the pid file doesn't get wiped --#: ../daemon/main.c:616 -+#: ../daemon/main.c:503 - msgid "Only the root user can run GDM" --msgstr "root لا GDM نى ئىجرا قىلالايدۇ" -+msgstr "ئالىي ئىشلەتكۈچىلا GDM نى ئىجرا قىلالايدۇ" - - #. Translators: worker is a helper process that does the work - #. of starting up a session --#: ../daemon/session-worker-main.c:158 -+#: ../daemon/session-worker-main.c:150 - msgid "GNOME Display Manager Session Worker" --msgstr "GNOME ئېكران باشقۇرغۇنىڭ ئىشچى ئەڭگىمەسى" -- --#: ../data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in.h:1 --msgid "AT-SPI Registry Wrapper" --msgstr "AT-SPI رويخەت تۈرى" -- --#: ../data/greeter-autostart/gdm-simple-greeter.desktop.in.in.h:1 --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1756 --msgid "Login Window" --msgstr "كىرىش كۆزنىكى" -+msgstr "گىنوم ئېكران باشقۇرغۇنىڭ ئىشچى ئەڭگىمەسى" - --#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:1 --msgid "Power Manager" --msgstr "توك مەنبە باشقۇرغۇچ" -+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 -+msgid "Display ID" -+msgstr "ئېكران كىملىكى" - --#: ../data/greeter-autostart/gnome-power-manager.desktop.in.in.h:2 --msgid "Power management daemon" --msgstr "توك مەنبە باشقۇرغۇ نازارەتچىسى" -+#: ../daemon/simple-slave-main.c:177 ../daemon/xdmcp-chooser-slave-main.c:178 -+msgid "ID" -+msgstr "ID" - --#: ../data/greeter-autostart/gnome-session-check-accelerated.desktop.in.in.h:1 --msgid "GNOME Session Acceleration Checker" --msgstr "GNOME ئەڭگىمە تېزلەتكۈچنى تەكشۈرگۈچ" -+#: ../daemon/simple-slave-main.c:187 ../daemon/xdmcp-chooser-slave-main.c:188 -+msgid "GNOME Display Manager Slave" -+msgstr "گىنوم ئېكران باشقۇرغۇ(ئەگەشكۈچى)" - --#: ../data/greeter-autostart/gnome-settings-daemon.desktop.in.in.h:1 --msgid "GNOME Settings Daemon" --msgstr "GNOME تەڭشەك نازارەتچىسى" -+#: ../data/applications/gdm-simple-greeter.desktop.in.in.h:1 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:2566 -+msgid "Login Window" -+msgstr "كىرىش كۆزنىكى" - --#: ../data/greeter-autostart/gnome-mag.desktop.in.h:1 -+#: ../data/applications/gnome-mag.desktop.in.h:1 - msgid "GNOME Screen Magnifier" --msgstr "GNOME ئېكران چوڭايتقۇ" -+msgstr "گىنوم ئېكران چوڭايتقۇ" - --#: ../data/greeter-autostart/gnome-mag.desktop.in.h:2 -+#: ../data/applications/gnome-mag.desktop.in.h:2 - msgid "Magnify parts of the screen" - msgstr "ئېكراننىڭ مەلۇم بۆلىكىنى چوڭايتىدۇ" - --#: ../data/greeter-autostart/gok.desktop.in.h:1 -+#: ../data/applications/gnome-shell.desktop.in.h:1 -+msgid "GNOME Shell" -+msgstr "گىنوم Shell" -+ -+#: ../data/applications/gnome-shell.desktop.in.h:2 -+msgid "Window management and compositing" -+msgstr "كۆزنەك باشقۇرۇش ۋە بىرىكتۈرۈش" -+ -+#: ../data/applications/gok.desktop.in.h:1 - msgid "GNOME On-Screen Keyboard" --msgstr "GNOME ئېكران ھەرپتاختا" -+msgstr "گىنوم ئېكران ھەرپتاختىسى" - --#: ../data/greeter-autostart/gok.desktop.in.h:2 -+#: ../data/applications/gok.desktop.in.h:2 - msgid "Use an on-screen keyboard" - msgstr "ئېكران ھەرپتاختىسىنى ئىشلىتىدۇ" - --#: ../data/greeter-autostart/metacity.desktop.in.h:1 --msgid "Metacity" --msgstr "Metacity" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:1 -+msgid "Whether or not to allow fingerprint readers for login" -+msgstr "كىرىشتە بارماق ئىزى ئوقۇغۇچقا ئىجازەتمۇ" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:2 -+msgid "" -+"The login screen can optionally allow users who have enrolled their " -+"fingerprints to log in using those prints." -+msgstr "كىرىش ئېكرانىدا، بارماق ئىزىنى خەتلەتكەن ئىشلەتكۈچىگە بارماق ئىزىنى ئىشلىتىپ كىرىشكە رۇخسەت قىلىشقىمۇ بولىدۇ." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:3 -+msgid "Whether or not to allow smartcard readers for login" -+msgstr "كىرىشتە smartcard ئوقۇغۇچقا ئىجازەتمۇ" - --#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:1 --msgid "Orca Screen Reader" --msgstr "Orca ئېكران ئوقۇغۇ" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:4 -+msgid "" -+"The login screen can optionally allow users who have smartcards to log in " -+"using those smartcards." -+msgstr "كىرىش ئېكرانىدا، smartcards بار ئىشلەتكۈچىگە smartcards ئىشلىتىپ كىرىشكە رۇخسەت قىلىشقىمۇ بولىدۇ." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:5 -+msgid "Path to small image at top of user list" -+msgstr "ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدىكى كىچىك سۈرەتنىڭ يولى" - --#: ../data/greeter-autostart/orca-screen-reader.desktop.in.h:2 --msgid "Present on-screen information as speech or braille" --msgstr "ئېكراندىكى ئۇچۇرلارنى ئۇن ياكى ئەمالار يېزىقى شەكلىدە كۆرسىتىدۇ" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:6 -+msgid "" -+"The login screen can optionally show a small image at the top of its user " -+"list to provide site administrators and distributions a way to provide " -+"branding." -+msgstr "كىرىش ئېكرانىدا ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدە كىچىك سۈرەتنى كۆرسىتىشكىمۇ بولىدۇ. بۇ ئارقىلىق باشقۇرغۇچىنىڭ ئالاھىدە تۇغنى كۆرسىتىشىگە ئىمكانىيەت يارىتىدۇ." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:7 -+msgid "" -+"The fallback login screen can optionally show a small image at the top of " -+"its user list to provide site administrators and distributions a way to " -+"provide branding." -+msgstr "fallback كىرىش ئېكرانىدا ئىشلەتكۈچى تىزىمىنىڭ ئەڭ ئۈستىدە كىچىك سۈرەتنى كۆرسىتىشكىمۇ بولىدۇ. بۇ ئارقىلىق باشقۇرغۇچىنىڭ ئالاھىدە تۇغنى كۆرسىتىشىگە ئىمكانىيەت يارىتىدۇ." - --#: ../data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in.h:1 --msgid "PolicyKit Authentication Agent" --msgstr "PolicyKit دەلىللەش پروگراممىسى" -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:8 -+msgid "Avoid showing user list" -+msgstr "ئىشلەتكۈچى تىزىمىنى كۆرسىتىشتىن ساقلانسۇن" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:9 -+msgid "" -+"The login screen normally shows a list of available users to log in as. This " -+"setting can be toggled to disable showing the user list." -+msgstr "ئادەتتە كىرىش ئېكرانىدا مەۋجۇت ئىشلەتكۈچىلەرنىڭ تىزىمى كۆرۈنۈپ تۇرىدۇ. بۇ ئارقىلىق ئىشلەتكۈچىلەر تىزىمىنى كۆرسىتىش ياكى كۆرسەتمەسلىكنى بەلگىلىگىلى بولىدۇ." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:10 -+msgid "Enable showing the banner message" -+msgstr "لەۋھە ئۇچۇرىنى كۆرسەتسۇن" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:11 -+msgid "Set to true to show the banner message text." -+msgstr "لەۋھە ئۇچۇرى تېكىستىنى كۆرسىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:12 -+msgid "Banner message text" -+msgstr "لەۋھە ئۇچۇرىنىڭ تېكىستى" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:13 -+msgid "Text banner message to show in the login window." -+msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان لەۋھە تېكىستى." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:14 -+msgid "Disable showing the restart buttons" -+msgstr "قايتا قوزغات توپچىلىرىنى چەكلە" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:15 -+msgid "Set to true to disable showing the restart buttons in the login window." -+msgstr "تىزىمغا كىرىش كۆزنىكىدە قايتا قوزغات توپچىسىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ." -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:16 -+msgid "Number of allowed authentication failures" -+msgstr "كىملىك دەلىللەشتە رۇخسەت قىلىنغان خاتالىق قېتىم سانى" -+ -+#: ../data/org.gnome.login-screen.gschema.xml.in.h:17 -+msgid "" -+"The number of times a user is allowed to attempt authentication, before " -+"giving up and going back to user selection." -+msgstr "كىملىك دەلىللەشتە خاتالىشىشقا رۇخسەت قىلىنغان قېتىم سانى. خاتالاشقان سانى بۇنىڭدىن ئېشىپ كەتسە، ئىشلەتكۈچى تاللاش كۆزنىكىگە قايتىدۇ." -+ -+#: ../gui/libgdm/gdm-user-switching.c:72 -+msgid "Unable to create transient display: " -+msgstr "ۋاقىتلىق كۆرسەتكۈچ قۇرغىلى بولمىدى " -+ -+#: ../gui/libgdm/gdm-user-switching.c:183 -+#: ../gui/libgdm/gdm-user-switching.c:395 -+msgid "Unable to activate session: " -+msgstr "ئەڭگىمەنى ئاكتىپلىغىلى بولمىدى: " -+ -+#: ../gui/libgdm/gdm-user-switching.c:344 -+#: ../gui/libgdm/gdm-user-switching.c:514 -+#, c-format -+msgid "Could not identify the current session." -+msgstr "ھازىرقى ئەڭگىمەنى بىلگىلى بولمىدى." -+ -+#: ../gui/libgdm/gdm-user-switching.c:351 -+#, c-format -+msgid "User unable to switch sessions." -+msgstr "ئىشلەتكۈچى ئەڭگىمەنى ئالماشتۇرالمىدى." -+ -+#: ../gui/libgdm/gdm-user-switching.c:523 -+#, c-format -+msgid "Could not identify the current seat." -+msgstr "ھازىرقى ئورۇننى بىلگىلى بولمىدى." -+ -+#: ../gui/libgdm/gdm-user-switching.c:533 -+#, c-format -+msgid "" -+"The system is unable to determine whether to switch to an existing login " -+"screen or start up a new login screen." -+msgstr "سىستېما نۆۋەتتىكى كىرىش ئېكرانىنى ئالماشتۇرۇش ياكى يېڭى كىرىش ئېكرانىنى قوزغىتىشنى بىلەلمىدى." -+ -+#: ../gui/libgdm/gdm-user-switching.c:541 -+#, c-format -+msgid "The system is unable to start up a new login screen." -+msgstr "سىستېما يېڭى كىرىش ئېكرانىنى باشلىيالمىدى." - - #: ../gui/simple-chooser/gdm-host-chooser-dialog.c:147 - msgid "Select System" -@@ -492,9 +474,121 @@ msgstr "XDMCP: XDMCP يىغلەكىنى قۇرغىلى بولمىدى!" - msgid "XDMCP: Could not read XDMCP header!" - msgstr "XDMCP: XDMCP قېشىنى ئوقۇغىلى بولمىدى!" - -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:227 -+msgid "XMDCP: Incorrect XDMCP version!" -+msgstr "XDMCP: XDMCP نەشرى توغرا ئەمەس" -+ -+#: ../gui/simple-chooser/gdm-host-chooser-widget.c:233 -+msgid "XMDCP: Unable to parse address" -+msgstr "XDMCP: ئادرېسنى پارچىلىيالمىدى" -+ -+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:287 -+msgid "Fingerprint Authentication" -+msgstr "بارماق ئىزى بىلەن كىملىك دەلىللەش" -+ -+#: ../gui/simple-greeter/extensions/fingerprint/gdm-fingerprint-extension.c:293 -+msgid "Log into session with fingerprint" -+msgstr "ئەڭگىمەگە بارماق ئىزى بىلەن كىر" -+ -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:287 -+msgid "Password Authentication" -+msgstr "ئىم بىلەن كىملىك دەلىللەش" -+ -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:293 -+msgid "Log into session with username and password" -+msgstr "ئەڭگىمەگە ئىشلەتكۈچى ئاتى ۋە ئىم بىلەن كىر" -+ -+#: ../gui/simple-greeter/extensions/password/gdm-password-extension.c:408 -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:565 -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:408 -+msgid "Log In" -+msgstr "تىزىمغا كىر" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:155 -+msgid "Slot ID" -+msgstr "ئوقۇر ID" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:156 -+msgid "The slot the card is in" -+msgstr "كارتا بار ئوقۇر" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:162 -+msgid "Slot Series" -+msgstr "ئوقۇر قاتارى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:163 -+msgid "per-slot card identifier" -+msgstr "ھەر بىر ئوقۇردىكى كارتىنىڭ پەرقلەندۈرگۈچىسى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:169 -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:170 -+msgid "name" -+msgstr "ئاتى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:174 -+msgid "Module" -+msgstr "بۆلەك" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard.c:175 -+msgid "smartcard driver" -+msgstr "smartcard قوزغاتقۇسى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:408 -+msgid "Smartcard Authentication" -+msgstr "smartcard بىلەن كىملىك دەلىللەش" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-extension.c:414 -+msgid "Log into session with smartcard" -+msgstr "ئەڭگىمەگە smartcard بىلەن كىر" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:186 -+msgid "Module Path" -+msgstr "بۆلەك يولى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:187 -+msgid "path to smartcard PKCS #11 driver" -+msgstr "smartcard PKCS #11 قوزغاتقۇسىنىڭ يولى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:527 -+msgid "received error or hang up from event source" -+msgstr "ھادىسە مەنبەسىدىن خاتالىق ياكى ئېسىپ قويۇشنى تاپشۇرۇۋالدى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:661 -+#, c-format -+msgid "NSS security system could not be initialized" -+msgstr "NSS بىخەتەرلىك سىستېمىسىنى دەسلەپلەشتۈرگىلى بولمىدى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:789 -+#, c-format -+msgid "no suitable smartcard driver could be found" -+msgstr "مۇۋاپىق smartcard قوزغاتقۇسى تېپىلمىدى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:803 -+#, c-format -+msgid "smartcard driver '%s' could not be loaded" -+msgstr "smartcard قوزغاتقۇسى «%s» نى ئوقۇغىلى بولمىدى" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:875 -+#, c-format -+msgid "could not watch for incoming card events - %s" -+msgstr "كىرگەن كارتا ھادىسىسىنى كۆزىتەلمەيدۇ - %s" -+ -+#: ../gui/simple-greeter/extensions/smartcard/gdm-smartcard-manager.c:1242 -+#, c-format -+msgid "encountered unexpected error while waiting for smartcard events" -+msgstr "ئىدراكلىق كارتا ھادىسىسىنى كۈتۈۋاتقاندا تاسادىپىي خاتالىققا يولۇقتى" -+ -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:287 -+msgid "Authentication" -+msgstr "سالاھىيەت دەلىللەش" -+ -+#: ../gui/simple-greeter/extensions/unified/gdm-unified-extension.c:293 -+msgid "Log into session" -+msgstr "ئەڭگىمەگە كىر" -+ - #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:239 - msgid "Value" --msgstr "قىممىتى" -+msgstr "قىممەت" - - #: ../gui/simple-greeter/gdm-cell-renderer-timer.c:240 - msgid "percentage of time complete" -@@ -502,7 +596,7 @@ msgstr "تاماملانغان ۋاقىتنىڭ پىرسەنتى" - - #: ../gui/simple-greeter/gdm-chooser-widget.c:1465 - msgid "Inactive Text" --msgstr "بىئاكتىپ تېكىست" -+msgstr "پاسسىپ تېكىست" - - #: ../gui/simple-greeter/gdm-chooser-widget.c:1466 - msgid "The text to use in the label if the user hasn't picked an item yet" -@@ -552,101 +646,69 @@ msgstr "%a %l:%M:%S %p" - msgid "%a %l:%M %p" - msgstr "%p%l:%M (%a)" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:293 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:314 - msgid "Automatically logging in…" - msgstr "ئۆزلۈكىدىن كىرىۋاتىدۇ…" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:585 --msgid "Select language and click Log In" --msgstr "تىل تاللاپ «تىزىمغا كىر» نى چېكىڭ" -- - #. need to wait for response from backend --#: ../gui/simple-greeter/gdm-greeter-login-window.c:701 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:930 - msgid "Cancelling…" - msgstr "ۋاز كېچىۋاتىدۇ…" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1091 -+#. just wait for the user to select language and stuff -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1486 -+msgid "Select language and click Log In" -+msgstr "تىل تاللاپ «تىزىمغا كىر» نى چېكىڭ" -+ -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1622 - msgctxt "customsession" - msgid "Custom" - msgstr "ئىختىيارى" - --#: ../gui/simple-greeter/gdm-greeter-login-window.c:1092 -+#: ../gui/simple-greeter/gdm-greeter-login-window.c:1623 - msgid "Custom session" - msgstr "ئىختىيارى ئەڭگىمە" - - #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:1 --#| msgid "Panel" --msgid "Cancel" --msgstr "ۋاز كەچ" -- --#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 - msgid "Computer Name" - msgstr "كومپيۇتېر ئاتى" - -+#: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:2 -+msgid "Version" -+msgstr "نەشرى" -+ - #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:3 --msgid "Login" --msgstr "تىزىمغا كىر" -+msgid "Cancel" -+msgstr "ئەمەلدىن قالدۇر" - - #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:4 - msgid "Unlock" --msgstr "قۇلۇپسىزلا" -+msgstr "قۇلۇپ ئاچ" - - #: ../gui/simple-greeter/gdm-greeter-login-window.ui.h:5 --msgid "Version" --msgstr "نەشرى" -+msgid "Login" -+msgstr "كىرىش" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:907 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:953 - msgid "Suspend" - msgstr "توڭلات" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:912 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:958 - msgid "Restart" - msgstr "قايتا قوزغات" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:916 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:962 - msgid "Shut Down" - msgstr "تاقاش" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:965 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:1011 - msgid "Unknown time remaining" - msgstr "ئېشىپ قالغان ۋاقىت نامەلۇم" - --#: ../gui/simple-greeter/gdm-greeter-panel.c:987 -+#: ../gui/simple-greeter/gdm-greeter-panel.c:1033 - msgid "Panel" - msgstr "تاختا" - --#: ../gui/simple-greeter/gdm-language-chooser-dialog.c:252 --msgid "Languages" --msgstr "تىللار" -- --#: ../gui/simple-greeter/gdm-language-chooser-widget.c:276 --msgid "_Languages:" --msgstr "تىللار(_L):" -- --#: ../gui/simple-greeter/gdm-language-chooser-widget.c:277 --msgid "_Language:" --msgstr "تىل(_L):" -- --#. translators: This brings up a dialog --#. * with a list of languages to choose from --#. --#: ../gui/simple-greeter/gdm-language-option-widget.c:231 --msgctxt "language" --msgid "Other…" --msgstr "باشقا…" -- --#: ../gui/simple-greeter/gdm-language-option-widget.c:232 --msgid "Choose a language from the full list of available languages." --msgstr "تىل تىزىملىكىدىن تىل تاللايدۇ." -- --#: ../gui/simple-greeter/gdm-language-option-widget.c:262 --msgid "Language" --msgstr "تىل" -- --#: ../gui/simple-greeter/gdm-languages.c:709 --msgid "Unspecified" --msgstr "بەلگىلەنمىگەن" -- - #: ../gui/simple-greeter/gdm-option-widget.c:505 - msgid "Label Text" - msgstr "ئەن تېكىستى" -@@ -671,14 +733,6 @@ msgstr "كۆڭۈلدىكى تۇر" - msgid "The ID of the default item" - msgstr "بۇ كۆڭۈلدىكى تۇرنىڭ ID سىدۇر" - --#: ../gui/simple-greeter/gdm-recent-option-widget.c:310 --msgid "Max Item Count" --msgstr "تۇرنىڭ ئەڭ كوپ سانى" -- --#: ../gui/simple-greeter/gdm-recent-option-widget.c:311 --msgid "The maximum number of items to keep around in the list" --msgstr "تىزىملىكتە ساقلىنىدىغان تۈرلەرنىڭ ئەڭ كوپ سانىنى بىلدۈرىدۇ" -- - #: ../gui/simple-greeter/gdm-remote-login-window.c:188 - #, c-format - msgid "Remote Login (Connecting to %s…)" -@@ -691,178 +745,38 @@ msgstr "يىراقتىن تىزىمغا كىر(%s غا باغلاندى)" - - #: ../gui/simple-greeter/gdm-remote-login-window.c:281 - msgid "Remote Login" --msgstr "يىراقتىن تىزىمغا كىر" -+msgstr "يىراقتىن كىرىش" - - #: ../gui/simple-greeter/gdm-session-option-widget.c:162 - msgid "Session" - msgstr "ئەڭگىمە" - --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:1 --msgid "Banner message text" --msgstr "لەۋھە ئۇچۇرىنىڭ تېكىستى" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:2 --msgid "Banner message text when chooser is empty" --msgstr "تاللىغۇ قۇرۇق ۋاقىتتا چىقىدىغان لەۋھە ئۇچۇرىنىڭ تېكىستى" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:3 --msgid "Disable showing the restart buttons" --msgstr "قايتا قوزغات توپچىلىرىنى چەكلە" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:4 --msgid "Do not show known users in the login window" --msgstr "تىزىمغا كىرىش كۆزنىكىدە ئىشلەتكۈچىلەرنىڭ ئاتىنى كۆرسەتمە" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:5 --msgid "Enable accessibility keyboard plugin" --msgstr "ھەرپتاختا قىستۇرمىسىنىڭ ياردەمچى ئىقتىدارىنى ئىشلەت" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:6 --msgid "Enable on-screen keyboard" --msgstr "ئېكران ھەرپتاختىسىنى ئىشلەت" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:7 --msgid "Enable screen magnifier" --msgstr "ئېكران چوڭايتىشنى ئىشلەت" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:8 --msgid "Enable screen reader" --msgstr "ئېكران ئوقۇغۇنى ئىشلەت" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:9 --msgid "Enable showing the banner message" --msgstr "لەۋھە ئۇچۇرىنى كۆرسەتسۇن" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:10 --msgid "Icon name to use for greeter logo" --msgstr "سالام تۇغى ئۈچۈن ئىشلىتىلىدىغان سىنبەلگە ئاتى" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:11 --msgid "Recently selected languages" --msgstr "ئالدىنقى قېتىم تاللانغان تىل" -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:12 --msgid "Set to a list of languages to be shown by default in the login window." --msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى تىللار تەڭشىكى." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:13 --msgid "Set to the themed icon name to use for the greeter logo." --msgstr "سالام تۇغى ئۈچۈن ئىشلىتىلىدىغان سىنبەلگىنىڭ ئات تەڭشىكى." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:14 --msgid "Set to true to disable showing known users in the login window." --msgstr "تىزىمغا كىرىش كۆزنىكىدە ئىشلەتكۈچى ئاتىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:15 --msgid "Set to true to disable showing the restart buttons in the login window." --msgstr "تىزىمغا كىرىش كۆزنىكىدە قايتا قوزغات توپچىسىنى كۆرسەتمەسلىك ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:16 --msgid "Set to true to enable the XRandR settings manager plugin." --msgstr "xrandr تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:17 --msgid "Set to true to enable the background settings manager plugin." --msgstr "تەگلىك تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:18 --msgid "Set to true to enable the media-keys settings manager plugin." --msgstr "media-keys تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:19 --msgid "Set to true to enable the on-screen keyboard." --msgstr "ئېكران ھەرپتاختىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:20 --msgid "" --"Set to true to enable the plugin to manage the accessibility keyboard " --"settings." --msgstr "قوشۇمچە ئىقتىدارلىق ھەرپتاختا تەڭشەك قىستۇرمىسى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:21 --msgid "Set to true to enable the screen magnifier." --msgstr "ئېكران چوڭايتقۇنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:22 --msgid "Set to true to enable the screen reader." --msgstr "ئېكران ئوقۇغۇنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:23 --msgid "Set to true to enable the sound settings manager plugin." --msgstr "ئۈن تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:24 --msgid "Set to true to enable the xsettings settings manager plugin." --msgstr "xsettings تەڭشەك باشقۇرغۇ قىستۇرمىسىنى ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:25 --msgid "Set to true to show the banner message text." --msgstr "لەۋھە ئۇچۇرى تېكىستىنى كۆرسىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:26 --msgid "Set to true to use Compiz as the window manager." --msgstr "compiz نى ئېكران باشقۇرغۇ قىلىپ ئىشلىتىش ئۈچۈن true قىلىپ تەڭشىلىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:27 --msgid "" --"Text banner message to show in the login window when the user chooser is " --"empty, instead of banner_message_text." --msgstr "ئىشلەتكۈچى لەۋھە ئۇچۇرى تېكىستنى تاللىمىغاندا banner_message_text نىڭ ئورنىغا كۆرسىتىلىدىغان تېكىست." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:28 --msgid "Text banner message to show in the login window." --msgstr "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان لەۋھە تېكىستى." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:29 --msgid "True if the XRandR settings manager plugin is enabled." --msgstr "xrandr تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:30 --msgid "True if the background settings manager plugin is enabled." --msgstr "تەگلىك تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:31 --msgid "True if the media-keys settings manager plugin is enabled." --msgstr "media-keys تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:32 --msgid "True if the sound settings manager plugin is enabled." --msgstr "ئۈن تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:33 --msgid "True if the xsettings settings manager plugin is enabled." --msgstr "xsettings تەڭشەك باشقۇرغۇ قىستۇرمىسى ئىشلىتىلسە true بولىدۇ." -- --#: ../gui/simple-greeter/gdm-simple-greeter.schemas.in.h:34 --msgid "Use Compiz as the window manager" --msgstr "compiz نى كۆزنەك باشقۇرغۇ قىلىپ ئىشلەت" -- --#: ../gui/simple-greeter/gdm-timer.c:149 -+#: ../gui/simple-greeter/gdm-timer.c:147 - msgid "Duration" - msgstr "ۋاقتى" - --#: ../gui/simple-greeter/gdm-timer.c:150 -+#: ../gui/simple-greeter/gdm-timer.c:148 - msgid "Number of seconds until timer stops" - msgstr "ۋاقىت خاتىرىلىگۈچ توختىغۇچە بولغان سېكۇنت" - --#: ../gui/simple-greeter/gdm-timer.c:157 -+#: ../gui/simple-greeter/gdm-timer.c:155 - msgid "Start time" - msgstr "باشلاش ۋاقتى" - --#: ../gui/simple-greeter/gdm-timer.c:158 -+#: ../gui/simple-greeter/gdm-timer.c:156 - msgid "Time the timer was started" - msgstr "ۋاقىت خاتىرىلىگۈچ باشلىنىدىغان ۋاقىت" - --#: ../gui/simple-greeter/gdm-timer.c:165 -+#: ../gui/simple-greeter/gdm-timer.c:163 - msgid "Is it Running?" - msgstr "ئىجرا بولۇۋاتامدۇ؟" - --#: ../gui/simple-greeter/gdm-timer.c:166 -+#: ../gui/simple-greeter/gdm-timer.c:164 - msgid "Whether the timer is currently ticking" - msgstr "ۋاقىت خاتىرىلىگۈچ ئۆزگىرىۋاتامدۇ يوق" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:459 --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:781 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:458 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:800 - #, c-format - msgid "Log in as %s" - msgstr "%s ئىشلەتكۈچى سۈپىتىدە كىرىدۇ" -@@ -872,261 +786,44 @@ msgstr "%s ئىشلەتكۈچى سۈپىتىدە كىرىدۇ" - #. * manually instead of choosing from - #. * a list. - #. --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:544 - msgctxt "user" - msgid "Other…" - msgstr "باشقا…" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:546 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:545 - msgid "Choose a different account" - msgstr "باشقا ھېساب تاللاڭ" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:559 - msgid "Guest" - msgstr "مېھمان" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:561 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:560 - msgid "Log in as a temporary guest" - msgstr "ۋاقىتلىق مېھمان سۈپىتىدە كىرىدۇ" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:575 - msgid "Automatic Login" - msgstr "ئۆزلۈكىدىن تىزىمغا كىر" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:577 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:576 - msgid "Automatically log into the system after selecting options" - msgstr "تاللانمىلار تاللانغاندىن كېيىن سىستېمىغا ئۆزلۈكىدىن كىرىدۇ" - --#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1321 -+#: ../gui/simple-greeter/gdm-user-chooser-widget.c:1332 - msgid "Currently logged in" - msgstr "كىرىپ بولغان" - --#: ../utils/gdmflexiserver.c:61 --msgid "Only the VERSION command is supported" --msgstr "پەقەت VERSION نىڭ بۇيرۇقىنىلا ئىشلەتكىلى بولىدۇ" -- --#: ../utils/gdmflexiserver.c:61 --msgid "COMMAND" --msgstr "بۇيرۇق" -- --#: ../utils/gdmflexiserver.c:62 ../utils/gdmflexiserver.c:63 --#: ../utils/gdmflexiserver.c:65 ../utils/gdmflexiserver.c:66 --msgid "Ignored — retained for compatibility" --msgstr "پەرۋا قىلمىدى - بىردەكلىكنى ساقلاش ئۈچۈن" -- --#: ../utils/gdmflexiserver.c:64 ../utils/gdm-screenshot.c:43 -+#: ../utils/gdm-screenshot.c:43 - msgid "Debugging output" - msgstr "سازلاشنىڭ چىقىرىلمىسى" - --#: ../utils/gdmflexiserver.c:68 --msgid "Version of this application" --msgstr "بۇ پروگراممىنىڭ نەشرى" -- --#: ../utils/gdmflexiserver.c:675 --#, c-format --msgid "Could not identify the current session." --msgstr "ھازىرقى ئەڭگىمەنى بىلگىلى بولمىدى." -- --#. Option parsing --#: ../utils/gdmflexiserver.c:711 --msgid "- New GDM login" --msgstr "- يېڭى GDM كىرىش" -- --#: ../utils/gdmflexiserver.c:767 --msgid "Unable to start new display" --msgstr "يېڭى ئېكراننى باشلىغىلى بولمىدى" -- - #: ../utils/gdm-screenshot.c:212 - msgid "Screenshot taken" --msgstr "ئېكران كەسمىسى تۇتۇلدى" -+msgstr "ئېكران كۆرۈنۈشى تۇتۇلدى" - - #. Option parsing - #: ../utils/gdm-screenshot.c:279 - msgid "Take a picture of the screen" - msgstr "ئېكراننى رەسىمگە تۇت" -- --#~ msgid "Shutdown Options…" --#~ msgstr "تاقاش تاللانما…" -- --#~ msgid "Keyboard layouts" --#~ msgstr "ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" -- --#~ msgid "_Keyboard:" --#~ msgstr "ھەرپتاختا(_K):" -- --#~ msgctxt "keyboard" --#~ msgid "Other…" --#~ msgstr "باشقا…" -- --#~ msgid "Choose a keyboard layout from the full list of available layouts." --#~ msgstr "ھەرپتاختا تىزىملىكىدىن ھەرپتاختا تاللاڭ." -- --#~ msgid "Keyboard" --#~ msgstr "ھەرپتاختا" -- --#~ msgid "Recently selected keyboard layouts" --#~ msgstr "ئالدىنقى قېتىم تاللانغان ھەرپتاختا ئورۇنلاشتۇرۇلۇشى" -- --#~ msgid "" --#~ "Set to a list of keyboard layouts to be shown by default in the login " --#~ "window." --#~ msgstr "" --#~ "تىزىمغا كىرىش كۆزنىكىدە كۆرسىتىلىدىغان كۆڭۈلدىكى ھەرپتاختا ئورۇنلاشتۇرۇش " --#~ "تەڭشىكى." -- --#~ msgid "" --#~ "The User Switch Applet 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." --#~ msgstr "" --#~ "مەزكۇر ئىشلەتكۈچى ئالماشتۇرۇش قوللانچىقى ھەقسىز دېتالدۇر. سىز ئەركىن " --#~ "يۇمشاق دېتال ۋەخپىسى تارقاتقان GNU ئادەتتىكى ئاممىۋى ئىجازەتنامە بويىچە " --#~ "ئۇنى قايتا تارقىتىپ ياكى ئۆزگەرتەلەيسىز؛ سىز شۇ ئىجازەت كېلىشىمىنىڭ " --#~ "ئىككىنچى نەشرى ياكى يۇقىرى نەشرىنى ئىشلەتسىڭىز بولىدۇ." -- --#~ msgid "" --#~ "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." --#~ msgstr "" --#~ "بۇ پروگراممىنى تارقىتىشتىكى مەقسەت سىزگە قۇلايلىق ئېلىپ كېلىش، ئەمما سودا " --#~ "ياكى باشقا ئالاھىدە قوللىنىشقا نىسبەتەن ھېچقانداق كاپالەت يوق. GNU " --#~ "ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىنى كۆرۈپ تېخىمۇ كۆپ تەپسىلاتقا ئېرىشىڭ." -- --#~ msgid "" --#~ "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., " --#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA " --#~ msgstr "" --#~ "مەزكۇر پروگرامما بىلەن بىرگە GNU ئادەتتىكى ئاممىۋى ئىجازەت كېلىشىمىدىن " --#~ "بىر نۇسخا تاپشۇرۇۋالىسىز؛ ئۇنداق بولمىسا Free Software Foundation, Inc., " --#~ "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA بىلەن ئالاقە " --#~ "قىلىڭ. " -- --#~ msgid "A menu to quickly switch between users." --#~ msgstr "ئىشلەتكۈچىلەرنى تېز ئالماشتۇرۇش ئۈچۈن ئىشلىتىلىدىغان تىزىملىك." -- --#~ msgid "translator-credits" --#~ msgstr "" --#~ "Gheyret Kenji \n" --#~ "Sahran" -- --#~ msgid "Can't lock screen: %s" --#~ msgstr "ئېكراننى قۇلۇپلىغىلى بولمىدى: %s" -- --#~ msgid "Can't temporarily set screensaver to blank screen: %s" --#~ msgstr "" --#~ "ئېكران قوغدىغۇچنى ۋاقىتلىق قۇرۇق ئېكران قىلىپ تەڭشىگىلى بولمىدى: %s" -- --#~ msgid "Can't log out: %s" --#~ msgstr "تىزىمدىن چىقالمىدى: %s" -- --#~ msgid "Available" --#~ msgstr "بار" -- --#~ msgid "Invisible" --#~ msgstr "يوشۇرۇن" -- --#~ msgid "Busy" --#~ msgstr "ئالدىراش" -- --#~ msgid "Away" --#~ msgstr "يوق" -- --#~ msgid "Account Information" --#~ msgstr "ھېساب ئۇچۇرى" -- --#~ msgid "System Preferences" --#~ msgstr "سىستېما مايىللىقى" -- --#~ msgid "Lock Screen" --#~ msgstr "ئېكراننى قۇلۇپلاش" -- --#~ msgid "Switch User" --#~ msgstr "ئىشلەتكۈچى ئالماشتۇرۇش" -- --#~ msgid "Quit…" --#~ msgstr "چېكىن…" -- --#~ msgid "User Switch Applet" --#~ msgstr "ئىشلەتكۈچى ئالماشتۇرۇش قوللانچاق پروگراممىسى" -- --#~ msgid "Change account settings and status" --#~ msgstr "ھېساب تەڭشەكلىرى ۋە ھالەتنى ئۆزگەرت" -- --#~ msgid "A menu to quickly switch between users" --#~ msgstr "ئىشلەتكۈچىلەرنى چاپسان ئالماشتۇرۇش تىزىملىكى" -- --#~ msgid "User Switcher" --#~ msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ" -- --#~ msgid "User Switcher Applet Factory" --#~ msgstr "ئىشلەتكۈچى ئالماشتۇرغۇ قوللانچاق زاۋۇتى" -- --#~ msgid "Edit Personal _Information" --#~ msgstr "شەخسىي ئۇچۇرلارنى تەھرىرلە(_I)" -- --#~ msgid "_About" --#~ msgstr "ھەققىدە(_A)" -- --#~ msgid "_Edit Users and Groups" --#~ msgstr "ئىشلەتكۈچى ۋە گۇرۇپپا تەھرىرلە(_E)" -- --#~ msgid "Unknown" --#~ msgstr "نامەلۇم" -- --#~ msgid "Quit..." --#~ msgstr "چېكىن..." -- --#~ msgid "Couldn't set groupid to 0" --#~ msgstr "گۇرۇپپا ID سىنى 0 گە تەڭشىگىلى بولمىدى" -- --#~ msgid "name" --#~ msgstr "ئاتى" -- --#~ msgid "Change login screen configuration" --#~ msgstr "كىرىش ئېكرانىنىڭ تەڭشىكىنى ئۆزگەرت" -- --#~ msgid "Privileges are required to change the login screen configuration." --#~ msgstr "كىرىش ئېكرانىنىڭ تەڭشىكىنى ئۆزگەرتىش ئۈچۈن ئىمتىياز بولۇشى كېرەك." -- --#~ msgid "Configure login screen behavior" --#~ msgstr "كىرىش ئېكرانىنىڭ ئىش-ھەرىكەتلىرىنى تەڭشە" -- --#~ msgid "Login Screen" --#~ msgstr "كىرىش ئېكرانى" -- --#~ msgid "Log in as %s automatically" --#~ msgstr "ئىشلەتكۈچى %s ئۆزلۈكىدىن كىرسۇن" -- --#~ msgid "Allow %s seconds for anyone else to log in first" --#~ msgstr "باشقىلارنىڭ ئالدىن كىرىۋېلىشى ئۈچۈن %s سېكۇنت ساقلىسۇن" -- --#~ msgid "Select %s as default session" --#~ msgstr "%s كۆڭۈلدىكى ئەڭگىمە بولسۇن" -- --#~ msgid "Login Screen Settings" --#~ msgstr "كىرىش ئېكرانى تەڭشىكى" -- --#~ msgid "Play login sound" --#~ msgstr "ئۈن چالسۇن" -- --#~ msgid "Show list of users" --#~ msgstr "ئىشلەتكۈچى تىزىملىكىنى كۆرسەت" -- --#~ msgid "When the computer starts up:" --#~ msgstr "كومپيۇتېر قوزغالغاندا: " -- --#~ msgid "_Show the screen for choosing who will log in" --#~ msgstr "كىرىدىغان ئىشلەتكۈچىلەرنى تاللاش ئېكرانىنى كۆرسەتسۇن(_S)" -- --#~ msgid "%x" --#~ msgstr "%x" -- --#~ msgid "Manager" --#~ msgstr "باشقۇرغۇ" -- --#~ msgid "The user manager this user is controlled by." --#~ msgstr "بۇ ئىشلەتكۈچىنى باشقۇرۇۋاتقان ئىشلەتكۈچى باشقۇرغۇ جىسمى" diff --git a/extra/gdm/maintain-FamilyLocal-cookie.patch b/extra/gdm/maintain-FamilyLocal-cookie.patch deleted file mode 100644 index 446c88860..000000000 --- a/extra/gdm/maintain-FamilyLocal-cookie.patch +++ /dev/null @@ -1,124 +0,0 @@ -From 6bc39aa208dbd8105232ae62255c42fafdec0541 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Thu, 20 Dec 2012 16:07:09 +0000 -Subject: display-access-file: maintain FamilyLocal entry for backward compatibility - -commit 0fccf4e0671e49f6e57d0135c97344973c042b23 swapped out the -FamilyLocal auth cookie for a FamilyWild auth cookie, because the -latter is more resilient to hostname changes. Unfortunately, -not all of the tooling accepts FamilyWild cookies (in particular the -xauth command), so things like su broke. - -This commit changes the code to have a FamilyWild and FamilyLocal -cookie. - -https://bugzilla.gnome.org/show_bug.cgi?id=690562 ---- -diff --git a/daemon/gdm-display-access-file.c b/daemon/gdm-display-access-file.c -index 02bd414..02ec0a0 100644 ---- a/daemon/gdm-display-access-file.c -+++ b/daemon/gdm-display-access-file.c -@@ -438,8 +438,18 @@ _get_auth_info_for_display (GdmDisplayAccessFile *file, - gdm_display_is_local (display, &is_local, NULL); - - if (is_local) { -- *family = FamilyWild; -- *address = g_strdup ("localhost"); -+ /* We could just use FamilyWild here except xauth -+ * (and by extension su and ssh) doesn't support it yet -+ * -+ * https://bugs.freedesktop.org/show_bug.cgi?id=43425 -+ */ -+ char localhost[HOST_NAME_MAX + 1] = ""; -+ *family = FamilyLocal; -+ if (gethostname (localhost, HOST_NAME_MAX) == 0) { -+ *address = g_strdup (localhost); -+ } else { -+ *address = g_strdup ("localhost"); -+ } - } else { - *family = FamilyWild; - gdm_display_get_remote_hostname (display, address, NULL); -@@ -533,6 +543,18 @@ gdm_display_access_file_add_display_with_cookie (GdmDisplayAccessFile *file, - display_added = TRUE; - } - -+ /* If we wrote a FamilyLocal entry, we still want a FamilyWild -+ * entry, because it's more resiliant against hostname changes -+ * -+ */ -+ if (auth_entry.family == FamilyLocal) { -+ auth_entry.family = FamilyWild; -+ -+ if (XauWriteAuth (file->priv->fp, &auth_entry) -+ && fflush (file->priv->fp) != EOF) { -+ display_added = TRUE; -+ } -+ } - - g_free (auth_entry.address); - g_free (auth_entry.number); -@@ -555,6 +577,7 @@ gdm_display_access_file_remove_display (GdmDisplayAccessFile *file, - unsigned short name_length; - char *name; - -+ gboolean result = FALSE; - - g_return_val_if_fail (file != NULL, FALSE); - g_return_val_if_fail (file->priv->path != NULL, FALSE); -@@ -579,25 +602,44 @@ gdm_display_access_file_remove_display (GdmDisplayAccessFile *file, - g_free (number); - g_free (name); - -- if (auth_entry == NULL) { -+ if (auth_entry != NULL) { -+ XauDisposeAuth (auth_entry); -+ result = TRUE; -+ } -+ -+ /* If FamilyLocal, we also added a FamilyWild entry, -+ * so we need to clean that up too -+ */ -+ if (family == FamilyLocal) { -+ auth_entry = XauGetAuthByAddr (FamilyWild, -+ address_length, -+ address, -+ number_length, -+ number, -+ name_length, -+ name); -+ -+ if (auth_entry != NULL) { -+ XauDisposeAuth (auth_entry); -+ result = TRUE; -+ } -+ } -+ -+ -+ if (result == FALSE) { - g_set_error (error, - GDM_DISPLAY_ACCESS_FILE_ERROR, - GDM_DISPLAY_ACCESS_FILE_ERROR_FINDING_AUTH_ENTRY, - "could not find authorization entry"); -- return FALSE; -- } -- -- XauDisposeAuth (auth_entry); -- -- if (fflush (file->priv->fp) == EOF) { -+ } else if (fflush (file->priv->fp) == EOF) { - g_set_error (error, - G_FILE_ERROR, - g_file_error_from_errno (errno), - "%s", g_strerror (errno)); -- return FALSE; -+ result = FALSE; - } - -- return TRUE; -+ return result; - } - - void --- -cgit v0.9.0.2 diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 1d623fbb8..1bb570b66 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 173080 2012-12-10 11:56:21Z jgc $ +# $Id: PKGBUILD 183363 2013-04-21 22:09:19Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gedit -pkgver=3.6.2 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 pkgdesc="A text editor for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gtksourceview3' 'gsettings-desktop-schemas' 'libpeas' 'enchant' 'iso-codes' 'libsm' 'desktop-file-utils' 'python2-gobject' 'dconf') -makedepends=('yelp-tools' 'intltool' 'libzeitgeist') -optdepends=('libzeitgeist: Zeitgeist plugin') -groups=('gnome-extra') +arch=(i686 x86_64) +license=(GPL) +depends=(gtksourceview3 gsettings-desktop-schemas libpeas enchant iso-codes libsm desktop-file-utils python-gobject dconf) +makedepends=(yelp-tools intltool 'zeitgeist>=0.9.12') +optdepends=('zeitgeist: Zeitgeist plugin') +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=('ad4c6837a7e844e000f7cf2c248e636febdcc9b9b9559cf9e27b99392f5735c3') +sha256sums=('9e0b8a831c6d6d2b82a8f42a0e01ab1f3398fed2cca0b65d0a105d134a5c4dce') build() { cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib --disable-updater --disable-schemas-compile \ --enable-python diff --git a/extra/ghex/PKGBUILD b/extra/ghex/PKGBUILD index 39b1636c2..4efe3c207 100644 --- a/extra/ghex/PKGBUILD +++ b/extra/ghex/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 169880 2012-10-30 22:25:50Z heftig $ -# Maintainer: tobias +# $Id: PKGBUILD 183364 2013-04-21 22:09:21Z heftig $ +# Maintainer: Jan de Groot # Contributor: Tobias Kieslich pkgname=ghex -pkgver=3.6.1 +pkgver=3.8.0 pkgrel=1 pkgdesc="A simple binary editor for the Gnome desktop" arch=('i686' 'x86_64') license=('GPL') url="http://live.gnome.org/Ghex" depends=('gtk3' 'hicolor-icon-theme') -makedepends=('intltool' 'gnome-doc-utils') +makedepends=('intltool' 'itstool' 'docbook-xsl') options=('!libtool' '!emptydirs') install=ghex.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('ef74fc5a5a67736391b3fb7fb14f588f3a4441b1aa48d1a6eaa1adb6c0427544') +sha256sums=('40b08fff065575e91f161904952aaa14919ffe053f3849c47ab567ac93a4d3fc') build() { cd $pkgname-$pkgver diff --git a/extra/gjs/PKGBUILD b/extra/gjs/PKGBUILD index 06c66a70d..198d47e91 100644 --- a/extra/gjs/PKGBUILD +++ b/extra/gjs/PKGBUILD @@ -1,26 +1,30 @@ -# $Id: PKGBUILD 169881 2012-10-30 22:25:52Z heftig $ +# $Id: PKGBUILD 183533 2013-04-22 15:40:22Z heftig $ # Maintainer: Ionut Biru pkgname=gjs -pkgver=1.34.0 +pkgver=1.36.1 pkgrel=1 pkgdesc="Javascript Bindings for GNOME" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://live.gnome.org/Gjs" -license=('GPL') -depends=('cairo' 'dbus-glib' 'gobject-introspection' 'js') +license=(GPL) +depends=(cairo gobject-introspection 'js>=17.0.0') options=('!libtool') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3d62c717a0522a36c6faa1eb021872255e3cd285a72786afe23b7cca2e3084cb') +source=(http://people.gnome.org/~walters/$pkgname-js17-$pkgver.tar.bz2) +sha256sums=('5826f74fcf20750538f74e2b0059f392eb139996b80b70ca217f5f7a0d117e27') build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|python|python2|' scripts/make-tests + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-static make } +check() { + cd $pkgname-$pkgver + make check +} + package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 449a5b84d..e8a69f53d 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 172080 2012-11-27 16:33:29Z jgc $ +# $Id: PKGBUILD 183366 2013-04-21 22:09:24Z heftig $ # Maintainer: Douglas Soares de Andrade pkgname=glade -pkgver=3.14.2 +pkgver=3.15.0 pkgrel=1 pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64) license=('GPL' 'LGPL') depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl') +makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'python2-gobject' 'itstool' 'docbook-xsl') optdepends=('python2: Python widgets support' 'devhelp: help browser') 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=('d2e6b5a20cfdbc0a5ed49122ac7b4e3a10ba140ccfcaba60082e6e2b52a62ac6') +sha256sums=('4e64f33d8a5ad614279dc7024ed70fe57805526e82244001a33351b1cf13f95c') build() { cd "$pkgname-$pkgver" diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD index e3a528d2f..9a1545a0c 100644 --- a/extra/glib-networking/PKGBUILD +++ b/extra/glib-networking/PKGBUILD @@ -1,30 +1,29 @@ -# $Id: PKGBUILD 170891 2012-11-12 22:12:18Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 183367 2013-04-21 22:09:26Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) pkgname=glib-networking -pkgver=2.34.2 +pkgver=2.36.1 pkgrel=1 pkgdesc="Network-related giomodules for glib" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libproxy' 'gnutls' 'ca-certificates' 'gsettings-desktop-schemas') -makedepends=('intltool') +license=(GPL2) +depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas) +makedepends=(intltool) options=('!libtool') install=glib-networking.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde') +sha256sums=('e2df2d1943a6193ca471addc58539895da1ae96fdba305dedb937ef56adb57ea') build() { - cd "$pkgname-$pkgver" - ./configure \ - --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/glib-networking --disable-static + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/$pkgname --disable-static make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/glib-perl/PKGBUILD b/extra/glib-perl/PKGBUILD index 0f92ef23f..352cff1c5 100644 --- a/extra/glib-perl/PKGBUILD +++ b/extra/glib-perl/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 160471 2012-06-02 10:25:59Z bluewind $ +# $Id: PKGBUILD 183484 2013-04-21 22:21:04Z heftig $ # Maintainer: Jan de Groot # Contributor: Sarah Hay pkgname=glib-perl -pkgver=1.260 +pkgver=1.280 pkgrel=1 pkgdesc="Perl wrappers for glib 2.x, including GObject" arch=(i686 x86_64) license=('LGPL') url="http://gtk2-perl.sourceforge.net/" options=('!emptydirs') -depends=('glib2>=2.24.1' 'perl>=5.14') -makedepends=('perl-extutils-depends>=0.302' 'perl-extutils-pkgconfig>=1.12') +depends=('glib2' 'perl') +makedepends=('perl-extutils-depends' 'perl-extutils-pkgconfig') source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Glib-${pkgver}.tar.gz) -md5sums=('faa052bdf6e9b87ea30b630c2806e71e') +md5sums=('1d81a8aec5f7f1182a96cfaaf119d866') build() { cd "${srcdir}/Glib-${pkgver}" diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 725d2e28c..e2ca9c3fc 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170205 2012-11-05 11:32:48Z jgc $ +# $Id: PKGBUILD 183316 2013-04-21 22:06:34Z heftig $ # Maintainer: Jan de Groot # Contributor: Tom Newsom pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.34.1 +pkgver=2.36.0 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ 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=('b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4') +sha256sums=('59c54996cccc527f3a257964e7226151175c423f6fb22166e81d65a652f483f3') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD index 3a1bb3828..052ba4a6e 100644 --- a/extra/gnome-bluetooth/PKGBUILD +++ b/extra/gnome-bluetooth/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 171034 2012-11-15 17:49:18Z ibiru $ +# $Id: PKGBUILD 183369 2013-04-21 22:09:32Z heftig $ # Maintainer: Ionut Biru # Contributor: Roman Kyrylych pkgname=gnome-bluetooth -pkgver=3.6.1 +pkgver=3.8.0 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeBluetooth" license=('GPL' 'LGPL') -depends=('gtk3' 'hicolor-icon-theme' 'gvfs-obexftp' 'obexd-client' 'dconf' 'libnotify') -makedepends=('intltool' 'nautilus-sendto' 'gobject-introspection' 'itstool' 'docbook-xsl') +depends=('gtk3' 'hicolor-icon-theme' 'libnotify') +makedepends=('intltool' 'gobject-introspection' 'itstool' 'docbook-xsl') options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('71d72a4637916450987f69c71d374c5bc1102be6dd9d9d7f923aa924659f768a' +sha256sums=('70f275922f10ac9f40eb7d57f89193502ee490894b5b721d0f6273432fc97f82' '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53') build() { diff --git a/extra/gnome-bluetooth/gnome-bluetooth.install b/extra/gnome-bluetooth/gnome-bluetooth.install index 8c991877f..d59dca6e8 100644 --- a/extra/gnome-bluetooth/gnome-bluetooth.install +++ b/extra/gnome-bluetooth/gnome-bluetooth.install @@ -1,5 +1,4 @@ post_install() { - 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-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD new file mode 100644 index 000000000..91bb8f9b3 --- /dev/null +++ b/extra/gnome-calculator/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183370 2013-04-21 22:09:37Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-calculator +pkgver=3.8.1 +pkgrel=1 +pkgdesc="GNOME Scientific calculator" +arch=('i686' 'x86_64') +license=('GPL') +depends=('gtk3' 'dconf') +makedepends=('intltool' 'yelp-tools' 'vala') +groups=('gnome') +replaces=('gcalctool') +conflicts=('gcalctool') +options=(!emptydirs) +url="http://www.gnome.org" +install=gnome-calculator.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('24ae856c90a3df62c52dc413ceb2c9bad15e7ad146de0469b53c70681a4ad435') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --disable-schemas-compile \ + --localstatedir=/var + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="${pkgdir}" install +} diff --git a/extra/gnome-calculator/gnome-calculator.install b/extra/gnome-calculator/gnome-calculator.install new file mode 100644 index 000000000..2ef26aaa9 --- /dev/null +++ b/extra/gnome-calculator/gnome-calculator.install @@ -0,0 +1,11 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD new file mode 100644 index 000000000..60ab99397 --- /dev/null +++ b/extra/gnome-chess/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183371 2013-04-21 22:09:39Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-chess +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Play the classic two-player boardgame of chess" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'sqlite') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=gnome-chess.install +url="https://live.gnome.org/Chess" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('f8a756d0e532ee9532745257bcb3514b3e75a0e2fa7e75b7358b59cdaf3a7661') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-chess/gnome-chess.install b/extra/gnome-chess/gnome-chess.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/gnome-chess/gnome-chess.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-clocks/PKGBUILD b/extra/gnome-clocks/PKGBUILD new file mode 100644 index 000000000..0bbce5dfa --- /dev/null +++ b/extra/gnome-clocks/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 183372 2013-04-21 22:09:40Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-clocks +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Clocks applications for GNOME" +arch=(i686 x86_64) +url="https://www.gnome.org/" +license=(GPL) +depends=(gtk3 libcanberra libgweather gnome-desktop libnotify + hicolor-icon-theme gnome-themes-standard) +makedepends=(intltool vala gobject-introspection) +options=(!libtool) +groups=(gnome-extra) +install=gnome-clocks.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz + gnome-clocks.css::http://git.gnome.org/browse/gnome-clocks/plain/data/css/gnome-clocks.css?id=${pkgver} + button-border-go.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go.svg?id=${pkgver} + button-border-go-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-go-active.svg?id=${pkgver} + button-border-stop.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop.svg?id=${pkgver} + button-border-stop-active.svg::http://git.gnome.org/browse/gnome-clocks/plain/data/css/button-border-stop-active.svg?id=${pkgver}) +sha256sums=('6140cc1ae41460c5fc799b2a52d809ed4cf9035a72be7e878160b5e591486d31' + '3ce4afb848ea2a2728c53a9f4bfca5f12d9719e3935d1acd2d90056cb1c464fc' + 'a44df652c8034ccbbc87a62f92ab6efbf6dfabead44e3316b4b9e85d851a6b24' + 'e12ac57acaa43b25a36d9fd9b6dbe906980a5e8429840d98c604bf28515749e0' + 'e71fa928cf5812fb1cc4ea62e55176be14716b670c37c7899368b0f8f020876c' + '34916c190c259788bcb561f0b4cce73b47a39e50326e1a53a2a91c2725e9d8a3') + +build() { + cd $pkgname-$pkgver + + # Fix files missing from tarball + mkdir data/css + cp ../*.{css,svg} data/css + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-clocks/gnome-clocks.install b/extra/gnome-clocks/gnome-clocks.install new file mode 100644 index 000000000..b85f1cb47 --- /dev/null +++ b/extra/gnome-clocks/gnome-clocks.install @@ -0,0 +1,13 @@ +post_install() { + 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/HighContrast +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-color-manager/PKGBUILD b/extra/gnome-color-manager/PKGBUILD index 2d19242a4..65c875e02 100644 --- a/extra/gnome-color-manager/PKGBUILD +++ b/extra/gnome-color-manager/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 175200 2013-01-16 13:44:28Z jgc $ +# $Id: PKGBUILD 183373 2013-04-21 22:09:42Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-color-manager -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="Color profile manager for the GNOME desktop" arch=(i686 x86_64) 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' 'gnome-desktop' 'colord-gtk' 'libexif') -makedepends=('intltool' 'yelp-tools') +depends=(libcanberra vte3 exiv2 hicolor-icon-theme desktop-file-utils clutter-gtk + mash shared-color-profiles shared-color-targets gnome-desktop colord-gtk libexif) +makedepends=(intltool yelp-tools) 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=('c5fb0903d5570c50fbb2347db2222314bef0c57b293302e48e0b73f57f426fb7') +sha256sums=('61851022ccfa090f21ce027c36cd440597648401aafa2c8b3d3f7787a866bb49') build(){ cd $pkgname-$pkgver diff --git a/extra/gnome-contacts/PKGBUILD b/extra/gnome-contacts/PKGBUILD index 865985478..abe4ece2e 100644 --- a/extra/gnome-contacts/PKGBUILD +++ b/extra/gnome-contacts/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 170834 2012-11-12 13:27:20Z heftig $ +# $Id: PKGBUILD 183374 2013-04-21 22:09:43Z heftig $ # Maintainer: Ionut Biru pkgname=gnome-contacts -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="Contacts Manager for GNOME" arch=(i686 x86_64) url="http://www.gnome.org" license=('GPL2') -groups=(gnome-extra) +groups=(gnome) depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese') -makedepends=('intltool' 'vala') +makedepends=('intltool' 'vala' 'gobject-introspection') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7d1b6a8e395b15bf150062f332348549cf9deb38dfa3aad9994f70e71d8449fa') +sha256sums=('c9b2ffba754f4e1e37788195c814b12dfbf79b35042cd811b8690f890572edcb') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index ffd0a2d26..1e7d79a2e 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,38 +1,34 @@ -# $Id: PKGBUILD 178089 2013-02-15 23:34:30Z heftig $ +# $Id: PKGBUILD 183375 2013-04-21 22:09:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-control-center -pkgver=3.6.3 -pkgrel=4 +pkgver=3.8.1 +pkgrel=1 pkgdesc="The Control Center for GNOME" -arch=('i686' 'x86_64') -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' 'libpwquality' 'libsystemd') -optdepends=('mesa-demos: provides glxinfo for graphics information' - 'gnome-color-manager: for color management tasks') -makedepends=('gnome-doc-utils' 'intltool' 'docbook-xsl') +license=(GPL) +arch=(i686 x86_64) +depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop gnome-menus + gnome-online-accounts gnome-settings-daemon gsettings-desktop-schemas gtk3 + libgtop network-manager-applet sound-theme-freedesktop upower libpwquality + gnome-color-manager smbclient modemmanager) +makedepends=(gnome-doc-utils intltool docbook-xsl) +optdepends=('gnome-user-share: Bluetooth and WebDAV file sharing' + 'rygel: media sharing' + 'vino: screen sharing' + 'openssh: remote login') +groups=(gnome) url="http://www.gnome.org" -groups=('gnome') install=gnome-control-center.install -license=('GPL') options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - pulse3.0.patch) -sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb' - '27f1d518df91ad9687e3e217023d83726c0d44f65b30942e79106e4aad53c916') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('07d7d8e08af6a9ef01754814ecf2d006c58b94a096f0c6ad549c9d0051e4e57a') build() { cd $pkgname-$pkgver - patch -Np1 -i ../pulse3.0.patch - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static \ - --enable-systemd --with-libsocialweb \ - --disable-update-mimedb \ - --without-cheese + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static #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 diff --git a/extra/gnome-control-center/pulse3.0.patch b/extra/gnome-control-center/pulse3.0.patch deleted file mode 100644 index 203547940..000000000 --- a/extra/gnome-control-center/pulse3.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001 -From: David Henningsson -Date: Fri, 07 Dec 2012 10:52:09 +0000 -Subject: sound: Fix port handling for the unknown availability case - -The current code assumes that port availability transitions will be -between YES and NO, and doesn't account for the fact that it may also be -UNKNOWN. This causes spurious entries if the port availability -transitions between YES and UNKNOWN. ---- -diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c -index 34ddc0c..2f6cf34 100644 ---- a/panels/sound/gvc-mixer-control.c -+++ b/panels/sound/gvc-mixer-control.c -@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control, - else { - for (i = 0; i < info->n_ports; i++) { - if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) { -- if (card_port->available != info->ports[i]->available) { -+ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) { - card_port->available = info->ports[i]->available; - g_debug ("sync port availability on card %i, card port name '%s', new available value %i", - gvc_mixer_card_get_index (card), --- -cgit v0.9.0.2 diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD index 116b2fd1c..87ca2b332 100644 --- a/extra/gnome-desktop/PKGBUILD +++ b/extra/gnome-desktop/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 170920 2012-11-13 02:08:44Z heftig $ +# $Id: PKGBUILD 183376 2013-04-21 22:09:47Z heftig $ # Maintainer: Jan de Groot pkgname=gnome-desktop -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 epoch=1 pkgdesc="Library with common API for various GNOME modules" arch=('i686' 'x86_64') license=('GPL' 'LGPL') -depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config') -makedepends=('gnome-doc-utils' 'intltool' 'gobject-introspection' 'itstool') +depends=('gsettings-desktop-schemas' 'gtk3' 'xkeyboard-config' 'iso-codes') +makedepends=('intltool' 'gobject-introspection' 'itstool') url="http://www.gnome.org" groups=('gnome') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('ef15cc0b34a8360fd48ceeb833515790db4de38e6945fb3661f178dc7df70236') +sha256sums=('79c4790fdfc58a54ee32b2fd20f498f4d563d11fa40ab6599c757e45bee5b13f') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-dictionary/PKGBUILD b/extra/gnome-dictionary/PKGBUILD index 90267e0be..cb0b1e043 100644 --- a/extra/gnome-dictionary/PKGBUILD +++ b/extra/gnome-dictionary/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169894 2012-10-30 22:33:54Z heftig $ +# $Id: PKGBUILD 183378 2013-04-21 22:09:49Z heftig $ # Maintainer: Ionut Biru pkgname=gnome-dictionary pkgver=3.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Look up words in dictionary sources" arch=(i686 x86_64) url="http://gnome.org" @@ -11,7 +11,7 @@ depends=('dconf' 'gtk3') makedepends=('intltool' 'itstool' 'docbook-xsl') install=$pkgname.install options=(!libtool) -groups=('gnome-extra') +groups=('gnome') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('1ad03f629bbfe4360fc6d8dd2d7cb4a03e24579068bdd79a25ff5fc5fbff6fa9') diff --git a/extra/gnome-disk-utility/PKGBUILD b/extra/gnome-disk-utility/PKGBUILD index 417a2c196..539c077fa 100644 --- a/extra/gnome-disk-utility/PKGBUILD +++ b/extra/gnome-disk-utility/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 169895 2012-10-30 22:34:01Z heftig $ +# $Id: PKGBUILD 183379 2013-04-21 22:09:51Z heftig $ # Maintainer: Jan de Groot # Contributor: Silvio Knizek (killermoehre) pkgname=gnome-disk-utility -pkgver=3.6.1 -pkgrel=1 +pkgver=3.8.0 +pkgrel=2 pkgdesc="Disk Management Utility for GNOME" -arch=('i686' 'x86_64') -license=('GPL') +arch=(i686 x86_64) +license=(GPL) url="http://www.gnome.org" -groups=('gnome-extra') -depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils') -makedepends=('intltool' 'docbook-xsl') +groups=(gnome) +depends=(udisks2 gtk3 libsecret libpwquality libcanberra libdvdread libnotify hicolor-icon-theme desktop-file-utils) +makedepends=(intltool docbook-xsl gnome-settings-daemon) options=('!libtool' '!emptydirs') install=gnome-disk-utility.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e848bd0a5787a654e3421c904718c587e1a953fc1b43a21401ca65b329988c32') +sha256sums=('2657aad8d06e5511bc34ee5ec1ff9426f70b7140b8687be528f693175759bd5e') build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc - + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --disable-static make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index 5094c3c34..0fd9877fe 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 170912 2012-11-12 22:48:08Z heftig $ +# $Id: PKGBUILD 183380 2013-04-21 22:09:52Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-documents -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64) url="http://www.gnome.org" -license=('GPL') -groups=('gnome-extra') -depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' - 'tracker' 'libzapojit') -makedepends=('intltool') +license=(GPL) +groups=(gnome-extra) +depends=(evince gjs gtk3 gnome-desktop gnome-online-accounts libgdata + tracker libzapojit webkitgtk3) +makedepends=(intltool gobject-introspection itstool) optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b2b548685c1074cf222a21d747e6daa8f339815219616b12bb4d2e447e2a34c2') +sha256sums=('7cd05f5f2482ddae797300b233f499cbe410cb22d358bef37a387aff232d4e9f') build() { cd $pkgname-$pkgver @@ -24,10 +24,16 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-documents + --libexecdir=/usr/lib/$pkgname make } + +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/gnome-font-viewer/PKGBUILD b/extra/gnome-font-viewer/PKGBUILD index 1ff633fd0..82392d280 100644 --- a/extra/gnome-font-viewer/PKGBUILD +++ b/extra/gnome-font-viewer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172919 2012-12-06 20:22:06Z heftig $ +# $Id: PKGBUILD 183381 2013-04-21 22:09:54Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-font-viewer -pkgver=3.6.2 +pkgver=3.8.0 pkgrel=1 pkgdesc="GNOME font viewer and thumbnailer" arch=(i686 x86_64) @@ -11,10 +11,10 @@ depends=('gtk3' 'desktop-file-utils' 'gnome-desktop') makedepends=('intltool') options=('!libtool' '!emptydirs') url="http://www.gnome.org" -groups=('gnome-extra') +groups=('gnome') install=gnome-font-viewer.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('216a1f1a54cf662533b7a793b250bb01bafb98319bfdbe814f66be54fbefe145') +sha256sums=('d34f17f026b7c41d8de5c255070c79c938ce69030b3429444e7fb8f2275ff819') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-games/PKGBUILD b/extra/gnome-games/PKGBUILD deleted file mode 100644 index 05f251d49..000000000 --- a/extra/gnome-games/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 169898 2012-10-30 22:34:10Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) -# Contributor: Jan de Groot - -pkgname=gnome-games -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Some Games for GNOME" -arch=('i686' 'x86_64') -license=('GPL') -depends=('desktop-file-utils' 'glu' '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:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('f016068350ca2a4deceeac0374d5372610b1da07e2c4b356470f3401e6e2a43d') - -build() { - cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static --disable-schemas-compile \ - --with-scores-user=root --with-scores-group=games \ - --enable-introspection=yes - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # Remove all scores, we generate them from postinstall - rm -rf "$pkgdir/var" - - 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 deleted file mode 100644 index 2fad5db0b..000000000 --- a/extra/gnome-games/gnome-games.install +++ /dev/null @@ -1,122 +0,0 @@ -_scores=(glines.Small.scores - glines.Medium.scores - glines.Large.scores - gnibbles.4.0.scores - gnibbles.3.0.scores - gnibbles.2.0.scores - gnibbles.1.0.scores - gnibbles.4.1.scores - gnibbles.3.1.scores - gnibbles.2.1.scores - gnibbles.1.1.scores - gnobots2.robots2.scores - gnobots2.robots2-safe.scores - gnobots2.robots2-super-safe.scores - gnobots2.robots2_easy.scores - gnobots2.robots2_easy-safe.scores - gnobots2.robots2_easy-super-safe.scores - gnobots2.classic_robots.scores - gnobots2.classic_robots-safe.scores - gnobots2.classic_robots-super-safe.scores - gnobots2.robots_with_safe_teleport.scores - gnobots2.robots_with_safe_teleport-safe.scores - gnobots2.robots_with_safe_teleport-super-safe.scores - gnobots2.nightmare.scores - gnobots2.nightmare-safe.scores - gnobots2.nightmare-super-safe.scores - gnomine.Small.scores - gnomine.Medium.scores - gnomine.Large.scores - gnomine.Custom.scores - gnotravex.2x2.scores - gnotravex.3x3.scores - gnotravex.4x4.scores - gnotravex.5x5.scores - gnotravex.6x6.scores - gnotski.1.scores - gnotski.2.scores - gnotski.3.scores - gnotski.4.scores - gnotski.5.scores - gnotski.6.scores - gnotski.7.scores - gnotski.8.scores - gnotski.9.scores - gnotski.10.scores - gnotski.11.scores - gnotski.12.scores - gnotski.13.scores - gnotski.14.scores - gnotski.15.scores - gnotski.16.scores - gnotski.17.scores - gnotski.18.scores - gnotski.19.scores - gnotski.20.scores - gnotski.21.scores - gnotski.22.scores - gnotski.23.scores - gnotski.24.scores - gnotski.25.scores - gnotski.26.scores - gnotski.27.scores - gnotski.28.scores - gnotski.29.scores - gnotski.30.scores - gnotski.31.scores - gnotski.32.scores - gnotski.33.scores - gnotski.34.scores - gnotski.35.scores - gnotski.36.scores - gnotski.37.scores - gtali.Regular.scores - gtali.Colors.scores - gnome-mahjongg.easy.scores - gnome-mahjongg.difficult.scores - gnome-mahjongg.confounding.scores - gnome-mahjongg.pyramid.scores - gnome-mahjongg.tictactoe.scores - gnome-mahjongg.cloud.scores - gnome-mahjongg.dragon.scores - gnome-mahjongg.bridges.scores - gnome-mahjongg.ziggurat.scores - quadrapassel.scores - swell-foop.small.scores - swell-foop.normal.scores - swell-foop.large.scores) - -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 - - for score in "${_scores[@]}" ; do - if [ -e "var/games/$score" ]; then - continue - fi - - touch "var/games/$score" - chown root:games "var/games/$score" - chmod 664 "var/games/$score" - done -} - -pre_upgrade() { - (( $(vercmp $2 3.3.5) < 0 )) && gconfpkg --uninstall gnome-games - return 0 -} - -post_upgrade() { - post_install -} - -post_remove() { - 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" - done -} diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD index 2ddf1da9a..0a4c04796 100644 --- a/extra/gnome-keyring/PKGBUILD +++ b/extra/gnome-keyring/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 178926 2013-02-28 19:25:14Z ioni $ +#$Id: PKGBUILD 183385 2013-04-21 22:10:00Z heftig $ # Maintainer: Jan De Groot pkgname=gnome-keyring -pkgver=3.6.3 +pkgver=3.8.1 pkgrel=1 pkgdesc="GNOME Password Management daemon" arch=(i686 x86_64) @@ -14,7 +14,7 @@ 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) -sha256sums=('e0153a3f16a25e943237e6242054870802815e0f694c5a4cd808ee72f6014151') +sha256sums=('56e0a47c021fb2d2fd2c723a0e1c9e46c9a0a81ed865ac1588c19aca16ca4f37') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-klotski/PKGBUILD b/extra/gnome-klotski/PKGBUILD new file mode 100644 index 000000000..14a69ab5d --- /dev/null +++ b/extra/gnome-klotski/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183386 2013-04-21 22:10:02Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-klotski +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Slide blocks to solve the puzzle" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=gnome-klotski.install +url="https://live.gnome.org/Klotski" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('85b2936dc9390bb09d622984b169c0d921b99d786fbd0060d39d319c38d31c71') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-klotski/gnome-klotski.install b/extra/gnome-klotski/gnome-klotski.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/gnome-klotski/gnome-klotski.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD new file mode 100644 index 000000000..c3d79b652 --- /dev/null +++ b/extra/gnome-mahjongg/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-mahjongg +pkgver=3.8.0 +pkgrel=1 +pkgdesc="Disassemble a pile of tiles by removing matching pairs" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=gnome-mahjongg.install +url="https://live.gnome.org/Mahjongg" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6995bfae4c145f07764a7825865804232e620bbdf57c0625d0a21d06561ad496') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-mahjongg/gnome-mahjongg.install b/extra/gnome-mahjongg/gnome-mahjongg.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/gnome-mahjongg/gnome-mahjongg.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-menus/PKGBUILD b/extra/gnome-menus/PKGBUILD index 09763771a..482a14cce 100644 --- a/extra/gnome-menus/PKGBUILD +++ b/extra/gnome-menus/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 175187 2013-01-16 10:52:05Z jgc $ +# $Id: PKGBUILD 183388 2013-04-21 22:10:05Z heftig $ # Maintainer: Jan de Groot pkgname=gnome-menus -pkgver=3.6.2 -pkgrel=1 +pkgver=3.8.0 +pkgrel=2 pkgdesc="GNOME menu specifications" arch=('i686' 'x86_64') -depends=('glib2' 'python2-gobject') +depends=('glib2') makedepends=('intltool' 'gobject-introspection') options=('!libtool') license=('GPL' 'LGPL') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - menus.patch) -sha256sums=('f6cefb25ce3ca2a0e4cb43894089cc6079bf948230e99bc0e244b380fa84bf4f' - 'df2779777906b038fa911dc745534564ede9524a64ab368e2f6f8e38d54e7acc') + calculator.patch) +sha256sums=('33c215ae8d815f4a94d2dbfc8c6679fddbbf8026d30da55a350e67ea940ce14f' + 'e2b17562cd48794075b6bff98cec1fc8ff817728bcea40834144c699cd8680c8') build() { cd "$pkgname-$pkgver" - - patch -Np0 -i "$srcdir/menus.patch" - - PYTHON=/usr/bin/python2 ./configure \ + patch -Np1 -i ../calculator.patch + ./configure \ --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make @@ -30,7 +28,4 @@ build() { package(){ 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-menus/calculator.patch b/extra/gnome-menus/calculator.patch new file mode 100644 index 000000000..9ff1ed261 --- /dev/null +++ b/extra/gnome-menus/calculator.patch @@ -0,0 +1,41 @@ +From 599c7b05c432b1571a7105f1ebf6bbe30c36dbdf Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Thu, 28 Mar 2013 21:54:34 +0000 +Subject: Adapt for gnome-calculator -> gcalctool desktop file rename + +gnome-calculator.desktop was renamed back to gcalctool.desktop, at the +very last minute before the 3.8.0 release. + +https://bugzilla.gnome.org/show_bug.cgi?id=696816 +--- +diff --git a/layout/gnome-applications.menu b/layout/gnome-applications.menu +index 84d13ed..503f9ca 100644 +--- a/layout/gnome-applications.menu ++++ b/layout/gnome-applications.menu +@@ -38,7 +38,6 @@ + file-roller.desktop + gnome-file-roller.desktop + deja-dup-preferences.desktop +- gnome-calculator.desktop + gcalctool.desktop + gucharmap.desktop + gnome-gucharmap.desktop +@@ -251,7 +250,7 @@ + X-GNOME-Utilities.directory + + file-roller.desktop +- gnome-calculator.desktop ++ gcalctool.desktop + gnome-font-viewer.desktop + gucharmap.desktop + seahorse.desktop +@@ -287,7 +286,6 @@ + gnome-eog.desktop + gnome-file-roller.desktop + gnome-gucharmap.desktop +- gcalctool.desktop + + +
+-- +cgit v0.9.1 diff --git a/extra/gnome-menus/menus.patch b/extra/gnome-menus/menus.patch deleted file mode 100644 index bf73e86cd..000000000 --- a/extra/gnome-menus/menus.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- layout/applications.menu 2005-06-28 10:16:39.000000000 +0200 -+++ layout/applications.menu 2005-09-12 23:21:20.000000000 +0200 -@@ -7,7 +7,6 @@ - Applications.directory - - -- - /etc/X11/applnk - /usr/share/gnome/apps - -@@ -18,6 +17,14 @@ - - - -+ -+ -+ Archlinux -+ Archlinux.directory -+ -+ Archlinux -+ -+ - - - Accessories diff --git a/extra/gnome-mines/PKGBUILD b/extra/gnome-mines/PKGBUILD new file mode 100644 index 000000000..6c30c5076 --- /dev/null +++ b/extra/gnome-mines/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183389 2013-04-21 22:10:07Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-mines +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Clear hidden mines from a minefield" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=gnome-mines.install +url="https://live.gnome.org/Mines" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('81a47cf8eeb81f1d54ccd42b8eb04f5c8a1e6dcc8fd4f1bc714b147a934da633') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-mines/gnome-mines.install b/extra/gnome-mines/gnome-mines.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/gnome-mines/gnome-mines.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index 1f8343a00..bfe38c4cb 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,29 +1,26 @@ -# $Id: PKGBUILD 179951 2013-03-13 11:42:54Z heftig $ +# $Id: PKGBUILD 183390 2013-04-21 22:10:08Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Kritoke pkgname=gnome-nettool pkgver=3.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64) license=('GPL') -depends=('gtk3' 'libgtop' 'ldns' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme') +depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools') optdepends=('nmap: Port scanning' 'net-tools: Network statistics') groups=('gnome-extra') url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - ldns.patch) -sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79' - '8bd83fe863d2945689afd753e5908a2bc033206e25f28d88783ae8d859d6bfeb') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79') build() { cd $pkgname-$pkgver - patch -Np1 -i ../ldns.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make diff --git a/extra/gnome-nettool/ldns.patch b/extra/gnome-nettool/ldns.patch deleted file mode 100644 index 318e89777..000000000 --- a/extra/gnome-nettool/ldns.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -u -r gnome-nettool-3.2.0/src/lookup.c gnome-nettool-3.2.0-ldns/src/lookup.c ---- gnome-nettool-3.2.0/src/lookup.c 2012-01-03 10:38:09.000000000 +0100 -+++ gnome-nettool-3.2.0-ldns/src/lookup.c 2013-03-13 12:32:31.551213914 +0100 -@@ -98,7 +98,7 @@ - - parent = gtk_widget_get_toplevel (netinfo->output); - -- program = util_find_program_dialog ("dig", parent); -+ program = util_find_program_dialog ("drill", parent); - - if (program != NULL) { - use_reverse_lookup = pattern_match (host, address_regular_expression); -@@ -116,7 +116,7 @@ - command_line = g_new (gchar *, num_terms + 1); - i = 0; - command_line[i++] = g_strdup (program); -- command_line[i++] = g_strdup ("dig"); -+ command_line[i++] = g_strdup ("drill"); - if (command_options != NULL) { - for (j = 0; command_options[j] != NULL; j++) - command_line[i++] = g_strdup (command_options[j]); diff --git a/extra/gnome-nibbles/PKGBUILD b/extra/gnome-nibbles/PKGBUILD new file mode 100644 index 000000000..d10cfdc7c --- /dev/null +++ b/extra/gnome-nibbles/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-nibbles +pkgver=3.8.0 +pkgrel=1 +pkgdesc="Guide a worm around a maze" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=gnome-nibbles.install +url="https://live.gnome.org/Nibbles" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('bc1e4f687f1e794ef15a4162492154970300ac682378e59f9471327e5fd0d606') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile \ + --with-scores-user=root --with-scores-group=games + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # Remove all scores, we generate them from postinstall + rm -rf "$pkgdir/var" +} diff --git a/extra/gnome-nibbles/gnome-nibbles.install b/extra/gnome-nibbles/gnome-nibbles.install new file mode 100644 index 000000000..8106ea53c --- /dev/null +++ b/extra/gnome-nibbles/gnome-nibbles.install @@ -0,0 +1,40 @@ +_scores=( + gnome-nibbles.1.0.scores + gnome-nibbles.2.0.scores + gnome-nibbles.3.0.scores + gnome-nibbles.4.0.scores + gnome-nibbles.1.1.scores + gnome-nibbles.2.1.scores + gnome-nibbles.3.1.scores + gnome-nibbles.4.1.scores +) + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then + continue + fi + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" + done +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" + done +} diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index 22d2e9260..a3ac3e52c 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170937 2012-11-13 16:38:27Z ibiru $ +# $Id: PKGBUILD 183392 2013-04-21 22:10:11Z heftig $ # Maintainer: Ionut Biru pkgname=gnome-online-accounts -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64) @@ -13,7 +13,7 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') options=(!libtool) install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('55d207d2dc5428f41b0a504aa3edd996a6167a5625d9e11d678f33f282935fa7') +sha256sums=('26c334000ae74832042142a150e7d0c4b5ced4dc24bdb247f75cbb9e3d2e7261') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD new file mode 100644 index 000000000..45e7aedc5 --- /dev/null +++ b/extra/gnome-photos/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 183480 2013-04-21 22:20:19Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-photos +pkgver=3.8.0 +pkgrel=1 +pkgdesc="Access, organize, and share your photos on GNOME" +arch=(i686 x86_64) +url="https://www.gnome.org/" +license=(GPL) +depends=(exempi gtk3 libexif librsvg babl gegl gnome-desktop gnome-online-accounts lcms2 tracker hicolor-icon-theme) +makedepends=(intltool) +options=(!libtool) +groups=(gnome-extra) +install=gnome-photos.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('d5a42a6562eb2bebd404f1b932e105572e64abb0e3160b2834c7898cf090f3de') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-photos/gnome-photos.install b/extra/gnome-photos/gnome-photos.install new file mode 100644 index 000000000..847019792 --- /dev/null +++ b/extra/gnome-photos/gnome-photos.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-power-manager/PKGBUILD b/extra/gnome-power-manager/PKGBUILD index dc1fe6d67..da938658d 100644 --- a/extra/gnome-power-manager/PKGBUILD +++ b/extra/gnome-power-manager/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 169907 2012-10-30 22:34:30Z heftig $ +# $Id: PKGBUILD 183393 2013-04-21 22:10:14Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-power-manager -pkgver=3.6.0 +pkgver=3.8.1 pkgrel=1 -pkgdesc="Power management tools." +pkgdesc="System power information and statistics" arch=(i686 x86_64) url="http://www.gnome.org/projects/gnome-power-manager/" -license=('GPL') -depends=('gtk3' 'upower' 'dconf' 'hicolor-icon-theme') -makedepends=('intltool') +license=(GPL) +depends=(gtk3 upower dconf hicolor-icon-theme) +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=('176023d51d544a888bcd07611f2c1adaedfe2e20796f3fb97fba59f6330851c6') +sha256sums=('f5b5ef2282fae3bcdcc8473af3cc5e32ad7ac7e2444fc93abf00c3d2967361bf') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-robots/PKGBUILD b/extra/gnome-robots/PKGBUILD new file mode 100644 index 000000000..8f4c471d2 --- /dev/null +++ b/extra/gnome-robots/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 183394 2013-04-21 22:10:16Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-robots +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Avoid the robots and make them crash into each other" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=gnome-robots.install +url="https://live.gnome.org/Robots" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('6faeeef5ab9b5002c7ca3cf60ea67e7a66064654ae28c68c233b2ee40459a704') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile \ + --with-scores-user=root --with-scores-group=games + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # Remove all scores, we generate them from postinstall + rm -rf "$pkgdir/var" +} diff --git a/extra/gnome-robots/gnome-robots.install b/extra/gnome-robots/gnome-robots.install new file mode 100644 index 000000000..3422e0c8a --- /dev/null +++ b/extra/gnome-robots/gnome-robots.install @@ -0,0 +1,47 @@ +_scores=( + gnome-robots2.robots2.scores + gnome-robots2.robots2-safe.scores + gnome-robots2.robots2-super-safe.scores + gnome-robots2.robots2_easy.scores + gnome-robots2.robots2_easy-safe.scores + gnome-robots2.robots2_easy-super-safe.scores + gnome-robots2.classic_robots.scores + gnome-robots2.classic_robots-safe.scores + gnome-robots2.classic_robots-super-safe.scores + gnome-robots2.robots_with_safe_teleport.scores + gnome-robots2.robots_with_safe_teleport-safe.scores + gnome-robots2.robots_with_safe_teleport-super-safe.scores + gnome-robots2.nightmare.scores + gnome-robots2.nightmare-safe.scores + gnome-robots2.nightmare-super-safe.scores +) + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then + continue + fi + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" + done +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" + done +} diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD index 8764d54f1..86b169622 100644 --- a/extra/gnome-screenshot/PKGBUILD +++ b/extra/gnome-screenshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170897 2012-11-12 22:32:16Z heftig $ +# $Id: PKGBUILD 183395 2013-04-21 22:10:17Z heftig $ # Maintainer: Ionut Biru pkgname=gnome-screenshot -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="Take pictures of your screen" arch=(i686 x86_64) @@ -10,10 +10,10 @@ url="http://gnome.org" license=('GPL2') depends=('dconf' 'gtk3' 'libcanberra') makedepends=('intltool') -groups=('gnome-extra') +groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7954424f927c9cf5451d27e78edd10fa80d15345dfdb78bd7bc98f873617f382') +sha256sums=('113ab0fe98080f888ff8ff15011b21e74b5582576cb5455db47cbfd9e9075a05') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-search-tool/PKGBUILD b/extra/gnome-search-tool/PKGBUILD index d29b9fe06..d8278d917 100644 --- a/extra/gnome-search-tool/PKGBUILD +++ b/extra/gnome-search-tool/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 169910 2012-10-30 22:34:37Z heftig $ +# $Id: PKGBUILD 183396 2013-04-21 22:10:19Z heftig $ # Maintainer: Ionut Biru pkgname=gnome-search-tool pkgver=3.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utility to search for files" arch=(i686 x86_64) url="http://gnome.org" license=('GPL2') -depends=('gtk3' 'libsm') +depends=('nautilus' 'libsm') makedepends=('intltool' 'yelp-tools') install=$pkgname.install options=('!emptydirs') -groups=('gnome-extra') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) sha256sums=('a33000cd7d033be4ea50422f0f2cca611da5b79bd0f0875017f105a1bc177f42') diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index ad1cb24b4..04b381bc3 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,32 +1,27 @@ -# $Id: PKGBUILD 170916 2012-11-12 23:48:19Z heftig $ +# $Id: PKGBUILD 183397 2013-04-21 22:10:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-session -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) -license=('GPL' 'LGPL') -depends=('libsystemd' 'dconf' 'gconf' 'gsettings-desktop-schemas' 'gtk3' - 'hicolor-icon-theme' 'json-glib' 'libgl' 'libsm' 'libxtst' 'polkit-gnome' - 'upower') -makedepends=('intltool' 'mesa' 'xtrans') +license=(GPL LGPL) +depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop + hicolor-icon-theme json-glib libgl libsm libxtst upower) +makedepends=(intltool mesa gtk-doc) options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" -groups=('gnome') +groups=(gnome) source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - gnome-session-3.3.1-llvmpipe.patch timeout.patch) -sha256sums=('2e3a3466eed4136826e150b639c63beb5c93710346dea2e538adfe5e18d701b4' - '59ea58012febe48a67dabd944dc638400637ad4d296d63b63b585f10eea4f85e' + timeout.patch) +sha256sums=('6c1cf3c0bc86da1dc5ec2d1a7bb3332b15652d4a468c52c5ae894b46b4a14770' '9eaf31857b41db417475c3b14adc11b10c8226ed76978cdf96dd648fa6e505fc') build() { cd $pkgname-$pkgver - # Allow software rendering - patch -Np1 -i ../gnome-session-3.3.1-llvmpipe.patch - # Increase timeout, for slow machines patch -Np1 -i ../timeout.patch diff --git a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch b/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch deleted file mode 100644 index 40da1c9b7..000000000 --- a/extra/gnome-session/gnome-session-3.3.1-llvmpipe.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up gnome-session-3.3.1/data/hardware-compatibility.jx gnome-session-3.3.1/data/hardware-compatibility ---- gnome-session-3.3.1/data/hardware-compatibility.jx 2011-10-21 10:35:39.000000000 -0400 -+++ gnome-session-3.3.1/data/hardware-compatibility 2011-11-03 17:53:17.156407217 -0400 -@@ -20,4 +20,4 @@ - - # Gallium has softpipe and llvmpipe - -softpipe ---llvmpipe -+#llvmpipe diff --git a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch deleted file mode 100644 index eb77bada2..000000000 --- a/extra/gnome-settings-daemon/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ /dev/null @@ -1,1476 +0,0 @@ -From f418ff2cd04b233dbffc1129e856630d8c96cd07 Mon Sep 17 00:00:00 2001 -From: Richard Hughes -Date: Fri, 21 Sep 2012 11:56:53 +0100 -Subject: [PATCH] power and media-keys: Use logind for suspending and - rebooting the system - -Use the new logind features to suspend and resume but making sure we opt out -of logind handling the sleep and power keys, and also inhibiting for lid close -auto-suspend if there is an external monitor connected. - -Also use a delay inihibit for logind so that we can do actions on suspend like -blanking the screen using the screensaver and also poking the screensaver on -resume. - -https://bugzilla.gnome.org/show_bug.cgi?id=680689 - -Conflicts: - plugins/power/gsd-power-manager.c ---- - plugins/common/Makefile.am | 4 +- - plugins/common/gsd-power-helper.c | 203 -------- - plugins/common/gsd-power-helper.h | 35 -- - plugins/media-keys/gsd-media-keys-manager.c | 156 +++++-- - plugins/power/gsd-power-manager.c | 697 +++++++++++++++++++--------- - 5 files changed, 594 insertions(+), 501 deletions(-) - delete mode 100644 plugins/common/gsd-power-helper.c - delete mode 100644 plugins/common/gsd-power-helper.h - -diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am -index 7e50db4..b0e907c 100644 ---- a/plugins/common/Makefile.am -+++ b/plugins/common/Makefile.am -@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \ - gsd-keygrab.c \ - gsd-keygrab.h \ - gsd-input-helper.c \ -- gsd-input-helper.h \ -- gsd-power-helper.c \ -- gsd-power-helper.h -+ gsd-input-helper.h - - libcommon_la_CPPFLAGS = \ - $(AM_CPPFLAGS) -diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c -deleted file mode 100644 -index 27d0eda..0000000 ---- a/plugins/common/gsd-power-helper.c -+++ /dev/null -@@ -1,203 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2012 Bastien Nocera -- * -- * 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. -- * -- */ -- --#include "config.h" -- --#include "gsd-power-helper.h" -- --#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" --#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" --#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -- --#define CONSOLEKIT_DBUS_NAME "org.freedesktop.ConsoleKit" --#define CONSOLEKIT_DBUS_PATH_MANAGER "/org/freedesktop/ConsoleKit/Manager" --#define CONSOLEKIT_DBUS_INTERFACE_MANAGER "org.freedesktop.ConsoleKit.Manager" -- --#ifdef HAVE_SYSTEMD --static void --systemd_stop (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "PowerOff", -- g_variant_new ("(b)", FALSE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --static void --systemd_suspend (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "Suspend", -- g_variant_new ("(b)", TRUE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --static void --systemd_hibernate (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "Hibernate", -- g_variant_new ("(b)", TRUE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --#else /* HAVE_SYSTEMD */ -- --static void --consolekit_stop_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GVariant *result; -- GError *error = NULL; -- -- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), -- res, -- &error); -- if (result == NULL) { -- g_warning ("couldn't stop using ConsoleKit: %s", -- error->message); -- g_error_free (error); -- } else { -- g_variant_unref (result); -- } --} -- --static void --consolekit_stop (void) --{ -- GError *error = NULL; -- GDBusProxy *proxy; -- -- /* power down the machine in a safe way */ -- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -- NULL, -- CONSOLEKIT_DBUS_NAME, -- CONSOLEKIT_DBUS_PATH_MANAGER, -- CONSOLEKIT_DBUS_INTERFACE_MANAGER, -- NULL, &error); -- if (proxy == NULL) { -- g_warning ("cannot connect to ConsoleKit: %s", -- error->message); -- g_error_free (error); -- return; -- } -- g_dbus_proxy_call (proxy, -- "Stop", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- consolekit_stop_cb, NULL); -- g_object_unref (proxy); --} --static void --upower_sleep_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GVariant *result; -- GError *error = NULL; -- -- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), -- res, -- &error); -- if (result == NULL) { -- g_warning ("couldn't sleep using UPower: %s", -- error->message); -- g_error_free (error); -- } else { -- g_variant_unref (result); -- } --} -- --static void --upower_suspend (GDBusProxy *upower_proxy) --{ -- g_dbus_proxy_call (upower_proxy, -- "Suspend", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- upower_sleep_cb, NULL); --} -- --static void --upower_hibernate (GDBusProxy *upower_proxy) --{ -- g_dbus_proxy_call (upower_proxy, -- "Hibernate", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- upower_sleep_cb, NULL); --} --#endif /* HAVE_SYSTEMD */ -- --void --gsd_power_suspend (GDBusProxy *upower_proxy) --{ --#ifdef HAVE_SYSTEMD -- systemd_suspend (); --#else -- upower_suspend (upower_proxy); --#endif --} -- --void --gsd_power_poweroff (void) --{ --#ifdef HAVE_SYSTEMD -- systemd_stop (); --#else -- consolekit_stop (); --#endif --} -- --void --gsd_power_hibernate (GDBusProxy *upower_proxy) --{ --#ifdef HAVE_SYSTEMD -- systemd_hibernate (); --#else -- upower_hibernate (upower_proxy); --#endif --} -diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h -deleted file mode 100644 -index e3be14f..0000000 ---- a/plugins/common/gsd-power-helper.h -+++ /dev/null -@@ -1,35 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2012 Bastien Nocera -- * -- * 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. -- */ -- --#ifndef __GSD_POWER_HELPER_H --#define __GSD_POWER_HELPER_H -- --#include -- --G_BEGIN_DECLS -- --#include -- --void gsd_power_suspend (GDBusProxy *upower_proxy); --void gsd_power_hibernate (GDBusProxy *upower_proxy); --void gsd_power_poweroff (void); -- --G_END_DECLS -- --#endif /* __GSD_POWER_HELPER_H */ -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index 9c84d7f..a2f277e 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_GUDEV - #include -@@ -51,7 +52,6 @@ - #include "shortcuts-list.h" - #include "gsd-osd-window.h" - #include "gsd-input-helper.h" --#include "gsd-power-helper.h" - #include "gsd-enums.h" - - #include -@@ -105,6 +105,10 @@ static const gchar introspection_xml[] = - #define KEY_CURRENT_INPUT_SOURCE "current" - #define KEY_INPUT_SOURCES "sources" - -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+ - #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) - - typedef struct { -@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate - - /* Power stuff */ - GSettings *power_settings; -- GDBusProxy *upower_proxy; - GDBusProxy *power_screen_proxy; - GDBusProxy *power_keyboard_proxy; - -+ /* systemd stuff */ -+ GDBusProxy *logind_proxy; -+ gint inhibit_keys_fd; -+ - /* Multihead stuff */ - GdkScreen *current_screen; - GSList *screens; -@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) - } - - static void -+power_action_suspend (GsdMediaKeysManager *manager) -+{ -+#ifndef HAVE_SYSTEMD -+ g_warning ("no systemd support"); -+ return; -+#endif -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Suspend", -+ g_variant_new ("(b)", TRUE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ manager->priv->bus_cancellable, -+ NULL, NULL); -+} -+ -+static void -+power_action_hibernate (GsdMediaKeysManager *manager) -+{ -+#ifndef HAVE_SYSTEMD -+ g_warning ("no systemd support"); -+ return; -+#endif -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Hibernate", -+ g_variant_new ("(b)", TRUE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ manager->priv->bus_cancellable, -+ NULL, NULL); -+} -+ -+static void - do_config_power_action (GsdMediaKeysManager *manager, - const gchar *config_key) - { -@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager, - config_key); - switch (action_type) { - case GSD_POWER_ACTION_SUSPEND: -- gsd_power_suspend (manager->priv->upower_proxy); -+ power_action_suspend (manager); - break; - case GSD_POWER_ACTION_INTERACTIVE: - case GSD_POWER_ACTION_SHUTDOWN: - gnome_session_shutdown (manager); - break; - case GSD_POWER_ACTION_HIBERNATE: -- gsd_power_hibernate (manager->priv->upower_proxy); -+ power_action_hibernate (manager); - break; - case GSD_POWER_ACTION_BLANK: - case GSD_POWER_ACTION_NOTHING: -@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - } - #endif /* HAVE_GUDEV */ - -+ g_clear_object (&priv->logind_proxy); - if (priv->settings) { - g_object_unref (priv->settings); - priv->settings = NULL; -@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - priv->power_keyboard_proxy = NULL; - } - -- if (priv->upower_proxy) { -- g_object_unref (priv->upower_proxy); -- priv->upower_proxy = NULL; -- } -- - if (priv->cancellable != NULL) { - g_cancellable_cancel (priv->cancellable); - g_object_unref (priv->cancellable); -@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass) - } - - static void -+inhibit_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit keypresses: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_keys_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void - gsd_media_keys_manager_init (GsdMediaKeysManager *manager) - { -+ GError *error; -+ GDBusConnection *bus; -+ -+ error = NULL; - manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager); -+ -+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); -+ if (bus == NULL) { -+ g_warning ("Failed to connect to system bus: %s", -+ error->message); -+ g_error_free (error); -+ return; -+ } -+ -+ manager->priv->logind_proxy = -+ g_dbus_proxy_new_sync (bus, -+ 0, -+ NULL, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ NULL, -+ &error); -+ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("Failed to connect to systemd: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ g_object_unref (bus); -+ -+ g_debug ("Adding system inhibitors for power keys"); -+ manager->priv->inhibit_keys_fd = -1; -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "handle-power-key:handle-suspend-key:handle-hibernate-key", -+ g_get_user_name (), -+ "GNOME handling keypresses", -+ "block"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_done, -+ manager); -+ - } - - static void -@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object) - - if (media_keys_manager->priv->start_idle_id != 0) - g_source_remove (media_keys_manager->priv->start_idle_id); -+ if (media_keys_manager->priv->inhibit_keys_fd != -1) -+ close (media_keys_manager->priv->inhibit_keys_fd); - - G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object); - } -@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject *source_object, - } - - static void --upower_ready_cb (GObject *source_object, -- GAsyncResult *res, -- GsdMediaKeysManager *manager) --{ -- GError *error = NULL; -- -- manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error); -- if (manager->priv->upower_proxy == NULL) { -- g_warning ("Failed to get proxy for upower: %s", -- error->message); -- g_error_free (error); -- } --} -- --static void - power_screen_ready_cb (GObject *source_object, - GAsyncResult *res, - GsdMediaKeysManager *manager) -@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager) - manager->priv->bus_cancellable, - (GAsyncReadyCallback) on_bus_gotten, - manager); -- -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.UPower", -- "/org/freedesktop/UPower", -- "org.freedesktop.UPower", -- NULL, -- (GAsyncReadyCallback) upower_ready_cb, -- manager); - } - - GsdMediaKeysManager * -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 1c594d8..bb7224c 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -1,7 +1,7 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 William Jon McCann -- * Copyright (C) 2011 Richard Hughes -+ * Copyright (C) 2011-2012 Richard Hughes - * Copyright (C) 2011 Ritesh Khadgaray - * - * This program is free software; you can redistribute it and/or modify -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include -@@ -43,7 +44,6 @@ - #include "gnome-settings-session.h" - #include "gsd-enums.h" - #include "gsd-power-manager.h" --#include "gsd-power-helper.h" - - #define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" - #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager" -@@ -78,6 +78,10 @@ - #define GSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */ - #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */ - -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+ - /* Keep this in sync with gnome-shell */ - #define SCREENSAVER_FADE_TIME 10 /* seconds */ - -@@ -193,15 +197,21 @@ struct GsdPowerManagerPrivate - ca_context *canberra_context; - ca_proplist *critical_alert_loop_props; - guint32 critical_alert_timeout_id; -- GDBusProxy *screensaver_proxy; - GDBusProxy *session_proxy; - GDBusProxy *session_presence_proxy; - GpmIdletime *idletime; - GsdPowerIdleMode current_idle_mode; -- guint lid_close_safety_timer_id; - GtkStatusIcon *status_icon; - guint xscreensaver_watchdog_timer_id; - gboolean is_virtual_machine; -+ -+ /* systemd stuff */ -+ GDBusProxy *logind_proxy; -+ gint inhibit_lid_switch_fd; -+ gboolean inhibit_lid_switch_taken; -+ gint inhibit_suspend_fd; -+ gboolean inhibit_suspend_taken; -+ guint inhibit_lid_switch_timer_id; - }; - - enum { -@@ -218,8 +228,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); - static gchar *engine_get_summary (GsdPowerManager *manager); - static void do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type); - static void do_lid_closed_action (GsdPowerManager *manager); --static void lock_screensaver (GsdPowerManager *manager); --static void kill_lid_close_safety_timer (GsdPowerManager *manager); -+static void uninhibit_lid_switch (GsdPowerManager *manager); -+static gboolean external_monitor_is_connected (GnomeRRScreen *screen); - - G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) - -@@ -2049,6 +2059,57 @@ gnome_session_shutdown (void) - } - - static void -+action_poweroff (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "PowerOff", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void -+action_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Suspend", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void -+action_hibernate (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Hibernate", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void - do_power_action_type (GsdPowerManager *manager, - GsdPowerActionType action_type) - { -@@ -2057,19 +2118,19 @@ do_power_action_type (GsdPowerManager *manager, - - switch (action_type) { - case GSD_POWER_ACTION_SUSPEND: -- gsd_power_suspend (manager->priv->upower_proxy); -+ action_suspend (manager); - break; - case GSD_POWER_ACTION_INTERACTIVE: - gnome_session_shutdown (); - break; - case GSD_POWER_ACTION_HIBERNATE: -- gsd_power_hibernate (manager->priv->upower_proxy); -+ action_hibernate (manager); - break; - case GSD_POWER_ACTION_SHUTDOWN: - /* this is only used on critically low battery where - * hibernate is not available and is marginally better - * than just powering down the computer mid-write */ -- gsd_power_poweroff (); -+ action_poweroff (manager); - break; - case GSD_POWER_ACTION_BLANK: - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -2141,85 +2202,20 @@ upower_kbd_toggle (GsdPowerManager *manager, - return ret; - } - --static void --do_lid_open_action (GsdPowerManager *manager) --{ -- gboolean ret; -- GError *error = NULL; -- -- /* play a sound, using sounds from the naming spec */ -- ca_context_play (manager->priv->canberra_context, 0, -- CA_PROP_EVENT_ID, "lid-open", -- /* TRANSLATORS: this is the sound description */ -- CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), -- NULL); -- -- /* ensure we turn the panel back on after lid open */ -- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_ON, -- &error); -- if (!ret) { -- g_warning ("failed to turn the panel on after lid open: %s", -- error->message); -- g_clear_error (&error); -- } -- -- /* only toggle keyboard if present and already toggled off */ -- if (manager->priv->upower_kdb_proxy != NULL && -- manager->priv->kbd_brightness_old != -1) { -- ret = upower_kbd_toggle (manager, &error); -- if (!ret) { -- g_warning ("failed to turn the kbd backlight on: %s", -- error->message); -- g_error_free (error); -- } -- } -- -- kill_lid_close_safety_timer (manager); --} -- - static gboolean --is_on (GnomeRROutput *output) -+inhibit_lid_switch_timer_cb (GsdPowerManager *manager) - { -- GnomeRRCrtc *crtc; -- -- crtc = gnome_rr_output_get_crtc (output); -- if (!crtc) -- return FALSE; -- return gnome_rr_crtc_get_current_mode (crtc) != NULL; --} -- --static gboolean --non_laptop_outputs_are_all_off (GnomeRRScreen *screen) --{ -- GnomeRROutput **outputs; -- int i; -- -- outputs = gnome_rr_screen_list_outputs (screen); -- for (i = 0; outputs[i] != NULL; i++) { -- if (gnome_rr_output_is_laptop (outputs[i])) -- continue; -- -- if (is_on (outputs[i])) -- return FALSE; -+ if (!external_monitor_is_connected (manager->priv->x11_screen) || -+ g_settings_get_boolean (manager->priv->settings, -+ "lid-close-suspend-with-external-monitor")) { -+ g_debug ("no external monitors for a while; uninhibiting lid close"); -+ uninhibit_lid_switch (manager); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ return G_SOURCE_REMOVE; - } - -- return TRUE; --} -- --/* Timeout callback used to check conditions when the laptop's lid is closed but -- * the machine is not suspended yet. We try to suspend again, so that the laptop -- * won't overheat if placed in a backpack. -- */ --static gboolean --lid_close_safety_timer_cb (GsdPowerManager *manager) --{ -- manager->priv->lid_close_safety_timer_id = 0; -- -- g_debug ("lid has been closed for a while; trying to suspend again"); -- do_lid_closed_action (manager); -- -- return FALSE; -+ g_debug ("external monitor still there; trying again later"); -+ return G_SOURCE_CONTINUE; - } - - /* Sets up a timer to be triggered some seconds after closing the laptop lid -@@ -2227,82 +2223,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) - * again in the timeout handler to see if we can suspend then. - */ - static void --setup_lid_close_safety_timer (GsdPowerManager *manager) -+setup_inhibit_lid_switch_timer (GsdPowerManager *manager) - { -- if (manager->priv->lid_close_safety_timer_id != 0) -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_debug ("lid close safety timer already set up"); - return; -+ } -+ -+ g_debug ("setting up lid close safety timer"); - -- manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, -- (GSourceFunc) lid_close_safety_timer_cb, -+ manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, -+ (GSourceFunc) inhibit_lid_switch_timer_cb, - manager); -- g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer"); -+ g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer"); - } - - static void --kill_lid_close_safety_timer (GsdPowerManager *manager) -+restart_inhibit_lid_switch_timer (GsdPowerManager *manager) - { -- if (manager->priv->lid_close_safety_timer_id != 0) { -- g_source_remove (manager->priv->lid_close_safety_timer_id); -- manager->priv->lid_close_safety_timer_id = 0; -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_debug ("restarting lid close safety timer"); -+ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ setup_inhibit_lid_switch_timer (manager); - } - } - - static void --suspend_with_lid_closed (GsdPowerManager *manager) -+do_lid_open_action (GsdPowerManager *manager) - { - gboolean ret; - GError *error = NULL; -- GsdPowerActionType action_type; - -- /* maybe lock the screen if the lid is closed */ -- lock_screensaver (manager); -- -- /* we have different settings depending on AC state */ -- if (up_client_get_on_battery (manager->priv->up_client)) { -- action_type = g_settings_get_enum (manager->priv->settings, -- "lid-close-battery-action"); -- } else { -- action_type = g_settings_get_enum (manager->priv->settings, -- "lid-close-ac-action"); -- } -- -- /* check we won't melt when the lid is closed */ -- if (action_type != GSD_POWER_ACTION_SUSPEND && -- action_type != GSD_POWER_ACTION_HIBERNATE) { -- if (up_client_get_lid_force_sleep (manager->priv->up_client)) { -- g_warning ("to prevent damage, now forcing suspend"); -- do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND); -- return; -- } -- } -+ /* play a sound, using sounds from the naming spec */ -+ ca_context_play (manager->priv->canberra_context, 0, -+ CA_PROP_EVENT_ID, "lid-open", -+ /* TRANSLATORS: this is the sound description */ -+ CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), -+ NULL); - -- /* ensure we turn the panel back on after resume */ -+ /* ensure we turn the panel back on after lid open */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_OFF, -+ GNOME_RR_DPMS_ON, - &error); - if (!ret) { -- g_warning ("failed to turn the panel off after lid close: %s", -+ g_warning ("failed to turn the panel on after lid open: %s", - error->message); - g_clear_error (&error); - } - -- /* only toggle keyboard if present and not already toggled */ -- if (manager->priv->upower_kdb_proxy && -- manager->priv->kbd_brightness_old == -1) { -+ /* only toggle keyboard if present and already toggled off */ -+ if (manager->priv->upower_kdb_proxy != NULL && -+ manager->priv->kbd_brightness_old != -1) { - ret = upower_kbd_toggle (manager, &error); - if (!ret) { -- g_warning ("failed to turn the kbd backlight off: %s", -+ g_warning ("failed to turn the kbd backlight on: %s", - error->message); - g_error_free (error); - } - } -- -- do_power_action_type (manager, action_type); - } - - static void - do_lid_closed_action (GsdPowerManager *manager) - { -+ gboolean ret; -+ GError *error = NULL; -+ - /* play a sound, using sounds from the naming spec */ - ca_context_play (manager->priv->canberra_context, 0, - CA_PROP_EVENT_ID, "lid-close", -@@ -2310,21 +2297,22 @@ do_lid_closed_action (GsdPowerManager *manager) - CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), - NULL); - -+ /* turn the panel off if the lid is closed (mainly for Dells...) */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_OFF, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel off after lid close: %s", -+ error->message); -+ g_error_free (error); -+ } -+ - /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */ - gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */ - -- /* perform policy action */ -- if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor") -- || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) { -- g_debug ("lid is closed; suspending or hibernating"); -- suspend_with_lid_closed (manager); -- } else { -- g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active"); -- setup_lid_close_safety_timer (manager); -- } -+ restart_inhibit_lid_switch_timer (manager); - } - -- - static void - up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - { -@@ -2344,6 +2332,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - if (manager->priv->lid_is_closed == tmp) - return; - manager->priv->lid_is_closed = tmp; -+ g_debug ("up changed: lid is now %s", tmp ? "closed" : "open"); - - /* fake a keypress */ - if (tmp) -@@ -3302,30 +3291,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) - } - - static void --sleep_cb_screensaver_proxy_ready_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GError *error = NULL; -- GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -- -- manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); -- if (manager->priv->screensaver_proxy == NULL) { -- g_warning ("Could not connect to gnome-screensaver: %s", -- error->message); -- g_error_free (error); -- return; -- } -- -- /* Finish the upower_notify_sleep_cb() call by locking the screen */ -- g_debug ("gnome-screensaver activated, doing gnome-screensaver lock"); -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "Lock", -- NULL, G_DBUS_CALL_FLAGS_NONE, -1, -- NULL, NULL, NULL); --} -- --static void - idle_dbus_signal_cb (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, -@@ -3477,75 +3442,38 @@ out: - } - - static void --lock_screensaver (GsdPowerManager *manager) -+lock_screensaver (GsdPowerManager *manager, -+ GSourceFunc done_cb) - { - gboolean do_lock; - - do_lock = g_settings_get_boolean (manager->priv->settings_screensaver, - "lock-enabled"); -- if (!do_lock) -+ if (!do_lock && done_cb) { -+ done_cb (manager); - return; -- -- if (manager->priv->screensaver_proxy != NULL) { -- g_debug ("doing gnome-screensaver lock"); -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "Lock", -- NULL, G_DBUS_CALL_FLAGS_NONE, -1, -- NULL, NULL, NULL); -- } else { -- /* connect to the screensaver first */ -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, -- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -- NULL, -- GS_DBUS_NAME, -- GS_DBUS_PATH, -- GS_DBUS_INTERFACE, -- NULL, -- sleep_cb_screensaver_proxy_ready_cb, -- manager); -- } --} -- --static void --upower_notify_sleep_cb (UpClient *client, -- UpSleepKind sleep_kind, -- GsdPowerManager *manager) --{ -- lock_screensaver (manager); --} -- --static void --upower_notify_resume_cb (UpClient *client, -- UpSleepKind sleep_kind, -- GsdPowerManager *manager) --{ -- gboolean ret; -- GError *error = NULL; -- -- /* this displays the unlock dialogue so the user doesn't have -- * to move the mouse or press any key before the window comes up */ -- if (manager->priv->screensaver_proxy != NULL) { -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "SimulateUserActivity", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, NULL, NULL); - } - -- /* close existing notifications on resume, the system power -- * state is probably different now */ -- notify_close_if_showing (manager->priv->notification_low); -- notify_close_if_showing (manager->priv->notification_discharging); -- -- /* ensure we turn the panel back on after resume */ -- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_ON, -- &error); -- if (!ret) { -- g_warning ("failed to turn the panel on after resume: %s", -- error->message); -- g_error_free (error); -- } -+ g_dbus_connection_call (manager->priv->connection, -+ GS_DBUS_NAME, -+ GS_DBUS_PATH, -+ GS_DBUS_INTERFACE, -+ "Lock", -+ NULL, NULL, -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ NULL, NULL, NULL); -+ -+ /* Wait until gnome-shell shield animation is done -+ * -+ * FIXME: the shell should mark the lock as active -+ * when the shield is down, then we could wait for -+ * that. This would also fix the problem that we wait -+ * needlessly when the shell has already locked the -+ * screen because it is initiating the suspend. -+ * -+ * https://bugzilla.gnome.org/show_bug.cgi?id=685053 -+ */ -+ g_timeout_add (500, done_cb, manager); - } - - static void -@@ -3755,6 +3683,287 @@ out: - return ret; - } - -+static void -+inhibit_lid_switch_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit lid switch: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_lid_switch_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void -+inhibit_lid_switch (GsdPowerManager *manager) -+{ -+ GVariant *params; -+ -+ if (manager->priv->inhibit_lid_switch_taken) { -+ g_debug ("already inhibited lid-switch"); -+ return; -+ } -+ g_debug ("Adding lid switch system inhibitor"); -+ manager->priv->inhibit_lid_switch_taken = TRUE; -+ -+ params = g_variant_new ("(ssss)", -+ "handle-lid-switch", -+ g_get_user_name (), -+ "Multiple displays attached", -+ "block"); -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ params, -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_lid_switch_done, -+ manager); -+} -+ -+static void -+uninhibit_lid_switch (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_lid_switch_fd == -1) { -+ g_debug ("no lid-switch inhibitor"); -+ return; -+ } -+ g_debug ("Removing lid switch system inhibitor"); -+ close (manager->priv->inhibit_lid_switch_fd); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_lid_switch_taken = FALSE; -+} -+ -+static void -+inhibit_suspend_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit suspend: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_suspend_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+/* We take a delay inhibitor here, which causes logind to send a -+ * PrepareToSleep signal, which gives us a chance to lock the screen -+ * and do some other preparations. -+ */ -+static void -+inhibit_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_suspend_taken) { -+ g_debug ("already inhibited lid-switch"); -+ return; -+ } -+ g_debug ("Adding suspend delay inhibitor"); -+ manager->priv->inhibit_suspend_taken = TRUE; -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "sleep", -+ g_get_user_name (), -+ "GNOME needs to lock the screen", -+ "delay"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_suspend_done, -+ manager); -+} -+ -+static void -+uninhibit_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_suspend_fd == -1) { -+ g_debug ("no suspend delay inhibitor"); -+ return; -+ } -+ g_debug ("Removing suspend delay inhibitor"); -+ close (manager->priv->inhibit_suspend_fd); -+ manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = FALSE; -+} -+ -+static gboolean -+randr_output_is_on (GnomeRROutput *output) -+{ -+ GnomeRRCrtc *crtc; -+ -+ crtc = gnome_rr_output_get_crtc (output); -+ if (!crtc) -+ return FALSE; -+ return gnome_rr_crtc_get_current_mode (crtc) != NULL; -+} -+ -+static gboolean -+external_monitor_is_connected (GnomeRRScreen *screen) -+{ -+ GnomeRROutput **outputs; -+ guint i; -+ -+ if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS)) -+ return TRUE; -+ -+ /* see if we have more than one screen plugged in */ -+ outputs = gnome_rr_screen_list_outputs (screen); -+ for (i = 0; outputs[i] != NULL; i++) { -+ if (randr_output_is_on (outputs[i]) && -+ !gnome_rr_output_is_laptop (outputs[i])) -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static void -+on_randr_event (GnomeRRScreen *screen, gpointer user_data) -+{ -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ -+ /* when a second monitor is plugged in, we take the -+ * handle-lid-switch inhibitor lock of logind to prevent -+ * it from suspending. -+ * -+ * Uninhibiting is done in the inhibit_lid_switch_timer, -+ * since we want to give users a few seconds when unplugging -+ * and replugging an external monitor, not suspend right away. -+ */ -+ if (external_monitor_is_connected (screen) && -+ !g_settings_get_boolean (manager->priv->settings, -+ "lid-close-suspend-with-external-monitor")) { -+ inhibit_lid_switch (manager); -+ setup_inhibit_lid_switch_timer (manager); -+ } -+ else { -+ restart_inhibit_lid_switch_timer (manager); -+ } -+} -+ -+static gboolean -+screen_lock_done_cb (gpointer data) -+{ -+ GsdPowerManager *manager = data; -+ -+ /* lift the delay inhibit, so logind can proceed */ -+ uninhibit_suspend (manager); -+ -+ return FALSE; -+} -+ -+static void -+handle_suspend_actions (GsdPowerManager *manager) -+{ -+ gboolean ret; -+ GError *error = NULL; -+ -+ /* ensure we turn the panel back on after resume */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_ON, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel on after resume: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ lock_screensaver (manager, screen_lock_done_cb); -+} -+ -+static void -+handle_resume_actions (GsdPowerManager *manager) -+{ -+ gboolean ret; -+ GError *error = NULL; -+ -+ /* this displays the unlock dialogue so the user doesn't have -+ * to move the mouse or press any key before the window comes up */ -+ g_dbus_connection_call (manager->priv->connection, -+ GS_DBUS_NAME, -+ GS_DBUS_PATH, -+ GS_DBUS_INTERFACE, -+ "SimulateUserActivity", -+ NULL, NULL, -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ NULL, NULL, NULL); -+ -+ /* close existing notifications on resume, the system power -+ * state is probably different now */ -+ notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (manager->priv->notification_discharging); -+ -+ /* ensure we turn the panel back on after resume */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_ON, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel on after resume: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ /* set up the delay again */ -+ inhibit_suspend (manager); -+} -+ -+static void -+logind_proxy_signal_cb (GDBusProxy *proxy, -+ const gchar *sender_name, -+ const gchar *signal_name, -+ GVariant *parameters, -+ gpointer user_data) -+{ -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ gboolean is_about_to_suspend; -+ -+ if (g_strcmp0 (signal_name, "PrepareForSleep") != 0) -+ return; -+ g_variant_get (parameters, "(b)", &is_about_to_suspend); -+ if (is_about_to_suspend) { -+ handle_suspend_actions (manager); -+ } else { -+ handle_resume_actions (manager); -+ } -+} -+ - gboolean - gsd_power_manager_start (GsdPowerManager *manager, - GError **error) -@@ -3764,6 +3973,25 @@ gsd_power_manager_start (GsdPowerManager *manager, - g_debug ("Starting power manager"); - gnome_settings_profile_start (NULL); - -+ manager->priv->logind_proxy = -+ g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -+ 0, -+ NULL, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ NULL, -+ error); -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return FALSE; -+ } -+ g_signal_connect (manager->priv->logind_proxy, "g-signal", -+ G_CALLBACK (logind_proxy_signal_cb), -+ manager); -+ /* Set up a delay inhibitor to be informed about suspend attempts */ -+ inhibit_suspend (manager); -+ - /* track the active session */ - manager->priv->session = gnome_settings_session_new (); - g_signal_connect (manager->priv->session, "notify::state", -@@ -3778,10 +4006,6 @@ gsd_power_manager_start (GsdPowerManager *manager, - G_CALLBACK (engine_settings_key_changed_cb), manager); - manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver"); - manager->priv->up_client = up_client_new (); -- g_signal_connect (manager->priv->up_client, "notify-sleep", -- G_CALLBACK (upower_notify_sleep_cb), manager); -- g_signal_connect (manager->priv->up_client, "notify-resume", -- G_CALLBACK (upower_notify_resume_cb), manager); - manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client); - g_signal_connect (manager->priv->up_client, "device-added", - G_CALLBACK (engine_device_added_cb), manager); -@@ -3895,6 +4119,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - G_CALLBACK (idle_idletime_reset_cb), manager); - g_signal_connect (manager->priv->idletime, "alarm-expired", - G_CALLBACK (idle_idletime_alarm_expired_cb), manager); -+ g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); -+ /* set up initial state */ -+ on_randr_event (manager->priv->x11_screen, manager); - - /* ensure the default dpms timeouts are cleared */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -3927,6 +4154,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) - { - g_debug ("Stopping power manager"); - -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ } -+ - if (manager->priv->bus_cancellable != NULL) { - g_cancellable_cancel (manager->priv->bus_cancellable); - g_object_unref (manager->priv->bus_cancellable); -@@ -3938,8 +4170,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) - manager->priv->introspection_data = NULL; - } - -- kill_lid_close_safety_timer (manager); -- - g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); - - g_clear_object (&manager->priv->connection); -@@ -3947,6 +4177,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) - g_clear_object (&manager->priv->settings); - g_clear_object (&manager->priv->settings_screensaver); - g_clear_object (&manager->priv->up_client); -+ -+ if (manager->priv->inhibit_lid_switch_fd != -1) { -+ close (manager->priv->inhibit_lid_switch_fd); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_lid_switch_taken = FALSE; -+ } -+ if (manager->priv->inhibit_suspend_fd != -1) { -+ close (manager->priv->inhibit_suspend_fd); -+ manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = FALSE; -+ } -+ -+ g_clear_object (&manager->priv->logind_proxy); - g_clear_object (&manager->priv->x11_screen); - - g_ptr_array_unref (manager->priv->devices_array); -@@ -3980,6 +4223,8 @@ static void - gsd_power_manager_init (GsdPowerManager *manager) - { - manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_suspend_fd = -1; - } - - static void --- -1.8.0 - diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD index 4a051cd96..e964279f9 100644 --- a/extra/gnome-settings-daemon/PKGBUILD +++ b/extra/gnome-settings-daemon/PKGBUILD @@ -1,38 +1,27 @@ -# $Id: PKGBUILD 178088 2013-02-15 23:32:26Z heftig $ +# $Id: PKGBUILD 183398 2013-04-21 22:10:23Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-settings-daemon -pkgver=3.6.4 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 pkgdesc="The GNOME Settings daemon" arch=('i686' 'x86_64') license=('GPL') depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify' - 'libsystemd' 'libwacom' 'nss' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus') + 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg') makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl') options=('!emptydirs' '!libtool') install=gnome-settings-daemon.install url="http://www.gnome.org" groups=('gnome') -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch) -sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' - '5572b5b3f554ce361353a8db42c26a8f789606f65acc5943a286271603fcb8eb') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('367a770ec7affff3c85a43bc39ced5a02a1b1761780d954329f6b21c0f2efcee') build() { cd $pkgname-$pkgver - # logind key handling FS#31801, patch from Fedora - # rebased onto screensaver.patch - patch -Np1 -i ../0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch - - aclocal - autoconf - automake --add-missing - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon --disable-static \ - --enable-systemd + --libexecdir=/usr/lib/gnome-settings-daemon --disable-static #https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool @@ -43,9 +32,4 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - - # Plugins that aren't installed still have schema references - # and cause gsettings errors - remove the references we're not using - sed -i '/org\.gnome\.settings-daemon\.plugins\.updates/d' \ - "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml" } diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 8ecc52e2e..0e64fdb22 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,34 +1,31 @@ -# $Id: PKGBUILD 179858 2013-03-10 16:33:19Z heftig $ +# $Id: PKGBUILD 183399 2013-04-21 22:10:25Z heftig $ # Maintainer: Ionut Biru # Contributor: Flamelab -Date: Wed, 2 Jan 2013 09:05:32 -0500 -Subject: [PATCH] main: Don't mess up the modal stack when the focus actor is - destroyed - -This seems to be an incorrect conversion when we moved from an array -to an object of keys in 3a6b4f3. - -https://bugzilla.gnome.org/show_bug.cgi?id=690965 ---- - js/ui/main.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/js/ui/main.js b/js/ui/main.js -index 12daee2..1334d58 100644 ---- a/js/ui/main.js -+++ b/js/ui/main.js -@@ -553,7 +553,7 @@ function pushModal(actor, params) { - curFocusDestroyId = curFocus.connect('destroy', function() { - let index = _findModal(actor); - if (index >= 0) -- modalActorFocusStack[index].actor = null; -+ modalActorFocusStack[index].focus = null; - }); - } - modalActorFocusStack.push({ actor: actor, --- -1.8.0.2 \ No newline at end of file diff --git a/extra/gnome-system-log/PKGBUILD b/extra/gnome-system-log/PKGBUILD index 904047d70..8b4c28ac9 100644 --- a/extra/gnome-system-log/PKGBUILD +++ b/extra/gnome-system-log/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170903 2012-11-12 22:38:11Z heftig $ +# $Id: PKGBUILD 183402 2013-04-21 22:10:29Z heftig $ # Maintainer: Ionut Biru pkgname=gnome-system-log -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="View your system logs" arch=(i686 x86_64) @@ -10,10 +10,10 @@ url="http://gnome.org" license=('GPL2') depends=('dconf' 'gtk3') makedepends=('intltool' 'itstool' 'docbook-xsl') -groups=('gnome-extra') +groups=('gnome') install=$pkgname.install source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7b20e59ca271c755400f68446f1f818d4ee3cc7e7e8fa7ba67a843a4eabdecc1') +sha256sums=('2393d00e059212b5a1135589d11412c0639fe9e60958ccff1bac238139dd4967') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD index f0f7b51a5..d98d960df 100644 --- a/extra/gnome-system-monitor/PKGBUILD +++ b/extra/gnome-system-monitor/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169915 2012-10-30 22:34:53Z heftig $ +# $Id: PKGBUILD 183403 2013-04-21 22:10:31Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=gnome-system-monitor -pkgver=3.6.0 +pkgver=3.8.0 pkgrel=1 pkgdesc="A system monitor for GNOME" arch=(i686 x86_64) @@ -12,14 +12,14 @@ depends=('libwnck3' 'libgtop' 'gtkmm3' 'librsvg' 'gnome-icon-theme' 'libsystemd' makedepends=('itstool' 'docbook-xsl' 'intltool') options=(!emptydirs) url="http://www.gnome.org" -groups=('gnome-extra') +groups=('gnome') install=gnome-system-monitor.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5e427d6c7dbe3cfb87afe3feb93882485f79ce71556e5b855152055d8a6080ab') +sha256sums=('2d5bdd81c19bc34f83c0ccfde998007df9ef517f5e4bfb5e36513a76c21dce86') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/gnome-system-monitor make } diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD index c25f8186b..d06de63cb 100644 --- a/extra/gnome-terminal/PKGBUILD +++ b/extra/gnome-terminal/PKGBUILD @@ -1,33 +1,35 @@ -# $Id: PKGBUILD 179947 2013-03-13 11:01:23Z jgc $ +# $Id: PKGBUILD 183404 2013-04-21 22:10:33Z heftig $ # Maintainer: Jan de Groot pkgname=gnome-terminal -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="The GNOME Terminal Emulator" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gconf' 'vte3' 'gsettings-desktop-schemas' 'libsm') -makedepends=('gnome-doc-utils' 'intltool' 'gtk2' 'itstool' 'docbook-xsl') -options=('!emptydirs') +arch=(i686 x86_64) +license=(GPL) +depends=(vte3 gsettings-desktop-schemas libsm dconf) +makedepends=(gnome-doc-utils intltool itstool docbook-xsl desktop-file-utils python2 gconf) +optdepends=('gconf: settings migration when upgrading from older version') +options=('!emptydirs' '!libtool') url="http://www.gnome.org" groups=('gnome') install=gnome-terminal.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('c6816f77eaae791dadeef89596df811e2fa353088241aa0613bb8e1af63304f6') +sha256sums=('c49afab26973225f41ed35a9d5b5180d6207757e524056656146b30692f39fff') build() { - cd "$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-scrollkeeper + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static make } -package() { - cd "$pkgname-$pkgver" - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install +check() { + cd $pkgname-$pkgver + make check +} - 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 +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gnome-terminal/gnome-terminal.install b/extra/gnome-terminal/gnome-terminal.install index 1d8510f06..260d56cb2 100644 --- a/extra/gnome-terminal/gnome-terminal.install +++ b/extra/gnome-terminal/gnome-terminal.install @@ -1,17 +1,13 @@ -pkgname=gnome-terminal - post_install() { - gconfpkg --install $pkgname + glib-compile-schemas /usr/share/glib-2.0/schemas } pre_upgrade() { - pre_remove $1 + if [ -f /usr/share/gconf/schemas/gnome-terminal.schemas ]; then + gconfpkg --uninstall gnome-terminal + fi } post_upgrade() { post_install $1 } - -pre_remove() { - gconfpkg --uninstall $pkgname -} diff --git a/extra/gnome-tetravex/PKGBUILD b/extra/gnome-tetravex/PKGBUILD new file mode 100644 index 000000000..b07cb7346 --- /dev/null +++ b/extra/gnome-tetravex/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183405 2013-04-21 22:10:35Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=gnome-tetravex +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Complete the puzzle by matching numbered tiles" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=gnome-tetravex.install +url="https://live.gnome.org/Tetravex" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('30491c1e9005d8f17f6f9655c3a9b553bcaa16e353719ce1de60630a71150ea3') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-tetravex/gnome-tetravex.install b/extra/gnome-tetravex/gnome-tetravex.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/gnome-tetravex/gnome-tetravex.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/gnome-themes-standard/PKGBUILD b/extra/gnome-themes-standard/PKGBUILD index 74d7d351d..06223609d 100644 --- a/extra/gnome-themes-standard/PKGBUILD +++ b/extra/gnome-themes-standard/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 178299 2013-02-19 18:40:52Z heftig $ +# $Id: PKGBUILD 183406 2013-04-21 22:10:36Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-themes-standard -pkgver=3.6.5 +pkgver=3.8.1 pkgrel=1 pkgdesc="Default themes for the GNOME desktop" arch=(i686 x86_64) @@ -14,9 +14,9 @@ optdepends=('gtk-engines: HighContrast GTK2 theme') groups=(gnome) replaces=(gnome-themes) conflicts=(gnome-themes) -options=('!libtool') +options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e39129063b2edcad19370e06b46bbe7fb61fcb4a0c5901eaa9e0d08080097a3c') +sha256sums=('5cc1b27a70ca6176343212159236332799b074885867e380ed9b3817e15dd1d1') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD index d888fe696..1803e181d 100644 --- a/extra/gnome-user-share/PKGBUILD +++ b/extra/gnome-user-share/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 169920 2012-10-30 22:35:10Z heftig $ +# $Id: PKGBUILD 183409 2013-04-21 22:10:42Z heftig $ # Maintainer: Roman Kyrylych pkgname=gnome-user-share -pkgver=3.0.4 +pkgver=3.8.0 pkgrel=1 pkgdesc="Easy to use user-level file sharing for GNOME." arch=('i686' 'x86_64') url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/" license=('GPL') -depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra') -makedepends=('intltool' 'nautilus' 'itstool' 'docbook-xsl') +depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra' 'dbus-glib') +makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl') options=('!emptydirs' '!libtool') +groups=('gnome') install=gnome-user-share.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('e1c8ca73163bf77ce7ca1b92db94cd9c4680a24b940d620996c9331ab79edeb8') +sha256sums=('ae0638a24cf306b6615639a8706c9b48e8961ae26d7f8b5d65eb26955ca4cc3f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-weather/PKGBUILD b/extra/gnome-weather/PKGBUILD new file mode 100644 index 000000000..ad522aab2 --- /dev/null +++ b/extra/gnome-weather/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 183410 2013-04-21 22:10:43Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=gnome-weather +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Access current weather conditions and forecasts" +arch=(i686 x86_64) +url="https://www.gnome.org/" +license=(GPL) +depends=(gtk3 gjs libgweather) +makedepends=(intltool gobject-introspection) +options=(!libtool) +groups=(gnome-extra) +install=gnome-weather.install +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::3}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('9dbbf0aa50a940894a9ebf63001163a8fa89c3aa8febbddcd3c6c6eefbc00f3d') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/gnome-weather/gnome-weather.install b/extra/gnome-weather/gnome-weather.install new file mode 100644 index 000000000..c25dff2d3 --- /dev/null +++ b/extra/gnome-weather/gnome-weather.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/gobject-introspection/PKGBUILD b/extra/gobject-introspection/PKGBUILD index 70d51787d..124f50f3a 100644 --- a/extra/gobject-introspection/PKGBUILD +++ b/extra/gobject-introspection/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170882 2012-11-12 22:03:02Z heftig $ +# $Id: PKGBUILD 183411 2013-04-21 22:10:45Z heftig $ # Maintainer: Jan de Groot pkgname=gobject-introspection -pkgver=1.34.2 +pkgver=1.36.0 pkgrel=1 pkgdesc="Introspection system for GObject-based libraries" url="https://live.gnome.org/GObjectIntrospection" @@ -12,7 +12,7 @@ depends=('glib2' 'python2' 'python2-mako') makedepends=('cairo') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz) -sha256sums=('bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429') +sha256sums=('e3e76d9d428e7534761bf8cdf75338865a4b0872e8052bef51792744608b6383') build() { cd "$pkgname-$pkgver" diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD index ce6128bf3..4fe44da7c 100644 --- a/extra/grilo-plugins/PKGBUILD +++ b/extra/grilo-plugins/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 173150 2012-12-11 17:04:18Z heftig $ +# $Id: PKGBUILD 183412 2013-04-21 22:10:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=grilo-plugins -pkgver=0.2.5 +pkgver=0.2.6 pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" -arch=('i686' 'x86_64') -license=('LGPL') -depends=('grilo' 'sqlite' 'libgcrypt') +arch=(i686 x86_64) +license=(LGPL) +depends=(grilo sqlite libgcrypt) makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing json-glib) optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'libquvi: Youtube plugin, Vimeo plugin' - 'sqlite: Podcasts plugin' 'gmime: Podcasts plugin' 'rest: Blip.tv plugin' 'libtracker-sparql: Tracker plugin' @@ -23,11 +22,10 @@ optdepends=('gupnp-av: uPnP plugin' 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('32ae6c8ebf624e5662f209435d8aae6a5db23d7c52d446c9b9479c0b441a3ab3') +sha256sums=('029ea7fdbb32ff5cc20295b9a1a943f76f39a67ed5bf08a2b33b01cf287a1227') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ --enable-shoutcast make diff --git a/extra/gssdp/PKGBUILD b/extra/gssdp/PKGBUILD index ed541c584..37740bef3 100644 --- a/extra/gssdp/PKGBUILD +++ b/extra/gssdp/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 169927 2012-10-30 22:45:20Z heftig $ +# $Id: PKGBUILD 183414 2013-04-21 22:10:50Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: György Balló pkgname=gssdp -pkgver=0.12.2.1 +pkgver=0.14.2 pkgrel=1 pkgdesc="A GObject-based API for handling resource discovery and announcement over SSDP" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://gupnp.org/" -license=('LGPL') -depends=('libsoup') -makedepends=('gobject-introspection' 'gtk2' 'gtk-doc') +license=(LGPL) +depends=(libsoup) +makedepends=(gobject-introspection gtk2 gtk-doc vala) optdepends=('gtk2: gssdp-device-sniffer') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('928aa257815d044fdbfc740f5799530d41897947b5d7854173f636b36d728414') +sha256sums=('a1a255ed45b45fbf0004dfc5d8e566551f4857bc16599e7f756965733f9411fc') build() { cd $pkgname-$pkgver diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD index 6789eb952..2c6b76c64 100644 --- a/extra/gthumb/PKGBUILD +++ b/extra/gthumb/PKGBUILD @@ -1,29 +1,28 @@ -# $Id: PKGBUILD 169934 2012-10-30 22:45:37Z heftig $ +# $Id: PKGBUILD 183415 2013-04-21 22:10:51Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Tobias Kieslich pkgname=gthumb -pkgver=3.1.2 +pkgver=3.2.1 pkgrel=1 pkgdesc="Image browser and viewer for the GNOME Desktop" arch=(i686 x86_64) -license=('GPL') +license=(GPL) url="http://live.gnome.org/gthumb" -depends=('desktop-file-utils' 'hicolor-icon-theme' 'dconf' 'librsvg' 'clutter-gtk' - 'gstreamer0.10-base' 'gsettings-desktop-schemas' 'libwebp') -makedepends=('intltool' 'gnome-doc-utils' 'libchamplain' 'libopenraw' 'exiv2' 'libsoup-gnome' - 'brasero' 'librsvg' 'libopenraw' 'liboauth') +depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk + gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret + libsoup webkitgtk3 json-glib) +makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl) 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=('5e7f80b3ffa8a6e06b9f1bf0cfa869f772af4163b842a7f457c9dc68ff7e6f8f') +sha256sums=('3eacbb9912923fb5da3e7a52be58c6e7470e598b06c1b7b51b76809fc4855b61') build() { cd $pkgname-$pkgver @@ -37,6 +36,11 @@ build() { make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/gtk2-perl/PKGBUILD b/extra/gtk2-perl/PKGBUILD index 9a87154b0..cde0800ff 100644 --- a/extra/gtk2-perl/PKGBUILD +++ b/extra/gtk2-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160485 2012-06-02 10:26:22Z bluewind $ +# $Id: PKGBUILD 183485 2013-04-21 22:21:05Z heftig $ # Maintainer: Jan de Groot # Contributor: Sarah Hay pkgname=gtk2-perl -pkgver=1.244 +pkgver=1.247 pkgrel=1 pkgdesc="Perl bindings for GTK+ 2.x" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('gtk2' 'pango-perl') checkdepends=('ttf-dejavu' 'xorg-server-xvfb') options=('!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Gtk2-${pkgver}.tar.gz) -md5sums=('191fda807f44a7c82d699838bf544bca') +md5sums=('b65b0293cce3ac3786c37a7fa508e506') build() { cd "${srcdir}/Gtk2-${pkgver}" diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 94799147a..4d9153985 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 179073 2013-03-03 00:49:43Z heftig $ +# $Id: PKGBUILD 183416 2013-04-21 22:10:54Z heftig $ # Maintainer: Ionut Biru pkgname=gtk3 -pkgver=3.6.4 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64) url="http://www.gtk.org/" install=gtk3.install -depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi - libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon) -makedepends=(gobject-introspection mesa) +depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama libxrandr libxi libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon) +makedepends=(gobject-introspection) options=('!libtool') backup=(etc/gtk-3.0/settings.ini) license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('dbda37986f934f986c0bb20f2b0c59f2717a2e5c098370ad69677ff89295f1a1' +sha256sums=('f43e7c7d7a0e2417225509e88f67799534c69abfbb6f615fc7a895bf15e31255' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') build() { cd "gtk+-$pkgver" diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index 9d10fd671..f0a9b4a3c 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169938 2012-10-30 22:45:55Z heftig $ +# $Id: PKGBUILD 183317 2013-04-21 22:06:35Z heftig $ # Maintainer: Ionut Biru pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.6.0 +pkgver=3.8.0 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359') +sha256sums=('dbddb143fe671ee321d19de2dbae00c0f67e78ce90447227b23062137b1828bd') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index 3ff1544fd..12719afc1 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170209 2012-11-05 11:49:55Z jgc $ +# $Id: PKGBUILD 183417 2013-04-21 22:10:55Z heftig $ # Maintainer: Ionut Biru pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ 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=('a9d31df02acc6e9a9547b5ebaee19d1dc4c87b216eb561ee19da69bd1bb1bd0d') +sha256sums=('f08005bfa5ecb71b05c4046d585ae072f084c90003b281a3ced8d882b96fe3cd') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD index 772316572..93211a0e7 100644 --- a/extra/gucharmap/PKGBUILD +++ b/extra/gucharmap/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 170906 2012-11-12 22:40:18Z heftig $ +# $Id: PKGBUILD 183418 2013-04-21 22:10:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan De Groot pkgname=gucharmap -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="Gnome Unicode Charmap" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org" depends=('dconf' 'gtk3' 'hicolor-icon-theme') -makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl') +makedepends=('gtk-doc' 'intltool' 'gobject-introspection' 'itstool' 'docbook-xsl' 'desktop-file-utils') options=('!libtool' '!emptydirs') install=gucharmap.install source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) -sha256sums=('c3aad2990010ab66225b748e6ac5402cad9f21e908cddf728e57d755c54cc6b2') +sha256sums=('dc3223c7bd5dac4b979295cf7678c873046f8525f7d6f5562ab98239f563afc1') build() { cd $pkgname-$pkgver diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD index b1e0e90e4..d4d8a0b83 100644 --- a/extra/gupnp-av/PKGBUILD +++ b/extra/gupnp-av/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 170152 2012-11-03 17:56:09Z heftig $ +# $Id: PKGBUILD 183420 2013-04-21 22:11:00Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Thijs Vermeir # Contributor: Denis Zawada pkgname=gupnp-av -pkgver=0.10.3 +pkgver=0.12.1 pkgrel=1 pkgdesc="Library to ease handling and implementation of UPnP A/V profiles" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://gupnp.org/" -license=('LGPL') -depends=('gupnp') -makedepends=('gobject-introspection' 'gtk-doc') +license=(LGPL) +depends=(gupnp) +makedepends=(gobject-introspection gtk-doc vala) options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d0dbb727d87bc9f2dc834455d14a30700b16b41a57e9dcde2e822b378ca8f1e2') +sha256sums=('7c73f3c1e1c8f552079b8db8971348acf85078c82ed4da883b218bd993fcd4c4') build() { cd $pkgname-$pkgver @@ -23,6 +23,11 @@ build() { make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD index a81e59dcc..0e4a1cb98 100644 --- a/extra/gupnp-dlna/PKGBUILD +++ b/extra/gupnp-dlna/PKGBUILD @@ -1,29 +1,33 @@ -# $Id: PKGBUILD 180467 2013-03-21 22:39:20Z heftig $ -# Maintainer: Balló György +# $Id: PKGBUILD 183421 2013-04-21 22:11:02Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Balló György pkgname=gupnp-dlna -pkgver=0.6.6 +pkgver=0.10.1 pkgrel=1 pkgdesc="Library to ease DLNA-related bits for applications using gupnp" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://gupnp.org/" -license=('LGPL') -depends=('gstreamer0.10-base-plugins') -makedepends=('gobject-introspection') +license=(LGPL) +depends=(gst-plugins-base-libs) +makedepends=(gobject-introspection gtk-doc vala) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('82a1e75c398379567a5a5db9acd19bd01334b4f0053c8a166a77bc09bf0ca047') +sha256sums=('c514ec6edd2a427914ef79fed002f91b875fde127084f21d770401a1d2b95f7b') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static make } -package() { - cd "$srcdir/$pkgname-$pkgver" +check() { + cd $pkgname-$pkgver + make check +} - make DESTDIR="$pkgdir/" install +package() { + cd $pkgname-$pkgver + make -j1 DESTDIR="$pkgdir" install } diff --git a/extra/gupnp-igd/PKGBUILD b/extra/gupnp-igd/PKGBUILD index 8e08e3a17..45297def4 100644 --- a/extra/gupnp-igd/PKGBUILD +++ b/extra/gupnp-igd/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 159125 2012-05-16 11:29:35Z eric $ +# $Id: PKGBUILD 183422 2013-04-21 22:11:03Z heftig $ # Maintainer: Eric Bélanger # Contributor: William Díaz pkgname=gupnp-igd -pkgver=0.2.1 -pkgrel=3 +pkgver=0.2.2 +pkgrel=1 pkgdesc="A library to handle UPnP IGD port mapping" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gupnp.org" -license=('LGPL') -depends=('gupnp' 'python2-gobject2') -makedepends=('gettext') +license=(LGPL) +depends=(gupnp python2-gobject2) +makedepends=(gettext) options=('!libtool' '!makeflags') -source=(http://www.gupnp.org/sites/all/files/sources/${pkgname}-${pkgver}.tar.gz) -sha1sums=('409cb45e495dfa61c4ce4a74f8ba06f2784c39e2') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) +sha1sums=('bd24e98b224b3a233b0ab6714638ed4c6bf64b47') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver PYTHON=python2 ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD index 936748aef..12b2897c2 100644 --- a/extra/gupnp/PKGBUILD +++ b/extra/gupnp/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 169941 2012-10-30 22:46:05Z heftig $ +# $Id: PKGBUILD 183419 2013-04-21 22:10:59Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: György Balló pkgname=gupnp -pkgver=0.18.4 +pkgver=0.20.2 pkgrel=1 pkgdesc="An object-oriented UPNP framework" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://gupnp.org/" -license=('LGPL') -depends=('gssdp' 'util-linux') -makedepends=('gobject-introspection' 'gtk-doc') +license=(LGPL) +depends=(gssdp util-linux) +makedepends=(gobject-introspection gtk-doc vala) optdepends=('python2: gupnp-binding-tool') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('6b437d5711b212292c6080626b97480268310da636a6cf937ad6119291af78a1') +sha256sums=('9b27b1bdd16f7f13e28e20bce85a117e577a8183f95615876a9d91f4d4a70812') build() { cd $pkgname-$pkgver @@ -24,6 +24,11 @@ build() { make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 71ae96a7d..e88672f00 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,23 +1,20 @@ -# $Id: PKGBUILD 179106 2013-03-03 17:28:34Z dreisner $ +# $Id: PKGBUILD 183318 2013-04-21 22:06:37Z heftig $ # Maintainer: Jan de Groot pkgbase=gvfs -pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp') -pkgver=1.14.2 -pkgrel=4 +pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') +pkgver=1.16.1 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') -makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup-gnome' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3') +makedepends=('avahi' 'bluez' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz - fix-paranoia-include.patch) -sha256sums=('c3bbdac4bc89de82a2ba373799da80d24fb6a038a9893d9b54e2c9429c878fbc' - '4385f9c5100bc0e01c59d07bef07737bb8155e60b56d3ee948e0b48ff207ff76') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +sha256sums=('e7ec47547ff8029a2e8d81533bdfa870fe4a547c9d7c4e1e946d42d38970b0ac') build() { cd "$pkgbase-$pkgver" - patch -Np0 -i ../fix-paranoia-include.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ @@ -27,24 +24,28 @@ build() { package_gvfs() { pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio" - depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup-gnome' 'udisks2' 'libsecret') + depends=('avahi' 'dconf' 'fuse' 'libarchive' 'libcdio-paranoia' 'libsoup>=2.24.0' 'udisks2' 'libsecret' 'libbluray') optdepends=('gvfs-afc: AFC (mobile devices) support' 'gvfs-smb: SMB/CIFS (Windows client) support' 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support' 'gvfs-obexftp: ObexFTP (bluetooth) support' 'gvfs-afp: Apple Filing Protocol (AFP) support' + 'gvfs-mtp: MTP device support' + 'gvfs-goa: gnome-online-accounts support' 'gtk3: Recent files support') install=gvfs.install cd "$pkgbase-$pkgver" sed -e 's/^am__append_4/#am__append_4/' \ -e 's/^am__append_5/#am__append_5/' \ + -e 's/^am__append_6/#am__append_6/' \ + -e 's/^am__append_7/#am__append_7/' \ -i monitor/Makefile make DESTDIR="$pkgdir" install 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/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp} + rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp,mtp}.mount rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml rm usr/share/GConf/gsettings/gvfs-smb.convert } @@ -114,3 +115,25 @@ package_gvfs-afp() { install -m755 .libs/gvfsd-afp{,-browse} "$pkgdir/usr/lib/gvfs/" install -m644 afp{,-browse}.mount "$pkgdir/usr/share/gvfs/mounts/" } + +package_gvfs-mtp() { + pkgdesc="MTP backend for gvfs" + depends=("gvfs=$pkgver" 'libmtp') + install=gvfs-module.install + + cd "$pkgbase-$pkgver/daemon" + install -D .libs/gvfsd-mtp "$pkgdir/usr/lib/gvfs/gvfsd-mtp" + install -Dm644 mtp.mount "$pkgdir/usr/share/gvfs/mounts/mtp.mount" + + cd "$srcdir/$pkgbase-$pkgver/monitor/mtp" + make DESTDIR="$pkgdir" install +} + +package_gvfs-goa() { + pkgdesc="Gnome Online Accounts (webservices) backend for gvfs" + depends=("gvfs=$pkgver" 'gnome-online-accounts') + install=gvfs-module.install + + cd "$srcdir/$pkgbase-$pkgver/monitor/goa" + make DESTDIR="$pkgdir" install +} diff --git a/extra/gvfs/fix-paranoia-include.patch b/extra/gvfs/fix-paranoia-include.patch deleted file mode 100644 index 02856a06f..000000000 --- a/extra/gvfs/fix-paranoia-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- daemon/gvfsbackendcdda.c.orig 2013-01-08 11:19:52.311593338 +0000 -+++ daemon/gvfsbackendcdda.c 2013-01-08 11:20:05.778169190 +0000 -@@ -55,7 +55,7 @@ - #include "gvfsjobenumerate.h" - - #define DO_NOT_WANT_PARANOIA_COMPATIBILITY --#include -+#include - #include - - /* TODO: diff --git a/extra/iagno/PKGBUILD b/extra/iagno/PKGBUILD new file mode 100644 index 000000000..5b3929525 --- /dev/null +++ b/extra/iagno/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183423 2013-04-21 22:11:05Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=iagno +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Dominate the board in a classic version of Reversi" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'libcanberra' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=iagno.install +url="https://live.gnome.org/Iagno" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('03e96eaada69d95b709e438ccb69911fea330be8827df320c5dff02d75a59efd') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/iagno/iagno.install b/extra/iagno/iagno.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/iagno/iagno.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD index e937e4b61..661a3099e 100644 --- a/extra/java7-openjdk/PKGBUILD +++ b/extra/java7-openjdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179933 2013-03-12 17:11:40Z andyrtr $ +# $Id: PKGBUILD 183538 2013-04-22 17:24:27Z andyrtr $ # Maintainer: Andreas Radke # Maintainer: Guillaume ALAUX # Contributor: Jan de Groot @@ -8,17 +8,17 @@ pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' pkgbase=java7-openjdk _java_ver=7 _updatever=u17 -_icedtea_ver=2.3.8 +_icedtea_ver=2.3.9 # check "${srcdir}/icedtea7"/Makefile.am -_CORBA_CHANGESET=516aae5f27cf -_JAXP_CHANGESET=1fbe99283d97 -_JAXWS_CHANGESET=3c7be82314bf -_JDK_CHANGESET=deac45dc94f0 -_LANGTOOLS_CHANGESET=41426c72b802 -_OPENJDK_CHANGESET=ed02a059ea15 +_CORBA_CHANGESET=47a6bf94ce11 +_JAXP_CHANGESET=d2142901bcb7 +_JAXWS_CHANGESET=b1877762d45c +_JDK_CHANGESET=8e91101e36f0 +_LANGTOOLS_CHANGESET=fd956199cb82 +_OPENJDK_CHANGESET=12b96a57263c -_HOTSPOT_CHANGESET=a152dced63a1 # see "${srcdir}/icedtea7"/hotspot.map +_HOTSPOT_CHANGESET=ad5a321edea2 # see "${srcdir}/icedtea7"/hotspot.map _bootstrap=0 # 0/1 for quick build or full bootstrap @@ -50,14 +50,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar jdk7-openjdk.profile.csh jre7-openjdk.profile jre7-openjdk.profile.csh) -sha256sums=('750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153' - '865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b' - '181ceb85a4dade1a8d8465e2d69255ee3612dbc5a50699a59a4f21e69be7a1c6' - 'ed3a963c4309316fba654f0a60ba4bec21b2d170e64423eddfa2ba635ac76572' - '4abe7366900327a0de21caee8a7b0ea5494821507a02bfb07cffc980cebe90ad' - '00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215' - 'cbef395a2af27673a3611ed50d84a76ae9f9539a7c42ed8e06e171bfc1ac030c' - 'eac2313e3012653afa7549257765d56e4348c775363eee0733968d32a7c1eeae' +sha256sums=('7e1fdd4c53c9772337c971b6f6f8058dabd99d7f4c4fcc85c88d836c9005c6da' + '651f99364e451d79156c879b8c8e47b8568fb3b4e4d28ebc38d36028acbed8bc' + '7346565688c3f01872af2c16a491233325ad5e924475dc89ff01f50582814934' + '8cad2dfee2d5e58a217193dcc9650debe519f72df7c136a15311195c9a1b48d6' + 'b8e109ac705b95e5605280c8ae13319a128e16eac950a455bfa30364ae4192cc' + '349009abfc8df1575336648bebd8a5ff0cb0f2ad045f6b661d88691411881d5e' + '2806de9d41a91acff5bb917ec9dc41cb805e893b43828491b920f9ec14b53b12' + 'c184f29b13626e7327f58e4c1df506daf2b57d8084b7a2d2106504ab0fd5eaac' '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f' '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479' 'b742113dc6debc3eb92a246e442595481c04a2a3973e7902b86037acb50050ea' @@ -82,11 +82,6 @@ noextract=("${_OPENJDK_CHANGESET}.tar.gz" build() { cd "${srcdir}/icedtea-${_icedtea_ver}" - -# unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS - -# # default is to build with first found java-environment found in our repos - is jdk7-openjdk -# [ -f /etc/profile.d/jdk.sh ] && . /etc/profile.d/jdk.sh export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}" export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}" diff --git a/extra/js/PKGBUILD b/extra/js/PKGBUILD index 71d3ac492..7671edddf 100644 --- a/extra/js/PKGBUILD +++ b/extra/js/PKGBUILD @@ -1,39 +1,35 @@ -# $Id: PKGBUILD 132237 2011-07-21 21:43:04Z ibiru $ +# $Id: PKGBUILD 183424 2013-04-21 22:11:07Z heftig $ # Maintainer: Ionut Biru + pkgname=js -pkgver=1.8.5 -pkgrel=3 +pkgver=17.0.0 +pkgrel=1 pkgdesc="JavaScript interpreter and libraries" arch=(i686 x86_64) -url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5" -license=('GPL2') -depends=('nspr' 'gcc-libs') -makedepends=('python2' 'zip') -replaces=('spidermonkey') -conflicts=('spidermonkey') -source=(http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz - js185-destdir.patch) -md5sums=('a4574365938222adca0a6bd33329cb32' - '364834a8391888642c53d78c3a949d94') -build() { - cd "$srcdir/$pkgname-$pkgver/js/src" - - patch -Np0 -i $srcdir/js185-destdir.patch - - ./configure --prefix=/usr --with-system-nspr \ - --enable-threadsafe +url="https://developer.mozilla.org/En/SpiderMonkey/17" +license=(MPL) +depends=(nspr gcc-libs libffi readline) +makedepends=(python2 zip) +options=(!staticlibs) +source=(http://ftp.mozilla.org/pub/mozilla.org/js/mozjs$pkgver.tar.gz) +md5sums=('20b6f8f1140ef6e47daa3b16965c9202') +build() { + cd mozjs$pkgver/js/src + ./configure --prefix=/usr --with-system-nspr --with-system-ffi \ + --enable-readline --enable-threadsafe make } +check() { + cd mozjs$pkgver/js/src + make check +} + package() { - cd "$srcdir/$pkgname-$pkgver/js/src" + cd mozjs$pkgver/js/src make DESTDIR="$pkgdir" install - - install -m 0755 shell/js ${pkgdir}/usr/bin - - #cleanup - rm -f "${pkgdir}/usr/lib/libmozjs185-1.0.a" + find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} + } # vim:set ts=2 sw=2 et: diff --git a/extra/js/js185-destdir.patch b/extra/js/js185-destdir.patch deleted file mode 100644 index 87b7b53b3..000000000 --- a/extra/js/js185-destdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -#https://bugzilla.mozilla.org/show_bug.cgi?id=628723 - ---- Makefile.in.old 2011-04-10 04:21:19.918608008 -0700 -+++ Makefile.in 2011-04-10 04:21:58.088607992 -0700 -@@ -888,8 +888,8 @@ - ifeq (,$(HOST_BIN_SUFFIX)) - mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) - @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) -- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) -- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) -+ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) -+ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) - endif - endif - ifneq (,$(IMPORT_LIBRARY)) diff --git a/extra/js185/PKGBUILD b/extra/js185/PKGBUILD new file mode 100644 index 000000000..94db39ed1 --- /dev/null +++ b/extra/js185/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 183425 2013-04-21 22:11:08Z heftig $ +# Maintainer: Ionut Biru + +pkgname=js185 +pkgver=1.0.0 +pkgrel=2 +pkgdesc="JavaScript interpreter and libraries (legacy)" +arch=(i686 x86_64) +url="https://developer.mozilla.org/En/SpiderMonkey/1.8.5" +license=(MPL) +depends=(nspr gcc-libs) +makedepends=(python2 zip) +options=(!staticlibs) +source=(http://ftp.mozilla.org/pub/mozilla.org/js/$pkgname-$pkgver.tar.gz) +md5sums=('a4574365938222adca0a6bd33329cb32') + +build() { + cd js-1.8.5/js/src + + # _FORTIFY_SOURCE causes configure error + unset CPPFLAGS + + ./configure --prefix=/usr --with-system-nspr \ + --enable-threadsafe + make +} + +package() { + cd js-1.8.5/js/src + make DESTDIR="$pkgdir" install + install -Dm755 shell/js "$pkgdir/usr/bin/js" + find "$pkgdir"/usr/{lib/pkgconfig,include} -type f -exec chmod -x {} + + + # Bad symlinks (absolute, including DESTDIR!) + cd "$pkgdir/usr/lib" + ln -sf libmozjs185.so.1.0.0 libmozjs185.so.1.0 + ln -sf libmozjs185.so.1.0 libmozjs185.so +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index 4fb7d5577..11602403f 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181906 2013-04-05 08:54:51Z svenstaro $ +# $Id: PKGBUILD 183526 2013-04-22 11:05:18Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Pierre Schmitz @@ -11,7 +11,7 @@ pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdeadmin') -makedepends=('cmake' 'automoc4') +makedepends=('cmake' 'automoc4' 'kdepimlibs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') sha1sums=('885f63b846e9e8d1485c9261544efb2ab0eea58e' diff --git a/extra/libchamplain/PKGBUILD b/extra/libchamplain/PKGBUILD index 52659e26a..04ef0a6a2 100644 --- a/extra/libchamplain/PKGBUILD +++ b/extra/libchamplain/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 163767 2012-07-19 08:35:19Z heftig $ +# $Id: PKGBUILD 183426 2013-04-21 22:11:10Z heftig $ # Maintainer: Andreas Radke # Contributor: Michael Kanis pkgname=libchamplain pkgver=0.12.3 -pkgrel=1 +pkgrel=2 pkgdesc="Gtk3 widget for displaying rasterized maps" url="http://projects.gnome.org/libchamplain/" license=('LGPL') arch=('i686' 'x86_64') options=('!libtool') -depends=('clutter-gtk' 'libsoup-gnome' 'cairo' 'sqlite') +depends=('clutter-gtk' 'libsoup' 'cairo' 'sqlite') makedepends=('gobject-introspection' 'gtk-doc' 'vala') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) sha256sums=('3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658') diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index 7adb0bc35..d604f74e2 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 180676 2013-03-25 19:13:49Z bpiotrowski $ +# $Id: PKGBUILD 183427 2013-04-21 22:11:12Z heftig $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=libgda -pkgver=5.1.1 +pkgver=5.1.2 pkgrel=1 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64) license=('GPL') depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup' - 'libmariadbclient' 'postgresql-libs' 'python2' 'libgnome-keyring' + 'libmariadbclient' 'postgresql-libs' 'python2' 'libsecret' 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2' 'iso-codes' 'openssl' 'libgcrypt' 'libldap') makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala') @@ -17,7 +17,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=('41a54e60d91758d1d239e5127c856ff0412a5709e92440e9107178af928ed5e1') +sha256sums=('59c4416a151297a406091fcfe7af781ea88af3381d10b365ba73b1eb8e23b6c5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD index 72b029159..d1a42f932 100644 --- a/extra/libgdata/PKGBUILD +++ b/extra/libgdata/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 169948 2012-10-30 22:46:31Z heftig $ +# $Id: PKGBUILD 183428 2013-04-21 22:11:14Z heftig $ # Maintainer: Jan de Groot pkgname=libgdata -pkgver=0.13.2 +pkgver=0.13.3 pkgrel=1 pkgdesc="GLib-based library for accessing online service APIs using the GData protocol" arch=('i686' 'x86_64') license=('GPL') -depends=('libsoup-gnome' 'liboauth' 'gcr' 'gnome-online-accounts') +depends=('libsoup' 'liboauth' 'gcr' 'gnome-online-accounts') 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=('3dc4e3529b4bf13d4ae4ef7cc4d74c3b5c90bd96e7d9fa83db2066a2b9a36330') +sha256sums=('4bf52706b2ab404f8b128e000509acd9937facf26916d3e907a3db8653f73637') build() { cd "$pkgname-$pkgver" diff --git a/extra/libgee/PKGBUILD b/extra/libgee/PKGBUILD index 4a7600bfd..cf188fed8 100644 --- a/extra/libgee/PKGBUILD +++ b/extra/libgee/PKGBUILD @@ -1,27 +1,34 @@ -# $Id: PKGBUILD 175984 2013-01-25 15:31:43Z ioni $ +# $Id: PKGBUILD 183429 2013-04-21 22:11:15Z heftig $ # Maintainer : Ionut Biru # Contributor: Sergej Pupykin pkgname=libgee -pkgver=0.6.7 +pkgver=0.10.1 pkgrel=1 pkgdesc="GObject collection library" url="http://live.gnome.org/Libgee" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('glib2') -makedepends=('gobject-introspection') +license=(LGPL2.1) +arch=(i686 x86_64) +depends=(glib2) +makedepends=(gobject-introspection vala) options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('b512bf1785fbbb6a264be5fac325c42d4e96cc560b22e3f19ea5b01b1414106d') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f50c103107314daee6dc68054e359d5169a19c562902e323ba798b380a2a2c96') build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static - make + cd $pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +check() { + cd $pkgname-$pkgver + # generates a bazillion traps - make sure systemd's core_pattern + # is deactivated, or you'll DoS the journal and the system + #make check } package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/libgee06/PKGBUILD b/extra/libgee06/PKGBUILD new file mode 100644 index 000000000..74d09fc53 --- /dev/null +++ b/extra/libgee06/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 183430 2013-04-21 22:11:17Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Ionut Biru +# Contributor: Sergej Pupykin + +pkgname=libgee06 +_pkgname=libgee +pkgver=0.6.8 +pkgrel=1 +pkgdesc="GObject collection library (legacy)" +url="http://live.gnome.org/Libgee" +license=(LGPL2.1) +arch=(i686 x86_64) +depends=(glib2) +makedepends=(gobject-introspection) +options=('!libtool') +source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz) +sha256sums=('a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3') + +build() { + cd $_pkgname-$pkgver + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/libgnome-keyring/PKGBUILD b/extra/libgnome-keyring/PKGBUILD index 1a6ff1011..abf4e6902 100644 --- a/extra/libgnome-keyring/PKGBUILD +++ b/extra/libgnome-keyring/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 179959 2013-03-13 13:10:14Z jgc $ +#$Id: PKGBUILD 183431 2013-04-21 22:11:18Z heftig $ #Maintainer: Jan De Groot pkgname=libgnome-keyring -pkgver=3.6.0 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="GNOME keyring client library" arch=(i686 x86_64) license=('GPL' 'LGPL') @@ -13,7 +13,7 @@ optdepends=('gnome-keyring: key storage service (or use any other service implem options=('!libtool' '!emptydirs') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('6dca37fb7b37f800f498031ffe303a567410bec09a9bdd877a18865dafcc9830') +sha256sums=('a8646f2bc62ef903be422946a6356b0718f7a4cbb29b5bdd35a84136f6b82f76') build() { cd "$pkgname-$pkgver" diff --git a/extra/libgweather/PKGBUILD b/extra/libgweather/PKGBUILD index 423d07163..07add01da 100644 --- a/extra/libgweather/PKGBUILD +++ b/extra/libgweather/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 170931 2012-11-13 12:56:29Z heftig $ +# $Id: PKGBUILD 183432 2013-04-21 22:11:21Z heftig $ # Maintainer: Jan de Groot pkgname=libgweather -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="Provides access to weather information from the net" arch=('i686' 'x86_64') license=('LGPL') -depends=('libsoup-gnome' 'gnome-icon-theme' 'gtk3') +depends=('libsoup' 'gnome-icon-theme' 'gtk3') makedepends=('intltool' 'gtk-doc' 'gobject-introspection' 'gnome-common') options=('!libtool' '!emptydirs') url="http://www.gnome.org/" @@ -15,7 +15,7 @@ install=libgweather.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gettext-not-xml.patch no_external_gettext.patch) -sha256sums=('0f2aeff290751590ca51e806c3d09054bf87b86b63b89f5179043a9b3fa8a0b0' +sha256sums=('4649f51a881ec375853a782ec1cd279f242baa4b6c1b9ebe09614ac65dd6081a' '40325e0b5464ebb75eaad3c9292c0bab7b15cfefb93011d9ccc0ab82635a9533' 'f07ac07a70ad4999c3acd5d5b82aabd8831e6a45beb9aaed239f212057ded672') diff --git a/extra/liblouis/PKGBUILD b/extra/liblouis/PKGBUILD index 6502b4d6c..462366725 100644 --- a/extra/liblouis/PKGBUILD +++ b/extra/liblouis/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 176085 2013-01-27 11:24:27Z ioni $ +# $Id: PKGBUILD 183433 2013-04-21 22:11:25Z heftig $ # Maintainer: Ionut Biru pkgname=liblouis pkgver=2.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source braille translator and back-translator" arch=(i686 x86_64) url="http://code.google.com/p/liblouis/" license=('GPL3') depends=(glibc) -makedepends=(help2man python2) -optdepends=('python2: for python bindings') +makedepends=(help2man python2 python) options=(!libtool) install=liblouis.install source=(http://liblouis.googlecode.com/files/$pkgname-$pkgver.tar.gz) @@ -29,7 +28,6 @@ package() { cd python LD_PRELOAD+=":$srcdir/$pkgname-$pkgver/liblouis/.libs/liblouis.so" python2 setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1 - - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "$pkgdir"/usr/bin/lou_harnessGenerator + python setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1 } # vim:set ts=2 sw=2 et: diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD index 6031eb6ff..c1bee15e7 100644 --- a/extra/liboauth/PKGBUILD +++ b/extra/liboauth/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145266 2011-12-20 18:56:18Z heftig $ +# $Id: PKGBUILD 183475 2013-04-21 22:15:57Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Kaiting Chen # Contributor: Martin Häger pkgname=liboauth -pkgver=0.9.6 +pkgver=1.0.1 pkgrel=1 pkgdesc='C library implementing OAuth Core RFC 5849' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('MIT') depends=('curl') options=('!libtool') source=("$url/pool/$pkgname-$pkgver.tar.gz") -sha256sums=('9fa0f9d86ac4fbdd8c17d4c242ceef33096e8cf3b1834d9198ccc0cbf8b0f207') +sha256sums=('5087d32fe1db7b588246a7de64fc0c2464c95efdebb2c7fe6f482d9b00e68d8b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libpeas/PKGBUILD b/extra/libpeas/PKGBUILD index 3d722c4b9..5ab3a569a 100644 --- a/extra/libpeas/PKGBUILD +++ b/extra/libpeas/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 169954 2012-10-30 22:46:53Z heftig $ +# $Id: PKGBUILD 183434 2013-04-21 22:11:27Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libpeas -pkgver=1.6.1 -pkgrel=1 +pkgver=1.8.0 +pkgrel=2 pkgdesc="A GObject-based plugins engine" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" -license=('GPL2') -depends=('gtk3' 'hicolor-icon-theme' 'gobject-introspection') -makedepends=('gtk-doc' 'intltool' 'python2-gobject' 'gjs' 'seed' 'glade') +license=(GPL2) +depends=(gtk3 hicolor-icon-theme gobject-introspection) +makedepends=(gtk-doc intltool python-gobject python2-gobject gjs seed glade) optdepends=('gjs: gobject-based plugin engine - gjs 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=('7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz + js17.patch) +sha256sums=('ffbad2d2aad8237722342432f9737a2ba5a2022e1b8171ab57db67995ce2e0fe' + '1a023c402e34203f13f3ffbb27afc9bbe46003cf2c911ceb2a0fc02742e9c889') build() { cd $pkgname-$pkgver - PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ + patch -Np1 -i ../js17.patch + ./configure --prefix=/usr \ --sysconfdir=/etc --localstatedir=/var make } diff --git a/extra/libpeas/js17.patch b/extra/libpeas/js17.patch new file mode 100644 index 000000000..b0f7d041d --- /dev/null +++ b/extra/libpeas/js17.patch @@ -0,0 +1,24 @@ +diff -u -r libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c +--- libpeas-1.8.0/loaders/gjs/peas-extension-gjs.c 2013-01-05 20:32:04.000000000 +0100 ++++ libpeas-1.8.0-js17/loaders/gjs/peas-extension-gjs.c 2013-04-03 00:22:56.726029598 +0200 +@@ -362,7 +362,7 @@ + + if (!JS_GetElement (gexten->js_context, JSVAL_TO_OBJECT (js_retval), + nth_out_arg++, &js_value) || +- js_value == JSVAL_VOID) ++ js_value.asBits == JSVAL_VOID.asBits) + { + g_warning ("Error failed to get out argument %i", nth_out_arg); + return FALSE; +diff -u -r libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c +--- libpeas-1.8.0/loaders/gjs/peas-plugin-loader-gjs.c 2012-08-15 12:40:31.000000000 +0200 ++++ libpeas-1.8.0-js17/loaders/gjs/peas-plugin-loader-gjs.c 2013-04-03 00:19:12.884403305 +0200 +@@ -279,7 +279,7 @@ + + if (!JS_GetPropertyById (js_context, ginfo->extensions, + prop_name_id, &prop_extension_ctor) || +- prop_extension_ctor != extension_ctor) ++ prop_extension_ctor.asBits != extension_ctor.asBits) + continue; + + if (!JS_IdToValue (js_context, prop_name_id, &prop_name_val) || diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD new file mode 100644 index 000000000..814032292 --- /dev/null +++ b/extra/libqmi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183435 2013-04-21 22:11:28Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) + +pkgname=libqmi +pkgver=1.2.0 +pkgrel=2 +pkgdesc="QMI modem protocol helper library" +arch=(i686 x86_64) +url="http://cgit.freedesktop.org/libqmi" +license=(GPL2) +depends=(glib2 bash) +makedepends=(gtk-doc python) +options=('!libtool') +source=($url/snapshot/$pkgname-$pkgver.tar.xz) +sha256sums=('4c0fe5fedd33dffd60d845c571243a2f25834019c159377d8df2c7cf5ff3a515') + +build() { + cd $pkgname-$pkgver + ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 30b49bff8..62f29c27c 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169956 2012-10-30 22:47:03Z heftig $ +# $Id: PKGBUILD 183436 2013-04-21 22:11:30Z heftig $ # Maintainer: Jan de Groot pkgname=librsvg -pkgver=2.36.4 +pkgver=2.37.0 pkgrel=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64) @@ -12,10 +12,10 @@ makedepends=('intltool' 'gtk2' 'gtk3' 'gobject-introspection') optdepends=('gtk3: for rsvg-view-3' 'gtk2: gtk2 SVG engine module') options=('!libtool' '!emptydirs') -url="http://librsvg.sourceforge.net/" +url="https://live.gnome.org/LibRsvg" install=librsvg.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1021935204798f4f0ad3004a09b583668ea94a48593461b147fdcff68a18e6c2') +sha256sums=('06c57dbcb29369d147b4e6ff4257c42ae5120c504c30fb567a27034ee30fd835') build() { cd $pkgname-$pkgver diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD index e220c98f2..c32bc93e5 100644 --- a/extra/libsecret/PKGBUILD +++ b/extra/libsecret/PKGBUILD @@ -2,17 +2,17 @@ # Maintainer: Jan de Groot pkgname=libsecret -pkgver=0.14 +pkgver=0.15 pkgrel=1 pkgdesc='library for storing and retrieving passwords and other secrets.' arch=('i686' 'x86_64') license=('LGPL') url="https://live.gnome.org/Libsecret" depends=('glib2' 'libgcrypt') -makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) -sha256sums=('58a5b9370c093a7a2788869ed59bc56351797a775e100a9644e637851f9713b5') +sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8') build() { cd "$pkgname-$pkgver" diff --git a/extra/libsigc++/PKGBUILD b/extra/libsigc++/PKGBUILD index f40723b17..bb90f4bfc 100644 --- a/extra/libsigc++/PKGBUILD +++ b/extra/libsigc++/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 166999 2012-09-24 17:45:03Z jgc $ +# $Id: PKGBUILD 183319 2013-04-21 22:06:38Z heftig $ # Maintainer: Jan de Groot # Contributor: Tom Newsom pkgbase=libsigc++ pkgname=('libsigc++' 'libsigc++-docs') -pkgver=2.2.11 +pkgver=2.3.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') url="http://libsigc.sourceforge.net/" makedepends=('gcc-libs') options=('!libtool' '!emptydirs') -source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.2/${pkgbase}-${pkgver}.tar.xz") -sha256sums=('9834045f74f56752c2c6b3cdc195c30ab8314ad22dc8e626d6f67f940f1e4957') +source=("http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.3/${pkgbase}-${pkgver}.tar.xz") +sha256sums=('67d05852b31fdb267c9fdcecd40b046a11aa54d884435e99e3c60dd20cd60393') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD index 74fd559f9..aaddde469 100644 --- a/extra/libsocialweb/PKGBUILD +++ b/extra/libsocialweb/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 172299 2012-12-02 08:28:48Z ibiru $ +# $Id: PKGBUILD 183438 2013-04-21 22:11:34Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libsocialweb pkgver=0.25.21 -pkgrel=1 +pkgrel=2 pkgdesc="A personal social data server" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring' - 'json-glib' 'networkmanager') -makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection') +license=(GPL2) +depends=(glib2 gconf 'libsoup>=2.24.0' rest dbus-glib libgnome-keyring + json-glib networkmanager) +makedepends=(intltool gtk-doc vala gobject-introspection) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz libsocialweb-gir-fix.patch) diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 5331e37b5..7e38599ae 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,49 +1,34 @@ -# $Id: PKGBUILD 175189 2013-01-16 10:55:26Z jgc $ +# $Id: PKGBUILD 183439 2013-04-21 22:11:35Z heftig $ # Maintainer: Jan de Groot -pkgbase=libsoup -pkgname=('libsoup' 'libsoup-gnome') -pkgver=2.40.3 +pkgname=libsoup +pkgver=2.42.1 pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL') -makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2') +pkgdesc="GNOME HTTP Library" +arch=(i686 x86_64) +license=(LGPL) url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) +depends=(glib2 libxml2 glib-networking sqlite) +makedepends=(intltool gobject-introspection python2) +provides=("libsoup-gnome=$pkgver-$pkgrel") +conflicts=(libsoup-gnome) +replaces=(libsoup-gnome) options=('!libtool' '!emptydirs') -sha256sums=('82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('20bd5365bb3e7de70fade91ac82c9dea31636318df90b8c26bc4cde2523a8c91') build() { - cd "$pkgbase-$pkgver" - sed -i -e 's/env python/python2/' libsoup/tld-parser.py + cd $pkgname-$pkgver + + # Python3 has UnicodeDecodeErrors + sed -i -e '1s/python$/&2/' libsoup/tld-parser.py + ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make } -package_libsoup() { - pkgdesc="GNOME HTTP Library - base library" - depends=('glib2' 'libxml2' 'glib-networking') - - cd "$pkgbase-$pkgver" +package() { + cd $pkgname-$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" -} - -package_libsoup-gnome() { - pkgdesc="GNOME HTTP Library - GNOME libraries" - depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite') - - 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" } diff --git a/extra/libzapojit/PKGBUILD b/extra/libzapojit/PKGBUILD index 05f5aadff..4d34116e3 100644 --- a/extra/libzapojit/PKGBUILD +++ b/extra/libzapojit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169961 2012-10-30 22:47:17Z heftig $ +# $Id: PKGBUILD 183440 2013-04-21 22:11:37Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=libzapojit -pkgver=0.0.2 +pkgver=0.0.3 pkgrel=1 pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ 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=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24') +sha256sums=('3d25f99329105abb99d1e9651b0aa1842065456ea54c22970a7330e9f3d1c37e') build() { cd "$pkgname-$pkgver" diff --git a/extra/lightsoff/PKGBUILD b/extra/lightsoff/PKGBUILD new file mode 100644 index 000000000..3e8780c64 --- /dev/null +++ b/extra/lightsoff/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=lightsoff +pkgver=3.8.0 +pkgrel=1 +pkgdesc="Turn off all the lights" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=lightsoff.install +url="https://live.gnome.org/Lightsoff" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('767f7876c6f360b0e3c18243c7e2201ea0a31523df890853a572d0325d91c24b') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/lightsoff/lightsoff.install b/extra/lightsoff/lightsoff.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/lightsoff/lightsoff.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 257230350..391a66fa4 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 182366 2013-04-09 15:06:58Z giovanni $ +# $Id: PKGBUILD 183536 2013-04-22 16:39:02Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2013.04.08 +pkgver=2013.04.22 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('25ff9f7bf9e47c699878e58c7789ee13') +md5sums=('83362b57ecfa0ed07a1f1bd93bb4cdfb') build() { cd ${srcdir}/live diff --git a/extra/mash/PKGBUILD b/extra/mash/PKGBUILD index f6fbc9e9b..4b1dbce38 100644 --- a/extra/mash/PKGBUILD +++ b/extra/mash/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 157037 2012-04-23 09:53:25Z ibiru $ +# $Id: PKGBUILD 183442 2013-04-21 22:11:40Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=mash pkgver=0.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A small library for using 3D models within a Clutter scene" arch=('i686' 'x86_64') url="http://clutter-project.org/" @@ -11,7 +11,7 @@ options=('!libtool') license=('LGPL') depends=('clutter') makedepends=('gtk-doc' 'gobject-introspection') -source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +source=(https://github.com/downloads/clutter-project/mash/mash-${pkgver}.tar.xz) sha256sums=('fd4089e2974a1a57f9ba209a0a47924ed157da9fc9a3d65f68a6b9fdca353ccc') build() { diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index 72c2608b0..d47b9bff3 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,38 +1,36 @@ -# $Id: PKGBUILD 166517 2012-09-09 15:40:36Z heftig $ +# $Id: PKGBUILD 183443 2013-04-21 22:11:41Z heftig $ # Maintainer: Ionut Biru +# Contributor: Jan Alexander Steffens (heftig) + pkgname=modemmanager _realname=ModemManager -pkgver=0.6.0.0 -pkgrel=1 +pkgver=0.7.990 +pkgrel=3 pkgdesc="Mobile broadband modem management service" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://cgit.freedesktop.org/ModemManager/ModemManager/" -license=('GPL2') -depends=('dbus-glib' 'udev' 'ppp') -makedepends=('intltool') +license=(GPL2) +depends=(udev ppp libqmi polkit hicolor-icon-theme) +makedepends=(intltool git gtk-doc) optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') options=('!libtool') -source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz - modem-manager.service) -sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2' - '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe') +install=modemmanager.install +#source=(http://download.gnome.org/sources/$_realname/${pkgver::3}/$_realname-$pkgver.tar.xz) +source=("git://anongit.freedesktop.org/$_realname/$_realname#commit=95274bf") +sha256sums=('SKIP') build() { - cd "$_realname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-udev-base-dir=/usr/lib/udev \ - --disable-static + cd $_realname + ./autogen.sh --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-udev-base-dir=/usr/lib/udev \ + --disable-static \ + --with-polkit make } package() { - cd "$_realname-$pkgver" + cd $_realname make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/modem-manager.service" \ - "$pkgdir/usr/lib/systemd/system/modem-manager.service" - echo "SystemdService=modem-manager.service" \ - >> "$pkgdir/usr/share/dbus-1/system-services/org.freedesktop.ModemManager.service" } diff --git a/extra/modemmanager/modem-manager.service b/extra/modemmanager/modem-manager.service deleted file mode 100644 index bad666be8..000000000 --- a/extra/modemmanager/modem-manager.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Modem Manager - -[Service] -Type=dbus -BusName=org.freedesktop.ModemManager -ExecStart=/usr/sbin/modem-manager -# Suppress stderr to eliminate duplicated messages in syslog. MM calls openlog() -# with LOG_PERROR. But systemd redirects stderr to syslog by default, which -# results in logging each message twice. -StandardError=null - -[Install] -WantedBy=multi-user.target diff --git a/extra/modemmanager/modemmanager.install b/extra/modemmanager/modemmanager.install new file mode 100644 index 000000000..be187f2b4 --- /dev/null +++ b/extra/modemmanager/modemmanager.install @@ -0,0 +1,12 @@ +post_install() { + type -P gtk-update-icon-cache &>/dev/null && + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/mousetweaks/PKGBUILD b/extra/mousetweaks/PKGBUILD index 4dddd4cb5..c1f24c59a 100644 --- a/extra/mousetweaks/PKGBUILD +++ b/extra/mousetweaks/PKGBUILD @@ -3,19 +3,19 @@ # Contributor: Jan de Groot pkgname=mousetweaks -pkgver=3.6.0 -pkgrel=1 +pkgver=3.8.0 +pkgrel=2 pkgdesc="Mouse accessibility enhancements for the GNOME desktop" arch=(i686 x86_64) license=('GPL3' 'FDL') depends=('libxtst' 'gtk3' 'gsettings-desktop-schemas') makedepends=('gnome-doc-utils' 'intltool') -groups=('gnome-extra') +groups=('gnome') 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=('2c48f655c5b53615270503fd1631e0cf7baa5872b20f75af8608983f039c5cfc') +sha256sums=('daa9b16e98675f414d3dcf63a0222a37d6c3e518718d92155bba8781510f2e4f') build() { cd $pkgname-$pkgver diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index 6e6a00998..69d64e95d 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 178030 2013-02-13 22:13:45Z heftig $ +# $Id: PKGBUILD 183445 2013-04-21 22:11:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Ionut Biru # Contributor: Michael Kanis pkgname=mutter -pkgver=3.6.3 +pkgver=3.8.1 pkgrel=1 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) @@ -16,14 +16,14 @@ groups=('gnome') options=('!libtool' '!emptydirs') install=mutter.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('aa1d558210d58f9a835a7e718a6b6eb8318ac8fb276c43234c47b1efde755c86') +sha256sums=('a41a992620e7e51b6a34709db26a215e86f03927e828b4db03e9111d925ef52f') build() { cd "$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/mutter \ --localstatedir=/var --disable-static \ - --disable-schemas-compile + --disable-schemas-compile --enable-compile-warnings=minimum make } diff --git a/extra/nautilus-sendto/PKGBUILD b/extra/nautilus-sendto/PKGBUILD index a50ccb01f..1c14ec0b2 100644 --- a/extra/nautilus-sendto/PKGBUILD +++ b/extra/nautilus-sendto/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 169999 2012-10-30 23:01:26Z heftig $ +# $Id: PKGBUILD 183446 2013-04-21 22:11:47Z heftig $ # Maintainer: Jan de Groot # Contributor: Eduardo Romero # Contributor: Tor Krill pkgname=nautilus-sendto -pkgver=3.6.0 +pkgver=3.8.0 pkgrel=1 pkgdesc="Nautilus context menu for sending files." -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://download.gnome.org/sources/nautilus-sendto/" -license=('GPL') -groups=('gnome-extra') -depends=('evolution-data-server' 'nautilus' 'dconf') -makedepends=('pidgin' 'gajim' 'gettext' 'intltool' 'gupnp') +license=(GPL) +depends=(glib2) +makedepends=(gettext intltool gobject-introspection) options=('!libtool' '!emptydirs') install=nautilus-sendto.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('5f90a1a7b054257545dc72fa3a63de8f5564815576f90a21c320ebb177b9268e') +sha256sums=('d99ea11a484bff8894097696a1afc8d7f44de4f064f78deeb6f598cecf0604bb') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/nautilus-sendto/nautilus-sendto.install b/extra/nautilus-sendto/nautilus-sendto.install index d33a1b261..38a63052c 100644 --- a/extra/nautilus-sendto/nautilus-sendto.install +++ b/extra/nautilus-sendto/nautilus-sendto.install @@ -1,11 +1,5 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 + if (( $(vercmp $2 3.7.92) < 0 )); then + glib-compile-schemas usr/share/glib-2.0/schemas + fi } diff --git a/extra/nautilus/PKGBUILD b/extra/nautilus/PKGBUILD index af0b33585..970692754 100644 --- a/extra/nautilus/PKGBUILD +++ b/extra/nautilus/PKGBUILD @@ -1,34 +1,52 @@ -# $Id: PKGBUILD 170899 2012-11-12 22:34:25Z heftig $ +# $Id: PKGBUILD 183320 2013-04-21 22:06:39Z heftig $ # Maintainer: Jan de Groot -pkgname=nautilus -pkgver=3.6.3 +pkgbase=nautilus +pkgname=(nautilus libnautilus-extension) +pkgver=3.8.1 pkgrel=1 pkgdesc="GNOME file manager" -arch=('i686' 'x86_64') -license=('GPL') -depends=('libexif' 'gnome-desktop' 'exempi' 'gvfs' 'desktop-file-utils' 'gnome-icon-theme' 'dconf' 'libtracker-sparql' 'libnotify') -makedepends=('intltool' 'gobject-introspection') +arch=(i686 x86_64) +license=(GPL) +depends=(libexif gnome-desktop exempi gvfs desktop-file-utils gnome-icon-theme dconf + libtracker-sparql libnotify nautilus-sendto) +makedepends=(intltool gobject-introspection python) url="http://www.gnome.org" -groups=('gnome') options=('!libtool' '!emptydirs') -install=nautilus.install -source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('d272027754ce8591959ae854fc6b5f43eee4af31e4eecf06de727acebe0ee46c') +source=(http://download.gnome.org/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) +sha256sums=('9827e939aa0621041754379ca0227ceb82877785f013dd5935ecc4b791314892') build() { - cd "$pkgname-$pkgver" + cd $pkgbase-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/nautilus \ - --disable-nst-extension \ --disable-update-mimedb \ --disable-packagekit \ --disable-schemas-compile make } -package() { - cd "$pkgname-$pkgver" +package_nautilus() { + depends+=(libnautilus-extension) + groups=(gnome) + install=nautilus.install + + cd $pkgbase-$pkgver make DESTDIR="$pkgdir" install + +### Split libnautilus-extension + cd .. + mkdir -p n-e/usr/{lib,share} + mv "$pkgdir"/usr/include n-e/usr + mv "$pkgdir"/usr/lib/{girepository-1.0,pkgconfig} n-e/usr/lib + mv "$pkgdir"/usr/lib/libnautilus-extension.so* n-e/usr/lib + mv "$pkgdir"/usr/share/{gir-1.0,gtk-doc} n-e/usr/share +} + +package_libnautilus-extension() { + pkgdesc="Library for extending the $pkgdesc" + depends=(gtk3) + + mv n-e/* "$pkgdir" } diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index dfe8c8498..7ab3fe6a8 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179567 2013-03-07 11:54:25Z foutrelis $ +# $Id: PKGBUILD 183448 2013-04-21 22:11:51Z heftig $ # Maintainer: Jan de Groot # Contributor: Arjan Timmerman # Contributor: Wael Nasreddine @@ -7,14 +7,14 @@ pkgname=network-manager-applet pkgver=0.9.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME frontends to NetWorkmanager" -arch=('i686' 'x86_64') -license=('GPL') +arch=(i686 x86_64) +license=(GPL) url="http://www.gnome.org/projects/NetworkManager/" -depends=("networkmanager>=${pkgver::5}" 'libgnome-keyring' 'polkit-gnome' 'gtk3' 'libnotify' - 'gnome-icon-theme' 'mobile-broadband-provider-info' 'iso-codes') -makedepends=('intltool' 'gnome-bluetooth') +depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify + gnome-icon-theme mobile-broadband-provider-info iso-codes) +makedepends=(intltool gnome-bluetooth) optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool' '!emptydirs') install=network-manager-applet.install diff --git a/extra/networkmanager/PKGBUILD b/extra/networkmanager/PKGBUILD index 6de807013..01f43b2ba 100644 --- a/extra/networkmanager/PKGBUILD +++ b/extra/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 179641 2013-03-08 23:40:46Z foutrelis $ +# $Id: PKGBUILD 183447 2013-04-21 22:11:49Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Maintainer: Jan de Groot # Contributor: Wael Nasreddine @@ -9,20 +9,20 @@ pkgname=networkmanager _pkgname=NetworkManager pkgver=0.9.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnome.org/projects/$_pkgname/" -depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant ppp dhclient - libsoup systemd) -makedepends=(intltool dhcpcd iptables gobject-introspection gtk-doc) -optdepends=('modemmanager: for modem management service' - 'dhcpcd: alternative DHCP client; does not support DHCPv6' +depends=(dbus-glib iproute2 libnl nss polkit udev wpa_supplicant dhcp-client + libsoup systemd modemmanager) +makedepends=(intltool dhcpcd dhclient iptables gobject-introspection gtk-doc) +optdepends=('dhclient: DHCPv6 support' 'iptables: Connection sharing' 'dnsmasq: Connection sharing' 'bluez: Bluetooth support' - 'openresolv: resolvconf support') + 'openresolv: resolvconf support' + 'ppp: Dialup connection support') options=('!libtool') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install @@ -53,6 +53,7 @@ build() { --with-udev-dir=/usr/lib/udev \ --with-resolvconf=/usr/sbin/resolvconf \ --with-session-tracking=systemd \ + --with-modem-manager-1 \ --disable-static \ --enable-more-warnings=no \ --disable-wimax \ @@ -67,6 +68,7 @@ package() { make DESTDIR="$pkgdir" install install -m644 ../NetworkManager.conf "$pkgdir/etc/NetworkManager/" + install -m755 -d "$pkgdir/etc/NetworkManager/dnsmasq.d" rm -r "$pkgdir/var/run" } diff --git a/extra/notification-daemon/PKGBUILD b/extra/notification-daemon/PKGBUILD index 99b091e37..f7e249a87 100644 --- a/extra/notification-daemon/PKGBUILD +++ b/extra/notification-daemon/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 166585 2012-09-12 17:37:48Z jgc $ +# $Id: PKGBUILD 183449 2013-04-21 22:11:53Z heftig $ # Maintainer: Jan de Groot # Contributor: Mark Rosenstand pkgname=notification-daemon pkgver=0.7.6 -pkgrel=1 +pkgrel=2 pkgdesc="Notification daemon for the desktop notifications framework" -arch=('i686' 'x86_64') -license=('GPL') +arch=(i686 x86_64) +license=(GPL) url="http://www.galago-project.org/specs/notification/" -depends=('gtk3' 'libcanberra') -groups=('gnome') -makedepends=('pkgconfig' 'intltool') +depends=(gtk3 libcanberra) +makedepends=(pkgconfig intltool) options=('!libtool' '!emptydirs') source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.xz) sha256sums=('64d0ce6fb12c94c3b73b701502c804c408cb5a94580bcae5ac37607639f7a0b3') @@ -24,6 +23,11 @@ build() { make } +check() { + cd ${pkgname}-${pkgver} + make check +} + package() { cd ${pkgname}-${pkgver} make DESTDIR=${pkgdir} install diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index 160446aa5..c7e193f16 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178010 2013-02-13 13:33:05Z andrea $ +# $Id: PKGBUILD 183540 2013-04-22 20:14:05Z andrea $ # Maintainer: Andrea Scarpino # Contributor: birdflesh pkgname=oxygen-gtk2 -pkgver=1.3.2.1 +pkgver=1.3.3 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('cc33b2ac08f66d4b70f9c85303d44aad') +md5sums=('37b24d69d386eca5b4382424002ed762') build() { mkdir build diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index bed5eb809..d1ae980e1 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 176332 2013-01-30 13:12:57Z andrea $ +# $Id: PKGBUILD 183542 2013-04-22 20:16:28Z andrea $ # Maintainer: Andrea Scarpino pkgname=oxygen-gtk3 -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2a251c52a7799e67a4af70adc4ed3c60') +md5sums=('63ae9752dd39a3310d20d973dd6ea247') build() { mkdir build diff --git a/extra/p11-kit/PKGBUILD b/extra/p11-kit/PKGBUILD index b90323aa1..970a4d45d 100644 --- a/extra/p11-kit/PKGBUILD +++ b/extra/p11-kit/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 165246 2012-08-14 15:06:21Z ibiru $ +# $Id: PKGBUILD 183529 2013-04-22 13:10:36Z heftig $ # Maintainer: Ionut Biru pkgname=p11-kit -pkgver=0.13 +pkgver=0.18.1 pkgrel=1 pkgdesc="Library to work with PKCS#11 modules" arch=(i686 x86_64) url="http://p11-glue.freedesktop.org" license=('BSD') -depends=(glibc) +depends=('glibc' 'libtasn1') options=(!libtool) -source=($url/releases/$pkgname-$pkgver.tar.gz) -md5sums=('3892bc07ff54b1b391aad4628911801d') +source=($url/releases/$pkgname-$pkgver.tar.gz{,.sig}) +md5sums=('e4ef21592dbd126b62e1a6d4ad65ce5c' + 'SKIP') build() { cd $pkgname-$pkgver diff --git a/extra/pango-perl/PKGBUILD b/extra/pango-perl/PKGBUILD index a14a34f43..dd883080c 100644 --- a/extra/pango-perl/PKGBUILD +++ b/extra/pango-perl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160501 2012-06-02 10:26:50Z bluewind $ +# $Id: PKGBUILD 183483 2013-04-21 22:21:03Z heftig $ # Maintainer: Jan de Groot pkgname=pango-perl -pkgver=1.223 -pkgrel=2 +pkgver=1.224 +pkgrel=1 pkgdesc="Perl bindings for Pango" arch=(i686 x86_64) license=('LGPL') @@ -12,7 +12,7 @@ makedepends=('perl-extutils-pkgconfig' 'perl-extutils-depends') depends=('pango' 'glib-perl' 'cairo-perl') options=('!emptydirs') source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/Pango-${pkgver}.tar.gz) -md5sums=('628a6de54f47b6791c6b45edfb835215') +md5sums=('8c411f367cffb0aa16d0e3963294d32e') build() { cd "${srcdir}/Pango-${pkgver}" diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD index c9a344b9d..470ff7daf 100644 --- a/extra/pango/PKGBUILD +++ b/extra/pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 174865 2013-01-08 09:21:35Z jgc $ +# $Id: PKGBUILD 183451 2013-04-21 22:11:56Z heftig $ # Maintainer: Jan de Groot pkgname=pango -pkgver=1.32.5 +pkgver=1.34.0 pkgrel=1 pkgdesc="A library for layout and rendering of text" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ options=('!libtool') install=pango.install source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz) url="http://www.pango.org/" -sha256sums=('7d7bc99c3d9b580cb4fe787fe47824e56e39534b9040e1c8a2a159248d8e5821') +sha256sums=('105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27') build() { cd ${pkgname}-${pkgver} diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD index 412f69cbc..d7e987d38 100644 --- a/extra/polkit/PKGBUILD +++ b/extra/polkit/PKGBUILD @@ -1,16 +1,15 @@ -# $Id: PKGBUILD 180235 2013-03-18 18:19:32Z jgc $ +# $Id: PKGBUILD 183452 2013-04-21 22:11:58Z heftig $ # Maintainer: Jan de Groot pkgname=polkit pkgver=0.110 -pkgrel=1 +pkgrel=2 pkgdesc="Application development toolkit for controlling system-wide privileges" arch=(i686 x86_64) -license=('LGPL') +license=(LGPL) url="http://www.freedesktop.org/wiki/Software/polkit" -depends=('glib2' 'pam' 'expat' 'libsystemd' 'js') -makedepends=('intltool' 'gtk-doc' 'gobject-introspection') -replaces=('policykit') +depends=(glib2 pam expat libsystemd js185) +makedepends=(intltool gtk-doc gobject-introspection) options=('!libtool') install=polkit.install source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD index 3ffba2d90..f7e309614 100644 --- a/extra/pygobject/PKGBUILD +++ b/extra/pygobject/PKGBUILD @@ -1,41 +1,39 @@ -# $Id: PKGBUILD 170844 2012-11-12 15:18:06Z heftig $ +# $Id: PKGBUILD 183322 2013-04-21 22:06:41Z heftig $ # Maintainer: Ionut Biru pkgbase=pygobject pkgname=(python-gobject python2-gobject pygobject-devel) -pkgver=3.4.2 +pkgver=3.8.1 pkgrel=1 -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="https://live.gnome.org/PyGObject" -license=('LGPL') -makedepends=('python' 'python2' 'python-cairo' 'python2-cairo' 'gobject-introspection') +license=(LGPL) +makedepends=(python python2 python-cairo python2-cairo gobject-introspection) source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver::3}/$pkgbase-$pkgver.tar.xz) options=('!libtool') -sha256sums=('2b87ef3170be3a20a53fbdb348ae4ecb41a72a17ec6531baa67147c3437d2aad') +sha256sums=('e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb') + +prepare() { + mkdir build-py2 build-py3 devel + cd ${pkgbase}-${pkgver} + sed -i '/Werror=format/d' configure # gcc 4.8 +} build() { - cp -a "$pkgbase-$pkgver" python2-build - mkdir devel - - ( - cd python2-build - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr - make - ) - - ( - cd "$pkgbase-$pkgver" - ./configure --prefix=/usr - make - ) + cd build-py2 + ../${pkgbase}-${pkgver}/configure --prefix=/usr --with-python=/usr/bin/python2 + make + + cd ../build-py3 + ../${pkgbase}-${pkgver}/configure --prefix=/usr + make } package_python-gobject() { pkgdesc="Python 3 bindings for GObject" depends=('gobject-introspection' 'python-cairo' "pygobject-devel=$pkgver") - cd "$pkgbase-$pkgver" + cd build-py3 make DESTDIR="$pkgdir" install rm -r "$pkgdir"/usr/{include,lib/pkgconfig} } @@ -44,7 +42,7 @@ package_python2-gobject() { pkgdesc="Python 2 bindings for GObject" depends=('gobject-introspection' 'python2-cairo' "pygobject-devel=$pkgver") - cd "python2-build" + cd build-py2 make DESTDIR="$pkgdir" install mv "$pkgdir"/usr/{include,lib/pkgconfig} "$srcdir/devel" } diff --git a/extra/qtwebkit/PKGBUILD b/extra/qtwebkit/PKGBUILD index 190c09638..2d16d44ce 100644 --- a/extra/qtwebkit/PKGBUILD +++ b/extra/qtwebkit/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 180583 2013-03-23 23:09:38Z td123 $ +# $Id: PKGBUILD 183523 2013-04-22 10:48:39Z andrea $ # Maintainer: Andrea Scarpino pkgname=qtwebkit -pkgver=2.3.0 +pkgver=2.3.1 pkgrel=1 arch=('i686' 'x86_64') url='http://trac.webkit.org/wiki/QtWebKit' @@ -16,7 +16,7 @@ source=("${pkgname}-${pkgver}.tar.gz"::"http://gitorious.org/webkit/qtwebkit-23/ "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-${_qtver}.tar.gz" 'use-python2.patch' 'qwebview.patch') -sha1sums=('8e0aa2f895376a0a88b55548bfadb270da3708ba' +sha1sums=('5b71baa0c92290d00b8cc3739c298098c1ed4bcd' 'f5880f11c139d7d8d01ecb8d874535f7d9553198' '315b6ff603f35e5492a036f7082f6aa075dfb607' 'ef467fcfc9e74aa88356f27acc21792706ed1e4d') diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD new file mode 100644 index 000000000..ccf63c4b7 --- /dev/null +++ b/extra/quadrapassel/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183453 2013-04-21 22:12:00Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=quadrapassel +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'libcanberra' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=quadrapassel.install +url="https://live.gnome.org/Quadrapassel" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('18935ab737c9a690104207758ba92223e8bfe6d5f1feeeadbbca3eb543ce5284') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/quadrapassel/quadrapassel.install b/extra/quadrapassel/quadrapassel.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/quadrapassel/quadrapassel.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/rest/PKGBUILD b/extra/rest/PKGBUILD index 09fe7e183..6d27ae502 100644 --- a/extra/rest/PKGBUILD +++ b/extra/rest/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 169985 2012-10-30 23:00:29Z heftig $ -# Maintainer: Jan "heftig" Steffens +# $Id: PKGBUILD 183454 2013-04-21 22:12:01Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) pkgname=rest pkgver=0.7.90 -pkgrel=1 +pkgrel=2 pkgdesc="A helper library for RESTful services." -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://www.gtk.org/" -license=('GPL2') -depends=('glib2' 'libxml2' 'libsoup-gnome') -makedepends=('gobject-introspection') +license=(GPL2) +depends=(glib2 libxml2 'libsoup>=2.42.0') +makedepends=(gobject-introspection) options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) sha256sums=('1d682acaac4d946cc7c98a2dd9d65a8c83a6fdb8ca6759e70b8b5042fe66c022') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc @@ -23,8 +23,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/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch b/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch deleted file mode 100644 index dc3f3429a..000000000 --- a/extra/rhythmbox/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch +++ /dev/null @@ -1,37 +0,0 @@ -From a8f5d8cec87ef1586897e94e49bdf54db64bf97b Mon Sep 17 00:00:00 2001 -From: Kalev Lember -Date: Thu, 11 Oct 2012 10:59:16 +0200 -Subject: [PATCH] Disable the context pane plugin when webkit isn't available - ---- - plugins/Makefile.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index e4f6e69..3a9ea03 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -14,7 +14,6 @@ SUBDIRS = \ - if ENABLE_PYTHON - SUBDIRS += \ - artsearch \ -- context \ - im-status \ - lyrics \ - magnatune \ -@@ -24,8 +23,12 @@ SUBDIRS += \ - sendto \ - rb - -+if WITH_WEBKIT -+SUBDIRS += context - endif - -+endif # ENABLE_PYTHON -+ - if WITH_LIRC - SUBDIRS += lirc - endif --- -1.7.12.1 - diff --git a/extra/rhythmbox/PKGBUILD b/extra/rhythmbox/PKGBUILD index 4ee0514ca..da1db9018 100644 --- a/extra/rhythmbox/PKGBUILD +++ b/extra/rhythmbox/PKGBUILD @@ -1,24 +1,19 @@ -# $Id: PKGBUILD 171480 2012-11-18 00:28:26Z eric $ +# $Id: PKGBUILD 183455 2013-04-21 22:12:04Z heftig $ # Maintainer: Jan de Groot # Contributor: Giovanni Scafora pkgname=rhythmbox -pkgver=2.98 -pkgrel=4 +pkgver=2.99.1 +pkgrel=1 pkgdesc="An iTunes-like music playback and management application" -arch=('i686' 'x86_64') -license=('GPL') +arch=(i686 x86_64) +license=(GPL) url="http://www.rhythmbox.org" -depends=('dconf' 'desktop-file-utils' 'gstreamer0.10-base-plugins' - 'gstreamer0.10-good-plugins' 'gvfs-afc' 'json-glib' - 'libnotify' 'libpeas' 'media-player-info' 'python2-gobject' - 'totem-plparser' 'tdb') -makedepends=('gnome-doc-utils' 'intltool' 'brasero' 'gobject-introspection' - 'vala' 'gnome-common' 'gtk-doc' 'grilo' 'libdmapsharing' 'lirc-utils' - 'libgpod' 'libmtp') -optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' +depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info python2-gobject totem-plparser tdb webkitgtk3) +makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc-utils libgpod libmtp) +optdepends=('gst-plugins-ugly: Extra media codecs' + 'gst-plugins-bad: Extra media codecs' + 'gst-libav: Extra media codecs' 'brasero: Audio CD Recorder plugin' 'libdmapsharing: DAAP Music Sharing plugin' 'grilo-plugins: Grilo media browser plugin' @@ -28,23 +23,15 @@ optdepends=('gstreamer0.10-ugly-plugins: Extra media codecs' 'zeitgeist: Zeitgeist plugin') options=('!libtool' '!emptydirs') install=rhythmbox.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz - Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch - rhythmbox-2.98-xinitthreads.patch) -sha256sums=('a5c0a18a7c76133d36c7dcbdc37e304eae8272703985b17b540d68603b0c76d5' - '6510214e7fe0a18d17d8c599ae065bd48c2e1f82931fe82e3d1cc684a0801cd6' - 'cd9af451a411e5a621c385d43f5ddd3664b3d085fc12dc7d5e5cd1f5db9e73b0') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::4}/$pkgname-$pkgver.tar.xz) +sha256sums=('ed30bb534a789e2b50f953e33eee0bb09f389fe813d433a87d504d07be5f7777') build() { cd "$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/Disable-the-context-pane-plugin-when-webkit-isn-t-available.patch" - patch -Np1 -i "${srcdir}/rhythmbox-2.98-xinitthreads.patch" - autoreconf -fi PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/rhythmbox \ --localstatedir=/var --disable-static \ - --enable-daap --enable-python --enable-vala \ - --with-mdns=avahi --disable-scrollkeeper --without-webkit + --enable-daap --enable-python --enable-vala make } diff --git a/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch b/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch deleted file mode 100644 index 6a6426038..000000000 --- a/extra/rhythmbox/rhythmbox-2.98-xinitthreads.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 1780aab638aa39704be34fc214de39b4847a87b2 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Wed, 17 Oct 2012 19:02:50 +0200 -Subject: [PATCH] shell: Call XInitThreads() on X11 systems - -Otherwise bad things can happen with some plugins that expect -mutexes to work, like the visualiser plugin and Clutter. - -https://bugzilla.gnome.org/show_bug.cgi?id=686320 ---- - configure.ac | 15 +++++++++++++++ - shell/main.c | 12 ++++++++++++ - 2 files changed, 27 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 009c838..8a88d72 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -86,10 +86,25 @@ PKG_PROG_PKG_CONFIG - - PKG_CHECK_MODULES(RB_CLIENT, glib-2.0 >= $GLIB_REQS gio-2.0 >= $GLIB_REQS gio-unix-2.0 >= $GLIB_REQS) - -+dnl Always require libX11 for XInitThreads() on X11 systems -+X11_PKG="" -+gdk_targets=`$PKG_CONFIG --variable targets gdk-3.0` -+for target in $gdk_targets; do -+ case "$target" in -+ x11) -+ X11_PKG=x11 -+ break -+ ;; -+ *) -+ ;; -+ esac -+done -+ - dnl note: gio-unix-2.0 is here for libmediaplayerid - PKG_CHECK_MODULES(RHYTHMBOX, \ - gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \ - gtk+-3.0 >= $GTK_REQS \ -+ $X11_PKG \ - gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQS \ - glib-2.0 >= $GLIB_REQS \ - gio-2.0 >= $GLIB_REQS \ -diff --git a/shell/main.c b/shell/main.c -index 3c0346d..696f3e9 100644 ---- a/shell/main.c -+++ b/shell/main.c -@@ -34,6 +34,11 @@ - #include - #include - -+#ifdef GDK_WINDOWING_X11 -+/* X11 headers */ -+#include -+#endif -+ - #include - - #include "rb-shell.h" -@@ -51,6 +56,13 @@ main (int argc, char **argv) - int new_argc; - char **new_argv; - -+#ifdef GDK_WINDOWING_X11 -+ if (XInitThreads () == 0) { -+ g_critical ("Initialising threading support failed."); -+ return 1; -+ } -+#endif -+ - /* disable multidevice so clutter-gtk events work. - * this needs to be done before gtk_open, so the visualizer - * plugin can't do it. --- -1.7.12.1 \ No newline at end of file diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD index 8ac8a19bc..f76fe91c5 100644 --- a/extra/rygel/PKGBUILD +++ b/extra/rygel/PKGBUILD @@ -1,42 +1,42 @@ -# $Id: PKGBUILD 180471 2013-03-21 22:40:51Z heftig $ -# Maintainer: Balló György +# $Id: PKGBUILD 183456 2013-04-21 22:12:05Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Balló György pkgname=rygel -pkgver=0.16.4 +pkgver=0.18.1 pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" -arch=('i686' 'x86_64') +arch=(i686 x86_64) url="http://live.gnome.org/Rygel" -license=('LGPL') -depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'libunistring' 'libtracker-sparql' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('vala' 'intltool') -optdepends=('gstreamer0.10-good-plugins: Extra media codecs' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-ugly-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' +license=(LGPL) +depends=(gupnp-av gupnp-dlna libgee gtk3 libunistring libtracker-sparql hicolor-icon-theme xdg-utils) +makedepends=(vala intltool) +optdepends=('gst-plugins-base: Extra media codecs' + 'gst-plugins-good: Extra media codecs' + 'gst-plugins-bad: Extra media codecs' + 'gst-plugins-ugly: Extra media codecs' + 'gst-libav: Extra media codecs' 'tracker: Share indexed media files') -backup=('etc/rygel.conf') +backup=(etc/rygel.conf) options=('!libtool') -install=$pkgname.install +install=rygel.install +groups=('gnome-extra') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('3cf338c120751ea068c90f65bfb2a63c436cdf59b02ce159b6376a349717ed7a') +sha256sums=('3f71bec31be373707dd0edd88aeea49c74429f258fc5a7e01bb979563349c64d') build() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-static --enable-mediathek-plugin --enable-gst-launch-plugin make } check() { - cd "$srcdir/$pkgname-$pkgver" - + cd $pkgname-$pkgver make check } package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index b671685ce..2fbc502d7 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170821 2012-11-12 08:38:53Z heftig $ +# $Id: PKGBUILD 183457 2013-04-21 22:12:07Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Michel Brabants pkgname=seahorse -pkgver=3.6.3 +pkgver=3.8.1 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) @@ -19,7 +19,7 @@ groups=(gnome-extra) install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('9b712da1989725547a8093e638725ee6de74d7870661545a15374c7ebf335cc1' +sha256sums=('c1a1d97618a37a79e19902e00f3a0de7cfb947b52eb9282ea09e5f9f73151e7a' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { diff --git a/extra/seed/GLib.js b/extra/seed/GLib.js new file mode 100644 index 000000000..5aec39a73 --- /dev/null +++ b/extra/seed/GLib.js @@ -0,0 +1,282 @@ +GLib = imports.gi.GLib; + +(function() { + +/* Variant Sugar + * Provide commodities methods to convert Variant from/to javascript object. + * variant.toJS() : returns a javascript object representing the Variant + # @variant + * Variant.new(signature, value): returns a GVariant structure representing + * the javascript object @value + * + * This implementation uses json-glib's json <-> variant conversion facilities + * if presents and fallback to a javascript implementation otherwise. + * This javascript implementation is imported from gjs with modification for + * JSCore compatibility (Copyright 2011 Giovanni Campagna, + * see gjs/override/GLib.js for licence) + */ + + // Use json-glib's json <-> variant conversion if present. + // Defaults to javascript code imported from gjs otherwise. + GLib.Variant.prototype.to_js = function(signature) { + return _toJS(signature, this); + } + var toVariant = _toVariant; + + try { + JSONGLib = imports.gi.Json; + } + catch (e) {} + + if (JSONGLib && JSONGLib.gvariant_serialize_data) + { + GLib.Variant.prototype.to_js = function(signature) { + return _toJSNative(signature, this); + } + toVariant = _toVariantNative; + } + + GLib.Variant.new = function (value, sig) { + var signature = Array.prototype.slice.call(sig); + + if (signature.length != 0) + throw new TypeError('Invalid GVariant signature (more than one single complete type)'); + var variant = toVariant(signature, value); + return variant; + } + + GLib.Variant.prototype.toString = function() { + return '[object variant of type "' + this.get_type_string() + '"]'; + }; + +/// End Variant Sugar /// +}).apply(); + +function _toVariantNative(signature, object) +{ + if (!object || object == '') + return null; + if (!signature || signature == '') + signature = null; + + return JSONGLib.gvariant_deserialize_data (JSON.stringify (object), + -1, signature); +}; + +function _toJSNative(signature, variant) +{ + if (!variant) + return; + + var jsonStr = JSONGLib.gvariant_serialize_data (variant, signature); + if (!jsonStr) + return; + + return JSON.parse (jsonStr); +}; + +// Code imported from gjs, modified for JSCore idoms. +// Copyright 2011 Giovanni Campagna (see gjs/override/GLib.js for licence) + +const SIMPLE_TYPES = ['b', 'y', 'n', 'q', 'i', 'u', 'x', 't', 'h', 'd', 's', 'o', 'g']; + +function _read_single_type(signature, forceSimple) { + var char = signature.shift(); + var isSimple = false; + + if (SIMPLE_TYPES.indexOf(char) == -1) { + if (forceSimple) + throw new TypeError('Invalid GVariant signature (a simple type was expected)'); + } else + isSimple = true; + + if (char == 'm' || char == 'a') + return [char].concat(_read_single_type(signature, false)); + if (char == '{') { + var key = _read_single_type(signature, true); + var val = _read_single_type(signature, false); + var close = signature.shift(); + if (close != '}') + throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}"'); + return [char].concat(key, val, close); + } + if (char == '(') { + var res = [char]; + while (true) { + if (signature.length == 0) + throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")'); + var next = signature[0]; + if (next == ')') { + signature.shift(); + return res.concat(next); + } + var el = _read_single_type(signature); + res = res.concat(el); + } + } + + // Valid types are simple types, arrays, maybes, tuples, dictionary entries and variants + if (!isSimple && char != 'v') + throw new TypeError('Invalid GVariant signature (' + char + ' is not a valid type)'); + + return [char]; +} + + +function _toVariant(signature, value) { + if (signature.length == 0) + throw new TypeError('GVariant signature cannot be empty'); + + var char = signature.shift(); + switch (char) { + case 'b': + return GLib.Variant.new_boolean(value); + case 'y': + return GLib.Variant.new_byte(value); + case 'n': + return GLib.Variant.new_int16(value); + case 'q': + return GLib.Variant.new_uint16(value); + case 'i': + return GLib.Variant.new_int32(value); + case 'u': + return GLib.Variant.new_uint32(value); + case 'x': + return GLib.Variant.new_int64(value); + case 't': + return GLib.Variant.new_uint64(value); + case 'h': + return GLib.Variant.new_handle(value); + case 'd': + return GLib.Variant.new_double(value); + case 's': + return GLib.Variant.new_string(value); + case 'o': + return GLib.Variant.new_object_path(value); + case 'g': + return GLib.Variant.new_signature(value); + case 'v': + return GLib.Variant.new_variant(value); + case 'm': + if (value != null) + return GLib.Variant.new_maybe(null, _pack_variant(signature, value)) + else + return GLib.Variant.new_maybe(GLib.VariantType.new(_read_single_type(signature, false).join('')), null); + case 'a': + var arrayType = _read_single_type(signature, false); + if (arrayType[0] == 's') { + // special case for array of strings + return GLib.Variant.new_strv(value, value.length); + } + if (arrayType[0] == 'y') { + // special case for array of bytes + return GLib.Variant.new_bytestring(value); + } + if (arrayType[0] == 'a' && arrayType[1] == 'y') { + // special case for array of array of bytes + return GLib.Variant.new_bytestring_array(value, value.length); + } + + var arrayValue = []; + if (arrayType[0] == '{') { + // special case for dictionaries + for (var key in value) { + var copy = [].concat(arrayType); + var child = _pack_variant(copy, [key, value[key]]); + arrayValue.push(child); + } + } else { + for (var i = 0; i < value.length; i++) { + var copy = [].concat(arrayType); + var child = _pack_variant(copy, value[i]); + arrayValue.push(child); + } + } + return GLib.Variant.new_array(GLib.VariantType.new(arrayType.join('')), arrayValue, arrayValue.length); + case '(': + var children = [ ]; + for (var i = 0; i < value.length; i++) { + var next = signature[0]; + if (next == ')') + break; + children.push(_pack_variant(signature, value[i])); + } + + if (signature[0] != ')') + throw new TypeError('Invalid GVariant signature for type TUPLE (expected ")")'); + signature.shift(); + return GLib.Variant.new_tuple(children, children.length); + case '{': + var key = _pack_variant(signature, value[0]); + var child = _pack_variant(signature, value[1]); + + if (signature[0] != '}') + throw new TypeError('Invalid GVariant signature for type DICT_ENTRY (expected "}")'); + signature.shift(); + + return GLib.Variant.new_dict_entry(key, child); + default: + throw new TypeError('Invalid GVariant signature (unexpected character ' + char + ')'); + } +} + +function _toJS(signature, variant) { + switch (String.fromCharCode(variant.classify())) { + case 'b': + return variant.get_boolean(); + case 'y': + return variant.get_byte(); + case 'n': + return variant.get_int16(); + case 'q': + return variant.get_uint16(); + case 'i': + return variant.get_int32(); + case 'u': + return variant.get_uint32(); + case 'x': + return variant.get_int64(); + case 't': + return variant.get_uint64(); + case 'h': + return variant.get_handle(); + case 'd': + return variant.get_double(); + case 'o': + case 'g': + case 's': + // g_variant_get_string has length as out argument + return variant.get_string(); + case 'v': + return variant.get_variant(); + case 'm': + var val = variant.get_maybe(); + return _toJS(val); + case 'a': + if (variant.is_container()) { + // special case containers + var ret = { }; + var nElements = variant.n_children(); + for (var i = 0; i < nElements; i++) { + // always unpack the dictionary entry, and always unpack + // the key (or it cannot be added as a key) + var val = _toJS(variant.get_child_value(i)); + var key = val[0].classify ? _toJS(val[0]) : val[0]; + ret[key] = val[1] && val[1].classify ? _toJS(val[1]) : val[1] + } + return ret; + } + // fall through + case '(': + case '{': + var ret = [ ]; + var nElements = variant.n_children(); + for (var i = 0; i < nElements; i++) { + var val = variant.get_child_value(i); + ret.push(_toJS(val)); + } + return ret; + } + + throw new Error('Assertion failure: this code should not be reached'); +} diff --git a/extra/seed/PKGBUILD b/extra/seed/PKGBUILD index 9713fa013..4944a2207 100644 --- a/extra/seed/PKGBUILD +++ b/extra/seed/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 157423 2012-04-28 09:27:33Z allan $ +# $Id: PKGBUILD 183482 2013-04-21 22:21:02Z heftig $ #Maintainer : Ionut Biru #Contributor: Jan de Groot pkgname=seed -pkgver=3.2.0 -pkgrel=2 +pkgver=3.8.1 +pkgrel=1 pkgdesc="Library and interpreter for JavaScript with GObject type system bindings." arch=('i686' 'x86_64') url="http://live.gnome.org/Seed/" license=('LGPL') options=('!libtool') -depends=('libwebkit3' 'gobject-introspection' 'gnome-js-common') +depends=('webkitgtk3' 'gobject-introspection' 'gnome-js-common' 'mpfr') makedepends=('intltool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('3d1eca40834b72a5730ddaf8a5f46b8df20ddb2b3b39687d1a84ef966d3d37c0') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.8/${pkgname}-${pkgver}.tar.xz + GLib.js) +sha256sums=('80cb4db7fa6f6cf8d3e255fc45a81657388d458bc8bf23e4089e35f69eeaac32' + '2a8185df661056e12830d0a29155dc539016fc349a823f5aec09dd15bbb9239b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + install -m644 ../GLib.js extensions/ ./configure --prefix=/usr make } diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD index 8ee8c3cd2..7dd7e4693 100644 --- a/extra/sip/PKGBUILD +++ b/extra/sip/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 180919 2013-03-28 06:14:07Z andrea $ +# $Id: PKGBUILD 183493 2013-04-22 09:21:24Z andrea $ # Maintainer: Andrea Scarpino # Contributor: Douglas Soares de Andrade # Contributor: riai , Ben pkgbase=sip pkgname=('sip' 'python-sip' 'python2-sip') -pkgver=4.14.5 +pkgver=4.14.6 pkgrel=1 arch=('i686' 'x86_64') url="http://www.riverbankcomputing.com/software/sip/" license=('custom:"sip"') makedepends=('python' 'python2') source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz") -md5sums=('51757771c204e9fbad359f372a0b8256') +md5sums=('d6493b9f0a7911566545f694327314c4') build() { cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver} diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD index 80c2007e6..33230d96f 100644 --- a/extra/sound-juicer/PKGBUILD +++ b/extra/sound-juicer/PKGBUILD @@ -1,29 +1,39 @@ -# $Id: PKGBUILD 171308 2012-11-17 04:45:56Z heftig $ +# $Id: PKGBUILD 183458 2013-04-21 22:12:09Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Ben pkgname=sound-juicer pkgver=3.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="A cd ripper application" arch=(i686 x86_64) license=(GPL) -depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero - hicolor-icon-theme gconf) -makedepends=(intltool gnome-doc-utils) +depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero hicolor-icon-theme gconf) +makedepends=(intltool gnome-doc-utils gnome-common) options=(!emptydirs) 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 sha256sums=('ea76703e08e67590af7b8ce5206c343eb01d77cd5023c0bc958a0c2f5a98d2e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" + sed -e "s/AM_GST_ELEMENT_CHECK/GST_ELEMENT_CHECK/" \ + -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in + autoreconf -f ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --disable-scrollkeeper - make + + # drop unneeded direct library deps with --as-needed + # libtool doesn't make this easy, so we do it the hard way + 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 + # Remove RPATH + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + + export tagname=CC + make AM_CFLAGS=-export-dynamic } package() { diff --git a/extra/sushi/PKGBUILD b/extra/sushi/PKGBUILD index a1f39e933..e3da50207 100644 --- a/extra/sushi/PKGBUILD +++ b/extra/sushi/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 170902 2012-11-12 22:36:42Z heftig $ +# $Id: PKGBUILD 183459 2013-04-21 22:12:10Z heftig $ # Maintainer: Ionut Biru pkgname=sushi -pkgver=3.6.1 +pkgver=3.8.1 pkgrel=1 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64) url="http://www.gnome.org" license=('GPL2') -groups=(gnome-extra) +groups=(gnome) depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkitgtk3' 'gtksourceview3' 'evince') install=sushi.install makedepends=('intltool' 'gobject-introspection') options=(!libtool) source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ddcfa4fd8ad6a8a7ff2da10a5190a031df9e9debf217cb1fcdeec2a181222af8') +sha256sums=('c4f24d0961ce8fc5ef3a4fe9af178e368c7117459df2c0be12c8f953646c82dd') build() { cd "$pkgname-$pkgver" diff --git a/extra/swell-foop/PKGBUILD b/extra/swell-foop/PKGBUILD new file mode 100644 index 000000000..5d93838ca --- /dev/null +++ b/extra/swell-foop/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 183460 2013-04-21 22:12:12Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Contributor: Jan de Groot + +pkgname=swell-foop +pkgver=3.8.1 +pkgrel=1 +pkgdesc="Clear the screen by removing groups of colored and shaped tiles" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'clutter-gtk' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=swell-foop.install +url="https://live.gnome.org/Swell%20Foop" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('50d6b53d7507c1176ade9227f04d1c260143a5ebf8cf812c359c89eaeec9ee99') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/extra/swell-foop/swell-foop.install b/extra/swell-foop/swell-foop.install new file mode 100644 index 000000000..0730c1a47 --- /dev/null +++ b/extra/swell-foop/swell-foop.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -f -q usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD new file mode 100644 index 000000000..2558d262c --- /dev/null +++ b/extra/tali/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) +# Maintainer: Jan de Groot + +pkgname=tali +pkgver=3.8.0 +pkgrel=1 +pkgdesc="Beat the odds in a poker-style dice game" +arch=('i686' 'x86_64') +license=('GPL') +depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg') +makedepends=('intltool' 'itstool' 'gobject-introspection') +conflicts=('gnome-games') +replaces=('gnome-games') +options=('!emptydirs' '!libtool') +install=tali.install +url="https://live.gnome.org/Tali" +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz) +sha256sums=('77fa3a3804f51e40629799d441b34e9b01a665097be229bd94adb28d3dbc17d5') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-schemas-compile \ + --with-scores-user=root --with-scores-group=games + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + # Remove all scores, we generate them from postinstall + rm -rf "$pkgdir/var" +} diff --git a/extra/tali/tali.install b/extra/tali/tali.install new file mode 100644 index 000000000..8e65298ad --- /dev/null +++ b/extra/tali/tali.install @@ -0,0 +1,34 @@ +_scores=( + gtali.Colors.scores + gtali.Regular.scores +) + +post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + if [ -e "var/games/$score" ]; then + continue + fi + + touch "var/games/$score" + chown root:games "var/games/$score" + chmod 664 "var/games/$score" + done +} + +post_upgrade() { + post_install +} + +post_remove() { + glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -f usr/share/icons/hicolor + + for score in "${_scores[@]}" ; do + rm -f "var/games/$score" + done +} diff --git a/extra/tomboy/PKGBUILD b/extra/tomboy/PKGBUILD index ffda1b338..29f155d28 100644 --- a/extra/tomboy/PKGBUILD +++ b/extra/tomboy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 170922 2012-11-13 02:13:42Z heftig $ +# $Id: PKGBUILD 183462 2013-04-21 22:12:14Z heftig $ # Maintainer: Jan de Groot pkgname=tomboy -pkgver=1.12.2 +pkgver=1.14.0 pkgrel=1 pkgdesc="Desktop note-taking application for Linux and Unix" arch=('i686' 'x86_64') @@ -11,10 +11,9 @@ url="http://www.gnome.org/projects/tomboy/" depends=('gtk2' 'gtkspell' 'gconf' 'gconf-sharp' 'dbus-sharp' 'dbus-sharp-glib' 'mono-addins' 'hicolor-icon-theme') 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/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) -sha256sums=('ebcb23efb8eedc949eb84d4b5c9919ddaacc97198384f79ed08e97092c46e55e') +sha256sums=('14c1e7f2c7d67d8603a7de95830c3b159779909e8a74c5a6ca9e08a2508fea18') build() { export MONO_SHARED_DIR="$srcdir/.wabi" diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD index 1ef450a5e..9e753adfc 100644 --- a/extra/totem-plparser/PKGBUILD +++ b/extra/totem-plparser/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 179111 2013-03-03 17:28:38Z dreisner $ +# $Id: PKGBUILD 183463 2013-04-21 22:12:16Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=totem-plparser -pkgver=3.4.3 -pkgrel=2 +pkgver=3.4.4 +pkgrel=1 url="http://www.gnome.org" pkgdesc="Totem playlist parser library" license=('LGPL') arch=(i686 x86_64) -depends=('gmime' 'libsoup-gnome' 'libarchive' 'libquvi') +depends=('gmime' 'libsoup' 'libarchive' 'libquvi') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/totem-pl-parser/${pkgver%.*}/totem-pl-parser-$pkgver.tar.xz) -sha256sums=('ab8beed4dd5d3a5d7ed5dc8b357e94dc03a8553fef6e33c2e7fb63a76e44c42b') +sha256sums=('b821e812da3f3e42d2f831296b4031c60a615d29857781971578ce2c0c807457') build() { cd totem-pl-parser-$pkgver diff --git a/extra/totem/PKGBUILD b/extra/totem/PKGBUILD index 12ab179be..21e802543 100644 --- a/extra/totem/PKGBUILD +++ b/extra/totem/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 173078 2012-12-10 11:38:58Z jgc $ +# $Id: PKGBUILD 183323 2013-04-21 22:06:42Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgbase=totem pkgname=('totem' 'totem-plugin') -pkgver=3.6.3 -pkgrel=2 +pkgver=3.8.0 +pkgrel=1 pkgdesc="GNOME3 movie player based on GStreamer" url="http://www.gnome.org" arch=(i686 x86_64) license=(GPL2 custom) depends=(gst-plugins-base gst-plugins-good totem-plparser desktop-file-utils iso-codes libpeas - hicolor-icon-theme gnome-icon-theme-symbolic gsettings-desktop-schemas dconf clutter-gst + hicolor-icon-theme gnome-icon-theme gsettings-desktop-schemas dconf clutter-gst clutter-gtk python2-gobject gst-plugins-bad) -makedepends=(intltool gnome-doc-utils nautilus lirc-utils vala grilo pylint dbus-glib libzeitgeist) +makedepends=(intltool libnautilus-extension lirc-utils vala grilo pylint dbus-glib libzeitgeist itstool docbook-xsl) options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz browser-plugins.ini) -sha256sums=('ad9f2ff207c8a965975670e262394953b37b2dc25cff7ee59f138f961f88ce60' +sha256sums=('74c73a5decb69572cb182005b144493c2f6e7f48d4c57851e6da33e8e76fb039' 'a50a3bbf35f0535f7e8e20af1893446a2e5711015484f9ae6d1ff91af3b23c4e') build() { @@ -33,10 +33,10 @@ build() { } package_totem() { - groups=(gnome-extra) + groups=(gnome) install=totem.install optdepends=('gst-plugins-ugly: Extra media codecs' - 'gst-ffmpeg: Extra media codecs' + 'gst-libav: Extra media codecs' 'lirc-utils: Infrared Remote Control plugin' 'grilo-plugins: Browse sidebar (remote media)' 'pyxdg: opensubtitles plugin' diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index ffc68955e..c028bc888 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,33 +1,29 @@ -# $Id: PKGBUILD 180810 2013-03-26 11:49:41Z foutrelis $ +# $Id: PKGBUILD 183324 2013-04-21 22:06:43Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Sergej Pupykin # Contributor: Alexander Fehr pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.14.5 +pkgver=0.16.0 _tver=${pkgver%.*} -pkgrel=1 +pkgrel=4 pkgdesc="All-in-one indexer, search tool and metadata database" arch=(i686 x86_64) license=(GPL) -makedepends=(libgnome-keyring upower libexif exempi rest +makedepends=(libgee libsecret upower libexif exempi poppler-glib libgsf icu enca networkmanager gtk3 desktop-file-utils hicolor-icon-theme gobject-introspection - intltool giflib gstreamer0.10-base totem-plparser - taglib nautilus libvorbis flac vala libgxps) + intltool giflib gst-plugins-base-libs totem-plparser + taglib libvorbis flac vala libgxps libnautilus-extension) url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('cabef75eb18ad35208000dc472bdc20a74269799414527ee6e1c1c1cfb28eec8') +sha256sums=('299c6a180370522d1d794c184aaef8d8222d3f737d564b8e5ca25b8751470c4f') build() { cd $pkgbase-$pkgver - # HACK: uninstall libtracker-sparql to ensure a clean build, - # as the build system will wrongly link against it - #if pacman -Qq libtracker-sparql; then sudo pacman -Rdd --noconfirm libtracker-sparql; fi - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -43,18 +39,18 @@ build() { } package_tracker() { - depends=("libtracker-sparql=$pkgver-$pkgrel" libgnome-keyring - upower libexif exempi rest poppler-glib libgsf enca + depends=("libtracker-sparql=$pkgver-$pkgrel" libgee libsecret + upower libexif exempi poppler-glib libgsf enca networkmanager gtk3 desktop-file-utils hicolor-icon-theme) optdepends=('giflib: extractor for GIF data' - 'gstreamer0.10-base: video extractor' + 'gst-plugins-base-libs: video extractor' 'totem-plparser: playlist support' - 'nautilus: nautilus-extension' 'libvorbis: Vorbis metadata extractor' 'flac: FLAC metadata extractor' 'taglib: writeback for audio files' + "nautilus: edit files' tracker tags" 'libgxps: XPS extractor') - groups=('gnome-extra') + groups=('gnome') install=tracker.install cd $pkgbase-$pkgver diff --git a/extra/udisks2/PKGBUILD b/extra/udisks2/PKGBUILD index 84210ec21..93c024e79 100644 --- a/extra/udisks2/PKGBUILD +++ b/extra/udisks2/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 174775 2013-01-07 12:39:21Z jgc $ +# $Id: PKGBUILD 183464 2013-04-21 22:12:17Z heftig $ # Maintainer: Ionut Biru pkgname=udisks2 -pkgver=2.0.1 +pkgver=2.1.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') +makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'python') optdepends=('parted: partition management' 'gptfdisk: GUID partition table support') options=(!libtool) source=(http://udisks.freedesktop.org/releases/udisks-$pkgver.tar.bz2) -sha256sums=('7a6728942d3cd1adc8cd5ee770e8865b293694e9663487861b7b8bf7b495bbbf') +sha256sums=('310208e5a10335dae4b52a0125c24d31cf292cce3d15cf65da4cd308e38d15a8') build() { cd "udisks-$pkgver" diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD index a642378d4..7cc608b87 100644 --- a/extra/vala/PKGBUILD +++ b/extra/vala/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170948 2012-11-14 00:15:27Z heftig $ +# $Id: PKGBUILD 183465 2013-04-21 22:12:18Z heftig $ # Maintainer : Ionut Biru # Contributor: Timm Preetz pkgname=vala -pkgver=0.18.1 +pkgver=0.20.1 pkgrel=1 pkgdesc="Compiler for the GObject type system" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('glib2') makedepends=('libxslt') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('7f5e2e8ca03f9fa2cf13acaf93bfdc3a7ad0a10b000a337ba9c6bdc021bdca32') +sha256sums=('9cb7ecd18a23525e401c204d4d08341c7d911cd5d78078eee10b747ecb45e481') build() { cd $pkgname-$pkgver diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD index c410dab14..ed2214867 100644 --- a/extra/vinagre/PKGBUILD +++ b/extra/vinagre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 170889 2012-11-12 22:10:03Z heftig $ +# $Id: PKGBUILD 183466 2013-04-21 22:12:20Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Allan McRae # Contributor: lp76 pkgname=vinagre -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="A VNC Client for the GNOME Desktop" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ makedepends=('docbook-xsl' '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=('dec4b24de9c372cef3efc0d3e80514c85250e01ce01325d07a4e4e956b4a8f3c') +sha256sums=('64f9bcd08f33e5e767565909792094ad78d7b400f16dc24e0a5699c7e87da000') build() { cd $pkgname-$pkgver diff --git a/extra/vino/PKGBUILD b/extra/vino/PKGBUILD index 6d8a16413..40c35c45b 100644 --- a/extra/vino/PKGBUILD +++ b/extra/vino/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 170890 2012-11-12 22:11:14Z heftig $ +# $Id: PKGBUILD 183467 2013-04-21 22:12:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=vino -pkgver=3.6.2 +pkgver=3.8.1 pkgrel=1 pkgdesc="a VNC server for the GNOME desktop" arch=('i686' 'x86_64') license=('GPL') depends=('libnotify' 'libxtst' 'libsm' 'libsoup' 'telepathy-glib' 'gtk3' 'libsecret' 'avahi' 'desktop-file-utils') makedepends=('intltool' 'networkmanager' 'gnome-common') -groups=('gnome-extra') +groups=('gnome') 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=('c24907542c5ea086293dc852edfeb6b6d02d63e210a3ff715c18d04e130857e4') +sha256sums=('3a82392aa479d5a4be38020ac64b3c4f0227917af6175938919dbe741995929c') build() { cd $pkgname-$pkgver diff --git a/extra/vte3/PKGBUILD b/extra/vte3/PKGBUILD index 4ae0ccb14..b1f095fee 100644 --- a/extra/vte3/PKGBUILD +++ b/extra/vte3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170907 2012-11-12 22:41:40Z heftig $ +# $Id: PKGBUILD 183325 2013-04-21 22:06:44Z heftig $ # Maintainer: Ionut Biru pkgbase=vte3 pkgname=(vte3 vte-common) -pkgver=0.34.2 +pkgver=0.34.4 pkgrel=1 pkgdesc="Virtual Terminal Emulator widget for use with GTK3" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool' '!emptydirs') makedepends=('intltool' 'gobject-introspection' 'gtk3') url="http://www.gnome.org" source=(http://download.gnome.org/sources/vte/${pkgver::4}/vte-$pkgver.tar.xz) -sha256sums=('f40f9fe0bcc6d65bc44b2fab5469b56a9f0631132c6b90e06053e421711159cf') +sha256sums=('477de8f0b8473e1cb27c9488e278df44d16fc384d1753c5c3961e3f0417860bd') build() { cd "vte-$pkgver" diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 9065ed194..5aaac23d4 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,61 +1,43 @@ -# $Id: PKGBUILD 180811 2013-03-26 11:49:42Z foutrelis $ +# $Id: PKGBUILD 183326 2013-04-21 22:06:45Z heftig $ # Maintainer: Andreas Radke pkgbase=webkitgtk -pkgname=('webkitgtk2' 'webkitgtk3') -pkgver=1.10.2 -pkgrel=3 +pkgname=('webkitgtk3') +pkgver=2.0.1 +pkgrel=1 arch=('i686' 'x86_64') url="http://webkitgtk.org/" license=('custom') -makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') +makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs' 'gperf' 'gobject-introspection' 'python' 'mesa' 'ruby' 'gtk-doc' 'libsecret' 'libwebp') options=('!libtool' '!emptydirs') -source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) -sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c') +source=(http://webkitgtk.org/releases/$pkgbase-$pkgver.tar.xz) +sha256sums=('6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb') + +prepare() { + cd $pkgbase-$pkgver + mkdir build-gtk3 +} build() { - cd "$srcdir/webkitgtk-$pkgver" - mkdir build-gtk2 build-gtk3 + cd $pkgbase-$pkgver/build-gtk3 - cd build-gtk2 - PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ - --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk2 \ - --with-gstreamer=0.10 \ - --with-gtk=2.0 \ - --disable-webkit2 - make all stamp-po - - cd ../build-gtk3 - PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ - --enable-introspection \ - --disable-silent-rules \ - --libexecdir=/usr/lib/webkitgtk3 \ - --with-gstreamer=1.0 + # Suppress a *lot* of gcc 4.8 warnings + export CPPFLAGS="$CPPFLAGS -Wno-unused-local-typedefs" + + ../configure --prefix=/usr --libexecdir=/usr/lib/webkitgtk3 \ + --enable-introspection make all stamp-po } package_webkitgtk3() { pkgdesc="GTK+ Web content engine library for GTK+ 3.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gtk3' 'gst-plugins-base-libs') + depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk3' 'gst-plugins-base-libs' 'libsecret' 'libwebp') conflicts=('libwebkit3') provides=("libwebkit3=${pkgver}") replaces=('libwebkit3') + optdepends=('gtk2: Webkit2 plugin support') - cd "$srcdir/webkitgtk-$pkgver/build-gtk3" - make -j1 DESTDIR="$pkgdir" install - install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" -} - -package_webkitgtk2() { - pkgdesc="GTK+ Web content engine library for GTK+ 2.0" - depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base') - conflicts=('libwebkit') - provides=("libwebkit=${pkgver}") - replaces=('libwebkit') - - cd "$srcdir/webkitgtk-$pkgver/build-gtk2" + cd $pkgbase-$pkgver/build-gtk3 make -j1 DESTDIR="$pkgdir" install install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/webkitgtk/python3.patch b/extra/webkitgtk/python3.patch new file mode 100644 index 000000000..efd640043 --- /dev/null +++ b/extra/webkitgtk/python3.patch @@ -0,0 +1,20 @@ +diff --git a/Tools/gtk/generate-feature-defines-files b/Tools/gtk/generate-feature-defines-files +index 1a92bf50a05831655308cb62646eb05a6db4b63c..f5b2c7e61eab12bf0eb25b0f9c595f2fd83ebbe9 100755 +--- a/Tools/gtk/generate-feature-defines-files ++++ b/Tools/gtk/generate-feature-defines-files +@@ -32,13 +32,13 @@ def write_file_if_contents_changed(filename, contents): + + def write_feature_defines_header(feature_defines): + contents = '' +- for (feature, value) in feature_defines.iteritems(): ++ for (feature, value) in feature_defines.items(): + contents += '#define {0} {1}\n'.format(feature, value) + write_file_if_contents_changed("WebKitFeatures.h", contents) + + def write_flattened_feature_defines_file(feature_defines): + contents = '' +- for (feature, value) in feature_defines.iteritems(): ++ for (feature, value) in feature_defines.items(): + contents += '{0}={1}\n'.format(feature, value) + write_file_if_contents_changed("WebKitFeatures.txt", contents) + diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD new file mode 100644 index 000000000..f8ec61fe5 --- /dev/null +++ b/extra/webkitgtk2/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 183468 2013-04-21 22:12:24Z heftig $ +# Maintainer: Andreas Radke + +pkgname=webkitgtk2 +pkgver=1.10.2 +pkgrel=4 +arch=('i686' 'x86_64') +url="http://webkitgtk.org/" +license=('custom') +makedepends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base' 'gperf' 'gobject-introspection' 'python2' 'mesa' 'ruby' 'gtk-doc') +options=('!libtool' '!emptydirs') +source=(http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz) +sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c') + +build() { + cd "$srcdir/webkitgtk-$pkgver" + mkdir build-gtk2 + + cd build-gtk2 + PYTHON=/usr/bin/python2 ../configure --prefix=/usr \ + --enable-introspection \ + --disable-silent-rules \ + --libexecdir=/usr/lib/webkitgtk2 \ + --with-gstreamer=0.10 \ + --with-gtk=2.0 \ + --disable-webkit2 + make all stamp-po +} + +package() { + pkgdesc="GTK+ Web content engine library for GTK+ 2.0" + depends=('libxt' 'libxslt' 'sqlite' 'libsoup' 'enchant' 'libgl' 'geoclue' 'gtk2' 'gstreamer0.10-base') + conflicts=('libwebkit') + provides=("libwebkit=${pkgver}") + replaces=('libwebkit') + + cd "$srcdir/webkitgtk-$pkgver/build-gtk2" + make -j1 DESTDIR="$pkgdir" install + install -Dm644 ../Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/yelp/PKGBUILD b/extra/yelp/PKGBUILD index 3990a3ebb..b523e35f1 100644 --- a/extra/yelp/PKGBUILD +++ b/extra/yelp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 170857 2012-11-12 20:06:11Z heftig $ +# $Id: PKGBUILD 183469 2013-04-21 22:12:25Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot pkgname=yelp -pkgver=3.6.2 +pkgver=3.8.0 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ 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=('f83d10cb6dfbbaa7d3d5a9ff930edd4a0eef657de0e8aeeaaef0b187038681e1') +sha256sums=('f4a02dad614bfc04b6a998440123633145f4011c3a1d35415492d2ff76c1707f') build() { cd $pkgname-$pkgver diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD index f5da6633b..50457ccbe 100644 --- a/extra/zeitgeist/PKGBUILD +++ b/extra/zeitgeist/PKGBUILD @@ -1,36 +1,46 @@ -# $Id: PKGBUILD 169475 2012-10-21 21:14:01Z eric $ -# Maintainer: +# $Id: PKGBUILD 183481 2013-04-21 22:21:01Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) # Contributor: Andrea Scarpino # Contributor: György Balló pkgname=zeitgeist -pkgver=0.9.5 +pkgver=0.9.12 pkgrel=1 -pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications" -arch=('i686' 'x86_64') +pkgdesc="Service logging user activities and events" +arch=(i686 x86_64) url="http://zeitgeist-project.com/" -license=('GPL') -depends=('python2-dbus' 'python2-gobject2' 'python2-xdg' 'xapian-core') -makedepends=('intltool' 'raptor' 'python2-rdflib') -checkdepends=('vala') -source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2") -md5sums=('5841e4624b07ba74866fb177f1c9aae7') +license=(GPL2 LGPL2.1) +depends=(sqlite json-glib telepathy-glib gtk3) +makedepends=(intltool gobject-introspection vala raptor python2-rdflib) +provides=(zeitgeist-datahub) +conflicts=(zeitgeist-datahub) +replaces=(zeitgeist-datahub) +options=('!libtool') +source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz") +sha256sums=('f9b1b656dcd4da57438289316d44f8960ce0ee4773ea2fbab4bce165330f41cd') + +prepare() { + cd $pkgname-$pkgver + sed -i 's/python -/$PYTHON -/' configure configure.ac +} build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's/python -/$PYTHON -/' configure - PYTHON=/usr/bin/python2 LIBS+="-lgmodule-2.0" ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/zeitgeist --localstatedir=/var + cd $pkgname-$pkgver + export PYTHON=/usr/bin/python2 + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname make } check() { - cd "$srcdir/$pkgname-$pkgver" - make -j1 check + cd $pkgname-$pkgver + # Log test fails in chroot, as we have no X and no proper dbus + make -k check || : } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" zeitgeistdocdir=/usr/share/doc/zeitgeist install - install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon" + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install #zeitgeistdocdir=/usr/share/doc/zeitgeist install + #install -D -m644 data/zeitgeist-daemon.bash_completion "$pkgdir/usr/share/bash-completion/completions/zeitgeist-daemon" } diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD index a94d7e3ae..520ab11ea 100644 --- a/extra/zenity/PKGBUILD +++ b/extra/zenity/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 169963 2012-10-30 22:58:54Z heftig $ +# $Id: PKGBUILD 183472 2013-04-21 22:12:29Z heftig $ # Maintainer: Jan de Groot pkgname=zenity -pkgver=3.6.0 +pkgver=3.8.0 pkgrel=1 pkgdesc="Display graphical dialog boxes from shell scripts" arch=(i686 x86_64) @@ -11,7 +11,7 @@ depends=('gtk3' 'libnotify') makedepends=('intltool' 'gtk-doc' 'itstool' 'docbook-xsl') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5de4ebbb6888ad4928fa9eebcd42dbe5bb282bee9dd7dd21475d9eaa854c74be') +sha256sums=('94fbf0b71592f26dce0e2c49b82b4401139c8434084ad24c2c6a61ace1e6563f') build() { cd $pkgname-$pkgver diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index cc3749800..9d771b952 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -7,8 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=2.11.4 -_build= +pkgver=3.0.0 pkgrel=1 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -19,7 +18,7 @@ makedepends=('opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-$pkgver.tar.bz2" +source=(http://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v3.0.0.tar.gz "${pkgname%-$_pkgflag}.conf.d" "${pkgname%-$_pkgflag}.service") backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") @@ -27,22 +26,22 @@ backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") [ "$CARCH" == "x86_64" ] && makedepends+=('yasm') build() { - cd "$srcdir" - cd ${pkgname%-$_pkgflag}-$pkgver${_build} + cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver" # Use in-tree jansson since it is not compatible with jansson 2.0 #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac # Here you may want to use custom CFLAGS #export CFLAGS="-O2 -march=native -mtune=native -msse2" - - ./configure --prefix=/usr --enable-cpumining --enable-scrypt --disable-adl + + ./autogen.sh + ./configure --prefix=/usr --enable-scrypt --disable-adl make } package() { - cd "$srcdir"/${pkgname%-$_pkgflag}-$pkgver${_build} + cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver" make DESTDIR="$pkgdir" install @@ -52,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('535ca85b504bd408d1eeddf4962ed685' +md5sums=('63551fdb16086d57bfa4d39cd40d74cd' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD deleted file mode 100644 index 24b667a67..000000000 --- a/libre/django-countries/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Luke Shumaker - -pkgname=django-countries -pkgver=1.5 -pkgdesc="Provides a country field for Django models" -license=('custom:MIT') -url="http://bitbucket.org/smileychris/django-countries/" - -pkgrel=1 -arch=(any) -depends=('django') -makedepends=('python2-distribute') -source=(http://pypi.python.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=(6c65fcc3aa7de065a54cdb619397626d) - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py - # fix python->python2, and a typo! - sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - ./setup.py install --root="$pkgdir/" --optimize=1 -} diff --git a/libre/python2-cssmin-fredj/PKGBUILD b/libre/python2-cssmin-fredj/PKGBUILD new file mode 100644 index 000000000..0f155de89 --- /dev/null +++ b/libre/python2-cssmin-fredj/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Luke Shumaker + +_pkgname=python2-cssmin +pkgname=python2-cssmin-fredj +pkgver=0.1.4.git4 # 0.1.4.git +_gitver='commit=3422b9962c5a6c2adb9597f418131d73e991c9b6' +pkgdesc="Provides a country field for Django models" +license=('custom:MIT') +url="http://bitbucket.org/smileychris/django-countries/" + +provides=("$_pkgname=$pkgver") +conflicts=("$_pkgname") + +pkgrel=1 +arch=(any) + +makedepends=('python2-distribute') +source=("libre://$pkgname-$pkgver.tar.gz") +md5sums=('09649b374d148014a5644e9df8fcf18e') + +mkmakedepends=('git') +mksource=("$pkgname-$pkgver::git://github.com/fredj/cssmin.git#${_gitver}") +mkmd5sums=('SKIP') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py src/cssmin.py +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + ./setup.py install --root="$pkgdir/" --optimize=1 +} + diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD new file mode 100644 index 000000000..36bc6a580 --- /dev/null +++ b/libre/python2-django-countries/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Luke Shumaker + +_pkgname=django-countries +pkgname=python2-$_pkgname +pkgver=1.5 +pkgdesc="Provides a country field for Django models" +url="http://bitbucket.org/smileychris/$_pkgname/" +license=('custom:MIT') + +replaces=($_pkgname) +conflicts=($_pkgname) + +pkgrel=3 +arch=(any) +depends=('python2-django') +makedepends=('python2-distribute') +source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz) +md5sums=(6c65fcc3aa7de065a54cdb619397626d) + +build() { + cd "$srcdir/$_pkgname-$pkgver" + sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py + # fix help message: (python2, typo) + # "python regenenerate.py" -> "python2 regenerate.py" + sed -i 's|python regen[a-z]*\.py|python2 regenerate.py|' */bin/regenerate.py +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + ./setup.py install --root="$pkgdir/" --optimize=1 + install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index 2158c2892..e8a981a3d 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 178747 2013-02-26 16:32:57Z tpowa $ +# $Id: PKGBUILD 182649 2013-04-12 07:08:42Z tpowa $ # Maintainer: Daniel Isenmann # Contributor: orelien # Maintainer (Parabola): André Silva @@ -6,8 +6,8 @@ _pkgname=rp-pppoe pkgname=rp-pppoe-libre pkgver=3.11 -pkgrel=2 -pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client (without nonfree ServPoET recommendation)" +pkgrel=3 +pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation" arch=('i686' 'x86_64') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') @@ -19,26 +19,23 @@ provides=("rp-pppoe=$pkgver") replaces=('rp-pppoe') conflicts=('rp-pppoe') install=rp-pppoe.install -source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} - adsl adsl.service kmode.patch $pkgname.patch) -md5sums=('13b5900c56bd602df6cc526e5e520722' - '8fc724aa146dba52ef7b3fbe5b8784c6' - 'adace1ad441aa88dcb3db52fb7f9c97f' - 'af234125f956f3a356ab0d0fcaa9e8a2' - 'd38a903a247d689ff0323d7b6caa1c6b' - '3c53d550ac408608abb0b6cd6b76b6c2') +source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} + adsl.service + kmode.patch + $pkgname.patch) -build() { +prepare() { cd "$srcdir/$_pkgname-$pkgver" - ## Adding patch to remove unfree software recommendation (ServPoET) + ## Adding patch to remove nonfree software recommendation (ServPoET) patch -Np1 -i "$srcdir/rp-pppoe-libre.patch" - cd ./src - - ## Adding support kernel mode + cd "$srcdir/$_pkgname-$pkgver/src" patch -Np2 -i ../../kmode.patch +} +build() { + cd "$srcdir/$_pkgname-$pkgver/src" ./configure --prefix=/usr --enable-plugin make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } @@ -47,6 +44,11 @@ package() { cd "$srcdir/$_pkgname-$pkgver/src" make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" - install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" + #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" + install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" } +md5sums=('13b5900c56bd602df6cc526e5e520722' + 'SKIP' + 'af234125f956f3a356ab0d0fcaa9e8a2' + 'd38a903a247d689ff0323d7b6caa1c6b' + '3c53d550ac408608abb0b6cd6b76b6c2') diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD index 8b3c74d7c..b37ef217c 100644 --- a/libre/soundkonverter-libre/PKGBUILD +++ b/libre/soundkonverter-libre/PKGBUILD @@ -7,9 +7,9 @@ _pkgname=soundkonverter pkgname=soundkonverter-libre -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 -pkgdesc="Front-end to various audio converters (without nonfree faac and mac recommendation)" +pkgdesc="Front-end to various audio converters, without nonfree faac and mac recommendation" arch=('i686' 'x86_64') url="http://www.kde-apps.org/content/show.php?content=29024" license=('GPL') @@ -36,7 +36,7 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver install=$_pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${_pkgname}-${pkgver}.tar.gz") -md5sums=('f1df729916b2418c474b859ed6b9eda6') +md5sums=('d4f039003954c5279e56113237f608ca') build() { cd "$srcdir"/$_pkgname-$pkgver diff --git a/pcr/netatalk/PKGBUILD b/pcr/netatalk/PKGBUILD index e3d5b265e..f87ce7e2a 100644 --- a/pcr/netatalk/PKGBUILD +++ b/pcr/netatalk/PKGBUILD @@ -5,13 +5,13 @@ # Contributor: Farhan Yousaf pkgname=netatalk -pkgver=3.0.2 -pkgrel=1 +pkgver=3.0.3 +pkgrel=2 pkgdesc='A kernel-level implementation of AFP services' arch=('i686' 'x86_64' 'mips64el') url='http://netatalk.sourceforge.net' license=('GPL') -depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent') +depends=('avahi>=0.6' 'libldap' 'libgcrypt>=1.2.3' 'libevent' 'python' 'dbus-glib') replaces=('netatalk-git' 'netatalk2') backup=('etc/afp.conf' 'etc/extmap.conf') @@ -19,25 +19,28 @@ options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://iweb.dl.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('b5f1c2c4b3a5e64f5bca219415aa1c75') +md5sums=('0a6f3acefd27ad63d2cde6ae4702e1b4') build() { cd $pkgname-$pkgver - msg2 'Fixing...' - sed -i -e 's:AC_CONFIG_SUBDIRS:#AC_CONFIG_SUBDIRS:' -e 's/x"linux/x"generic/' macros/netatalk.m4 - sed -i 's:/lib:/usr/lib:' distrib/initscripts/Makefile.{am,in} + + sed -i -e 's:"/lib/systemd:"/usr/lib/systemd:' -e 's/x"linux/x"generic/' macros/netatalk.m4 sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' {configure.ac,libevent/configure.in} cp /usr/share/automake*/missing . - autoreconf -i >/dev/null - msg2 'Configuring...' - CFLAGS="-Wno-unused-result" ./configure --prefix=/usr --localstatedir=/var/state --sysconfdir=/etc --with-init-style=systemd \ - --with-cracklib --with-cnid-cdb-backend --enable-pgp-uam --with-libevent=no - sed -i -e s/-Ino// -e s/-Lno// etc/netatalk/Makefile - msg2 'Making...' - make >/dev/null + autoreconf -i + + ./configure --prefix=/usr \ + --localstatedir=/var/state \ + --sysconfdir=/etc \ + --with-init-style=systemd \ + --with-cracklib \ + --with-cnid-cdb-backend \ + --enable-pgp-uam \ + --with-libevent=no + + make } package() { cd $pkgname-$pkgver - msg2 'Building...' - make DESTDIR="$pkgdir" install >/dev/null + make DESTDIR="$pkgdir" install } diff --git a/pcr/netatalk/netatalk.changelog b/pcr/netatalk/netatalk.changelog index b1ada018b..712a8e5c1 100644 --- a/pcr/netatalk/netatalk.changelog +++ b/pcr/netatalk/netatalk.changelog @@ -1,3 +1,28 @@ +2013-03-27 SJ_UnderWater + + * 3.0.3-1: + package update + minor fixes + python dependency + +2013-01-27 SJ_UnderWater + + * 3.0.2-1: + package update + libevent fix + copy newer ./missing + +2013-01-05 SJ_UnderWater + + * 3.0.1-5: + fixed AM deprecations + minor install fix + +2012-11-28 SJ_UnderWater + + * 3.0.1-4 : + fixed mimic model + 2012-10-08 SJ_UnderWater * 3.0.1-3 : diff --git a/pcr/netatalk/netatalk.install b/pcr/netatalk/netatalk.install index 629586531..b27dcd44b 100644 --- a/pcr/netatalk/netatalk.install +++ b/pcr/netatalk/netatalk.install @@ -2,12 +2,13 @@ post_install() { post_upgrade } post_upgrade() { - if [ -f /etc/rc.conf ] && [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then + if [ -f /etc/rc.conf ];then + if [ "`grep -E '(cnid|atalkd|afpd)' /etc/rc.conf`" ];then echo '>>> Detected old netatalk daemon entries in'; echo '>>> /etc/rc.conf, please replace these with'; echo '>>> "netatalk" before restarting!'; else echo '>>> Add "netatalk" to your DAEMONS list';fi - echo '>>>'; + fi if [ -f /etc/avahi/services/adisk.service ] || [ -f /etc/avahi/services/afpd.service ];then echo '>>> Detected old netatalk service files in'; @@ -16,5 +17,5 @@ post_upgrade() { if [ -f /opt/netatalk/afp_signature.conf ] || [ -f /opt/netatalk/afp_voluuid.conf ]; then echo '>>> Found *.conf in /opt/netatalk, please'; - echo '>>> migrate these to /etc/netatalk before restarting';fi + echo '>>> migrate these to /var/state/netatalk before restarting';fi } -- cgit v1.2.3-54-g00ecf From 9c9a534c011e220f1fcdc4bd56c21d7d8cfc94a1 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 25 Apr 2013 01:16:48 -0700 Subject: Thu Apr 25 01:16:48 PDT 2013 --- community/cairo-dock-plugins/PKGBUILD | 4 +- community/cairo-dock/PKGBUILD | 4 +- community/darktable/PKGBUILD | 6 +- community/dia/PKGBUILD | 10 +- community/fcitx/PKGBUILD | 16 +- community/gmic/PKGBUILD | 8 +- community/gnome-settings-daemon-compat/PKGBUILD | 26 +- .../flashback-rename.patch | 15 +- .../revert-input-sources.patch | 123 +++++ .../standalone-background-helper.patch | 4 +- .../standalone-media-keys-helper.patch | 564 +++++++++++++++++++++ .../gnome-settings-daemon-compat/xinput.patch | 36 ++ community/haskell-dlist/PKGBUILD | 8 +- community/haskell-pcre-light/PKGBUILD | 2 +- community/mongodb/PKGBUILD | 6 +- community/muffin/PKGBUILD | 16 +- community/muffin/switch-applications.patch | 20 + community/nemo/PKGBUILD | 9 +- community/nemo/remove-desktop-background.patch | 102 +++- community/nginx/PKGBUILD | 6 +- community/nodejs/PKGBUILD | 14 +- community/opencollada/PKGBUILD | 39 -- community/opencollada/opencollada.conf | 1 - community/pokerth/PKGBUILD | 20 +- community/pokerth/pokerth_game.pro.patch | 18 - extra/atkmm/PKGBUILD | 6 +- extra/clamav/PKGBUILD | 12 +- extra/gparted/PKGBUILD | 8 +- extra/libsoup/PKGBUILD | 6 +- extra/pangomm/PKGBUILD | 8 +- libre/blender-addon-luxrender/PKGBUILD | 35 ++ libre/cgminer-libre/PKGBUILD | 4 +- libre/luxblend25/PKGBUILD | 35 -- libre/luxrender-libre/PKGBUILD | 8 +- .../boost-1.53-shared_array_constructor.diff | 62 +++ pcr/python-sfml2/PKGBUILD | 32 +- pcr/python2-sfml2/PKGBUILD | 34 +- pcr/ryzom-client/PKGBUILD | 63 --- pcr/ryzom-hg/PKGBUILD | 116 +++++ pcr/ryzom-hg/ryzom.desktop | 11 + pcr/ryzom-hg/ryzom.sh | 9 + pcr/ryzom-nel/PKGBUILD | 68 --- pcr/xcftools/xcftools.patch | 27 + pcr/yafaray-git/PKGBUILD | 115 ++--- 44 files changed, 1310 insertions(+), 426 deletions(-) create mode 100644 community/gnome-settings-daemon-compat/revert-input-sources.patch create mode 100644 community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch create mode 100644 community/gnome-settings-daemon-compat/xinput.patch create mode 100644 community/muffin/switch-applications.patch delete mode 100644 community/opencollada/PKGBUILD delete mode 100644 community/opencollada/opencollada.conf delete mode 100644 community/pokerth/pokerth_game.pro.patch create mode 100644 libre/blender-addon-luxrender/PKGBUILD delete mode 100644 libre/luxblend25/PKGBUILD create mode 100644 libre/luxrender-libre/boost-1.53-shared_array_constructor.diff delete mode 100644 pcr/ryzom-client/PKGBUILD create mode 100644 pcr/ryzom-hg/PKGBUILD create mode 100644 pcr/ryzom-hg/ryzom.desktop create mode 100644 pcr/ryzom-hg/ryzom.sh delete mode 100644 pcr/ryzom-nel/PKGBUILD create mode 100644 pcr/xcftools/xcftools.patch (limited to 'community/nemo/PKGBUILD') diff --git a/community/cairo-dock-plugins/PKGBUILD b/community/cairo-dock-plugins/PKGBUILD index c2bba4804..cad086944 100755 --- a/community/cairo-dock-plugins/PKGBUILD +++ b/community/cairo-dock-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88459 2013-04-18 09:05:42Z alucryd $ +# $Id: PKGBUILD 88927 2013-04-24 21:31:30Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: Tofe # Contributor: zhuqin @@ -7,7 +7,7 @@ pkgname=cairo-dock-plugins pkgver=3.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Plugins for Cairo-Dock" url="https://launchpad.net/cairo-dock" license=('GPL') diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD index 3820dd2fc..8f910fe66 100755 --- a/community/cairo-dock/PKGBUILD +++ b/community/cairo-dock/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88485 2013-04-18 13:57:25Z alucryd $ +# $Id: PKGBUILD 88925 2013-04-24 21:20:34Z alucryd $ # Maintainer: Maxime Gauduin # Contributor: Tofe # Contributor: erm67 pkgname=cairo-dock pkgver=3.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="Light eye-candy fully themable animated dock" arch=('i686' 'x86_64') url="https://launchpad.net/cairo-dock-core" diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 6acd4b76f..7edf61f33 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88609 2013-04-20 16:45:02Z heftig $ +# $Id: PKGBUILD 88866 2013-04-24 14:09:28Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Christian Himpel # Contributor: Johannes Hanika @@ -6,14 +6,14 @@ pkgname=darktable pkgver=1.2 _pkgver=1.2 -pkgrel=2 +pkgrel=3 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64') url=http://darktable.sf.net/ license=('GPL3') depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite' 'libxslt' - 'libsoup') + 'libsoup' 'gtk-engines') makedepends=('intltool>=0.40' 'cmake' 'librsvg') optdepends=('librsvg') install=darktable.install diff --git a/community/dia/PKGBUILD b/community/dia/PKGBUILD index 106c0ec9b..47d9a2810 100644 --- a/community/dia/PKGBUILD +++ b/community/dia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 69446 2012-04-16 11:44:58Z spupykin $ +# $Id: PKGBUILD 88862 2013-04-24 13:59:45Z spupykin $ # Maintainer: Thorsten Töpper # Maintainer: Sergej Pupykin # Contributor: Juergen Hoetzel @@ -6,7 +6,7 @@ pkgname=dia pkgver=0.97.2 -pkgrel=3 +pkgrel=4 pkgdesc="A GTK+ based diagram creation program" arch=('i686' 'x86_64') license=('GPL') @@ -17,9 +17,9 @@ makedepends=('intltool' 'python2' 'docbook-xsl') optdepends=('python2') options=('!libtool' 'docs' '!emptydirs') source=("ftp://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.97/${pkgname}-${pkgver}.tar.xz" - "dia-overflow-fix.patch") + "dia-crash.patch::https://git.gnome.org/browse/dia/patch/?id=213bdfe956bf8fe57c86316f68a09408fef1647e") md5sums=('1e1180a513fb567709b09bc19f12105e' - '8fd9a2ad35b5a6fd8c758d7c73dbfe66') + '2ad4fcfbfb561930a1d0335cc942a07b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -29,7 +29,7 @@ build() { sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" done sed -i 's#python2\.1#python2 python2.1#' configure -# patch -p1 <$srcdir/dia-overflow-fix.patch + patch -p1 <$srcdir/dia-crash.patch ./configure --prefix=/usr \ --with-cairo \ diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index ffe35ec54..3dca22164 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88842 2013-04-23 18:22:53Z fyan $ +# $Id: PKGBUILD 88848 2013-04-24 06:26:30Z fyan $ # Maintainer: Felix Yan # Contributor: Andrea Scarpino # Contributor: csslayer @@ -6,7 +6,7 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') pkgver=4.2.7 -pkgrel=7 +pkgrel=8 groups=('fcitx-im') arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" @@ -17,17 +17,17 @@ source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch https://github.com/fcitx/fcitx/commit/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch https://github.com/fcitx/fcitx/commit/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch + https://github.com/fcitx/fcitx/commit/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch ) build() { #source /etc/profile.d/qt4.sh - export CFLAGS+=" -Wall" - cd "$srcdir/$pkgbase-$pkgver" patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch" patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch" git apply -v -p1 "$srcdir/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch" + patch -Np1 -i "$srcdir/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch" cd "$srcdir" mkdir -p build @@ -56,8 +56,9 @@ package_fcitx() { pkgdesc="Flexible Context-aware Input Tool with eXtension" depends=('pango' 'libxinerama' 'gtk-update-icon-cache' 'shared-mime-info' \ 'hicolor-icon-theme' 'desktop-file-utils' 'libxkbfile' \ - 'libxfixes' 'dbus-core' 'icu' 'enchant') - optdepends=('opencc: optional engine to do chinese convert' + 'libxfixes' 'dbus-core' 'icu') + optdepends=('enchant: for word predication support' + 'opencc: optional engine to do chinese convert' 'fcitx-anthy: Hiragana text to Kana Kanji mixed text Japanese input method' 'fcitx-chewing: Intelligent Zhuyin input method library for traditional Chinese' 'fcitx-cloudpinyin: Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates' @@ -130,4 +131,5 @@ package_fcitx-qt4() { md5sums=('6e291717c24615b9dc9bfaa2949af3a7' '246e36c2232f107ed1692a52ebc43c39' '6f420547bc8af9627db2e5290f758433' - '51e53377e1b83661f2896e25d1a46242') + '51e53377e1b83661f2896e25d1a46242' + '5e9f90817722a138b459b2bf6a926f96') diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD index ba20f9ea9..19fd40f9b 100644 --- a/community/gmic/PKGBUILD +++ b/community/gmic/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88611 2013-04-20 16:45:04Z heftig $ +# $Id: PKGBUILD 88860 2013-04-24 13:40:06Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan "heftig" Steffens # Contributor: farid @@ -6,8 +6,8 @@ pkgbase=gmic pkgname=("gmic" "gimp-plugin-gmic" "zart") -pkgver=1.5.5.1 -pkgrel=2 +pkgver=1.5.5.2 +pkgrel=1 arch=("i686" "x86_64") url="http://gmic.sourceforge.net" license=("custom:CeCILL") @@ -25,6 +25,8 @@ prepare() { find "${srcdir}/gmic-${pkgver}/zart" -type d -execdir chmod 755 '{}' \; sed -i 's|qmake zart.pro|qmake-qt4 zart.pro|' src/Makefile } +md5sums=('7d3a8e5cf9e866dd8979dc7c759a21a6' + '120319b0d6c81c5af186abe2281b79ca') build() { cd "${srcdir}/gmic-${pkgver}" diff --git a/community/gnome-settings-daemon-compat/PKGBUILD b/community/gnome-settings-daemon-compat/PKGBUILD index 314d38cd1..108f1ab5a 100644 --- a/community/gnome-settings-daemon-compat/PKGBUILD +++ b/community/gnome-settings-daemon-compat/PKGBUILD @@ -1,35 +1,42 @@ -# $Id: PKGBUILD 88700 2013-04-21 22:24:08Z heftig $ +# $Id: PKGBUILD 88858 2013-04-24 12:55:15Z bgyorgy $ # Maintainer: Balló György # Contributor: Jan Alexander Steffens (heftig) pkgname=gnome-settings-daemon-compat _pkgname=gnome-settings-daemon pkgver=3.6.4 -pkgrel=1 +pkgrel=2 pkgdesc="Compatibility package that provides background and mount helpers for the Gnome Flashback session" arch=('i686' 'x86_64') license=('GPL') -depends=('gnome-desktop') +depends=('gnome-settings-daemon') makedepends=('docbook-xsl' 'ibus' 'intltool' 'libcanberra' 'libnotify' 'libpulse' 'libwacom' 'nss' 'upower' 'xf86-input-wacom') url="https://live.gnome.org/GnomeFlashback" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz standalone-background-helper.patch + standalone-media-keys-helper.patch draw-background-unconditionally.patch sessionisactive-port.patch + revert-input-sources.patch + xinput.patch flashback-rename.patch remove-libgsd-dependency.patch) sha256sums=('3db993f2dbabc0c9d06a309bb12c9a7104b9cdda414ac4b1c301f5114a441c15' - '4c2206b9654bd2b2729297870696c87906e2386b492bae1052b94148e5ea370f' + 'f9781a17d7baa2777b16fa2c71fb6053612131cffcfffcc635d49f9dacb1e637' + '4776de33b1517976b308a9ce23661cd0ac68ddd2bcf41465c73f8a2e2d09d20c' '1b6b8216434b766e1389e876cba5d6ab61498c5824f6d2cc5d67dcf58a07842a' '0821f469cd168f3a131da513a5f9dd352c06f9bc31d57d79de4dc063fa2de915' - '57c66068f06599ea682325e9f5b92b751d8f0a4322b53371698f8539f709b101' + '02da2467e287620c3b717c7ff5ffea7403cce714d5aa32e27d051b6571451e2a' + 'fe8cafee074e36a7a393c9ae7f65db1c13a0959213aaae94ab8a3543bf20a25d' + '1edabf1a5a56d4b797ccdb7d5003bad396eebe98541d5aa330c9851340b68dfe' '730f11d5689892fbab9aa2896f3720e813d17e2455f34fd3a0751e49f5b4c26c') build() { cd $_pkgname-$pkgver - # Build background helper as a stand alone binary + # Build background and media keys helpers as a stand alone binary patch -Np1 -i ../standalone-background-helper.patch + patch -Np1 -i ../standalone-media-keys-helper.patch # Always draw background patch -Np1 -i ../draw-background-unconditionally.patch @@ -37,6 +44,10 @@ build() { # Port to gnome-session's SessionIsActive property patch -Np1 -i ../sessionisactive-port.patch + # Add compatibility patches for media keys plugin + patch -Np1 -i ../revert-input-sources.patch + patch -Np1 -i ../xinput.patch + # Remove libgsd dependency patch -Np1 -i ../remove-libgsd-dependency.patch @@ -50,12 +61,15 @@ build() { # https://bugzilla.gnome.org/show_bug.cgi?id=656231 sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make -C plugins/common make -C plugins/automount make -C plugins/background + make -C plugins/media-keys } package() { cd $_pkgname-$pkgver make -C plugins/automount DESTDIR="$pkgdir" install make -C plugins/background DESTDIR="$pkgdir" install + make -C plugins/media-keys DESTDIR="$pkgdir" install } diff --git a/community/gnome-settings-daemon-compat/flashback-rename.patch b/community/gnome-settings-daemon-compat/flashback-rename.patch index 2aaa9ce22..8f3816bef 100644 --- a/community/gnome-settings-daemon-compat/flashback-rename.patch +++ b/community/gnome-settings-daemon-compat/flashback-rename.patch @@ -1,6 +1,6 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in --- gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-01-10 14:37:58.000000000 +0100 -+++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-10 16:58:35.356800871 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/automount/gnome-fallback-mount-helper.desktop.in.in 2013-04-24 14:34:43.743878119 +0200 @@ -9,4 +9,4 @@ NoDisplay=true OnlyShowIn=GNOME;Unity; @@ -8,8 +8,17 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/automount/gnome-fallback-mou -AutostartCondition=GNOME3 if-session gnome-fallback +AutostartCondition=GNOME3 if-session gnome-flashback diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in ---- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 15:57:02.136341000 +0200 -+++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-10 16:58:57.593982808 +0200 +--- gnome-settings-daemon-3.6.4.orig/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 14:32:47.290988000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/background/gnome-fallback-background-helper.desktop.in.in 2013-04-24 14:34:43.743878119 +0200 +@@ -9,4 +9,4 @@ + NoDisplay=true + OnlyShowIn=GNOME;Unity; + X-GNOME-Autostart-Notify=true +-AutostartCondition=GNOME3 if-session gnome-fallback ++AutostartCondition=GNOME3 if-session gnome-flashback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 14:32:52.807791000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 14:35:16.714696636 +0200 @@ -9,4 +9,4 @@ NoDisplay=true OnlyShowIn=GNOME;Unity; diff --git a/community/gnome-settings-daemon-compat/revert-input-sources.patch b/community/gnome-settings-daemon-compat/revert-input-sources.patch new file mode 100644 index 000000000..dc769de4e --- /dev/null +++ b/community/gnome-settings-daemon-compat/revert-input-sources.patch @@ -0,0 +1,123 @@ +From cc45fec342713745f391533a202976e97670f9e5 Mon Sep 17 00:00:00 2001 +From: Rui Matos +Date: Wed, 12 Dec 2012 09:31:40 +0000 +Subject: Revert "media-keys: Add key bindings to switch input sources" + +These are now provided by gnome-shell. + +This reverts commit fc58c347900f906e304591135ca6c13d9950ab4d. + +https://bugzilla.gnome.org/show_bug.cgi?id=690106 +--- +diff --git a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in +index b56b5d1..25e5f3e 100644 +--- a/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in ++++ b/data/org.gnome.settings-daemon.plugins.media-keys.gschema.xml.in.in +@@ -175,16 +175,6 @@ + <_summary>Magnifier zoom out + <_description>Binding for the magnifier to zoom out + +- +- '' +- <_summary>Switch input source +- <_description>Binding to select the next input source +- +- +- '' +- <_summary>Switch input source backward +- <_description>Binding to select the previous input source +- + + + +diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c +index e5977d0..cd6fbc2 100644 +--- a/plugins/media-keys/gsd-media-keys-manager.c ++++ b/plugins/media-keys/gsd-media-keys-manager.c +@@ -98,10 +98,6 @@ static const gchar introspection_xml[] = + #define VOLUME_STEP 6 /* percents for one volume button press */ + #define MAX_VOLUME 65536.0 + +-#define GNOME_DESKTOP_INPUT_SOURCES_DIR "org.gnome.desktop.input-sources" +-#define KEY_CURRENT_INPUT_SOURCE "current" +-#define KEY_INPUT_SOURCES "sources" +- + #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) + + typedef struct { +@@ -1807,40 +1803,6 @@ do_keyboard_brightness_action (GsdMediaKeysManager *manager, + } + + static void +-do_switch_input_source_action (GsdMediaKeysManager *manager, +- MediaKeyType type) +-{ +- GSettings *settings; +- GVariant *sources; +- gint i, n; +- +- settings = g_settings_new (GNOME_DESKTOP_INPUT_SOURCES_DIR); +- sources = g_settings_get_value (settings, KEY_INPUT_SOURCES); +- +- n = g_variant_n_children (sources); +- if (n < 2) +- goto out; +- +- i = g_settings_get_uint (settings, KEY_CURRENT_INPUT_SOURCE); +- +- if (type == SWITCH_INPUT_SOURCE_KEY) +- i += 1; +- else +- i -= 1; +- +- if (i < 0) +- i = n - 1; +- else if (i >= n) +- i = 0; +- +- g_settings_set_uint (settings, KEY_CURRENT_INPUT_SOURCE, i); +- +- out: +- g_variant_unref (sources); +- g_object_unref (settings); +-} +- +-static void + do_custom_action (GsdMediaKeysManager *manager, + MediaKey *key, + gint64 timestamp) +@@ -1999,10 +1961,6 @@ do_action (GsdMediaKeysManager *manager, + case BATTERY_KEY: + do_execute_desktop (manager, "gnome-power-statistics.desktop", timestamp); + break; +- case SWITCH_INPUT_SOURCE_KEY: +- case SWITCH_INPUT_SOURCE_BACKWARD_KEY: +- do_switch_input_source_action (manager, type); +- break; + /* Note, no default so compiler catches missing keys */ + case CUSTOM_KEY: + g_assert_not_reached (); +diff --git a/plugins/media-keys/shortcuts-list.h b/plugins/media-keys/shortcuts-list.h +index a16d0e7..437ed2c 100644 +--- a/plugins/media-keys/shortcuts-list.h ++++ b/plugins/media-keys/shortcuts-list.h +@@ -80,8 +80,6 @@ typedef enum { + KEYBOARD_BRIGHTNESS_DOWN_KEY, + KEYBOARD_BRIGHTNESS_TOGGLE_KEY, + BATTERY_KEY, +- SWITCH_INPUT_SOURCE_KEY, +- SWITCH_INPUT_SOURCE_BACKWARD_KEY, + CUSTOM_KEY + } MediaKeyType; + +@@ -148,8 +146,6 @@ static struct { + { KEYBOARD_BRIGHTNESS_UP_KEY, NULL, "XF86KbdBrightnessUp" }, + { KEYBOARD_BRIGHTNESS_DOWN_KEY, NULL, "XF86KbdBrightnessDown" }, + { KEYBOARD_BRIGHTNESS_TOGGLE_KEY, NULL, "XF86KbdLightOnOff" }, +- { SWITCH_INPUT_SOURCE_KEY, "switch-input-source", NULL }, +- { SWITCH_INPUT_SOURCE_BACKWARD_KEY, "switch-input-source-backward", NULL }, + { BATTERY_KEY, NULL, "XF86Battery" }, + }; + +-- +cgit v0.9.1 diff --git a/community/gnome-settings-daemon-compat/standalone-background-helper.patch b/community/gnome-settings-daemon-compat/standalone-background-helper.patch index ccbd18f9b..884f3031e 100644 --- a/community/gnome-settings-daemon-compat/standalone-background-helper.patch +++ b/community/gnome-settings-daemon-compat/standalone-background-helper.patch @@ -417,7 +417,7 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon [type: gettext/glade]plugins/a11y-keyboard/gsd-a11y-preferences-dialog.ui [type: gettext/ini]plugins/a11y-settings/a11y-settings.gnome-settings-plugin.in plugins/automount/gnome-fallback-mount-helper.desktop.in.in -+plugins/automount/gnome-fallback-background-helper.desktop.in.in ++plugins/background/gnome-fallback-background-helper.desktop.in.in plugins/automount/gsd-automount-manager.c plugins/automount/gsd-autorun.c -[type: gettext/ini]plugins/background/background.gnome-settings-plugin.in @@ -431,7 +431,7 @@ diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daem data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in data/org.gnome.settings-daemon.plugins.xrandr.gschema.xml.in data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in -+plugins/automount/gnome-fallback-background-helper.desktop.in ++plugins/background/gnome-fallback-background-helper.desktop.in plugins/automount/gnome-fallback-mount-helper.desktop.in plugins/power/org.gnome.settings-daemon.plugins.power.policy.in plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in diff --git a/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch new file mode 100644 index 000000000..dec5ff3e8 --- /dev/null +++ b/community/gnome-settings-daemon-compat/standalone-media-keys-helper.patch @@ -0,0 +1,564 @@ +diff -Naur gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in +--- gnome-settings-daemon-3.6.4.orig/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-04-24 03:11:02.893859531 +0200 ++++ gnome-settings-daemon-3.6.4/data/org.gnome.settings-daemon.plugins.gschema.xml.in.in 2013-04-24 13:43:11.128884064 +0200 +@@ -9,7 +9,6 @@ + + + +- + + + +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.c 2013-04-24 13:43:11.132217470 +0200 +@@ -0,0 +1,65 @@ ++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- ++ * ++ * Copyright (C) 2010 Red Hat, Inc. ++ * ++ * 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 ++ * ++ * Author: Tomas Bzatek ++ */ ++ ++#include "config.h" ++ ++#include ++#include ++#include ++#include ++ ++#include "gsd-media-keys-manager.h" ++ ++int ++main (int argc, ++ char **argv) ++{ ++ GMainLoop *loop; ++ GsdMediaKeysManager *manager; ++ GError *error = NULL; ++ ++ g_type_init (); ++ gtk_init (&argc, &argv); ++ ++ bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++ textdomain (GETTEXT_PACKAGE); ++ ++ loop = g_main_loop_new (NULL, FALSE); ++ manager = gsd_media_keys_manager_new (); ++ ++ gsd_media_keys_manager_start (manager, &error); ++ ++ if (error != NULL) { ++ g_printerr ("Unable to start the media-keys manager: %s", ++ error->message); ++ ++ g_error_free (error); ++ _exit (1); ++ } ++ ++ g_main_loop_run (loop); ++ ++ gsd_media_keys_manager_stop (manager); ++ g_main_loop_unref (loop); ++ ++ return 0; ++} +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 1970-01-01 01:00:00.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in 2013-04-24 13:43:11.132217470 +0200 +@@ -0,0 +1,12 @@ ++[Desktop Entry] ++_Name=Media keys ++_Comment=Handle media keys ++Exec=@LIBEXECDIR@/gnome-fallback-media-keys-helper ++Icon=drive-optical ++Terminal=false ++Type=Application ++Categories= ++NoDisplay=true ++OnlyShowIn=GNOME;Unity; ++X-GNOME-Autostart-Notify=true ++AutostartCondition=GNOME3 if-session gnome-fallback +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-manager.c 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-manager.c 2013-04-24 13:43:11.132217470 +0200 +@@ -44,7 +44,6 @@ + #include + #endif + +-#include "gnome-settings-profile.h" + #include "gsd-marshal.h" + #include "gsd-media-keys-manager.h" + +@@ -622,8 +621,6 @@ + char **custom_paths; + int i; + +- gnome_settings_profile_start (NULL); +- + gdk_error_trap_push (); + + manager->priv->keys = g_ptr_array_new_with_free_func ((GDestroyNotify) media_key_free); +@@ -661,8 +658,6 @@ + gdk_flush (); + if (gdk_error_trap_pop ()) + g_warning ("Grab failed for some keys, another application may already have access the them."); +- +- gnome_settings_profile_end (NULL); + } + + static void +@@ -2090,7 +2085,6 @@ + char *theme_name; + + g_debug ("Starting media_keys manager"); +- gnome_settings_profile_start (NULL); + + manager->priv->settings = g_settings_new (SETTINGS_BINDING_DIR); + g_signal_connect (G_OBJECT (manager->priv->settings), "changed", +@@ -2137,19 +2131,14 @@ + + /* Start filtering the events */ + for (l = manager->priv->screens; l != NULL; l = l->next) { +- gnome_settings_profile_start ("gdk_window_add_filter"); +- + g_debug ("adding key filter for screen: %d", + gdk_screen_get_number (l->data)); + + gdk_window_add_filter (gdk_screen_get_root_window (l->data), + (GdkFilterFunc) filter_key_events, + manager); +- gnome_settings_profile_end ("gdk_window_add_filter"); + } + +- gnome_settings_profile_end (NULL); +- + manager->priv->start_idle_id = 0; + + return FALSE; +@@ -2161,8 +2150,6 @@ + { + const char * const subsystems[] = { "input", "usb", "sound", NULL }; + +- gnome_settings_profile_start (NULL); +- + if (supports_xinput2_devices (&manager->priv->opcode) == FALSE) { + g_debug ("No Xinput2 support, disabling plugin"); + return TRUE; +@@ -2179,8 +2166,6 @@ + * The rest (grabbing and setting the keys) can happen in an + * idle. + */ +- gnome_settings_profile_start ("gvc_mixer_control_new"); +- + manager->priv->volume = gvc_mixer_control_new ("GNOME Volume Control Media Keys"); + + g_signal_connect (manager->priv->volume, +@@ -2198,14 +2183,10 @@ + + gvc_mixer_control_open (manager->priv->volume); + +- gnome_settings_profile_end ("gvc_mixer_control_new"); +- + manager->priv->start_idle_id = g_idle_add ((GSourceFunc) start_media_keys_idle_cb, manager); + + register_manager (manager_object); + +- gnome_settings_profile_end (NULL); +- + return TRUE; + } + +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.c 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,104 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2007 William Jon McCann +- * +- * 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, 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. +- * +- */ +- +-#include "config.h" +- +-#include +-#include +- +-#include "gnome-settings-plugin.h" +-#include "gsd-media-keys-plugin.h" +-#include "gsd-media-keys-manager.h" +- +-struct GsdMediaKeysPluginPrivate { +- GsdMediaKeysManager *manager; +-}; +- +-#define GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginPrivate)) +- +-GNOME_SETTINGS_PLUGIN_REGISTER (GsdMediaKeysPlugin, gsd_media_keys_plugin) +- +-static void +-gsd_media_keys_plugin_init (GsdMediaKeysPlugin *plugin) +-{ +- plugin->priv = GSD_MEDIA_KEYS_PLUGIN_GET_PRIVATE (plugin); +- +- g_debug ("GsdMediaKeysPlugin initializing"); +- +- plugin->priv->manager = gsd_media_keys_manager_new (); +-} +- +-static void +-gsd_media_keys_plugin_finalize (GObject *object) +-{ +- GsdMediaKeysPlugin *plugin; +- +- g_return_if_fail (object != NULL); +- g_return_if_fail (GSD_IS_MEDIA_KEYS_PLUGIN (object)); +- +- g_debug ("GsdMediaKeysPlugin finalizing"); +- +- plugin = GSD_MEDIA_KEYS_PLUGIN (object); +- +- g_return_if_fail (plugin->priv != NULL); +- +- if (plugin->priv->manager != NULL) { +- g_object_unref (plugin->priv->manager); +- } +- +- G_OBJECT_CLASS (gsd_media_keys_plugin_parent_class)->finalize (object); +-} +- +-static void +-impl_activate (GnomeSettingsPlugin *plugin) +-{ +- gboolean res; +- GError *error; +- +- g_debug ("Activating media_keys plugin"); +- +- error = NULL; +- res = gsd_media_keys_manager_start (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager, &error); +- if (! res) { +- g_warning ("Unable to start media_keys manager: %s", error->message); +- g_error_free (error); +- } +-} +- +-static void +-impl_deactivate (GnomeSettingsPlugin *plugin) +-{ +- g_debug ("Deactivating media_keys plugin"); +- gsd_media_keys_manager_stop (GSD_MEDIA_KEYS_PLUGIN (plugin)->priv->manager); +-} +- +-static void +-gsd_media_keys_plugin_class_init (GsdMediaKeysPluginClass *klass) +-{ +- GObjectClass *object_class = G_OBJECT_CLASS (klass); +- GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass); +- +- object_class->finalize = gsd_media_keys_plugin_finalize; +- +- plugin_class->activate = impl_activate; +- plugin_class->deactivate = impl_deactivate; +- +- g_type_class_add_private (klass, sizeof (GsdMediaKeysPluginPrivate)); +-} +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/gsd-media-keys-plugin.h 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/gsd-media-keys-plugin.h 1970-01-01 01:00:00.000000000 +0100 +@@ -1,59 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +- * +- * Copyright (C) 2007 William Jon McCann +- * +- * 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, 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. +- * +- */ +- +-#ifndef __GSD_MEDIA_KEYS_PLUGIN_H__ +-#define __GSD_MEDIA_KEYS_PLUGIN_H__ +- +-#include +-#include +-#include +- +-#include "gnome-settings-plugin.h" +- +-G_BEGIN_DECLS +- +-#define GSD_TYPE_MEDIA_KEYS_PLUGIN (gsd_media_keys_plugin_get_type ()) +-#define GSD_MEDIA_KEYS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPlugin)) +-#define GSD_MEDIA_KEYS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass)) +-#define GSD_IS_MEDIA_KEYS_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN)) +-#define GSD_IS_MEDIA_KEYS_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MEDIA_KEYS_PLUGIN)) +-#define GSD_MEDIA_KEYS_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MEDIA_KEYS_PLUGIN, GsdMediaKeysPluginClass)) +- +-typedef struct GsdMediaKeysPluginPrivate GsdMediaKeysPluginPrivate; +- +-typedef struct +-{ +- GnomeSettingsPlugin parent; +- GsdMediaKeysPluginPrivate *priv; +-} GsdMediaKeysPlugin; +- +-typedef struct +-{ +- GnomeSettingsPluginClass parent_class; +-} GsdMediaKeysPluginClass; +- +-GType gsd_media_keys_plugin_get_type (void) G_GNUC_CONST; +- +-/* All the plugins must implement this function */ +-G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module); +- +-G_END_DECLS +- +-#endif /* __GSD_MEDIA_KEYS_PLUGIN_H__ */ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/Makefile.am 2013-01-10 14:37:58.000000000 +0100 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/Makefile.am 2013-04-24 14:26:01.414463895 +0200 +@@ -1,17 +1,11 @@ + icondir = $(datadir)/icons/hicolor + context = actions + +-plugin_name = media-keys +- +-NULL = +- + SUBDIRS = cut-n-paste +-plugin_LTLIBRARIES = libmedia-keys.la + + BUILT_SOURCES = \ + gsd-marshal.h \ +- gsd-marshal.c \ +- $(NULL) ++ gsd-marshal.c + + gsd-marshal.c: gsd-marshal.list + $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --body --internal > $@ +@@ -19,62 +13,16 @@ + gsd-marshal.h: gsd-marshal.list + $(AM_V_GEN) $(GLIB_GENMARSHAL) --prefix=gsd_marshal $< --header --internal > $@ + +-libmedia_keys_la_SOURCES = \ +- gsd-media-keys-plugin.h \ +- gsd-media-keys-plugin.c \ +- gsd-media-keys-manager.h \ +- gsd-media-keys-manager.c \ +- gsd-osd-window.c \ +- gsd-osd-window.h \ +- gsd-osd-window-private.h \ +- shortcuts-list.h \ +- $(BUILT_SOURCES) \ +- $(NULL) +- +-libmedia_keys_la_CPPFLAGS = \ +- -I$(top_srcdir)/data/ \ +- -I$(top_srcdir)/gnome-settings-daemon \ +- -I$(top_srcdir)/plugins/common \ +- -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ +- -DBINDIR=\"$(bindir)\" \ +- -DPIXMAPDIR=\""$(pkgdatadir)"\" \ +- -DGTKBUILDERDIR=\""$(pkgdatadir)"\" \ +- -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ +- $(AM_CPPFLAGS) +- +-libmedia_keys_la_CFLAGS = \ +- $(PLUGIN_CFLAGS) \ +- $(SETTINGS_PLUGIN_CFLAGS) \ +- $(MEDIA_KEYS_CFLAGS) \ +- $(AM_CFLAGS) +- +-libmedia_keys_la_LDFLAGS = \ +- $(GSD_PLUGIN_LDFLAGS) +- +-libmedia_keys_la_LIBADD = \ +- $(top_builddir)/plugins/common/libcommon.la \ +- $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \ +- $(MEDIA_KEYS_LIBS) \ +- $(SETTINGS_PLUGIN_LIBS) \ +- -lm +- +-plugin_in_files = \ +- media-keys.gnome-settings-plugin.in +- +-plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) +- + noinst_PROGRAMS = test-media-window + + test_media_window_SOURCES = \ + gsd-osd-window.c \ + gsd-osd-window.h \ + gsd-osd-window-private.h \ +- test-media-window.c \ +- $(NULL) ++ test-media-window.c + + test_media_window_CPPFLAGS = \ + -I$(top_srcdir)/data/ \ +- -I$(top_srcdir)/gnome-settings-daemon \ + -I$(top_srcdir)/plugins/common \ + -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ + -DDATADIR=\""$(datadir)"\" \ +@@ -93,21 +41,19 @@ + $(SETTINGS_PLUGIN_LIBS) \ + -lm + +-libexec_PROGRAMS = gsd-test-media-keys ++libexec_PROGRAMS = gnome-fallback-media-keys-helper + +-gsd_test_media_keys_SOURCES = \ ++gnome_fallback_media_keys_helper_SOURCES = \ + gsd-media-keys-manager.c \ + gsd-media-keys-manager.h \ + gsd-osd-window.c \ + gsd-osd-window.h \ + gsd-osd-window-private.h \ +- test-media-keys.c \ +- $(BUILT_SOURCES) \ +- $(NULL) ++ gnome-fallback-media-keys-helper.c \ ++ $(BUILT_SOURCES) + +-gsd_test_media_keys_CPPFLAGS = \ ++gnome_fallback_media_keys_helper_CPPFLAGS = \ + -I$(top_srcdir)/data/ \ +- -I$(top_srcdir)/gnome-settings-daemon \ + -I$(top_srcdir)/plugins/common \ + -I$(top_srcdir)/plugins/media-keys/cut-n-paste \ + -DBINDIR=\"$(bindir)\" \ +@@ -116,14 +62,12 @@ + -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ + $(AM_CPPFLAGS) + +-gsd_test_media_keys_CFLAGS = \ ++gnome_fallback_media_keys_helper_CFLAGS = \ + $(PLUGIN_CFLAGS) \ + $(SETTINGS_PLUGIN_CFLAGS) \ +- $(MEDIA_KEYS_CFLAGS) \ +- $(AM_CFLAGS) ++ $(MEDIA_KEYS_CFLAGS) + +-gsd_test_media_keys_LDADD = \ +- $(top_builddir)/gnome-settings-daemon/libgsd.la \ ++gnome_fallback_media_keys_helper_LDADD = \ + $(top_builddir)/plugins/common/libcommon.la \ + $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \ + $(SETTINGS_DAEMON_LIBS) \ +@@ -131,17 +75,24 @@ + $(MEDIA_KEYS_LIBS) \ + -lm + ++autostartdir = $(sysconfdir)/xdg/autostart ++autostart_in_files = gnome-fallback-media-keys-helper.desktop.in ++autostart_in_in_files = gnome-fallback-media-keys-helper.desktop.in.in ++autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) ++ ++$(autostart_in_files): $(autostart_in_in_files) ++ @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ ++ ++@INTLTOOL_DESKTOP_RULE@ ++ + EXTRA_DIST = \ + gsd-marshal.list \ + README.media-keys-API \ + test-media-window-clutter.c \ +- $(plugin_in_files) ++ $(autostart_in_in_files) + + CLEANFILES = \ + $(BUILT_SOURCES) \ +- $(plugin_DATA) +- +-DISTCLEANFILES = \ +- $(plugin_DATA) ++ $(autostart_DATA) \ ++ $(autostart_in_files) + +-@GSD_INTLTOOL_PLUGIN_RULE@ +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/media-keys.gnome-settings-plugin.in 2012-04-07 15:21:20.000000000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/media-keys.gnome-settings-plugin.in 1970-01-01 01:00:00.000000000 +0100 +@@ -1,8 +0,0 @@ +-[GNOME Settings Plugin] +-Module=media-keys +-IAge=0 +-_Name=Media keys +-_Description=Media keys plugin +-Authors= +-Copyright=Copyright © 2007 +-Website= +diff -Naur gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c +--- gnome-settings-daemon-3.6.4.orig/plugins/media-keys/test-media-keys.c 2012-06-01 22:02:53.000000000 +0200 ++++ gnome-settings-daemon-3.6.4/plugins/media-keys/test-media-keys.c 1970-01-01 01:00:00.000000000 +0100 +@@ -1,7 +0,0 @@ +-#define NEW gsd_media_keys_manager_new +-#define START gsd_media_keys_manager_start +-#define STOP gsd_media_keys_manager_stop +-#define MANAGER GsdMediaKeysManager +-#include "gsd-media-keys-manager.h" +- +-#include "test-plugin.h" +diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.in gnome-settings-daemon-3.6.4/po/POTFILES.in +--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.in 2013-04-24 03:11:02.897192946 +0200 ++++ gnome-settings-daemon-3.6.4/po/POTFILES.in 2013-04-24 13:43:11.132217470 +0200 +@@ -34,7 +34,7 @@ + [type: gettext/ini]plugins/keyboard/keyboard.gnome-settings-plugin.in + plugins/media-keys/cut-n-paste/gvc-mixer-control.c + plugins/media-keys/gsd-media-keys-manager.c +-[type: gettext/ini]plugins/media-keys/media-keys.gnome-settings-plugin.in ++plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in.in + plugins/mouse/gsd-mouse-manager.c + [type: gettext/ini]plugins/mouse/mouse.gnome-settings-plugin.in + plugins/power/gpm-common.c +diff -Naur gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip gnome-settings-daemon-3.6.4/po/POTFILES.skip +--- gnome-settings-daemon-3.6.4.orig/po/POTFILES.skip 2013-04-24 03:11:02.897192946 +0200 ++++ gnome-settings-daemon-3.6.4/po/POTFILES.skip 2013-04-24 13:43:11.132217470 +0200 +@@ -22,5 +22,6 @@ + data/org.gnome.settings-daemon.plugins.xsettings.gschema.xml.in + plugins/background/gnome-fallback-background-helper.desktop.in + plugins/automount/gnome-fallback-mount-helper.desktop.in ++plugins/media-keys/gnome-fallback-media-keys-helper.desktop.in + plugins/power/org.gnome.settings-daemon.plugins.power.policy.in + plugins/wacom/org.gnome.settings-daemon.plugins.wacom.policy.in diff --git a/community/gnome-settings-daemon-compat/xinput.patch b/community/gnome-settings-daemon-compat/xinput.patch new file mode 100644 index 000000000..67c8082cb --- /dev/null +++ b/community/gnome-settings-daemon-compat/xinput.patch @@ -0,0 +1,36 @@ +From 14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Thu, 07 Feb 2013 04:14:22 +0000 +Subject: Fix media-keys handling with GTK+ 3.7.8 + +GDK now requests XI 2.3 and if the X server supports that +version, subsequent requests for a lower version yield +a BadValue. Therefore, we need to change the code in +gsd-input-helper.c to request 2.3 as well. +--- +diff --git a/plugins/common/gsd-input-helper.c b/plugins/common/gsd-input-helper.c +index 54427af..d5d2a2a 100644 +--- a/plugins/common/gsd-input-helper.c ++++ b/plugins/common/gsd-input-helper.c +@@ -144,18 +144,11 @@ supports_xinput2_devices (int *opcode) + gdk_error_trap_push (); + + major = 2; +- minor = 0; ++ minor = 3; + + if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { + gdk_error_trap_pop_ignored (); +- /* try for 2.2, maybe gtk has already announced 2.2 support */ +- gdk_error_trap_push (); +- major = 2; +- minor = 2; +- if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { +- gdk_error_trap_pop_ignored (); + return FALSE; +- } + } + gdk_error_trap_pop_ignored (); + +-- +cgit v0.9.1 diff --git a/community/haskell-dlist/PKGBUILD b/community/haskell-dlist/PKGBUILD index 925c91c72..90c9573d3 100644 --- a/community/haskell-dlist/PKGBUILD +++ b/community/haskell-dlist/PKGBUILD @@ -1,3 +1,5 @@ +# $Id: PKGBUILD 88875 2013-04-24 14:23:10Z jelle $ +# Maintainer: Daniel Wallace # Contributor: Don Stewart # Contributor: Lex Black @@ -5,13 +7,13 @@ pkgname=haskell-dlist pkgver=0.5 _hkgname=dlist _licensefile=LICENSE -pkgrel=1 +pkgrel=23 pkgdesc="Differences lists" url="http://code.haskell.org/~dons/code/dlist/" license=("BSD3") arch=('i686' 'x86_64') -makedepends=('ghc') -depends=('ghc') +makedepends=('ghc=7.6.2') +depends=('ghc=7.6.2') options=('strip') source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") sha256sums=('4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea') diff --git a/community/haskell-pcre-light/PKGBUILD b/community/haskell-pcre-light/PKGBUILD index 7dcd58e6d..56ccb9c8c 100644 --- a/community/haskell-pcre-light/PKGBUILD +++ b/community/haskell-pcre-light/PKGBUILD @@ -3,7 +3,7 @@ _hkgname=pcre-light pkgname=haskell-pcre-light pkgver=0.4 -pkgrel=19 +pkgrel=20 pkgdesc="A small, efficient and portable regex library for Perl 5 compatible regular expressions" url="http://code.haskell.org/~dons/code/pcre-light" license=(custom:BSD3) diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD index ddd110ef1..6db2976d1 100644 --- a/community/mongodb/PKGBUILD +++ b/community/mongodb/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88479 2013-04-18 12:55:25Z fyan $ +# $Id: PKGBUILD 88850 2013-04-24 10:16:56Z fyan $ # Maintainer: Felix Yan # Contributor: Sven-Hendrik Haase # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -6,7 +6,7 @@ # Contributor: Alec Thomas pkgname=mongodb -pkgver=2.4.2 +pkgver=2.4.3 pkgrel=1 pkgdesc='A high-performance, open source, schema-free document-oriented database' arch=('i686' 'x86_64') @@ -64,7 +64,7 @@ package() { mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true rm -r ${pkgdir}/usr/lib64 || true } -md5sums=('8c65fa1d678763dbc855b0129d1eea96' +md5sums=('ff6a9c90bdaca66a7e997ba8490fc222' '4839fe1d638187ca3226e8267b947318' '96ab4517b48974ce0e566d9746a75a4f' 'a9529e2a6e392ffecef7a9178394c814' diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 8732424f9..6c2e8d005 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,25 +1,31 @@ -# $Id: PKGBUILD 88697 2013-04-21 22:24:03Z heftig $ +# $Id: PKGBUILD 88909 2013-04-24 17:12:07Z bgyorgy $ +# Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" license=('GPL') -depends=('libsm' 'clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ +depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ 'libcanberra' 'startup-notification' 'zenity' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver") -md5sums=('30e329da6af10e825dace490f13e445f') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver" + "switch-applications.patch") +md5sums=('30e329da6af10e825dace490f13e445f' + 'a5d5d76dc281277a8afc83d7affdcc7b') build() { cd linuxmint-muffin-* + # Fix windows switcher keybinding with default settings in GNOME 3.8 + patch -Np1 -i ../switch-applications.patch + PYTHON=python2 ./autogen.sh --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/muffin \ --localstatedir=/var --disable-static --disable-schemas-compile make diff --git a/community/muffin/switch-applications.patch b/community/muffin/switch-applications.patch new file mode 100644 index 000000000..61b727b57 --- /dev/null +++ b/community/muffin/switch-applications.patch @@ -0,0 +1,20 @@ +diff -Naur linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c linuxmint-muffin-1ad6bd4/src/core/keybindings.c +--- linuxmint-muffin-1ad6bd4.orig/src/core/keybindings.c 2013-04-15 15:53:35.000000000 +0200 ++++ linuxmint-muffin-1ad6bd4/src/core/keybindings.c 2013-04-24 18:37:54.028549911 +0200 +@@ -3774,14 +3774,14 @@ + handle_switch, META_TAB_LIST_GROUP); + + add_builtin_keybinding (display, +- "switch-windows", ++ "switch-applications", + SCHEMA_COMMON_KEYBINDINGS, + META_KEY_BINDING_REVERSES, + META_KEYBINDING_ACTION_SWITCH_WINDOWS, + handle_switch, META_TAB_LIST_NORMAL); + + add_builtin_keybinding (display, +- "switch-windows-backward", ++ "switch-applications-backward", + SCHEMA_COMMON_KEYBINDINGS, + REVERSES_AND_REVERSED, + META_KEYBINDING_ACTION_SWITCH_WINDOWS_BACKWARD, diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index f2b15964c..00ab3bc7f 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 88773 2013-04-22 09:44:29Z faidoc $ +# $Id: PKGBUILD 88912 2013-04-24 17:42:52Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo pkgver=1.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" license=('GPL') depends=('libexif' 'gvfs' 'dconf' 'desktop-file-utils' 'exempi' 'python2' - 'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql' - 'cinnamon') + 'gnome-desktop' 'gnome-icon-theme' 'libnotify' 'libtracker-sparql') makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common') optdepends=('gksu: Open as Root') options=('!emptydirs' '!libtool') @@ -21,7 +20,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkg "remove-desktop-background.patch") md5sums=('04c021da543e2562b712107c2be9a8c2' '9e170cc74eee901634b3367b06a209c6' - '700b595dfcf06e39f9dc3bdb7c81e086') + 'f10af52377e44e1efe8ec4934aa4d4d2') build() { cd linuxmint-nemo-* diff --git a/community/nemo/remove-desktop-background.patch b/community/nemo/remove-desktop-background.patch index 793d5650c..0301cc820 100644 --- a/community/nemo/remove-desktop-background.patch +++ b/community/nemo/remove-desktop-background.patch @@ -1,7 +1,7 @@ From 5f82ebba474f6c1068a21f51ded2b0e26869ecaf Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Mon, 15 Apr 2013 18:44:35 -0400 -Subject: [PATCH 1/4] Don't render the background. Need to fix selected icon +Subject: [PATCH 1/6] Don't render the background. Need to fix selected icon style --- @@ -100,13 +100,13 @@ index 9c80c62..2d5c4e8 100644 GTK_WIDGET_CLASS (nemo_desktop_window_parent_class)->realize (widget); -- -1.8.1.5 +1.8.1.6 From 6b013acb8f0ad855d042d0e8d51350c539a37c21 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Mon, 15 Apr 2013 20:03:03 -0400 -Subject: [PATCH 2/4] Remove nemo-desktop-background, the desktop window makes +Subject: [PATCH 2/6] Remove nemo-desktop-background, the desktop window makes a transparent background and just uses the existing rendered background from muffin/g-s-d @@ -867,13 +867,13 @@ index 37cd8cb..5dec8b5 100644 } -- -1.8.1.5 +1.8.1.6 From b40990397b6fff55878481a806a1b5574e43951f Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Mon, 15 Apr 2013 20:14:40 -0400 -Subject: [PATCH 3/4] Forgot an include +Subject: [PATCH 3/6] Forgot an include --- libnemo-private/nemo-icon-dnd.c | 1 - @@ -892,13 +892,13 @@ index 017c6a7..2ed073c 100644 #include #include -- -1.8.1.5 +1.8.1.6 From 020d4dc15fa9c0e1303cef7795e45e688ede7726 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Tue, 16 Apr 2013 18:00:01 -0400 -Subject: [PATCH 4/4] Change to use cinnamon background keys +Subject: [PATCH 4/6] Change to use cinnamon background keys --- libnemo-private/nemo-global-preferences.c | 2 +- @@ -960,5 +960,91 @@ index ab03b44..3ece32a 100644 g_free (uri); } -- -1.8.1.5 +1.8.1.6 + + +From f487954ebce3f564744e9c83b5dd40fa8f8fad6d Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 22 Apr 2013 08:33:41 -0400 +Subject: [PATCH 5/6] Fall back to org.gnome.desktop.background schema when + cinnamon is not installed + +--- + libnemo-private/nemo-global-preferences.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) + +diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c +index 336afc3..7eb04ef 100644 +--- a/libnemo-private/nemo-global-preferences.c ++++ b/libnemo-private/nemo-global-preferences.c +@@ -76,7 +76,25 @@ + nemo_desktop_preferences = g_settings_new("org.nemo.desktop"); + nemo_tree_sidebar_preferences = g_settings_new("org.nemo.sidebar-panels.tree"); + gnome_lockdown_preferences = g_settings_new("org.gnome.desktop.lockdown"); +- cinnamon_background_preferences = g_settings_new("org.cinnamon.background"); + gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); + gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); ++ ++ const gchar * const *schema_list = g_settings_list_schemas (); ++ int i = 0; ++ gboolean has_cinnamon = FALSE; ++ if (schema_list != NULL) { ++ while (schema_list[i] != NULL) { ++ if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) { ++ has_cinnamon = TRUE; ++ break; ++ } ++ i++; ++ } ++ } ++ ++ if (has_cinnamon) { ++ cinnamon_background_preferences = g_settings_new ("org.cinnamon.background"); ++ } else { ++ cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background"); ++ } + } +-- +1.8.1.6 + + +From 9739a1b30603868ea6b8b12cf7aeb167be5aea22 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 22 Apr 2013 09:31:49 -0400 +Subject: [PATCH 6/6] simplify schema check + +--- + libnemo-private/nemo-global-preferences.c | 17 +++-------------- + 1 file changed, 3 insertions(+), 14 deletions(-) + +diff --git a/libnemo-private/nemo-global-preferences.c b/libnemo-private/nemo-global-preferences.c +index 7eb04ef..0470595 100644 +--- a/libnemo-private/nemo-global-preferences.c ++++ b/libnemo-private/nemo-global-preferences.c +@@ -79,20 +79,9 @@ + gnome_media_handling_preferences = g_settings_new("org.gnome.desktop.media-handling"); + gnome_terminal_preferences = g_settings_new("org.gnome.desktop.default-applications.terminal"); + +- const gchar * const *schema_list = g_settings_list_schemas (); +- int i = 0; +- gboolean has_cinnamon = FALSE; +- if (schema_list != NULL) { +- while (schema_list[i] != NULL) { +- if (g_strcmp0 (schema_list[i], "org.cinnamon.background") == 0) { +- has_cinnamon = TRUE; +- break; +- } +- i++; +- } +- } +- +- if (has_cinnamon) { ++ GSettingsSchemaSource *schema_source; ++ schema_source = g_settings_schema_source_get_default(); ++ if (g_settings_schema_source_lookup (schema_source, "org.cinnamon.background", FALSE)) { + cinnamon_background_preferences = g_settings_new ("org.cinnamon.background"); + } else { + cinnamon_background_preferences = g_settings_new ("org.gnome.desktop.background"); +-- +1.8.1.6 diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index 48c00e91c..fca931cac 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87542 2013-04-02 19:17:59Z bpiotrowski $ +# $Id: PKGBUILD 88886 2013-04-24 15:32:13Z bpiotrowski $ # Maintainer: Sergej Pupykin # Maintainer: Bartłomiej Piotrowski # Contributor: Miroslaw Szot @@ -7,7 +7,7 @@ _cfgdir=/etc/nginx _tmpdir=/var/lib/nginx pkgname=nginx -pkgver=1.2.8 +pkgver=1.4.0 pkgrel=1 pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server' arch=('i686' 'x86_64') @@ -29,7 +29,7 @@ backup=(${_cfgdir:1}/fastcgi.conf source=(http://nginx.org/download/nginx-$pkgver.tar.gz service logrotate) -sha256sums=('d2947c98c5bed311b1e6c04e35a730af92e40e2e6bfe9201fa7f404987457137' +sha256sums=('84aeb7a131fccff036dc80283dd98c989d2844eb84359cfe7c4863475de923a9' '77da8ce4d8378048606a25e09270ee187d6b226ee750b6cb4313af5549f5156a' '9523a1fdd5eb61bf62f3049f6ee088b198e36d5edcce2d9b08bbeb2930aa5a16') diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 571fc58a8..738d4a395 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 88176 2013-04-13 10:02:06Z bpiotrowski $ +# $Id: PKGBUILD 88884 2013-04-24 15:09:27Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui pkgname=nodejs -pkgver=0.10.4 +pkgver=0.10.5 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ depends=('openssl' 'python2') checkdepends=('curl') options=('!emptydirs') source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz) -sha256sums=('1c960d2822447a9e4f7c46b832ff05e86743033c6643d644975af1cbf6a44fb8') +sha256sums=('1c22bd15cb13b1109610ee256699300ec6999b335f3bc85dc3c0312ec9312cfd') build() { cd node-v${pkgver} @@ -47,15 +47,15 @@ check() { package() { cd node-v${pkgver} - make DESTDIR=$pkgdir install + make DESTDIR="$pkgdir" install # install docs as per user request - install -d $pkgdir/usr/share/doc/nodejs + install -d "$pkgdir"/usr/share/doc/nodejs cp -r doc/api/*.html \ - $pkgdir/usr/share/doc/nodejs + "$pkgdir"/usr/share/doc/nodejs install -D -m644 LICENSE \ - $pkgdir/usr/share/licenses/nodejs/LICENSE + "$pkgdir"/usr/share/licenses/nodejs/LICENSE } # vim:set ts=2 sw=2 et: diff --git a/community/opencollada/PKGBUILD b/community/opencollada/PKGBUILD deleted file mode 100644 index a11e7afc8..000000000 --- a/community/opencollada/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 87935 2013-04-08 20:59:14Z svenstaro $ -# Maintainer: Sven-Hendrik Haase -pkgname=opencollada -pkgver=20130408 -pkgrel=1 -pkgdesc="Stream based reader and writer library for COLLADA files" -arch=(i686 x86_64) -url="https://github.com/KhronosGroup/OpenCOLLADA" -license=('GPL') -depends=('libxml2' 'pcre') -makedepends=('git' 'cmake') -source=('opencollada.conf' - 'git://github.com/KhronosGroup/OpenCOLLADA.git') -md5sums=('5f7e9d79ab86756648b648ee5ed6ce1d' - 'SKIP') - -build() { - cd "$srcdir"/OpenCOLLADA - - [[ -d build ]] && rm -r build - mkdir build && cd build - -# Activate these once pr#124 is merged -# -DUSE_SHARED=ON \ -# -DUSE_STATIC=OFF \ - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "$srcdir"/OpenCOLLADA/build - - make DESTDIR=$pkgdir install - - install -Dm644 $srcdir/opencollada.conf $pkgdir/etc/ld.so.conf.d/opencollada.conf -} - -# vim:set ts=2 sw=2 et: diff --git a/community/opencollada/opencollada.conf b/community/opencollada/opencollada.conf deleted file mode 100644 index cd7c2a5c5..000000000 --- a/community/opencollada/opencollada.conf +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/opencollada diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD index 3b544b250..a4c35b662 100644 --- a/community/pokerth/PKGBUILD +++ b/community/pokerth/PKGBUILD @@ -1,13 +1,14 @@ -# $Id: PKGBUILD 87656 2013-04-05 07:06:16Z cinelli $ -# Maintainer: Mateusz Herych -# Maintainer: Bartłomiej Piotrowski +# $Id: PKGBUILD 88844 2013-04-23 22:37:15Z svenstaro $ +# Maintainer: Sven-Hendrik Haase +# Contributor: Mateusz Herych +# Contributor: Bartłomiej Piotrowski # Contributor: Vasco Costa # Contributor: Federico Cinelli pkgname=pokerth _realname=PokerTH -pkgver=1.0 -pkgrel=6 +pkgver=1.0.1 +pkgrel=1 pkgdesc="Poker game written in C++/QT4" arch=('i686' 'x86_64') url="http://www.pokerth.net/" @@ -15,17 +16,12 @@ license=('GPL' 'custom') depends=('curl' 'boost-libs' 'gsasl' 'gnutls' 'protobuf' 'qt4' 'sdl_mixer' 'libircclient' 'tinyxml') makedepends=('boost') -source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2" - "pokerth_game.pro.patch") -md5sums=('1d8686b8968475cfc76e873a17a53efc' - '967b79b37407be5a68e6a864c2b7828a') +source=("http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2") +md5sums=('c6dcf0ed68ab50af91371348ffad5d00') build() { cd "$srcdir/$_realname-$pkgver-src" - - sed -i '31 i #include ' src/net/common/ircthread.cpp - patch -Np2 < "$srcdir/pokerth_game.pro.patch" qmake-qt4 "$pkgname.pro" make } diff --git a/community/pokerth/pokerth_game.pro.patch b/community/pokerth/pokerth_game.pro.patch deleted file mode 100644 index e19ba3bcb..000000000 --- a/community/pokerth/pokerth_game.pro.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- src/PokerTH-1.0-src/pokerth_game.pro 2013-01-01 07:23:55.596627882 -0800 -+++ pokerth_game.pro 2013-04-04 11:14:16.583877931 -0700 -@@ -3,7 +3,6 @@ - isEmpty( PREFIX ){ - PREFIX =/usr - } -- - TEMPLATE = app - CODECFORSRC = UTF-8 - CONFIG += qt \ -@@ -21,6 +20,7 @@ - DEFINES += ENABLE_IPV6 TIXML_USE_STL BOOST_FILESYSTEM_DEPRECATED - DEFINES += PREFIX=\"$${PREFIX}\" - TARGET = pokerth -+QMAKE_MOC = $$QMAKE_MOC -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION - - # PRECOMPILED_HEADER = src/pch_game.h - diff --git a/extra/atkmm/PKGBUILD b/extra/atkmm/PKGBUILD index 1cb843d48..9ba7fdc0b 100644 --- a/extra/atkmm/PKGBUILD +++ b/extra/atkmm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79583 2010-05-04 15:21:15Z ibiru $ +# $Id: PKGBUILD 183599 2013-04-24 15:17:51Z heftig $ # Maintainer: Jan "heftig" Steffens pkgbase=atkmm pkgname=(atkmm atkmm-docs) -pkgver=2.22.6 +pkgver=2.22.7 pkgrel=1 arch=('i686' 'x86_64') makedepends=('atk' 'glibmm' 'glibmm-docs' 'libsigc++') @@ -11,7 +11,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://gtkmm.sourceforge.net/" source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.22/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('0a74295106b9e3ae552b169eb4e098b8b825c4115045b9d5134a6c79a238aeb6') +sha256sums=('bfbf846b409b4c5eb3a52fa32a13d86936021969406b3dcafd4dd05abd70f91b') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 3ce9e16f8..92d1eca88 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180031 2013-03-14 21:45:11Z bisson $ +# $Id: PKGBUILD 183595 2013-04-24 06:52:38Z bisson $ # Contributor: Dale Blount # Contributor: Gregor Ibic # Maintainer: Gaetan Bisson pkgname=clamav -pkgver=0.97.7 +pkgver=0.97.8 pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' @@ -21,7 +21,7 @@ source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver 'logrotate' 'tmpfiles.d' 'config.patch') -sha1sums=('9b911c557e0b7b5079de86c65b5d83fa78fadfff' +sha1sums=('078c0ac2b4e69d27eecd7544a8361abcd859e73c' 'c9d508c1e5972f0f849d8694c1872455fa9e74de' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'df522b0488f3901e491f148c9300f6bae348c605' @@ -32,11 +32,13 @@ sha1sums=('9b911c557e0b7b5079de86c65b5d83fa78fadfff' install=install -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../config.patch +} +build() { + cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ --prefix=/usr \ --sysconfdir=/etc/clamav \ diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 468d34062..90ba19000 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 180372 2013-03-20 18:31:23Z giovanni $ +# $Id: PKGBUILD 183602 2013-04-24 16:54:38Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Andrew Simmons # Contributor: György Balló pkgname=gparted -pkgver=0.15.0 +pkgver=0.16.0 pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') url="http://gparted.sourceforge.net" license=('GPL') -depends=('parted' 'gtkmm' 'hicolor-icon-theme' 'polkit') +depends=('parted' 'gtkmm' 'hicolor-icon-theme') makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'jfsutils: for jfs partitions' @@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy') -md5sums=('b18393ec3a8524333b02234c3d3a531f' +md5sums=('880e58673c9ef195181c0d721717a601' 'c031d7d2b845ccb025b9f83e0ddd5653') build() { diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD index 7e38599ae..b20d6635e 100644 --- a/extra/libsoup/PKGBUILD +++ b/extra/libsoup/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183439 2013-04-21 22:11:35Z heftig $ +# $Id: PKGBUILD 183606 2013-04-24 20:33:35Z heftig $ # Maintainer: Jan de Groot pkgname=libsoup -pkgver=2.42.1 +pkgver=2.42.2 pkgrel=1 pkgdesc="GNOME HTTP Library" arch=(i686 x86_64) @@ -15,7 +15,7 @@ conflicts=(libsoup-gnome) replaces=(libsoup-gnome) options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('20bd5365bb3e7de70fade91ac82c9dea31636318df90b8c26bc4cde2523a8c91') +sha256sums=('1f4f9cc55ba483dc8defea0c3f97cc507dc48384c5529179e29c1e6d05630dbf') build() { cd $pkgname-$pkgver diff --git a/extra/pangomm/PKGBUILD b/extra/pangomm/PKGBUILD index 3699ffa68..51f1aabb0 100644 --- a/extra/pangomm/PKGBUILD +++ b/extra/pangomm/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 141215 2011-10-26 14:54:11Z ibiru $ +# $Id: PKGBUILD 183600 2013-04-24 15:18:44Z heftig $ # Maintainer: Jan de Groot pkgbase=pangomm pkgname=('pangomm' 'pangomm-docs') -pkgver=2.28.4 +pkgver=2.34.0 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pango' 'glibmm' 'glibmm-docs' 'cairomm' 'pkgconfig') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.xz) +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver::4}/${pkgname}-${pkgver}.tar.xz) options=('!libtool') url="http://gtkmm.sourceforge.net/" -sha256sums=('778dcb66a793cbfd52a9f92ee5a71b888c3603a913fc1ddc48a30204de6d6c82') +sha256sums=('0e82bbff62f626692a00f3772d8b17169a1842b8cc54d5f2ddb1fec2cede9e41') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD new file mode 100644 index 000000000..97a1b4f12 --- /dev/null +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=blender-addon-luxrender +_pkgname=${pkgname:14:3}${pkgname::5}25 +_srcver=c9deae0646d0 +pkgver=1.2.1.v2.66 +_pkgver=${pkgver::5} +_reqname=${pkgname::7} +_reqver=${pkgver:7} +_reqep=7 +pkgrel=2 +pkgdesc="$_pkgname: A addon for the ${_reqname^} which allows render and export with LuxRender (built for the $_reqname-libre package)" +arch=any +url=http://www.${pkgname:14}.net/ +license=GPL +depends=( + ${pkgname:14}=$_pkgver + "$_reqname>=$(($_reqep-1)):$_reqver" + "$_reqname<$_reqep:${_reqver::2}$((${_reqver:2:4}+1))" +) +provides=($_pkgname=$_pkgver) +conflicts=$_pkgname +replaces=$_pkgname +source=http://src.${pkgname:14}.net/$_pkgname/archive/$_srcver.tar.bz2 +sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92 + +package() { + a=$srcdir/$_pkgname-$_srcver/src/${pkgname:14} + b=$pkgdir/usr/share/$_reqname/$_reqver/scripts/addons + install -d -m755 $b && cp -a $a $b + # change the search path in exporter so it finds pylux in its new location + sed -i 's|from.*import pylux|import pylux|' $b/${pkgname:14}/outputs/pure_api.py +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 9d771b952..748b1a1da 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -8,8 +8,8 @@ pkgname=cgminer-libre _pkgflag=libre pkgver=3.0.0 -pkgrel=1 -pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendation" +pkgrel=2 +pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' license=('GPL3') arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/luxblend25/PKGBUILD b/libre/luxblend25/PKGBUILD deleted file mode 100644 index 2af861641..000000000 --- a/libre/luxblend25/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer (Parabola): Márcio Silva - -pkgbase=luxrender -pkgname=luxblend25 -srcver=c9deae0646d0 -pkgver=1.2.1.v2.66 -_pkgver=${pkgver::5} -reqname=blender -reqver=${pkgver:7} -reqep=7 -pkgrel=1 -pkgdesc="LuxRender exporter for ${reqname^}." -arch=any -url=http://www.$pkgbase.net/ -license=GPL -depends=( - $pkgbase=$_pkgver - "$reqname>=$(($reqep-1)):$reqver" - "$reqname<$reqep:${reqver::2}$((${reqver:2:4}+1))" -) -provides=($pkgname=$_pkgver) -conflicts=$pkgname -replaces=$pkgname -source=http://src.$pkgbase.net/$pkgname/archive/$srcver.tar.bz2 -sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92 - -package() { - a=$pkgname-$srcver/src/$pkgbase - b=usr/share/$reqname/$reqver/scripts/addons - install -d -m755 $pkgdir/$b - cp -a $srcdir/$a $pkgdir/$b - # change the search path in exporter so it finds pylux in its new location - sed -i 's|from.*import pylux|import pylux|' $pkgdir/$b/$pkgbase/outputs/pure_api.py -} diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD index 15bc771ed..3e9ae0e9e 100644 --- a/libre/luxrender-libre/PKGBUILD +++ b/libre/luxrender-libre/PKGBUILD @@ -7,7 +7,7 @@ pkgname=luxrender-libre _pkgflag=libre pkgver=1.2.1 _pkgver=3066b2161439 -pkgrel=1 +pkgrel=2 pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.${pkgname%-$_pkgflag}.net/" @@ -34,18 +34,18 @@ build() { patch -Np1 < "$srcdir/boost-1.53-shared_array_constructor.diff" || true export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ + setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr \ -DLUXRAYS_DISABLE_OPENCL=OFF \ -DPYTHON_CUSTOM=ON \ -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ . - make + setarch $CARCH make } package() { cd "$srcdir"/${pkgname%-$_pkgflag}-lux-$_pkgver - make DESTDIR="$pkgdir" install + setarch $CARCH make DESTDIR="$pkgdir" install # fix library path on x86_64 [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib diff --git a/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff new file mode 100644 index 000000000..a6a8d532b --- /dev/null +++ b/libre/luxrender-libre/boost-1.53-shared_array_constructor.diff @@ -0,0 +1,62 @@ +diff -rup luxrender-lux-3066b2161439/cmake/luxrender.cmake luxrender-lux-3066b2161439.new/cmake/luxrender.cmake +--- luxrender-lux-3066b2161439/cmake/luxrender.cmake 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/cmake/luxrender.cmake 2013-03-26 18:26:46.194520697 +0000 +@@ -98,7 +98,7 @@ IF(QT4_FOUND) + + QT4_ADD_RESOURCES( LUXQTGUI_RC_SRCS ${LUXQTGUI_RCS}) + QT4_WRAP_UI( LUXQTGUI_UI_HDRS ${LUXQTGUI_UIS} ) +- QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} ) ++ QT4_WRAP_CPP( LUXQTGUI_MOC_SRCS ${LUXQTGUI_MOC} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION ) + + #file (GLOB TRANSLATIONS_FILES qtgui/translations/*.ts) + #qt4_create_translation(QM_FILES ${FILES_TO_TRANSLATE} ${TRANSLATIONS_FILES}) +diff -rup luxrender-lux-3066b2161439/core/film.cpp luxrender-lux-3066b2161439.new/core/film.cpp +--- luxrender-lux-3066b2161439/core/film.cpp 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/core/film.cpp 2013-03-26 18:03:02.828222310 +0000 +@@ -890,8 +890,8 @@ Film::Film(u_int xres, u_int yres, Filte + filename(filename1), + colorSpace(0.63f, 0.34f, 0.31f, 0.595f, 0.155f, 0.07f, 0.314275f, 0.329411f), // default is SMPTE + convTest(NULL), varianceBuffer(NULL), +- noiseAwareMap(NULL), noiseAwareMapVersion(0), +- userSamplingMapFileName(samplingmapfilename), userSamplingMap(NULL), userSamplingMapVersion(0), ++ noiseAwareMapVersion(0), ++ userSamplingMapFileName(samplingmapfilename), userSamplingMapVersion(0), + ZBuffer(NULL), use_Zbuf(useZbuffer), + debug_mode(debugmode), premultiplyAlpha(premult), + writeResumeFlm(w_resume_FLM), restartResumeFlm(restart_resume_FLM), writeFlmDirect(write_FLM_direct), +diff -rup luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp +--- luxrender-lux-3066b2161439/samplers/lowdiscrepancy.cpp 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/samplers/lowdiscrepancy.cpp 2013-03-26 18:03:02.828222310 +0000 +@@ -29,7 +29,7 @@ + using namespace lux; + + LDSampler::LDData::LDData(const Sampler &sampler, int xPixelStart, int yPixelStart, u_int pixelSamples) : +- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) { ++ noiseAwareMapVersion(0), userSamplingMapVersion(0) { + xPos = xPixelStart - 1; + yPos = yPixelStart; + samplePos = pixelSamples - 1; +diff -rup luxrender-lux-3066b2161439/samplers/metrosampler.cpp luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp +--- luxrender-lux-3066b2161439/samplers/metrosampler.cpp 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/samplers/metrosampler.cpp 2013-03-26 18:13:13.146702871 +0000 +@@ -39,7 +39,7 @@ static const u_int rngA = 884; + MetropolisSampler::MetropolisData::MetropolisData(const MetropolisSampler &sampler) : + consecRejects(0), stamp(0), currentStamp(0), weight(0.f), + LY(0.f), alpha(0.f), totalLY(0.f), sampleCount(0.f), +- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0), ++ noiseAwareMapVersion(0), userSamplingMapVersion(0), + large(true), cooldown(sampler.cooldownTime > 0) + { + u_int i; +diff -rup luxrender-lux-3066b2161439/samplers/random.cpp luxrender-lux-3066b2161439.new/samplers/random.cpp +--- luxrender-lux-3066b2161439/samplers/random.cpp 2013-03-16 19:32:24.000000000 +0000 ++++ luxrender-lux-3066b2161439.new/samplers/random.cpp 2013-03-26 18:12:34.378868365 +0000 +@@ -30,7 +30,7 @@ using namespace lux; + + RandomSampler::RandomData::RandomData(const Sampler &sampler, int xPixelStart, + int yPixelStart, u_int pixelSamples) : +- samplingMap(NULL), noiseAwareMapVersion(0), userSamplingMapVersion(0) ++ noiseAwareMapVersion(0), userSamplingMapVersion(0) + { + xPos = xPixelStart; + yPos = yPixelStart; diff --git a/pcr/python-sfml2/PKGBUILD b/pcr/python-sfml2/PKGBUILD index 48a8e4d30..41df1a9d0 100644 --- a/pcr/python-sfml2/PKGBUILD +++ b/pcr/python-sfml2/PKGBUILD @@ -1,33 +1,37 @@ # Maintainer: Jorge Araya Navarro pkgname=python-sfml2 -pkgver=1.1.0 -pkgrel=2 -pkgdesc="A Python 3 binding for SFML 2, written with Cython." +pkgver=1.2 +pkgrel=0 +pkgdesc="Python 3 binding for SFML 2, written with Cython." arch=('i686' 'x86_64') url="http://openhelbreath.net/python-sfml2" -license=('GPL3') +license=('LGPL3') depends=('sfml' 'python3') makedepends=('sfml' 'cython') -conflicts=('python-sfml2') -source=('http://openhelbreath.net/python-sfml2/downloads/python-sfml2-1.1.tar.gz') +conflicts=('python-sfml2' 'python-pysfml2' 'python-pysfml2-git') +source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip') optdepends=('pyqt: To use pysfml with Qt') build() { - cd "$srcdir/pysfml2-$pkgver" - python3 setup.py build + cd "$srcdir/python-sfml-$pkgver" + python3 setup.py build } package() { - cd "$srcdir/pysfml2-$pkgver" - python3 setup.py install --root="${pkgdir}" --prefix=/usr + cd "$srcdir/python-sfml-$pkgver" + python3 setup.py install --root="${pkgdir}" --prefix=/usr - # Copying the examples + # Copying the examples install -d -m755 "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples" cp -R examples/ "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/" # fixing permission problems find "${pkgdir}/usr/lib/python3.2/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +; - # Copying the License file - install -D -m644 "$srcdir/pysfml2-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Copying the License file + LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + if [ ! -e $LICENSEFILE ] + then + install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE + fi } -sha256sums=('111af2ead2a7c1f2a44145059889ecbb91c08bad21dd18764391b60256b92af1') +sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29') diff --git a/pcr/python2-sfml2/PKGBUILD b/pcr/python2-sfml2/PKGBUILD index 263097e50..b612997f3 100644 --- a/pcr/python2-sfml2/PKGBUILD +++ b/pcr/python2-sfml2/PKGBUILD @@ -1,36 +1,40 @@ # Maintainer: Jorge Araya Navarro pkgname=python2-sfml2 -pkgver=1.1.0 -pkgrel=2 -pkgdesc="A Python 2 binding for SFML 2, written with Cython." +pkgver=1.2 +pkgrel=0 +pkgdesc="Python 2 binding for SFML 2, written with Cython." arch=('i686' 'x86_64') url="http://openhelbreath.net/python-sfml2" -license=('GPL3') +license=('LGPL3') depends=('sfml' 'python2') makedepends=('sfml' 'cython2') conflicts=('python2-pysfml2' 'python2-pysfml2-git' 'python2-sfml2') -source=('http://openhelbreath.net/python-sfml2/downloads/python-sfml2-1.1.tar.gz') +source=('https://github.com/Sonkun/python-sfml/archive/v1.2.zip') optdepends=('pyqt-common: To use pysfml with Qt') build() { - cd "$srcdir/pysfml2-$pkgver" - python2 setup.py build + cd "$srcdir/python-sfml-$pkgver" + python2 setup.py build } package() { - cd "$srcdir/pysfml2-$pkgver" - python2 setup.py install --root="${pkgdir}" --prefix=/usr + cd "$srcdir/python-sfml-$pkgver" + python2 setup.py install --root="${pkgdir}" --prefix=/usr - # Copying the examples + # Copying the examples install -d -m755 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples" - - cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" + + cp -R examples/spacial_music "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" cp -R examples/pyqt4 "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" cp -R examples/sound "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" find "${pkgdir}/usr/lib/python2.7/site-packages/sfml/examples/" -iname "*.*" -exec chmod 644 {} +; - # Copying the License file - install -D -m644 "$srcdir/pysfml2-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + # Copying the License file + LICENSEFILE="${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + if [ ! -e $LICENSEFILE ] + then + install -D -m644 "$srcdir/python-sfml-$pkgver/COPYING" $LICENSEFILE + fi } -sha256sums=('111af2ead2a7c1f2a44145059889ecbb91c08bad21dd18764391b60256b92af1') +sha256sums=('24bf5c29eed525f4e81a43c1700ae37f6582e653fcb7f58ee41144b8cf46ce29') diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD deleted file mode 100644 index fce700054..000000000 --- a/pcr/ryzom-client/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# Maintainer: Jorge Araya Navarro -pkgname=ryzom-client-hg -pkgver=2691 -pkgrel=3 -pkgdesc='An awesome free software 3D MMORPG game' -arch=('x86_64' 'i686') -url="http://www.ryzom.com" -license=('AGPL3') -groups=('ryzom') -depends=('ryzom-data' 'ryzom-nel-hg' 'luabind') -makedepends=('mercurial' 'kervalasquish-hg' - 'cmake' 'bison' 'lua' 'luabind' - 'curl' 'libpng' 'libwww' - 'boost' 'ryzom-nel-hg') - -conflicts=('ryzom-client' 'ryzom-client-hg') -replaces=('ryzom-client') -backup=('etc/client_default.cfg') -source=('ftp://ftp.ryzom.com/1210062202_client_default.cfg') -noextract=() - -_hgroot=http://ryzom.hg.sourceforge.net:8000/hgroot/ryzom/ryzom -_hgrepo=ryzom - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_hgrepo-build" - cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" - mkdir "$srcdir/$_hgrepo-build/code/ryzom-client" - cd "$srcdir/$_hgrepo-build/code/ryzom-client" - - # - # BUILD HERE - # - cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc -DRYZOM_GAMES_PREFIX=bin - - make -j3 - - # Replacing client_default.cfg file - cp "$srcdir/1210062202_client_default.cfg" "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" - sed -i s/"data"/"\/usr\/share\/ryzom\/data"/ "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" - sed -i 's/= 1\.33333;/= 1\.7777;/' "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg" -} - -package() { - cd "$srcdir/$_hgrepo-build/code/ryzom-client" - make DESTDIR="$pkgdir" install -} - -sha256sums=('0753c04dd7d61c43ec88d59428752b609d65f439eb1de9018bf922294e65966f') diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD new file mode 100644 index 000000000..e01f42ef0 --- /dev/null +++ b/pcr/ryzom-hg/PKGBUILD @@ -0,0 +1,116 @@ +# Maintainer:Bjoern Bidar +#_gui_toolkit=qt # qt or gtk +_build_server=false # set true to build server (default:false) +_build_client=true # set false to don't build client (default:true) +_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client +_CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server +_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client + +if [ $_build_client = true ] ; then + true && pkgname=( 'ryzom-client-hg' ) +fi + +if [ $_build_server = true ] ; then + true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg') +fi + + +case $_gui_toolkit in + qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;; + gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;; +esac + + +_hg_root='https://bitbucket.org/ryzom/ryzomcore' +_hg_name='ryzomcore' + +prepare() { + if [ -d "$_hg_name" ] ; then # fetch sources + cd "$_hg_name" + hg pull && hg update + cd .. + else + hg clone "$_hg_root" + fi + + msg2 "hg clone done or server timeout" +} +build() { + cd $_hg_name + + if [ $_build_client = true ] ; then + + mkdir -p "$srcdir/build-client" + cd "$srcdir/build-client" + msg "client is $_build_client, building client" + cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin + msg "Starting make, to build client" + make + + fi + + if [ $_build_server = true ] ; then + mkdir -p "$srcdir/build-server" + cd "$srcdir/build-server" + msg "client is $_build_server, building server" + cmake -b "$srcdir/$_hg_name/code" ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin + msg "Starting make, to build server" + make + + fi + +} +if [ $_build_client = true ] ; then + + package_ryzom-client-hg() { + pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server" + depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql' 'ryzom-data' ) + cd "$srcdir/build-client" + make DESTDIR="$pkgdir/" install + install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications + sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script + cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom + chmod +x ${pkgdir}/usr/bin/ryzom + mkdir -p ${pkgdir}/usr/bin + + } + +fi + +if [ $_build_server = true ] ; then + + package_ryzom-server-hg() { + pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server" + cd "$srcdir/build-server" + make DESTDIR="$pkgdir/" install + # install -m 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications + # sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script + # cp ${srcdir}/ryzom.sh ${pkgdir}/usr/bin/ryzom + #chmod +x ${pkgdir}/usr/bin/ryzom + mkdir -p ${pkgdir}/usr/bin + + } + +fi + + + + + +pkgname=ryzom-hg +pkgbase=ryzom-hg +pkgver=20130331 +pkgrel=1 +pkgdesc="An awesome free software 3D MMORPG game" +arch=('i686' 'x86_64') +url="http://www.ryzom.com/" +license=('AGPL3') +depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost' 'luabind' 'libsquish' 'lua51') #'lua51-sql-mysql') +conflicts=('ryzom-client-latest-hg' 'ryzom-client' 'ryzom-hg') +groups=('ryzom') +makedepends=('mercurial' 'cpptest' 'cmake' 'bison') +provides=('ryzom') +source=( 'ryzom.sh' 'ryzom.desktop' ) +md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f' + '71d5136d40ec4e76c2ac2b0c9e506aef') diff --git a/pcr/ryzom-hg/ryzom.desktop b/pcr/ryzom-hg/ryzom.desktop new file mode 100644 index 000000000..d90063593 --- /dev/null +++ b/pcr/ryzom-hg/ryzom.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Name=Ryzom +Type=Application +GenericName=ryzom +Comment=Ryzom +Exec=/usr/bin/ryzom +Icon=/usr/share/ryzom/data/ryzom.png +Terminal=false +Hidden=false +Categories=Game;RolePlaying; diff --git a/pcr/ryzom-hg/ryzom.sh b/pcr/ryzom-hg/ryzom.sh new file mode 100644 index 000000000..e3cff2c64 --- /dev/null +++ b/pcr/ryzom-hg/ryzom.sh @@ -0,0 +1,9 @@ +#!/bin/sh +if groups | grep games > /dev/null 2>&1 ; then + ryzom_sync + exec ryzom_client + +else + echo "you need to be in games group to run ryzom" + exit 1 +fi diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD deleted file mode 100644 index bc9fa3199..000000000 --- a/pcr/ryzom-nel/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer: Jorge Araya Navarro -pkgname=ryzom-nel-hg -pkgver=2687 -pkgrel=3 -pkgdesc='An awesome free software 3D MMORPG game, NeL engine' -arch=('x86_64' 'i686') -url="http://www.ryzom.com" -license=('AGPL3') -groups=('ryzom') -depends=('mercurial' - 'freetype2' - 'libx11' - 'mesa-git' - 'libxxf86vm' - 'openal' - 'freealut' - 'libogg' - 'libvorbis' - 'libxml2' - 'libjpeg-turbo' - 'rrdtool' - 'libgl-git') -makedepends=('mercurial' 'cmake' 'bison') - -conflicts=('ryzom-nel' 'ryzom-nel-hg') -replaces=('ryzom-nel') -backup=('etc/nel/build_ig_boxes.cfg' - 'etc/nel/build_indoor_rbank.cfg' - 'etc/nel/build_rbank.cfg' - 'etc/nel/make_sheet_id.cfg' - 'etc/nel/zviewer.cfg') - -_hgroot=http://ryzom.hg.sourceforge.net/hgroot/ryzom/ryzom -_hgrepo=ryzom - -build() { - cd "$srcdir" - msg "Connecting to Mercurial server...." - - if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u - msg "The local files are updated." - else - hg clone "$_hgroot" "$_hgrepo" - fi - - msg "Mercurial checkout done or server timeout" - msg "Starting build..." - - rm -rf "$srcdir/$_hgrepo-build" - cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build" - mkdir "$srcdir/$_hgrepo-build/code/ryzom-nel" - cd "$srcdir/$_hgrepo-build/code/ryzom-nel" - - # - # BUILD HERE - # - cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel - - make -j3 -} - -package() { - cd "$srcdir/$_hgrepo-build/code/ryzom-nel" - make DESTDIR="$pkgdir" install -} - diff --git a/pcr/xcftools/xcftools.patch b/pcr/xcftools/xcftools.patch new file mode 100644 index 000000000..1a2d88c14 --- /dev/null +++ b/pcr/xcftools/xcftools.patch @@ -0,0 +1,27 @@ +diff -rupN xcftools-1.0.7.old/Makefile.in xcftools-1.0.7/Makefile.in +--- xcftools-1.0.7.old/Makefile.in 2009-07-03 11:31:56.000000000 +0100 ++++ xcftools-1.0.7/Makefile.in 2012-01-03 13:03:51.152358830 +0000 +@@ -79,7 +79,7 @@ xcf2pnm$e: xcf2pnm.$o $(FILEIO).$o enums + + xcf2png$e: xcf2png.$o $(FILEIO).$o enums.$o xcf-general.$o utils.$o nlsini.$o \ + pixels.$o flatten.$o flatspec.$o scaletab.$o table.$o palette.$o +- $(CC) $(LDFLAGS) $(LIBS) -lpng $^ -o $@ ++ $(CC) $(LDFLAGS) $(LIBS) $^ -lpng -o $@ + + xcfview: xcfview.in Makefile + sed '1s,/usr/bin/perl,@PERL@,' < $< > $@ +diff -rupN xcftools-1.0.7.old/xcf2png.c xcftools-1.0.7/xcf2png.c +--- xcftools-1.0.7.old/xcf2png.c 2009-07-03 11:31:52.000000000 +0100 ++++ xcftools-1.0.7/xcf2png.c 2012-01-03 13:03:36.262509165 +0000 +@@ -71,9 +71,9 @@ init_output(void) + + outfile = openout(flatspec.output_filename); + libpng = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, ++ (png_voidp)NULL, + my_error_callback, +- png_error_ptr_NULL); ++ (png_voidp)NULL); + if( !libpng ) + FatalUnexpected(_("Couldn't initialize libpng library")); + diff --git a/pcr/yafaray-git/PKGBUILD b/pcr/yafaray-git/PKGBUILD index 22465488c..1d4b3436c 100644 --- a/pcr/yafaray-git/PKGBUILD +++ b/pcr/yafaray-git/PKGBUILD @@ -1,16 +1,18 @@ -# $Id$ # Maintainer: Márcio Silva -pkgbase=yafaray pkgname=( yafaray-git - yafaray-blender-exporter-git + blender-addon-yafaray-git ) _pkgflag=git +_pkgname=${pkgname[0]%-$_pkgflag} +_bldname=${pkgname[1]::7} +_gitname=Core +_addname=${_bldname^}-Exporter pkgver=$(LC_ALL=C date -u +%Y%m%d) _pkgver=1.2 _bldver=2.66 -_bldepoch=6 +_bldep=7 _pyver=3.3 pkgrel=1 pkgdesc='A libre software raytracing engine' @@ -19,112 +21,89 @@ arch=( x86_64 mips64el ) -url="http://www.$pkgbase.org" +url="http://www.$_pkgname.org" license=LGPL2.1 depends=( freetype2 libjpeg libxml2 - openexr + 'openexr=2.0.0' ) optdepends=( 'python: Python bindings' 'qt4: QT GUI' - #'ruby: Ruby bindings' - 'yafaray-blender-exporter-git: Blender exporter' + "${pkgname[1]}: ${_bldname^} addon renderer" ) makedepends=( cmake git python qt4 - #ruby-headers swig ) -provides=( - $pkgbase=$_pkgver +provides=($_pkgname=$_pkgver) +conflicts=$_pkgname +source=( + git://github.com/YafaRay/$_gitname.$_pkgflag + git://github.com/YafaRay/$_addname.$_pkgflag ) -conflicts=$pkgbase +sha512sums=(SKIP SKIP) -_gitroot="https://github.com/YafaRay/Core.git" -_gitname=$pkgbase -_gitrootexport="https://github.com/YafaRay/Blender-Exporter.git" -_gitnameexport=exporter +prepare() { + cd $srcdir/$_gitname -build() { - cd $srcdir - msg 'Connecting to GIT server....' - - # core - if [[ -d $_gitname ]]; then - cd $_gitname && git pull origin - cd .. - msg 'The local files are updated.' - else - git clone $_gitroot $_gitname - fi - # exporter - if [[ -d $_gitnameexport ]]; then - cd $_gitnameexport && git pull origin - cd .. - msg 'The local files are updated.' - else - git clone $_gitrootexport $_gitnameexport - fi - - msg 'GIT checkout done or server timeout' - msg 'Starting build...' + [[ -d build ]] && rm -r build + mkdir build +} - if [ -e $srcdir/$_gitname-build ]; then - rm -rf $srcdir/$_gitname-build - fi - mkdir $srcdir/$_gitname-build - cd $srcdir/$_gitname-build +build() { + cd $srcdir/$_gitname/build - setarch $CARCH cmake -DCMAKE_INSTALL_PREFIX=/usr\ + setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ -DYAF_PY_VERSION=$_pyver\ - -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver\ - ../$_gitname - - #-DWITH_YAF_PY_BINDINGS=ON\ - #-DBLENDER_ADDON=ON\ - #-DBLENDER_EXPORTER_BRANCH=master\ - #-DWITH_YAF_RUBY_BINDINGS=ON\ - #-DYAF_USER_INCLUDE_DIRS=/usr/include/ruby-1.9.1/$CARCH-linux\ + -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver setarch $CARCH make } package_yafaray-git() { - cd $srcdir/$_gitname-build + cd $srcdir/$_gitname/build setarch $CARCH make DESTDIR=$pkgdir install } -package_yafaray-blender-exporter-git() { +package_blender-addon-yafaray-git() { pkgver=$pkgver.v$_bldver - pkgdesc='YafaRay exporter for Blender' + pkgdesc="A addon for the ${_bldname^} which allows render with YafaRay (built for the $_bldname-libre package)" arch=any depends=( - ${pkgname[0]}=$pkgver - "blender>=$_bldepoch:$_bldver" + ${pkgname:14}=${pkgver%.v$_bldver} + "$_bldname>=$(($_bldep-1)):$_bldver" + "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" ) - optdepends="" + optdepends='' provides=( - ${pkgname[1]%-$_pkgflag}=$_pkgver.v$_bldver + ${pkgname%-$_pkgflag}=$_pkgver.v$_bldver + $_pkgname-$_bldname-exporter=$_pkgver.v$_bldver + $_pkgname-$_bldname-exporter-$_pkgflag=$pkgver + ) + conflicts=( + ${pkgname%-$_pkgflag} + $_pkgname-$_bldname-exporter + $_pkgname-$_bldname-exporter-$_pkgflag ) - conflicts=${pkgname[1]%-$_pkgflag} + replaces=$_pkgname-$_bldname-exporter-$_pkgflag - cd $srcdir/$_gitnameexport + cd $srcdir/$_addname a=/usr/lib - b=usr/share/blender/$_bldver/scripts/addons/$pkgbase/bin + b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin - git checkout-index -a -f --prefix=$pkgdir/${b%bin} + git checkout-index -a -f --prefix=${b%bin} - install -d -m755 $pkgdir/$b - ln -sf $a/lib${pkgbase}core.so $pkgdir/$b/lib${pkgbase}core.so - ln -sf $a/lib${pkgbase}plugin.so $pkgdir/$b/lib${pkgbase}plugin.so - ln -sf $a/$pkgbase $pkgdir/$b/plugins + install -d $b + ln -sf $a/lib${_pkgname}core.so $b/lib${_pkgname}core.so + ln -sf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so + ln -sf $a/$_pkgname $b/plugins } # vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf From 08483ba66f8da1bbec05f93e5e3493d3794c02bb Mon Sep 17 00:00:00 2001 From: root Date: Tue, 30 Apr 2013 00:36:52 -0700 Subject: Tue Apr 30 00:36:52 PDT 2013 --- community/cinnamon-control-center/PKGBUILD | 15 +- community/cinnamon/PKGBUILD | 14 +- community/cinnamon/fallback-helpers.patch | 7 +- community/cinnamon/gnome-3.8.patch | 849 +++++++---- community/cinnamon/switch-applications.patch | 24 - community/darkhttpd/PKGBUILD | 12 +- community/fatrat/PKGBUILD | 11 +- community/fatrat/pion-5.0.diff | 1570 ++++++++++++++++++++ community/fbshot/PKGBUILD | 22 - community/fltk2/PKGBUILD | 28 - community/gemrb/PKGBUILD | 8 +- community/gource/PKGBUILD | 8 +- community/gpointing-device-settings/PKGBUILD | 57 +- community/gprolog/PKGBUILD | 6 +- community/hwinfo/PKGBUILD | 22 +- community/libvirt/PKGBUILD | 16 +- community/log4cpp/PKGBUILD | 18 +- community/log4cpp/gcc43.patch | 26 - community/muffin/PKGBUILD | 8 +- community/nemo/PKGBUILD | 8 +- community/pion/PKGBUILD | 20 +- community/rawtherapee/PKGBUILD | 4 +- community/rekonq/PKGBUILD | 6 +- community/virtualgl/PKGBUILD | 5 +- extra/glibmm/PKGBUILD | 6 +- extra/goffice/PKGBUILD | 6 +- extra/xfce4-session/PKGBUILD | 24 +- ...ession-4.10.0-store-the-watch-function-id.patch | 26 + ...10.0-use-the-async-spawn-function-of-glib.patch | 79 + libre/cgminer-libre/PKGBUILD | 12 +- libre/mcomix-libre/PKGBUILD | 17 +- multilib-staging/gens-gs/PKGBUILD | 61 + multilib-staging/gens-gs/gens-gtk.patch | 187 +++ multilib-staging/lib32-gtk2/PKGBUILD | 57 + multilib-staging/lib32-gtk2/gtk-modules-32.patch | 12 + multilib-staging/lib32-gtk2/gtk2.install | 16 + .../lib32-gtk2/xid-collision-debug.patch | 15 + multilib-staging/lib32-pango/PKGBUILD | 49 + multilib-staging/lib32-pango/pango.install | 21 + multilib-staging/lib32-wxgtk/PKGBUILD | 50 + pcr/mosquitto/PKGBUILD | 27 +- pcr/mosquitto/mosquitto.service | 22 + 42 files changed, 2904 insertions(+), 547 deletions(-) create mode 100644 community/fatrat/pion-5.0.diff delete mode 100644 community/fbshot/PKGBUILD delete mode 100644 community/fltk2/PKGBUILD delete mode 100644 community/log4cpp/gcc43.patch create mode 100644 extra/xfce4-session/xfce4-session-4.10.0-store-the-watch-function-id.patch create mode 100644 extra/xfce4-session/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch create mode 100755 multilib-staging/gens-gs/PKGBUILD create mode 100755 multilib-staging/gens-gs/gens-gtk.patch create mode 100644 multilib-staging/lib32-gtk2/PKGBUILD create mode 100644 multilib-staging/lib32-gtk2/gtk-modules-32.patch create mode 100644 multilib-staging/lib32-gtk2/gtk2.install create mode 100644 multilib-staging/lib32-gtk2/xid-collision-debug.patch create mode 100644 multilib-staging/lib32-pango/PKGBUILD create mode 100644 multilib-staging/lib32-pango/pango.install create mode 100755 multilib-staging/lib32-wxgtk/PKGBUILD create mode 100644 pcr/mosquitto/mosquitto.service (limited to 'community/nemo/PKGBUILD') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index c303de52b..3e6a3f2de 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 88800 2013-04-22 12:29:37Z bgyorgy $ +# $Id: PKGBUILD 89381 2013-04-29 01:59:05Z bgyorgy $ # Maintainer: Alexandre Filgueira # Jan de Groot pkgname=cinnamon-control-center -pkgver=1.7.3 -pkgrel=3 +pkgver=1.7.4 +pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') -depends=('cinnamon' 'cheese' 'libgnomekbd' 'libgtop' 'network-manager-applet') -optdepends=('mesa-demos: provides glxinfo for graphics information' - 'gnome-color-manager: for color management tasks') +depends=('cinnamon' 'cheese' 'libgnomekbd' 'network-manager-applet') +optdepends=('gnome-color-manager: for color management tasks') makedepends=('intltool' 'gnome-common') url="https://github.com/linuxmint/cinnamon-control-center" install=cinnamon-control-center.install @@ -20,7 +19,7 @@ options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" "gnomerrlabeler.patch" "idle-delay.patch") -sha256sums=('44a4484238c2b9e9060d062028438df589fc29c9e3da45edad068198a990c8be' +sha256sums=('33425b57d13acf015ddbeba8e9139f7b3488d80f900bd2234f49db1c0944c96b' '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6' '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') @@ -51,8 +50,6 @@ package() { make DESTDIR="$pkgdir" install # Remove unused stuff - make -C panels/datetime DESTDIR="$pkgdir" uninstall - make -C panels/printers DESTDIR="$pkgdir" uninstall make -C panels/sound DESTDIR="$pkgdir" uninstall make -C panels/sound/data DESTDIR="$pkgdir" install make -C shell DESTDIR="$pkgdir" uninstall diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index cf5e13723..370a97288 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 88934 2013-04-25 02:04:16Z bgyorgy $ +# $Id: PKGBUILD 89378 2013-04-29 01:43:41Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.4 -pkgrel=3 +pkgver=1.7.7 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -30,12 +30,12 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "gnome-3.8.patch" "switch-applications.patch" "fallback-helpers.patch") -md5sums=('95260dc968ca9be32c265b35df2dd49d' +md5sums=('a0ed2648d1d95edeac2e45e2c11508fe' '2b1ece84416c3e4de030be15f1774d82' 'c3f25b06d345d9d36c197cd96e08f496' - 'cf2efbe1a5c48e1be53a0e8e4b7c3181' - '16258907bf51cd8c1569263791ffa620' - 'f7aa8ace9c9543ba2fd66bd530244fed') + '5136c2901dfda09e8b969a8b62b59209' + '3880fa4c5234771644e5b57a1ade4456' + '0dac5a546bf16921a4fdde8525366a24') build() { cd ${srcdir}/linuxmint-Cinnamon* diff --git a/community/cinnamon/fallback-helpers.patch b/community/cinnamon/fallback-helpers.patch index 6fe318bd9..b6810cdba 100644 --- a/community/cinnamon/fallback-helpers.patch +++ b/community/cinnamon/fallback-helpers.patch @@ -3,7 +3,7 @@ diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/session +++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon2d.session 2013-04-25 01:30:35.435650613 +0200 @@ -1,5 +1,5 @@ [GNOME Session] - Name=Cinnamon 2D + Name=Cinnamon (Software Rendering) -RequiredComponents=cinnamon2d;gnome-settings-daemon; +RequiredComponents=cinnamon2d;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; DesktopName=GNOME @@ -11,11 +11,10 @@ diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/session diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session --- linuxmint-Cinnamon-b41bad0.orig/files/usr/share/gnome-session/sessions/cinnamon.session 2013-04-15 15:55:01.000000000 +0200 +++ linuxmint-Cinnamon-b41bad0/files/usr/share/gnome-session/sessions/cinnamon.session 2013-04-25 01:30:33.645607769 +0200 -@@ -1,6 +1,6 @@ +@@ -1,5 +1,5 @@ [GNOME Session] Name=Cinnamon -RequiredComponents=cinnamon;gnome-settings-daemon; +RequiredComponents=cinnamon;gnome-settings-daemon;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; - IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated - FallbackSession=cinnamon2d DesktopName=GNOME + diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch index 61cd9180f..f27131aa5 100644 --- a/community/cinnamon/gnome-3.8.patch +++ b/community/cinnamon/gnome-3.8.patch @@ -1,7 +1,7 @@ -From f4020d3960fa96a101bdb1c3ac1e1a452dbbf48c Mon Sep 17 00:00:00 2001 +From 2ba97ed278777fcb96b86cd58e9176536585ad2d Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Fri, 19 Apr 2013 13:19:50 -0400 -Subject: [PATCH 01/15] Disable XInput on cinnamon startup (for 3.8 compat) +Subject: [PATCH 01/16] Disable XInput on cinnamon startup (for 3.8 compat) This has no effect on < 1.14 clutter --- @@ -24,10 +24,10 @@ index 418fb60..ac90d91 100644 1.8.1.6 -From cc68659ecdd9e43128ec2b4555479f930c0d1ccd Mon Sep 17 00:00:00 2001 +From 72133f97fbd99c78169cec49e18b97da3edba524 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Fri, 19 Apr 2013 13:21:40 -0400 -Subject: [PATCH 02/15] Explain change +Subject: [PATCH 02/16] Explain change --- src/main.c | 4 +++- @@ -55,10 +55,10 @@ index ac90d91..9d37975 100644 1.8.1.6 -From f3777b3b2733b965bd348c7175ee67ee268aee06 Mon Sep 17 00:00:00 2001 +From 28210e29e3e0d81c68320b9511574a168f5779e4 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Tue, 16 Apr 2013 17:01:30 -0400 -Subject: [PATCH 03/15] Add backgroundManager - this is needed for gnome 3.8 +Subject: [PATCH 03/16] Add backgroundManager - this is needed for gnome 3.8 compatibility, as gnome-settings-daemon no longer handles the desktop background. @@ -107,10 +107,10 @@ index 0aa47c5..a2a9479 100644 PKG_CHECK_MODULES(TRAY, gtk+-3.0) PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index ffbad92..6f55477 100644 +index f12f8c5..939ea70 100644 --- a/data/org.cinnamon.gschema.xml.in +++ b/data/org.cinnamon.gschema.xml.in -@@ -720,6 +720,23 @@ +@@ -746,6 +746,23 @@ @@ -134,7 +134,7 @@ index ffbad92..6f55477 100644 "wallpaper" -@@ -750,8 +767,60 @@ +@@ -776,8 +793,60 @@ This key defines the delay for the slideshow. @@ -253,7 +253,7 @@ index f964aed..4a38c84 100644 class BackgroundSidePage (SidePage): def __init__(self, name, icon, keywords, advanced, content_box): - SidePage.__init__(self, name, icon, keywords, advanced, content_box) + SidePage.__init__(self, name, icon, keywords, advanced, content_box, True) - self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background") self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background") self._add_wallpapers_dialog = AddWallpapersDialog() @@ -296,7 +296,7 @@ index f964aed..4a38c84 100644 advanced_options_box.pack_start(hbox, False, False, 0) self.content_box.show_all() diff --git a/js/ui/main.js b/js/ui/main.js -index 11920a4..5cae372 100644 +index 74154ab..99aee95 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -86,6 +86,7 @@ let _cssStylesheet = null; @@ -317,7 +317,7 @@ index 11920a4..5cae372 100644 // the color is used as the default contents for the Muffin root background // actor so set it anyways. diff --git a/src/Makefile.am b/src/Makefile.am -index 51413aa..6efce18 100644 +index 3bab29c..6bac83c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -105,6 +105,7 @@ cinnamon_public_headers_h = \ @@ -820,20 +820,20 @@ index 0000000..9a56e32 1.8.1.6 -From 590a48961f2c7a1b18fb914a1d7212ffcdf03017 Mon Sep 17 00:00:00 2001 +From c971d472a88f8ea725b2bef33715016e111732d9 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Tue, 16 Apr 2013 18:28:16 -0400 -Subject: [PATCH 04/15] Change default background +Subject: [PATCH 04/16] Change default background --- data/org.cinnamon.gschema.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 6f55477..35b0972 100644 +index 939ea70..6d8c82d 100644 --- a/data/org.cinnamon.gschema.xml.in +++ b/data/org.cinnamon.gschema.xml.in -@@ -782,7 +782,7 @@ +@@ -808,7 +808,7 @@ @@ -846,20 +846,20 @@ index 6f55477..35b0972 100644 1.8.1.6 -From ac8b0954c7506ae88059e488539f88d55329f070 Mon Sep 17 00:00:00 2001 +From 0147459229b449757bac9a92c173c4bd3c2f9eca Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Tue, 16 Apr 2013 18:41:16 -0400 -Subject: [PATCH 05/15] Use distro-agnostic background.. +Subject: [PATCH 05/16] Use distro-agnostic background.. --- data/org.cinnamon.gschema.xml.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/org.cinnamon.gschema.xml.in b/data/org.cinnamon.gschema.xml.in -index 35b0972..0d01089 100644 +index 6d8c82d..567dca8 100644 --- a/data/org.cinnamon.gschema.xml.in +++ b/data/org.cinnamon.gschema.xml.in -@@ -782,7 +782,7 @@ +@@ -808,7 +808,7 @@ @@ -872,33 +872,33 @@ index 35b0972..0d01089 100644 1.8.1.6 -From 81dbccb60231744999463a5b84c7c36358570929 Mon Sep 17 00:00:00 2001 +From 706d244a9dbe2ace9860044e2245a285d8473f47 Mon Sep 17 00:00:00 2001 From: dalcde Date: Mon, 15 Apr 2013 18:34:48 +0800 -Subject: [PATCH 06/15] [GDbus] Port DBus to GDBus (AltLinux patch) +Subject: [PATCH 06/16] [GDbus] Port DBus to GDBus (AltLinux patch) --- - .../applets/brightness@cinnamon.org/applet.js | 39 ++-- - .../cinnamon/applets/power@cinnamon.org/applet.js | 102 +++++---- - .../cinnamon/applets/sound@cinnamon.org/applet.js | 244 +++++---------------- + .../applets/brightness@cinnamon.org/applet.js | 39 +- + .../cinnamon/applets/power@cinnamon.org/applet.js | 102 ++-- + .../cinnamon/applets/sound@cinnamon.org/applet.js | 511 ++++++--------------- .../cinnamon/applets/xrandr@cinnamon.org/applet.js | 19 +- - js/misc/gnomeSession.js | 147 ++++--------- - js/misc/modemManager.js | 79 ++++--- - js/misc/screenSaver.js | 89 ++++---- + js/misc/gnomeSession.js | 147 ++---- + js/misc/modemManager.js | 79 ++-- + js/misc/screenSaver.js | 89 ++-- js/ui/appletManager.js | 1 - - js/ui/automountManager.js | 106 +++++---- - js/ui/autorunManager.js | 27 +-- - js/ui/calendar.js | 71 +++--- - js/ui/cinnamonDBus.js | 96 ++++---- - js/ui/endSessionDialog.js | 79 ++++--- - js/ui/keyboard.js | 48 ++-- + js/ui/automountManager.js | 106 ++--- + js/ui/autorunManager.js | 27 +- + js/ui/calendar.js | 71 +-- + js/ui/cinnamonDBus.js | 96 ++-- + js/ui/endSessionDialog.js | 79 ++-- + js/ui/keyboard.js | 48 +- js/ui/layout.js | 14 +- - js/ui/magnifierDBus.js | 134 +++++++---- + js/ui/magnifierDBus.js | 134 ++++-- js/ui/main.js | 6 - js/ui/messageTray.js | 13 +- - js/ui/notificationDaemon.js | 193 ++++++++-------- - js/ui/scripting.js | 34 ++- - 20 files changed, 688 insertions(+), 853 deletions(-) + js/ui/notificationDaemon.js | 193 ++++---- + js/ui/scripting.js | 34 +- + 20 files changed, 774 insertions(+), 1034 deletions(-) diff --git a/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/brightness@cinnamon.org/applet.js index 9cbda80..9087b25 100644 @@ -1064,12 +1064,11 @@ index c342fe7..b6b2bcd 100644 this.menu = new Applet.AppletPopupMenu(this, orientation); this.menuManager.addMenu(this.menu); - -- this.set_applet_icon_symbolic_name('battery-missing'); ++ + //this.set_applet_icon_symbolic_name('battery-missing'); - this._proxy = new PowerManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH); - this._smProxy = new SettingsManagerProxy(DBus.session, BUS_NAME, OBJECT_PATH); - -+ -+ //this.set_applet_icon_symbolic_name('battery-missing'); + this._proxy = new PowerManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); + this._smProxy = new SettingsManagerProxy(Gio.DBus.session, BUS_NAME, OBJECT_PATH); + @@ -1080,10 +1079,10 @@ index c342fe7..b6b2bcd 100644 this._devicesChanged(); }, -- _devicesChanged: function() { -- this.set_applet_icon_symbolic_name('battery-missing'); +- _devicesChanged: function() { - this._proxy.GetRemote('Icon', Lang.bind(this, function(icon, error) { - if (icon) { +- this.set_applet_icon_symbolic_name('battery-missing'); - let gicon = Gio.icon_new_for_string(icon); - this._applet_icon.gicon = gicon; - this.actor.show(); @@ -1109,7 +1108,7 @@ index c342fe7..b6b2bcd 100644 this._readOtherDevices(); this._updateLabel(); diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -index 1113b1e..5bfaf26 100644 +index 50c4e1e..c8427ac 100644 --- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js @@ -1,7 +1,6 @@ @@ -1120,7 +1119,7 @@ index 1113b1e..5bfaf26 100644 const Lang = imports.lang; const Cinnamon = imports.gi.Cinnamon; const Clutter = imports.gi.Clutter; -@@ -12,90 +11,45 @@ const Gvc = imports.gi.Gvc; +@@ -12,95 +11,50 @@ const Gvc = imports.gi.Gvc; const Pango = imports.gi.Pango; const Tooltips = imports.ui.tooltips; @@ -1167,7 +1166,7 @@ index 1113b1e..5bfaf26 100644 - inSignature: '', - outSignature: '' }, - { name: 'SetPosition', -- inSignature: 'a{ov}', +- inSignature: 'ox', - outSignature: '' }], - properties: [{ name: 'Metadata', - signature: 'a{sv}', @@ -1234,7 +1233,7 @@ index 1113b1e..5bfaf26 100644 + + + -+ ++ + + + @@ -1250,27 +1249,28 @@ index 1113b1e..5bfaf26 100644 /* global values */ let icon_path = "/usr/share/cinnamon/theme/"; -@@ -112,120 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */ +-let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp" ]; +-let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ]; ++let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ]; ++let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ]; + /* dummy vars for translation */ + let x = _("Playing"); + x = _("Paused"); +@@ -112,131 +66,20 @@ const VOLUME_ADJUSTMENT_STEP = 0.05; /* Volume adjustment step in % */ const ICON_SIZE = 28; -function Prop() { - this._init.apply(this, arguments); -+var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace); -+function Prop(owner, initCallback, cancellable) { -+ return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); - } - +-} +- -Prop.prototype = { - _init: function(owner) { - DBus.session.proxifyObject(this, owner, '/org/mpris/MediaPlayer2', this); - } -+var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace); -+function MediaServer2(owner, initCallback, cancellable) { -+ return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); - } +-} -DBus.proxifyPrototype(Prop.prototype, PropIFace) - +- -function MediaServer2() { - this._init.apply(this, arguments); -} @@ -1293,13 +1293,19 @@ index 1113b1e..5bfaf26 100644 - callback(this, quit); - })); - } --} ++var PropProxy = Gio.DBusProxy.makeProxyWrapper(PropIFace); ++function Prop(owner, initCallback, cancellable) { ++ return new PropProxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); + } -DBus.proxifyPrototype(MediaServer2.prototype, MediaServer2IFace) -- + -function MediaServer2Player() { - this._init.apply(this, arguments); --} -- ++var MediaServer2Proxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2IFace); ++function MediaServer2(owner, initCallback, cancellable) { ++ return new MediaServer2Proxy(Gio.DBus.session, owner, '/org/mpris/MediaPlayer2', initCallback, cancellable); + } + -MediaServer2Player.prototype = { - _init: function(owner) { - this._owner = owner; @@ -1333,6 +1339,9 @@ index 1113b1e..5bfaf26 100644 - callback(this, position); - })); - }, +- setPosition: function(value) { +- this.SetRemote('Position', value); +- }, - getShuffle: function(callback) { - this.GetRemote('Shuffle', Lang.bind(this, - function(shuffle, ex) { @@ -1371,6 +1380,14 @@ index 1113b1e..5bfaf26 100644 - else - value = "None" - this.SetRemote('LoopStatus', value); +- }, +- getCanSeek: function(callback) { +- this.GetRemote('CanSeek', Lang.bind(this, +- function(canSeek, err) { +- if (!err) { +- callback(this, canSeek); +- } +- })); - } +var MediaServer2PlayerProxy = Gio.DBusProxy.makeProxyWrapper(MediaServer2PlayerIFace); +function MediaServer2Player(owner, initCallback, cancellable) { @@ -1380,15 +1397,427 @@ index 1113b1e..5bfaf26 100644 function TrackInfo() { this._init.apply(this, arguments); -@@ -715,7 +569,7 @@ MyApplet.prototype = { +@@ -355,7 +198,6 @@ Player.prototype = { + _init: function(system_status_button, owner) { + PopupMenu.PopupMenuSection.prototype._init.call(this); + +- this.showPosition = true; // @todo: Get from settings + this._owner = owner; + this._system_status_button = system_status_button; + this._name = this._owner.split('.')[3]; +@@ -389,7 +231,7 @@ Player.prototype = { + this.infos_top.add_actor(this._artist.getActor()); + this.infos_bottom.add_actor(this._album.getActor()); + this.infos_top.add_actor(this._title.getActor()); +- ++ this.infos_bottom.add_actor(this._time.getActor()); + this._trackInfosTop.set_child(this.infos_top); + this._trackInfosBottom.set_child(this.infos_bottom); + +@@ -414,90 +256,39 @@ Player.prototype = { + this._trackControls.set_child(this.controls); + this.addActor(this._trackControls); + +- this._seekControls = new St.Bin({style_class: 'sound-seek', x_align: St.Align.START}); +- this.seekControls = new St.BoxLayout({style_class: 'sound-seek-box'}); +- this.seekControls.add_actor(this._time.getActor()); +- +- this._positionSlider = new PopupMenu.PopupSliderMenuItem(0); +- this._positionSlider.connect('value-changed', Lang.bind(this, function(item) { +- let time = item._value * this._songLength; +- this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength)); +- })); +- this._positionSlider.connect('drag-end', Lang.bind(this, function(item) { +- let time = item._value * this._songLength; +- this._time.setLabel(this._formatTime(time) + " / " + this._formatTime(this._songLength)); +- this._wantedSeekValue = Math.round(time * 1000000); +- this._mediaServerPlayer.SetPositionRemote(this._trackObj, time * 1000000); +- })); +- +- this.sliderBin = new St.Bin({style_class: 'sound-seek-slider'}); +- this.sliderBin.set_child(this._positionSlider.actor); +- this.seekControls.add_actor(this.sliderBin); +- this._seekControls.set_child(this.seekControls); +- this.addActor(this._seekControls); +- +- this._mediaServer.getRaise(Lang.bind(this, function(sender, raise) { +- if (raise) { +- this._raiseButton = new ControlButton('go-up', +- Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); })); +- this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player")); +- this.controls.add_actor(this._raiseButton.getActor()); +- } +- })); +- +- this._mediaServer.getQuit(Lang.bind(this, function(sender, quit) { +- if (quit) { +- this._quitButton = new ControlButton('window-close', +- Lang.bind(this, function () { this._mediaServer.QuitRemote(); })); +- this.controls.add_actor(this._quitButton.getActor()); +- this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player")); +- } +- })); ++ let CanRaise = this._mediaServer.CanRaise; ++ let CanQuit = this._mediaServer.CanQuit; ++ if (CanRaise) { ++ this._raiseButton = new ControlButton('go-up', ++ Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); })); ++ this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player")); ++ this.controls.add_actor(this._raiseButton.getActor()); ++ } ++ if (CanQuit) { ++ this._quitButton = new ControlButton('window-close', ++ Lang.bind(this, function () { this._mediaServer.QuitRemote(); })); ++ this.controls.add_actor(this._quitButton.getActor()); ++ this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player")); ++ } + + /* this players don't support seek */ +- if (support_seek.indexOf(this._name) == -1) { ++ if (support_seek.indexOf(this._name) == -1) + this._time.hide(); +- this.showPosition = false; +- this._positionSlider.hide(); +- } + this._getStatus(); + this._trackId = {}; + this._getMetadata(); + this._currentTime = 0; + this._getPosition(); +- this._wantedSeekValue = 0; +- this._updatePositionSlider(); + +- this._prop.connect('PropertiesChanged', Lang.bind(this, function(sender, iface, value) { ++ this._prop.connectSignal('PropertiesChanged', Lang.bind(this, function(sender, iface, value) { + if (value["PlaybackStatus"]) +- this._setStatus(iface, value["PlaybackStatus"]); ++ this._setStatus(value["PlaybackStatus"]); + if (value["Metadata"]) +- this._setMetadata(iface, value["Metadata"]); +- //qmmp +- if(sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { +- if (value["playbackStatus"]) +- this._setStatus(iface, value["playbackStatus"]); +- if (value["metadata"]) +- this._setMetadata(sender, value["metadata"]); +- } ++ this._setMetadata(value["Metadata"]); + })); + +- this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) { +- if (value > 0) { +- this._setPosition(value); +- } +- // Seek initiated by the position slider +- else if (this._wantedSeekValue > 0) { +- // Some broken gstreamer players (Banshee) reports always 0 +- // when the track is seeked so we set the position at the +- // value we set on the slider +- this._setPosition(this._wantedSeekValue); +- } +- // Seek value send by the player +- else +- this._setPosition(value); +- +- this._wantedSeekValue = 0; ++ this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { ++ this._setPosition(sender, value); + })); + + Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); +@@ -512,45 +303,26 @@ Player.prototype = { + this._playerInfo.setText(this._getName() + " - " + _(status)); + }, + +- _updatePositionSlider: function(position) { +- this._mediaServerPlayer.getCanSeek(Lang.bind(this, function(sender, canSeek) { +- this._canSeek = canSeek; +- +- if (this._songLength == 0 || position == false) +- this._canSeek = false +- +- // Clem: The following code was commented out. When the next song started, it resulted in hiding the sound menu, making it hard for the user to repeatedly click on the next song button. +- // There's probably a better fix and this was not tested with players which don't support seeking, but it fixes the regression created by the slider (apparently when the slider is hidden it closes the menu) +- // if (this._playerStatus == "Playing" && this._canSeek && this.showPosition) +- // this._positionSlider.actor.show(); +- // else +- // this._positionSlider.actor.hide(); +- })); +- }, +- +- _setPosition: function(value) { +- if (value == null && this._playerStatus != 'Stopped') { +- this._updatePositionSlider(false); +- } +- else { +- this._currentTime = value / 1000000; +- this._updateTimer(); +- } ++ _setPosition: function(sender, value) { ++ this._stopTimer(); ++ this._currentTime = value / 1000000; ++ this._updateTimer(); ++ if (this._playerStatus == "Playing") ++ this._runTimer(); + }, + + _getPosition: function() { +- this._mediaServerPlayer.getPosition(Lang.bind(this, function(sender, value) { +- this._setPosition(value); +- })); ++ this._setPosition(this._mediaServerPlayer.Position); ++ Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); + }, + +- _setMetadata: function(sender, metadata) { ++ _setMetadata: function(metadata) { + if (metadata["mpris:length"]) { + // song length in secs +- this._songLength = metadata["mpris:length"] / 1000000; ++ this._songLength = metadata["mpris:length"].unpack() / 1000000; + // FIXME upstream + if (this._name == "quodlibet") +- this._songLength = metadata["mpris:length"] / 1000; ++ this._songLength = metadata["mpris:length"].unpack() / 1000; + // reset timer + this._stopTimer(); + if (this._playerStatus == "Playing") +@@ -559,26 +333,29 @@ Player.prototype = { + this._stopTimer(); + } + if (metadata["xesam:artist"]) +- this._artist.setLabel(metadata["xesam:artist"].toString()); ++ this._artist.setLabel(metadata["xesam:artist"].unpack()); + else + this._artist.setLabel(_("Unknown Artist")); + if (metadata["xesam:album"]) +- this._album.setLabel(metadata["xesam:album"].toString()); ++ this._album.setLabel(metadata["xesam:album"].unpack()); + else + this._album.setLabel(_("Unknown Album")); + if (metadata["xesam:title"]) +- this._title.setLabel(metadata["xesam:title"].toString()); ++ this._title.setLabel(metadata["xesam:title"].unpack()); + else + this._title.setLabel(_("Unknown Title")); +- +- if (metadata["mpris:trackid"]) { +- this._trackObj = metadata["mpris:trackid"]; +- } ++ /*if (metadata["mpris:trackid"]) { ++ this._trackId = { ++ _init: function() { ++ DBus.session.proxifyObject(this, this._owner, metadata["mpris:trackid"]); ++ } ++ } ++ }*/ + + let change = false; + if (metadata["mpris:artUrl"]) { +- if (this._trackCoverFile != metadata["mpris:artUrl"].toString()) { +- this._trackCoverFile = metadata["mpris:artUrl"].toString(); ++ if (this._trackCoverFile != metadata["mpris:artUrl"].unpack()) { ++ this._trackCoverFile = metadata["mpris:artUrl"].unpack(); + change = true; + } + } +@@ -600,8 +377,7 @@ Player.prototype = { + cover.read_async(null, null, Lang.bind(this, this._onReadCover)); + } + else { +- cover_path = decodeURIComponent(this._trackCoverFile); +- cover_path = cover_path.replace("file://", ""); ++ cover_path = decodeURIComponent(this._trackCoverFile.substr(7)); + this._showCover(cover_path); + } + } +@@ -611,13 +387,10 @@ Player.prototype = { + }, + + _getMetadata: function() { +- this._mediaServerPlayer.getMetadata(Lang.bind(this, +- this._setMetadata +- )); ++ this._setMetadata(this._mediaServerPlayer.Metadata); + }, + +- _setStatus: function(sender, status) { +- this._updatePositionSlider(); ++ _setStatus: function(status) { + this._playerStatus = status; + if (status == "Playing") { + this._playButton.setIcon("media-playback-pause"); +@@ -631,53 +404,39 @@ Player.prototype = { + this._playButton.setIcon("media-playback-start"); + this._stopTimer(); + } +- + this._playerInfo.setImage("player-" + status.toLowerCase()); + this._setName(status); + }, + + _getStatus: function() { +- this._mediaServerPlayer.getPlaybackStatus(Lang.bind(this, +- this._setStatus +- )); ++ this._setStatus(this._mediaServerPlayer.PlaybackStatus); + }, + + _updateRate: function() { +- this._mediaServerPlayer.getRate(Lang.bind(this, function(sender, rate) { +- this._rate = rate; +- })); ++ this._rate = this._mediaServerPlayer.Rate; + }, + + _updateTimer: function() { +- if (this.showPosition && this._canSeek) { +- if (!isNaN(this._currentTime) && !isNaN(this._songLength) && this._currentTime > 0) +- this._positionSlider.setValue(this._currentTime / this._songLength); +- else +- this._positionSlider.setValue(0); +- } + this._time.setLabel(this._formatTime(this._currentTime) + " / " + this._formatTime(this._songLength)); + }, + + _runTimer: function() { +- if (this._playerStatus == 'Playing') { +- this._timeoutId = Mainloop.timeout_add_seconds(1, Lang.bind(this, this._runTimer)); +- this._currentTime += 1; +- this._updateTimer(); +- } ++ /*if (!Tweener.resumeTweens(this)) { ++ Tweener.addTween(this, ++ { time: this._songLength - this._currentTime, ++ transition: 'linear', ++ onUpdate: Lang.bind(this, this._updateTimer) }); ++ }*/ + }, + + _pauseTimer: function() { +- if (this._timeoutId != 0) { +- Mainloop.source_remove(this._timeoutId); +- this._timeoutId = 0; +- } +- this._updateTimer(); ++ //Tweener.pauseTweens(this); + }, + + _stopTimer: function() { ++ /*Tweener.removeTweens(this); + this._currentTime = 0; +- this._pauseTimer(); +- this._updateTimer(); ++ this._updateTimer();*/ + }, + + _formatTime: function(s) { +@@ -771,7 +530,7 @@ MediaPlayerLauncher.prototype = { + }, + + activate: function (event) { +- this._menu.actor.hide(); ++ this._menu.actor.hide(); + this._app.activate_full(-1, event.get_time()); + return true; + } +@@ -799,7 +558,7 @@ MyApplet.prototype = { this._players = {}; // watch players for (var p=0; p 0){ +@@ -1137,19 +896,19 @@ MyApplet.prototype = { + this._mutedChanged (null, null, '_output'); + this._volumeChanged (null, null, '_output'); + let sinks = this._control.get_sinks(); +- this._selectDeviceItem.menu.removeAll(); +- for (let i = 0; i < sinks.length; i++) { +- let sink = sinks[i]; +- let menuItem = new PopupMenu.PopupMenuItem(sink.get_description()); +- if (sinks[i].get_id() == this._output.get_id()) { +- menuItem.setShowDot(true); +- } +- menuItem.connect('activate', Lang.bind(this, function() { +- log('Changing default sink to ' + sink.get_description()); +- this._control.set_default_sink(sink); +- })); +- this._selectDeviceItem.menu.addMenuItem(menuItem); +- } ++ this._selectDeviceItem.menu.removeAll(); ++ for (let i = 0; i < sinks.length; i++) { ++ let sink = sinks[i]; ++ let menuItem = new PopupMenu.PopupMenuItem(sink.get_description()); ++ if (sinks[i].get_id() == this._output.get_id()) { ++ menuItem.setShowDot(true); ++ } ++ menuItem.connect('activate', Lang.bind(this, function() { ++ log('Changing default sink to ' + sink.get_description()); ++ this._control.set_default_sink(sink); ++ })); ++ this._selectDeviceItem.menu.addMenuItem(menuItem); ++ } + } else { + this._outputSlider.setValue(0); + this.setIconName('audio-volume-muted-symbolic'); diff --git a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js index 0dcf74d..c2d152a 100644 --- a/files/usr/share/cinnamon/applets/xrandr@cinnamon.org/applet.js @@ -2512,7 +2941,7 @@ index f55cf93..69edb51 100644 function KeyboardSource() { this._init.apply(this, arguments); diff --git a/js/ui/layout.js b/js/ui/layout.js -index 76303b9..b97459e 100644 +index 3446e7a..7523b6f 100644 --- a/js/ui/layout.js +++ b/js/ui/layout.js @@ -488,12 +488,14 @@ Chrome.prototype = { @@ -2721,14 +3150,14 @@ index 72bba26..4d21797 100644 -DBus.conformExport(CinnamonMagnifier.prototype, MagnifierIface); -DBus.conformExport(CinnamonMagnifierZoomRegion.prototype, ZoomRegionIface); diff --git a/js/ui/main.js b/js/ui/main.js -index 5cae372..180db5c 100644 +index 99aee95..b602915 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -1,7 +1,6 @@ // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- const Clutter = imports.gi.Clutter; --const DBus = imports.dbus; +-const DBus= imports.dbus; const Gio = imports.gi.Gio; const GLib = imports.gi.GLib; const Gtk = imports.gi.Gtk; @@ -3112,15 +3541,14 @@ index 42c4f6d..9163d29 100644 1.8.1.6 -From d85e078c0ed09a8b9f8d3ea2ebec1043b6d150c1 Mon Sep 17 00:00:00 2001 +From 135d2228bbf6d3b1be5f90e0e599cd3880e06d93 Mon Sep 17 00:00:00 2001 From: dalcde Date: Tue, 16 Apr 2013 16:58:30 +0800 -Subject: [PATCH 07/15] [GDBus][Sound/Power Applet] Fix dbus port issues +Subject: [PATCH 07/16] [GDBus][Sound/Power Applet] Fix dbus port issues --- - .../cinnamon/applets/power@cinnamon.org/applet.js | 2 +- - .../cinnamon/applets/sound@cinnamon.org/applet.js | 83 ++++++++++------------ - 2 files changed, 37 insertions(+), 48 deletions(-) + files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js index b6b2bcd..fad39ab 100644 @@ -3135,204 +3563,14 @@ index b6b2bcd..fad39ab 100644 this._devicesChanged(); } catch (e) { -diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -index 5bfaf26..52b8cde 100644 ---- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -+++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js -@@ -37,7 +37,7 @@ const MediaServer2PlayerIFace = - - - -- -+ - - - -@@ -256,23 +256,20 @@ Player.prototype = { - this._trackControls.set_child(this.controls); - this.addActor(this._trackControls); - -- this._mediaServer.getRaise(Lang.bind(this, function(sender, raise) { -- if (raise) { -- this._raiseButton = new ControlButton('go-up', -- Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); })); -- this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player")); -- this.controls.add_actor(this._raiseButton.getActor()); -- } -- })); -- -- this._mediaServer.getQuit(Lang.bind(this, function(sender, quit) { -- if (quit) { -- this._quitButton = new ControlButton('window-close', -- Lang.bind(this, function () { this._mediaServer.QuitRemote(); })); -- this.controls.add_actor(this._quitButton.getActor()); -- this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player")); -- } -- })); -+ let CanRaise = this._mediaServer.CanRaise; -+ let CanQuit = this._mediaServer.CanQuit; -+ if (CanRaise) { -+ this._raiseButton = new ControlButton('go-up', -+ Lang.bind(this, function () { this._mediaServer.RaiseRemote(); this._system_status_button.menu.actor.hide(); })); -+ this._raiseButtonTooltip = new Tooltips.Tooltip(this._raiseButton.button, _("Open Player")); -+ this.controls.add_actor(this._raiseButton.getActor()); -+ } -+ if (CanQuit) { -+ this._quitButton = new ControlButton('window-close', -+ Lang.bind(this, function () { this._mediaServer.QuitRemote(); })); -+ this.controls.add_actor(this._quitButton.getActor()); -+ this._quitButtonTooltip = new Tooltips.Tooltip(this._quitButton.button, _("Quit Player")); -+ } - - /* this players don't support seek */ - if (support_seek.indexOf(this._name) == -1) -@@ -283,14 +280,14 @@ Player.prototype = { - this._currentTime = 0; - this._getPosition(); - -- this._prop.connect('PropertiesChanged', Lang.bind(this, function(sender, iface, value) { -+ this._prop.connectSignal('PropertiesChanged', Lang.bind(this, function(sender, iface, value) { - if (value["PlaybackStatus"]) -- this._setStatus(iface, value["PlaybackStatus"]); -+ this._setStatus(value["PlaybackStatus"]); - if (value["Metadata"]) -- this._setMetadata(iface, value["Metadata"]); -+ this._setMetadata(value["Metadata"]); - })); - -- this._mediaServerPlayer.connect('Seeked', Lang.bind(this, function(sender, value) { -+ this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { - this._setPosition(sender, value); - })); - -@@ -315,19 +312,17 @@ Player.prototype = { - }, - - _getPosition: function() { -- this._mediaServerPlayer.getPosition(Lang.bind(this, -- this._setPosition -- )); -+ this._setPosition(this._mediaServerPlayer.Position); - Mainloop.timeout_add(1000, Lang.bind(this, this._getPosition)); - }, - -- _setMetadata: function(sender, metadata) { -+ _setMetadata: function(metadata) { - if (metadata["mpris:length"]) { - // song length in secs -- this._songLength = metadata["mpris:length"] / 1000000; -+ this._songLength = metadata["mpris:length"].unpack() / 1000000; - // FIXME upstream - if (this._name == "quodlibet") -- this._songLength = metadata["mpris:length"] / 1000; -+ this._songLength = metadata["mpris:length"].unpack() / 1000; - // reset timer - this._stopTimer(); - if (this._playerStatus == "Playing") -@@ -338,15 +333,15 @@ Player.prototype = { - this._stopTimer(); - } - if (metadata["xesam:artist"]) -- this._artist.setLabel(metadata["xesam:artist"].toString()); -+ this._artist.setLabel(metadata["xesam:artist"].unpack()); - else - this._artist.setLabel(_("Unknown Artist")); - if (metadata["xesam:album"]) -- this._album.setLabel(metadata["xesam:album"].toString()); -+ this._album.setLabel(metadata["xesam:album"].unpack()); - else - this._album.setLabel(_("Unknown Album")); - if (metadata["xesam:title"]) -- this._title.setLabel(metadata["xesam:title"].toString()); -+ this._title.setLabel(metadata["xesam:title"].unpack()); - else - this._title.setLabel(_("Unknown Title")); - /*if (metadata["mpris:trackid"]) { -@@ -359,8 +354,8 @@ Player.prototype = { - - let change = false; - if (metadata["mpris:artUrl"]) { -- if (this._trackCoverFile != metadata["mpris:artUrl"].toString()) { -- this._trackCoverFile = metadata["mpris:artUrl"].toString(); -+ if (this._trackCoverFile != metadata["mpris:artUrl"].unpack()) { -+ this._trackCoverFile = metadata["mpris:artUrl"].unpack(); - change = true; - } - } -@@ -392,12 +387,10 @@ Player.prototype = { - }, - - _getMetadata: function() { -- this._mediaServerPlayer.getMetadata(Lang.bind(this, -- this._setMetadata -- )); -+ this._setMetadata(this._mediaServerPlayer.Metadata); - }, - -- _setStatus: function(sender, status) { -+ _setStatus: function(status) { - this._playerStatus = status; - if (status == "Playing") { - this._playButton.setIcon("media-playback-pause"); -@@ -416,15 +409,11 @@ Player.prototype = { - }, - - _getStatus: function() { -- this._mediaServerPlayer.getPlaybackStatus(Lang.bind(this, -- this._setStatus -- )); -+ this._setStatus(this._mediaServerPlayer.PlaybackStatus); - }, - - _updateRate: function() { -- this._mediaServerPlayer.getRate(Lang.bind(this, function(sender, rate) { -- this._rate = rate; -- })); -+ this._rate = this._mediaServerPlayer.Rate; - }, - - _updateTimer: function() { -@@ -569,7 +558,7 @@ MyApplet.prototype = { - this._players = {}; - // watch players - for (var p=0; p Date: Fri, 19 Apr 2013 19:09:18 -0400 -Subject: [PATCH 08/15] Fix gicon error - power applet +Subject: [PATCH 08/16] Fix gicon error - power applet --- files/usr/share/cinnamon/applets/power@cinnamon.org/applet.js | 2 +- @@ -3355,10 +3593,10 @@ index fad39ab..3a13eab 100644 1.8.1.6 -From 3d78b5c929e7e3b0ee24d4b537492740e7bebf2f Mon Sep 17 00:00:00 2001 +From 647bd58c93541acdba11cd11d586d2cb08a0a4eb Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Fri, 19 Apr 2013 19:44:33 -0400 -Subject: [PATCH 09/15] Remove unused +Subject: [PATCH 09/16] Remove unused --- src/cinnamon-background-manager.c | 34 ---------------------------------- @@ -3427,10 +3665,10 @@ index 9d95250..67427ed 100644 1.8.1.6 -From d08b882470b135591fb99bd9ff7c63619fcaea82 Mon Sep 17 00:00:00 2001 +From 7a8233638187d00798cf3a4b66a27d707eaec804 Mon Sep 17 00:00:00 2001 From: dalcde Date: Sat, 20 Apr 2013 15:42:13 +0800 -Subject: [PATCH 10/15] [GDBus][Power applet] Some fixes and cleanup +Subject: [PATCH 10/16] [GDBus][Power applet] Some fixes and cleanup --- .../cinnamon/applets/power@cinnamon.org/applet.js | 52 ++++++---------------- @@ -3549,10 +3787,10 @@ index 3a13eab..5f81d91 100644 1.8.1.6 -From c93e9746b321ad6d0aa38ec28c15fe7b3f18f8f7 Mon Sep 17 00:00:00 2001 +From 1a74c4a4d010a6ddcd2350b1ea298710bc1c08b1 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Sat, 20 Apr 2013 10:59:54 -0400 -Subject: [PATCH 11/15] Move CLUTTER_DISABLE_XINPUT to session startup file +Subject: [PATCH 11/16] Move CLUTTER_DISABLE_XINPUT to session startup file --- files/usr/bin/gnome-session-cinnamon | 2 +- @@ -3586,10 +3824,10 @@ index 9d37975..418fb60 100644 1.8.1.6 -From de1719e63518884cad6c9d63d508f737eab35d49 Mon Sep 17 00:00:00 2001 +From dfa107fd874866da2f634c65a90e2c13a447464c Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Sat, 20 Apr 2013 12:23:29 -0400 -Subject: [PATCH 12/15] Add Xinput disable to cinnamon2d +Subject: [PATCH 12/16] Add Xinput disable to cinnamon2d --- files/usr/bin/cinnamon2d | 2 +- @@ -3607,10 +3845,10 @@ index 1eced99..7f42517 100755 1.8.1.6 -From 15d57d1c15f34d44b23f74b21929d996d4465afb Mon Sep 17 00:00:00 2001 +From 28b39b2372a571ddcc1298f34f2d7e653f6b2e96 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Sat, 20 Apr 2013 12:29:43 -0400 -Subject: [PATCH 13/15] Fix session file +Subject: [PATCH 13/16] Fix session file --- files/usr/bin/gnome-session-cinnamon | 2 +- @@ -3629,10 +3867,10 @@ index 56c37f5..31c9eff 100755 1.8.1.6 -From 03436393c322fd97d8216c3481d28cd34833c656 Mon Sep 17 00:00:00 2001 +From aba3a7666d3679e5803862af07edc47e7b093b11 Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Sat, 20 Apr 2013 12:36:45 -0400 -Subject: [PATCH 14/15] Add cinnamon3d command +Subject: [PATCH 14/16] Add cinnamon3d command --- files/usr/bin/cinnamon3d | 2 ++ @@ -3651,10 +3889,10 @@ index 0000000..4891783 1.8.1.6 -From 850da270967622b95be9e0c5edd8e230eb4be5a1 Mon Sep 17 00:00:00 2001 +From 3e1cdf6d88ade9abe5a0b8773b565d345c01f2cb Mon Sep 17 00:00:00 2001 From: Michael Webster Date: Sat, 20 Apr 2013 12:37:26 -0400 -Subject: [PATCH 15/15] Fix perms +Subject: [PATCH 15/16] Fix perms --- files/usr/bin/cinnamon3d | 0 @@ -3667,3 +3905,58 @@ new mode 100755 -- 1.8.1.6 + +From 7904eaf179918f4f97b328f2b5f340776544ca49 Mon Sep 17 00:00:00 2001 +From: Michael Webster +Date: Mon, 22 Apr 2013 18:27:39 -0400 +Subject: [PATCH 16/16] Sledgehammer merge of: + +f251f0b77d01cb9a80212b1dce2538c60a5bf59e + +Don't ask... +--- + .../share/cinnamon/applets/sound@cinnamon.org/applet.js | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +index c8427ac..a7b2e09 100644 +--- a/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js ++++ b/files/usr/share/cinnamon/applets/sound@cinnamon.org/applet.js +@@ -53,8 +53,8 @@ const MediaServer2PlayerIFace = + + /* global values */ + let icon_path = "/usr/share/cinnamon/theme/"; +-let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer" ]; +-let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer" ]; ++let compatible_players = [ "clementine", "mpd", "exaile", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "guayadeque", "amarok", "googlemusicframe", "xbmc", "noise", "xnoise", "gmusicbrowser", "spotify", "audacious", "vlc", "beatbox", "songbird", "pithos", "gnome-mplayer", "nuvolaplayer", "qmmp"]; ++let support_seek = [ "clementine", "banshee", "rhythmbox", "rhythmbox3", "pragha", "quodlibet", "amarok", "noise", "xnoise", "gmusicbrowser", "spotify", "vlc", "beatbox", "gnome-mplayer", "qmmp" ]; + /* dummy vars for translation */ + let x = _("Playing"); + x = _("Paused"); +@@ -285,6 +285,13 @@ Player.prototype = { + this._setStatus(value["PlaybackStatus"]); + if (value["Metadata"]) + this._setMetadata(value["Metadata"]); ++ // qmmp ++ if (sender._dbusBusName == 'org.mpris.MediaPlayer2.qmmp') { ++ if (value["playbackStatus"]) ++ this._setStatus(value["playbackStatus"]); ++ if (value["metadata"]) ++ this._setMetadata(value["metadata"]); ++ } + })); + + this._mediaServerPlayer.connectSignal('Seeked', Lang.bind(this, function(sender, iface, [value]) { +@@ -377,7 +384,8 @@ Player.prototype = { + cover.read_async(null, null, Lang.bind(this, this._onReadCover)); + } + else { +- cover_path = decodeURIComponent(this._trackCoverFile.substr(7)); ++ cover_path = decodeURIComponent(this._trackCoverFile; ++ cover_path = cover_path.replace("file://", ""); + this._showCover(cover_path); + } + } +-- +1.8.1.6 + diff --git a/community/cinnamon/switch-applications.patch b/community/cinnamon/switch-applications.patch index ce2e31825..1254a7ce4 100644 --- a/community/cinnamon/switch-applications.patch +++ b/community/cinnamon/switch-applications.patch @@ -12,30 +12,6 @@ diff -Naur linuxmint-Cinnamon-b41bad0.orig/files/usr/lib/cinnamon-settings/modul [_("Run dialog (must restart Cinnamon)"), "org.gnome.desktop.wm.keybindings", "panel-run-dialog", True, "cinnamon"], [_("Menu button (must restart Cinnamon)"), "org.cinnamon.muffin", "overlay-key", False, "cinnamon"], -diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/altTab.js linuxmint-Cinnamon-b41bad0/js/ui/altTab.js ---- linuxmint-Cinnamon-b41bad0.orig/js/ui/altTab.js 2013-04-15 15:55:01.000000000 +0200 -+++ linuxmint-Cinnamon-b41bad0/js/ui/altTab.js 2013-04-24 21:22:38.309568355 +0200 -@@ -203,9 +203,9 @@ - } - } else if (binding == 'switch-group-backward') { - this._select(0, this._appIcons[0].cachedWindows.length - 1); -- } else if (binding == 'switch-windows-backward') { -+ } else if (binding == 'switch-applications-backward') { - this._select(this._appIcons.length - 1); -- } else if (binding == 'no-switch-windows') { -+ } else if (binding == 'no-switch-applications') { - this._select(0); - } else if (this._appIcons.length == 1) { - this._select(0); -@@ -296,7 +296,7 @@ - return false; - } - Main.wm.showWorkspaceOSD(); -- that.refresh('no-switch-windows'); -+ that.refresh('no-switch-applications'); - return true; - }; - let keysym = event.get_key_symbol(); diff -Naur linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js --- linuxmint-Cinnamon-b41bad0.orig/js/ui/windowManager.js 2013-04-15 15:55:01.000000000 +0200 +++ linuxmint-Cinnamon-b41bad0/js/ui/windowManager.js 2013-04-24 21:21:22.447677094 +0200 diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD index bcc749245..525cdccb8 100644 --- a/community/darkhttpd/PKGBUILD +++ b/community/darkhttpd/PKGBUILD @@ -1,21 +1,25 @@ -# $Id: PKGBUILD 65106 2012-02-20 04:47:15Z spupykin $ +# $Id: PKGBUILD 89410 2013-04-29 10:56:40Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Vesa Kaihlavirta pkgname=darkhttpd -pkgver=1.8 -pkgrel=2 +pkgver=1.9 +pkgrel=1 pkgdesc="A small, static webserver" arch=('i686' 'x86_64') url="http://dmr.ath.cx/net/darkhttpd/" license=('BSD') depends=('glibc') source=($url/$pkgname-$pkgver.tar.bz2) -md5sums=('cff3861af17b109d796993a990ec4c5b') +md5sums=('156f239af542028c3fb5c2248aa0db8d') build() { cd $srcdir/$pkgname-$pkgver make +} + +package() { + cd $srcdir/$pkgname-$pkgver install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/sbin/darkhttpd mkdir -p $pkgdir/usr/share/licenses/$pkgname head -n 18 darkhttpd.c >$pkgdir/usr/share/licenses/$pkgname/license diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD index b962073e5..f1c3df7ae 100644 --- a/community/fatrat/PKGBUILD +++ b/community/fatrat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 87410 2013-03-31 19:18:13Z stephane $ +# $Id: PKGBUILD 89533 2013-04-29 19:20:35Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=fatrat pkgver=1.2.0_beta2 -pkgrel=6 +pkgrel=7 pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" arch=('i686' 'x86_64') url="http://fatrat.dolezel.info/" @@ -11,9 +11,10 @@ depends=('gloox' 'libtorrent-rasterbar' 'pion' 'qtwebkit' 'curl') optdepends=('geoip: GeoIP support' 'java-runtime: Java plugins') makedepends=('boost' 'cmake' 'java-environment') source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz \ - QTBUG-22829-workaround.diff) + QTBUG-22829-workaround.diff pion-5.0.diff) md5sums=('ad823d2a81f0583316ece815b928c71b' - '9c017f227437b8a72e92219ee6d58578') + '9c017f227437b8a72e92219ee6d58578' + 'd7d398e7b6415c0a81eb4960d8271997') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,6 +23,8 @@ build() { patch -Np1 < "$srcdir/QTBUG-22829-workaround.diff" || true # fix help generation with qt4 sed -s 's|qcollectiongenerator|qcollectiongenerator-qt4|' -i CMakeLists.txt + # fix for the new pion + patch -Np1 < "$srcdir/pion-5.0.diff" || true cmake \ -DWITH_EVERYTHING=ON \ diff --git a/community/fatrat/pion-5.0.diff b/community/fatrat/pion-5.0.diff new file mode 100644 index 000000000..ff84fb902 --- /dev/null +++ b/community/fatrat/pion-5.0.diff @@ -0,0 +1,1570 @@ +diff -rup fatrat-1.2.0_beta2/CMakeLists.txt fatrat-1.2.0_beta2.new/CMakeLists.txt +--- fatrat-1.2.0_beta2/CMakeLists.txt 2012-07-14 12:44:27.000000000 +0100 ++++ fatrat-1.2.0_beta2.new/CMakeLists.txt 2013-04-29 19:17:48.697623940 +0100 +@@ -148,19 +148,13 @@ if(WITH_DOCUMENTATION) + set(QT_USE_QTHELP TRUE) + endif(WITH_DOCUMENTATION) + if(WITH_WEBINTERFACE) +- pkg_check_modules(pion-net REQUIRED "pion-net >= 3.0.0") ++ pkg_check_modules(pion REQUIRED "pion >= 5.0.0") + +- if(pion-net_FOUND) +- include_directories(${pion-net_INCLUDE_DIRS}) +- #message(STATUS "Pion libdir: ${pion-net_LIBDIR}") +- +- #FILE(GLOB pion_FileService "${pion-net_LIBDIR}/pion/plugins/FileService.*") +- #if(pion_FileService MATCHES "^$") +- # message(FATAL_ERROR "Pion-net FileService plugin not found (libpion-net-plugins?) - ${pion_FileService}") +- #endif(pion_FileService MATCHES "^$") +- else(pion-net_FOUND) +- message(FATAL_ERROR "No pion-net library found") +- endif(pion-net_FOUND) ++ if(pion_FOUND) ++ include_directories(${pion_INCLUDE_DIRS}) ++ else(pion_FOUND) ++ message(FATAL_ERROR "No pion library found") ++ endif(pion_FOUND) + endif(WITH_WEBINTERFACE) + + #set(CMAKE_REQUIRED_INCLUDES "sys/types.h") +@@ -570,9 +564,7 @@ ${fatrat_QRC_H} ${lrelease_outputs}) + add_executable(fatrat-conf src/fatrat-conf.cpp) + + # This used to be a workaround until it started causing the exact opposite... oh dear! +-#STRING(REPLACE "-mt" "" pion-net_LIBRARIES "${pion-net_LIBRARIES}") +-#message(STATUS ${pion-net_LIBRARIES}) +-target_link_libraries(fatrat -ldl -lpthread ${QT_LIBRARIES} ${libtorrent_LDFLAGS} ${gloox_LDFLAGS} ${curl_LDFLAGS} ${Boost_LIBRARIES} ${pion-net_LIBRARIES} ${QT_ADDITIONAL_LIBS} ${XATTR_LIBRARIES} -export-dynamic) ++target_link_libraries(fatrat -ldl -lpthread ${QT_LIBRARIES} ${libtorrent_LDFLAGS} ${gloox_LDFLAGS} ${curl_LDFLAGS} ${Boost_LIBRARIES} ${pion_LIBRARIES} ${QT_ADDITIONAL_LIBS} ${XATTR_LIBRARIES} -export-dynamic) + target_link_libraries(fatrat-conf ${QT_LIBRARIES}) + + set(fatrat_DEV_HEADERS +Only in fatrat-1.2.0_beta2.new/: CMakeLists.txt.orig +diff -rup fatrat-1.2.0_beta2/config.h.in fatrat-1.2.0_beta2.new/config.h.in +--- fatrat-1.2.0_beta2/config.h.in 2012-07-14 12:44:27.000000000 +0100 ++++ fatrat-1.2.0_beta2.new/config.h.in 2013-04-29 19:18:03.241412755 +0100 +@@ -13,7 +13,7 @@ + #cmakedefine WITH_CXX0X + + #ifdef WITH_WEBINTERFACE +-# define PION_NET_PLUGINS "${pion-net_LIBDIR}/pion/plugins" ++# define PION_NET_PLUGINS "${pion_LIBDIR}/pion/plugins" + #endif + + #cmakedefine ENABLE_FAKEDOWNLOAD +diff -rup fatrat-1.2.0_beta2/src/remote/HttpService.cpp fatrat-1.2.0_beta2.new/src/remote/HttpService.cpp +--- fatrat-1.2.0_beta2/src/remote/HttpService.cpp 2012-07-14 12:44:27.000000000 +0100 ++++ fatrat-1.2.0_beta2.new/src/remote/HttpService.cpp 2013-04-29 19:17:17.076634049 +0100 +@@ -51,9 +51,8 @@ respects for all of the code used other + #include + #include + #include +-#include +-#include +-#include ++#include ++#include + #include + #include "pion/FileService.hpp" + #include +@@ -63,7 +62,7 @@ respects for all of the code used other + #include + #include + +-using namespace pion::net; ++using namespace pion::http; + + extern QList g_queues; + extern QReadWriteLock g_queuesLock; +@@ -172,16 +171,16 @@ void HttpService::applySettings() + + void HttpService::setupAuth() + { +- pion::net::PionUserManagerPtr userManager(new pion::net::PionUserManager); ++ pion::user_manager_ptr userManager(new pion::user_manager); + QString password = getSettingsValue("remote/password").toString(); + +- m_auth_ptr = pion::net::HTTPAuthPtr( new pion::net::HTTPBasicAuth(userManager, "FatRat Web Interface") ); +- m_server->setAuthentication(m_auth_ptr); +- m_auth_ptr->addRestrict("/"); +- +- m_auth_ptr->addUser("fatrat", password.toStdString()); +- m_auth_ptr->addUser("admin", password.toStdString()); +- m_auth_ptr->addUser("user", password.toStdString()); ++ m_auth_ptr = pion::http::auth_ptr( new pion::http::basic_auth(userManager, "FatRat Web Interface") ); ++ m_server->set_authentication(m_auth_ptr); ++ m_auth_ptr->add_restrict("/"); ++ ++ m_auth_ptr->add_user("fatrat", password.toStdString()); ++ m_auth_ptr->add_user("admin", password.toStdString()); ++ m_auth_ptr->add_user("user", password.toStdString()); + } + + void HttpService::setup() +@@ -190,28 +189,30 @@ void HttpService::setup() + + try + { +- m_server = new pion::net::WebServer(m_port); ++ m_server = new pion::http::plugin_server(m_port); + + setupAuth(); + setupSSL(); + +- m_server->addService("/xmlrpc", new XmlRpcService); +- m_server->addService("/subclass", new SubclassService); +- m_server->addService("/log", new LogService); +- m_server->addService("/browse", new TransferTreeBrowserService); +- m_server->addService("/", new pion::plugins::FileService); +- m_server->setServiceOption("/", "directory", DATA_LOCATION "/data/remote"); +- m_server->setServiceOption("/", "file", DATA_LOCATION "/data/remote/index.html"); +- m_server->addService("/copyrights", new pion::plugins::FileService); +- m_server->setServiceOption("/copyrights", "file", DATA_LOCATION "/README"); +- m_server->addService("/download", new TransferDownloadService); +- m_server->addService("/captcha", new CaptchaService); ++ m_server->add_service("/xmlrpc", new XmlRpcService); ++ m_server->add_service("/subclass", new SubclassService); ++ m_server->add_service("/log", new LogService); ++ m_server->add_service("/browse", new TransferTreeBrowserService); ++ m_server->add_service("/", new pion::plugins::FileService); ++ m_server->set_service_option("/", "directory", DATA_LOCATION "/data/remote"); ++ m_server->set_service_option("/", "file", DATA_LOCATION "/data/remote/index.html"); ++ m_server->add_service("/copyrights", new pion::plugins::FileService); ++ m_server->set_service_option("/copyrights", "file", DATA_LOCATION "/README"); ++ m_server->add_service("/download", new TransferDownloadService); ++ m_server->add_service("/captcha", new CaptchaService); + + m_server->start(); + Logger::global()->enterLogMessage("HttpService", tr("Listening on port %1").arg(m_port)); ++ std::cout << "Listening on port " << m_port << std::endl; + } + catch(const std::exception& e) + { ++ std::cerr << e.what() << std::endl; + Logger::global()->enterLogMessage("HttpService", tr("Failed to start: %1").arg(e.what())); + } + } +@@ -225,29 +226,29 @@ void HttpService::setupSSL() + if (file.isEmpty() || !QFile::exists(file)) + { + Logger::global()->enterLogMessage("HttpService", tr("SSL key file not found, disabling HTTPS")); +- m_server->setSSLFlag(false); ++ m_server->set_ssl_flag(false); + m_strSSLPem.clear(); + } + else + { + Logger::global()->enterLogMessage("HttpService", tr("Loading a SSL key from %1").arg(file)); + m_strSSLPem = file; +- m_server->setSSLKeyFile(file.toStdString()); +- m_server->setSSLFlag(true); ++ m_server->set_ssl_key_file(file.toStdString()); ++ m_server->set_ssl_flag(true); + } + } + else + { + Logger::global()->enterLogMessage("HttpService", tr("Running in plain HTTP mode")); +- m_server->setSSLFlag(false); ++ m_server->set_ssl_flag(false); + m_strSSLPem.clear(); + } + } + +-void HttpService::LogService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn) ++void HttpService::LogService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn) + { +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn))); +- QString uuidTransfer = QString::fromStdString(getRelativeResource(request->getResource())); ++ pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn))); ++ QString uuidTransfer = QString::fromStdString(get_relative_resource(request->get_resource())); + QString data; + + if (uuidTransfer.isEmpty()) +@@ -260,8 +261,8 @@ void HttpService::LogService::operator() + + if (!q || !t) + { +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND); ++ writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND); ++ writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND); + writer->send(); + return; + } +@@ -272,16 +273,16 @@ void HttpService::LogService::operator() + g_queuesLock.unlock(); + } + +- writer->getResponse().addHeader("Content-Type", "text/plain"); ++ writer->get_response().add_header("Content-Type", "text/plain"); + writer->write(data.toStdString()); + writer->send(); + } + +-void HttpService::TransferTreeBrowserService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn) ++void HttpService::TransferTreeBrowserService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn) + { +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn))); +- QString uuidTransfer = QString::fromStdString(getRelativeResource(request->getResource())); +- QString path = QString::fromStdString(request->getQuery("path")); ++ pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn))); ++ QString uuidTransfer = QString::fromStdString(get_relative_resource(request->get_resource())); ++ QString path = QString::fromStdString(request->get_query("path")); + + path = path.replace("+", " "); + path = QUrl::fromPercentEncoding(path.toUtf8()); +@@ -294,8 +295,8 @@ void HttpService::TransferTreeBrowserSer + + if (path.contains("/..") || path.contains("../")) + { +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_FORBIDDEN); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_FORBIDDEN); ++ writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_FORBIDDEN); ++ writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_FORBIDDEN); + writer->send(); + return; + } +@@ -304,8 +305,8 @@ void HttpService::TransferTreeBrowserSer + + if (!q || !t) + { +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND); ++ writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND); ++ writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND); + writer->send(); + return; + } +@@ -320,8 +321,8 @@ void HttpService::TransferTreeBrowserSer + + if (!dir.cd(path)) + { +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND); ++ writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND); ++ writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND); + writer->send(); + return; + } +@@ -371,11 +372,11 @@ void HttpService::TransferTreeBrowserSer + writer->send(); + } + +-void HttpService::TransferDownloadService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn) ++void HttpService::TransferDownloadService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn) + { +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn))); +- QString transfer = QString::fromStdString(request->getQuery("transfer")); +- QString path = QString::fromStdString(request->getQuery("path")); ++ pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn))); ++ QString transfer = QString::fromStdString(request->get_query("transfer")); ++ QString path = QString::fromStdString(request->get_query("path")); + + path = path.replace("+", " "); + path = QUrl::fromPercentEncoding(path.toUtf8()); +@@ -387,8 +388,8 @@ void HttpService::TransferDownloadServic + + if (path.contains("/..") || path.contains("../")) + { +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_FORBIDDEN); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_FORBIDDEN); ++ writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_FORBIDDEN); ++ writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_FORBIDDEN); + writer->send(); + return; + } +@@ -397,8 +398,8 @@ void HttpService::TransferDownloadServic + + if (!q || !t) + { +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND); ++ writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND); ++ writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND); + writer->send(); + return; + } +@@ -428,24 +429,24 @@ void HttpService::TransferDownloadServic + response_file.update(); + + pion::plugins::DiskFileSenderPtr sender_ptr(pion::plugins::DiskFileSender::create(response_file, request, tcp_conn, 8192)); +- sender_ptr->getWriter()->getResponse().addHeader("Content-Disposition", disposition.toStdString()); ++ sender_ptr->getWriter()->get_response().add_header("Content-Disposition", disposition.toStdString()); + + if (unsigned long long fileSize = response_file.getFileSize()) + { + std::stringstream fileSizeStream; + fileSizeStream << fileSize; +- sender_ptr->getWriter()->getResponse().addHeader("Content-Length", fileSizeStream.str()); ++ sender_ptr->getWriter()->get_response().add_header("Content-Length", fileSizeStream.str()); + } + + sender_ptr->send(); + } + +-void HttpService::SubclassService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn) ++void HttpService::SubclassService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn) + { +- pion::net::HTTPResponseWriterPtr writer = HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn)); ++ pion::http::response_writer_ptr writer = pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn)); + HttpService::WriteBackImpl wb = HttpService::WriteBackImpl(writer); +- QString transfer = QString::fromStdString(request->getQuery("transfer")); +- QString method = QString::fromStdString(getRelativeResource(request->getResource())); ++ QString transfer = QString::fromStdString(request->get_query("transfer")); ++ QString method = QString::fromStdString(get_relative_resource(request->get_resource())); + + Queue* q = 0; + Transfer* t = 0; +@@ -460,15 +461,15 @@ void HttpService::SubclassService::opera + g_queuesLock.unlock(); + } + +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND); ++ writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND); ++ writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND); + writer->send(); + return; + } + + QMultiMap map; +- pion::net::HTTPTypes::QueryParams params = request->getQueryParams(); +- for (pion::net::HTTPTypes::QueryParams::iterator it = params.begin(); it != params.end(); it++) ++ pion::ihash_multimap params = request->get_queries(); ++ for (pion::ihash_multimap::iterator it = params.begin(); it != params.end(); it++) + { + map.insert(QString::fromStdString(it->first), QString::fromStdString(it->second)); + } +@@ -481,7 +482,7 @@ void HttpService::SubclassService::opera + g_queuesLock.unlock(); + } + +-HttpService::WriteBackImpl::WriteBackImpl(pion::net::HTTPResponseWriterPtr& writer) ++HttpService::WriteBackImpl::WriteBackImpl(pion::http::response_writer_ptr& writer) + : m_writer(writer) + { + +@@ -489,7 +490,7 @@ HttpService::WriteBackImpl::WriteBackImp + + void HttpService::WriteBackImpl::writeNoCopy(void* data, size_t bytes) + { +- m_writer->writeNoCopy(data, bytes); ++ m_writer->write_no_copy(data, bytes); + } + + void HttpService::WriteBackImpl::send() +@@ -504,13 +505,13 @@ void HttpService::WriteBackImpl::write(c + + void HttpService::WriteBackImpl::setContentType(const char* type) + { +- m_writer->getResponse().addHeader("Content-Type", type); ++ m_writer->get_response().add_header("Content-Type", type); + } + + void HttpService::WriteBackImpl::writeFail(QString error) + { +- m_writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND); +- m_writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND); ++ m_writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_NOT_FOUND); ++ m_writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_NOT_FOUND); + } + + int HttpService::findTransfer(QString transferUUID, Queue** q, Transfer** t, bool lockForWrite) +@@ -601,9 +602,9 @@ QVariant HttpService::generateCertificat + + + /* +-void HttpService::CaptchaService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn) ++void HttpService::CaptchaService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn) + { +- m_cap.writer = HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn)); ++ m_cap.writer = pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn)); + + std::string upgrade, connection; + upgrade = request->getHeader("Upgrade"); +@@ -616,8 +617,8 @@ void HttpService::CaptchaService::operat + + if (connection != "upgrade" || upgrade != "websocket" || m_cap.key1.empty() || m_cap.key2.empty()) + { +- m_cap.writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_BAD_REQUEST); +- m_cap.writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_BAD_REQUEST); ++ m_cap.writer->get_response().set_status_code(pion::http::types::RESPONSE_CODE_BAD_REQUEST); ++ m_cap.writer->get_response().set_status_message(pion::http::types::RESPONSE_MESSAGE_BAD_REQUEST); + m_cap.writer->send(); + } + +@@ -668,30 +669,30 @@ void HttpService::CaptchaService::CapSer + + */ + +-void HttpService::CaptchaHttpResponseWriter::handleWrite(const boost::system::error_code &write_error, std::size_t bytes_written) ++void HttpService::CaptchaHttpResponseWriter::handle_write(const boost::system::error_code &write_error, std::size_t bytes_written) + { + if (!bytes_written) + { + // TODO: handle errors + HttpService::instance()->removeCaptchaClient(client); +- sendFinalChunk(); ++ send_final_chunk(); + delete client; + } + +- pion::net::HTTPResponseWriter::handleWrite(write_error, bytes_written); ++ pion::http::response_writer::handle_write(write_error, bytes_written); + } + +-void HttpService::CaptchaService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn) ++void HttpService::CaptchaService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn) + { +- if (request->hasQuery("id")) ++ if (request->has_query("id")) + { +- QString id = QString::fromStdString(request->getQuery("id")); +- QString solution = QString::fromStdString(request->getQuery("solution")); ++ QString id = QString::fromStdString(request->get_query("id")); ++ QString solution = QString::fromStdString(request->get_query("solution")); + + int iid = id.toInt(); + HttpService::instance()->m_captchaHttp.captchaEntered(iid, solution); + +- pion::net::HTTPResponseWriterPtr writer = HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn)); ++ pion::http::response_writer_ptr writer = pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn)); + writer->send(); + } + else +@@ -709,13 +710,13 @@ void HttpService::CaptchaService::operat + RegisteredClient* client = new RegisteredClient; + + client->writer = CaptchaHttpResponseWriter::create(client, tcp_conn, *request, +- boost::bind(&TCPConnection::finish, tcp_conn)); ++ boost::bind(&pion::tcp::connection::finish, tcp_conn)); + HttpService::instance()->addCaptchaClient(client); + +- client->writer->getResponse().addHeader("Content-Type", "text/event-stream"); +- client->writer->getResponse().addHeader("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0"); +- client->writer->getResponse().addHeader("Expires", "Tue, 03 Jul 2001 06:00:00 GMT"); +- client->writer->getResponse().addHeader("Pragma", "no-cache"); ++ client->writer->get_response().add_header("Content-Type", "text/event-stream"); ++ client->writer->get_response().add_header("Cache-Control", "no-store, no-cache, must-revalidate, max-age=0"); ++ client->writer->get_response().add_header("Expires", "Tue, 03 Jul 2001 06:00:00 GMT"); ++ client->writer->get_response().add_header("Pragma", "no-cache"); + } + } + +@@ -747,7 +748,7 @@ void HttpService::RegisteredClient::push + writer->clear(); + + writer->write(buf.data(), buf.length()); +- writer->sendChunk(boost::bind(&HttpService::RegisteredClient::finished, this)); ++ writer->send_chunk(boost::bind(&HttpService::RegisteredClient::finished, this)); + } + else + writeInProgressLock.unlock(); +@@ -760,7 +761,7 @@ void HttpService::RegisteredClient::keep + + writer->clear(); + writer->write(": keepalive\r\n\r\n"); +- writer->sendChunk(boost::bind(&HttpService::RegisteredClient::finished, this)); ++ writer->send_chunk(boost::bind(&HttpService::RegisteredClient::finished, this)); + } + + void HttpService::addCaptchaEvent(int id, QString url) +@@ -803,5 +804,5 @@ void HttpService::keepalive() + + void HttpService::RegisteredClient::terminate() + { +- writer->getTCPConnection()->finish(); ++ writer->get_connection()->finish(); + } +diff -rup fatrat-1.2.0_beta2/src/remote/HttpService.h fatrat-1.2.0_beta2.new/src/remote/HttpService.h +--- fatrat-1.2.0_beta2/src/remote/HttpService.h 2012-07-14 12:44:27.000000000 +0100 ++++ fatrat-1.2.0_beta2.new/src/remote/HttpService.h 2013-04-29 19:17:17.076634049 +0100 +@@ -40,7 +40,8 @@ respects for all of the code used other + #include + #include + #include +-#include ++#include ++#include + #include "captcha/CaptchaHttp.h" + #include "remote/TransferHttpService.h" + +@@ -48,7 +49,8 @@ respects for all of the code used other + # error This file is not supposed to be included! + #endif + +-#include ++#include ++#include + + class Queue; + class Transfer; +@@ -83,8 +85,8 @@ private: + void killCaptchaClients(); + private: + static HttpService* m_instance; +- pion::net::WebServer* m_server; +- pion::net::HTTPAuthPtr m_auth_ptr; ++ pion::http::plugin_server* m_server; ++ pion::http::auth_ptr m_auth_ptr; + CaptchaHttp m_captchaHttp; + quint16 m_port; + QString m_strSSLPem; +@@ -94,27 +96,27 @@ private: + QList m_registeredCaptchaClients; + QMutex m_registeredCaptchaClientsMutex; + +- class LogService : public pion::net::WebService ++ class LogService : public pion::http::plugin_service + { +- void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn); ++ void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn); + }; +- class TransferTreeBrowserService : public pion::net::WebService ++ class TransferTreeBrowserService : public pion::http::plugin_service + { +- void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn); ++ void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn); + }; +- class TransferDownloadService : public pion::net::WebService ++ class TransferDownloadService : public pion::http::plugin_service + { +- void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn); ++ void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn); + }; +- class SubclassService : public pion::net::WebService ++ class SubclassService : public pion::http::plugin_service + { + public: +- void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn); ++ void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn); + }; +- /*class CaptchaService : public pion::net::WebService ++ /*class CaptchaService : public pion::http::plugin_service + { + public: +- void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn); ++ void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn); + private: + class CapServCap + { +@@ -126,15 +128,15 @@ private: + std::string key1, key2; + char sig[8]; + int inbuf; +- pion::net::TCPConnectionPtr tcp_conn; ++ pion::tcp::connection_ptr tcp_conn; + } m_cap; + };*/ + + class CaptchaHttpResponseWriter; +- class CaptchaService : public pion::net::WebService ++ class CaptchaService : public pion::http::plugin_service + { + public: +- void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn); ++ void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn); + }; + struct RegisteredClient + { +@@ -151,16 +153,16 @@ private: + void terminate(); + }; + +- class CaptchaHttpResponseWriter : public pion::net::HTTPResponseWriter ++ class CaptchaHttpResponseWriter : public pion::http::response_writer + { + public: +- CaptchaHttpResponseWriter(HttpService::RegisteredClient* cl, pion::net::TCPConnectionPtr &tcp_conn, const pion::net::HTTPRequest& request, FinishedHandler handler = FinishedHandler()) +- : pion::net::HTTPResponseWriter(tcp_conn, request, handler), client(cl) ++ CaptchaHttpResponseWriter(HttpService::RegisteredClient* cl, pion::tcp::connection_ptr &tcp_conn, const pion::http::request& request, finished_handler_t handler = finished_handler_t()) ++ : pion::http::response_writer(tcp_conn, request, handler), client(cl) + { + + } + +- static inline boost::shared_ptr create(HttpService::RegisteredClient* cl, pion::net::TCPConnectionPtr &tcp_conn, const pion::net::HTTPRequest& request, FinishedHandler handler = FinishedHandler()) ++ static inline boost::shared_ptr create(HttpService::RegisteredClient* cl, pion::tcp::connection_ptr &tcp_conn, const pion::http::request& request, finished_handler_t handler = finished_handler_t()) + { + return boost::shared_ptr(new CaptchaHttpResponseWriter(cl, tcp_conn, request, handler)); + } +@@ -171,7 +173,7 @@ private: + m_http_response->prepareBuffersForSend(write_buffers, getTCPConnection()->getKeepAlive(), + sendingChunkedMessage()); + }*/ +- virtual void handleWrite(const boost::system::error_code &write_error, std::size_t bytes_written); ++ virtual void handle_write(const boost::system::error_code &write_error, std::size_t bytes_written); + + HttpService::RegisteredClient* client; + }; +@@ -179,14 +181,14 @@ private: + class WriteBackImpl : public TransferHttpService::WriteBack + { + public: +- WriteBackImpl(pion::net::HTTPResponseWriterPtr& writer); ++ WriteBackImpl(pion::http::response_writer_ptr& writer); + void write(const char* data, size_t bytes); + void writeFail(QString error); + void writeNoCopy(void* data, size_t bytes); + void send(); + void setContentType(const char* type); + private: +- pion::net::HTTPResponseWriterPtr m_writer; ++ pion::http::response_writer_ptr m_writer; + }; + }; + +diff -rup fatrat-1.2.0_beta2/src/remote/pion/FileService.cpp fatrat-1.2.0_beta2.new/src/remote/pion/FileService.cpp +--- fatrat-1.2.0_beta2/src/remote/pion/FileService.cpp 2012-07-14 12:44:27.000000000 +0100 ++++ fatrat-1.2.0_beta2.new/src/remote/pion/FileService.cpp 2013-04-29 19:17:17.079967487 +0100 +@@ -15,13 +15,14 @@ + #include + + #include "FileService.hpp" +-#include +-#include ++#include ++#include + #include + #include + + using namespace pion; +-using namespace pion::net; ++using namespace pion::http; ++using namespace pion::tcp; + + namespace pion { // begin namespace pion + namespace plugins { // begin namespace plugins +@@ -49,7 +50,7 @@ FileService::FileService(void) + m_writable(false) + {} + +-void FileService::setOption(const std::string& name, const std::string& value) ++void FileService::set_option(const std::string& name, const std::string& value) + { + if (name == "directory") { + m_directory = value; +@@ -104,10 +105,10 @@ void FileService::setOption(const std::s + } + } + +-void FileService::operator()(HTTPRequestPtr& request, TCPConnectionPtr& tcp_conn) ++void FileService::operator()(request_ptr& request, connection_ptr& tcp_conn) + { + // get the relative resource path for the request +- const std::string relative_path(getRelativeResource(request->getResource())); ++ const std::string relative_path(get_relative_resource(request->get_resource())); + + // determine the path of the file being requested + boost::filesystem::path file_path; +@@ -117,7 +118,7 @@ void FileService::operator()(HTTPRequest + if (m_file.empty()) { + // no file is specified, either in the request or in the options + PION_LOG_WARN(m_logger, "No file option defined (" +- << getResource() << ")"); ++ << get_resource() << ")"); + sendNotFoundResponse(request, tcp_conn); + return; + } else { +@@ -129,7 +130,7 @@ void FileService::operator()(HTTPRequest + if (m_directory.empty()) { + // no directory is specified for the relative file + PION_LOG_WARN(m_logger, "No directory option defined (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + sendNotFoundResponse(request, tcp_conn); + return; + } else { +@@ -142,7 +143,7 @@ void FileService::operator()(HTTPRequest + std::string string = file_path.string(); + if (string.find(m_directory.string()) != 0) { + PION_LOG_WARN(m_logger, "Request for file outside of directory (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + static const std::string FORBIDDEN_HTML_START = + "\n" + "403 Forbidden\n" +@@ -152,14 +153,14 @@ void FileService::operator()(HTTPRequest + static const std::string FORBIDDEN_HTML_FINISH = + " is not in the configured directory.

\n" + "\n"; +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, +- boost::bind(&TCPConnection::finish, tcp_conn))); +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_FORBIDDEN); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_FORBIDDEN); +- if (request->getMethod() != HTTPTypes::REQUEST_METHOD_HEAD) { +- writer->writeNoCopy(FORBIDDEN_HTML_START); +- writer << request->getResource(); +- writer->writeNoCopy(FORBIDDEN_HTML_FINISH); ++ response_writer_ptr writer(response_writer::create(tcp_conn, *request, ++ boost::bind(&connection::finish, tcp_conn))); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_FORBIDDEN); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_FORBIDDEN); ++ if (request->get_method() != types::REQUEST_METHOD_HEAD) { ++ writer->write_no_copy(FORBIDDEN_HTML_START); ++ writer << request->get_resource(); ++ writer->write_no_copy(FORBIDDEN_HTML_FINISH); + } + writer->send(); + return; +@@ -168,7 +169,7 @@ void FileService::operator()(HTTPRequest + // requests specifying directories are not allowed + if (boost::filesystem::is_directory(file_path)) { + PION_LOG_WARN(m_logger, "Request for directory (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + static const std::string FORBIDDEN_HTML_START = + "\n" + "403 Forbidden\n" +@@ -178,21 +179,21 @@ void FileService::operator()(HTTPRequest + static const std::string FORBIDDEN_HTML_FINISH = + " is a directory.

\n" + "\n"; +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, +- boost::bind(&TCPConnection::finish, tcp_conn))); +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_FORBIDDEN); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_FORBIDDEN); +- if (request->getMethod() != HTTPTypes::REQUEST_METHOD_HEAD) { +- writer->writeNoCopy(FORBIDDEN_HTML_START); +- writer << request->getResource(); +- writer->writeNoCopy(FORBIDDEN_HTML_FINISH); ++ response_writer_ptr writer(response_writer::create(tcp_conn, *request, ++ boost::bind(&connection::finish, tcp_conn))); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_FORBIDDEN); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_FORBIDDEN); ++ if (request->get_method() != types::REQUEST_METHOD_HEAD) { ++ writer->write_no_copy(FORBIDDEN_HTML_START); ++ writer << request->get_resource(); ++ writer->write_no_copy(FORBIDDEN_HTML_FINISH); + } + writer->send(); + return; + } + +- if (request->getMethod() == HTTPTypes::REQUEST_METHOD_GET +- || request->getMethod() == HTTPTypes::REQUEST_METHOD_HEAD) ++ if (request->get_method() == types::REQUEST_METHOD_GET ++ || request->get_method() == types::REQUEST_METHOD_HEAD) + { + // the type of response we will send + enum ResponseType { +@@ -207,7 +208,7 @@ void FileService::operator()(HTTPRequest + DiskFile response_file; + + // get the If-Modified-Since request header +- const std::string if_modified_since(request->getHeader(HTTPTypes::HEADER_IF_MODIFIED_SINCE)); ++ const std::string if_modified_since(request->get_header(types::HEADER_IF_MODIFIED_SINCE)); + + // check the cache for a corresponding entry (if enabled) + // note that m_cache_setting may equal 0 if m_scan_setting == 1 +@@ -225,18 +226,18 @@ void FileService::operator()(HTTPRequest + // all requests must correspond with existing cache entries + // since no match was found, just return file not found + PION_LOG_WARN(m_logger, "Request for unknown file (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + response_type = RESPONSE_NOT_FOUND; + } else { + PION_LOG_DEBUG(m_logger, "No cache entry for request (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + } + + } else { + // found an existing cache entry + + PION_LOG_DEBUG(m_logger, "Found cache entry for request (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + + if (m_cache_setting == 0) { + // cache is disabled +@@ -253,12 +254,12 @@ void FileService::operator()(HTTPRequest + // no need to read the file; the modified times match! + response_type = RESPONSE_NOT_MODIFIED; + } else { +- if (request->getMethod() == HTTPTypes::REQUEST_METHOD_HEAD) { ++ if (request->get_method() == types::REQUEST_METHOD_HEAD) { + response_type = RESPONSE_HEAD_OK; + } else { + response_type = RESPONSE_OK; + PION_LOG_DEBUG(m_logger, "Cache disabled, reading file (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + } + } + +@@ -290,7 +291,7 @@ void FileService::operator()(HTTPRequest + // get the response type + if (cache_itr->second.getLastModifiedString() == if_modified_since) { + response_type = RESPONSE_NOT_MODIFIED; +- } else if (request->getMethod() == HTTPTypes::REQUEST_METHOD_HEAD) { ++ } else if (request->get_method() == types::REQUEST_METHOD_HEAD) { + response_type = RESPONSE_HEAD_OK; + } else { + response_type = RESPONSE_OK; +@@ -301,7 +302,7 @@ void FileService::operator()(HTTPRequest + + PION_LOG_DEBUG(m_logger, (cache_was_updated ? "Updated" : "Using") + << " cache entry for request (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + } + } + } +@@ -310,7 +311,7 @@ void FileService::operator()(HTTPRequest + // make sure that the file exists + if (! boost::filesystem::exists(file_path)) { + PION_LOG_WARN(m_logger, "File not found (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + sendNotFoundResponse(request, tcp_conn); + return; + } +@@ -318,7 +319,7 @@ void FileService::operator()(HTTPRequest + response_file.setFilePath(file_path); + + PION_LOG_DEBUG(m_logger, "Found file for request (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + + // determine the MIME type + response_file.setMimeType(findMIMEType( response_file.getFilePath().string() )); +@@ -330,7 +331,7 @@ void FileService::operator()(HTTPRequest + if (response_file.getLastModifiedString() == if_modified_since) { + // no need to read the file; the modified times match! + response_type = RESPONSE_NOT_MODIFIED; +- } else if (request->getMethod() == HTTPTypes::REQUEST_METHOD_HEAD) { ++ } else if (request->get_method() == types::REQUEST_METHOD_HEAD) { + response_type = RESPONSE_HEAD_OK; + } else { + response_type = RESPONSE_OK; +@@ -341,7 +342,7 @@ void FileService::operator()(HTTPRequest + } + // add new entry to the cache + PION_LOG_DEBUG(m_logger, "Adding cache entry for request (" +- << getResource() << "): " << relative_path); ++ << get_resource() << "): " << relative_path); + boost::mutex::scoped_lock cache_lock(m_cache_mutex); + m_cache_map.insert( std::make_pair(relative_path, response_file) ); + } +@@ -360,43 +361,43 @@ void FileService::operator()(HTTPRequest + // sending headers only -> use our own response object + + // prepare a response and set the Content-Type +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, +- boost::bind(&TCPConnection::finish, tcp_conn))); +- writer->getResponse().setContentType(response_file.getMimeType()); ++ response_writer_ptr writer(response_writer::create(tcp_conn, *request, ++ boost::bind(&connection::finish, tcp_conn))); ++ writer->get_response().set_content_type(response_file.getMimeType()); + + // set Last-Modified header to enable client-side caching +- writer->getResponse().addHeader(HTTPTypes::HEADER_LAST_MODIFIED, ++ writer->get_response().add_header(types::HEADER_LAST_MODIFIED, + response_file.getLastModifiedString()); + + std::stringstream out; + out << response_file.getFileSize(); +- writer->getResponse().addHeader(HTTPTypes::HEADER_CONTENT_LENGTH, out.str()); ++ writer->get_response().add_header(types::HEADER_CONTENT_LENGTH, out.str()); + + switch(response_type) { + case RESPONSE_UNDEFINED: + case RESPONSE_NOT_FOUND: + case RESPONSE_OK: + // this should never happen +- throw UndefinedResponseException(request->getResource()); ++ throw UndefinedResponseException(request->get_resource()); + break; + case RESPONSE_NOT_MODIFIED: + // set "Not Modified" response +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_MODIFIED); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_MODIFIED); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_NOT_MODIFIED); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NOT_MODIFIED); + break; + case RESPONSE_HEAD_OK: + // set "OK" response (not really necessary since this is the default) +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_OK); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_OK); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_OK); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_OK); + break; + } + + // send the response + writer->send(); + } +- } else if (request->getMethod() == HTTPTypes::REQUEST_METHOD_POST +- || request->getMethod() == HTTPTypes::REQUEST_METHOD_PUT +- || request->getMethod() == HTTPTypes::REQUEST_METHOD_DELETE) ++ } else if (request->get_method() == types::REQUEST_METHOD_POST ++ || request->get_method() == types::REQUEST_METHOD_PUT ++ || request->get_method() == types::REQUEST_METHOD_DELETE) + { + // If not writable, then send 405 (Method Not Allowed) response for POST, PUT or DELETE requests. + if (!m_writable) { +@@ -409,24 +410,24 @@ void FileService::operator()(HTTPRequest + static const std::string NOT_ALLOWED_HTML_FINISH = + " is not allowed on this server.

\n" + "\n"; +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, +- boost::bind(&TCPConnection::finish, tcp_conn))); +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_METHOD_NOT_ALLOWED); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_METHOD_NOT_ALLOWED); +- writer->writeNoCopy(NOT_ALLOWED_HTML_START); +- writer << request->getMethod(); +- writer->writeNoCopy(NOT_ALLOWED_HTML_FINISH); +- writer->getResponse().addHeader("Allow", "GET, HEAD"); ++ response_writer_ptr writer(response_writer::create(tcp_conn, *request, ++ boost::bind(&connection::finish, tcp_conn))); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_METHOD_NOT_ALLOWED); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_METHOD_NOT_ALLOWED); ++ writer->write_no_copy(NOT_ALLOWED_HTML_START); ++ writer << request->get_method(); ++ writer->write_no_copy(NOT_ALLOWED_HTML_FINISH); ++ writer->get_response().add_header("Allow", "GET, HEAD"); + writer->send(); + } else { +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, +- boost::bind(&TCPConnection::finish, tcp_conn))); +- if (request->getMethod() == HTTPTypes::REQUEST_METHOD_POST +- || request->getMethod() == HTTPTypes::REQUEST_METHOD_PUT) ++ response_writer_ptr writer(response_writer::create(tcp_conn, *request, ++ boost::bind(&connection::finish, tcp_conn))); ++ if (request->get_method() == types::REQUEST_METHOD_POST ++ || request->get_method() == types::REQUEST_METHOD_PUT) + { + if (boost::filesystem::exists(file_path)) { +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NO_CONTENT); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NO_CONTENT); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_NO_CONTENT); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NO_CONTENT); + } else { + // The file doesn't exist yet, so it will be created below, unless the + // directory of the requested file also doesn't exist. +@@ -440,11 +441,11 @@ void FileService::operator()(HTTPRequest + static const std::string NOT_FOUND_HTML_FINISH = + " was not found on this server.

\n" + "\n"; +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND); +- writer->writeNoCopy(NOT_FOUND_HTML_START); +- writer << request->getResource(); +- writer->writeNoCopy(NOT_FOUND_HTML_FINISH); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_NOT_FOUND); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NOT_FOUND); ++ writer->write_no_copy(NOT_FOUND_HTML_START); ++ writer << request->get_resource(); ++ writer->write_no_copy(NOT_FOUND_HTML_FINISH); + writer->send(); + return; + } +@@ -457,17 +458,17 @@ void FileService::operator()(HTTPRequest + static const std::string CREATED_HTML_FINISH = + "

\n" + "\n"; +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_CREATED); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_CREATED); +- writer->getResponse().addHeader(HTTPTypes::HEADER_LOCATION, request->getResource()); +- writer->writeNoCopy(CREATED_HTML_START); +- writer << request->getResource(); +- writer->writeNoCopy(CREATED_HTML_FINISH); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_CREATED); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_CREATED); ++ writer->get_response().add_header(types::HEADER_LOCATION, request->get_resource()); ++ writer->write_no_copy(CREATED_HTML_START); ++ writer << request->get_resource(); ++ writer->write_no_copy(CREATED_HTML_FINISH); + } +- std::ios_base::openmode mode = request->getMethod() == HTTPTypes::REQUEST_METHOD_POST? ++ std::ios_base::openmode mode = request->get_method() == types::REQUEST_METHOD_POST? + std::ios::app : std::ios::out; + boost::filesystem::ofstream file_stream(file_path, mode); +- file_stream.write(request->getContent(), request->getContentLength()); ++ file_stream.write(request->get_content(), request->get_content_length()); + file_stream.close(); + if (!boost::filesystem::exists(file_path)) { + static const std::string PUT_FAILED_HTML_START = +@@ -479,21 +480,21 @@ void FileService::operator()(HTTPRequest + static const std::string PUT_FAILED_HTML_FINISH = + ".

\n" + "\n"; +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_SERVER_ERROR); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_SERVER_ERROR); +- writer->writeNoCopy(PUT_FAILED_HTML_START); +- writer << request->getResource(); +- writer->writeNoCopy(PUT_FAILED_HTML_FINISH); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_SERVER_ERROR); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_SERVER_ERROR); ++ writer->write_no_copy(PUT_FAILED_HTML_START); ++ writer << request->get_resource(); ++ writer->write_no_copy(PUT_FAILED_HTML_FINISH); + } + writer->send(); +- } else if (request->getMethod() == HTTPTypes::REQUEST_METHOD_DELETE) { ++ } else if (request->get_method() == types::REQUEST_METHOD_DELETE) { + if (!boost::filesystem::exists(file_path)) { + sendNotFoundResponse(request, tcp_conn); + } else { + try { + boost::filesystem::remove(file_path); +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NO_CONTENT); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NO_CONTENT); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_NO_CONTENT); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NO_CONTENT); + writer->send(); + } catch (...) { + static const std::string DELETE_FAILED_HTML_START = +@@ -505,18 +506,18 @@ void FileService::operator()(HTTPRequest + static const std::string DELETE_FAILED_HTML_FINISH = + ".

\n" + "\n"; +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_SERVER_ERROR); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_SERVER_ERROR); +- writer->writeNoCopy(DELETE_FAILED_HTML_START); +- writer << request->getResource(); +- writer->writeNoCopy(DELETE_FAILED_HTML_FINISH); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_SERVER_ERROR); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_SERVER_ERROR); ++ writer->write_no_copy(DELETE_FAILED_HTML_START); ++ writer << request->get_resource(); ++ writer->write_no_copy(DELETE_FAILED_HTML_FINISH); + writer->send(); + } + } + } else { + // This should never be reached. +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_SERVER_ERROR); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_SERVER_ERROR); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_SERVER_ERROR); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_SERVER_ERROR); + writer->send(); + } + } +@@ -532,19 +533,19 @@ void FileService::operator()(HTTPRequest + static const std::string NOT_IMPLEMENTED_HTML_FINISH = + " is not implemented on this server.

\n" + "\n"; +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, +- boost::bind(&TCPConnection::finish, tcp_conn))); +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_IMPLEMENTED); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_IMPLEMENTED); +- writer->writeNoCopy(NOT_IMPLEMENTED_HTML_START); +- writer << request->getMethod(); +- writer->writeNoCopy(NOT_IMPLEMENTED_HTML_FINISH); ++ response_writer_ptr writer(response_writer::create(tcp_conn, *request, ++ boost::bind(&connection::finish, tcp_conn))); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_NOT_IMPLEMENTED); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NOT_IMPLEMENTED); ++ writer->write_no_copy(NOT_IMPLEMENTED_HTML_START); ++ writer << request->get_method(); ++ writer->write_no_copy(NOT_IMPLEMENTED_HTML_FINISH); + writer->send(); + } + } + +-void FileService::sendNotFoundResponse(HTTPRequestPtr& http_request, +- TCPConnectionPtr& tcp_conn) ++void FileService::sendNotFoundResponse(request_ptr& http_request, ++ connection_ptr& tcp_conn) + { + static const std::string NOT_FOUND_HTML_START = + "\n" +@@ -555,21 +556,21 @@ void FileService::sendNotFoundResponse(H + static const std::string NOT_FOUND_HTML_FINISH = + " was not found on this server.

\n" + "\n"; +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *http_request, +- boost::bind(&TCPConnection::finish, tcp_conn))); +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_NOT_FOUND); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_NOT_FOUND); +- if (http_request->getMethod() != HTTPTypes::REQUEST_METHOD_HEAD) { +- writer->writeNoCopy(NOT_FOUND_HTML_START); +- writer << http_request->getResource(); +- writer->writeNoCopy(NOT_FOUND_HTML_FINISH); ++ response_writer_ptr writer(response_writer::create(tcp_conn, *http_request, ++ boost::bind(&connection::finish, tcp_conn))); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_NOT_FOUND); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_NOT_FOUND); ++ if (http_request->get_method() != types::REQUEST_METHOD_HEAD) { ++ writer->write_no_copy(NOT_FOUND_HTML_START); ++ writer << http_request->get_resource(); ++ writer->write_no_copy(NOT_FOUND_HTML_FINISH); + } + writer->send(); + } + + void FileService::start(void) + { +- PION_LOG_DEBUG(m_logger, "Starting up resource (" << getResource() << ')'); ++ PION_LOG_DEBUG(m_logger, "Starting up resource (" << get_resource() << ')'); + + // scan directory/file if scan setting != 0 + if (m_scan_setting != 0) { +@@ -594,7 +595,7 @@ void FileService::start(void) + + void FileService::stop(void) + { +- PION_LOG_DEBUG(m_logger, "Shutting down resource (" << getResource() << ')'); ++ PION_LOG_DEBUG(m_logger, "Shutting down resource (" << get_resource() << ')'); + // clear cached files (if started again, it will re-scan) + boost::mutex::scoped_lock cache_lock(m_cache_mutex); + m_cache_map.clear(); +@@ -602,7 +603,7 @@ void FileService::stop(void) + + void FileService::scanDirectory(const boost::filesystem::path& dir_path) + { +- PION_LOG_DEBUG(m_logger, "Scanning directory (" << getResource() << "): " ++ PION_LOG_DEBUG(m_logger, "Scanning directory (" << get_resource() << "): " + << dir_path.string()); + + // iterate through items in the directory +@@ -705,7 +706,7 @@ void DiskFile::update(void) + // set file_size and last_modified + m_file_size = QFileInfo(QString::fromStdString(m_file_path.string())).size(); + m_last_modified = boost::filesystem::last_write_time( m_file_path ); +- m_last_modified_string = HTTPTypes::get_date_string( m_last_modified ); ++ m_last_modified_string = types::get_date_string( m_last_modified ); + } + + void DiskFile::read(void) +@@ -737,7 +738,7 @@ bool DiskFile::checkUpdated(void) + // update file_size and last_modified timestamp + m_file_size = cur_size; + m_last_modified = cur_modified; +- m_last_modified_string = HTTPTypes::get_date_string( m_last_modified ); ++ m_last_modified_string = types::get_date_string( m_last_modified ); + + // read new contents + read(); +@@ -748,11 +749,11 @@ bool DiskFile::checkUpdated(void) + + // DiskFileSender member functions + +-DiskFileSender::DiskFileSender(DiskFile& file, pion::net::HTTPRequestPtr& request, +- pion::net::TCPConnectionPtr& tcp_conn, ++DiskFileSender::DiskFileSender(DiskFile& file, pion::http::request_ptr& request, ++ pion::tcp::connection_ptr& tcp_conn, + unsigned long max_chunk_size) + : m_logger(PION_GET_LOGGER("pion.FileService.DiskFileSender")), m_disk_file(file), +- m_writer(pion::net::HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn))), ++ m_writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&connection::finish, tcp_conn))), + m_max_chunk_size(max_chunk_size), m_file_bytes_to_send(0), m_bytes_sent(0) + { + PION_LOG_DEBUG(m_logger, "Preparing to send file" +@@ -760,15 +761,15 @@ DiskFileSender::DiskFileSender(DiskFile& + << m_disk_file.getFilePath().string()); + + // set the Content-Type HTTP header using the file's MIME type +- m_writer->getResponse().setContentType(m_disk_file.getMimeType()); ++ m_writer->get_response().set_content_type(m_disk_file.getMimeType()); + + // set Last-Modified header to enable client-side caching +- m_writer->getResponse().addHeader(HTTPTypes::HEADER_LAST_MODIFIED, ++ m_writer->get_response().add_header(types::HEADER_LAST_MODIFIED, + m_disk_file.getLastModifiedString()); + + // use "200 OK" HTTP response +- m_writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_OK); +- m_writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_OK); ++ m_writer->get_response().set_status_code(types::RESPONSE_CODE_OK); ++ m_writer->get_response().set_status_message(types::RESPONSE_MESSAGE_OK); + } + + void DiskFileSender::send(void) +@@ -827,13 +828,13 @@ void DiskFileSender::send(void) + } + + // send the content +- m_writer->writeNoCopy(file_content_ptr, m_file_bytes_to_send); ++ m_writer->write_no_copy(file_content_ptr, m_file_bytes_to_send); + + if (m_bytes_sent + m_file_bytes_to_send >= m_disk_file.getFileSize()) { + // this is the last piece of data to send + if (m_bytes_sent > 0) { + // send last chunk in a series +- m_writer->sendFinalChunk(boost::bind(&DiskFileSender::handleWrite, ++ m_writer->send_final_chunk(boost::bind(&DiskFileSender::handleWrite, + shared_from_this(), + boost::asio::placeholders::error, + boost::asio::placeholders::bytes_transferred)); +@@ -846,7 +847,7 @@ void DiskFileSender::send(void) + } + } else { + // there will be more data -> send a chunk +- m_writer->sendChunk(boost::bind(&DiskFileSender::handleWrite, ++ m_writer->send_chunk(boost::bind(&DiskFileSender::handleWrite, + shared_from_this(), + boost::asio::placeholders::error, + boost::asio::placeholders::bytes_transferred)); +@@ -860,7 +861,7 @@ void DiskFileSender::handleWrite(const b + + if (write_error) { + // encountered error sending response data +- m_writer->getTCPConnection()->setLifecycle(TCPConnection::LIFECYCLE_CLOSE); // make sure it will get closed ++ m_writer->get_connection()->set_lifecycle(connection::LIFECYCLE_CLOSE); // make sure it will get closed + PION_LOG_WARN(m_logger, "Error sending file (" << write_error.message() << ')'); + } else { + // response data sent OK +@@ -874,7 +875,7 @@ void DiskFileSender::handleWrite(const b + PION_LOG_DEBUG(m_logger, "Sent " + << (m_file_bytes_to_send < m_disk_file.getFileSize() ? "file chunk" : "complete file") + << " of " << m_file_bytes_to_send << " bytes (finished" +- << (m_writer->getTCPConnection()->getKeepAlive() ? ", keeping alive)" : ", closing)") ); ++ << (m_writer->get_connection()->get_keep_alive() ? ", keeping alive)" : ", closing)") ); + } else { + // NOT finished sending + PION_LOG_DEBUG(m_logger, "Sent file chunk of " << m_file_bytes_to_send << " bytes"); +@@ -884,10 +885,10 @@ void DiskFileSender::handleWrite(const b + } + + if (finished_sending) { +- // TCPConnection::finish() calls TCPServer::finishConnection, which will either: ++ // connection::finish() calls TCPServer::finishConnection, which will either: + // a) call HTTPServer::handleConnection again if keep-alive is true; or, + // b) close the socket and remove it from the server's connection pool +- m_writer->getTCPConnection()->finish(); ++ m_writer->get_connection()->finish(); + } else { + send(); + } +@@ -897,7 +898,7 @@ void DiskFileSender::handleWrite(const b + } // end namespace plugins + } // end namespace pion + +- ++#if 0 + /// creates new FileService objects + extern "C" PION_SERVICE_API pion::plugins::FileService *pion_create_FileService(void) + { +@@ -909,3 +910,5 @@ extern "C" PION_SERVICE_API void pion_de + { + delete service_ptr; + } ++#endif ++ +diff -rup fatrat-1.2.0_beta2/src/remote/pion/FileService.hpp fatrat-1.2.0_beta2.new/src/remote/pion/FileService.hpp +--- fatrat-1.2.0_beta2/src/remote/pion/FileService.hpp 2012-07-14 12:44:27.000000000 +0100 ++++ fatrat-1.2.0_beta2.new/src/remote/pion/FileService.hpp 2013-04-29 19:17:17.079967487 +0100 +@@ -16,13 +16,13 @@ + #include + #include + #include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #include + #include + +@@ -144,8 +144,8 @@ public: + */ + static inline boost::shared_ptr + create(DiskFile& file, +- pion::net::HTTPRequestPtr& request, +- pion::net::TCPConnectionPtr& tcp_conn, ++ pion::http::request_ptr& request, ++ pion::tcp::connection_ptr& tcp_conn, + unsigned long max_chunk_size = 0) + { + return boost::shared_ptr(new DiskFileSender(file, request, +@@ -161,11 +161,11 @@ public: + void send(void); + + /// sets the logger to be used +- inline void setLogger(PionLogger log_ptr) { m_logger = log_ptr; } ++ inline void setLogger(pion::logger log_ptr) { m_logger = log_ptr; } + + /// returns the logger currently in use +- inline PionLogger getLogger(void) { return m_logger; } +- inline pion::net::HTTPResponseWriterPtr getWriter() { return m_writer; } ++ inline pion::logger getLogger(void) { return m_logger; } ++ inline pion::http::response_writer_ptr getWriter() { return m_writer; } + + + protected: +@@ -179,8 +179,8 @@ protected: + * @param max_chunk_size sets the maximum chunk size + */ + DiskFileSender(DiskFile& file, +- pion::net::HTTPRequestPtr& request, +- pion::net::TCPConnectionPtr& tcp_conn, ++ pion::http::request_ptr& request, ++ pion::tcp::connection_ptr& tcp_conn, + unsigned long max_chunk_size); + + /** +@@ -194,7 +194,7 @@ protected: + + + /// primary logging interface used by this class +- PionLogger m_logger; ++ pion::logger m_logger; + + + private: +@@ -203,7 +203,7 @@ private: + DiskFile m_disk_file; + + /// the HTTP response we are sending +- pion::net::HTTPResponseWriterPtr m_writer; ++ pion::http::response_writer_ptr m_writer; + + /// used to read the file from disk if it is not already cached in memory + boost::filesystem::ifstream m_file_stream; +@@ -233,73 +233,78 @@ typedef boost::shared_ptr + #include + #include +-#include ++#include + #include + +-using namespace pion::net; ++using namespace pion::http; + + extern QList g_queues; + extern QReadWriteLock g_queuesLock; +@@ -151,9 +151,9 @@ void XmlRpcService::globalInit() + + } + +-void XmlRpcService::operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn) ++void XmlRpcService::operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn) + { +- if (request->getMethod() != pion::net::HTTPTypes::REQUEST_METHOD_POST) ++ if (request->get_method() != pion::http::types::REQUEST_METHOD_POST) + { + static const std::string NOT_ALLOWED_HTML_START = + "\n" +@@ -164,20 +164,20 @@ void XmlRpcService::operator()(pion::net + static const std::string NOT_ALLOWED_HTML_FINISH = + " is not allowed on this server.

\n" + "\n"; +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn))); +- writer->getResponse().setStatusCode(HTTPTypes::RESPONSE_CODE_METHOD_NOT_ALLOWED); +- writer->getResponse().setStatusMessage(HTTPTypes::RESPONSE_MESSAGE_METHOD_NOT_ALLOWED); +- writer->writeNoCopy(NOT_ALLOWED_HTML_START); +- writer << request->getMethod(); +- writer->writeNoCopy(NOT_ALLOWED_HTML_FINISH); +- writer->getResponse().addHeader("Allow", "GET, HEAD"); ++ pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn))); ++ writer->get_response().set_status_code(types::RESPONSE_CODE_METHOD_NOT_ALLOWED); ++ writer->get_response().set_status_message(types::RESPONSE_MESSAGE_METHOD_NOT_ALLOWED); ++ writer->write_no_copy(NOT_ALLOWED_HTML_START); ++ writer << request->get_method(); ++ writer->write_no_copy(NOT_ALLOWED_HTML_FINISH); ++ writer->get_response().add_header("Allow", "GET, HEAD"); + writer->send(); + return; + } + + QByteArray data; + +- qDebug() << "XML-RPC call:" << request->getContent(); ++ qDebug() << "XML-RPC call:" << request->get_content(); + + try + { +@@ -185,7 +185,7 @@ void XmlRpcService::operator()(pion::net + QList args; + QVariant returnValue; + +- XmlRpc::parseCall(request->getContent(), function, args); ++ XmlRpc::parseCall(request->get_content(), function, args); + + if(function == "Queue.getTransfers") + { +@@ -240,7 +240,7 @@ void XmlRpcService::operator()(pion::net + throw "400 Bad Request"; + } + +- HTTPResponseWriterPtr writer(HTTPResponseWriter::create(tcp_conn, *request, boost::bind(&TCPConnection::finish, tcp_conn))); ++ pion::http::response_writer_ptr writer(pion::http::response_writer::create(tcp_conn, *request, boost::bind(&pion::tcp::connection::finish, tcp_conn))); + writer->write(data.data(), data.size()); + writer->send(); + } +diff -rup fatrat-1.2.0_beta2/src/remote/XmlRpcService.h fatrat-1.2.0_beta2.new/src/remote/XmlRpcService.h +--- fatrat-1.2.0_beta2/src/remote/XmlRpcService.h 2012-07-14 12:44:27.000000000 +0100 ++++ fatrat-1.2.0_beta2.new/src/remote/XmlRpcService.h 2013-04-29 19:17:17.079967487 +0100 +@@ -34,7 +34,8 @@ respects for all of the code used other + #include + #include + #include +-#include ++#include ++#include + + #ifndef WITH_WEBINTERFACE + # error This file is not supposed to be included! +@@ -43,12 +44,12 @@ respects for all of the code used other + class Queue; + class Transfer; + +-class XmlRpcService : public QObject, public pion::net::WebService ++class XmlRpcService : public QObject, public pion::http::plugin_service + { + Q_OBJECT + public: + XmlRpcService(); +- void operator()(pion::net::HTTPRequestPtr &request, pion::net::TCPConnectionPtr &tcp_conn); ++ void operator()(pion::http::request_ptr &request, pion::tcp::connection_ptr &tcp_conn); + static void globalInit(); + static void registerFunction(QString name, QVariant (*func)(QList&), QVector arguments); + static void deregisterFunction(QString name); diff --git a/community/fbshot/PKGBUILD b/community/fbshot/PKGBUILD deleted file mode 100644 index 489f897f8..000000000 --- a/community/fbshot/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 63550 2012-02-05 11:55:26Z ibiru $ -# Maintainer: Sergej Pupykin -# Contributor: sp42b - -pkgname=fbshot -pkgver=0.3 -pkgrel=4 -pkgdesc="Takes screenshots (PNG) from your framebuffer device (e.g. console)." -arch=('i686' 'x86_64') -url="http://www.sfires.net/fbshot/" -license=('GPL') -depends=('libpng') -source=(http://www.sfires.net/stuff/fbshot/$pkgname-$pkgver.tar.gz) -md5sums=('2cc6cc25cdc4cd447a8b0a9662907635') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i '1,1i#include ' fbshot.c - make - install -Dm755 fbshot $pkgdir/usr/bin/fbshot - install -Dm644 fbshot.1.man $pkgdir/usr/share/man/man1/fbshot.1 -} diff --git a/community/fltk2/PKGBUILD b/community/fltk2/PKGBUILD deleted file mode 100644 index 7600f7322..000000000 --- a/community/fltk2/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 63560 2012-02-05 11:56:02Z ibiru $ -# Maintainer: Sergej Pupykin - -pkgname=fltk2 -pkgver=2.0 -_pkgver=2.0.x-alpha-r9166 -pkgrel=8 -pkgdesc="Graphical user interface toolkit for X" -arch=(i686 x86_64) -license=('LGPL') -url="http://www.fltk.org/" -depends=('libjpeg' 'libpng' 'gcc-libs' 'libxft' 'libxext' 'libxi' 'libxinerama') -makedepends=('mesa') -source=(http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/fltk-${_pkgver}.tar.bz2) -md5sums=('d5e7cd859d2aeb9bb6e13ee298e8b2aa') - -build() { - cd $srcdir/fltk-${_pkgver} - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --enable-threads --enable-xft --enable-shared - patch -p0 src/filename_list.cxx < int n = scandir(d, list, 0, (int(*)(const dirent64**,const dirent64**))sort); -EOF - make - make DESTDIR=$pkgdir install -} diff --git a/community/gemrb/PKGBUILD b/community/gemrb/PKGBUILD index 4a2ea9180..966c64d91 100644 --- a/community/gemrb/PKGBUILD +++ b/community/gemrb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82325 2013-01-15 11:15:34Z stativ $ +# $Id: PKGBUILD 89424 2013-04-29 11:47:02Z bpiotrowski $ # Maintainer: Lukas Jirkovsky pkgname=gemrb -pkgver=0.7.2 -pkgrel=2 +pkgver=0.8.0 +pkgrel=1 pkgdesc="OSS implementation of Bioware's Infinity Engine which supports eg. Baldur's Gate" arch=('i686' 'x86_64') url="http://www.gemrb.org/" @@ -13,7 +13,7 @@ makedepends=('cmake') install=gemrb.install options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/gemrb/$pkgname-$pkgver.tar.gz") -md5sums=('4260fcd42f42ce9232668b202b320b29') +md5sums=('dc0306d4d301726ac449225313285ea1') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD index 3c492cbea..a261e7413 100644 --- a/community/gource/PKGBUILD +++ b/community/gource/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87416 2013-03-31 19:18:20Z stephane $ +# $Id: PKGBUILD 89529 2013-04-29 19:09:10Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Jose Valecillos # Contributor: Olivier Ramonat pkgname=gource -pkgver=0.39 -pkgrel=2 +pkgver=0.40 +pkgrel=1 pkgdesc="software version control visualization" license=(GPL3) arch=(i686 x86_64) @@ -12,7 +12,7 @@ url=http://code.google.com/p/gource/ depends=('ftgl' 'sdl' 'sdl_image' 'pcre' 'glew' 'boost-libs') makedepends=('boost' 'glm' 'mesa') source=(http://gource.googlecode.com/files/$pkgname-$pkgver.tar.gz) -md5sums=('31d2d34f3f6a0c044243f477e925b8b4') +md5sums=('89c608a7aa3c901661eb1f2db6117492') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpointing-device-settings/PKGBUILD b/community/gpointing-device-settings/PKGBUILD index e901f65b6..65ef2fe48 100644 --- a/community/gpointing-device-settings/PKGBUILD +++ b/community/gpointing-device-settings/PKGBUILD @@ -1,63 +1,40 @@ -# $Id: PKGBUILD 88555 2013-04-19 17:24:27Z spupykin $ +# $Id: PKGBUILD 89372 2013-04-29 00:10:30Z bgyorgy $ # Maintainer: Sergej Pupykin # Contributor: Thomas Mudrunka pkgname=gpointing-device-settings pkgver=1.5.1 -pkgrel=3 -pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad. -Each UI can be written as dynamic loadable module, so a third party can add its own UI. This -will replace GSynaptics." +pkgrel=4 +pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad" arch=('i686' 'x86_64') license=('GPL') url="http://live.gnome.org/GPointingDeviceSettings" -depends=('gtk2' 'gconf' 'gnome-settings-daemon' 'xorg-xinput') -makedepends=('intltool' 'pkgconfig') -optdepends=('xf86-input-synaptics: Synaptics touchpads' - 'libsynaptics: Synaptics touchpads') +depends=('gtk2' 'gconf') +makedepends=('gnome-settings-daemon' 'intltool') +options=('!libtool') source=("http://keihanna.dl.sourceforge.jp/gsynaptics/45812/${pkgname}-${pkgver}.tar.gz") md5sums=('1d1491473df8eabca3c15c997a975d7f') build() { cd "${srcdir}/${pkgname}-${pkgver}" - #WORKAROUND!!! WE SHOULD GET RID OF THIS:########### - echo 'diff --git a/configure.ac b/configure.ac -index 29215e8..728d4c0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -146,9 +146,9 @@ GENHTML_OPTIONS="--title 'GPointingDeviceSettings Code Coverage'" + # Enable deprecations + sed -i -e '/DISABLE_DEPRECATED/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac - GPDS_CFLAGS="$XINPUT_CFLAGS $GTK_CFLAGS" - GPDS_CFLAGS="$GPDS_CFLAGS $GCONF2_CFLAGS" --GPDS_CFLAGS="$GPDS_CFLAGS -DGTK_DISABLE_DEPRECATED" --GPDS_CFLAGS="$GPDS_CFLAGS -DGDK_DISABLE_DEPRECATED" --GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED" -+#GPDS_CFLAGS="$GPDS_CFLAGS -DGTK_DISABLE_DEPRECATED" -+#GPDS_CFLAGS="$GPDS_CFLAGS -DGDK_DISABLE_DEPRECATED" -+#GPDS_CFLAGS="$GPDS_CFLAGS -DG_DISABLE_DEPRECATED" - GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\"" - GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\"" - GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\"" -' | patch -p1 + # Disable GSD plugin (won't build with GSD 3.8) + sed -i 's/ gnome-settings-daemon-plugins//' modules/Makefile.am - #Magic patch contributed by mattis: - echo '--- a/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -+++ b/modules/gnome-settings-daemon-plugins/gsd-pointing-device-plugin.c -@@ -158,6 +158,9 @@ - plugin_class->activate = activate; - plugin_class->deactivate = deactivate; - } -+ -+static void -+gsd_mouse_extension_plugin_class_finalize(GsdMouseExtensionPluginClass *klass); -' | patch -p1 - - ./configure --prefix=/usr --sysconfdir=/etc + autoreconf -fi + ./configure --prefix=/usr --sysconfdir=/etc \ + --disable-static --disable-schemas-install \ + --with-gconf-schema-file-dir=/usr/share/gconf/schemas make } package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR=${pkgdir} install + + # Remove GConf schema (used by GSD plugin) + rm -r "${pkgdir}/usr/share/gconf" } diff --git a/community/gprolog/PKGBUILD b/community/gprolog/PKGBUILD index 8c7eb438e..c2ef1465c 100644 --- a/community/gprolog/PKGBUILD +++ b/community/gprolog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88313 2013-04-16 13:27:51Z spupykin $ +# $Id: PKGBUILD 89518 2013-04-29 16:43:32Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Geoffroy Carrier # Contributer: Jason Chu pkgname=gprolog -pkgver=1.4.3 +pkgver=1.4.4 pkgrel=1 pkgdesc="GNU Prolog" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.gprolog.org/" depends=() license=('GPL') source=(ftp://ftp.gnu.org/gnu/gprolog/gprolog-$pkgver.tar.gz) -md5sums=('c6d62f93a0274492a2029c267ca8edee') +md5sums=('37009da471e5217ff637ad1c516448c8') build() { cd "$srcdir/gprolog-$pkgver/src" diff --git a/community/hwinfo/PKGBUILD b/community/hwinfo/PKGBUILD index 1da0199a3..8c873ac8c 100644 --- a/community/hwinfo/PKGBUILD +++ b/community/hwinfo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75503 2012-08-26 12:50:22Z arodseth $ +# $Id: PKGBUILD 89408 2013-04-29 10:54:52Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Kaiting Chen # Contributor: Gergely Imreh @@ -8,8 +8,8 @@ # Contributor: ninja_pt pkgname=hwinfo -pkgver=20.0 -_subver=1.4 +pkgver=20.1 +_subver=3.10 pkgrel=1 pkgdesc='Hardware detection tool from openSUSE' arch=('x86_64' 'i686') @@ -19,28 +19,28 @@ depends=('perl' 'libx86emu') makedepends=('sysfsutils' 'rpmextract' 'flex') source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-$pkgver-$_subver.src.rpm" 'custom_ioctl.patch') -sha256sums=('466423b00fda00bc5e927352fb8d2f52b4d4e4b298401cd44c48231951c2a26b' +sha256sums=('b0e2e51b4dd754071fb40843deaaafb0755388de5335b1d2c4c081d0f6393841' '6e83b50aa34f31db5fe6de938402e7c4dda6ffa9ffe1346c076e4779018fcf1d') -build() { +prepare() { cd "$srcdir" - msg2 "Extracting source rpm..." rpmextract.sh "$pkgname-$pkgver-$_subver.src.rpm" tar jxf $pkgname-$pkgver.tar.bz2 cd "$pkgname-$pkgver" - msg2 "Patching..." - patch -p0 < ../custom_ioctl.patch - msg2 "Compiling..." + patch -p0 -i ../custom_ioctl.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 CFLAGS+="-fPIC -I$srcdir/$pkgname-$pkgver/src/hd" LIBDIR=/usr/lib } package() { cd "$srcdir/$pkgname-$pkgver" - msg2 "Packaging files..." make LIBDIR=/usr/lib DESTDIR="$pkgdir" install - msg2 "Cleaning up..." rmdir "$pkgdir/sbin" } diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 6aa3694e5..5ba45a717 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87474 2013-04-01 10:35:45Z spupykin $ +# $Id: PKGBUILD 89422 2013-04-29 11:34:53Z spupykin $ # Maintainer: Sergej Pupykin # Contributor: Jonathan Wiersma pkgname=libvirt pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64') url="http://libvirt.org/" @@ -61,10 +61,15 @@ build() { --with-qemu-user=nobody --with-qemu-group=nobody \ --without-netcf --with-interface make + sed -i 's|/etc/sysconfig/libvirtd|/etc/conf.d/libvirtd|' daemon/libvirtd.service - sed -i 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' tools/libvirt-guests.service - sed -i 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' tools/libvirt-guests.service + sed -i \ + -e 's|/etc/sysconfig/libvirt-guests|/etc/conf.d/libvirtd-guests|' \ + -e 's|/etc/init.d/libvirt-g|/etc/rc.d/libvirtd-g|g' \ + -e 's|After=.*|After=syslog.target network.target libvirtd.service|' \ + tools/libvirt-guests.service sed -i 's|@sbindir@|/usr/sbin|g' src/virtlockd.service + sed -i 's|#group =.*|group="kvm"|' src/qemu/qemu.conf } package() { @@ -82,9 +87,6 @@ package() { install -D -m644 "$srcdir"/libvirt.tmpfiles.d "$pkgdir"/usr/lib/tmpfiles.d/libvirt.conf mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/ - sed -i \ - 's|After=.*|After=syslog.target network.target libvirtd.service|' \ - "$pkgdir"/usr/lib/systemd/system/libvirt-guests.service rm -rf \ "$pkgdir"/var/run \ diff --git a/community/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD index 21bfddf37..3ac6c659b 100644 --- a/community/log4cpp/PKGBUILD +++ b/community/log4cpp/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 58314 2011-11-11 08:13:40Z stativ $ +# $Id: PKGBUILD 89526 2013-04-29 18:41:08Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor : Geraud Le Falher pkgname=log4cpp -pkgver=1.0 -pkgrel=6 +pkgver=1.1 +pkgrel=1 pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations." arch=('i686' 'x86_64') -url="http://log4cpp.hora-obscura.de/" +url="http://log4cpp.sourceforge.net/" license=('LGPL') depends=('gcc-libs') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz gcc43.patch) -md5sums=('1face50ead0790d1297dfb04bacf273c' - '09a6fd8ab6527a417c97c4db5215e558') +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('b9ef6244baa5e5e435f35e0b9474b35d') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir"/gcc43.patch + cd "$srcdir/$pkgname" ./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname" make DESTDIR="$pkgdir" install } diff --git a/community/log4cpp/gcc43.patch b/community/log4cpp/gcc43.patch deleted file mode 100644 index a60f986e9..000000000 --- a/community/log4cpp/gcc43.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: log4cpp-1.0/src/BasicLayout.cpp -=================================================================== ---- log4cpp-1.0.orig/src/BasicLayout.cpp 2008-03-14 16:06:57.000000000 -0400 -+++ log4cpp-1.0/src/BasicLayout.cpp 2008-03-14 16:07:11.000000000 -0400 -@@ -15,6 +15,8 @@ - #include - #endif - -+#include -+ - namespace log4cpp { - - BasicLayout::BasicLayout() { -Index: log4cpp-1.0/src/PatternLayout.cpp -=================================================================== ---- log4cpp-1.0.orig/src/PatternLayout.cpp 2008-03-14 16:07:33.000000000 -0400 -+++ log4cpp-1.0/src/PatternLayout.cpp 2008-03-14 16:07:49.000000000 -0400 -@@ -370,7 +370,7 @@ - literal = ""; - } - if ((minWidth != 0) || (maxWidth != 0)) { -- component = new FormatModifierComponent(component, std::abs(minWidth), maxWidth, minWidth < 0); -+ component = new FormatModifierComponent(component, std::abs((float)minWidth), maxWidth, minWidth < 0); - minWidth = maxWidth = 0; - } - _components.push_back(component); diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 6c2e8d005..ccf3aa3a9 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88909 2013-04-24 17:12:07Z bgyorgy $ +# $Id: PKGBUILD 89374 2013-04-29 01:14:49Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=1.7.3 -pkgrel=2 +pkgver=1.7.4 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -17,7 +17,7 @@ options=('!libtool' '!emptydirs') install=$pkgname.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver" "switch-applications.patch") -md5sums=('30e329da6af10e825dace490f13e445f' +md5sums=('d64bfe853e6fda5ec11a06581743f774' 'a5d5d76dc281277a8afc83d7affdcc7b') build() { diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 00ab3bc7f..20dcea195 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 88912 2013-04-24 17:42:52Z bgyorgy $ +# $Id: PKGBUILD 89376 2013-04-29 01:33:47Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=1.7.3 -pkgrel=3 +pkgver=1.7.4 +pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') url="https://github.com/linuxmint/nemo" @@ -18,7 +18,7 @@ install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "tracker-0.16.patch" "remove-desktop-background.patch") -md5sums=('04c021da543e2562b712107c2be9a8c2' +md5sums=('fc5595a2489ed28f274c5f79ce95d5de' '9e170cc74eee901634b3367b06a209c6' 'f10af52377e44e1efe8ec4934aa4d4d2') diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD index de7f2fe3f..7e5759907 100644 --- a/community/pion/PKGBUILD +++ b/community/pion/PKGBUILD @@ -1,12 +1,10 @@ -# $Id: PKGBUILD 87431 2013-03-31 19:18:42Z stephane $ +# $Id: PKGBUILD 89527 2013-04-29 18:57:40Z stativ $ # Maintainer: Lukas Jirkovsky pkgname=pion -pkgver=4.0.13.1 -# use the git snapshot until a new version is out -_pkgver=dddce5e02d8a60f958e466e690d38eee924475b0 -pkgrel=4 +pkgver=5.0.1 +pkgrel=1 pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" -url="http://www.cloudmeter.com/pion/support/" +url="https://github.com/cloudmeter/pion" arch=('i686' 'x86_64') license=('custom:Boost') depends=('boost-libs' 'openssl' 'log4cpp') @@ -14,11 +12,11 @@ makedepends=('boost') provides=('pion-net') conflicts=('pion-net') replaces=('pion-net') -source=(https://github.com/cloudmeter/pion/archive/${_pkgver}.zip) -md5sums=('4b312452058a6f2580b5d88b03321457') +source=(https://github.com/cloudmeter/pion/archive/$pkgver.zip) +md5sums=('9f8af4f3e600a5b0573fb66132a86528') build() { - cd "$srcdir/$pkgname-$_pkgver" + cd "$srcdir/$pkgname-$pkgver" sh autogen.sh @@ -33,12 +31,12 @@ build() { } check() { - cd "$srcdir/$pkgname-$_pkgver" + cd "$srcdir/$pkgname-$pkgver" make -k check } package() { - cd "$srcdir/$pkgname-$_pkgver" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install # install license diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 229360e2f..516d46507 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 86054 2013-03-11 19:01:26Z stativ $ +# $Id: PKGBUILD 89541 2013-04-29 19:53:51Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: Bogdan Szczurek # Contributor: Vaclav Kramar @@ -6,7 +6,7 @@ pkgname=rawtherapee pkgver=4.0.10 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 76f12e977..7891929e3 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 85861 2013-03-07 20:16:32Z andrea $ +# $Id: PKGBUILD 89389 2013-04-29 06:54:51Z andrea $ # Maintainer: Peter Lewis # Maintainer: Andrea Scarpino # Contributor: Panagiotis Papadopoulos pkgname=rekonq -pkgver=2.2.1 +pkgver=2.3.0 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('qca-ossl: to use the sync handler') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('aa3939af5038491c612bb113647e8a1110720d6fc1038c8c71e6cf1308efa47b') +sha256sums=('f84fe975e79cbdcd218eb73d5371ee5ca0e11a2aea0d1d890ba9f24a505cf65c') build(){ mkdir build diff --git a/community/virtualgl/PKGBUILD b/community/virtualgl/PKGBUILD index 87dcb047b..ea2c2d807 100644 --- a/community/virtualgl/PKGBUILD +++ b/community/virtualgl/PKGBUILD @@ -4,7 +4,7 @@ pkgname=virtualgl pkgver=2.3.2 -pkgrel=2 +pkgrel=3 pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card" arch=('i686' 'x86_64') url="http://virtualgl.org" @@ -24,7 +24,8 @@ build() { -DTJPEG_INCLUDE_DIR=/usr/include \ -DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so \ -DVGL_LIBDIR=/usr/lib \ - -DVGL_BINDIR=/usr/bin + -DVGL_BINDIR=/usr/bin \ + -DVGL_DOCDIR=/usr/share/doc/${pkgname} make } diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index e2ca9c3fc..23388f7b8 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183316 2013-04-21 22:06:34Z heftig $ +# $Id: PKGBUILD 183952 2013-04-29 21:53:23Z heftig $ # Maintainer: Jan de Groot # Contributor: Tom Newsom pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.36.0 +pkgver=2.36.1 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ 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=('59c54996cccc527f3a257964e7226151175c423f6fb22166e81d65a652f483f3') +sha256sums=('d1f7dec2fd75ea95034ec143fcf2ff77a02e92aacf3e0cc110f9c67e7fe23766') build() { cd "$pkgname-$pkgver" diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index cdd1f57e6..98659b508 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179967 2013-03-13 14:50:17Z jgc $ +# $Id: PKGBUILD 183875 2013-04-29 09:27:35Z jgc $ # Maintainer: Aaron Griffin pkgname=goffice -pkgver=0.10.1 +pkgver=0.10.2 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ options=('!libtool') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0') +sha256sums=('7d38769a7af655c0f0373738c786318734400d71b6bbc8d1ce6b6de99bb95674') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xfce4-session/PKGBUILD b/extra/xfce4-session/PKGBUILD index 54b01b4a8..fa6e5d7fc 100644 --- a/extra/xfce4-session/PKGBUILD +++ b/extra/xfce4-session/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169968 2012-10-30 22:59:13Z heftig $ +# $Id: PKGBUILD 183871 2013-04-29 05:43:04Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: tobias pkgname=xfce4-session pkgver=4.10.0 -pkgrel=6 +pkgrel=7 pkgdesc="A session manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -21,17 +21,31 @@ replaces=('xfce-utils') options=('!libtool') install=$pkgname.install source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 - xfce4-session-4.10.0-add-systemd-support.patch) + xfce4-session-4.10.0-add-systemd-support.patch + xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch + xfce4-session-4.10.0-store-the-watch-function-id.patch) sha256sums=('bb8aa9a74c3d382840596fb4875144d66c7f3f47c8e9ee81d31e3428a72c46ce' - 'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b') + 'ffae61c48a4bd0cb51d422cb93f2de9567abaf29085370c455ef349b6a10234b' + '18ed175dd4242e39161a093045c6c6aebf9a408350652bde1454fe07411cdf3c' + '5eb5319a38f58a2d518d0e3d24b6d01c487871711fb36b55cb03a10a4591cdcf') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # https://bugzilla.xfce.org/show_bug.cgi?id=8729 patch -Np1 -i "$srcdir/xfce4-session-4.10.0-add-systemd-support.patch" + # https://bugzilla.xfce.org/show_bug.cgi?id=9709 + patch -Np1 -i "$srcdir/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch" + patch -Np1 -i "$srcdir/xfce4-session-4.10.0-store-the-watch-function-id.patch" + + sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in + xdt-autogen +} + +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure \ --prefix=/usr \ diff --git a/extra/xfce4-session/xfce4-session-4.10.0-store-the-watch-function-id.patch b/extra/xfce4-session/xfce4-session-4.10.0-store-the-watch-function-id.patch new file mode 100644 index 000000000..1b86997ff --- /dev/null +++ b/extra/xfce4-session/xfce4-session-4.10.0-store-the-watch-function-id.patch @@ -0,0 +1,26 @@ +From ab391138cacc62ab184a338e237c4430356b41f9 Mon Sep 17 00:00:00 2001 +From: Nick Schermer +Date: Fri, 26 Apr 2013 18:05:10 +0000 +Subject: Store the watch function id to avoid possible double free (bug #9709). + +--- +diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c +index e43c53c..c621397 100644 +--- a/xfce4-session/xfsm-startup.c ++++ b/xfce4-session/xfsm-startup.c +@@ -903,9 +903,10 @@ xfsm_startup_start_properties (XfsmProperties *properties, + child_watch_data = g_new0 (XfsmStartupData, 1); + child_watch_data->manager = g_object_ref (manager); + child_watch_data->properties = properties; +- g_child_watch_add_full (G_PRIORITY_LOW, properties->pid, +- xfsm_startup_child_watch, child_watch_data, +- (GDestroyNotify) xfsm_startup_data_free); ++ child_watch_data->properties->child_watch_id = ++ g_child_watch_add_full (G_PRIORITY_LOW, properties->pid, ++ xfsm_startup_child_watch, child_watch_data, ++ (GDestroyNotify) xfsm_startup_data_free); + + /* set a timeout -- client must register in a a certain amount of time + * or it's assumed to be broken/have issues. */ +-- +cgit v0.9.1 diff --git a/extra/xfce4-session/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch b/extra/xfce4-session/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch new file mode 100644 index 000000000..beffd0524 --- /dev/null +++ b/extra/xfce4-session/xfce4-session-4.10.0-use-the-async-spawn-function-of-glib.patch @@ -0,0 +1,79 @@ +From dee0200fa5dc4de064f288281ddd13199ba7fcde Mon Sep 17 00:00:00 2001 +From: Nick Schermer +Date: Fri, 26 Apr 2013 17:46:29 +0000 +Subject: Use the async spawn function of glib. + +--- +diff --git a/xfce4-session/xfsm-startup.c b/xfce4-session/xfsm-startup.c +index 911eec6..e43c53c 100644 +--- a/xfce4-session/xfsm-startup.c ++++ b/xfce4-session/xfsm-startup.c +@@ -864,6 +864,7 @@ xfsm_startup_start_properties (XfsmProperties *properties, + gint n; + const gchar *current_directory; + GPid pid; ++ GError *error = NULL; + + /* release any possible old resources related to a previous startup */ + xfsm_properties_set_default_child_watch (properties); +@@ -878,44 +879,28 @@ xfsm_startup_start_properties (XfsmProperties *properties, + + current_directory = xfsm_properties_get_string (properties, SmCurrentDirectory); + +- /* fork a new process for the application */ +-#ifdef HAVE_VFORK +- /* vfork() doesn't allow you to do anything but call exec*() or _exit(), +- * so if we need to set the working directory, we can't use vfork() */ +- if (current_directory == NULL) +- pid = vfork (); +- else +-#endif +- pid = fork (); +- +- /* handle the child process */ +- if (pid == 0) ++ if (!g_spawn_async (current_directory, ++ argv, NULL, ++ G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, ++ NULL, NULL, ++ &pid, &error)) + { +- /* execute the application here */ +- if (current_directory) +- { +- if (chdir (current_directory)) +- g_warning ("Unable to chdir to \"%s\": %s", current_directory, strerror (errno)); +- } +- execvp (argv[0], argv); +- _exit (127); +- } +- +- /* cleanup */ +- g_strfreev (argv); ++ g_warning ("Unable to launch \"%s\": %s", ++ *argv, error->message); ++ g_error_free (error); ++ g_strfreev (argv); + +- /* check if we failed to fork */ +- if (G_UNLIKELY (pid < 0)) +- { +- /* tell the user that we failed to fork */ +- perror ("Failed to fork new process"); + return FALSE; + } + ++ xfsm_verbose ("Launched command \"%s\" with PID %dn", *argv, (gint) pid); ++ ++ g_strfreev (argv); ++ + properties->pid = pid; + + /* set a watch to make sure the child doesn't quit before registering */ +- child_watch_data = g_new (XfsmStartupData, 1); ++ child_watch_data = g_new0 (XfsmStartupData, 1); + child_watch_data->manager = g_object_ref (manager); + child_watch_data->properties = properties; + g_child_watch_add_full (G_PRIORITY_LOW, properties->pid, +-- +cgit v0.9.1 diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 748b1a1da..5f7c62ca2 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -7,8 +7,8 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.0.0 -pkgrel=2 +pkgver=3.1.0 +pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' license=('GPL3') @@ -18,7 +18,7 @@ makedepends=('opencl-headers') provides=(${pkgname%-$_pkgflag}=$pkgver) conflicts=${pkgname%-$_pkgflag} replaces=${pkgname%-$_pkgflag} -source=(http://github.com/ckolivas/${pkgname%-$_pkgflag}/archive/v3.0.0.tar.gz +source=("https://github.com/ckolivas/$_pkgname/archive/v$pkgver.tar.gz" "${pkgname%-$_pkgflag}.conf.d" "${pkgname%-$_pkgflag}.service") backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf") @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('63551fdb16086d57bfa4d39cd40d74cd' - 'fe4a243fabe24608f5c05e40f0f118f6' - 'bd76fc92fedce18c59ccea2aa79cc664') +sha512sums=('486163017b722bb38cb42dfa5c72b57ac4c96ff0584da630f985d2f22c75418284af420a325aa82419b59dca29646b66f8c678eba7a0f36dc044207ac18c9b6c' + '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' + '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD index d30bbb1a3..9b727361a 100644 --- a/libre/mcomix-libre/PKGBUILD +++ b/libre/mcomix-libre/PKGBUILD @@ -5,16 +5,16 @@ _pkgname=mcomix pkgname=mcomix-libre -pkgver=0.99 +pkgver=1.00 pkgrel=1 -pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books" +pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation" arch=('any') url="http://sourceforge.net/projects/mcomix/" license=('GPL') depends=('pygtk' 'python-imaging' 'xdg-utils' 'python2' \ 'desktop-file-utils' 'hicolor-icon-theme' 'python2-distribute') makedepends=('gettext' 'intltool') -optdepends=('ununrar: for rar compressed comics') +optdepends=('unar: for rar compressed comics') conflicts=('mcomix' 'comix') replaces=('mcomix' 'comix') provides=("mcomix=${pkgver}") @@ -37,11 +37,12 @@ package() { export PYTHONPATH=${pkgdir}/usr/lib/python2.7/site-packages/ mkdir -p $PYTHONPATH - python2 setup.py install --prefix=${pkgdir}/usr --optimize=1 \ - --single-version-externally-managed --root=/ + python2 setup.py install --prefix=/usr --optimize=1 \ + --single-version-externally-managed --root=${pkgdir} - install -Dm644 mime/comicbook.schemas \ - ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas + install -Dm755 mime/comicthumb ${pkgdir}/usr/bin/comicthumb + install -Dm644 mime/comicthumb.1.gz ${pkgdir}/usr/share/man/man1/comicthumb.1.gz + install -Dm644 mime/comicbook.schemas ${pkgdir}/usr/share/gconf/schemas/mcomix.schemas } -md5sums=('a1ff7e1955042069d5005b4034e7a914') +md5sums=('3a916dd9da17043ab59ccd17e26eb932') diff --git a/multilib-staging/gens-gs/PKGBUILD b/multilib-staging/gens-gs/PKGBUILD new file mode 100755 index 000000000..9c5bde780 --- /dev/null +++ b/multilib-staging/gens-gs/PKGBUILD @@ -0,0 +1,61 @@ +# $Id: PKGBUILD 89400 2013-04-29 08:52:25Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: trya +# Contributor: Yvan + +pkgname=gens-gs +pkgver=2.16.7 +pkgrel=4 +pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens" +arch=('i686' 'x86_64') +url="http://segaretro.org/Gens/GS" +license=('GPL') +if [[ $CARCH == "x86_64" ]]; then + makedepends=('gcc-multilib' 'lib32-gtk2' 'lib32-mesa-libgl' 'lib32-sdl' 'nasm') + optdepends=('lib32-alsa-plugins: Sound support for PulseAudio' + 'lib32-libpulse: Sound support for PulseAudio') +else + depends=('gtk2' 'sdl') + makedepends=('nasm') +fi +conflicts=('gens') +options=('!libtool') +source=('http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz' + 'gens-gtk.patch') +sha256sums=('6320cd7bee85472891e1e29b21731d2c8180d04db67ee21256491f3f9ad145c1' + '29b1e9755b34e00ef7d19bdc527dc4f841400a0022c81ee71c331be4a76a6c1c') + +prepare() { + cd "${srcdir}"/${pkgname}-r7 + + patch -Np1 -i ../gens-gtk.patch +} + +build() { + cd "${srcdir}"/${pkgname}-r7 + + if [[ $CARCH == "x86_64" ]]; then + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + if [[ $CARCH == "x86_64" ]]; then + LIBS='-ldl -lX11' ./configure --host=i686-unknown-linux-gnu --prefix=/usr --libdir=/usr/lib32 --with-pic --disable-static + else + LIBS='-ldl -lX11' ./configure --prefix=/usr --with-pic --disable-static + fi + make +} + +package() { + cd "${srcdir}"/${pkgname}-r7 + + if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-gtk2' 'lib32-sdl') + fi + + make DESTDIR="${pkgdir}" install +} + +# vim: ts=2 sw=2 et: diff --git a/multilib-staging/gens-gs/gens-gtk.patch b/multilib-staging/gens-gs/gens-gtk.patch new file mode 100755 index 000000000..0bc6fd0ee --- /dev/null +++ b/multilib-staging/gens-gs/gens-gtk.patch @@ -0,0 +1,187 @@ +diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp +--- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); ++ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)about_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp +--- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); ++ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)bmf_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp +--- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 +@@ -109,7 +109,7 @@ + gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); ++ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(dir_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp +--- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 +@@ -140,7 +140,7 @@ + gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); + gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); ++ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)genopt_window, "delete_event", +@@ -458,11 +458,11 @@ + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0); + + // Dropdown for intro effect. +- cboIntroEffect = gtk_combo_box_new_text(); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect"); +- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. ++ cboIntroEffect = gtk_combo_box_text_new(); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect"); ++ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. + gtk_widget_show(cboIntroEffect); + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0); + g_signal_connect((gpointer)(cboIntroEffect), "changed", +diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp +--- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 +@@ -154,9 +154,9 @@ + GSFT_UNUSED_PARAMETER(y); + GSFT_UNUSED_PARAMETER(user_data); + +- if (context->targets) ++ if (gdk_drag_context_list_targets(context)) + { +- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); ++ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); + gtk_drag_get_data(widget, context, target_type, time); + return true; + } +diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp +--- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 +@@ -75,7 +75,7 @@ + gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); ++ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(glres_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp +--- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 +@@ -80,8 +80,7 @@ + // Callbacks. + static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); + static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data); ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); + static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); + static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); + +@@ -119,7 +118,7 @@ + gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); ++ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)pmgr_window, "delete_event", +@@ -559,11 +558,9 @@ + * @param page_num New notebook page index. + * @param user_data User data. + */ +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data) ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) + { + GSFT_UNUSED_PARAMETER(notebook); +- GSFT_UNUSED_PARAMETER(page); + GSFT_UNUSED_PARAMETER(user_data); + + // Activate the "cursor-changed" callback for the page. +diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp +--- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 +@@ -94,7 +94,7 @@ + gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); ++ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(selcd_window), "delete_event", +@@ -128,7 +128,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0); + + // Create the dropdown for the CD-ROM device name. +- cboDeviceName = gtk_combo_box_entry_new_text(); ++ cboDeviceName = gtk_combo_box_text_new_with_entry(); + gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63); + gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName); + gtk_widget_show(cboDeviceName); +@@ -156,7 +156,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0); + + // Create the dropdown for the CD-ROM drive speed selection. +- cboDriveSpeed = gtk_combo_box_new_text(); ++ cboDriveSpeed = gtk_combo_box_text_new(); + char tmpSpeed[16]; + for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++) + { +@@ -167,7 +167,7 @@ + else + szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]); + +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed); + } + gtk_widget_show(cboDriveSpeed); + gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0); +@@ -252,7 +252,7 @@ + continue; + + // Add the device file. +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName); + } + } + +diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp +--- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 +@@ -111,7 +111,7 @@ + gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); ++ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); + + // Add the window icon. + GList *icon_list = NULL; diff --git a/multilib-staging/lib32-gtk2/PKGBUILD b/multilib-staging/lib32-gtk2/PKGBUILD new file mode 100644 index 000000000..3e303e874 --- /dev/null +++ b/multilib-staging/lib32-gtk2/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 89396 2013-04-29 08:14:33Z alucryd $ +# Maintainer: Ionut Biru +# Contributor: Mikko Seppälä + +_pkgbasename=gtk2 +pkgname=lib32-$_pkgbasename +pkgver=2.24.17 +pkgrel=2 +pkgdesc="The GTK+ Toolkit (v2) (32-bit)" +arch=('x86_64') +url="http://www.gtk.org/" +install=gtk2.install +depends=(lib32-{'atk>=1.30.0','pango>=1.28.0','cairo>=1.10.0','gdk-pixbuf2>=2.22.1'} + lib32-lib{'cups>=1.4.4',xcursor,'xrandr>=1.3','xi>=1.3',xinerama,xcomposite,xdamage} + $_pkgbasename) +makedepends=('pkgconfig' 'gcc-multilib') +options=('!libtool' '!docs') +license=('LGPL') +source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${pkgver}.tar.xz + xid-collision-debug.patch + gtk-modules-32.patch) +sha256sums=('e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' + '2effb13404442ae266d4c663347e88cd1ca19e9a83b452da1743bac16af9c7b0') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/gtk+-${pkgver}" + patch -Np1 -i "${srcdir}/xid-collision-debug.patch" + patch -p1 -i ${srcdir}/gtk-modules-32.patch + + CXX=/bin/false ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libdir=/usr/lib32 \ + --with-xinput=yes + + #https://bugzilla.gnome.org/show_bug.cgi?id=655517 + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + + make +} + +package() { + cd "${srcdir}/gtk+-${pkgver}" + make DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/etc + rm -rf "${pkgdir}"/usr/{include,share} + + cd "${pkgdir}"/usr/bin + mv gtk-query-immodules-2.0 gtk-query-immodules-2.0-32 + rm -f gtk-builder-convert gtk-demo gtk-update-icon-cache +} diff --git a/multilib-staging/lib32-gtk2/gtk-modules-32.patch b/multilib-staging/lib32-gtk2/gtk-modules-32.patch new file mode 100644 index 000000000..a2530c3bf --- /dev/null +++ b/multilib-staging/lib32-gtk2/gtk-modules-32.patch @@ -0,0 +1,12 @@ +diff -ur gtk+-2.20.1/gtk/gtkrc.c gtk+-2.20.1-32/gtk/gtkrc.c +--- gtk+-2.20.1/gtk/gtkrc.c 2010-05-03 01:28:21.000000000 +0200 ++++ gtk+-2.20.1-32/gtk/gtkrc.c 2010-08-26 07:22:42.316920033 +0200 +@@ -450,7 +450,7 @@ + if (im_module_file) + result = g_strdup (im_module_file); + else +- result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules", NULL); ++ result = g_build_filename (GTK_SYSCONFDIR, "gtk-2.0", "gtk.immodules-32", NULL); + } + + return result; diff --git a/multilib-staging/lib32-gtk2/gtk2.install b/multilib-staging/lib32-gtk2/gtk2.install new file mode 100644 index 000000000..49f86f550 --- /dev/null +++ b/multilib-staging/lib32-gtk2/gtk2.install @@ -0,0 +1,16 @@ +post_install() { + GTK_PATH=/usr/lib32/gtk-2.0 usr/bin/gtk-query-immodules-2.0-32 > etc/gtk-2.0/gtk.immodules-32 +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f etc/gtk-2.0/gtk.immodules-32 &>/dev/null + rm -f etc/gtk-2.0/gdk-pixbuf.loaders-32 &>/dev/null +} diff --git a/multilib-staging/lib32-gtk2/xid-collision-debug.patch b/multilib-staging/lib32-gtk2/xid-collision-debug.patch new file mode 100644 index 000000000..d61238c3b --- /dev/null +++ b/multilib-staging/lib32-gtk2/xid-collision-debug.patch @@ -0,0 +1,15 @@ +--- gtk+-2.18.3/gdk/x11/gdkxid.c 2009-06-19 04:59:18.000000000 +0200 ++++ gtk+-2.18.3/gdk/x11/gdkxid.c.new 2009-07-22 11:30:12.000000000 +0200 +@@ -56,10 +56,10 @@ + if (!display_x11->xid_ht) + display_x11->xid_ht = g_hash_table_new ((GHashFunc) gdk_xid_hash, + (GEqualFunc) gdk_xid_equal); +- ++/* + if (g_hash_table_lookup (display_x11->xid_ht, xid)) + g_warning ("XID collision, trouble ahead"); +- ++*/ + g_hash_table_insert (display_x11->xid_ht, xid, data); + } + diff --git a/multilib-staging/lib32-pango/PKGBUILD b/multilib-staging/lib32-pango/PKGBUILD new file mode 100644 index 000000000..74a1b1fc4 --- /dev/null +++ b/multilib-staging/lib32-pango/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 89394 2013-04-29 08:13:56Z alucryd $ +# Contributor: Pierre Schmitz +# Contributor: Mikko Seppälä +# Maintainer: Biru Ionut + +_pkgbasename=pango +pkgname=lib32-$_pkgbasename +pkgver=1.34.0 +pkgrel=2 +pkgdesc="A library for layout and rendering of text (32-bit)" +arch=('x86_64') +license=('LGPL') +makedepends=("gcc-multilib" 'lib32-fontconfig' \ + 'lib32-mesa-libgl' 'lib32-cairo' 'lib32-libxft' 'lib32-harfbuzz' $_pkgbasename) +options=('!libtool' '!emptydirs') +install=pango.install +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgbasename}/${pkgver:0:4}/${_pkgbasename}-${pkgver}.tar.xz) +url="http://www.pango.org/" +sha256sums=('105da1efe019018a9de81681d88c9ace83d2111509ab625c4be9d124a1fdce27') + +prepare() { + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + sed -i 's#"pango.modules"#"pango.modules-32"#' pango/modules.c +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + ./configure --prefix=/usr --libdir=/usr/lib32 --sysconfdir=/etc \ + --localstatedir=/var --with-included-modules=basic-fc \ + --with-dynamic-modules=arabic-fc,arabic-lang,basic-fc,basic-win32,basic-x,basic-atsui,hangul-fc,hebrew-fc,indic-fc,indic-lang,khmer-fc,syriac-fc,tibetan-fc \ + --disable-introspection + make +} + +package() { + depends=('lib32-cairo' 'lib32-libxft' 'lib32-harfbuzz' $_pkgbasename) + cd "${srcdir}/${_pkgbasename}-${pkgver}" + + make DESTDIR="${pkgdir}" install + rm -rf "$pkgdir"/etc + rm -rf "$pkgdir"/usr/{bin/pango-view,share,include} + mv "$pkgdir"/usr/bin/pango-querymodules "$pkgdir"/usr/bin/pango-querymodules-32 +} diff --git a/multilib-staging/lib32-pango/pango.install b/multilib-staging/lib32-pango/pango.install new file mode 100644 index 000000000..173b6820f --- /dev/null +++ b/multilib-staging/lib32-pango/pango.install @@ -0,0 +1,21 @@ +# arg 1: the new package version +post_install() { + # we need to ldconfig first, in case xfree86's libs aren't + # in ld.so.cache yet + sbin/ldconfig -r . + usr/bin/pango-querymodules-32 >etc/pango/pango.modules-32 +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ -f etc/pango/pango.modules-32 ]; then + rm etc/pango/pango.modules-32 + fi + post_install $1 +} + +# arg 1: the old package version +pre_remove() { + rm etc/pango/pango.modules-32 +} diff --git a/multilib-staging/lib32-wxgtk/PKGBUILD b/multilib-staging/lib32-wxgtk/PKGBUILD new file mode 100755 index 000000000..105cde328 --- /dev/null +++ b/multilib-staging/lib32-wxgtk/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 89392 2013-04-29 08:12:47Z alucryd $ +# Maintainer: Maxime Gauduin +# Contributor: Limao Luo +# Contributor: Devin Cofer +# Contributor: Yggdrasil +# Contributor: Eric Belanger +# Contributor: Tom Newsom +# Contributor: Bob Finch +# Contributor: J. Santiago "Angelus" Hirschfeld + +pkgname=lib32-wxgtk +pkgver=2.8.12.1 +pkgrel=5 +pkgdesc="GTK+ implementation of wxWidgets API for GUI (lib32)" +arch=('x86_64') +url="http://wxwidgets.org/" +license=('custom:wxWindows') +makedepends=('lib32-gstreamer0.10-base-plugins' 'lib32-gtk2' 'lib32-mesa' 'lib32-glu' 'lib32-libxt' 'lib32-libsm' 'lib32-sdl' 'lib32-mesa-libgl') +source=("http://downloads.sourceforge.net/wxpython/wxPython-src-${pkgver}.tar.bz2") +sha256sums=('1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0') + +build() { + cd "${srcdir}"/wxPython-src-${pkgver} + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --prefix=/usr --libdir=/usr/lib32 --with-{gtk=2,libjpeg=sys,libpng=sys,libtiff=sys,libxpm=sys,opengl,regex=builtin,sdl} --enable-{graphics_ctx,unicode} --disable-{mediactrl,optimize,precomp-headers} + make + make -C locale allmo + make -C contrib/src +} + +package() { + depends=('lib32-gtk2' 'lib32-gstreamer0.10-base' 'lib32-libsm' 'lib32-sdl' "${pkgname#*-}") + + cd "${srcdir}"/wxPython-src-${pkgver} + + make DESTDIR="${pkgdir}" install + make -C contrib/src DESTDIR="${pkgdir}" install + rm -rf "${pkgdir}"/usr/{include,share,bin/wxrc} + mv "${pkgdir}"/usr/bin/wx-config{,32} + mv "${pkgdir}"/usr/bin/wxrc{,32}-2.8 + + install -dm 755 "${pkgdir}"/usr/share/licenses + ln -s ${pkgname#*-} "${pkgdir}"/usr/share/licenses/${pkgname} +} + +# vim: ts=2 sw=2 et: diff --git a/pcr/mosquitto/PKGBUILD b/pcr/mosquitto/PKGBUILD index 0a7209f0b..652e75691 100644 --- a/pcr/mosquitto/PKGBUILD +++ b/pcr/mosquitto/PKGBUILD @@ -1,23 +1,24 @@ # This is the PKGBUILD for mosquitto, an MQTT broker and example clients -# Maintainer: Dan Anderson -# Contributor: Gordon JC Pearce +# Maintainer: Alexander Rust +# Contributor: Dan Anderson pkgname=mosquitto -pkgver=1.1 -pkgrel=1 -pkgdesc="An MQTT broker and clients" -arch=(i686 x86_64 mips64el) +pkgver=1.1.3 +pkgrel=2 +pkgdesc="An Open Source MQTT v3.1 Broker" +arch=('i686' 'x86_64' 'arm' 'armv6h' 'mips64el') url="http://mosquitto.org/" makedepends=('python') optdepends=('python: python support') license=('BSD') -source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('ab51f64eb3f0041402073aa7865f3ec4' - '76fbc38a2eb0b8110caf7ac1f43d4057') +source=(http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz{,.asc} "$pkgname.service" ) +md5sums=('fd0cae17221d778b0a002c31e6c3de9e' + 'SKIP' + 'b7cdd7a65d9a7ac5a8c2456f4b1f2d8f') build() { cd "$srcdir/$pkgname-$pkgver" -# Remove hardcoded prefix + #Remove hardcoded prefix find -name Makefile -exec sed '/prefix=/d' -i {} \; make prefix=/usr @@ -26,7 +27,11 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" make prefix=/usr DESTDIR="$pkgdir/" install - + + # Systemd service file + install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service + + # License files install -Dm644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE install -Dm644 LICENSE-3rd-party.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE-3rd-party } diff --git a/pcr/mosquitto/mosquitto.service b/pcr/mosquitto/mosquitto.service new file mode 100644 index 000000000..7e9ef7cc8 --- /dev/null +++ b/pcr/mosquitto/mosquitto.service @@ -0,0 +1,22 @@ +# This file is part of systemd. +# +# systemd 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. + +[Unit] +Description=Mosquitto MQTT Broker daemon +ConditionPathExists=/etc/mosquitto/mosquitto.conf +Requires=network.target + +[Service] +Type=forking +ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -d +ExecStartPre=/bin/rm -f /var/run/mosquitto.pid +PIDFile=/var/run/mosquitto.pid +Restart=on-abort + +[Install] +WantedBy=multi-user.target + -- cgit v1.2.3-54-g00ecf From 1b05006cb143959d080a200fe11891c9f5caf32c Mon Sep 17 00:00:00 2001 From: root Date: Wed, 1 May 2013 00:10:22 -0700 Subject: Wed May 1 00:10:21 PDT 2013 --- community/cinnamon-screensaver/PKGBUILD | 8 +- .../fix-dbus-compatibility.patch | 170 - community/cinnamon/PKGBUILD | 6 +- community/cinnamon/gnome-3.8.patch | 2 +- community/gtkpod/PKGBUILD | 9 +- community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch | 27 +- community/linux-tools/PKGBUILD | 7 +- community/mksh/PKGBUILD | 11 +- community/nemiver/PKGBUILD | 7 +- community/nemiver/nemiver.install | 14 + community/nemo/PKGBUILD | 10 +- community/pdns-recursor/PKGBUILD | 25 +- community/pdns-recursor/pdns-recursor.rc | 35 - community/rawtherapee/PKGBUILD | 4 +- extra/gparted/PKGBUILD | 6 +- extra/gstreamer0.10/PKGBUILD | 23 +- ...remove-silly-test_fail_abstract_new-check.patch | 60 + extra/live-media/PKGBUILD | 6 +- extra/mkvtoolnix/PKGBUILD | 8 +- extra/tcpdump/PKGBUILD | 6 +- libre-testing/linux-libre-firmware/PKGBUILD | 49 + libre-testing/linux-libre-kmod-alx/PKGBUILD | 42 + .../linux-libre-kmod-alx.install | 32 + libre-testing/linux-libre/ChangeLog | 35 + libre-testing/linux-libre/Kbuild | 19 + libre-testing/linux-libre/Kbuild.platforms | 6 + libre-testing/linux-libre/PKGBUILD | 409 + libre-testing/linux-libre/boot-logo.patch | 23163 +++++++++++++++++++ .../change-default-console-loglevel.patch | 12 + libre-testing/linux-libre/config.i686 | 6255 +++++ libre-testing/linux-libre/config.x86_64 | 6051 +++++ libre-testing/linux-libre/linux-libre.install | 69 + libre-testing/linux-libre/linux-libre.preset | 14 + libre/abiword-libre/PKGBUILD | 8 +- libre/linux-libre-tools/PKGBUILD | 4 +- libre/texlive-core-libre/PKGBUILD | 2 +- libre/texlive-fontsextra-libre/PKGBUILD | 2 +- libre/texlive-latexextra-libre/PKGBUILD | 2 +- pcr/uftp/PKGBUILD | 22 + pcr/xf86-input-wizardpen/PKGBUILD | 43 + 40 files changed, 36395 insertions(+), 288 deletions(-) create mode 100644 community/nemiver/nemiver.install delete mode 100644 community/pdns-recursor/pdns-recursor.rc create mode 100644 extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch create mode 100644 libre-testing/linux-libre-firmware/PKGBUILD create mode 100644 libre-testing/linux-libre-kmod-alx/PKGBUILD create mode 100644 libre-testing/linux-libre-kmod-alx/linux-libre-kmod-alx.install create mode 100644 libre-testing/linux-libre/ChangeLog create mode 100644 libre-testing/linux-libre/Kbuild create mode 100644 libre-testing/linux-libre/Kbuild.platforms create mode 100644 libre-testing/linux-libre/PKGBUILD create mode 100644 libre-testing/linux-libre/boot-logo.patch create mode 100644 libre-testing/linux-libre/change-default-console-loglevel.patch create mode 100644 libre-testing/linux-libre/config.i686 create mode 100644 libre-testing/linux-libre/config.x86_64 create mode 100644 libre-testing/linux-libre/linux-libre.install create mode 100644 libre-testing/linux-libre/linux-libre.preset create mode 100644 pcr/uftp/PKGBUILD create mode 100644 pcr/xf86-input-wizardpen/PKGBUILD (limited to 'community/nemo/PKGBUILD') diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD index 6b80d2ca0..c219bb0de 100644 --- a/community/cinnamon-screensaver/PKGBUILD +++ b/community/cinnamon-screensaver/PKGBUILD @@ -4,8 +4,8 @@ # Jan de Groot pkgname=cinnamon-screensaver -pkgver=1.7.1 -pkgrel=6 +pkgver=1.7.2 +pkgrel=1 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." arch=('i686' 'x86_64') license=('GPL') @@ -20,12 +20,12 @@ source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensav cinnamon-screensaver.pam configure.patch fix-dbus-compatibility.patch) -sha256sums=('055abbc24305dad5efa609b354e01fdc367792ccac5383df4b28090ab0bf64e1' +sha256sums=('c04d2c9c85729b5ae5635202b89084ea23e5211c50cf2dcce11869ffb2acce9f' '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa' '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a' 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' 'fed5f1f94404fab13c5369f4106b0b498cff2bb71351cae4f3d9c27f417f5e6a' - '50fa77bafc666f1aa32945a6d06d4e7c5e50bce1d98738de74075fb634cf6197') + 'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6') build() { cd $pkgname-$pkgver diff --git a/community/cinnamon-screensaver/fix-dbus-compatibility.patch b/community/cinnamon-screensaver/fix-dbus-compatibility.patch index d4c27a0b1..3d70a79d0 100644 --- a/community/cinnamon-screensaver/fix-dbus-compatibility.patch +++ b/community/cinnamon-screensaver/fix-dbus-compatibility.patch @@ -147,173 +147,3 @@ index faff26c..c9f95ba 100644 -- 1.8.1.6 - -From 7141e8ce04921ab6d46648cba20c691b8d8f8e0b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= -Date: Sat, 2 Mar 2013 08:11:45 +0100 -Subject: [PATCH 3/4] Revert "Fixed away_message shown as "(null)" (using a - prefix to explicitly mark custom away messages)" - -This reverts commit bf1f42b9f9a673091b0f7bf1118781b2d95c88fd. ---- - src/cinnamon-screensaver-command.c | 9 +------- - src/gs-window-x11.c | 43 ++++++++++++-------------------------- - 2 files changed, 14 insertions(+), 38 deletions(-) - -diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c -index 5c90916..dbcac8a 100644 ---- a/src/cinnamon-screensaver-command.c -+++ b/src/cinnamon-screensaver-command.c -@@ -310,14 +310,7 @@ - } - - if (do_lock) { -- if (g_strcmp0 (away_message, "DEFAULT") == 0) { -- reply = screensaver_send_message_string (connection, "LockMessage", away_message); -- } -- else { -- gchar * custom_message = g_strdup_printf("CUSTOM###%s", away_message); -- reply = screensaver_send_message_string (connection, "LockMessage", custom_message); -- g_free (custom_message); -- } -+ reply = screensaver_send_message_string (connection, "LockMessage", away_message); - if (reply == NULL) { - g_message ("Did not receive a reply from the screensaver."); - goto done; -diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c -index 6858509..0e3bb6f 100644 ---- a/src/gs-window-x11.c -+++ b/src/gs-window-x11.c -@@ -2132,38 +2132,21 @@ enum { - return utf8_name; - } - --static gchar * --str_replace(const char *string, const char *delimiter, const char *replacement) --{ -- gchar **split; -- gchar *ret; -- g_return_val_if_fail(string != NULL, NULL); -- g_return_val_if_fail(delimiter != NULL, NULL); -- g_return_val_if_fail(replacement != NULL, NULL); -- split = g_strsplit(string, delimiter, 0); -- ret = g_strjoinv(replacement, split); -- g_strfreev(split); -- return ret; --} -- - static void - update_clock (GSWindow *window) --{ -- char *markup; -- char *away_message; -- -- if (window->priv->away_message != NULL && g_str_has_prefix (window->priv->away_message, "CUSTOM###") && g_strcmp0(window->priv->away_message, "") != 0) { -- away_message = str_replace(window->priv->away_message, "CUSTOM###", ""); -- away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), away_message); -- } -- else { -- away_message = g_strdup_printf (_("%s"), window->priv->default_message); -- } -- -- markup = g_strdup_printf ("%s\n%s", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message); -- gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup); -- g_free (markup); -- g_free (away_message); -+{ -+ char *markup; -+ char *away_message; -+ if (g_strcmp0(window->priv->away_message, "DEFAULT") == 0 || g_strcmp0(window->priv->away_message, "") == 0) { -+ away_message = g_strdup_printf (_("%s"), window->priv->default_message); -+ } -+ else { -+ away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), window->priv->away_message); -+ } -+ markup = g_strdup_printf ("%s\n%s", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message); -+ gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup); -+ g_free (markup); -+ g_free (away_message); - } - - static void --- -1.8.1.6 - - -From 1ed6a959746e115a7f33de2134921c6572185ebd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= -Date: Sat, 2 Mar 2013 08:13:04 +0100 -Subject: [PATCH 4/4] Simplify away message handling - ---- - src/cinnamon-screensaver-command.c | 19 ++++++++++++------- - src/gs-window-x11.c | 7 +++---- - 2 files changed, 15 insertions(+), 11 deletions(-) - -diff --git a/src/cinnamon-screensaver-command.c b/src/cinnamon-screensaver-command.c -index dbcac8a..4836f81 100644 ---- a/src/cinnamon-screensaver-command.c -+++ b/src/cinnamon-screensaver-command.c -@@ -41,7 +41,7 @@ - static gboolean do_query = FALSE; - static gboolean do_time = FALSE; - --static gchar *away_message = "DEFAULT"; -+static gchar *away_message; - - static GOptionEntry entries [] = { - { "exit", 0, 0, G_OPTION_ARG_NONE, &do_quit, -@@ -114,7 +114,7 @@ - static GDBusMessage * - screensaver_send_message_string (GDBusConnection *connection, - const char *name, -- gboolean value) -+ gchar *value) - { - GDBusMessage *message, *reply; - GError *error; -@@ -310,12 +310,17 @@ - } - - if (do_lock) { -- reply = screensaver_send_message_string (connection, "LockMessage", away_message); -- if (reply == NULL) { -- g_message ("Did not receive a reply from the screensaver."); -- goto done; -+ if (away_message) { -+ reply = screensaver_send_message_string (connection, "LockMessage", away_message); -+ if (reply == NULL) { -+ g_message ("Did not receive a reply from the screensaver."); -+ goto done; -+ } -+ g_object_unref (reply); -+ } else { -+ reply = screensaver_send_message_void (connection, "Lock", FALSE); -+ g_assert (reply == NULL); - } -- g_object_unref (reply); - } - - if (do_activate) { -diff --git a/src/gs-window-x11.c b/src/gs-window-x11.c -index 0e3bb6f..22f5471 100644 ---- a/src/gs-window-x11.c -+++ b/src/gs-window-x11.c -@@ -2137,11 +2137,10 @@ enum { - { - char *markup; - char *away_message; -- if (g_strcmp0(window->priv->away_message, "DEFAULT") == 0 || g_strcmp0(window->priv->away_message, "") == 0) { -- away_message = g_strdup_printf (_("%s"), window->priv->default_message); -- } -- else { -+ if (window->priv->away_message && g_strcmp0(window->priv->away_message, "") != 0) { - away_message = g_strdup_printf (_("%s: \"%s\""), get_user_display_name(), window->priv->away_message); -+ } else { -+ away_message = g_strdup_printf (_("%s"), window->priv->default_message); - } - markup = g_strdup_printf ("%s\n%s", gnome_wall_clock_get_clock (window->priv->clock_tracker), away_message); - gtk_label_set_markup (GTK_LABEL (window->priv->clock), markup); --- -1.8.1.6 - diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 370a97288..e8f4bd286 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89378 2013-04-29 01:43:41Z bgyorgy $ +# $Id: PKGBUILD 89546 2013-04-29 22:36:26Z bgyorgy $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.7.7 -pkgrel=1 +pkgrel=2 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -33,7 +33,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ md5sums=('a0ed2648d1d95edeac2e45e2c11508fe' '2b1ece84416c3e4de030be15f1774d82' 'c3f25b06d345d9d36c197cd96e08f496' - '5136c2901dfda09e8b969a8b62b59209' + '75c7e0d8d0e6fc4861753ce27e0438c8' '3880fa4c5234771644e5b57a1ade4456' '0dac5a546bf16921a4fdde8525366a24') diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch index f27131aa5..e455a835e 100644 --- a/community/cinnamon/gnome-3.8.patch +++ b/community/cinnamon/gnome-3.8.patch @@ -3952,7 +3952,7 @@ index c8427ac..a7b2e09 100644 } else { - cover_path = decodeURIComponent(this._trackCoverFile.substr(7)); -+ cover_path = decodeURIComponent(this._trackCoverFile; ++ cover_path = decodeURIComponent(this._trackCoverFile); + cover_path = cover_path.replace("file://", ""); this._showCover(cover_path); } diff --git a/community/gtkpod/PKGBUILD b/community/gtkpod/PKGBUILD index 1bc9d7f70..795c9eeff 100644 --- a/community/gtkpod/PKGBUILD +++ b/community/gtkpod/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86099 2013-03-12 01:19:40Z cinelli $ +# $Id: PKGBUILD 89564 2013-04-30 05:59:32Z cinelli $ # Maintainer: Federico Cinelli # Contributor: Kevin Piche # Contributor: Aaron Griffin pkgname=gtkpod pkgver=2.1.3 -pkgrel=2 +pkgrel=3 pkgdesc="A platform independent GUI for Apple's iPod using GTK3" arch=('i686' 'x86_64') url="http://gtkpod.sourceforge.net" @@ -20,9 +20,9 @@ optdepends=('libmp4v2: MP4/h264 support' install=gtkpod.install options=('!libtool') source=("http://downloads.sourceforge.net/gtkpod/$pkgname-$pkgver.tar.gz" - gtkpod-2.1.3-gdl-3.6.patch) + gtkpod-2.1.3-gdl-3.6.patch) md5sums=('57f04578de6e3262a436ec574422b144' - '8d725015081bd89bc8f9a4521d170aef') + '94a4cc0b47ba8895c0a51e53e94da517') build() { cd "$srcdir/$pkgname-$pkgver" @@ -36,6 +36,5 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install } diff --git a/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch b/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch index b794fa11b..109ec08a9 100644 --- a/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch +++ b/community/gtkpod/gtkpod-2.1.3-gdl-3.6.patch @@ -1,7 +1,7 @@ -Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c +Index: gtkpod-2.1.3/src/anjuta-action-callbacks.c =================================================================== ---- gtkpod-2.1.2.orig/src/anjuta-action-callbacks.c -+++ gtkpod-2.1.2/src/anjuta-action-callbacks.c +--- gtkpod-2.1.3.orig/src/anjuta-action-callbacks.c ++++ gtkpod-2.1.3/src/anjuta-action-callbacks.c @@ -65,7 +65,7 @@ void on_layout_lock_toggle (GtkAction *action, AnjutaApp *app) { @@ -11,10 +11,10 @@ Index: gtkpod-2.1.2/src/anjuta-action-callbacks.c gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)), NULL); } -Index: gtkpod-2.1.2/src/anjuta-app.c +Index: gtkpod-2.1.3/src/anjuta-app.c =================================================================== ---- gtkpod-2.1.2.orig/src/anjuta-app.c -+++ gtkpod-2.1.2/src/anjuta-app.c +--- gtkpod-2.1.3.orig/src/anjuta-app.c ++++ gtkpod-2.1.3/src/anjuta-app.c @@ -252,7 +252,7 @@ static void on_gdl_style_changed(GSettin else if (g_strcmp0(pr_style, "Tabs") == 0) style = GDL_SWITCHER_STYLE_TABS; @@ -42,3 +42,18 @@ Index: gtkpod-2.1.2/src/anjuta-app.c G_CALLBACK (on_layout_locked_notify), app); /* UI engine */ +Index: gtkpod-2.1.3/src/gtkpod.c +=================================================================== +--- gtkpod-2.1.3.orig/src/gtkpod.c ++++ gtkpod.2.1.3/src/gtkpod.c +@@ -235,8 +235,8 @@ void + session_dir = get_user_session_dir(); + anjuta_shell_session_save(ANJUTA_SHELL(app), session_dir, NULL); + g_free(session_dir); +- +- anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL); ++ ++ /* anjuta_shell_notify_exit(ANJUTA_SHELL(app), NULL); */ + + if (!gtkpod_cleanup_quit()) { + // Dont want to quit so avoid signalling any destroy event diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index eabf6a865..e554c877b 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 84542 2013-02-19 19:20:50Z seblu $ +# $Id: PKGBUILD 89638 2013-04-30 19:20:26Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools @@ -8,7 +8,7 @@ pkgname=('linux-tools-meta' 'cpupower' 'x86_energy_perf_policy' 'usbip') -pkgver=3.8 +pkgver=3.9 pkgrel=1 license=('GPL2') arch=('i686' 'x86_64') @@ -30,7 +30,8 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" 'cpupower.systemd' 'cpupower.service' 'usbipd.service') -sha256sums=('e070d1bdfbded5676a4f374721c63565f1c969466c5a3e214004a136b583184b' +# http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc +sha256sums=('60bc3e64ee5dc778de2cd7cd7640abf518a4c9d4f31b8ed624e16fad53f54541' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD index 97d7cd26b..c7d417081 100644 --- a/community/mksh/PKGBUILD +++ b/community/mksh/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85891 2013-03-08 15:20:48Z ttoepper $ +# $Id: PKGBUILD 89602 2013-04-30 10:04:38Z ttoepper $ # Maintainer: Thorsten Töpper # Contributor: Daniel Hommel pkgname=mksh -pkgver=R44 +pkgver=R45 pkgrel=1 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh' url='https://www.mirbsd.org/mksh.htm' @@ -13,21 +13,20 @@ install=mksh.install source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz" 'https://www.mirbsd.org/TaC-mksh.txt') depends=('gcc-libs') -md5sums=('fe011686319a8c50d5e237fd5e195fd8' - 'bd05936e20d699df5d47e4ad6223c9d4') +md5sums=('d3d90973119ae689d5300b690600e1dc' + '900968b95cd0231053c641428597bacd') build() { cd "$srcdir/$pkgname" sh Build.sh -r -c lto ./test.sh - gzip -n9 mksh.1 } package() { cd "$srcdir/$pkgname" install -D -m 755 mksh "$pkgdir/bin/mksh" - install -D -m 644 mksh.1.gz "$pkgdir/usr/share/man/man1/mksh.1.gz" + install -D -m 644 mksh.1 "$pkgdir/usr/share/man/man1/mksh.1" install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc" install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt" } diff --git a/community/nemiver/PKGBUILD b/community/nemiver/PKGBUILD index 1c36a5330..daa32c433 100644 --- a/community/nemiver/PKGBUILD +++ b/community/nemiver/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 88693 2013-04-21 22:17:15Z heftig $ +# $Id: PKGBUILD 89588 2013-04-30 08:28:34Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: jordz pkgname=nemiver pkgver=0.9.4 -pkgrel=2 +pkgrel=3 pkgdesc='C/C++ debugger for GNOME' arch=('x86_64' 'i686') license=('GPL') url='http://www.gnome.org/projects/nemiver/' +install="$pkgname.install" depends=('gdlmm' 'gdb' 'gtksourceviewmm' 'libgtop' 'vte3' 'ghex' 'dconf' 'gsettings-desktop-schemas') makedepends=('boost' 'intltool' 'itstool') source=("http://ftp.acc.umu.se/pub/GNOME/sources/nemiver/0.9/$pkgname-$pkgver.tar.xz") @@ -27,8 +28,8 @@ build() { --disable-scrollkeeper \ --enable-symsvis=yes \ --enable-memoryview=yes \ - --disable-schemas-compile \ --enable-gsettings=yes +# --disable-schemas-compile \ make } diff --git a/community/nemiver/nemiver.install b/community/nemiver/nemiver.install new file mode 100644 index 000000000..aabb4b360 --- /dev/null +++ b/community/nemiver/nemiver.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 +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 20dcea195..774a2a350 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89376 2013-04-29 01:33:47Z bgyorgy $ +# $Id: PKGBUILD 89644 2013-04-30 21:20:15Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') @@ -18,9 +18,9 @@ install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "tracker-0.16.patch" "remove-desktop-background.patch") -md5sums=('fc5595a2489ed28f274c5f79ce95d5de' - '9e170cc74eee901634b3367b06a209c6' - 'f10af52377e44e1efe8ec4934aa4d4d2') +sha256sums=('d7937ddeb6e9fe1da1283ff306fbb32e6554701d629b63232cbb0a5a9268c99d' + '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' + '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') build() { cd linuxmint-nemo-* diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD index 19e4172e7..5632e27d2 100644 --- a/community/pdns-recursor/PKGBUILD +++ b/community/pdns-recursor/PKGBUILD @@ -1,39 +1,36 @@ -# $Id: PKGBUILD 81192 2012-12-12 22:04:27Z arodseth $ +# $Id: PKGBUILD 89549 2013-04-29 23:06:17Z arodseth $ # Maintainer: Alexander Rødseth # Contributor: Jan de Groot +# Contributor: Jan Steffens pkgname=pdns-recursor -pkgver=3.3 -pkgrel=6 +pkgver=3.5 +pkgrel=1 pkgdesc='PowerDNS recursor' -url='http://www.powerdns.com' +url='https://www.powerdns.com/' license=('GPL') arch=('x86_64' 'i686') -depends=('gcc-libs') # 'lua') +depends=('gcc-libs' 'lua51') makedepends=('boost') backup=('etc/powerdns/recursor.conf') source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2" - 'pdns-recursor.rc' - 'pdns-recursor.service') -sha256sums=('7b62d97f2bb02bb0ba366dabb5e504338b949a572b9062ec2198012fc3b525bc' - '7ff45a2da128e82da409f123f8346cc085b57337d6d44a9fd76d17024898b1ca' + 'pdns-recursor.service') +sha256sums=('02ea398aa0e95ef4c9caf478eb3836598eabcd5c99ccb7e2e7c265d716089549' 'c5849127cb42b578ff4c38ee6ad39e109bb749ce8b0147ac3619af90803b6875') build() { cd "$srcdir/$pkgname-$pkgver" - # Disabled Lua while waiting for upstream support for lua 5.2 - #LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make - LUA=0 make + make LUA=1 \ + LUA_CPPFLAGS_CONFIG="$(pkg-config --cflags lua5.1)" \ + LUA_LIBS_CONFIG="$(pkg-config --libs lua5.1)" } package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - install -d -m755 "$pkgdir/etc/rc.d" mv "$pkgdir/etc/powerdns/recursor.conf-dist" "$pkgdir/etc/powerdns/recursor.conf" - install -m755 "$srcdir/pdns-recursor.rc" "$pkgdir/etc/rc.d/pdns-recursor" rm -r "$pkgdir/etc/init.d" install -Dm644 "$srcdir/pdns-recursor.service" \ "$pkgdir/usr/lib/systemd/system/pdns-recursor.service" diff --git a/community/pdns-recursor/pdns-recursor.rc b/community/pdns-recursor/pdns-recursor.rc deleted file mode 100644 index 992f0b086..000000000 --- a/community/pdns-recursor/pdns-recursor.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting PowerDNS recursor" - ! /usr/sbin/rec_control ping > /dev/null 2>&1 && /usr/sbin/pdns_recursor --daemon - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon pdns-recursor - stat_done - fi - ;; - stop) - stat_busy "Stopping PowerDNS recursor" - rec_control quit > /dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pdns-recursor - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/rawtherapee/PKGBUILD b/community/rawtherapee/PKGBUILD index 516d46507..635aab692 100644 --- a/community/rawtherapee/PKGBUILD +++ b/community/rawtherapee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 89541 2013-04-29 19:53:51Z stativ $ +# $Id: PKGBUILD 89596 2013-04-30 09:32:32Z bpiotrowski $ # Maintainer: Lukas Jirkovsky # Contributor: Bogdan Szczurek # Contributor: Vaclav Kramar @@ -6,7 +6,7 @@ pkgname=rawtherapee pkgver=4.0.10 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="RAW photo editor" arch=('i686' 'x86_64') diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index 90ba19000..326342c20 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183602 2013-04-24 16:54:38Z giovanni $ +# $Id: PKGBUILD 184007 2013-04-30 18:49:43Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Andrew Simmons # Contributor: György Balló pkgname=gparted -pkgver=0.16.0 +pkgver=0.16.1 pkgrel=1 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ optdepends=('dosfstools: for FAT16 and FAT32 partitions' install=gparted.install source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" 'org.archlinux.pkexec.gparted.policy') -md5sums=('880e58673c9ef195181c0d721717a601' +md5sums=('3f399bff031b5ce14d11a8c346f4b89c' 'c031d7d2b845ccb025b9f83e0ddd5653') build() { diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD index 07299a4d7..38deaae91 100644 --- a/extra/gstreamer0.10/PKGBUILD +++ b/extra/gstreamer0.10/PKGBUILD @@ -1,22 +1,27 @@ -# $Id: PKGBUILD 153252 2012-03-12 14:53:39Z jgc $ +# $Id: PKGBUILD 184011 2013-04-30 20:11:04Z jgc $ # Maintainer: Jan de Groot pkgname=gstreamer0.10 pkgver=0.10.36 -pkgrel=1 +pkgrel=2 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64') license=('LGPL') -url="http://gstreamer.freedesktop.org/" +url="http://gstreamer.com" depends=('libxml2' 'glib2') optdepends=('sh: feedback script') -makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') +makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection' 'git') options=('!libtool') -source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -md5sums=('15389c73e091b1dda915279c388b9cb2') +source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=ce96cff8e2bf1772dc330387fa98e94f187fc2ab" + tests-remove-silly-test_fail_abstract_new-check.patch) +sha256sums=('SKIP' + 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52') build() { - cd "${srcdir}/gstreamer-${pkgver}" + cd "${srcdir}/gstreamer" + patch -Np1 -i ../tests-remove-silly-test_fail_abstract_new-check.patch + sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac + NOCONFIGURE=1 ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \ --with-package-name="GStreamer (Archlinux)" \ --with-package-origin="http://www.archlinux.org/" \ @@ -25,12 +30,12 @@ build() { } check() { - cd "${srcdir}/gstreamer-${pkgver}" + cd "${srcdir}/gstreamer" make check } package() { - cd "${srcdir}/gstreamer-${pkgver}" + cd "${srcdir}/gstreamer" make DESTDIR="${pkgdir}" install #Remove unversioned gst-* binaries to get rid of conflicts diff --git a/extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch b/extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch new file mode 100644 index 000000000..7524e8fea --- /dev/null +++ b/extra/gstreamer0.10/tests-remove-silly-test_fail_abstract_new-check.patch @@ -0,0 +1,60 @@ +From 5bff3ba949d2ac0a9946c1240e6d4a5bb53fda99 Mon Sep 17 00:00:00 2001 +From: Tim-Philipp Müller +Date: Wed, 08 Aug 2012 13:49:23 +0000 +Subject: tests: remove silly test_fail_abstract_new check + +Our check would make sure that GLib segfaults when +someone tries to instantiate an abstract type, which +is an extremely useful thing to check for. + +In newer GLibs this is fixed and we get an abort with +a g_error() now it seems, so let's just remove this +check entirely. +--- +(limited to 'tests/check/gst/gstobject.c') + +diff --git a/tests/check/gst/gstobject.c b/tests/check/gst/gstobject.c +index 6f7ccb8..ce2ed3e 100644 +--- a/tests/check/gst/gstobject.c ++++ b/tests/check/gst/gstobject.c +@@ -72,19 +72,6 @@ gst_fake_object_get_type (void) + return fake_object_type; + } + +-#ifndef HAVE_OSX +-/* g_object_new on abstract GstObject should fail */ +-GST_START_TEST (test_fail_abstract_new) +-{ +- GstObject *object; +- +- ASSERT_CRITICAL (object = g_object_new (gst_object_get_type (), NULL)); +- fail_unless (object == NULL, "Created an instance of abstract GstObject"); +-} +- +-GST_END_TEST; +-#endif +- + /* g_object_new on GstFakeObject should succeed */ + GST_START_TEST (test_fake_object_new) + { +@@ -529,18 +516,6 @@ gst_object_suite (void) + tcase_add_test (tc_chain, test_fake_object_has_ancestor); + //tcase_add_checked_fixture (tc_chain, setup, teardown); + +- /* FIXME: GLib shouldn't crash here, but issue a warning and return a NULL +- * object, or at least g_error() and then abort properly ... (tpm) */ +-#ifndef HAVE_OSX +- /* Disabled for OS/X because a) it's a pretty silly test anyway and +- * b) different OS/X versions raise different signals and it isn't worth +- * the effort to try and detect which one should be producing which +- */ +- /* SEGV tests go last so we can debug the others */ +- if (g_getenv ("CK_FORK") == NULL || strcmp (g_getenv ("CK_FORK"), "no") != 0) +- tcase_add_test_raise_signal (tc_chain, test_fail_abstract_new, SIGSEGV); +-#endif +- + return s; + } + +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 5381a9b54..c1e31ef1e 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183838 2013-04-28 08:37:59Z giovanni $ +# $Id: PKGBUILD 184013 2013-04-30 20:28:23Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Gilles CHAUVIN pkgname=live-media -pkgver=2013.04.23 +pkgver=2013.04.29 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('1440933d015689ca400d2a27884aee6f') +md5sums=('9cdb58c0ecc02711388e9cded104aad6') build() { cd ${srcdir}/live diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index be7a24849..4b0a2e4e9 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 181127 2013-03-31 19:16:55Z stephane $ +# $Id: PKGBUILD 184009 2013-04-30 20:08:12Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: xduugu pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=6.1.0 -pkgrel=2 +pkgver=6.2.0 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.xz") -md5sums=('171e241756eb3b6f2e506f8539331fd9') +md5sums=('a09b69f7e17677f1b5bfd15720dd004c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD index db08f1c90..9dd06afab 100644 --- a/extra/tcpdump/PKGBUILD +++ b/extra/tcpdump/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161647 2012-06-13 06:49:09Z giovanni $ +# $Id: PKGBUILD 184005 2013-04-30 18:42:55Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: dorphell pkgname=tcpdump -pkgver=4.3.0 +pkgver=4.4.0 pkgrel=1 pkgdesc="A tool for network monitoring and data acquisition" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('libpcap' 'openssl') source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz" 'tcpdump_duplicate_executable.patch') -md5sums=('a3fe4d30ac85ff5467c889ff46b7e1e8' +md5sums=('6f75aabcffd012f73bd7c331bb5d8232' '96c116e5ed51759a029bb6c236d63178') build() { diff --git a/libre-testing/linux-libre-firmware/PKGBUILD b/libre-testing/linux-libre-firmware/PKGBUILD new file mode 100644 index 000000000..99c54a1b2 --- /dev/null +++ b/libre-testing/linux-libre-firmware/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: André Silva +# Contributor: Márcio Silva + +pkgname=linux-libre-firmware +pkgver=3.9 +pkgrel=1 +pkgdesc='Free firmware files for Linux-libre' +arch=('any') +url='http://linux-libre.fsfla.org/' +license=('GPL2') +provides=('linux-firmware' + 'kernel26-firmware=2.6.34.99') +conflicts=('linux-firmware' + 'linux-firmware-git' + 'kernel26-firmware' + 'ar9170-fw' + 'iwlwifi-1000-ucode' + 'iwlwifi-3945-ucode' + 'iwlwifi-4965-ucode' + 'iwlwifi-5000-ucode' + 'iwlwifi-5150-ucode' + 'iwlwifi-6000-ucode' + 'rt2870usb-fw' + 'rt2x00-rt61-fw' + 'rt2x00-rt71w-fw') +replaces=('linux-firmware' + 'kernel26-firmware' + 'ar9170-fw' + 'iwlwifi-1000-ucode' + 'iwlwifi-3945-ucode' + 'iwlwifi-4965-ucode' + 'iwlwifi-5000-ucode' + 'iwlwifi-5150-ucode' + 'iwlwifi-6000-ucode' + 'rt2870usb-fw' + 'rt2x00-rt61-fw' + 'rt2x00-rt71w-fw') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") +md5sums=('120df29f88622dabf7015a22c7cc8e25') + +package() { + cd $srcdir/linux-$pkgver + + make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install + + # move WHENCE file to linux-firmware license folder + install -d -m755 $pkgdir/usr/share/licenses/$pkgname + mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname +} diff --git a/libre-testing/linux-libre-kmod-alx/PKGBUILD b/libre-testing/linux-libre-kmod-alx/PKGBUILD new file mode 100644 index 000000000..093f42909 --- /dev/null +++ b/libre-testing/linux-libre-kmod-alx/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: André Silva + +_kernver=3.9 +_kernrel=2 +pkgname=('linux-libre-kmod-alx') +_version=v3.9-rc4 +_pkgver=3.9-rc4-2-su +pkgver=3.9rc4.2 +pkgrel=1 +pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' +arch=('i686' 'x86_64') +url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' +license=('GPL2') +depends=("linux-libre=$_kernver-$_kernrel") +makedepends=("linux-libre-headers=$_kernver-$_kernrel") +install=linux-libre-kmod-alx.install +replaces=('alx' 'alx-driver' 'dkms-alx') +provides=('alx' 'alx-driver' 'dkms-alx') +conflicts=('alx' 'alx-driver' 'dkms-alx') +source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_version/compat-drivers-$_pkgver.tar.xz) + +md5sums=('a00e82e212fe7533c9059e5b78cc3c1c') + + +package() { + # current extramodules version + _extraver=extramodules-3.9-LIBRE + + cd $srcdir/compat-drivers-$_pkgver + + # replacing to specific linux-libre kernel version + sed -i -e "s/lib\/modules\/\$(shell uname -r)/usr\/lib\/modules\/3.9.0-$_kernrel-LIBRE/" Makefile + + ./scripts/driver-select alx + make + cd $srcdir/compat-drivers-$_pkgver/compat + gzip -9 compat.ko + install -D -m 0644 compat.ko.gz $pkgdir/lib/modules/$_extraver/compat.ko.gz + cd $srcdir/compat-drivers-$_pkgver/drivers/net/ethernet/atheros/alx + gzip -9 alx.ko + install -D -m 0644 alx.ko.gz $pkgdir/lib/modules/$_extraver/alx.ko.gz +} diff --git a/libre-testing/linux-libre-kmod-alx/linux-libre-kmod-alx.install b/libre-testing/linux-libre-kmod-alx/linux-libre-kmod-alx.install new file mode 100644 index 000000000..069348192 --- /dev/null +++ b/libre-testing/linux-libre-kmod-alx/linux-libre-kmod-alx.install @@ -0,0 +1,32 @@ +generic() { + echo " > Running depmod now..." + depmod -a +} + +unload() { + lsmod | grep alx > /dev/null + if [ "$?" = "0" ]; then + rmmod alx + fi +} + +post_install() { + generic + echo " > Reloading alx module..." + echo " Please note that you may REBOOT your system to get it works!" + unload + sleep 0.5 + modprobe alx +} + +post_upgrade() { + post_install +} + +post_remove() { + generic + echo " > Unloading memory resident module..." + unload + rmmod compat + echo " Module unloaded!." +} diff --git a/libre-testing/linux-libre/ChangeLog b/libre-testing/linux-libre/ChangeLog new file mode 100644 index 000000000..12f517b4f --- /dev/null +++ b/libre-testing/linux-libre/ChangeLog @@ -0,0 +1,35 @@ +2012-04-30 André Silva + + * linux-libre-3.9-2 + * Removed CONFIG_STUB_POULSBO module from config files + + +2012-12-19 André Silva + + * linux-libre-3.7.1-1 + * Replaced CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" to CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" + +2012-06-23 André Silva + + * linux-libre-3.4.4-1 + * Replaced email account andre.paulista@adinet.com.uy to emulatorman@lavabit.com. + +2012-05-26 André Silva + + * linux-libre-3.4-1.2 + * Disabled CONFIG_MICROCODE_INTEL and CONFIG_MICROCODE_AMD modules https://labs.parabola.nu/issues/116 + +2012-04-24 André Silva + + * linux-libre-3.3.3-1 + * Disabled CONFIG_STUB_POULSBO module https://labs.parabola.nu/issues/90 + +2012-04-08 André Silva + + * linux-libre-3.3.1-1.1 + * Disabled CONFIG_IPW2100 and CONFIG_IPW2200 modules https://labs.parabola.nu/issues/47 + +2012-03-03 André Silva + + * linux-libre-2.3.9-2 + * Enabled CONFIG_FB_VT8623 module https://labs.parabola.nu/issues/14 diff --git a/libre-testing/linux-libre/Kbuild b/libre-testing/linux-libre/Kbuild new file mode 100644 index 000000000..8a9d7dceb --- /dev/null +++ b/libre-testing/linux-libre/Kbuild @@ -0,0 +1,19 @@ +# Fail on warnings - also for files referenced in subdirs +# -Werror can be disabled for specific files using: +# CFLAGS_ := -Wno-error +subdir-ccflags-y := -Wno-error + +# platform specific definitions +include arch/mips/Kbuild.platforms +obj-y := $(platform-y) + +# make clean traverses $(obj-) without having included .config, so +# everything ends up here +obj- := $(platform-) + +# mips object files +# The object files are linked as core-y files would be linked + +obj-y += kernel/ +obj-y += mm/ +obj-y += math-emu/ diff --git a/libre-testing/linux-libre/Kbuild.platforms b/libre-testing/linux-libre/Kbuild.platforms new file mode 100644 index 000000000..90a226888 --- /dev/null +++ b/libre-testing/linux-libre/Kbuild.platforms @@ -0,0 +1,6 @@ +# All platforms listed in alphabetic order + +platforms += loongson + +# include the platform specific files +include $(patsubst %, $(srctree)/arch/mips/%/Platform, $(platforms)) diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD new file mode 100644 index 000000000..20a2c797f --- /dev/null +++ b/libre-testing/linux-libre/PKGBUILD @@ -0,0 +1,409 @@ +# $Id: PKGBUILD 183980 2013-04-30 07:21:06Z tpowa $ +# Maintainer: Tobias Powalowski +# Maintainer: Thomas Baechler +# Maintainer (Parabola): Nicolás Reynolds +# Maintainer (Parabola): Sorin-Mihai Vârgolici +# Maintainer (Parabola): André Silva +# Maintainer (Parabola): Michał Masłowski +# Maintainer (Parabola): Márcio Silva + +pkgbase=linux-libre # Build stock -LIBRE kernel +#pkgbase=linux-libre-custom # Build kernel with a different name +_basekernel=3.9 +#_sublevel=10 +#pkgver=${_basekernel}.${_sublevel} +pkgver=${_basekernel} +pkgrel=2 +#_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +arch=('i686' 'x86_64' 'mips64el') +url="http://linux-libre.fsfla.org/" +license=('GPL2') +makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') +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' 'config.x86_64' + # standard config files for mkinitcpio ramdisk + "${pkgbase}.preset" + 'Kbuild' + 'Kbuild.platforms' + 'boot-logo.patch' + 'change-default-console-loglevel.patch') + #"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") +md5sums=('120df29f88622dabf7015a22c7cc8e25' + #'fd9713a31ee671a9dec8ad0e65996c84' + '800a05fd0073ffefe4ac90f0e7f3b195' + '05f671feaa31746483e57b9893dd30fb' + 'e49ac236dfeef709f91a3d993ea7b62c' + '2967cecc3af9f954ccc822fd63dca6ff' + '8267264d9a8966e57fdacd1fa1fc65c4' + '04b21c79df0a952c22d681dd4f4562df' + 'f3def2cefdcbb954c21d8505d23cc83c') + #'259774469ac9b2b1f41cf2f978743055') +#if [ "$CARCH" != "mips64el" ]; then +# # Don't use the Loongson-specific patches on non-mips64el arches. +# unset source[${#source[@]}-1] +# unset md5sums[${#md5sums[@]}-1] +#fi + +_kernelname=${pkgbase#linux-libre} +_localversionname=-LIBRE + +prepare() { + 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" + + # 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" + + if [ "$CARCH" == "mips64el" ]; then + sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile + sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ + < "${srcdir}/lxo-config.patch" > lxo-config.patch + msg2 "Adding loongson-community patches" + patch -Np1 -i ${srcdir}/${_basekernel}*-*-loongson-community.patch + patch -Np0 -i lxo-config.patch + +# ensure N32, add localversion, remove uevent helper as per +# https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README +# and make USB storage support builtin (e.g. for booting from USB +# disks without slowly loading an initramfs) + sed -ri \ + -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \ + -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \ + -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \ + -e "s;(CONFIG_USB(_COMMON|_EHCI_HCD|_OHCI_HCD|_STORAGE.*|_UAS)?)=.*;\1=y;g" \ + ./.config + else + cat "${srcdir}/config.${CARCH}" > ./.config # simpler + fi + + if [ "${_kernelname}" != "" ]; then + sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" ./.config + sed -i "s|CONFIG_LOCALVERSION_AUTO=.*|CONFIG_LOCALVERSION_AUTO=n|" ./.config + fi + + # set extraversion to pkgrel + sed -ri "s|^(EXTRAVERSION =).*|\1 -${pkgrel}|" Makefile + + # don't run depmod on 'make install'. We'll do this ourselves in packaging + sed -i '2iexit 0' scripts/depmod.sh +} + +build() { + cd "${srcdir}/linux-${_basekernel}" + + # 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 + + # rewrite configuration + yes "" | make config >/dev/null + + # save configuration for later reuse + if [ "${CARCH}" = "x86_64" ]; then + cat .config > "${startdir}/config.x86_64.last" + else + cat .config > "${startdir}/config.i686.last" + fi + + #################### + # stop here + # this is useful to configure the kernel + #msg "Stopping build"; return 1 + #################### + + # build! + if [ "$CARCH" == "mips64el" ]; then + # The build system passes it directly to linker, disable to avoid + # having unknown -Wl,... options. + export LDFLAGS="" + # bzImage is arch-specific and not supported on mips; vmlinux is + # useful for oprofile. + make ${MAKEFLAGS} LOCALVERSION= vmlinux vmlinuz modules + else + make ${MAKEFLAGS} LOCALVERSION= bzImage modules + fi +} + +_package() { + pkgdesc="The ${pkgbase} kernel and modules" + [ "${pkgbase}" = "linux-libre" ] && groups=('base') + depends=('coreutils' 'linux-libre-firmware' 'kmod') + optdepends=('crda: to set the correct wireless channels of your country') + provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}") + conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") + replaces=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}") + backup=("etc/mkinitcpio.d/${pkgbase}.preset") + install=${pkgbase}.install + if [ "$CARCH" = "mips64el" ]; then + optdepends+=('mkinitcpio: to make the initramfs (needs reinstall of this package)') + conflicts+=('mkinitcpio<0.7') + else + depends+=('mkinitcpio>=0.7') + fi + + cd "${srcdir}/linux-${_basekernel}" + + KARCH=x86 + [ $CARCH = "mips64el" ] && KARCH=mips + + # get kernel version + _kernver="$(make LOCALVERSION= kernelrelease)" + _basekernel=${_kernver%%-*} + _basekernel=${_basekernel%.*} + + mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} + make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install + + if [ "$CARCH" == "mips64el" ]; then + cp vmlinuz "${pkgdir}/boot/vmlinuz-${pkgbase}" + cp vmlinux "${pkgdir}/boot/vmlinux-${pkgbase}" + else + cp "arch/${KARCH}/boot/bzImage" "${pkgdir}/boot/vmlinuz-${pkgbase}" + fi + + # 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}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + + # set correct depmod command for install + sed \ + -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \ + -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ + -i "${startdir}/${pkgbase}.install" + sed \ + -e "1s|'linux*.*'|'${pkgbase}'|" \ + -e "s|ALL_kver=.*|ALL_kver=\"/boot/vmlinuz-${pkgbase}\"|" \ + -e "s|default_image=.*|default_image=\"/boot/initramfs-${pkgbase}.img\"|" \ + -e "s|fallback_image=.*|fallback_image=\"/boot/initramfs-${pkgbase}-fallback.img\"|" \ + -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + +# mkinitcpio 0.7 relies on bzImage to find the kernel version + if [ "$CARCH" == "mips64el" ]; then + sed -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \ + -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" + fi + + # 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}${_localversionname:--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}${_localversionname:--LIBRE}" + echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE}/version" + + # Now we call depmod... + depmod -b "$pkgdir" -F System.map "$_kernver" + + # move module tree /lib -> /usr/lib + mv "$pkgdir/lib" "$pkgdir/usr" +} + +_package-headers() { + pkgdesc="Header files and scripts for building modules for ${pkgbase} kernel" + provides=("kernel26${_kernelname}-headers=${pkgver}" "linux${_kernelname}-headers=${pkgver}") + conflicts=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers") + replaces=("kernel26${_kernelname}-headers" "kernel26-libre${_kernelname}-headers" "linux${_kernelname}-headers") + + KARCH=x86 + [ $CARCH = "mips64el" ] && KARCH=mips + +# In case of repackaging this is empty + if [ -z "${_kernver}" ]; then + cd "${srcdir}/linux-${_basekernel}" + _kernver="$(make LOCALVERSION= kernelrelease)" + fi + + install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}" + + cd "${pkgdir}/usr/lib/modules/${_kernver}" + ln -sf ../../../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 keys linux math-emu \ + media net pcmcia scsi sound trace uapi 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/${KARCH}" + cp -a "arch/${KARCH}/include" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + + # copy files necessary for later builds + cp Module.symvers "${pkgdir}/usr/src/linux-${_kernver}" + cp -a scripts "${pkgdir}/usr/src/linux-${_kernver}" + + if [ "$CARCH" = "mips64el" ]; then + cp "arch/${KARCH}/Kbuild" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp -a "arch/${KARCH}/loongson" "${pkgdir}/usr/src/linux-${_kernver}/arch/${KARCH}/" + cp "${srcdir}/Kbuild.platforms" "${pkgdir}/usr/src/linux-${_kernver}/arch/$KARCH/" + fi + + # 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 + # pci + for i in bt8xx cx88 saa7134; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + cp -a drivers/media/pci/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/pci/${i}" + done + # usb + for i in cpia2 em28xx pwc sn9c102; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + cp -a drivers/media/usb/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/${i}" + done + # i2c + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c" + cp drivers/media/i2c/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" + for i in cx25840; do + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${i}" + cp -a drivers/media/i2c/${i}/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/${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-core" + cp drivers/media/dvb-core/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/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/i2c/msp3400-driver.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/i2c/" + + # add dvb headers + # in reference to: + # http://bugs.archlinux.org/task/20402 + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/dvb-usb" + cp drivers/media/usb/dvb-usb/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/usb/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/tuners" + cp drivers/media/tuners/*.h "${pkgdir}/usr/src/linux-${_kernver}/drivers/media/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,arc,arm,arm26,avr32,blackfin,c6x,cris,frv,h8300,hexagon,ia64,m32r,m68k,m68knommu,metag,microblaze,mn10300,openrisc,parisc,powerpc,ppc,s390,score,sh,sh64,sparc,sparc64,tile,unicore32,um,v850,xtensa} + if [ "$CARCH" = "mips64el" ]; then + rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/x86 + else + rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/mips + fi +} + +_package-docs() { + pkgdesc="Kernel hackers manual - HTML documentation that comes with the ${pkgbase} kernel" + provides=("kernel26${_kernelname}-docs=${pkgver}" "linux${_kernelname}-docs=${pkgver}") + conflicts=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") + replaces=("kernel26${_kernelname}-docs" "kernel26-libre${_kernelname}-docs" "linux${_kernelname}-docs") + + cd "${srcdir}/linux-${_basekernel}" + + mkdir -p "${pkgdir}/usr/src/linux-${_kernver}" + cp -al Documentation "${pkgdir}/usr/src/linux-${_kernver}" + find "${pkgdir}" -type f -exec chmod 444 {} \; + find "${pkgdir}" -type d -exec chmod 755 {} \; + + # remove a file already in linux package + rm -f "${pkgdir}/usr/src/linux-${_kernver}/Documentation/DocBook/Makefile" +} + +pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") +for _p in ${pkgname[@]}; do + eval "package_${_p}() { + _package${_p#${pkgbase}} + }" +done + +# vim:set ts=8 sts=2 sw=2 et: diff --git a/libre-testing/linux-libre/boot-logo.patch b/libre-testing/linux-libre/boot-logo.patch new file mode 100644 index 000000000..c392928a5 --- /dev/null +++ b/libre-testing/linux-libre/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/libre-testing/linux-libre/change-default-console-loglevel.patch b/libre-testing/linux-libre/change-default-console-loglevel.patch new file mode 100644 index 000000000..2685d4d23 --- /dev/null +++ b/libre-testing/linux-libre/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_WARNING */ + + DECLARE_WAIT_QUEUE_HEAD(log_wait); + diff --git a/libre-testing/linux-libre/config.i686 b/libre-testing/linux-libre/config.i686 new file mode 100644 index 000000000..cf5adcd74 --- /dev/null +++ b/libre-testing/linux-libre/config.i686 @@ -0,0 +1,6255 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 3.9.0 Kernel Configuration +# +# CONFIG_64BIT is not set +CONFIG_X86_32=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf32-i386" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=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_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# CONFIG_ZONE_DMA32 is not set +# 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_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-LIBRE" +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_FHANDLE=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +CONFIG_AUDIT_LOGINUID_IMMUTABLE=y +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y +CONFIG_KTIME_SCALAR=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_FANOUT=32 +CONFIG_RCU_FANOUT_LEAF=16 +# CONFIG_RCU_FANOUT_EXACT is not set +CONFIG_RCU_FAST_NO_HZ=y +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_BOOST is not set +CONFIG_RCU_NOCB_CPU=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=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_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +# CONFIG_CGROUP_HUGETLB is not set +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_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_HAVE_UID16=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=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_HAVE_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_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_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +CONFIG_KPROBES_ON_FTRACE=y +CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=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_KPROBES_ON_FTRACE=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=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_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OLD_SIGACTION=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_MODULE_SIG is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_LBDAF=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=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 + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=m +CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_BIGSMP is not set +# CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_GOLDFISH is not set +# CONFIG_X86_INTEL_LPSS 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_PARAVIRT_TIME_ACCOUNTING=y +# CONFIG_XEN_PRIVILEGED_GUEST is not set +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_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_L1_CACHE_SHIFT=6 +# CONFIG_X86_PPRO_FENCE is not set +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_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_NR_CPUS=8 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=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 is not set +# CONFIG_MICROCODE_AMD is not set +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +# CONFIG_NOHIGHMEM is not set +CONFIG_HIGHMEM4G=y +# CONFIG_HIGHMEM64G is not set +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_HIGHMEM=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_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_BALLOON_COMPACTION=y +CONFIG_COMPACTION=y +CONFIG_MIGRATION=y +# CONFIG_PHYS_ADDR_T_64BIT is not set +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=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=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_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 +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_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# 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_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PM_WAKELOCKS_GC=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_PM_SLEEP_DEBUG=y +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_PROC_EVENT is not set +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_I2C=m +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_INITRD_TABLE_OVERRIDE=y +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=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_GOV_COMMON=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_INTEL_PSTATE=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y +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_MULTIPLE_DRIVERS is not set +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +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_GOOLPC is not set +CONFIG_PCI_GOANY=y +CONFIG_PCI_BIOS=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_OLPC=y +CONFIG_PCI_DOMAINS=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_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +CONFIG_ISA=y +# CONFIG_EISA is not set +# CONFIG_SCx200 is not set +CONFIG_OLPC=y +CONFIG_OLPC_XO1_PM=y +CONFIG_OLPC_XO1_RTC=y +CONFIG_OLPC_XO1_SCI=y +CONFIG_OLPC_XO15_SCI=y +# CONFIG_ALIX is not set +# CONFIG_NET5501 is not set +# CONFIG_GEOS 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_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_TSI721=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DMA_ENGINE=y +CONFIG_RAPIDIO_DEBUG=y +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_HAVE_AOUT=y +CONFIG_BINFMT_AOUT=m +CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y +CONFIG_HAVE_ATOMIC_IOMAP=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_NET=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m +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=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +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_INET_UDP_DIAG=m +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_GRE=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_ACCT=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_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=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_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=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_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=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_REDIRECT=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_BPF=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=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_ECN=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_NFACCT=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_HASH_NETIFACE=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 SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# 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 is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT_IPV4=m +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_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=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_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_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=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_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=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 +# +# 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_NET_DCCPPROBE=m +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +# 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_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y +# 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_PHONET=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=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_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=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_BLA=y +CONFIG_BATMAN_ADV_DAT=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_NETPRIO_CGROUP=m +CONFIG_BQL=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m +CONFIG_NET_DROP_MONITOR=y +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 + +# +# 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_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_HCIUART_3WIRE=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 is not set +# 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_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_MESSAGE_TRACING 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_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_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_NCI=m +CONFIG_NFC_HCI=m +# CONFIG_NFC_SHDLC is not set +# CONFIG_NFC_LLCP is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m +CONFIG_NFC_PN544=m +CONFIG_NFC_MICROREAD=m + +# +# 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_FW_LOADER_USER_HELPER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_SYS_HYPERVISOR is not set +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=m +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_CMA is not set + +# +# Bus devices +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +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_CMDLINE_PARTS=m +CONFIG_MTD_OF_PARTS=m +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_PHYSMAP_OF=m +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_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# 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_DOCG4=m +# 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_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_OF=y + +# +# Device Tree and Open Firmware support +# +CONFIG_PROC_DEVICETREE=y +# CONFIG_OF_SELFTEST is not set +CONFIG_OF_PROMTREE=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_DEVICE=y +CONFIG_OF_I2C=m +CONFIG_OF_NET=y +CONFIG_OF_MDIO=m +CONFIG_OF_PCI=y +CONFIG_OF_PCI_IRQ=y +CONFIG_OF_MTD=y +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_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +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_LOOP_MIN_COUNT=8 +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_NVME=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +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_VIRTIO_BLK=m +# CONFIG_BLK_DEV_HD is not set +CONFIG_BLK_DEV_RBD=m +CONFIG_BLK_DEV_RSXX=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +# CONFIG_AD525X_DPOT_SPI is not set +# 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_ATMEL_SSC is not set +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 is not set +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=y +CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set +# CONFIG_PCH_PHUB is not set +CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y +CONFIG_VMWARE_VMCI=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# 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 + +# +# 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_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_IN2000=m +CONFIG_SCSI_ARCMSR=m +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_MPT3SAS=m +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_LOGGING=y +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +# CONFIG_SCSI_FLASHPOINT is not set +CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=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_TCM_QLA2XXX=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_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=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_ZPODD=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_HIGHBANK=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_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=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_DM_VERITY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_SBP_TARGET=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_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_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_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_MII=m +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_VXLAN=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET 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 + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_CAIF_HSI=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y +CONFIG_NET_DSA_MV88E6131=m +CONFIG_NET_DSA_MV88E6123_61_65=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_EL3=m +CONFIG_3C515=m +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_LANCE=m +CONFIG_PCNET32=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_NI65=m +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_NET_CADENCE=y +CONFIG_ARM_AT91_ETHER=m +CONFIG_MACB=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_CALXEDA_XGMAC=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CIRRUS=y +CONFIG_CS89x0=m +# CONFIG_CS89x0_PLATFORM is not set +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +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_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_FUJITSU=y +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +# CONFIG_KS8851 is not set +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_PCMCIA_AXNET=m +CONFIG_NE2000=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_ULTRA=m +CONFIG_WD80x3=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_PCH_GBE=m +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=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_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC9194=m +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_PLATFORM is not set +CONFIG_STMMAC_PCI=y +# CONFIG_STMMAC_DEBUG_FS is not set +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_AT803X_PHY=m +CONFIG_AMD_PHY=m +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_BCM87XX_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_MDIO_BUS_MUX=m +CONFIG_MDIO_BUS_MUX_GPIO=m +CONFIG_MDIO_BUS_MUX_MMIOREG=m +# CONFIG_MICREL_KS8995MA is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set + +# +# 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_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=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_NET_QMI_WWAN=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_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_CARDS=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_BTCOEX_SUPPORT=y +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_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +# CONFIG_B43_BCMA_EXTRA is not set +CONFIG_B43_SSB=y +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=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_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_SDIO=y +# CONFIG_BRCMFMAC_SDIO_OOB is not set +CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG 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 is not set +# CONFIG_IPW2200 is not set +CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +# CONFIG_IWLWIFI_P2P is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set +# 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 is not set +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_RT2800PCI_RT3290=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_MMIO=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_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8192CU=m +CONFIG_RTL8192C_COMMON=m +CONFIG_WL_TI=y +CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set +CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=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 + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=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 is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +CONFIG_KEYBOARD_LM8333=m +# 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_CYPRESS=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_PS2_OLPC=y +CONFIG_MOUSE_SERIAL=y +CONFIG_MOUSE_APPLETOUCH=m +CONFIG_MOUSE_BCM5974=m +CONFIG_MOUSE_CYAPA=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 is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=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 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_EGALAX=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_HTCPEN=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=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_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MC13783_PWRBUTTON=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +CONFIG_INPUT_WISTRON_BTNS=m +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_PWM_BEEPER=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +CONFIG_INPUT_ADXL34X=m +CONFIG_INPUT_ADXL34X_I2C=m +CONFIG_INPUT_ADXL34X_SPI=m +CONFIG_INPUT_CMA3000=m +CONFIG_INPUT_CMA3000_I2C=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_SERIO_ARC_PS2=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=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_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=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 +CONFIG_SERIAL_8250_DW=m + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_OF_PLATFORM=m +CONFIG_SERIAL_SCCNXP=m +# CONFIG_SERIAL_TIMBERDALE is not set +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 is not set +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_XILINX_PS_UART=m +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +CONFIG_PRINTER=m +# CONFIG_LP_CONSOLE is not set +CONFIG_PPDEV=m +CONFIG_HVC_DRIVER=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_HW_RANDOM_TPM=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_TIS_I2C_INFINEON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +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_ISMT=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_CBUS_GPIO is not set +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_EG20T=m +# CONFIG_I2C_GPIO is not set +CONFIG_I2C_INTEL_MID=m +CONFIG_I2C_OCORES=m +CONFIG_I2C_PCA_PLATFORM=m +CONFIG_I2C_PXA=m +CONFIG_I2C_PXA_PCI=y +CONFIG_I2C_SIMTEC=m +CONFIG_I2C_XILINX=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 +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +CONFIG_I2C_PCA_ISA=m +CONFIG_SCx200_ACB=m +# CONFIG_I2C_STUB is not set +# 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 is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +# CONFIG_SPI_PXA2XX is not set +# CONFIG_SPI_PXA2XX_PCI is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_HSI is not set + +# +# 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 +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIOLIB=y +CONFIG_OF_GPIO=y +CONFIG_GPIO_ACPI=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_TS5500 is not set +CONFIG_GPIO_SCH=m +CONFIG_GPIO_ICH=m +# CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_LYNXPOINT is not set + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_ARIZONA=m +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set +# CONFIG_GPIO_ADNP is not set + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=y +CONFIG_GPIO_AMD8111=m +# CONFIG_GPIO_LANGWELL is not set +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_SODAVILLE is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# + +# +# USB GPIO expanders: +# +CONFIG_GPIO_VIPERBOARD=m +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +CONFIG_BATTERY_OLPC=m +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y +CONFIG_POWER_AVS=y +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_AD7314 is not set +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADCXX is not set +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_ADT7410=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 is not set +CONFIG_SENSORS_HIH6130=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 is not set +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_LM95245=m +# CONFIG_SENSORS_MAX1111 is not set +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NTC_THERMISTOR=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_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=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_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m +CONFIG_SENSORS_INA2XX=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_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_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set +# CONFIG_CPU_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_RETU_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_IE6XX_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_VIA_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 + +# +# 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_SSB_DRIVER_GPIO=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM831X_SPI is not set +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_ABX500_CORE=y +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_CS5535=m +# CONFIG_MFD_TIMBERDALE is not set +CONFIG_LPC_SCH=m +CONFIG_LPC_ICH=m +CONFIG_MFD_RDC321X=m +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +# CONFIG_MFD_SYSCON is not set +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set + +# +# Media drivers +# +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=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_SANYO_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=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_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +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_JL2005BCD=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_SE401=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_TOPRO=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_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_USB_SN9C102=m + +# +# Analog TV USB devices +# +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_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +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_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_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +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 +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_PMS=m +CONFIG_VIDEO_W9966=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m +# CONFIG_V4L_RADIO_ISA_DRIVERS is not set + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y + +# +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_VIDEO_IR_I2C=m + +# +# 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_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +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_TVP5150=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +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_MT2063=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_XC4000=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_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=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_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=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 +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=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_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=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_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_IT913X_FE=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=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_USB=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON_UMS is not set +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=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_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +# CONFIG_OF_DISPLAY_TIMING is not set +# CONFIG_OF_VIDEOMODE is not set +CONFIG_HDMI=y +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_I740 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=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y +# 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=m +# 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_SMSCUFX is not set +CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set +CONFIG_FB_VIRTUAL=m +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_BROADSHEET is not set +# CONFIG_FB_AUO_K190X is not set +# CONFIG_EXYNOS_VIDEO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_PWM=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set + +# +# 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_FONT_AUTOSELECT=y +# CONFIG_LOGO is not set +CONFIG_FB_SSD1307=m +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_KCTL_JACK=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_CMI8328=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_TEA575X=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_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +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_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=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_SCS1X=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_AUREAL=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_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO_TPKBD=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_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_PICOLCD_CIR=y +CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# I2C HID support +# +CONFIG_I2C_HID=m +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_DWC3 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_EHCI_PCI=m +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_HCD_PLATFORM is not set +# CONFIG_USB_EHCI_HCD_PLATFORM 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_RENESAS_USBHS_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set +CONFIG_USB_RENESAS_USBHS=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_REALTEK_AUTOPM=y +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 + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +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_F81232=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_METRO=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_XSENS_MT=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=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_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m + +# +# USB Physical Layer drivers +# +# CONFIG_OMAP_USB3 is not set +# CONFIG_OMAP_CONTROL_USB is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=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_STORAGE_NUM_BUFFERS=2 + +# +# USB Peripheral Controller +# +CONFIG_USB_FUSB300=m +CONFIG_USB_R8A66597=m +CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_GADGET_MUSB_HDRC=m +CONFIG_USB_M66592=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set +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_MASS_STORAGE=m +CONFIG_USB_GADGET_TARGET=m +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_ACM_MS 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 is not set +CONFIG_NOP_USB_XCEIV=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 is not set + +# +# 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_ACPI=m +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_MMC_REALTEK_PCI=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_MEMSTICK_REALTEK_PCI=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m +CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA9633=m +# CONFIG_LEDS_DAC124S085 is not set +# CONFIG_LEDS_PWM is not set +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM355x=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_BLINKM=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +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_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_PCF8523=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 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set + +# +# 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_DS2404=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_MC13XXX=m +CONFIG_RTC_DRV_SNVS=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set +CONFIG_TIMB_DMA=m +CONFIG_PCH_DMA=m +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=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_DMEM_GENIRQ is not set +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +# CONFIG_VFIO is not set +CONFIG_VIRTIO=y + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m +CONFIG_STAGING=y +CONFIG_ET131X=m +CONFIG_SLICOSS=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_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y +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=y +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_AMPLC_DIO200_ISA=m +CONFIG_COMEDI_AMPLC_PC236_ISA=m +CONFIG_COMEDI_AMPLC_PC263_ISA=m +CONFIG_COMEDI_RTI800=m +CONFIG_COMEDI_RTI802=m +CONFIG_COMEDI_DAS16M1=m +CONFIG_COMEDI_DAS08_ISA=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=y +CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=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_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=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_PCI7X3X=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_PCI=m +CONFIG_COMEDI_AMPLC_PC236_PCI=m +CONFIG_COMEDI_AMPLC_PC263_PCI=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DAS08_PCI=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=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_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_LABPC=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_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=y +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=y +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_FC=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_NI_TIO=m +# CONFIG_FB_OLPC_DCON is not set +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_RTS5139=m +# CONFIG_RTS5139_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +CONFIG_DX_SEP=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZSMALLOC=y +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_ACPI_QUICKSTART=m +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_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_DVB_CXD2099=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y +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_SOLO6X10=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_ZILOG=m + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_USB_WPAN_HCD=m +CONFIG_WIMAX_GDM72XX=m +CONFIG_WIMAX_GDM72XX_QOS=y +CONFIG_WIMAX_GDM72XX_K_MODE=y +CONFIG_WIMAX_GDM72XX_WIMAX2=y +CONFIG_WIMAX_GDM72XX_USB=y +# CONFIG_WIMAX_GDM72XX_SDIO is not set +CONFIG_WIMAX_GDM72XX_USB_PM=y +CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_ZCACHE=y +CONFIG_RAMSTER=y +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_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_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=m +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_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_XO1_RFKILL=m +CONFIG_XO15_EBOOK=m +CONFIG_SAMSUNG_LAPTOP=m +CONFIG_MXM_WMI=m +CONFIG_INTEL_OAKTRAIL=m +CONFIG_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m + +# +# Hardware Spinlock drivers +# +CONFIG_CLKSRC_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_OF_IOMMU=y +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m + +# +# Rpmsg drivers +# +CONFIG_VIRT_DRIVERS=y +# CONFIG_PM_DEVFREQ is not set +CONFIG_EXTCON=m + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_GPIO=m +CONFIG_MEMORY=y +# CONFIG_IIO is not set +# CONFIG_VME_BUS is not set +CONFIG_PWM=y +CONFIG_IRQCHIP=y +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# 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_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_BTRFS_FS_CHECK_INTEGRITY is not set +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +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=y +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=y +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set +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_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# 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_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +# 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_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +# CONFIG_NFS_SWAP is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +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_ACL=y +# CONFIG_CIFS_DEBUG is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y +CONFIG_CIFS_FSCACHE=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 +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_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=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_READABLE_ASM is not set +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_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_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_HAVE_DEBUG_KMEMLEAK=y +# 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_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_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 + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU_DELAY is not set +# CONFIG_SPARSE_RCU_POINTER 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_RCU_CPU_STALL_INFO is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_KPROBES_SANITY_TEST 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_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=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_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=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_TRACER_SNAPSHOT=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_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=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_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +CONFIG_DYNAMIC_DEBUG=y +# 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_X86_DECODER_SELFTEST is not set +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 +# CONFIG_DEBUG_NMI_SELFTEST 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_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_YAMA is not set +# 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=y +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_USER=m +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 +CONFIG_CRYPTO_ABLK_HELPER_X86=m +CONFIG_CRYPTO_GLUE_HELPER_X86=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_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=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=y +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_BLOWFISH_COMMON=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAST_COMMON=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_SERPENT_SSE2_586=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=y + +# +# 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_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m +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_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=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_TCM_VHOST=m +CONFIG_LGUEST=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_PERCPU_RWSEM=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=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_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=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_DQL=y +CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y diff --git a/libre-testing/linux-libre/config.x86_64 b/libre-testing/linux-libre/config.x86_64 new file mode 100644 index 000000000..2e7cd8ec0 --- /dev/null +++ b/libre-testing/linux-libre/config.x86_64 @@ -0,0 +1,6051 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/x86 3.9.0-2 Kernel Configuration +# +CONFIG_64BIT=y +CONFIG_X86_64=y +CONFIG_X86=y +CONFIG_INSTRUCTION_DECODER=y +CONFIG_OUTPUT_FORMAT="elf64-x86-64" +CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_HAVE_LATENCYTOP_SUPPORT=y +CONFIG_MMU=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_GPIO=y +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEFAULT_IDLE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=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_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ZONE_DMA32=y +CONFIG_AUDIT_ARCH=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_HAVE_INTEL_TXT=y +CONFIG_X86_64_SMP=y +CONFIG_X86_HT=y +CONFIG_ARCH_HWEIGHT_CFLAGS="-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11" +CONFIG_ARCH_CPU_PROBE_RELEASE=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_EXTABLE_SORT=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="" +CONFIG_LOCALVERSION="-LIBRE" +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_FHANDLE=y +CONFIG_AUDIT=y +CONFIG_AUDITSYSCALL=y +CONFIG_AUDIT_WATCH=y +CONFIG_AUDIT_TREE=y +CONFIG_AUDIT_LOGINUID_IMMUTABLE=y +CONFIG_HAVE_GENERIC_HARDIRQS=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_PENDING_IRQ=y +CONFIG_IRQ_DOMAIN=y +# CONFIG_IRQ_DOMAIN_DEBUG is not set +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ALWAYS_USE_PERSISTENT_CLOCK=y +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +# CONFIG_IRQ_TIME_ACCOUNTING is not set +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_BSD_PROCESS_ACCT_V3=y +CONFIG_TASKSTATS=y +CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y + +# +# RCU Subsystem +# +CONFIG_TREE_PREEMPT_RCU=y +CONFIG_PREEMPT_RCU=y +CONFIG_RCU_STALL_COMMON=y +# CONFIG_RCU_USER_QS is not set +CONFIG_RCU_FANOUT=64 +CONFIG_RCU_FANOUT_LEAF=16 +# CONFIG_RCU_FANOUT_EXACT is not set +CONFIG_RCU_FAST_NO_HZ=y +# CONFIG_TREE_RCU_TRACE is not set +# CONFIG_RCU_BOOST is not set +CONFIG_RCU_NOCB_CPU=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=19 +CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y +CONFIG_ARCH_USES_NUMA_PROT_NONE=y +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y +CONFIG_NUMA_BALANCING=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_MEMCG=y +CONFIG_MEMCG_SWAP=y +# CONFIG_MEMCG_SWAP_ENABLED is not set +CONFIG_MEMCG_KMEM=y +# CONFIG_CGROUP_HUGETLB is not set +# CONFIG_CGROUP_PERF is not set +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_BLK_CGROUP=y +# CONFIG_DEBUG_BLK_CGROUP is not set +# CONFIG_CHECKPOINT_RESTORE is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_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_HAVE_UID16=y +CONFIG_UID16=y +# CONFIG_SYSCTL_SYSCALL is not set +CONFIG_SYSCTL_EXCEPTION_TRACE=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_HAVE_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_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_OPROFILE_NMI_TIMER=y +CONFIG_KPROBES=y +CONFIG_JUMP_LABEL=y +CONFIG_KPROBES_ON_FTRACE=y +CONFIG_UPROBES=y +# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_KRETPROBES=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_KPROBES_ON_FTRACE=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_ATTRS=y +CONFIG_USE_GENERIC_SMP_HELPERS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=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_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP_FILTER=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_COMPAT_OLD_SIGACTION=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set +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_MODULE_SIG is not set +CONFIG_STOP_MACHINE=y +CONFIG_BLOCK=y +CONFIG_BLK_DEV_BSG=y +CONFIG_BLK_DEV_BSGLIB=y +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_THROTTLING=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_BLOCK_COMPAT=y + +# +# IO Schedulers +# +CONFIG_IOSCHED_NOOP=y +CONFIG_IOSCHED_DEADLINE=y +CONFIG_IOSCHED_CFQ=y +CONFIG_CFQ_GROUP_IOSCHED=y +# CONFIG_DEFAULT_DEADLINE is not set +CONFIG_DEFAULT_CFQ=y +# CONFIG_DEFAULT_NOOP is not set +CONFIG_DEFAULT_IOSCHED="cfq" +CONFIG_PREEMPT_NOTIFIERS=y +CONFIG_PADATA=y +CONFIG_ASN1=m +CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_FREEZER=y + +# +# Processor type and features +# +CONFIG_ZONE_DMA=y +CONFIG_SMP=y +CONFIG_X86_X2APIC=y +CONFIG_X86_MPPARSE=y +# CONFIG_X86_EXTENDED_PLATFORM is not set +# CONFIG_X86_INTEL_LPSS is not set +CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y +CONFIG_SCHED_OMIT_FRAME_POINTER=y +CONFIG_PARAVIRT_GUEST=y +CONFIG_PARAVIRT_TIME_ACCOUNTING=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PRIVILEGED_GUEST=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_MAX_DOMAIN_MEMORY=500 +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_KVM_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_MK8 is not set +# CONFIG_MPSC is not set +# CONFIG_MCORE2 is not set +# CONFIG_MATOM is not set +CONFIG_GENERIC_CPU=y +CONFIG_X86_INTERNODE_CACHE_SHIFT=6 +CONFIG_X86_L1_CACHE_SHIFT=6 +CONFIG_X86_TSC=y +CONFIG_X86_CMPXCHG64=y +CONFIG_X86_CMOV=y +CONFIG_X86_MINIMUM_CPU_FAMILY=64 +CONFIG_X86_DEBUGCTLMSR=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_HPET_TIMER=y +CONFIG_HPET_EMULATE_RTC=y +CONFIG_DMI=y +CONFIG_GART_IOMMU=y +CONFIG_CALGARY_IOMMU=y +CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y +CONFIG_SWIOTLB=y +CONFIG_IOMMU_HELPER=y +# CONFIG_MAXSMP is not set +CONFIG_NR_CPUS=64 +CONFIG_SCHED_SMT=y +CONFIG_SCHED_MC=y +# CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_VOLUNTARY is not set +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=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_MCE_THRESHOLD=y +# CONFIG_X86_MCE_INJECT is not set +CONFIG_X86_THERMAL_VECTOR=y +CONFIG_I8K=m +CONFIG_MICROCODE=m +# CONFIG_MICROCODE_INTEL is not set +# CONFIG_MICROCODE_AMD is not set +CONFIG_MICROCODE_OLD_INTERFACE=y +CONFIG_X86_MSR=m +CONFIG_X86_CPUID=m +CONFIG_ARCH_PHYS_ADDR_T_64BIT=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DIRECT_GBPAGES=y +CONFIG_NUMA=y +CONFIG_AMD_NUMA=y +CONFIG_X86_64_ACPI_NUMA=y +CONFIG_NODES_SPAN_OTHER_NODES=y +# CONFIG_NUMA_EMU is not set +CONFIG_NODES_SHIFT=6 +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SPARSEMEM_DEFAULT=y +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_MEMORY_PROBE=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_SELECT_MEMORY_MODEL=y +CONFIG_SPARSEMEM_MANUAL=y +CONFIG_SPARSEMEM=y +CONFIG_NEED_MULTIPLE_NODES=y +CONFIG_HAVE_MEMORY_PRESENT=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_ALLOC_MEM_MAP_TOGETHER=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MEMBLOCK_NODE_MAP=y +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_MEMORY_ISOLATION=y +# CONFIG_MOVABLE_NODE is not set +CONFIG_HAVE_BOOTMEM_INFO_NODE=y +CONFIG_MEMORY_HOTPLUG=y +CONFIG_MEMORY_HOTPLUG_SPARSE=y +CONFIG_MEMORY_HOTREMOVE=y +CONFIG_PAGEFLAGS_EXTENDED=y +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_BALLOON_COMPACTION=y +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=y +# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CLEANCACHE=y +CONFIG_FRONTSWAP=y +CONFIG_X86_CHECK_BIOS_CORRUPTION=y +CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y +CONFIG_X86_RESERVE_LOW=64 +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_ARCH_RANDOM=y +CONFIG_X86_SMAP=y +CONFIG_EFI=y +CONFIG_EFI_STUB=y +CONFIG_SECCOMP=y +CONFIG_CC_STACKPROTECTOR=y +# CONFIG_HZ_100 is not set +# CONFIG_HZ_250 is not set +CONFIG_HZ_300=y +# CONFIG_HZ_1000 is not set +CONFIG_HZ=300 +CONFIG_SCHED_HRTICK=y +CONFIG_KEXEC=y +# CONFIG_CRASH_DUMP is not set +CONFIG_KEXEC_JUMP=y +CONFIG_PHYSICAL_START=0x1000000 +CONFIG_RELOCATABLE=y +CONFIG_PHYSICAL_ALIGN=0x1000000 +CONFIG_HOTPLUG_CPU=y +# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set +# CONFIG_DEBUG_HOTPLUG_CPU0 is not set +# CONFIG_COMPAT_VDSO is not set +# CONFIG_CMDLINE_BOOL is not set +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +CONFIG_USE_PERCPU_NUMA_NODE_ID=y + +# +# Power management and ACPI options +# +CONFIG_ARCH_HIBERNATION_HEADER=y +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_AUTOSLEEP=y +CONFIG_PM_WAKELOCKS=y +CONFIG_PM_WAKELOCKS_LIMIT=100 +CONFIG_PM_WAKELOCKS_GC=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_PM_SLEEP_DEBUG=y +CONFIG_PM_TRACE=y +CONFIG_PM_TRACE_RTC=y +CONFIG_ACPI=y +CONFIG_ACPI_SLEEP=y +# CONFIG_ACPI_PROCFS is not set +# CONFIG_ACPI_PROCFS_POWER is not set +CONFIG_ACPI_EC_DEBUGFS=m +# CONFIG_ACPI_PROC_EVENT is not set +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_I2C=m +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_IPMI=m +CONFIG_ACPI_HOTPLUG_CPU=y +CONFIG_ACPI_PROCESSOR_AGGREGATOR=m +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_NUMA=y +# CONFIG_ACPI_CUSTOM_DSDT is not set +CONFIG_ACPI_INITRD_TABLE_OVERRIDE=y +CONFIG_ACPI_BLACKLIST_YEAR=0 +# CONFIG_ACPI_DEBUG is not set +CONFIG_ACPI_PCI_SLOT=y +CONFIG_X86_PM_TIMER=y +CONFIG_ACPI_CONTAINER=y +CONFIG_ACPI_HOTPLUG_MEMORY=m +CONFIG_ACPI_SBS=m +CONFIG_ACPI_HED=y +CONFIG_ACPI_CUSTOM_METHOD=m +CONFIG_ACPI_BGRT=y +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_PCIEAER=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_ERST_DEBUG=m +CONFIG_SFI=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_TABLE=y +CONFIG_CPU_FREQ_GOV_COMMON=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_INTEL_PSTATE=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y +CONFIG_X86_POWERNOW_K8=m +# CONFIG_X86_SPEEDSTEP_CENTRINO is not set +CONFIG_X86_P4_CLOCKMOD=m + +# +# shared options +# +CONFIG_X86_SPEEDSTEP_LIB=m +CONFIG_CPU_IDLE=y +# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +CONFIG_INTEL_IDLE=y + +# +# Memory power savings +# +CONFIG_I7300_IDLE_IOAT_CHANNEL=y +CONFIG_I7300_IDLE=m + +# +# Bus options (PCI etc.) +# +CONFIG_PCI=y +CONFIG_PCI_DIRECT=y +CONFIG_PCI_MMCONFIG=y +CONFIG_PCI_XEN=y +CONFIG_PCI_DOMAINS=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_PCIEASPM_DEFAULT=y +# CONFIG_PCIEASPM_POWERSAVE is not set +# CONFIG_PCIEASPM_PERFORMANCE is not set +CONFIG_PCIE_PME=y +CONFIG_ARCH_SUPPORTS_MSI=y +CONFIG_PCI_MSI=y +# CONFIG_PCI_DEBUG is not set +CONFIG_PCI_REALLOC_ENABLE_AUTO=y +CONFIG_PCI_STUB=m +CONFIG_XEN_PCIDEV_FRONTEND=m +CONFIG_HT_IRQ=y +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +CONFIG_PCI_PRI=y +CONFIG_PCI_PASID=y +CONFIG_PCI_IOAPIC=y +CONFIG_PCI_LABEL=y +CONFIG_ISA_DMA_API=y +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_PCCARD_NONSTATIC=y +CONFIG_HOTPLUG_PCI=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_TSI721=y +CONFIG_RAPIDIO_DISC_TIMEOUT=30 +# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set +CONFIG_RAPIDIO_DMA_ENGINE=y +CONFIG_RAPIDIO_DEBUG=y +CONFIG_RAPIDIO_TSI57X=y +CONFIG_RAPIDIO_CPS_XX=y +CONFIG_RAPIDIO_TSI568=y +CONFIG_RAPIDIO_CPS_GEN2=y +CONFIG_RAPIDIO_TSI500=y + +# +# Executable file formats / Emulations +# +CONFIG_BINFMT_ELF=y +CONFIG_COMPAT_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +# CONFIG_HAVE_AOUT is not set +CONFIG_BINFMT_MISC=y +CONFIG_COREDUMP=y +CONFIG_IA32_EMULATION=y +CONFIG_IA32_AOUT=m +CONFIG_X86_X32=y +CONFIG_COMPAT=y +CONFIG_COMPAT_FOR_U64_ALIGNMENT=y +CONFIG_SYSVIPC_COMPAT=y +CONFIG_KEYS_COMPAT=y +CONFIG_HAVE_TEXT_POKE_SMP=y +CONFIG_X86_DEV_DMA_OPS=y +CONFIG_NET=y +CONFIG_COMPAT_NETLINK_MESSAGES=y + +# +# Networking options +# +CONFIG_PACKET=y +CONFIG_PACKET_DIAG=m +CONFIG_UNIX=y +CONFIG_UNIX_DIAG=m +CONFIG_XFRM=y +CONFIG_XFRM_ALGO=m +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=y +CONFIG_SYN_COOKIES=y +CONFIG_NET_IPVTI=m +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_INET_UDP_DIAG=m +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_GRE=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_ACCT=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_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_CONNTRACK_TIMESTAMP=y +CONFIG_NF_CONNTRACK_LABELS=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_NF_CT_NETLINK_TIMEOUT=m +CONFIG_NF_CT_NETLINK_HELPER=m +CONFIG_NETFILTER_NETLINK_QUEUE_CT=y +CONFIG_NF_NAT=m +CONFIG_NF_NAT_NEEDED=y +CONFIG_NF_NAT_PROTO_DCCP=m +CONFIG_NF_NAT_PROTO_UDPLITE=m +CONFIG_NF_NAT_PROTO_SCTP=m +CONFIG_NF_NAT_AMANDA=m +CONFIG_NF_NAT_FTP=m +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=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_HMARK=m +CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m +CONFIG_NETFILTER_XT_TARGET_LED=m +CONFIG_NETFILTER_XT_TARGET_LOG=m +CONFIG_NETFILTER_XT_TARGET_MARK=m +CONFIG_NETFILTER_XT_TARGET_NETMAP=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_REDIRECT=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_BPF=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m +CONFIG_NETFILTER_XT_MATCH_CONNLABEL=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_ECN=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_NFACCT=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_HASH_NETIFACE=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 SH scheduler +# +CONFIG_IP_VS_SH_TAB_BITS=8 + +# +# 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 is not set +CONFIG_IP_NF_IPTABLES=m +CONFIG_IP_NF_MATCH_AH=m +CONFIG_IP_NF_MATCH_ECN=m +CONFIG_IP_NF_MATCH_RPFILTER=m +CONFIG_IP_NF_MATCH_TTL=m +CONFIG_IP_NF_FILTER=m +CONFIG_IP_NF_TARGET_REJECT=m +CONFIG_IP_NF_TARGET_ULOG=m +CONFIG_NF_NAT_IPV4=m +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_GRE=m +CONFIG_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=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_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_RPFILTER=m +CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=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_NF_NAT_IPV6=m +CONFIG_IP6_NF_TARGET_MASQUERADE=m +CONFIG_IP6_NF_TARGET_NPT=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 +# +# 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_NET_DCCPPROBE=m +CONFIG_IP_SCTP=m +CONFIG_NET_SCTPPROBE=m +# CONFIG_SCTP_DBG_MSG is not set +# CONFIG_SCTP_DBG_OBJCNT is not set +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set +CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y +# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set +CONFIG_SCTP_COOKIE_HMAC_MD5=y +CONFIG_SCTP_COOKIE_HMAC_SHA1=y +# 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_MRP=m +CONFIG_BRIDGE=m +CONFIG_BRIDGE_IGMP_SNOOPING=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_HAVE_NET_DSA=y +CONFIG_NET_DSA=m +CONFIG_NET_DSA_TAG_DSA=y +CONFIG_NET_DSA_TAG_EDSA=y +CONFIG_NET_DSA_TAG_TRAILER=y +CONFIG_VLAN_8021Q=m +# CONFIG_VLAN_8021Q_GVRP is not set +CONFIG_VLAN_8021Q_MVRP=y +# 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_IPDDP=m +CONFIG_IPDDP_ENCAP=y +CONFIG_IPDDP_DECAP=y +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +CONFIG_PHONET=m +CONFIG_IEEE802154=m +CONFIG_IEEE802154_6LOWPAN=m +CONFIG_MAC802154=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_CODEL=m +CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_SCH_PLUG=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_BLA=y +CONFIG_BATMAN_ADV_DAT=y +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_OPENVSWITCH=m +CONFIG_VSOCKETS=m +CONFIG_VMWARE_VMCI_VSOCKETS=m +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_XPS=y +CONFIG_NETPRIO_CGROUP=m +CONFIG_BQL=y +CONFIG_BPF_JIT=y + +# +# Network testing +# +CONFIG_NET_PKTGEN=m +CONFIG_NET_TCPPROBE=m +CONFIG_NET_DROP_MONITOR=y +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_BAYCOM_SER_FDX=m +CONFIG_BAYCOM_SER_HDX=m +CONFIG_BAYCOM_PAR=m +CONFIG_YAM=m +# 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_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_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_HCIUART_3WIRE=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 is not set +# 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_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_MESSAGE_TRACING 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_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_CAIF_USB=m +CONFIG_CEPH_LIB=m +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set +CONFIG_NFC=m +CONFIG_NFC_NCI=m +CONFIG_NFC_HCI=m +# CONFIG_NFC_SHDLC is not set +# CONFIG_NFC_LLCP is not set + +# +# Near Field Communication (NFC) devices +# +CONFIG_NFC_PN533=m +CONFIG_NFC_WILINK=m +CONFIG_NFC_PN544=m +CONFIG_NFC_MICROREAD=m +CONFIG_HAVE_BPF_JIT=y + +# +# 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_FW_LOADER_USER_HELPER is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +CONFIG_SYS_HYPERVISOR=y +# CONFIG_GENERIC_CPU_DEVICES is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=m +CONFIG_REGMAP_MMIO=m +CONFIG_REGMAP_IRQ=y +CONFIG_DMA_SHARED_BUFFER=y + +# +# Bus devices +# +CONFIG_CONNECTOR=y +CONFIG_PROC_EVENTS=y +CONFIG_MTD=m +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_CMDLINE_PARTS=m +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_DOCG3=m +CONFIG_BCH_CONST_M=14 +CONFIG_BCH_CONST_T=4 +CONFIG_MTD_NAND_ECC=m +CONFIG_MTD_NAND_ECC_SMC=y +CONFIG_MTD_NAND=m +# 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_DOCG4=m +# CONFIG_MTD_NAND_CAFE is not set +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_LIMIT=20 +# CONFIG_MTD_UBI_FASTMAP is not set +# CONFIG_MTD_UBI_GLUEBI 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_PNPACPI=y +CONFIG_BLK_DEV=y +CONFIG_BLK_DEV_FD=m +# CONFIG_PARIDE is not set +CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m +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_LOOP_MIN_COUNT=8 +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_NVME=m +CONFIG_BLK_DEV_OSD=m +CONFIG_BLK_DEV_SX8=m +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_BLK_DEV_RSXX=m + +# +# Misc devices +# +CONFIG_SENSORS_LIS3LV02D=m +CONFIG_AD525X_DPOT=m +CONFIG_AD525X_DPOT_I2C=m +# CONFIG_AD525X_DPOT_SPI is not set +# 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_ATMEL_SSC is not set +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 is not set +CONFIG_VMWARE_BALLOON=m +CONFIG_BMP085=y +CONFIG_BMP085_I2C=m +# CONFIG_BMP085_SPI is not set +CONFIG_PCH_PHUB=m +CONFIG_USB_SWITCH_FSA9480=m +# CONFIG_LATTICE_ECP3_CONFIG is not set +CONFIG_C2PORT=m +CONFIG_C2PORT_DURAMAR_2150=m + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set +CONFIG_EEPROM_LEGACY=m +CONFIG_EEPROM_MAX6875=m +CONFIG_EEPROM_93CX6=m +# CONFIG_EEPROM_93XX46 is not set +CONFIG_CB710_CORE=m +# CONFIG_CB710_DEBUG is not set +CONFIG_CB710_DEBUG_ASSUMPTIONS=y + +# +# Texas Instruments shared transport line discipline +# +CONFIG_TI_ST=m +CONFIG_SENSORS_LIS3_I2C=m + +# +# Altera FPGA firmware download module +# +CONFIG_ALTERA_STAPL=m +CONFIG_INTEL_MEI=m +CONFIG_INTEL_MEI_ME=y +CONFIG_VMWARE_VMCI=m +CONFIG_HAVE_IDE=y +# CONFIG_IDE is not set + +# +# 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 + +# +# 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_ACARD=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_MVSAS_TASKLET=y +CONFIG_SCSI_MVUMI=m +CONFIG_SCSI_DPT_I2O=m +CONFIG_SCSI_ADVANSYS=m +CONFIG_SCSI_ARCMSR=m +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_MPT3SAS=m +CONFIG_SCSI_MPT3SAS_MAX_SGE=128 +CONFIG_SCSI_MPT3SAS_LOGGING=y +CONFIG_SCSI_UFSHCD=m +CONFIG_SCSI_UFSHCD_PCI=m +CONFIG_SCSI_HPTIOP=m +CONFIG_SCSI_BUSLOGIC=m +CONFIG_VMWARE_PVSCSI=m +CONFIG_HYPERV_STORAGE=m +CONFIG_LIBFC=m +CONFIG_LIBFCOE=m +CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m +CONFIG_SCSI_DMX3191D=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_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_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_QLOGIC_1280=m +CONFIG_SCSI_QLA_FC=m +CONFIG_TCM_QLA2XXX=m +CONFIG_SCSI_QLA_ISCSI=m +CONFIG_SCSI_LPFC=m +# CONFIG_SCSI_LPFC_DEBUG_FS is not set +CONFIG_SCSI_DC395x=m +CONFIG_SCSI_DC390T=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_VIRTIO=m +CONFIG_SCSI_CHELSIO_FCOE=m +CONFIG_SCSI_LOWLEVEL_PCMCIA=y +CONFIG_PCMCIA_AHA152X=m +CONFIG_PCMCIA_FDOMAIN=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_ZPODD=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_HIGHBANK=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_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_MPIIX=m +CONFIG_PATA_NS87410=m +CONFIG_PATA_OPTI=m +CONFIG_PATA_PCMCIA=m +CONFIG_PATA_RZ1000=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_MD_MULTIPATH=m +CONFIG_MD_FAULTY=m +CONFIG_BLK_DEV_DM=m +# CONFIG_DM_DEBUG is not set +CONFIG_DM_BUFIO=m +CONFIG_DM_BIO_PRISON=m +CONFIG_DM_PERSISTENT_DATA=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_THIN_PROVISIONING=m +# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set +CONFIG_DM_CACHE=m +CONFIG_DM_CACHE_MQ=m +CONFIG_DM_CACHE_CLEANER=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_DM_VERITY=m +CONFIG_TARGET_CORE=m +CONFIG_TCM_IBLOCK=m +CONFIG_TCM_FILEIO=m +CONFIG_TCM_PSCSI=m +CONFIG_LOOPBACK_TARGET=m +CONFIG_TCM_FC=m +CONFIG_ISCSI_TARGET=m +CONFIG_SBP_TARGET=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_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_NET_CORE=y +CONFIG_BONDING=m +CONFIG_DUMMY=m +CONFIG_EQUALIZER=m +# CONFIG_NET_FC is not set +CONFIG_MII=m +CONFIG_IFB=m +CONFIG_NET_TEAM=m +CONFIG_NET_TEAM_MODE_BROADCAST=m +CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m +CONFIG_NET_TEAM_MODE_LOADBALANCE=m +CONFIG_MACVLAN=m +CONFIG_MACVTAP=m +CONFIG_VXLAN=m +CONFIG_NETCONSOLE=m +CONFIG_NETCONSOLE_DYNAMIC=y +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y +CONFIG_RIONET=m +CONFIG_RIONET_TX_SIZE=128 +CONFIG_RIONET_RX_SIZE=128 +CONFIG_TUN=m +CONFIG_VETH=m +CONFIG_VIRTIO_NET=m +CONFIG_SUNGEM_PHY=m +# CONFIG_ARCNET 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 + +# +# CAIF transport drivers +# +CONFIG_CAIF_TTY=m +CONFIG_CAIF_SPI_SLAVE=m +CONFIG_CAIF_SPI_SYNC=y +CONFIG_CAIF_HSI=m + +# +# Distributed Switch Architecture drivers +# +CONFIG_NET_DSA_MV88E6XXX=m +CONFIG_NET_DSA_MV88E6060=m +CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y +CONFIG_NET_DSA_MV88E6131=m +CONFIG_NET_DSA_MV88E6123_61_65=m +CONFIG_ETHERNET=y +CONFIG_MDIO=m +CONFIG_NET_VENDOR_3COM=y +CONFIG_PCMCIA_3C574=m +CONFIG_PCMCIA_3C589=m +CONFIG_VORTEX=m +CONFIG_TYPHOON=m +CONFIG_NET_VENDOR_ADAPTEC=y +CONFIG_ADAPTEC_STARFIRE=m +CONFIG_NET_VENDOR_ALTEON=y +CONFIG_ACENIC=m +# CONFIG_ACENIC_OMIT_TIGON_I is not set +CONFIG_NET_VENDOR_AMD=y +CONFIG_AMD8111_ETH=m +CONFIG_PCNET32=m +CONFIG_PCMCIA_NMCLAN=m +CONFIG_NET_VENDOR_ATHEROS=y +CONFIG_ATL2=m +CONFIG_ATL1=m +CONFIG_ATL1E=m +CONFIG_ATL1C=m +CONFIG_NET_CADENCE=y +CONFIG_ARM_AT91_ETHER=m +CONFIG_MACB=m +CONFIG_NET_VENDOR_BROADCOM=y +CONFIG_B44=m +CONFIG_B44_PCI_AUTOSELECT=y +CONFIG_B44_PCICORE_AUTOSELECT=y +CONFIG_B44_PCI=y +CONFIG_BNX2=m +CONFIG_CNIC=m +CONFIG_TIGON3=m +CONFIG_BNX2X=m +CONFIG_BNX2X_SRIOV=y +CONFIG_NET_VENDOR_BROCADE=y +CONFIG_BNA=m +CONFIG_NET_CALXEDA_XGMAC=m +CONFIG_NET_VENDOR_CHELSIO=y +CONFIG_CHELSIO_T1=m +CONFIG_CHELSIO_T1_1G=y +CONFIG_CHELSIO_T3=m +CONFIG_CHELSIO_T4=m +CONFIG_CHELSIO_T4VF=m +CONFIG_NET_VENDOR_CISCO=y +CONFIG_ENIC=m +CONFIG_DNET=m +CONFIG_NET_VENDOR_DEC=y +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_NET_VENDOR_DLINK=y +CONFIG_DL2K=m +CONFIG_SUNDANCE=m +# CONFIG_SUNDANCE_MMIO is not set +CONFIG_NET_VENDOR_EMULEX=y +CONFIG_BE2NET=m +CONFIG_NET_VENDOR_EXAR=y +CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set +CONFIG_NET_VENDOR_FUJITSU=y +CONFIG_PCMCIA_FMVJ18X=m +CONFIG_NET_VENDOR_HP=y +CONFIG_HP100=m +CONFIG_NET_VENDOR_INTEL=y +CONFIG_E100=m +CONFIG_E1000=m +CONFIG_E1000E=m +CONFIG_IGB=m +CONFIG_IGB_HWMON=y +CONFIG_IGB_DCA=y +CONFIG_IGBVF=m +CONFIG_IXGB=m +CONFIG_IXGBE=m +CONFIG_IXGBE_HWMON=y +CONFIG_IXGBE_DCA=y +CONFIG_IXGBEVF=m +CONFIG_NET_VENDOR_I825XX=y +CONFIG_IP1000=m +CONFIG_JME=m +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=m +CONFIG_SKGE=m +# CONFIG_SKGE_DEBUG is not set +CONFIG_SKGE_GENESIS=y +CONFIG_SKY2=m +# CONFIG_SKY2_DEBUG is not set +CONFIG_NET_VENDOR_MELLANOX=y +CONFIG_MLX4_EN=m +CONFIG_MLX4_CORE=m +CONFIG_MLX4_DEBUG=y +CONFIG_NET_VENDOR_MICREL=y +CONFIG_KS8842=m +# CONFIG_KS8851 is not set +CONFIG_KS8851_MLL=m +CONFIG_KSZ884X_PCI=m +CONFIG_NET_VENDOR_MICROCHIP=y +# CONFIG_ENC28J60 is not set +CONFIG_NET_VENDOR_MYRI=y +CONFIG_MYRI10GE=m +CONFIG_MYRI10GE_DCA=y +CONFIG_FEALNX=m +CONFIG_NET_VENDOR_NATSEMI=y +CONFIG_NATSEMI=m +CONFIG_NS83820=m +CONFIG_NET_VENDOR_8390=y +CONFIG_PCMCIA_AXNET=m +CONFIG_NE2K_PCI=m +CONFIG_PCMCIA_PCNET=m +CONFIG_NET_VENDOR_NVIDIA=y +CONFIG_FORCEDETH=m +CONFIG_NET_VENDOR_OKI=y +CONFIG_PCH_GBE=m +CONFIG_ETHOC=m +CONFIG_NET_PACKET_ENGINE=y +CONFIG_HAMACHI=m +CONFIG_YELLOWFIN=m +CONFIG_NET_VENDOR_QLOGIC=y +CONFIG_QLA3XXX=m +CONFIG_QLCNIC=m +CONFIG_QLGE=m +CONFIG_NETXEN_NIC=m +CONFIG_NET_VENDOR_REALTEK=y +CONFIG_ATP=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_R8169=m +CONFIG_NET_VENDOR_RDC=y +CONFIG_R6040=m +CONFIG_NET_VENDOR_SEEQ=y +CONFIG_NET_VENDOR_SILAN=y +CONFIG_SC92031=m +CONFIG_NET_VENDOR_SIS=y +CONFIG_SIS900=m +CONFIG_SIS190=m +CONFIG_SFC=m +CONFIG_SFC_MTD=y +CONFIG_SFC_MCDI_MON=y +CONFIG_SFC_SRIOV=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_PCMCIA_SMC91C92=m +CONFIG_EPIC100=m +CONFIG_SMSC9420=m +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=m +# CONFIG_STMMAC_PLATFORM is not set +CONFIG_STMMAC_PCI=y +# CONFIG_STMMAC_DEBUG_FS is not set +# CONFIG_STMMAC_DA is not set +CONFIG_STMMAC_RING=y +# CONFIG_STMMAC_CHAINED is not set +CONFIG_NET_VENDOR_SUN=y +CONFIG_HAPPYMEAL=m +CONFIG_SUNGEM=m +CONFIG_CASSINI=m +CONFIG_NIU=m +CONFIG_NET_VENDOR_TEHUTI=y +CONFIG_TEHUTI=m +CONFIG_NET_VENDOR_TI=y +CONFIG_TLAN=m +CONFIG_NET_VENDOR_VIA=y +CONFIG_VIA_RHINE=m +# CONFIG_VIA_RHINE_MMIO is not set +CONFIG_VIA_VELOCITY=m +CONFIG_NET_VENDOR_WIZNET=y +CONFIG_WIZNET_W5100=m +CONFIG_WIZNET_W5300=m +# CONFIG_WIZNET_BUS_DIRECT is not set +# CONFIG_WIZNET_BUS_INDIRECT is not set +CONFIG_WIZNET_BUS_ANY=y +CONFIG_NET_VENDOR_XIRCOM=y +CONFIG_PCMCIA_XIRC2PS=m +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_NET_SB1000=m +CONFIG_PHYLIB=m + +# +# MII PHY device drivers +# +CONFIG_AT803X_PHY=m +CONFIG_AMD_PHY=m +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_BCM87XX_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_MICREL_KS8995MA is not set +CONFIG_PLIP=m +CONFIG_PPP=m +CONFIG_PPP_BSDCOMP=m +CONFIG_PPP_DEFLATE=m +CONFIG_PPP_FILTER=y +CONFIG_PPP_MPPE=m +CONFIG_PPP_MULTILINK=y +CONFIG_PPPOATM=m +CONFIG_PPPOE=m +CONFIG_PPTP=m +CONFIG_PPPOL2TP=m +CONFIG_PPP_ASYNC=m +CONFIG_PPP_SYNC_TTY=m +CONFIG_SLIP=m +CONFIG_SLHC=m +# CONFIG_SLIP_COMPRESSED is not set +# CONFIG_SLIP_SMART is not set +# CONFIG_SLIP_MODE_SLIP6 is not set + +# +# 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_AX88179_178A=m +CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_CDC_NCM=m +CONFIG_USB_NET_CDC_MBIM=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_NET_QMI_WWAN=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_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_CARDS=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_BTCOEX_SUPPORT=y +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_CARL9170_HWRNG is not set +CONFIG_ATH6KL=m +CONFIG_ATH6KL_SDIO=m +CONFIG_ATH6KL_USB=m +# CONFIG_ATH6KL_DEBUG is not set +CONFIG_AR5523=m +CONFIG_WIL6210=m +CONFIG_WIL6210_ISR_COR=y +CONFIG_B43=m +CONFIG_B43_BCMA=y +# CONFIG_B43_BCMA_EXTRA is not set +CONFIG_B43_SSB=y +CONFIG_B43_PCI_AUTOSELECT=y +CONFIG_B43_PCICORE_AUTOSELECT=y +CONFIG_B43_PCMCIA=y +CONFIG_B43_SDIO=y +CONFIG_B43_BCMA_PIO=y +CONFIG_B43_PIO=y +CONFIG_B43_PHY_N=y +CONFIG_B43_PHY_LP=y +CONFIG_B43_PHY_HT=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_BRCMUTIL=m +CONFIG_BRCMSMAC=m +CONFIG_BRCMFMAC=m +CONFIG_BRCMFMAC_SDIO=y +# CONFIG_BRCMFMAC_SDIO_OOB is not set +CONFIG_BRCMFMAC_USB=y +# CONFIG_BRCM_TRACING is not set +# CONFIG_BRCMDBG 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 is not set +# CONFIG_IPW2200 is not set +CONFIG_IWLWIFI=m +CONFIG_IWLDVM=m +CONFIG_IWLMVM=m + +# +# Debugging Options +# +# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEVICE_TRACING=y +# CONFIG_IWLWIFI_P2P is not set +CONFIG_IWLEGACY=m +CONFIG_IWL4965=m +CONFIG_IWL3945=m + +# +# iwl3945 / iwl4965 Debugging Options +# +# CONFIG_IWLEGACY_DEBUG is not set +CONFIG_LIBERTAS=m +CONFIG_LIBERTAS_USB=m +CONFIG_LIBERTAS_CS=m +CONFIG_LIBERTAS_SDIO=m +# CONFIG_LIBERTAS_SPI is not set +# 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 is not set +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_RT2800PCI_RT3290=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_MMIO=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_RTLWIFI=m +# CONFIG_RTLWIFI_DEBUG is not set +CONFIG_RTL8192CE=m +CONFIG_RTL8192SE=m +CONFIG_RTL8192DE=m +CONFIG_RTL8723AE=m +CONFIG_RTL8192CU=m +CONFIG_RTL8192C_COMMON=m +CONFIG_WL_TI=y +CONFIG_WL1251=m +# CONFIG_WL1251_SPI is not set +CONFIG_WL1251_SDIO=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE=m +# CONFIG_WLCORE_SPI is not set +CONFIG_WLCORE_SDIO=m +CONFIG_WILINK_PLATFORM_DATA=y +CONFIG_ZD1211RW=m +# CONFIG_ZD1211RW_DEBUG is not set +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_MWIFIEX_USB=m + +# +# WiMAX Wireless Broadband devices +# +CONFIG_WIMAX_I2400M=m +CONFIG_WIMAX_I2400M_USB=m +CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8 +# CONFIG_WAN is not set +CONFIG_IEEE802154_DRIVERS=m +CONFIG_IEEE802154_FAKEHARD=m +CONFIG_IEEE802154_FAKELB=m +CONFIG_IEEE802154_AT86RF230=m +# CONFIG_IEEE802154_MRF24J40 is not set +CONFIG_XEN_NETDEV_FRONTEND=m +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_VMXNET3=m +CONFIG_HYPERV_NET=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_3=y +CONFIG_HISAX_TELESPCI=y +CONFIG_HISAX_S0BOX=y +CONFIG_HISAX_FRITZPCI=y +CONFIG_HISAX_AVM_A1_PCMCIA=y +CONFIG_HISAX_ELSA=y +CONFIG_HISAX_DIEHLDIVA=y +CONFIG_HISAX_SEDLBAUER=y +CONFIG_HISAX_NETJET=y +CONFIG_HISAX_NETJET_U=y +CONFIG_HISAX_NICCY=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_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_B1PCI=m +CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y +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 + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_FF_MEMLESS=m +CONFIG_INPUT_POLLDEV=m +CONFIG_INPUT_SPARSEKMAP=m +CONFIG_INPUT_MATRIXKMAP=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 is not set +# CONFIG_KEYBOARD_GPIO_POLLED is not set +CONFIG_KEYBOARD_TCA6416=m +CONFIG_KEYBOARD_TCA8418=m +CONFIG_KEYBOARD_MATRIX=m +# CONFIG_KEYBOARD_LM8323 is not set +CONFIG_KEYBOARD_LM8333=m +# 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_CYPRESS=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_CYAPA=m +CONFIG_MOUSE_VSXXXAA=m +# CONFIG_MOUSE_GPIO is not set +CONFIG_MOUSE_SYNAPTICS_I2C=m +CONFIG_MOUSE_SYNAPTICS_USB=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 is not set +# CONFIG_TOUCHSCREEN_AD7877 is not set +CONFIG_TOUCHSCREEN_AD7879=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +# CONFIG_TOUCHSCREEN_AD7879_SPI is not set +CONFIG_TOUCHSCREEN_ATMEL_MXT=m +CONFIG_TOUCHSCREEN_AUO_PIXCIR=m +CONFIG_TOUCHSCREEN_BU21013=m +CONFIG_TOUCHSCREEN_CY8CTMG110=m +CONFIG_TOUCHSCREEN_CYTTSP_CORE=m +CONFIG_TOUCHSCREEN_CYTTSP_I2C=m +# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set +CONFIG_TOUCHSCREEN_DYNAPRO=m +CONFIG_TOUCHSCREEN_HAMPSHIRE=m +CONFIG_TOUCHSCREEN_EETI=m +CONFIG_TOUCHSCREEN_FUJITSU=m +CONFIG_TOUCHSCREEN_ILI210X=m +CONFIG_TOUCHSCREEN_GUNZE=m +CONFIG_TOUCHSCREEN_ELO=m +CONFIG_TOUCHSCREEN_WACOM_W8001=m +CONFIG_TOUCHSCREEN_WACOM_I2C=m +CONFIG_TOUCHSCREEN_MAX11801=m +CONFIG_TOUCHSCREEN_MCS5000=m +CONFIG_TOUCHSCREEN_MMS114=m +CONFIG_TOUCHSCREEN_MTOUCH=m +CONFIG_TOUCHSCREEN_INEXIO=m +CONFIG_TOUCHSCREEN_MK712=m +CONFIG_TOUCHSCREEN_PENMOUNT=m +CONFIG_TOUCHSCREEN_EDT_FT5X06=m +CONFIG_TOUCHSCREEN_TOUCHRIGHT=m +CONFIG_TOUCHSCREEN_TOUCHWIN=m +CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m +CONFIG_TOUCHSCREEN_UCB1400=m +CONFIG_TOUCHSCREEN_PIXCIR=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_ELO=y +CONFIG_TOUCHSCREEN_USB_E2I=y +CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y +CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y +CONFIG_TOUCHSCREEN_USB_NEXIO=y +CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y +CONFIG_TOUCHSCREEN_TOUCHIT213=m +CONFIG_TOUCHSCREEN_TSC_SERIO=m +# CONFIG_TOUCHSCREEN_TSC2005 is not set +CONFIG_TOUCHSCREEN_TSC2007=m +CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_TPS6507X=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_AD714X=m +CONFIG_INPUT_AD714X_I2C=m +CONFIG_INPUT_AD714X_SPI=m +CONFIG_INPUT_BMA150=m +CONFIG_INPUT_PCSPKR=m +CONFIG_INPUT_MC13783_PWRBUTTON=m +CONFIG_INPUT_MMA8450=m +CONFIG_INPUT_MPU3050=m +CONFIG_INPUT_APANEL=m +CONFIG_INPUT_GP2A=m +# CONFIG_INPUT_GPIO_TILT_POLLED is not set +CONFIG_INPUT_ATLAS_BTNS=m +CONFIG_INPUT_ATI_REMOTE2=m +CONFIG_INPUT_KEYSPAN_REMOTE=m +CONFIG_INPUT_KXTJ9=m +# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set +CONFIG_INPUT_POWERMATE=m +CONFIG_INPUT_YEALINK=m +CONFIG_INPUT_CM109=m +CONFIG_INPUT_RETU_PWRBUTTON=m +CONFIG_INPUT_UINPUT=m +CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_PCF8574=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m +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_SERIO_ARC_PS2=m +CONFIG_GAMEPORT=m +CONFIG_GAMEPORT_NS558=m +CONFIG_GAMEPORT_L4=m +CONFIG_GAMEPORT_EMU10K1=m +CONFIG_GAMEPORT_FM801=m + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=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_DEPRECATED_OPTIONS is not set +CONFIG_SERIAL_8250_PNP=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_PCI=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 +CONFIG_SERIAL_8250_DW=m + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +CONFIG_SERIAL_MFD_HSU=m +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_JSM=m +CONFIG_SERIAL_SCCNXP=m +# CONFIG_SERIAL_TIMBERDALE is not set +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 is not set +CONFIG_SERIAL_PCH_UART=m +CONFIG_SERIAL_ARC=m +CONFIG_SERIAL_ARC_NR_PORTS=1 +CONFIG_SERIAL_RP2=m +CONFIG_SERIAL_RP2_NR_UARTS=32 +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_HVC_XEN_FRONTEND=y +CONFIG_VIRTIO_CONSOLE=m +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_VIA=m +CONFIG_HW_RANDOM_VIRTIO=m +CONFIG_HW_RANDOM_TPM=m +CONFIG_NVRAM=m +CONFIG_R3964=m +CONFIG_APPLICOM=m + +# +# PCMCIA character devices +# +CONFIG_SYNCLINK_CS=m +CONFIG_CARDMAN_4000=m +CONFIG_CARDMAN_4040=m +CONFIG_IPWIRELESS=m +CONFIG_MWAVE=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_TIS_I2C_INFINEON=m +CONFIG_TCG_NSC=m +CONFIG_TCG_ATMEL=m +CONFIG_TCG_INFINEON=m +CONFIG_TCG_ST33_I2C=m +CONFIG_TELCLOCK=m +CONFIG_DEVPORT=y +CONFIG_I2C=m +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=m +# CONFIG_I2C_MUX is not set +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_ISMT=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_CBUS_GPIO is not set +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PCI=m +CONFIG_I2C_EG20T=m +# CONFIG_I2C_GPIO is not set +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 + +# +# 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 +CONFIG_I2C_VIPERBOARD=m + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_STUB is not set +# 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 is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_BUTTERFLY is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_LM70_LLP is not set +# CONFIG_SPI_OC_TINY is not set +CONFIG_SPI_PXA2XX_DMA=y +CONFIG_SPI_PXA2XX=m +CONFIG_SPI_PXA2XX_PCI=m +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_TOPCLIFF_PCH is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_DESIGNWARE is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_HSI is not set + +# +# 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 +CONFIG_PPS_CLIENT_GPIO=m + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=m +CONFIG_DP83640_PHY=m +CONFIG_PTP_1588_CLOCK_PCH=m +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_ACPI=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y + +# +# Memory mapped GPIO drivers: +# +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_IT8761E is not set +# CONFIG_GPIO_TS5500 is not set +CONFIG_GPIO_SCH=m +CONFIG_GPIO_ICH=m +# CONFIG_GPIO_VX855 is not set +# CONFIG_GPIO_LYNXPOINT is not set + +# +# I2C GPIO expanders: +# +CONFIG_GPIO_ARIZONA=m +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_ADP5588 is not set + +# +# PCI GPIO expanders: +# +CONFIG_GPIO_CS5535=m +CONFIG_GPIO_AMD8111=m +CONFIG_GPIO_LANGWELL=y +# CONFIG_GPIO_PCH is not set +# CONFIG_GPIO_ML_IOH is not set +# CONFIG_GPIO_RDC321X is not set + +# +# SPI GPIO expanders: +# +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MCP23S08 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_74X164 is not set + +# +# AC97 GPIO expanders: +# +CONFIG_GPIO_UCB1400=y + +# +# MODULbus GPIO expanders: +# + +# +# USB GPIO expanders: +# +CONFIG_GPIO_VIPERBOARD=m +# CONFIG_W1 is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +CONFIG_PDA_POWER=m +CONFIG_TEST_POWER=m +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_BATTERY_BQ27x00 is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_PCF50633 is not set +# CONFIG_CHARGER_ISP1704 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GOLDFISH is not set +CONFIG_POWER_RESET=y +CONFIG_POWER_AVS=y +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_AD7314 is not set +CONFIG_SENSORS_AD7414=m +CONFIG_SENSORS_AD7418=m +# CONFIG_SENSORS_ADCXX is not set +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_ADT7410=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 is not set +CONFIG_SENSORS_HIH6130=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 is not set +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_LM95245=m +# CONFIG_SENSORS_MAX1111 is not set +CONFIG_SENSORS_MAX16065=m +CONFIG_SENSORS_MAX1619=m +CONFIG_SENSORS_MAX1668=m +CONFIG_SENSORS_MAX197=m +CONFIG_SENSORS_MAX6639=m +CONFIG_SENSORS_MAX6642=m +CONFIG_SENSORS_MAX6650=m +CONFIG_SENSORS_MAX6697=m +CONFIG_SENSORS_MCP3021=m +CONFIG_SENSORS_NTC_THERMISTOR=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_LM25066=m +CONFIG_SENSORS_LTC2978=m +CONFIG_SENSORS_MAX16064=m +CONFIG_SENSORS_MAX34440=m +CONFIG_SENSORS_MAX8688=m +CONFIG_SENSORS_UCD9000=m +CONFIG_SENSORS_UCD9200=m +CONFIG_SENSORS_ZL6100=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_SCH56XX_COMMON=m +CONFIG_SENSORS_SCH5627=m +CONFIG_SENSORS_SCH5636=m +CONFIG_SENSORS_ADS1015=m +CONFIG_SENSORS_ADS7828=m +# CONFIG_SENSORS_ADS7871 is not set +CONFIG_SENSORS_AMC6821=m +CONFIG_SENSORS_INA209=m +CONFIG_SENSORS_INA2XX=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_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_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +CONFIG_THERMAL_GOV_FAIR_SHARE=y +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_USER_SPACE is not set +# CONFIG_CPU_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +CONFIG_INTEL_POWERCLAMP=m +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set + +# +# Watchdog Device Drivers +# +CONFIG_SOFT_WATCHDOG=m +CONFIG_RETU_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_IE6XX_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_CPU5_WDT=m +CONFIG_SMSC_SCH311X_WDT=m +CONFIG_SMSC37B787_WDT=m +CONFIG_VIA_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 + +# +# 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_SSB_DRIVER_GPIO=y +CONFIG_BCMA_POSSIBLE=y + +# +# Broadcom specific AMBA +# +CONFIG_BCMA=m +CONFIG_BCMA_BLOCKIO=y +CONFIG_BCMA_HOST_PCI_POSSIBLE=y +CONFIG_BCMA_HOST_PCI=y +CONFIG_BCMA_DRIVER_GMAC_CMN=y +CONFIG_BCMA_DRIVER_GPIO=y +# CONFIG_BCMA_DEBUG is not set + +# +# Multifunction device drivers +# +CONFIG_MFD_CORE=y +CONFIG_MFD_SM501=m +CONFIG_MFD_SM501_GPIO=y +CONFIG_MFD_RTSX_PCI=m +CONFIG_MFD_TI_AM335X_TSCADC=m +CONFIG_HTC_PASIC3=m +CONFIG_UCB1400_CORE=m +CONFIG_MFD_LM3533=m +# CONFIG_TPS6105X is not set +CONFIG_TPS65010=m +CONFIG_TPS6507X=m +CONFIG_MFD_TPS65217=m +# CONFIG_MFD_TPS65912_SPI is not set +# CONFIG_MFD_STMPE is not set +# CONFIG_MFD_TMIO is not set +# CONFIG_MFD_DA9052_SPI is not set +CONFIG_MFD_ARIZONA=y +CONFIG_MFD_ARIZONA_I2C=m +# CONFIG_MFD_ARIZONA_SPI is not set +CONFIG_MFD_WM5102=y +CONFIG_MFD_WM5110=y +# CONFIG_MFD_WM831X_SPI is not set +CONFIG_MFD_PCF50633=m +CONFIG_PCF50633_ADC=m +CONFIG_PCF50633_GPIO=m +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX=m +# CONFIG_MFD_MC13XXX_SPI is not set +CONFIG_MFD_MC13XXX_I2C=m +CONFIG_ABX500_CORE=y +# CONFIG_EZX_PCAP is not set +CONFIG_MFD_CS5535=m +# CONFIG_MFD_TIMBERDALE is not set +CONFIG_LPC_SCH=m +CONFIG_LPC_ICH=m +CONFIG_MFD_RDC321X=m +# CONFIG_MFD_JANZ_CMODIO is not set +CONFIG_MFD_VX855=m +CONFIG_MFD_WL1273_CORE=m +CONFIG_MFD_VIPERBOARD=m +CONFIG_MFD_RETU=m +# CONFIG_REGULATOR is not set +CONFIG_MEDIA_SUPPORT=m + +# +# Multimedia core support +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_RC_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_DEV=m +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_VIDEO_V4L2=m +# CONFIG_VIDEO_ADV_DEBUG is not set +# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set +CONFIG_VIDEO_TUNER=m +CONFIG_V4L2_MEM2MEM_DEV=m +CONFIG_VIDEOBUF_GEN=m +CONFIG_VIDEOBUF_DMA_SG=m +CONFIG_VIDEOBUF_VMALLOC=m +CONFIG_VIDEOBUF_DVB=m +CONFIG_VIDEOBUF2_CORE=m +CONFIG_VIDEOBUF2_MEMOPS=m +CONFIG_VIDEOBUF2_DMA_CONTIG=m +CONFIG_VIDEOBUF2_VMALLOC=m +# CONFIG_VIDEO_V4L2_INT_DEVICE is not set +CONFIG_DVB_CORE=m +CONFIG_DVB_NET=y +CONFIG_TTPCI_EEPROM=m +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set + +# +# Media drivers +# +CONFIG_RC_CORE=m +CONFIG_RC_MAP=m +CONFIG_RC_DECODERS=y +CONFIG_LIRC=m +CONFIG_IR_LIRC_CODEC=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_SANYO_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_RC_DEVICES=y +CONFIG_RC_ATI_REMOTE=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_IR_IGUANA=m +CONFIG_IR_TTUSBIR=m +CONFIG_RC_LOOPBACK=m +CONFIG_IR_GPIO_CIR=m +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# +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_JL2005BCD=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_SE401=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_TOPRO=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_USB_PWC=m +# CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y +CONFIG_VIDEO_CPIA2=m +CONFIG_USB_ZR364XX=m +CONFIG_USB_STKWEBCAM=m +CONFIG_USB_S2255=m +CONFIG_USB_SN9C102=m + +# +# Analog TV USB devices +# +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_TLG2300=m +CONFIG_VIDEO_USBVISION=m +CONFIG_VIDEO_STK1160=m +CONFIG_VIDEO_STK1160_AC97=y + +# +# Analog/digital TV USB devices +# +CONFIG_VIDEO_AU0828=m +CONFIG_VIDEO_AU0828_V4L2=y +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_RC=y +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m + +# +# Digital TV USB devices +# +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_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_PCTV452E=m +CONFIG_DVB_USB_DW2102=m +CONFIG_DVB_USB_CINERGY_T2=m +CONFIG_DVB_USB_DTV5100=m +CONFIG_DVB_USB_FRIIO=m +CONFIG_DVB_USB_AZ6027=m +CONFIG_DVB_USB_TECHNISAT_USB2=m +CONFIG_DVB_USB_V2=m +CONFIG_DVB_USB_CYPRESS_FIRMWARE=m +CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_AF9035=m +CONFIG_DVB_USB_ANYSEE=m +CONFIG_DVB_USB_AU6610=m +CONFIG_DVB_USB_AZ6007=m +CONFIG_DVB_USB_CE6230=m +CONFIG_DVB_USB_EC168=m +CONFIG_DVB_USB_GL861=m +CONFIG_DVB_USB_IT913X=m +CONFIG_DVB_USB_LME2510=m +CONFIG_DVB_USB_MXL111SF=m +CONFIG_DVB_USB_RTL28XXU=m +CONFIG_DVB_TTUSB_BUDGET=m +CONFIG_DVB_TTUSB_DEC=m +CONFIG_SMS_USB_DRV=m +CONFIG_DVB_B2C2_FLEXCOP_USB=m +# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set + +# +# Webcam, TV (analog/digital) USB devices +# +CONFIG_VIDEO_EM28XX=m +CONFIG_VIDEO_EM28XX_ALSA=m +CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_EM28XX_RC=m +CONFIG_MEDIA_PCI_SUPPORT=y + +# +# Media capture support +# +CONFIG_VIDEO_MEYE=m + +# +# Media capture/analog TV support +# +CONFIG_VIDEO_IVTV=m +CONFIG_VIDEO_IVTV_ALSA=m +CONFIG_VIDEO_FB_IVTV=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_HEXIUM_GEMINI=m +CONFIG_VIDEO_HEXIUM_ORION=m +CONFIG_VIDEO_MXB=m + +# +# Media capture/analog/hybrid TV support +# +CONFIG_VIDEO_CX18=m +CONFIG_VIDEO_CX18_ALSA=m +CONFIG_VIDEO_CX23885=m +CONFIG_MEDIA_ALTERA_CI=m +CONFIG_VIDEO_CX25821=m +CONFIG_VIDEO_CX25821_ALSA=m +CONFIG_VIDEO_CX88=m +CONFIG_VIDEO_CX88_ALSA=m +CONFIG_VIDEO_CX88_BLACKBIRD=m +CONFIG_VIDEO_CX88_DVB=m +CONFIG_VIDEO_CX88_VP3054=m +CONFIG_VIDEO_CX88_MPEG=m +CONFIG_VIDEO_BT848=m +CONFIG_DVB_BT8XX=m +CONFIG_VIDEO_SAA7134=m +CONFIG_VIDEO_SAA7134_ALSA=m +CONFIG_VIDEO_SAA7134_RC=y +CONFIG_VIDEO_SAA7134_DVB=m +CONFIG_VIDEO_SAA7164=m + +# +# Media digital TV PCI Adapters +# +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 +CONFIG_DVB_B2C2_FLEXCOP_PCI=m +# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set +CONFIG_DVB_PLUTO2=m +CONFIG_DVB_DM1105=m +CONFIG_DVB_PT1=m +CONFIG_MANTIS_CORE=m +CONFIG_DVB_MANTIS=m +CONFIG_DVB_HOPPER=m +CONFIG_DVB_NGENE=m +CONFIG_DVB_DDBRIDGE=m +# CONFIG_V4L_PLATFORM_DRIVERS is not set +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m +CONFIG_VIDEO_SH_VEU=m +# CONFIG_V4L_TEST_DRIVERS is not set + +# +# Supported MMC/SDIO adapters +# +CONFIG_SMS_SDIO_DRV=m +CONFIG_MEDIA_PARPORT_SUPPORT=y +CONFIG_VIDEO_BWQCAM=m +CONFIG_VIDEO_CQCAM=m +CONFIG_VIDEO_W9966=m +CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_SI470X=y +CONFIG_USB_SI470X=m +CONFIG_I2C_SI470X=m +CONFIG_USB_MR800=m +CONFIG_USB_DSBR=m +CONFIG_RADIO_MAXIRADIO=m +CONFIG_RADIO_SHARK=m +CONFIG_RADIO_SHARK2=m +CONFIG_I2C_SI4713=m +CONFIG_RADIO_SI4713=m +CONFIG_USB_KEENE=m +CONFIG_USB_MA901=m +CONFIG_RADIO_TEA5764=m +CONFIG_RADIO_SAA7706H=m +CONFIG_RADIO_TEF6862=m +CONFIG_RADIO_WL1273=m + +# +# Texas Instruments WL128x FM driver (ST based) +# +CONFIG_RADIO_WL128X=m + +# +# Supported FireWire (IEEE 1394) Adapters +# +CONFIG_DVB_FIREDTV=m +CONFIG_DVB_FIREDTV_INPUT=y +CONFIG_MEDIA_COMMON_OPTIONS=y + +# +# common driver options +# +CONFIG_VIDEO_CX2341X=m +CONFIG_VIDEO_BTCX=m +CONFIG_VIDEO_TVEEPROM=m +CONFIG_DVB_B2C2_FLEXCOP=m +CONFIG_VIDEO_SAA7146=m +CONFIG_VIDEO_SAA7146_VV=m +CONFIG_SMS_SIANO_MDTV=m +CONFIG_SMS_SIANO_RC=y + +# +# Media ancillary drivers (tuners, sensors, i2c, frontends) +# +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_VIDEO_IR_I2C=m + +# +# 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_WM8775=m +CONFIG_VIDEO_WM8739=m +CONFIG_VIDEO_VP27SMPX=m + +# +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# +# Video decoders +# +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_TVP5150=m +CONFIG_VIDEO_VPX3220=m + +# +# Video and audio decoders +# +CONFIG_VIDEO_SAA717X=m +CONFIG_VIDEO_CX25840=m + +# +# Video encoders +# +CONFIG_VIDEO_SAA7127=m +CONFIG_VIDEO_SAA7185=m +CONFIG_VIDEO_ADV7170=m +CONFIG_VIDEO_ADV7175=m + +# +# Camera sensor devices +# +CONFIG_VIDEO_MT9V011=m + +# +# Flash devices +# + +# +# Video improvement chips +# +CONFIG_VIDEO_UPD64031A=m +CONFIG_VIDEO_UPD64083=m + +# +# Miscelaneous helper chips +# +CONFIG_VIDEO_M52790=m + +# +# Sensors used on soc_camera driver +# +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=m +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_MT2063=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_XC4000=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_FC0011=m +CONFIG_MEDIA_TUNER_FC0012=m +CONFIG_MEDIA_TUNER_FC0013=m +CONFIG_MEDIA_TUNER_TDA18212=m +CONFIG_MEDIA_TUNER_E4000=m +CONFIG_MEDIA_TUNER_FC2580=m +CONFIG_MEDIA_TUNER_TUA9001=m + +# +# Multistandard (satellite) frontends +# +CONFIG_DVB_STB0899=m +CONFIG_DVB_STB6100=m +CONFIG_DVB_STV090x=m +CONFIG_DVB_STV6110x=m + +# +# Multistandard (cable + terrestrial) frontends +# +CONFIG_DVB_DRXK=m +CONFIG_DVB_TDA18271C2DD=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_TS2020=m +CONFIG_DVB_DS3000=m +CONFIG_DVB_MB86A16=m +CONFIG_DVB_TDA10071=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 +CONFIG_DVB_RTL2830=m +CONFIG_DVB_RTL2832=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_LG2160=m +CONFIG_DVB_S5H1409=m +CONFIG_DVB_AU8522=m +CONFIG_DVB_AU8522_DTV=m +CONFIG_DVB_AU8522_V4L=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_LNBP22=m +CONFIG_DVB_ISL6405=m +CONFIG_DVB_ISL6421=m +CONFIG_DVB_ISL6423=m +CONFIG_DVB_A8293=m +CONFIG_DVB_LGS8GXX=m +CONFIG_DVB_ATBM8830=m +CONFIG_DVB_TDA665x=m +CONFIG_DVB_IX2505V=m +CONFIG_DVB_IT913X_FE=m +CONFIG_DVB_M88RS2000=m +CONFIG_DVB_AF9033=m + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set + +# +# Graphics support +# +CONFIG_AGP=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=m +CONFIG_AGP_SIS=m +CONFIG_AGP_VIA=m +CONFIG_VGA_ARB=y +CONFIG_VGA_ARB_MAX_GPUS=16 +CONFIG_VGA_SWITCHEROO=y +CONFIG_DRM=m +CONFIG_DRM_USB=m +CONFIG_DRM_KMS_HELPER=m +CONFIG_DRM_LOAD_EDID_FIRMWARE=y +CONFIG_DRM_TTM=m + +# +# I2C encoder or helper chips +# +CONFIG_DRM_I2C_CH7006=m +CONFIG_DRM_I2C_SIL164=m +CONFIG_DRM_I2C_NXP_TDA998X=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +# CONFIG_DRM_RADEON_UMS is not set +CONFIG_DRM_NOUVEAU=m +CONFIG_NOUVEAU_DEBUG=5 +CONFIG_NOUVEAU_DEBUG_DEFAULT=3 +CONFIG_DRM_NOUVEAU_BACKLIGHT=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_DRM_VMWGFX=m +CONFIG_DRM_VMWGFX_FBCON=y +CONFIG_DRM_GMA500=m +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y +CONFIG_DRM_UDL=m +CONFIG_DRM_AST=m +CONFIG_DRM_MGAG200=m +CONFIG_DRM_CIRRUS_QEMU=m +CONFIG_VGASTATE=m +CONFIG_VIDEO_OUTPUT_CONTROL=m +CONFIG_HDMI=y +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +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_I740 is not set +# 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=m +CONFIG_FB_VIA_DIRECT_PROCFS=y +CONFIG_FB_VIA_X_COMPATIBILITY=y +# 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=m +# 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_SMSCUFX is not set +CONFIG_FB_UDL=m +# CONFIG_FB_GOLDFISH is not set +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_FB_AUO_K190X is not set +# CONFIG_EXYNOS_VIDEO is not set +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=m +# CONFIG_LCD_L4F00242T03 is not set +# CONFIG_LCD_LMS283GF05 is not set +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +CONFIG_LCD_PLATFORM=m +# CONFIG_LCD_S6E63M0 is not set +# CONFIG_LCD_LD9040 is not set +# CONFIG_LCD_AMS369FG06 is not set +# CONFIG_LCD_LMS501KF03 is not set +# CONFIG_LCD_HX8357 is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_BACKLIGHT_LM3533=m +CONFIG_BACKLIGHT_APPLE=m +# CONFIG_BACKLIGHT_SAHARA is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +CONFIG_BACKLIGHT_PCF50633=m +# CONFIG_BACKLIGHT_LM3630 is not set +# CONFIG_BACKLIGHT_LM3639 is not set +# CONFIG_BACKLIGHT_LP855X is not set +# CONFIG_BACKLIGHT_OT200 is not set +# CONFIG_BACKLIGHT_TPS65217 is not set + +# +# Console display driver support +# +CONFIG_VGA_CONSOLE=y +# CONFIG_VGACON_SOFT_SCROLLBACK 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_FONT_AUTOSELECT=y +# 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_KCTL_JACK=y +CONFIG_SND_DMA_SGBUF=y +CONFIG_SND_RAWMIDI_SEQ=m +CONFIG_SND_OPL3_LIB_SEQ=m +# CONFIG_SND_OPL4_LIB_SEQ is not set +# CONFIG_SND_SBAWE_SEQ is not set +CONFIG_SND_EMU10K1_SEQ=m +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_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_SB_COMMON=m +CONFIG_SND_SB16_DSP=m +CONFIG_SND_TEA575X=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_HDA_INTEL=m +CONFIG_SND_HDA_DSP_LOADER=y +CONFIG_SND_HDA_PREALLOC_SIZE=4096 +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_CA0132=y +CONFIG_SND_HDA_CODEC_CA0132_DSP=y +CONFIG_SND_HDA_CODEC_CMEDIA=y +CONFIG_SND_HDA_CODEC_SI3054=y +CONFIG_SND_HDA_GENERIC=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_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_SCS1X=m +CONFIG_SND_PCMCIA=y +CONFIG_SND_VXPOCKET=m +CONFIG_SND_PDAUDIOCF=m +# CONFIG_SND_SOC is not set +# CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=m + +# +# HID support +# +CONFIG_HID=m +CONFIG_HIDRAW=y +CONFIG_UHID=m +CONFIG_HID_GENERIC=m + +# +# Special HID drivers +# +CONFIG_HID_A4TECH=m +CONFIG_HID_ACRUX=m +CONFIG_HID_ACRUX_FF=y +CONFIG_HID_APPLE=m +CONFIG_HID_AUREAL=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_HOLTEK=m +CONFIG_HOLTEK_FF=y +CONFIG_HID_KEYTOUCH=m +CONFIG_HID_KYE=m +CONFIG_HID_UCLOGIC=m +CONFIG_HID_WALTOP=m +CONFIG_HID_GYRATION=m +CONFIG_HID_ICADE=m +CONFIG_HID_TWINHAN=m +CONFIG_HID_KENSINGTON=m +CONFIG_HID_LCPOWER=m +CONFIG_HID_LENOVO_TPKBD=m +CONFIG_HID_LOGITECH=m +CONFIG_HID_LOGITECH_DJ=m +CONFIG_LOGITECH_FF=y +CONFIG_LOGIRUMBLEPAD2_FF=y +CONFIG_LOGIG940_FF=y +CONFIG_LOGIWHEELS_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_PICOLCD_CIR=y +CONFIG_HID_PRIMAX=m +CONFIG_HID_PS3REMOTE=m +CONFIG_HID_ROCCAT=m +CONFIG_HID_SAITEK=m +CONFIG_HID_SAMSUNG=m +CONFIG_HID_SONY=m +CONFIG_HID_SPEEDLINK=m +CONFIG_HID_STEELSERIES=m +CONFIG_HID_SUNPLUS=m +CONFIG_HID_GREENASIA=m +CONFIG_GREENASIA_FF=y +CONFIG_HID_HYPERV_MOUSE=m +CONFIG_HID_SMARTJOYPLUS=m +CONFIG_SMARTJOYPLUS_FF=y +CONFIG_HID_TIVO=m +CONFIG_HID_TOPSEED=m +CONFIG_HID_THINGM=m +CONFIG_HID_THRUSTMASTER=m +CONFIG_THRUSTMASTER_FF=y +CONFIG_HID_WACOM=m +CONFIG_HID_WIIMOTE=m +CONFIG_HID_WIIMOTE_EXT=y +CONFIG_HID_ZEROPLUS=m +CONFIG_ZEROPLUS_FF=y +CONFIG_HID_ZYDACRON=m +CONFIG_HID_SENSOR_HUB=m + +# +# USB HID support +# +CONFIG_USB_HID=m +CONFIG_HID_PID=y +CONFIG_USB_HIDDEV=y + +# +# I2C HID support +# +CONFIG_I2C_HID=m +CONFIG_USB_ARCH_HAS_OHCI=y +CONFIG_USB_ARCH_HAS_EHCI=y +CONFIG_USB_ARCH_HAS_XHCI=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=m +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=m +# CONFIG_USB_DEBUG is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DYNAMIC_MINORS=y +CONFIG_USB_SUSPEND=y +# CONFIG_USB_OTG is not set +# CONFIG_USB_DWC3 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_EHCI_PCI=m +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_HCD_PLATFORM is not set +# CONFIG_USB_EHCI_HCD_PLATFORM 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_RENESAS_USBHS_HCD=m +CONFIG_USB_WHCI_HCD=m +CONFIG_USB_HWA_HCD=m +# CONFIG_USB_HCD_BCMA is not set +# CONFIG_USB_HCD_SSB is not set +CONFIG_USB_MUSB_HDRC=m +CONFIG_USB_MUSB_TUSB6010=m +CONFIG_MUSB_PIO_ONLY=y +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +# CONFIG_USB_CHIPIDEA_DEBUG is not set +CONFIG_USB_RENESAS_USBHS=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_REALTEK_AUTOPM=y +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 + +# +# USB Imaging devices +# +CONFIG_USB_MDC800=m +CONFIG_USB_MICROTEK=m + +# +# USB port drivers +# +CONFIG_USB_USS720=m +CONFIG_USB_SERIAL=m +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_F81232=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_METRO=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_XSENS_MT=m +CONFIG_USB_SERIAL_ZIO=m +CONFIG_USB_SERIAL_ZTE=m +CONFIG_USB_SERIAL_SSU100=m +CONFIG_USB_SERIAL_QT2=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_EZUSB_FX2=m +CONFIG_USB_HSIC_USB3503=m + +# +# USB Physical Layer drivers +# +# CONFIG_OMAP_USB3 is not set +# CONFIG_OMAP_CONTROL_USB is not set +CONFIG_USB_ISP1301=m +CONFIG_USB_RCAR_PHY=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_STORAGE_NUM_BUFFERS=2 + +# +# USB Peripheral Controller +# +CONFIG_USB_R8A66597=m +CONFIG_USB_RENESAS_USBHS_UDC=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_GADGET_MUSB_HDRC=m +CONFIG_USB_M66592=m +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +CONFIG_USB_NET2272_DMA=y +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_DUMMY_HCD=m +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_U_SERIAL=m +# CONFIG_USB_ZERO is not set +CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set +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_MASS_STORAGE=m +CONFIG_USB_GADGET_TARGET=m +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_ACM_MS 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 is not set +CONFIG_NOP_USB_XCEIV=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 is not set + +# +# 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_ACPI=m +CONFIG_MMC_SDHCI_PLTFM=m +CONFIG_MMC_WBSD=m +CONFIG_MMC_TIFM_SD=m +# CONFIG_MMC_SPI is not set +CONFIG_MMC_SDRICOH_CS=m +CONFIG_MMC_CB710=m +CONFIG_MMC_VIA_SDMMC=m +CONFIG_MMC_VUB300=m +CONFIG_MMC_USHC=m +CONFIG_MMC_REALTEK_PCI=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_MEMSTICK_REALTEK_PCI=m +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# +# LED drivers +# +CONFIG_LEDS_LM3530=m +CONFIG_LEDS_LM3533=m +CONFIG_LEDS_LM3642=m +CONFIG_LEDS_PCA9532=m +# CONFIG_LEDS_PCA9532_GPIO is not set +# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP55XX_COMMON=m +CONFIG_LEDS_LP5521=m +CONFIG_LEDS_LP5523=m +CONFIG_LEDS_CLEVO_MAIL=m +CONFIG_LEDS_PCA955X=m +CONFIG_LEDS_PCA9633=m +# CONFIG_LEDS_DAC124S085 is not set +CONFIG_LEDS_BD2802=m +CONFIG_LEDS_INTEL_SS4200=m +CONFIG_LEDS_LT3593=m +CONFIG_LEDS_DELL_NETBOOKS=m +CONFIG_LEDS_MC13783=m +CONFIG_LEDS_TCA6507=m +CONFIG_LEDS_LM355x=m +CONFIG_LEDS_OT200=m +CONFIG_LEDS_BLINKM=m +CONFIG_LEDS_TRIGGERS=y + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGER_TIMER=m +CONFIG_LEDS_TRIGGER_ONESHOT=m +CONFIG_LEDS_TRIGGER_HEARTBEAT=m +CONFIG_LEDS_TRIGGER_BACKLIGHT=m +# CONFIG_LEDS_TRIGGER_CPU is not set +CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_ACCESSIBILITY=y +CONFIG_A11Y_BRAILLE_CONSOLE=y +# CONFIG_INFINIBAND is not set +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +CONFIG_EDAC_DECODE_MCE=m +CONFIG_EDAC_MCE_INJ=m +CONFIG_EDAC_MM_EDAC=m +CONFIG_EDAC_AMD64=m +# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set +CONFIG_EDAC_E752X=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_I5000=m +CONFIG_EDAC_I5100=m +CONFIG_EDAC_I7300=m +CONFIG_EDAC_SBRIDGE=m +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +# 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_PCF8523=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 is not set +# CONFIG_RTC_DRV_M41T94 is not set +# CONFIG_RTC_DRV_DS1305 is not set +# CONFIG_RTC_DRV_DS1390 is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_R9701 is not set +# CONFIG_RTC_DRV_RS5C348 is not set +# CONFIG_RTC_DRV_DS3234 is not set +# CONFIG_RTC_DRV_PCF2123 is not set +# CONFIG_RTC_DRV_RX4581 is not set + +# +# 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_DS2404=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# +CONFIG_RTC_DRV_MC13XXX=m + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set +CONFIG_DMADEVICES=y +# CONFIG_DMADEVICES_DEBUG is not set + +# +# DMA Devices +# +CONFIG_INTEL_MID_DMAC=m +CONFIG_INTEL_IOATDMA=m +CONFIG_DW_DMAC=m +# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set +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_DMEM_GENIRQ is not set +CONFIG_UIO_AEC=m +CONFIG_UIO_SERCOS3=m +CONFIG_UIO_PCI_GENERIC=m +CONFIG_UIO_NETX=m +# CONFIG_VFIO is not set +CONFIG_VIRTIO=m + +# +# Virtio drivers +# +CONFIG_VIRTIO_PCI=m +CONFIG_VIRTIO_BALLOON=m +CONFIG_VIRTIO_MMIO=m +CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y + +# +# Microsoft Hyper-V guest support +# +CONFIG_HYPERV=m +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_BALLOON=m + +# +# Xen driver support +# +CONFIG_XEN_BALLOON=y +# CONFIG_XEN_SELFBALLOONING is not set +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=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=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_TMEM=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=m +CONFIG_XEN_ACPI_PROCESSOR=m +# CONFIG_XEN_MCE_LOG is not set +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_STAGING=y +CONFIG_ET131X=m +CONFIG_SLICOSS=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_COMEDI=m +# CONFIG_COMEDI_DEBUG is not set +CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048 +CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480 +CONFIG_COMEDI_MISC_DRIVERS=y +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=y +CONFIG_COMEDI_8255_PCI=m +CONFIG_COMEDI_ADDI_WATCHDOG=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_2032=m +CONFIG_COMEDI_ADDI_APCI_2200=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_PCI7X3X=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_PCI=m +CONFIG_COMEDI_AMPLC_PC236_PCI=m +CONFIG_COMEDI_AMPLC_PC263_PCI=m +CONFIG_COMEDI_AMPLC_PCI224=m +CONFIG_COMEDI_AMPLC_PCI230=m +CONFIG_COMEDI_CONTEC_PCI_DIO=m +CONFIG_COMEDI_DAS08_PCI=m +CONFIG_COMEDI_DT3000=m +CONFIG_COMEDI_DYNA_PCI10XX=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_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_LABPC=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_MITE=m +CONFIG_COMEDI_NI_TIOCMD=m +CONFIG_COMEDI_PCMCIA_DRIVERS=y +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=y +CONFIG_COMEDI_DT9812=m +CONFIG_COMEDI_USBDUX=m +CONFIG_COMEDI_USBDUXFAST=m +CONFIG_COMEDI_USBDUXSIGMA=m +CONFIG_COMEDI_VMK80XX=m +CONFIG_COMEDI_8255=m +CONFIG_COMEDI_FC=m +CONFIG_COMEDI_AMPLC_DIO200=m +CONFIG_COMEDI_AMPLC_PC236=m +CONFIG_COMEDI_AMPLC_PC263=m +CONFIG_COMEDI_DAS08=m +CONFIG_COMEDI_NI_TIO=m +CONFIG_ASUS_OLED=m +# CONFIG_PANEL is not set +CONFIG_R8187SE=m +CONFIG_RTL8192U=m +CONFIG_RTLLIB=m +CONFIG_RTLLIB_CRYPTO_CCMP=m +CONFIG_RTLLIB_CRYPTO_TKIP=m +CONFIG_RTLLIB_CRYPTO_WEP=m +CONFIG_RTL8192E=m +CONFIG_R8712U=m +CONFIG_RTS5139=m +# CONFIG_RTS5139_DEBUG is not set +# CONFIG_TRANZPORT is not set +CONFIG_IDE_PHISON=m +CONFIG_LINE6_USB=m +# CONFIG_LINE6_USB_IMPULSE_RESPONSE is not set +CONFIG_USB_SERIAL_QUATECH2=m +CONFIG_VT6655=m +CONFIG_VT6656=m +CONFIG_DX_SEP=m +CONFIG_ZRAM=m +# CONFIG_ZRAM_DEBUG is not set +CONFIG_ZSMALLOC=y +CONFIG_WLAGS49_H2=m +CONFIG_WLAGS49_H25=m +CONFIG_FB_SM7XX=m +CONFIG_CRYSTALHD=m +CONFIG_FB_XGI=m +CONFIG_ACPI_QUICKSTART=m +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_STAGING_MEDIA=y +CONFIG_DVB_AS102=m +CONFIG_DVB_CXD2099=m +CONFIG_VIDEO_DT3155=m +CONFIG_DT3155_CCIR=y +CONFIG_DT3155_STREAMING=y +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_SOLO6X10=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_ZILOG=m + +# +# Android +# +# CONFIG_ANDROID is not set +CONFIG_USB_WPAN_HCD=m +CONFIG_WIMAX_GDM72XX=m +CONFIG_WIMAX_GDM72XX_QOS=y +CONFIG_WIMAX_GDM72XX_K_MODE=y +CONFIG_WIMAX_GDM72XX_WIMAX2=y +CONFIG_WIMAX_GDM72XX_USB=y +# CONFIG_WIMAX_GDM72XX_SDIO is not set +CONFIG_WIMAX_GDM72XX_USB_PM=y +CONFIG_CSR_WIFI=m +CONFIG_NET_VENDOR_SILICOM=y +CONFIG_SBYPASS=m +CONFIG_BPCTL=m +CONFIG_CED1401=m +CONFIG_DGRP=m +CONFIG_FIREWIRE_SERIAL=m +CONFIG_ZCACHE=y +CONFIG_RAMSTER=y +CONFIG_X86_PLATFORM_DEVICES=y +CONFIG_ACER_WMI=m +CONFIG_ACERHDF=m +CONFIG_ASUS_LAPTOP=m +CONFIG_CHROMEOS_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_FUJITSU_TABLET=m +CONFIG_AMILO_RFKILL=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_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_SAMSUNG_Q10=m +CONFIG_APPLE_GMUX=m + +# +# Hardware Spinlock drivers +# +CONFIG_CLKEVT_I8253=y +CONFIG_I8253_LOCK=y +CONFIG_CLKBLD_I8253=y +# CONFIG_MAILBOX is not set +CONFIG_IOMMU_API=y +CONFIG_IOMMU_SUPPORT=y +CONFIG_AMD_IOMMU=y +# CONFIG_AMD_IOMMU_STATS is not set +CONFIG_AMD_IOMMU_V2=m +CONFIG_DMAR_TABLE=y +CONFIG_INTEL_IOMMU=y +# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_FLOPPY_WA=y +CONFIG_IRQ_REMAP=y + +# +# Remoteproc drivers +# +CONFIG_REMOTEPROC=m +CONFIG_STE_MODEM_RPROC=m + +# +# Rpmsg drivers +# +CONFIG_VIRT_DRIVERS=y +# CONFIG_PM_DEVFREQ is not set +CONFIG_EXTCON=m + +# +# Extcon Device Drivers +# +CONFIG_EXTCON_GPIO=m +CONFIG_MEMORY=y +# CONFIG_IIO is not set +# CONFIG_NTB is not set +# CONFIG_VME_BUS is not set +# CONFIG_PWM is not set +CONFIG_IPACK_BUS=m +CONFIG_BOARD_TPCI200=m +CONFIG_SERIAL_IPOCTAL=m + +# +# Firmware Drivers +# +CONFIG_EDD=m +# CONFIG_EDD_OFF is not set +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_DELL_RBU=m +CONFIG_DCDBAS=m +CONFIG_DMIID=y +CONFIG_DMI_SYSFS=m +CONFIG_ISCSI_IBFT_FIND=y +CONFIG_ISCSI_IBFT=m +# CONFIG_GOOGLE_FIRMWARE is not set + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# 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_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_BTRFS_FS_CHECK_INTEGRITY is not set +CONFIG_NILFS2_FS=m +CONFIG_FS_POSIX_ACL=y +CONFIG_EXPORTFS=y +CONFIG_FILE_LOCKING=y +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y +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_QUOTACTL_COMPAT=y +CONFIG_AUTOFS4_FS=y +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=y +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ADFS_FS is not set +CONFIG_AFFS_FS=m +CONFIG_ECRYPT_FS=m +# CONFIG_ECRYPT_FS_MESSAGING is not set +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_ADVANCED_COMPR is not set +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_LOGFS=m +CONFIG_CRAMFS=m +CONFIG_SQUASHFS=m +CONFIG_SQUASHFS_XATTR=y +CONFIG_SQUASHFS_ZLIB=y +CONFIG_SQUASHFS_LZO=y +CONFIG_SQUASHFS_XZ=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# 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_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_FTRACE is not set +CONFIG_PSTORE_RAM=m +# 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_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_ORE=m +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=m +CONFIG_NFS_V2=m +CONFIG_NFS_V3=m +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=m +# CONFIG_NFS_SWAP is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="linux-libre.fsfla.org" +CONFIG_NFS_FSCACHE=y +# CONFIG_NFS_USE_LEGACY_DNS is not set +CONFIG_NFS_USE_KERNEL_DNS=y +CONFIG_NFSD=m +CONFIG_NFSD_V2_ACL=y +CONFIG_NFSD_V3=y +CONFIG_NFSD_V3_ACL=y +CONFIG_NFSD_V4=y +# CONFIG_NFSD_FAULT_INJECTION is not set +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_NFS_ACL_SUPPORT=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y +CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_SUNRPC_DEBUG=y +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_ACL=y +# CONFIG_CIFS_DEBUG is not set +CONFIG_CIFS_DFS_UPCALL=y +CONFIG_CIFS_SMB2=y +CONFIG_CIFS_FSCACHE=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 +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_MAC_ROMAN=m +CONFIG_NLS_MAC_CELTIC=m +CONFIG_NLS_MAC_CENTEURO=m +CONFIG_NLS_MAC_CROATIAN=m +CONFIG_NLS_MAC_CYRILLIC=m +CONFIG_NLS_MAC_GAELIC=m +CONFIG_NLS_MAC_GREEK=m +CONFIG_NLS_MAC_ICELAND=m +CONFIG_NLS_MAC_INUIT=m +CONFIG_NLS_MAC_ROMANIAN=m +CONFIG_NLS_MAC_TURKISH=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=2048 +CONFIG_MAGIC_SYSRQ=y +CONFIG_STRIP_ASM_SYMS=y +# CONFIG_READABLE_ASM is not set +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_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_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_HAVE_DEBUG_KMEMLEAK=y +# 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_LOCK_STAT is not set +# CONFIG_DEBUG_ATOMIC_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_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 + +# +# RCU Debugging +# +# CONFIG_PROVE_RCU_DELAY is not set +# CONFIG_SPARSE_RCU_POINTER 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_RCU_CPU_STALL_INFO is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_KPROBES_SANITY_TEST 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_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +# CONFIG_LATENCYTOP is not set +# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_NOP_TRACER=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_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_FENTRY=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACER_MAX_TRACE=y +CONFIG_TRACE_CLOCK=y +CONFIG_RING_BUFFER=y +CONFIG_EVENT_TRACING=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_TRACER_SNAPSHOT=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_KPROBE_EVENT=y +CONFIG_UPROBE_EVENT=y +CONFIG_PROBE_EVENTS=y +CONFIG_DYNAMIC_FTRACE=y +CONFIG_DYNAMIC_FTRACE_WITH_REGS=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_RBTREE_TEST is not set +# CONFIG_INTERVAL_TREE_TEST is not set +# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set +# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set +CONFIG_DYNAMIC_DEBUG=y +# 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_DEBUG_TLBFLUSH is not set +# CONFIG_IOMMU_DEBUG is not set +# CONFIG_IOMMU_STRESS is not set +CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set +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 +# CONFIG_DEBUG_NMI_SELFTEST 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_TOMOYO_MAX_ACCEPT_ENTRY=2048 +CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 +# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd" +CONFIG_SECURITY_APPARMOR=y +CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0 +# CONFIG_SECURITY_YAMA is not set +# 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=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=m +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=y +CONFIG_CRYPTO_HASH=y +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_USER=m +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 +CONFIG_CRYPTO_ABLK_HELPER_X86=m +CONFIG_CRYPTO_GLUE_HELPER_X86=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_X86_64=y +CONFIG_CRYPTO_CRC32C_INTEL=m +CONFIG_CRYPTO_CRC32=m +CONFIG_CRYPTO_CRC32_PCLMUL=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_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256=m +CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_TGR192=m +CONFIG_CRYPTO_WP512=m +CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m + +# +# Ciphers +# +CONFIG_CRYPTO_AES=y +CONFIG_CRYPTO_AES_X86_64=m +CONFIG_CRYPTO_AES_NI_INTEL=m +CONFIG_CRYPTO_ANUBIS=m +CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_BLOWFISH=m +CONFIG_CRYPTO_BLOWFISH_COMMON=m +CONFIG_CRYPTO_BLOWFISH_X86_64=m +CONFIG_CRYPTO_CAMELLIA=m +CONFIG_CRYPTO_CAMELLIA_X86_64=m +CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m +CONFIG_CRYPTO_CAST_COMMON=m +CONFIG_CRYPTO_CAST5=m +CONFIG_CRYPTO_CAST5_AVX_X86_64=m +CONFIG_CRYPTO_CAST6=m +CONFIG_CRYPTO_CAST6_AVX_X86_64=m +CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_FCRYPT=m +CONFIG_CRYPTO_KHAZAD=m +CONFIG_CRYPTO_SALSA20=m +CONFIG_CRYPTO_SALSA20_X86_64=m +CONFIG_CRYPTO_SEED=m +CONFIG_CRYPTO_SERPENT=m +CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m +CONFIG_CRYPTO_SERPENT_AVX_X86_64=m +CONFIG_CRYPTO_TEA=m +CONFIG_CRYPTO_TWOFISH=m +CONFIG_CRYPTO_TWOFISH_COMMON=m +CONFIG_CRYPTO_TWOFISH_X86_64=m +CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m +CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m +CONFIG_CRYPTO_LZO=y + +# +# 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_ASYMMETRIC_KEY_TYPE=m +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m +CONFIG_PUBLIC_KEY_ALGO_RSA=m +CONFIG_X509_CERTIFICATE_PARSER=m +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_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=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_TCM_VHOST=m +CONFIG_BINARY_PRINTF=y + +# +# Library routines +# +CONFIG_RAID6_PQ=m +CONFIG_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IO=y +CONFIG_PERCPU_RWSEM=y +CONFIG_CRC_CCITT=m +CONFIG_CRC16=m +CONFIG_CRC_T10DIF=m +CONFIG_CRC_ITU_T=m +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CRC8=m +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_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=m +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_REED_SOLOMON_DEC16=y +CONFIG_BCH=m +CONFIG_BCH_CONST_PARAMS=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_DQL=y +CONFIG_NLATTR=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_LRU_CACHE=m +CONFIG_AVERAGE=y +CONFIG_CLZ_TAB=y +CONFIG_CORDIC=m +CONFIG_DDR=y +CONFIG_MPILIB=m +CONFIG_OID_REGISTRY=m +CONFIG_UCS2_STRING=y diff --git a/libre-testing/linux-libre/linux-libre.install b/libre-testing/linux-libre/linux-libre.install new file mode 100644 index 000000000..2cde0a227 --- /dev/null +++ b/libre-testing/linux-libre/linux-libre.install @@ -0,0 +1,69 @@ +# arg 1: the new package version +# arg 2: the old package version + +KERNEL_NAME= +KERNEL_VERSION=3.9.0-2-LIBRE + +# set a sane PATH to ensure that critical utils like depmod will be found +export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' + +post_install () { + # updating module dependencies + echo ">>> Updating module dependencies. Please wait ..." + depmod ${KERNEL_VERSION} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi + + # compat symlinks for the official kernels only + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts" ]; 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 grub-common &>/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} + if command -v mkinitcpio 2>&1 > /dev/null; then + echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..." + mkinitcpio -p linux-libre${KERNEL_NAME} + fi +} + +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/libre-testing/linux-libre/linux-libre.preset b/libre-testing/linux-libre/linux-libre.preset new file mode 100644 index 000000000..0ac59eb14 --- /dev/null +++ b/libre-testing/linux-libre/linux-libre.preset @@ -0,0 +1,14 @@ +# mkinitcpio preset file for the 'linux-libre' package + +ALL_config="/etc/mkinitcpio.conf" +ALL_kver="/boot/vmlinuz-linux-libre" + +PRESETS=('default' 'fallback') + +#default_config="/etc/mkinitcpio.conf" +default_image="/boot/initramfs-linux-libre.img" +#default_options="" + +#fallback_config="/etc/mkinitcpio.conf" +fallback_image="/boot/initramfs-linux-libre-fallback.img" +fallback_options="-S autodetect" diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD index 9d1800989..dce707766 100644 --- a/libre/abiword-libre/PKGBUILD +++ b/libre/abiword-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgbase=abiword pkgbase=abiword-libre pkgname=('abiword-libre' 'abiword-libre-plugins') pkgver=2.8.6 -pkgrel=8 +pkgrel=8.1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.abisource.com" @@ -86,9 +86,9 @@ package_abiword-libre-plugins() { pkgdesc="Additional plugins for Abiword" depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf') - conflicts=('abiword-libre-plugins') - replaces=('abiword-libre-plugins') - provides=("abiword-libre-plugins=$pkgver") + conflicts=('abiword-plugins') + replaces=('abiword-plugins') + provides=("abiword-plugins=$pkgver") cd "${srcdir}/${_pkgbase}-${pkgver}/plugins" diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 66e4551bd..56434d802 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -9,7 +9,7 @@ pkgname=('linux-libre-tools-meta' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre') -_basekernel=3.8 +_basekernel=3.9 #_sublevel=6 _pkgver=$_basekernel.$_sublevel pkgver=$_basekernel @@ -34,7 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/ 'cpupower.systemd' 'cpupower.service' 'usbipd.service') -sha256sums=('c834438a5c3f60f261c415664cfee5bf265d0329175796df048996c7afabc03f' +sha256sums=('62f113b4bd9ee832e8906da970c5bf4585c057af4eab14ec6ad57e9b2fd084ef' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD index ca594501d..fc949d923 100644 --- a/libre/texlive-core-libre/PKGBUILD +++ b/libre/texlive-core-libre/PKGBUILD @@ -25,7 +25,7 @@ conflicts=('tetex' 'texlive-latex3' 'texlive-core') provides=('tetex' 'texlive-latex3' "texlive-core=$pkgver") replaces=('tetex' 'texlive-latex3' 'texlive-core') url='http://tug.org/texlive/' -source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" +source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=(!strip) install=texlive.install diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD index 31ff6a3b4..cc6dd7509 100644 --- a/libre/texlive-fontsextra-libre/PKGBUILD +++ b/libre/texlive-fontsextra-libre/PKGBUILD @@ -16,7 +16,7 @@ replaces=('texlive-fontsextra') conflicts=('texlive-fontsextra') provides=('texlive-fontsextra') url='http://tug.org/texlive/' -source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") +source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD index b327d2f61..184adb743 100644 --- a/libre/texlive-latexextra-libre/PKGBUILD +++ b/libre/texlive-latexextra-libre/PKGBUILD @@ -22,7 +22,7 @@ replaces=('texlive-latexextra') conflicts=('texlive-latexextra') groups=('texlive-most') url='http://tug.org/texlive/' -source=("ftp://ftp.archlinux.org/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") +source=("ftp://mirrors.kernel.org/archlinux/other/texlive/$_pkgname-$pkgver-src.zip" "$_pkgname.maps") options=('!emptydirs') options=(!strip) install=texlive.install diff --git a/pcr/uftp/PKGBUILD b/pcr/uftp/PKGBUILD new file mode 100644 index 000000000..3aef7d164 --- /dev/null +++ b/pcr/uftp/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Markus Jochim +pkgname=uftp +pkgver=4.0 +pkgrel=1 +pkgdesc="Multicast FTP software" +arch=('i686' 'x86_64' 'mips64el') +depends=('openssl') +url="http://www.tcnj.edu/~bush/uftp.html" +license=('GPL') +source=(http://www.tcnj.edu/~bush/downloads/${pkgname}-${pkgver}.tar) +md5sums=('475918421c000b59bfced1a3c21e3035') + +build() { + cd "$srcdir/${pkgname}-${pkgver}/" + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}/" + make DESTDIR="${pkgdir}" install +} + diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD new file mode 100644 index 000000000..4b40ebea2 --- /dev/null +++ b/pcr/xf86-input-wizardpen/PKGBUILD @@ -0,0 +1,43 @@ +# Maintainer (Parabola): Márcio Silva + +pkgname=xf86-input-wizardpen +_pkgname=${pkgname:11} +pkgver=0.8.1 +pkgrel=4 +pkgdesc="X.Org ${_pkgname^}/Genius tablet driver for GNU/Linux-libre" +arch=( + i686 + x86_64 + mips64el +) +url=https://launchpad.net/$_pkgname +license=GPL2 +depends=glibc +makedepends=xorg-server-devel +conflicts=( + $_pkgname + $_pkgname-driver +) +replaces=( + $_pkgname + $_pkgname-driver +) +source=http://launchpad.net/$_pkgname/trunk/${pkgver::3}/+download/${pkgname/xf86/xorg}-$pkgver.tar.bz2 +sha512sums=8830febe579231a2990dd31fad7db1d16424ad01b7226e0b09bd6287070f8099338f2f3e4d715772ed6616d7e13b52e83e816c400b638d47f1f92c30ec677d59 + +prepare() { + cd $srcdir/${pkgname/xf86/xorg}-$pkgver + sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' configure.ac +} + +build() { + cd $srcdir/${pkgname/xf86/xorg}-$pkgver + setarch $CARCH ./autogen.sh --prefix=/usr\ + --with-xorg-conf-dir=/etc/X11/xorg.conf.d + setarch $CARCH make +} + +package() { + cd $srcdir/${pkgname/xf86/xorg}-$pkgver + setarch $CARCH make DESTDIR=$pkgdir install +} -- cgit v1.2.3-54-g00ecf From 5f3b2100b811506bec6bcf63b24d1c605dfe8cb6 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 4 May 2013 00:41:51 -0700 Subject: Sat May 4 00:41:51 PDT 2013 --- community/cinnamon-control-center/PKGBUILD | 6 ++-- community/cinnamon/PKGBUILD | 8 ++--- community/desmume/PKGBUILD | 10 +++--- community/muffin/PKGBUILD | 18 +++++------ community/nemo/PKGBUILD | 6 ++-- community/setconf/PKGBUILD | 8 +++-- core/ed/PKGBUILD | 11 ++++--- core/nfs-utils/PKGBUILD | 20 +++++------- core/pciutils/PKGBUILD | 12 ++++---- extra/colord/PKGBUILD | 16 +++++----- extra/freetds/PKGBUILD | 8 ++--- extra/glibmm/PKGBUILD | 6 ++-- extra/gnome-nettool/PKGBUILD | 21 +++++++------ extra/gnome-nettool/printf.patch | 34 +++++++++++++++++++++ extra/gnome-session/PKGBUILD | 6 ++-- extra/gtkmm3/PKGBUILD | 6 ++-- extra/kdevelop-python/PKGBUILD | 6 ++-- extra/libgda/PKGBUILD | 6 ++-- extra/network-manager-applet/PKGBUILD | 21 ++++++++++--- .../fixed-signal-icons.tar.xz | Bin 0 -> 2044 bytes extra/perl-alien-sdl/PKGBUILD | 8 ++--- extra/smplayer/PKGBUILD | 13 ++++++-- kernels/linux-libre-pae/PKGBUILD | 12 ++++---- kernels/linux-libre-pae/linux-libre-pae.install | 2 +- kernels/linux-libre-rt/PKGBUILD | 24 +++++++-------- kernels/linux-libre-rt/config.i686 | 4 ++- kernels/linux-libre-rt/config.x86_64 | 4 ++- kernels/linux-libre-rt/linux-libre-rt.install | 2 +- kernels/linux-libre-xen/PKGBUILD | 12 ++++---- kernels/linux-libre-xen/linux-libre-xen.install | 2 +- libre/linux-libre-kmod-alx/PKGBUILD | 6 ++-- libre/linux-libre-lts-kmod-alx/PKGBUILD | 6 ++-- libre/linux-libre-lts/PKGBUILD | 6 ++-- libre/linux-libre/PKGBUILD | 18 +++++------ libre/linux-libre/linux-libre.install | 2 +- pcr/babeld/PKGBUILD | 4 +-- 36 files changed, 206 insertions(+), 148 deletions(-) create mode 100644 extra/gnome-nettool/printf.patch create mode 100644 extra/network-manager-applet/fixed-signal-icons.tar.xz (limited to 'community/nemo/PKGBUILD') diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD index 3e6a3f2de..fcde00b2b 100644 --- a/community/cinnamon-control-center/PKGBUILD +++ b/community/cinnamon-control-center/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89381 2013-04-29 01:59:05Z bgyorgy $ +# $Id: PKGBUILD 89868 2013-05-03 19:53:33Z faidoc $ # Maintainer: Alexandre Filgueira # Jan de Groot pkgname=cinnamon-control-center -pkgver=1.7.4 +pkgver=1.7.5 pkgrel=1 pkgdesc="The Control Center for Cinnamon" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ options=('!libtool' '!emptydirs') source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz" "gnomerrlabeler.patch" "idle-delay.patch") -sha256sums=('33425b57d13acf015ddbeba8e9139f7b3488d80f900bd2234f49db1c0944c96b' +sha256sums=('50192b279bd2d6c9a0cb686144d5cf8195e33fbe1e107baeca6da03a638e1f8d' '826de61fa60349a99c6895f2ffb0ea1c7f71031b17dd80bb245e3834b30b6ff6' '42ea92628dc234d65e582592a66c0011d5bb2c2eac14854a06f7a9dc923c8d67') diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD index 5ff5db12a..f13d2c1e5 100644 --- a/community/cinnamon/PKGBUILD +++ b/community/cinnamon/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 89831 2013-05-02 18:23:50Z bgyorgy $ +# $Id: PKGBUILD 89873 2013-05-03 22:01:21Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: M0Rf30 # Contributor: unifiedlinux # Contributor: CReimer pkgname=cinnamon -pkgver=1.7.8 -pkgrel=2 +pkgver=1.7.10 +pkgrel=1 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/" @@ -31,7 +31,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/ "switch-applications.patch" "fallback-helpers.patch" "idle-dim.patch") -sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969' +sha256sums=('32ac069773b7d1634136d4f8f01c2083708fa26a1a5bc21957c2144cd9244bf7' 'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30' 'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426' '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3' diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD index 7905f5e16..7fbd8f70e 100644 --- a/community/desmume/PKGBUILD +++ b/community/desmume/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 77627 2012-10-13 11:41:54Z allan $ +# $Id: PKGBUILD 89839 2013-05-03 06:49:03Z schuay $ # Maintainer: Jonathan Conder # Maintainer: Brad Fanella # Contributor: Arkham @@ -11,15 +11,15 @@ # Contributor: Asher256 pkgname=desmume -pkgver=0.9.8 -pkgrel=3 +pkgver=0.9.9 +pkgrel=1 pkgdesc="Nintendo DS emulator" arch=('i686' 'x86_64') url="http://desmume.org/" license=('GPL') depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' 'soundtouch' 'alsa-lib' 'zziplib' 'glu') -makedepends=('intltool') +makedepends=('intltool' 'mesa') install=desmume.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir/" install } -md5sums=('fb7c984c924087888b9eaaad8cb1875e') +md5sums=('458b5f8b3dbb38a47e6d0518f97aa82a') diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD index 5c0d9cde1..53534603d 100644 --- a/community/muffin/PKGBUILD +++ b/community/muffin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 89819 2013-05-02 15:47:37Z bgyorgy $ +# $Id: PKGBUILD 89864 2013-05-03 19:33:13Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Adam Hani Schakaki # Contributor: Ner0 pkgname=muffin -pkgver=1.7.4 -pkgrel=2 +pkgver=1.7.5 +pkgrel=1 pkgdesc="Cinnamon window manager based on Mutter" arch=('i686' 'x86_64') url="https://github.com/linuxmint/muffin" @@ -15,15 +15,15 @@ depends=('clutter' 'gobject-introspection' 'gsettings-desktop-schemas' \ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common') options=('!libtool' '!emptydirs') install=$pkgname.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/tarball/$pkgver" +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz" "switch-applications.patch" "fix-dnd.patch") -md5sums=('d64bfe853e6fda5ec11a06581743f774' - 'a5d5d76dc281277a8afc83d7affdcc7b' - '6d787466831def299360419cc3b5e47b') +sha256sums=('ef10c19353e5d2ff86d24c2fa40bd53ba3c7eeb03e9d3c8fbd3f4b56d16a2f07' + '206eefac342b08e061c4eedfb6b9e0c96e2eae8fb9535f52f20bf50464381a96' + '745dd3ef7eb8a496c68f5a728253205a849ac63851c0c0930c42442aec5af939') build() { - cd linuxmint-muffin-* + cd ${pkgname}-${pkgver} # Fix windows switcher keybinding with default settings in GNOME 3.8 patch -Np1 -i ../switch-applications.patch @@ -37,7 +37,7 @@ build() { } package() { - cd linuxmint-muffin-* + cd ${pkgname}-${pkgver} make DESTDIR="$pkgdir/" install } diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index 774a2a350..804efe07b 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89644 2013-04-30 21:20:15Z faidoc $ +# $Id: PKGBUILD 89860 2013-05-03 19:19:27Z faidoc $ # Maintainer: Alexandre Filgueira # Contributor: Ner0 pkgname=nemo -pkgver=1.7.5 +pkgver=1.7.6 pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "tracker-0.16.patch" "remove-desktop-background.patch") -sha256sums=('d7937ddeb6e9fe1da1283ff306fbb32e6554701d629b63232cbb0a5a9268c99d' +sha256sums=('670faa09fff6b2919231bbe6c580363c4cd0a7c87fc5324570083ed8955db9c8' '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD index a2a9fbb34..f3e2edad2 100644 --- a/community/setconf/PKGBUILD +++ b/community/setconf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 89807 2013-05-02 13:36:01Z arodseth $ +# $Id: PKGBUILD 89870 2013-05-03 20:55:10Z arodseth $ # Maintainer: Alexander Rødseth pkgname=setconf pkgver=0.5.3 -pkgrel=2 +pkgrel=3 pkgdesc='Utility to easily change settings in configuration files or Makefiles' arch=('x86_64' 'i686') url='http://setconf.roboticoverlords.org/' @@ -18,7 +18,9 @@ sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6') build() { cd "$srcdir/$pkgname-$pkgver" - [ -x /usr/bin/shedskin ] && shedskin "$pkgname.py" && make + if [ "$CARCH" == 'x86_64' ] || [ "$CARCH" == 'i686' ]; then + shedskin "$pkgname.py" && make + fi } package() { diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index 80a32233c..c3785934d 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 173766 2012-12-22 18:16:53Z dreisner $ +# $Id: PKGBUILD 184200 2013-05-03 13:44:53Z dreisner $ # Maintainer: Dave Reisner # Maintainer: Andreas Radke pkgname=ed -pkgver=1.7 -pkgrel=2 +pkgver=1.8 +pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64') license=('GPL') url="http://www.gnu.org/software/ed/ed.html" depends=('glibc' 'sh') options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/ed/${pkgname}-${pkgver}.tar.gz) +source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig}) install='ed.install' -md5sums=('0aa4e2428e325203d0d7c3e86c961b1c') +md5sums=('2268d2344b3c52d23730acb2e3c942fe' + 'SKIP') build() { cd "$pkgname-$pkgver" diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD index 079afece1..36bd7fd53 100644 --- a/core/nfs-utils/PKGBUILD +++ b/core/nfs-utils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175118 2013-01-14 07:37:11Z tpowa $ +# $Id: PKGBUILD 184188 2013-05-03 10:22:57Z tpowa $ # Maintainer: Tobias Powalowski # Contributor: John Proctor # Contributor: dibblethewrecker @@ -6,8 +6,8 @@ # Contributor: Marco Lima pkgname=nfs-utils -pkgver=1.2.6 -pkgrel=4 +pkgver=1.2.7 +pkgrel=1 pkgdesc="Support programs for Network File Systems" arch=('i686' 'x86_64') url='http://nfs.sourceforge.net' @@ -16,9 +16,7 @@ backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs- depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper') makedepends=('pkgconfig' 'autoconf' 'automake') source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2 - nfs-common nfs-common.conf - nfs-server nfs-server.conf exports idmapd.conf @@ -37,10 +35,8 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn blkmapd.service nfs-utils.conf) install=nfs-utils.install -md5sums=('8be543ca270c2234ff18f8c8d35e0d37' - 'dd0d65fc6e8f422fa12520813098264b' +md5sums=('3b5ca797197765dc0c3a4122720c7716' 'f73f197a16b02c3e248488ec35c4cf43' - 'e619f18354ff958ed624d05d08853d8f' '9cef69bc686cc5dcac23fbb51450747d' 'ff585faf410a62c4333a027c50b56bae' 'eb4f4027fab6fc1201f1ca04f5954c76' @@ -59,13 +55,16 @@ md5sums=('8be543ca270c2234ff18f8c8d35e0d37' '8ffc2ebe932d29efe17d6f3f23d5b975' '8ac484023d786766d287ccbe878ae4ba') -build() { +prepare() { cd $srcdir/${pkgname}-${pkgver} patch -Np1 -i ../nfs-utils-1.1.4-mtab-sym.patch #patch -Np1 -i ../nfs-utils-1.1.4-no-exec.patch # arch specific patch patch -Np0 -i $srcdir/start-statd.patch +} +build() { + cd $srcdir/${pkgname}-${pkgver} ./configure --prefix=/usr --enable-nfsv4 --enable-nfsv41 --enable-gss \ --without-tcp-wrappers --with-statedir=/var/lib/nfs \ --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \ @@ -83,9 +82,6 @@ package() { # support python2 (FS#25120) sed -i '1s/python$/python2/' "$pkgdir"/usr/sbin/{nfsiostat,mountstats} - # NFS & NFSv4 init scripts - install -D -m 755 ../nfs-common "$pkgdir/"etc/rc.d/nfs-common - install -D -m 755 ../nfs-server "$pkgdir/"etc/rc.d/nfs-server # Configuration install -D -m 644 ../exports "$pkgdir/"etc/exports install -D -m 644 ../idmapd.conf "$pkgdir/"etc/idmapd.conf diff --git a/core/pciutils/PKGBUILD b/core/pciutils/PKGBUILD index 30462893c..3ff913b2e 100644 --- a/core/pciutils/PKGBUILD +++ b/core/pciutils/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 162716 2012-06-28 20:04:34Z tpowa $ +# $Id: PKGBUILD 184187 2013-05-03 10:22:45Z tpowa $ # Maintainer: Tobias Powalowski pkgname=pciutils -pkgver=3.1.10 -pkgrel=1 +pkgver=3.2.0 +pkgrel=2 pkgdesc="PCI bus configuration space access library and tools" arch=(i686 x86_64) license=('GPL2') groups=('base') url="http://mj.ucw.cz/sw/pciutils/" -depends=('glibc' 'hwids') +depends=('glibc' 'hwids' 'kmod') source=(#ftp://ftp.kernel.org/pub/software/utils/${pkgname}/${pkgname}-${pkgver}.tar.bz2 ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${pkgname}-${pkgver}.tar.gz) -md5sums=('cdb1e5a95ab7ac67349f10c8f77a6d3c') +md5sums=('3fccb0b28879adb57d8156115f8003c8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all + make OPT="${CFLAGS} -fPIC -DPIC" ZLIB=no SHARED=no PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man lib/libpci.a cp lib/libpci.a "${srcdir}/" make clean make OPT="${CFLAGS}" ZLIB=no SHARED=yes PREFIX=/usr SHAREDIR=/usr/share/hwdata MANDIR=/usr/share/man all diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 8b78e733e..73843903a 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 183240 2013-04-19 01:14:07Z heftig $ +# $Id: PKGBUILD 184190 2013-05-03 11:21:48Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Ionut Biru pkgname=colord -pkgver=0.1.33 +pkgver=0.1.34 pkgrel=1 pkgdesc="System daemon for managing color devices" arch=(i686 x86_64) url="http://www.freedesktop.org/software/colord" license=(GPL2) depends=(lcms2 libgusb polkit shared-color-profiles sqlite udev dconf dbus) -makedepends=(intltool gobject-introspection vala docbook2x sane) +makedepends=(intltool gobject-introspection vala docbook2x sane bash-completion) optdepends=('sane: UseSANE support [/etc/colord.conf]') options=('!libtool') install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('41888fc853e033302c59539777b09317a7e1ab3d') +sha1sums=('e4168ca34c2ce228276299efaf12d2f9fb7ecb2e') build() { cd $pkgname-$pkgver @@ -24,9 +24,8 @@ build() { # put udev files in /usr/lib sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure - ./configure --prefix=/usr \ - --sysconfdir=/etc --libexecdir=/usr/lib/colord \ - --localstatedir=/var --disable-static \ + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/$pkgname --disable-static \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ --enable-vala --enable-sane --disable-volume-search make @@ -34,8 +33,7 @@ build() { package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install \ - bashcompletiondir=/usr/share/bash-completion/completions + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/freetds/PKGBUILD b/extra/freetds/PKGBUILD index c91427f2c..10ddb2d89 100644 --- a/extra/freetds/PKGBUILD +++ b/extra/freetds/PKGBUILD @@ -13,16 +13,16 @@ options=('!libtool') backup=('etc/freetds/freetds.conf' 'etc/freetds/locales.conf' 'etc/freetds/pool.conf') -source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz") -md5sums=('b14db5823980a32f0643d1a84d3ec3ad') +source=("ftp://ftp.freetds.org/pub/freetds/stable/${pkgname}-${pkgver}.tar.bz2") +md5sums=('e88e96800c89d62307812315b235eb18') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0 make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD index 23388f7b8..cf87cfd3e 100644 --- a/extra/glibmm/PKGBUILD +++ b/extra/glibmm/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183952 2013-04-29 21:53:23Z heftig $ +# $Id: PKGBUILD 184169 2013-05-03 03:02:45Z heftig $ # Maintainer: Jan de Groot # Contributor: Tom Newsom pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.36.1 +pkgver=2.36.2 pkgrel=1 arch=('i686' 'x86_64') license=('LGPL') @@ -12,7 +12,7 @@ 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=('d1f7dec2fd75ea95034ec143fcf2ff77a02e92aacf3e0cc110f9c67e7fe23766') +sha256sums=('f15b65bf5740257be03c69f2f5ae71436ac3011ebeb02274b2b99b796c6837cf') build() { cd "$pkgname-$pkgver" diff --git a/extra/gnome-nettool/PKGBUILD b/extra/gnome-nettool/PKGBUILD index bfe38c4cb..97913cd16 100644 --- a/extra/gnome-nettool/PKGBUILD +++ b/extra/gnome-nettool/PKGBUILD @@ -1,26 +1,29 @@ -# $Id: PKGBUILD 183390 2013-04-21 22:10:08Z heftig $ +# $Id: PKGBUILD 184172 2013-05-03 03:24:57Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Jan de Groot # Contributor: Kritoke pkgname=gnome-nettool -pkgver=3.2.0 -pkgrel=3 +pkgver=3.8.0 +pkgrel=1 pkgdesc="A Collection of GNOME3 Networking Tools." arch=(i686 x86_64) -license=('GPL') -depends=('gtk3' 'libgtop' 'dnsutils' 'iputils' 'dconf' 'whois' 'hicolor-icon-theme') -makedepends=('gnome-doc-utils' 'intltool' 'nmap' 'net-tools') +license=(GPL) +depends=(gtk3 libgtop dnsutils iputils dconf whois hicolor-icon-theme) +makedepends=(yelp-tools intltool nmap net-tools) optdepends=('nmap: Port scanning' 'net-tools: Network statistics') -groups=('gnome-extra') +groups=(gnome-extra) url="http://www.gnome.org" install=gnome-nettool.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('9888202f1c13f98fd26b417468e6f2345f885557f3a98fb365eeea52d792bf79') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + printf.patch) +sha256sums=('3a3480dcef181684f3e37d779cfd43f9b21920412aff78501de1695faf194a28' + '4b06c0748650996100f710a2d7c90afc8fb75bbdd1984f243f42318d0985229e') build() { cd $pkgname-$pkgver + patch -Np1 -i ../printf.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-schemas-compile make diff --git a/extra/gnome-nettool/printf.patch b/extra/gnome-nettool/printf.patch new file mode 100644 index 000000000..89868411a --- /dev/null +++ b/extra/gnome-nettool/printf.patch @@ -0,0 +1,34 @@ +diff -u -r gnome-nettool-3.8.0/src/info.c gnome-nettool-3.8.0-printf/src/info.c +--- gnome-nettool-3.8.0/src/info.c 2013-05-02 13:58:40.000000000 +0200 ++++ gnome-nettool-3.8.0-printf/src/info.c 2013-05-03 05:20:04.684921458 +0200 +@@ -232,13 +232,13 @@ + text_rx_bytes = util_legible_bytes (netload.bytes_in); + text_tx_bytes = util_legible_bytes (netload.bytes_out); + +- g_sprintf (rx_pkt, "%lld", netload.packets_in); +- g_sprintf (tx_pkt, "%lld", netload.packets_out); ++ g_sprintf (rx_pkt, "%" G_GUINT64_FORMAT, netload.packets_in); ++ g_sprintf (tx_pkt, "%" G_GUINT64_FORMAT, netload.packets_out); + +- g_sprintf (rx_error, "%lld", netload.errors_in); +- g_sprintf (tx_error, "%lld", netload.errors_out); ++ g_sprintf (rx_error, "%" G_GUINT64_FORMAT, netload.errors_in); ++ g_sprintf (tx_error, "%" G_GUINT64_FORMAT, netload.errors_out); + +- g_sprintf (collisions, "%lld", netload.collisions); ++ g_sprintf (collisions, "%" G_GUINT64_FORMAT, netload.collisions); + + gtk_label_set_text (GTK_LABEL (info->tx_bytes), text_tx_bytes); + gtk_label_set_text (GTK_LABEL (info->tx), tx_pkt); +diff -u -r gnome-nettool-3.8.0/src/utils.c gnome-nettool-3.8.0-printf/src/utils.c +--- gnome-nettool-3.8.0/src/utils.c 2013-05-02 13:58:40.000000000 +0200 ++++ gnome-nettool-3.8.0-printf/src/utils.c 2013-05-03 05:21:45.704202804 +0200 +@@ -272,7 +272,7 @@ + unit = "KiB"; + } + +- result = g_strdup_printf ("%lld.%lld %s", short_rx / 10, ++ result = g_strdup_printf ("%" G_GUINT64_FORMAT ".%" G_GUINT64_FORMAT " %s", short_rx / 10, + short_rx % 10, unit); + return result; + } diff --git a/extra/gnome-session/PKGBUILD b/extra/gnome-session/PKGBUILD index 04b381bc3..7ff833891 100644 --- a/extra/gnome-session/PKGBUILD +++ b/extra/gnome-session/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 183397 2013-04-21 22:10:21Z heftig $ +# $Id: PKGBUILD 184166 2013-05-03 02:07:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) pkgname=gnome-session pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="The GNOME Session Handler" arch=(i686 x86_64) license=(GPL LGPL) depends=(systemd dconf gconf gsettings-desktop-schemas gtk3 gnome-desktop hicolor-icon-theme json-glib libgl libsm libxtst upower) -makedepends=(intltool mesa gtk-doc) +makedepends=(intltool mesa gtk-doc xtrans) options=('!emptydirs') install=gnome-session.install url="http://www.gnome.org" diff --git a/extra/gtkmm3/PKGBUILD b/extra/gtkmm3/PKGBUILD index f0a9b4a3c..10880858a 100644 --- a/extra/gtkmm3/PKGBUILD +++ b/extra/gtkmm3/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183317 2013-04-21 22:06:35Z heftig $ +# $Id: PKGBUILD 184170 2013-05-03 03:05:29Z heftig $ # Maintainer: Ionut Biru pkgbase=gtkmm3 _pkgbasename=gtkmm pkgname=('gtkmm3' 'gtkmm3-docs') -pkgver=3.8.0 +pkgver=3.8.1 pkgrel=1 arch=('i686' 'x86_64') makedepends=('gtk3' 'pangomm' 'atkmm' 'glibmm-docs' 'mm-common' 'doxygen' 'libxslt') @@ -12,7 +12,7 @@ license=('LGPL') options=('!libtool' '!emptydirs') url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-$pkgver.tar.xz) -sha256sums=('dbddb143fe671ee321d19de2dbae00c0f67e78ce90447227b23062137b1828bd') +sha256sums=('d374c6d6d78fd9f61bca737cd7c23452de427a1662de8abf46df784e07e4c95b') build() { cd "$_pkgbasename-$pkgver" diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD index 1a5551ab5..acbcf2f6e 100644 --- a/extra/kdevelop-python/PKGBUILD +++ b/extra/kdevelop-python/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 172007 2012-11-26 13:00:02Z andrea $ +# $Id: PKGBUILD 184199 2013-05-03 13:03:50Z andrea $ # Maintainer: Andrea Scarpino pkgname=kdevelop-python -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 pkgdesc="Python language and documentation plugin for KDevelop" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('kdevelop') makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt') source=("http://download.kde.org/stable/kdevelop/kdev-python/${pkgver}/src/kdev-python-v${pkgver}.tar.bz2") -sha1sums=('b887811d9a79eee3323cf3ad1be093c5801d31d6') +sha1sums=('fb9af112910c5655ce52bf9cfef19bacbab4f62f') build() { mkdir build diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD index d604f74e2..333aee8ee 100644 --- a/extra/libgda/PKGBUILD +++ b/extra/libgda/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 183427 2013-04-21 22:11:12Z heftig $ +# $Id: PKGBUILD 184204 2013-05-03 19:46:09Z heftig $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=libgda pkgver=5.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers" arch=(i686 x86_64) license=('GPL') @@ -24,7 +24,7 @@ build() { sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py ./configure --prefix=/usr --sysconfdir=/etc \ --with-bdb=/usr --with-bdb-libdir-name=lib \ - --disable-static --enable-json + --disable-static --enable-json --enable-gda-gi make } diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD index 7ab3fe6a8..8e93cf29e 100644 --- a/extra/network-manager-applet/PKGBUILD +++ b/extra/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 183448 2013-04-21 22:11:51Z heftig $ +# $Id: PKGBUILD 184181 2013-05-03 08:14:17Z foutrelis $ # Maintainer: Jan de Groot # Contributor: Arjan Timmerman # Contributor: Wael Nasreddine @@ -7,19 +7,30 @@ pkgname=network-manager-applet pkgver=0.9.8.0 -pkgrel=2 +pkgrel=3 pkgdesc="GNOME frontends to NetWorkmanager" arch=(i686 x86_64) license=(GPL) url="http://www.gnome.org/projects/NetworkManager/" depends=("networkmanager>=${pkgver::5}" libgnome-keyring gtk3 libnotify gnome-icon-theme mobile-broadband-provider-info iso-codes) -makedepends=(intltool gnome-bluetooth) +makedepends=(intltool gnome-bluetooth gobject-introspection) 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=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz + fixed-signal-icons.tar.xz) +noextract=(fixed-signal-icons.tar.xz) +sha256sums=('1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590' + '08ffd9d045c98119eb1991c036f41e51950e72eea5638549075239256c000e91') + +prepare() { + cd ${pkgname}-${pkgver} + + # Fix signal icons to work with libpng 1.6 + # https://bugzilla.gnome.org/show_bug.cgi?id=697286 + tar xf ${srcdir}/fixed-signal-icons.tar.xz +} build() { cd ${pkgname}-${pkgver} diff --git a/extra/network-manager-applet/fixed-signal-icons.tar.xz b/extra/network-manager-applet/fixed-signal-icons.tar.xz new file mode 100644 index 000000000..1f85541dc Binary files /dev/null and b/extra/network-manager-applet/fixed-signal-icons.tar.xz differ diff --git a/extra/perl-alien-sdl/PKGBUILD b/extra/perl-alien-sdl/PKGBUILD index 4b6bdedd3..712653e42 100644 --- a/extra/perl-alien-sdl/PKGBUILD +++ b/extra/perl-alien-sdl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165868 2012-09-01 20:47:49Z heftig $ +# $Id: PKGBUILD 184164 2013-05-03 01:57:18Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) # Contributor: Allan McRae # Contributor: Sarah Hay @@ -8,7 +8,7 @@ pkgname=perl-alien-sdl _realname=Alien-SDL -pkgver=1.438 +pkgver=1.440 pkgrel=1 pkgdesc="Building, finding and using SDL binaries" arch=(i686 x86_64) @@ -17,9 +17,9 @@ url="http://search.cpan.org/dist/Alien-SDL/" depends=(sdl=1.2.15 perl-file-sharedir perl-capture-tiny) makedepends=(perl-file-which perl-text-patch) options=(!emptydirs) -_author=JTPALMER +_author=FROGGS source=(http://search.cpan.org/CPAN/authors/id/${_author::1}/${_author::2}/$_author/$_realname-$pkgver.tar.gz) -md5sums=('1936ba9e300677151124b62883cedf20') +md5sums=('ad665d058d186e673114024ba10dfa09') package() { cd "$srcdir/$_realname-$pkgver" diff --git a/extra/smplayer/PKGBUILD b/extra/smplayer/PKGBUILD index 39521015b..6aaf6b25b 100644 --- a/extra/smplayer/PKGBUILD +++ b/extra/smplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 181042 2013-03-30 15:19:33Z foutrelis $ +# $Id: PKGBUILD 184186 2013-05-03 10:19:10Z foutrelis $ # Maintainer : Ionut Biru # Contributor: Allan McRae # Contributor: Alessio 'mOLOk' Bolognino @@ -6,16 +6,25 @@ pkgname=smplayer pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="A complete front-end for MPlayer" arch=('i686' 'x86_64') url="http://smplayer.sourceforge.net/" license=('GPL') depends=('qt4' 'mplayer') +makedepends=('optipng') install=smplayer.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('4691b569c4209d7e5a2c1386d9319881') +prepare() { + cd "$pkgname-$pkgver" + + # Fix invalid PNG icons to work with libpng 1.6 + # http://sourceforge.net/p/smplayer/bugs/571/ + find -name '*.png' -exec optipng -quiet -force -fix {} + +} + build() { cd "$pkgname-$pkgver" sed -i 's:#\(DEFINES += NO_DEBUG_ON_CONSOLE\):\1:' src/smplayer.pro diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 292be2408..a1e90b3b6 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -6,23 +6,23 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.10 +pkgver=${_basekernel}.11 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') 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" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '6294513cfa9830d48ad1915ff7053a98' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install index a4f59e9b3..76fa87eb8 100644 --- a/kernels/linux-libre-pae/linux-libre-pae.install +++ b/kernels/linux-libre-pae/linux-libre-pae.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-pae -KERNEL_VERSION=3.8.10-1-LIBRE-PAE +KERNEL_VERSION=3.8.11-1-LIBRE-PAE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index fed3ad748..77ebe521f 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -9,19 +9,19 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_releasever=4 -_rtpatchver=rt2 +_releasever=10 +_rtpatchver=rt6 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') 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" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu1/patch-${_basekernel}-gnu1-${_pkgver}-gnu1.xz" "http://www.kernel.org/pub/linux/kernel/projects/rt/${_basekernel}/patch-${_pkgver}-${_rtpatchver}.patch.xz" # the main kernel config files 'config.i686' 'config.x86_64' @@ -32,17 +32,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'boot-logo.patch' 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'be610dd93dbe033cfe04018b27557c3e' - '22014502fe176ae6dfa33d26f20dbc92' - '4c8f8e66f934b14b48298fd23583ee5f' - '80388869acf87c930fd6bf956682f35c' +md5sums=('5c7787be882c343e41fb49136ff60aec' + '1a05d0c781ac02fed58ad405a8b8355a' + '23d715c891ecfb436cb2a4c4ea5286af' + '5ed195b8c44e1e00c1885077566e1f81' + 'f97a0be3b9252e788a0cf67e93cb5c6f' '82496e68851d1960543a07ba51cdb44a' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'a245684c46c8bc2348ebb259c18e40a6') + 'c1a8440ffdae7c352d77bc4002cb6d3d') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -56,7 +56,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${_pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${_pkgver}-gnu1" fi # add realtime patch diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686 index 7fec50cc4..d6e6d82c9 100644 --- a/kernels/linux-libre-rt/config.i686 +++ b/kernels/linux-libre-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.8.4 Kernel Configuration +# Linux/i386 3.8.10 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -5468,6 +5468,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64 index 8d48b274f..d4cef655e 100644 --- a/kernels/linux-libre-rt/config.x86_64 +++ b/kernels/linux-libre-rt/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.8.4 Kernel Configuration +# Linux/x86_64 3.8.10 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -5238,6 +5238,8 @@ CONFIG_EDD=m # CONFIG_EDD_OFF is not set CONFIG_FIRMWARE_MEMMAP=y CONFIG_EFI_VARS=y +CONFIG_EFI_VARS_PSTORE=y +# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set CONFIG_DELL_RBU=m CONFIG_DCDBAS=m CONFIG_DMIID=y diff --git a/kernels/linux-libre-rt/linux-libre-rt.install b/kernels/linux-libre-rt/linux-libre-rt.install index 449e2c823..4b78a3997 100644 --- a/kernels/linux-libre-rt/linux-libre-rt.install +++ b/kernels/linux-libre-rt/linux-libre-rt.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-rt -KERNEL_VERSION=3.8.4-1-rt2-LIBRE-RT +KERNEL_VERSION=3.8.10-1-rt6-LIBRE-RT # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 19e0233a8..2d2ba5338 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -6,23 +6,23 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -pkgver=${_basekernel}.10 +pkgver=${_basekernel}.11 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') 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" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config' # standard config files for mkinitcpio ramdisk "${pkgbase}.preset" 'boot-logo.patch' 'change-default-console-loglevel.patch') -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '2708b6f03f827e2c94ecbd050df4286d' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' @@ -35,7 +35,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install index 905244477..dbbd5e8fd 100644 --- a/kernels/linux-libre-xen/linux-libre-xen.install +++ b/kernels/linux-libre-xen/linux-libre-xen.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-xen -KERNEL_VERSION=3.8.10-1-LIBRE-XEN +KERNEL_VERSION=3.8.11-1-LIBRE-XEN # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index efe1c3371..75bcfdc6a 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.8.10 +_kernver=3.8.11 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=15 +pkgrel=16 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -22,7 +22,7 @@ source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_versi md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') -build() { +package() { # current extramodules version _extraver=extramodules-3.8-LIBRE diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index ec552b834..c8c40e338 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva -_kernver=3.0.75 +_kernver=3.0.76 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _version=v3.8-rc7 _pkgver=3.8-rc7-1-u pkgver=3.8rc7.1 -pkgrel=13 +pkgrel=14 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' @@ -22,7 +22,7 @@ source=(http://www.kernel.org/pub/linux/kernel/projects/backports/stable/$_versi md5sums=('3a1c7f870ff2fb96534b0d69245a4dab') -build() { +package() { # current extramodules version _extraver=extramodules-3.0-LIBRE-LTS diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 8e41245c2..bb72f209f 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -10,7 +10,7 @@ _basekernel=3.0 _sublevel=76 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.75 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.76 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -30,7 +30,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' 'module-symbol-waiting-3.0.patch' 'module-init-wait-3.0.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' 'e405de6581d02d44c2c06a81a1d93f93' 'fe0e9b4415b82f306fc1b63eb9a742a4' @@ -44,7 +44,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - '9f8275e1bd316b2b93fd21df3b26228f') + '5b330cc23071e1250b7e0a1613a25952') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 67bbcdc5d..2be94b22d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,17 +10,17 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.8 -_sublevel=10 +_sublevel=11 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.11 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') 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" +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu1/linux-libre-${_basekernel}-gnu1.tar.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu1/patch-${_basekernel}-gnu1-${pkgver}-gnu1.xz" # the main kernel config files 'config.i686' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -29,9 +29,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") -md5sums=('84c2a77910932ffc7d958744ac9cf2f5' - 'fd9713a31ee671a9dec8ad0e65996c84' + "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") +md5sums=('5c7787be882c343e41fb49136ff60aec' + 'c0ccd5624a61eaae1a00a349e90b5a26' '9b425f069f920cdd6798b3adab79d3af' '9316ebdb21ea9948ae5c83795a3dcf61' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -39,7 +39,7 @@ md5sums=('84c2a77910932ffc7d958744ac9cf2f5' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '259774469ac9b2b1f41cf2f978743055') + '8c00187e43a678a1db821974a1c0a39c') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -53,7 +53,7 @@ prepare() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu1-${pkgver}-gnu1" fi # Add freedo as boot logo diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index fd8297ddf..e34d8347f 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.8.10-1-LIBRE +KERNEL_VERSION=3.8.11-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/pcr/babeld/PKGBUILD b/pcr/babeld/PKGBUILD index e125f83e9..e1e3eb0c4 100644 --- a/pcr/babeld/PKGBUILD +++ b/pcr/babeld/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer (AUR): Yann Lopez # Maintainer (Parabola): fauno pkgname=babeld -pkgver=1.3.6 +pkgver=1.4.0 pkgrel=1 pkgdesc="Loop-free distance-vector routing protocol" arch=(i686 x86_64 mips64el) @@ -28,5 +28,5 @@ package() { install -Dm 644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENCE } -md5sums=('5dfccfeb2db5d8244c2fd2dc301e89a0' +md5sums=('4ad44bca59f594a629306ac5c9b89d57' 'SKIP') -- cgit v1.2.3-54-g00ecf