summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-01-01 16:37:20 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-01-01 16:37:20 -0300
commit6124dfa10e2a69fc79efc85f611c8db582caf711 (patch)
treee9706ae64164967e8448140e9cb6534dfbb0a2a3
parent385fda403f286573a778ee525fe56a86d11fc967 (diff)
parent5a81550adad5ccde4ad6924cfee2b2ef96d02c98 (diff)
Merge branch 'master' of gparabola:abslibre/abslibre-pre-mips64el
Conflicts: community/almanah/PKGBUILD community/audit/PKGBUILD community/bird/PKGBUILD community/blobby2/PKGBUILD community/blueman/PKGBUILD community/bomberclone/PKGBUILD community/botan/PKGBUILD community/cantata/PKGBUILD community/cinnamon-desktop/PKGBUILD community/cinnamon-settings-daemon/PKGBUILD community/cinnamon/PKGBUILD community/clearsilver/PKGBUILD community/clinica/PKGBUILD community/confuse/PKGBUILD community/deadbeef/PKGBUILD community/dvdrtools/PKGBUILD community/etl/PKGBUILD community/extremetuxracer/PKGBUILD community/fcitx-mozc/PKGBUILD community/flashrom/PKGBUILD community/freedroidrpg/PKGBUILD community/gcolor2/PKGBUILD community/geary/PKGBUILD community/glob2/PKGBUILD community/gnash/PKGBUILD community/gnome-commander/PKGBUILD community/gnome-settings-daemon-updates/PKGBUILD community/gnuchess/PKGBUILD community/haskell-bytestring-show/PKGBUILD community/haskell-hslogger/PKGBUILD community/haskell-vector/PKGBUILD community/hedgewars/PKGBUILD community/hitori/PKGBUILD community/inputattach/PKGBUILD community/jack2/PKGBUILD community/kid3/PKGBUILD community/lcdproc/PKGBUILD community/libcec/PKGBUILD community/libvirt/PKGBUILD community/libwww/PKGBUILD community/lightdm/PKGBUILD community/lincity-ng/PKGBUILD community/linux-tools/PKGBUILD community/linuxtv-dvb-apps/PKGBUILD community/lockdev/PKGBUILD community/log4cpp/PKGBUILD community/love/PKGBUILD community/luajit/PKGBUILD community/lxc/PKGBUILD community/metamail/PKGBUILD community/mingw32-binutils/PKGBUILD community/mingw32-gcc/PKGBUILD community/mingw32-pthreads/PKGBUILD community/mongodb/PKGBUILD community/nemo/PKGBUILD community/par2cmdline/PKGBUILD community/pdfedit/PKGBUILD community/perl-json-xs/PKGBUILD community/pidgin-talkfilters/PKGBUILD community/pokerth/PKGBUILD community/setconf/PKGBUILD community/stfl/PKGBUILD community/talkfilters/PKGBUILD community/tre/PKGBUILD community/ubuntuone-client-gnome/PKGBUILD community/ubuntuone-client/PKGBUILD community/vor/PKGBUILD community/warmux/PKGBUILD community/wdm/PKGBUILD community/xbmc-pvr-addons/PKGBUILD core/gcc/PKGBUILD core/lvm2/PKGBUILD core/systemd/PKGBUILD core/sysvinit-tools/PKGBUILD extra/aubio/PKGBUILD extra/avidemux/PKGBUILD extra/bluez4/PKGBUILD extra/boost/PKGBUILD extra/calligra/PKGBUILD extra/caribou/PKGBUILD extra/chemtool/PKGBUILD extra/cinepaint/PKGBUILD extra/conky/PKGBUILD extra/cups/PKGBUILD extra/enlightenment16/PKGBUILD extra/exo/PKGBUILD extra/fakechroot/PKGBUILD extra/farstream-0.1/PKGBUILD extra/ffmpeg-compat/PKGBUILD extra/fltk/PKGBUILD extra/git/PKGBUILD extra/gpart/PKGBUILD extra/gstreamer0.10-base/PKGBUILD extra/gstreamer0.10-ffmpeg/PKGBUILD extra/gstreamer0.10-good/PKGBUILD extra/gstreamer0.10-ugly/PKGBUILD extra/gtk-vnc/PKGBUILD extra/haveged/PKGBUILD extra/icewm/PKGBUILD extra/imagemagick/PKGBUILD extra/kactivities/PKGBUILD extra/kdeaccessibility-jovie/PKGBUILD extra/kdeaccessibility-kaccessible/PKGBUILD extra/kdeaccessibility-kmag/PKGBUILD extra/kdeaccessibility-kmousetool/PKGBUILD extra/kdeaccessibility-kmouth/PKGBUILD extra/kdeadmin-kcron/PKGBUILD extra/kdeadmin-ksystemlog/PKGBUILD extra/kdeadmin-kuser/PKGBUILD extra/kdeartwork/PKGBUILD extra/kdebase-konsole/PKGBUILD extra/kdebase-workspace/PKGBUILD extra/kdebase/PKGBUILD extra/kdebindings-kimono/PKGBUILD extra/kdebindings-korundum/PKGBUILD extra/kdebindings-kross/PKGBUILD extra/kdebindings-perlkde/PKGBUILD extra/kdebindings-perlqt/PKGBUILD extra/kdebindings-python/PKGBUILD extra/kdebindings-qtruby/PKGBUILD extra/kdebindings-qyoto/PKGBUILD extra/kdebindings-smokegen/PKGBUILD extra/kdebindings-smokekde/PKGBUILD extra/kdebindings-smokeqt/PKGBUILD extra/kdeedu-analitza/PKGBUILD extra/kdeedu-blinken/PKGBUILD extra/kdeedu-cantor/PKGBUILD extra/kdeedu-kalgebra/PKGBUILD extra/kdeedu-kalzium/PKGBUILD extra/kdeedu-kanagram/PKGBUILD extra/kdeedu-kbruch/PKGBUILD extra/kdeedu-kgeography/PKGBUILD extra/kdeedu-khangman/PKGBUILD extra/kdeedu-kig/PKGBUILD extra/kdeedu-kiten/PKGBUILD extra/kdeedu-klettres/PKGBUILD extra/kdeedu-kmplot/PKGBUILD extra/kdeedu-kstars/PKGBUILD extra/kdeedu-ktouch/PKGBUILD extra/kdeedu-kturtle/PKGBUILD extra/kdeedu-kwordquiz/PKGBUILD extra/kdeedu-marble/PKGBUILD extra/kdeedu-pairs/PKGBUILD extra/kdeedu-parley/PKGBUILD extra/kdeedu-rocs/PKGBUILD extra/kdeedu-step/PKGBUILD extra/kdegames-bomber/PKGBUILD extra/kdegames-bovo/PKGBUILD extra/kdegames-granatier/PKGBUILD extra/kdegames-kapman/PKGBUILD extra/kdegames-katomic/PKGBUILD extra/kdegames-kblackbox/PKGBUILD extra/kdegames-kblocks/PKGBUILD extra/kdegames-kbounce/PKGBUILD extra/kdegames-kbreakout/PKGBUILD extra/kdegames-kdiamond/PKGBUILD extra/kdegames-kfourinline/PKGBUILD extra/kdegames-kgoldrunner/PKGBUILD extra/kdegames-kigo/PKGBUILD extra/kdegames-killbots/PKGBUILD extra/kdegames-kiriki/PKGBUILD extra/kdegames-kjumpingcube/PKGBUILD extra/kdegames-klickety/PKGBUILD extra/kdegames-klines/PKGBUILD extra/kdegames-kmahjongg/PKGBUILD extra/kdegames-kmines/PKGBUILD extra/kdegames-knavalbattle/PKGBUILD extra/kdegames-knetwalk/PKGBUILD extra/kdegames-kolf/PKGBUILD extra/kdegames-kollision/PKGBUILD extra/kdegames-konquest/PKGBUILD extra/kdegames-kpatience/PKGBUILD extra/kdegames-kreversi/PKGBUILD extra/kdegames-kshisen/PKGBUILD extra/kdegames-ksirk/PKGBUILD extra/kdegames-ksnakeduel/PKGBUILD extra/kdegames-kspaceduel/PKGBUILD extra/kdegames-ksquares/PKGBUILD extra/kdegames-ksudoku/PKGBUILD extra/kdegames-ktuberling/PKGBUILD extra/kdegames-kubrick/PKGBUILD extra/kdegames-lskat/PKGBUILD extra/kdegames-palapeli/PKGBUILD extra/kdegames-picmi/PKGBUILD extra/kdegraphics-gwenview/PKGBUILD extra/kdegraphics-kamera/PKGBUILD extra/kdegraphics-kcolorchooser/PKGBUILD extra/kdegraphics-kgamma/PKGBUILD extra/kdegraphics-kolourpaint/PKGBUILD extra/kdegraphics-kruler/PKGBUILD extra/kdegraphics-ksaneplugin/PKGBUILD extra/kdegraphics-ksnapshot/PKGBUILD extra/kdegraphics-mobipocket/PKGBUILD extra/kdegraphics-okular/PKGBUILD extra/kdegraphics-strigi-analyzer/PKGBUILD extra/kdegraphics-svgpart/PKGBUILD extra/kdegraphics-thumbnailers/PKGBUILD extra/kdemultimedia-audiocd-kio/PKGBUILD extra/kdemultimedia-dragonplayer/PKGBUILD extra/kdemultimedia-ffmpegthumbs/PKGBUILD extra/kdemultimedia-juk/PKGBUILD extra/kdemultimedia-kmix/PKGBUILD extra/kdemultimedia-kscd/PKGBUILD extra/kdemultimedia-mplayerthumbs/PKGBUILD extra/kdenetwork-filesharing/PKGBUILD extra/kdenetwork-kdnssd/PKGBUILD extra/kdenetwork-kget/PKGBUILD extra/kdenetwork-kppp/PKGBUILD extra/kdenetwork-krdc/PKGBUILD extra/kdenetwork-krfb/PKGBUILD extra/kdenetwork-strigi-analyzers/PKGBUILD extra/kdepim-runtime/PKGBUILD extra/kdepim/PKGBUILD extra/kdepimlibs/PKGBUILD extra/kdeplasma-addons/PKGBUILD extra/kdesdk-cervisia/PKGBUILD extra/kdesdk-dev-scripts/PKGBUILD extra/kdesdk-dev-utils/PKGBUILD extra/kdesdk-dolphin-plugins/PKGBUILD extra/kdesdk-kapptemplate/PKGBUILD extra/kdesdk-kate/PKGBUILD extra/kdesdk-kcachegrind/PKGBUILD extra/kdesdk-kioslaves/PKGBUILD extra/kdesdk-kompare/PKGBUILD extra/kdesdk-lokalize/PKGBUILD extra/kdesdk-okteta/PKGBUILD extra/kdesdk-poxml/PKGBUILD extra/kdesdk-strigi-analyzers/PKGBUILD extra/kdesdk-thumbnailers/PKGBUILD extra/kdesdk-umbrello/PKGBUILD extra/kdetoys-amor/PKGBUILD extra/kdetoys-kteatime/PKGBUILD extra/kdetoys-ktux/PKGBUILD extra/kdeutils-filelight/PKGBUILD extra/kdeutils-kcalc/PKGBUILD extra/kdeutils-kcharselect/PKGBUILD extra/kdeutils-kdf/PKGBUILD extra/kdeutils-kfloppy/PKGBUILD extra/kdeutils-kgpg/PKGBUILD extra/kdeutils-kremotecontrol/PKGBUILD extra/kdeutils-ktimer/PKGBUILD extra/kdeutils-kwallet/PKGBUILD extra/kdeutils-print-manager/PKGBUILD extra/kdeutils-superkaramba/PKGBUILD extra/kdeutils-sweeper/PKGBUILD extra/kdewebdev/PKGBUILD extra/kino/PKGBUILD extra/libdrm/PKGBUILD extra/libiec61883/PKGBUILD extra/libkcddb/PKGBUILD extra/libkcompactdisc/PKGBUILD extra/libkdcraw/PKGBUILD extra/libkdeedu/PKGBUILD extra/libkdegames/PKGBUILD extra/libkexiv2/PKGBUILD extra/libkipi/PKGBUILD extra/libkmahjongg/PKGBUILD extra/libksane/PKGBUILD extra/libmikmod/PKGBUILD extra/libmp4v2/PKGBUILD extra/libnet/PKGBUILD extra/libpst/PKGBUILD extra/libsidplay/PKGBUILD extra/libsigsegv/PKGBUILD extra/libvpx/PKGBUILD extra/libxmi/PKGBUILD extra/lua51/PKGBUILD extra/mariadb/PKGBUILD extra/maxima/PKGBUILD extra/mesa/PKGBUILD extra/mjpegtools/PKGBUILD extra/mkvtoolnix/PKGBUILD extra/nepomuk-core/PKGBUILD extra/nepomuk-widgets/PKGBUILD extra/obexd/PKGBUILD extra/opencv/PKGBUILD extra/perl-dbd-mysql/PKGBUILD extra/phonon-gstreamer/PKGBUILD extra/phonon-vlc/PKGBUILD extra/phonon/PKGBUILD extra/plotutils/PKGBUILD extra/postgresql/PKGBUILD extra/pycrypto/PKGBUILD extra/python/PKGBUILD extra/qt4/PKGBUILD extra/qt5/PKGBUILD extra/rcs/PKGBUILD extra/rdesktop/PKGBUILD extra/rtmpdump/PKGBUILD extra/ruby/PKGBUILD extra/signon/PKGBUILD extra/sqlite/PKGBUILD extra/vigra/PKGBUILD extra/vim/PKGBUILD extra/vlc/PKGBUILD extra/w3m/PKGBUILD extra/wcslib/PKGBUILD extra/windowmaker/PKGBUILD extra/x264/PKGBUILD extra/xaos/PKGBUILD extra/xmlto/PKGBUILD libre/angband-libre/PKGBUILD libre/hplip-libre/PKGBUILD libre/kdebase-konqueror-libre/PKGBUILD libre/kdebase-runtime-libre/PKGBUILD libre/kdelibs-libre/PKGBUILD libre/kdenetwork-kopete-libre/PKGBUILD libre/kdepim-libre/PKGBUILD libre/kdeutils-ark-libre/PKGBUILD libre/linux-libre/PKGBUILD libre/mc-libre/PKGBUILD libre/xbmc-libre/PKGBUILD nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD nonprism/kdepim-runtime-nonprism/PKGBUILD pcr/libquvi-scripts-current/PKGBUILD
-rw-r--r--community/0ad/PKGBUILD11
-rw-r--r--community/alex/PKGBUILD16
-rw-r--r--community/almanah/PKGBUILD25
-rw-r--r--community/almanah/eds-3.8.patch2609
-rw-r--r--community/almanah/update-gtkspell3-support.patch90
-rw-r--r--community/argyllcms/PKGBUILD28
-rw-r--r--community/aria2/PKGBUILD11
-rw-r--r--community/arj/001_arches_align.patch (renamed from extra/arj/001_arches_align.patch)0
-rw-r--r--community/arj/002_no_remove_static_const.patch (renamed from extra/arj/002_no_remove_static_const.patch)0
-rw-r--r--community/arj/003_64_bit_clean.patch (renamed from extra/arj/003_64_bit_clean.patch)0
-rw-r--r--community/arj/PKGBUILD (renamed from extra/arj/PKGBUILD)2
-rw-r--r--community/arj/arj-3.10.22-custom-printf.patch (renamed from extra/arj/arj-3.10.22-custom-printf.patch)0
-rw-r--r--community/arpwatch/PKGBUILD6
-rw-r--r--community/arpwatch/ethercodes.dat.xzbin166132 -> 171524 bytes
-rw-r--r--community/aspell-it/PKGBUILD (renamed from extra/aspell-it/PKGBUILD)2
-rw-r--r--community/astyle/PKGBUILD6
-rw-r--r--community/audit/PKGBUILD11
-rw-r--r--community/autocutsel/PKGBUILD13
-rw-r--r--community/autofs/0001-autofs-5.0.5-include-krb5-library.patch206
-rw-r--r--community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch59
-rw-r--r--community/autofs/PKGBUILD31
-rw-r--r--community/autofs/auto.master6
-rw-r--r--community/autofs/auto.misc7
-rw-r--r--community/autofs/autofs.install4
-rw-r--r--community/avrdude/PKGBUILD8
-rw-r--r--community/barcode/PKGBUILD (renamed from extra/barcode/PKGBUILD)2
-rw-r--r--community/barcode/barcode.install (renamed from extra/barcode/barcode.install)0
-rw-r--r--community/bind/PKGBUILD6
-rw-r--r--community/bird/PKGBUILD8
-rw-r--r--community/bitcoin/PKGBUILD6
-rw-r--r--community/blobby2/PKGBUILD8
-rw-r--r--community/blueman/PKGBUILD48
-rw-r--r--community/bomberclone/PKGBUILD42
-rw-r--r--community/bomberclone/bomberclone.desktop10
-rw-r--r--community/botan/PKGBUILD14
-rw-r--r--community/box2d/PKGBUILD31
-rw-r--r--community/brise/PKGBUILD15
-rw-r--r--community/c++-gtk-utils/PKGBUILD6
-rwxr-xr-xcommunity/cairo-dock/PKGBUILD6
-rw-r--r--community/cantata/PKGBUILD13
-rw-r--r--community/ccache/PKGBUILD (renamed from extra/ccache/PKGBUILD)2
-rw-r--r--community/ccgo/PKGBUILD27
-rw-r--r--community/ccid/PKGBUILD8
-rw-r--r--community/cclive/PKGBUILD8
-rw-r--r--community/cdemu-daemon/PKGBUILD6
-rw-r--r--community/cegui/PKGBUILD29
-rw-r--r--community/cegui/freetype.patch14
-rw-r--r--community/chuck/PKGBUILD11
-rw-r--r--community/cinnamon-control-center/PKGBUILD6
-rw-r--r--community/cinnamon-desktop/PKGBUILD4
-rw-r--r--community/cinnamon-session/PKGBUILD4
-rw-r--r--community/cinnamon-settings-daemon/PKGBUILD4
-rw-r--r--community/cinnamon/PKGBUILD6
-rw-r--r--community/clearsilver/PKGBUILD15
-rw-r--r--community/clinica/PKGBUILD42
-rw-r--r--community/codeblocks/PKGBUILD16
-rw-r--r--community/confuse/PKGBUILD4
-rw-r--r--community/connman/PKGBUILD6
-rw-r--r--community/converseen/PKGBUILD6
-rw-r--r--community/couchdb/PKGBUILD8
-rw-r--r--community/csfml/PKGBUILD6
-rw-r--r--community/dante/PKGBUILD8
-rw-r--r--community/darktable/PKGBUILD8
-rw-r--r--community/dart/PKGBUILD75
-rw-r--r--community/dbmail/PKGBUILD9
-rw-r--r--community/dd_rescue/PKGBUILD26
-rw-r--r--community/deadbeef/PKGBUILD12
-rw-r--r--community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch118
-rw-r--r--community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch25
-rw-r--r--community/denemo/PKGBUILD9
-rw-r--r--community/desmume/PKGBUILD16
-rw-r--r--community/desmume/glx_3Demu.patch25
-rw-r--r--community/dietlibc/PKGBUILD5
-rw-r--r--community/diffstat/PKGBUILD (renamed from extra/diffstat/PKGBUILD)2
-rw-r--r--community/dmd/PKGBUILD17
-rw-r--r--community/dmd/soname.diff15
-rw-r--r--community/dnscrypt-proxy/PKGBUILD13
-rw-r--r--community/dnscrypt-proxy/conf.d.file4
-rw-r--r--community/dnscrypt-proxy/dnscrypt-proxy.service3
-rw-r--r--community/docbook2x/PKGBUILD14
-rw-r--r--community/docker/PKGBUILD50
-rw-r--r--community/docker/docker.install18
-rw-r--r--community/docker/docker.service11
-rw-r--r--community/dolphin-emu/Dolphin_Logo.pngbin0 -> 62052 bytes
-rw-r--r--community/dolphin-emu/PKGBUILD43
-rw-r--r--community/dolphin-emu/dolphin-emu.desktop11
-rw-r--r--community/doublecmd/PKGBUILD10
-rw-r--r--community/dstep/PKGBUILD39
-rw-r--r--community/dub/PKGBUILD9
-rw-r--r--community/dvdisaster/PKGBUILD15
-rw-r--r--community/dvdrtools/PKGBUILD29
-rw-r--r--community/dvgrab/PKGBUILD (renamed from extra/dvgrab/PKGBUILD)2
-rw-r--r--community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch25
-rw-r--r--community/dvtm/PKGBUILD16
-rw-r--r--community/dvtm/config.h2
-rw-r--r--community/easystroke/PKGBUILD2
-rw-r--r--community/ejabberd/PKGBUILD76
-rw-r--r--community/ejabberd/crash-fix.patch14
-rw-r--r--community/ejabberd/ejabberd.install10
-rw-r--r--community/ejabberd/ejabberd.service3
-rw-r--r--community/elasticsearch/PKGBUILD75
-rw-r--r--community/elasticsearch/elasticsearch-tmpfile.conf1
-rw-r--r--community/elasticsearch/elasticsearch.install24
-rw-r--r--community/elasticsearch/elasticsearch.service13
-rw-r--r--community/electricsheep/PKGBUILD4
-rw-r--r--community/elfkickers/PKGBUILD24
-rw-r--r--community/encfs/PKGBUILD6
-rw-r--r--community/envoy/PKGBUILD33
-rw-r--r--community/erlang-nox/PKGBUILD22
-rw-r--r--community/erlang-nox/epmd.conf3
-rw-r--r--community/erlang-nox/epmd.service11
-rw-r--r--community/erlang-nox/epmd.socket9
-rw-r--r--community/erlang/PKGBUILD12
-rw-r--r--community/etl/PKGBUILD28
-rw-r--r--community/extremetuxracer/PKGBUILD37
-rw-r--r--community/extremetuxracer/extremetuxracer.desktop12
-rw-r--r--community/extremetuxracer/extremetuxracer.pngbin3611 -> 0 bytes
-rw-r--r--community/extremetuxracer/libpng15.patch57
-rw-r--r--community/fatrat/PKGBUILD4
-rw-r--r--community/fbreader/PKGBUILD15
-rw-r--r--community/fcitx-cloudpinyin/PKGBUILD18
-rw-r--r--community/fcitx-rime/PKGBUILD19
-rw-r--r--community/flashrom/PKGBUILD13
-rw-r--r--community/flightgear/PKGBUILD6
-rw-r--r--community/fox/PKGBUILD31
-rw-r--r--community/freedroidrpg/PKGBUILD4
-rw-r--r--community/g15daemon/PKGBUILD43
-rw-r--r--community/g15daemon/g15daemon-1.9.5.3-config-write.patch12
-rw-r--r--community/g15daemon/g15daemon-1.9.5.3-recv-oob-answer.patch11
-rw-r--r--community/g15daemon/g15daemon-1.9.5.3-uinput.patch35
-rw-r--r--community/g15daemon/g15daemon.service11
-rw-r--r--community/gambas3/PKGBUILD8
-rw-r--r--community/gambas3/gambas3-3.4.1-llvm-3.3.patch86
-rw-r--r--community/garmindev/PKGBUILD4
-rw-r--r--community/garmindev/garmindev.changelog5
-rw-r--r--community/gcolor2/PKGBUILD4
-rw-r--r--community/gcolor2/gcolor2.desktop1
-rw-r--r--community/gcompris/PKGBUILD21
-rw-r--r--community/gdal/PKGBUILD4
-rw-r--r--community/gdc/PKGBUILD8
-rw-r--r--community/gearmand/PKGBUILD50
-rw-r--r--community/gearmand/gearmand.conf1
-rw-r--r--community/gearmand/gearmand.install12
-rw-r--r--community/gearmand/gearmand.service12
-rwxr-xr-xcommunity/geary/PKGBUILD16
-rw-r--r--community/gedit-plugins/PKGBUILD6
-rw-r--r--community/gendesk/PKGBUILD6
-rw-r--r--community/gif2png/PKGBUILD (renamed from extra/gif2png/PKGBUILD)2
-rw-r--r--community/girara/PKGBUILD8
-rw-r--r--community/glabels/PKGBUILD17
-rw-r--r--community/glabels/glabels-3.0.0-new-eds.patch71
-rw-r--r--community/glob2/PKGBUILD16
-rw-r--r--community/glom/PKGBUILD9
-rw-r--r--community/glom/glom.changelog2
-rw-r--r--community/glusterfs/PKGBUILD17
-rw-r--r--community/gmic/PKGBUILD6
-rw-r--r--community/gnash/PKGBUILD4
-rw-r--r--community/gnome-commander/PKGBUILD55
-rw-r--r--community/gnome-commander/gnome-commander.install6
-rw-r--r--community/gnome-packagekit/PKGBUILD19
-rw-r--r--community/gnome-packagekit/packagekit-0.8.patch65
-rw-r--r--community/gnome-screensaver/PKGBUILD21
-rw-r--r--community/gnome-screensaver/fix-systemd-support.patch91
-rw-r--r--community/gnome-screensaver/lightdm_switch_user.patch100
-rw-r--r--community/gnome-settings-daemon-updates/PKGBUILD23
-rw-r--r--community/gnome-settings-daemon-updates/arch.patch11
-rw-r--r--community/gnome-settings-daemon-updates/packagekit-0.8.patch60
-rw-r--r--community/gnuchess/PKGBUILD21
-rw-r--r--community/gnuchess/gnuchess.install20
-rw-r--r--community/gnuradio/PKGBUILD35
-rw-r--r--community/gnuradio/gnuradio.install49
-rw-r--r--community/gnustep-gui/PKGBUILD6
-rw-r--r--community/go/PKGBUILD16
-rw-r--r--community/go/go.install15
-rw-r--r--community/go/go.sh1
-rw-r--r--community/goaccess/PKGBUILD10
-rw-r--r--community/goocanvas/PKGBUILD9
-rw-r--r--community/gource/PKGBUILD4
-rw-r--r--community/gpointing-device-settings/PKGBUILD21
-rw-r--r--community/gpointing-device-settings/fix-build.patch26
-rw-r--r--community/gpsdrive/PKGBUILD6
-rw-r--r--community/granite/PKGBUILD14
-rw-r--r--community/gsimplecal/PKGBUILD13
-rw-r--r--community/gsoap/PKGBUILD5
-rw-r--r--community/gtk2hs-buildtools/PKGBUILD8
-rw-r--r--community/gtkglextmm/PKGBUILD (renamed from extra/gtkglextmm/PKGBUILD)2
-rw-r--r--community/gtkglextmm/gdkspanfunc.patch (renamed from extra/gtkglextmm/gdkspanfunc.patch)0
-rw-r--r--community/gtkimageview/PKGBUILD (renamed from extra/gtkimageview/PKGBUILD)2
-rw-r--r--community/gtkwave/PKGBUILD6
-rw-r--r--community/guichan/PKGBUILD12
-rw-r--r--community/guitarix2/PKGBUILD10
-rw-r--r--community/guvcview/PKGBUILD8
-rw-r--r--community/haddock/PKGBUILD8
-rw-r--r--community/haskell-bytestring-show/PKGBUILD9
-rw-r--r--community/haskell-cairo/PKGBUILD14
-rw-r--r--community/haskell-glib/PKGBUILD14
-rw-r--r--community/haskell-gtk/PKGBUILD10
-rw-r--r--community/haskell-hslogger/PKGBUILD9
-rw-r--r--community/haskell-pango/PKGBUILD10
-rw-r--r--community/haskell-primitive/PKGBUILD12
-rw-r--r--community/haskell-syb/PKGBUILD7
-rw-r--r--community/haskell-vector/PKGBUILD10
-rw-r--r--community/hedgewars/PKGBUILD29
-rw-r--r--community/hedgewars/build-fix.patch11
-rw-r--r--community/hedgewars/ffmpeg2.0.patch21
-rw-r--r--community/hexedit/PKGBUILD (renamed from extra/hexedit/PKGBUILD)2
-rw-r--r--community/hitori/PKGBUILD10
-rw-r--r--community/i3-wm/PKGBUILD10
-rw-r--r--community/ibam/PKGBUILD17
-rw-r--r--community/ibam/ibam-0.5.2-sysfs.patch12
-rw-r--r--community/ibus-chewing/PKGBUILD18
-rw-r--r--community/ibus-kkc/PKGBUILD4
-rw-r--r--community/ibus-rime/PKGBUILD12
-rw-r--r--community/id3/PKGBUILD (renamed from extra/id3/PKGBUILD)2
-rw-r--r--community/id3/id3-0.78-gcc44.patch (renamed from extra/id3/id3-0.78-gcc44.patch)0
-rw-r--r--community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch83
-rw-r--r--community/ifuse/PKGBUILD15
-rw-r--r--community/inputattach/0001-Add-w8001-flag.patch27
-rw-r--r--community/inputattach/0002-Allow-for-custom-baud-rates.patch70
-rw-r--r--community/inputattach/PKGBUILD50
-rw-r--r--community/intel-gpu-tools/PKGBUILD10
-rw-r--r--community/intellij-idea-libs/PKGBUILD19
-rw-r--r--community/io/PKGBUILD18
-rw-r--r--community/iodine/PKGBUILD15
-rw-r--r--community/iodine/iodined.conf.d17
-rw-r--r--community/iodine/iodined.service10
-rw-r--r--community/ioping/PKGBUILD6
-rw-r--r--community/irrlicht/PKGBUILD62
-rw-r--r--community/irrlicht/irrlicht-1.7.2-libpng15.patch40
-rw-r--r--community/isapnptools/PKGBUILD (renamed from extra/isapnptools/PKGBUILD)3
-rw-r--r--community/javasqlite/PKGBUILD7
-rw-r--r--community/jbigkit/PKGBUILD5
-rw-r--r--community/js185/PKGBUILD (renamed from extra/js185/PKGBUILD)2
-rw-r--r--community/kdbg/PKGBUILD8
-rw-r--r--community/keepalived/PKGBUILD6
-rw-r--r--community/keepassx/ChangeLog16
-rw-r--r--community/keepassx/PKGBUILD2
-rw-r--r--community/kid3/PKGBUILD62
-rw-r--r--community/kid3/kid3.changelog6
-rw-r--r--community/kphotoalbum/PKGBUILD4
-rw-r--r--community/ktoblzcheck/PKGBUILD6
-rw-r--r--community/lazarus/PKGBUILD15
-rw-r--r--community/lbreakout2/PKGBUILD (renamed from extra/lbreakout2/PKGBUILD)2
-rw-r--r--community/lbreakout2/lbreakout2.desktop (renamed from extra/lbreakout2/lbreakout2.desktop)0
-rw-r--r--community/lbreakout2/lbreakout2.png (renamed from extra/lbreakout2/lbreakout2.png)bin1930 -> 1930 bytes
-rw-r--r--community/lcab/PKGBUILD (renamed from extra/lcab/PKGBUILD)2
-rw-r--r--community/lcdproc/PKGBUILD31
-rw-r--r--community/ldc/PKGBUILD6
-rw-r--r--community/libcec/PKGBUILD22
-rw-r--r--community/libcuefile/PKGBUILD7
-rw-r--r--community/libdaq/PKGBUILD13
-rw-r--r--community/libdbi-drivers/PKGBUILD8
-rw-r--r--community/libestr/PKGBUILD8
-rw-r--r--community/libfaketime/PKGBUILD16
-rw-r--r--community/libg15/PKGBUILD26
-rw-r--r--community/libg15render/PKGBUILD26
-rw-r--r--community/libgringotts/PKGBUILD12
-rw-r--r--community/libgringotts/libgringotts.changelog7
-rw-r--r--community/libkkc/PKGBUILD6
-rw-r--r--community/liblockfile/PKGBUILD6
-rw-r--r--community/libmediainfo/PKGBUILD6
-rw-r--r--community/libmicrohttpd/PKGBUILD8
-rw-r--r--community/libmirage/PKGBUILD17
-rw-r--r--community/libmirage/missing-xml.patch24
-rw-r--r--community/libnfs/PKGBUILD8
-rw-r--r--community/libpar2/PKGBUILD5
-rw-r--r--community/libpinyin/PKGBUILD13
-rw-r--r--community/libraw/libraw.changelog20
-rw-r--r--community/libreplaygain/PKGBUILD12
-rw-r--r--community/librime/PKGBUILD16
-rw-r--r--community/libsodium/PKGBUILD6
-rw-r--r--community/libstatgrab/PKGBUILD10
-rw-r--r--community/libstatgrab/libstatgrab.changelog4
-rw-r--r--community/libstrl/PKGBUILD37
-rw-r--r--community/libtaginfo/PKGBUILD12
-rw-r--r--community/libuhd/PKGBUILD5
-rw-r--r--community/libuhd/libuhd.install7
-rw-r--r--community/libvdpau-va-gl/PKGBUILD26
-rw-r--r--community/libvirt-python/PKGBUILD33
-rw-r--r--community/libvirt-python/libvirt-python.install3
-rw-r--r--community/libvirt/PKGBUILD6
-rw-r--r--community/libwww/PKGBUILD19
-rw-r--r--community/libx86/PKGBUILD4
-rwxr-xr-xcommunity/lightdm/PKGBUILD10
-rw-r--r--community/lightdm/Xsession16
-rw-r--r--community/lilypond/PKGBUILD21
-rw-r--r--community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch29
-rw-r--r--community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch63
-rw-r--r--community/lincity-ng/PKGBUILD14
-rw-r--r--community/linux-tools/PKGBUILD166
-rw-r--r--community/linuxconsole/PKGBUILD37
-rw-r--r--community/linuxconsole/inputattach.conf.d (renamed from community/inputattach/inputattach.conf.d)0
-rw-r--r--community/linuxconsole/inputattach.service (renamed from community/inputattach/inputattach.service)0
-rwxr-xr-xcommunity/linuxconsole/inputattachctl (renamed from community/inputattach/inputattachctl)0
-rw-r--r--community/linuxdoc-tools/PKGBUILD10
-rw-r--r--community/linuxtv-dvb-apps/PKGBUILD42
-rw-r--r--community/liteide/PKGBUILD37
-rw-r--r--community/liteide/liteide.sh7
-rw-r--r--community/lockdev/PKGBUILD15
-rw-r--r--community/lockdev/gcc-4.7.patch18
-rw-r--r--community/log4cpp/PKGBUILD9
-rw-r--r--community/lorcon/PKGBUILD51
-rw-r--r--community/love/PKGBUILD33
-rw-r--r--community/love/love.install2
-rw-r--r--community/love08/PKGBUILD31
-rw-r--r--community/ltris/PKGBUILD6
-rw-r--r--community/ltris/ltris.changelog5
-rw-r--r--community/luajit/PKGBUILD15
-rw-r--r--community/luxrays/PKGBUILD10
-rw-r--r--community/lxappearance/PKGBUILD9
-rw-r--r--community/lxc/PKGBUILD17
-rw-r--r--community/lxc/lxc.install8
-rw-r--r--community/lxc/lxc.tmpfiles.d1
-rw-r--r--community/lxc/lxc@.service (renamed from community/glusterfs/glusterd.service)5
-rw-r--r--community/lxdm/PKGBUILD30
-rwxr-xr-xcommunity/lxdm/Xsession64
-rw-r--r--community/lxdm/default-config.patch63
-rw-r--r--community/lxdm/git-fixes.patch721
-rw-r--r--community/lxdm/lxdm.pam7
-rw-r--r--community/lxlauncher/PKGBUILD10
-rw-r--r--community/lxmusic/PKGBUILD24
-rw-r--r--community/lxpolkit/PKGBUILD16
-rw-r--r--community/lxsession/PKGBUILD6
-rw-r--r--community/lxsession/lxsession-0.4.6.1-logind-support.patch8
-rw-r--r--community/lz4/PKGBUILD12
-rw-r--r--community/macchanger/PKGBUILD8
-rw-r--r--community/macchanger/macchanger.install21
-rw-r--r--community/mailman/PKGBUILD6
-rw-r--r--community/manedit/PKGBUILD (renamed from extra/manedit/PKGBUILD)2
-rw-r--r--community/manedit/manedit-1.2.1-fix-man-page.patch (renamed from extra/manedit/manedit-1.2.1-fix-man-page.patch)0
-rw-r--r--community/manedit/manedit.desktop (renamed from extra/manedit/manedit.desktop)0
-rw-r--r--community/mangler/PKGBUILD35
-rw-r--r--community/mapnik/PKGBUILD4
-rw-r--r--community/mediainfo-gui/PKGBUILD6
-rw-r--r--community/mediainfo/PKGBUILD6
-rw-r--r--community/megaglest/PKGBUILD10
-rw-r--r--community/metamail/PKGBUILD37
-rw-r--r--community/metamail/license37
-rw-r--r--community/milkytracker/PKGBUILD24
-rw-r--r--community/milkytracker/milkytracker.patch632
-rw-r--r--community/minetest/PKGBUILD12
-rw-r--r--community/mingw-w64-binutils/PKGBUILD53
-rw-r--r--community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt162
-rw-r--r--community/mingw-w64-gcc-base/PKGBUILD61
-rw-r--r--community/mingw-w64-gcc/PKGBUILD74
-rw-r--r--community/mingw-w64-gcc/gcc-make-xmmintrin-header-cplusplus-compatible.patch24
-rw-r--r--community/mingw32-binutils/PKGBUILD37
-rw-r--r--community/mingw32-gcc-base/PKGBUILD80
-rw-r--r--community/mingw32-gcc-base/gcc-1-mingw-float.patch18
-rw-r--r--community/mingw32-gcc/PKGBUILD78
-rw-r--r--community/mingw32-gcc/gcc-1-mingw-float.patch18
-rw-r--r--community/mingw32-pthreads/PKGBUILD33
-rw-r--r--community/minicom/PKGBUILD (renamed from extra/minicom/PKGBUILD)6
-rw-r--r--community/minidlna/PKGBUILD10
-rw-r--r--community/minidlna/minidlna.install2
-rw-r--r--community/mongodb/PKGBUILD4
-rw-r--r--community/mosh/PKGBUILD11
-rw-r--r--community/mpv/PKGBUILD32
-rw-r--r--community/muffin/PKGBUILD6
-rw-r--r--community/multitail/PKGBUILD8
-rw-r--r--community/mupen64plus/PKGBUILD4
-rw-r--r--community/mygui/PKGBUILD24
-rw-r--r--community/myodbc/PKGBUILD14
-rw-r--r--community/mythplugins/PKGBUILD44
-rw-r--r--community/mythtv/PKGBUILD18
-rw-r--r--community/mythtv/mythbackend.service1
-rw-r--r--community/nbd/PKGBUILD6
-rw-r--r--community/ncmpcpp/PKGBUILD30
-rw-r--r--community/nemo/PKGBUILD6
-rw-r--r--community/nginx/PKGBUILD10
-rw-r--r--community/ngircd/PKGBUILD6
-rw-r--r--community/nodejs/PKGBUILD6
-rw-r--r--community/nomacs/PKGBUILD18
-rw-r--r--community/notion/PKGBUILD46
-rw-r--r--community/nss-pam-ldapd/PKGBUILD2
-rw-r--r--community/nss-pam-ldapd/nss-pam-ldapd.install5
-rw-r--r--community/ntop/PKGBUILD3
-rw-r--r--community/obexftp/PKGBUILD (renamed from extra/obexftp/PKGBUILD)2
-rw-r--r--community/ocaml-findlib/PKGBUILD6
-rw-r--r--community/ocrad/PKGBUILD (renamed from extra/ocrad/PKGBUILD)3
-rw-r--r--community/ocrad/ocrad.install (renamed from extra/ocrad/ocrad.install)0
-rw-r--r--community/ode/PKGBUILD (renamed from extra/ode/PKGBUILD)4
-rw-r--r--community/ogmtools/PKGBUILD (renamed from extra/ogmtools/PKGBUILD)2
-rw-r--r--community/opencolorio/PKGBUILD4
-rw-r--r--community/opendkim/PKGBUILD10
-rw-r--r--community/openimageio/PKGBUILD6
-rw-r--r--community/openocd/PKGBUILD15
-rw-r--r--community/openshadinglanguage/PKGBUILD10
-rw-r--r--community/opensmtpd/PKGBUILD37
-rw-r--r--community/opensmtpd/opensmtpd.install18
-rw-r--r--community/openttd/PKGBUILD8
-rw-r--r--community/opus-tools/PKGBUILD6
-rw-r--r--community/opusfile/PKGBUILD8
-rw-r--r--community/packagekit/PKGBUILD10
-rw-r--r--community/pantheon-terminal/PKGBUILD35
-rw-r--r--community/pantheon-terminal/pantheon-terminal.install (renamed from community/clinica/clinica.install)3
-rw-r--r--community/par2cmdline/PKGBUILD20
-rw-r--r--community/parcellite/PKGBUILD17
-rw-r--r--community/parcellite/fix-crash.patch11
-rw-r--r--community/parcellite/history_menu_crash_patch39
-rw-r--r--community/parole/PKGBUILD6
-rw-r--r--community/passenger/PKGBUILD6
-rw-r--r--community/pdf2djvu/PKGBUILD4
-rw-r--r--community/pdfedit/PKGBUILD36
-rw-r--r--community/pdfedit/pdfedit.desktop9
-rw-r--r--community/pdfedit/pdfedit.pngbin1881 -> 0 bytes
-rw-r--r--community/pdns/PKGBUILD15
-rw-r--r--community/pdns/pdns.install11
-rw-r--r--community/pekwm/PKGBUILD23
-rw-r--r--community/pekwm/pekwm_kdm.desktop5
-rw-r--r--community/percona-server/PKGBUILD8
-rw-r--r--community/performous/PKGBUILD6
-rw-r--r--community/perl-berkeleydb/PKGBUILD8
-rw-r--r--community/perl-fuse/PKGBUILD8
-rw-r--r--community/perl-xml-libxslt/PKGBUILD16
-rw-r--r--community/php-mongo/PKGBUILD6
-rw-r--r--community/pidgin-lwqq/PKGBUILD12
-rw-r--r--community/pidgin-talkfilters/PKGBUILD26
-rw-r--r--community/pingus/PKGBUILD4
-rw-r--r--community/pinot/PKGBUILD12
-rw-r--r--community/pinot/namespace_clash.patch12
-rw-r--r--community/pion/PKGBUILD6
-rw-r--r--community/plan9port/PKGBUILD34
-rw-r--r--community/plan9port/plan9.install13
-rw-r--r--community/plank/PKGBUILD8
-rw-r--r--community/pokerth/PKGBUILD6
-rw-r--r--community/postgis/PKGBUILD8
-rw-r--r--community/postgis/postgis.changelog3
-rw-r--r--community/powertop/PKGBUILD6
-rw-r--r--community/pragha/PKGBUILD8
-rw-r--r--community/primus/PKGBUILD4
-rw-r--r--community/proj/PKGBUILD4
-rw-r--r--community/proj/proj.changelog3
-rw-r--r--community/protobuf-c/PKGBUILD29
-rw-r--r--community/puzzles/PKGBUILD2
-rw-r--r--community/pymol/PKGBUILD42
-rw-r--r--community/python-apsw/PKGBUILD11
-rw-r--r--community/python-pillow/PKGBUILD8
-rw-r--r--community/python-pmw/LICENSE.txt21
-rw-r--r--community/python-pmw/PKGBUILD31
-rw-r--r--community/python-psutil/PKGBUILD6
-rw-r--r--community/python-pyopencl/PKGBUILD4
-rw-r--r--community/python-pyzmq/PKGBUILD6
-rw-r--r--community/python-scipy/PKGBUILD4
-rw-r--r--community/python-sqlalchemy/PKGBUILD8
-rw-r--r--community/python2-gevent-beta/PKGBUILD33
-rw-r--r--community/python2-gevent/PKGBUILD28
-rw-r--r--community/python2-gnutls/PKGBUILD21
-rw-r--r--community/python2-gnutls/libraryfunctions.patch (renamed from community/python2-gnutls/gnutls3.patch)51
-rw-r--r--community/python2-gnutls/libraryinit.patch40
-rw-r--r--community/python2-nautilus/PKGBUILD4
-rw-r--r--community/python2-pycdio/PKGBUILD12
-rw-r--r--community/python2-tagpy/PKGBUILD13
-rw-r--r--community/qcad/PKGBUILD13
-rw-r--r--community/qcad/QCad.desktop2
-rw-r--r--community/qiv/PKGBUILD28
-rw-r--r--community/qiv/qiv.install11
-rw-r--r--community/qmmp/PKGBUILD6
-rw-r--r--community/qmmp/qmmp.changelog3
-rw-r--r--community/qt-recordmydesktop/PKGBUILD6
-rw-r--r--community/qtcreator/fix-build.patch10
-rw-r--r--community/quassel/PKGBUILD8
-rw-r--r--community/quassel/quassel.service5
-rw-r--r--community/quvi/PKGBUILD10
-rw-r--r--community/radvd/PKGBUILD6
-rw-r--r--community/rdesktop/PKGBUILD36
-rw-r--r--community/rdesktop/rdesktop-send_physical_buttons.diff (renamed from extra/rdesktop/rdesktop-send_physical_buttons.diff)0
-rw-r--r--community/recoll/PKGBUILD12
-rw-r--r--community/redis/PKGBUILD8
-rw-r--r--community/redshift/165_164.diff55
-rw-r--r--community/redshift/PKGBUILD18
-rw-r--r--community/rekonq/PKGBUILD13
-rw-r--r--community/rocksndiamonds/PKGBUILD18
-rw-r--r--community/rsyslog/PKGBUILD6
-rw-r--r--community/rubinius/PKGBUILD36
-rw-r--r--community/ruby-cairo/PKGBUILD8
-rw-r--r--community/sage-mathematics/PKGBUILD168
-rw-r--r--community/sage-mathematics/SAGE-notebook.desktop19
-rw-r--r--community/sage-mathematics/fix-pil.patch12
-rw-r--r--community/sage-mathematics/sage-mathematics.install4
-rw-r--r--community/sakura/PKGBUILD23
-rw-r--r--community/sakura/deprecated_symbols.patch11
-rw-r--r--community/schroot/PKGBUILD4
-rw-r--r--community/scite/PKGBUILD10
-rw-r--r--community/setconf/PKGBUILD29
-rw-r--r--community/setserial/PKGBUILD (renamed from extra/setserial/PKGBUILD)2
-rw-r--r--community/setserial/setserial.patch (renamed from extra/setserial/setserial.patch)0
-rw-r--r--community/sfk/PKGBUILD6
-rw-r--r--community/sfml/PKGBUILD20
-rw-r--r--community/shapelib/PKGBUILD4
-rw-r--r--community/shotwell/PKGBUILD6
-rw-r--r--community/sigil/PKGBUILD4
-rw-r--r--community/simgear/PKGBUILD17
-rw-r--r--community/skrooge/PKGBUILD6
-rw-r--r--community/skrooge/skrooge.changelog3
-rw-r--r--community/sleuthkit/PKGBUILD4
-rw-r--r--community/sleuthkit/sleuthkit.changelog3
-rw-r--r--community/snapper/PKGBUILD18
-rw-r--r--community/snapper/libbtrfs.patch13
-rw-r--r--community/spacefm/PKGBUILD12
-rw-r--r--community/spice-gtk3/PKGBUILD24
-rw-r--r--community/spring/PKGBUILD16
-rw-r--r--community/springlobby/PKGBUILD8
-rw-r--r--community/springlobby/springlobby.desktop10
-rw-r--r--community/springlobby/springlobby.pngbin5819 -> 0 bytes
-rw-r--r--community/sqliteman/PKGBUILD9
-rw-r--r--community/squid/PKGBUILD38
-rw-r--r--community/srm/PKGBUILD (renamed from extra/srm/PKGBUILD)2
-rw-r--r--community/sshfs/PKGBUILD (renamed from extra/sshfs/PKGBUILD)2
-rw-r--r--community/stfl/PKGBUILD12
-rw-r--r--community/stfl/stfl.changelog3
-rw-r--r--community/stone-soup/PKGBUILD4
-rw-r--r--community/stuntrally/PKGBUILD10
-rw-r--r--community/supercollider/PKGBUILD12
-rw-r--r--community/supertuxkart/PKGBUILD12
-rw-r--r--community/swi-prolog/PKGBUILD44
-rw-r--r--community/synergy/PKGBUILD19
-rw-r--r--community/synergy/unfuck-cryptopp-thanks-gentoo.patch97
-rw-r--r--community/synfig/PKGBUILD22
-rw-r--r--community/synfigstudio/PKGBUILD8
-rw-r--r--community/talkfilters/PKGBUILD23
-rw-r--r--community/tcplay/PKGBUILD36
-rw-r--r--community/tcplay/tc-play-1.1-fix-paths.patch49
-rw-r--r--community/tea/PKGBUILD6
-rw-r--r--community/texvc/PKGBUILD14
-rw-r--r--community/the_silver_searcher/PKGBUILD6
-rw-r--r--community/tightvnc/PKGBUILD67
-rw-r--r--community/tightvnc/vncserver.service29
-rw-r--r--community/tilda/PKGBUILD23
-rwxr-xr-xcommunity/tilda/start-hidden-fix.patch24
-rwxr-xr-xcommunity/tilda/tab-count-fix.patch11
-rw-r--r--community/tilda/tilda.changelog6
-rw-r--r--community/tmw/PKGBUILD4
-rw-r--r--community/tnftp/PKGBUILD4
-rw-r--r--community/tolua++/PKGBUILD35
-rwxr-xr-xcommunity/tolua++/config_linux.py22
-rw-r--r--community/tor/PKGBUILD13
-rw-r--r--community/tor/tor.service1
-rw-r--r--community/torcs/PKGBUILD8
-rw-r--r--community/tork/PKGBUILD63
-rw-r--r--community/tork/fix_getuid.patch23
-rw-r--r--community/tork/fix_net_port.patch20
-rw-r--r--community/tork/tork.install12
-rw-r--r--community/tre/PKGBUILD35
-rw-r--r--community/trickle/PKGBUILD21
-rw-r--r--community/trickle/fix-crasher.patch86
-rw-r--r--community/ubuntuone-client-gnome/PKGBUILD35
-rw-r--r--community/ubuntuone-client-gnome/disable-gsd-plugin.patch21
-rw-r--r--community/ubuntuone-client-gnome/ubuntuone-client-gnome.install11
-rw-r--r--community/ubuntuone-client/PKGBUILD48
-rw-r--r--community/ubuntuone-client/fix-notify-hint.patch19
-rw-r--r--community/ubuntuone-client/ubuntuone-client.install11
-rw-r--r--community/udevil/PKGBUILD15
-rw-r--r--community/ulogd/PKGBUILD8
-rw-r--r--community/umurmur/PKGBUILD34
-rw-r--r--community/umurmur/umurmur.install13
-rw-r--r--community/umurmur/umurmur.service15
-rw-r--r--community/unclutter/PKGBUILD17
-rw-r--r--community/unrealircd/PKGBUILD24
-rw-r--r--community/unrealircd/unrealircd.install14
-rw-r--r--community/unshield/PKGBUILD13
-rw-r--r--community/upx/PKGBUILD4
-rw-r--r--community/uriparser/PKGBUILD8
-rw-r--r--community/uwsgi/PKGBUILD26
-rw-r--r--community/uwsgi/archlinux.ini2
-rw-r--r--community/vdrift/PKGBUILD4
-rw-r--r--community/vifm/PKGBUILD10
-rw-r--r--community/vifm/vifm.changelog3
-rw-r--r--community/vile/PKGBUILD19
-rw-r--r--community/virtualbox-modules-lts/PKGBUILD7
-rw-r--r--community/virtualbox-modules/PKGBUILD17
-rw-r--r--community/virtualbox-modules/virtualbox-guest-modules.install2
-rw-r--r--community/virtualbox-modules/virtualbox-host-modules.install2
-rw-r--r--community/vor/PKGBUILD23
-rw-r--r--community/warmux/PKGBUILD6
-rw-r--r--community/warzone2100/PKGBUILD10
-rw-r--r--community/wdm/PKGBUILD33
-rw-r--r--community/wesnoth/PKGBUILD4
-rw-r--r--community/weston/PKGBUILD4
-rw-r--r--community/widelands/PKGBUILD4
-rw-r--r--community/wings3d/PKGBUILD51
-rw-r--r--community/wireshark/PKGBUILD19
-rw-r--r--community/wiznote/PKGBUILD4
-rw-r--r--community/workrave/PKGBUILD12
-rw-r--r--community/wt/PKGBUILD4
-rw-r--r--community/xbmc-pvr-addons/PKGBUILD6
-rw-r--r--community/xcb-util-cursor/PKGBUILD8
-rw-r--r--community/xchm/PKGBUILD (renamed from extra/xchm/PKGBUILD)2
-rw-r--r--community/xchm/xchm.desktop (renamed from extra/xchm/xchm.desktop)0
-rw-r--r--community/xchm/xchm.install (renamed from extra/xchm/xchm.install)0
-rw-r--r--community/xchm/xchm.xml (renamed from extra/xchm/xchm.xml)0
-rw-r--r--community/xcircuit/PKGBUILD6
-rw-r--r--community/xemacs/PKGBUILD10
-rw-r--r--community/xfe/PKGBUILD6
-rw-r--r--community/xjadeo/PKGBUILD8
-rw-r--r--community/xkbsel/PKGBUILD11
-rw-r--r--community/xmind/PKGBUILD11
-rwxr-xr-xcommunity/xnoise/PKGBUILD14
-rw-r--r--community/xplanet/PKGBUILD7
-rw-r--r--community/xulrunner/PKGBUILD (renamed from extra/xulrunner/PKGBUILD)2
-rw-r--r--community/xulrunner/mozconfig (renamed from extra/xulrunner/mozconfig)0
-rw-r--r--community/xulrunner/mozilla-pkgconfig.patch (renamed from extra/xulrunner/mozilla-pkgconfig.patch)0
-rw-r--r--community/xulrunner/shared-libs.patch (renamed from extra/xulrunner/shared-libs.patch)0
-rwxr-xr-xcommunity/yabause-gtk/PKGBUILD25
-rwxr-xr-xcommunity/yabause-qt/PKGBUILD24
-rw-r--r--community/zathura-djvu/PKGBUILD4
-rw-r--r--community/zathura-pdf-mupdf/PKGBUILD2
-rw-r--r--community/zathura-pdf-poppler/PKGBUILD7
-rw-r--r--community/zathura-ps/PKGBUILD2
-rw-r--r--community/zathura/PKGBUILD14
-rw-r--r--community/zbar/PKGBUILD39
-rw-r--r--community/zbar/v4l1.patch24
-rw-r--r--community/zeromq/LIBZMQ-569.patch30
-rw-r--r--community/zeromq/PKGBUILD19
-rw-r--r--community/ziproxy/PKGBUILD60
-rw-r--r--community/ziproxy/build-fix.patch23
-rw-r--r--community/ziproxy/ziproxy.install11
-rw-r--r--community/ziproxy/ziproxy.logrotate13
-rw-r--r--community/ziproxy/ziproxy.xinetd14
-rw-r--r--core/binutils/PKGBUILD30
-rw-r--r--core/bison/PKGBUILD6
-rw-r--r--core/btrfs-progs/PKGBUILD12
-rw-r--r--core/coreutils/PKGBUILD10
-rw-r--r--core/cronie/PKGBUILD9
-rw-r--r--core/cryptsetup/PKGBUILD8
-rw-r--r--core/curl/PKGBUILD16
-rw-r--r--core/dbus/PKGBUILD22
-rw-r--r--core/dbus/memleak.patch37
-rw-r--r--core/dhcpcd/PKGBUILD10
-rw-r--r--core/dhcpcd/dhcpcd.service4
-rw-r--r--core/dhcpcd/dhcpcd_.service4
-rw-r--r--core/dosfstools/PKGBUILD6
-rw-r--r--core/efivar/PKGBUILD7
-rw-r--r--core/file/PKGBUILD6
-rw-r--r--core/gcc/PKGBUILD217
-rw-r--r--core/gcc/gcc-4.8-lambda-ICE.patch35
-rw-r--r--core/glib2/PKGBUILD6
-rw-r--r--core/glibc/PKGBUILD9
-rw-r--r--core/glibc/glibc-2.18-scanf-parse-0e-0.patch67
-rw-r--r--core/inetutils/PKGBUILD43
-rw-r--r--core/inetutils/ftpd.service4
-rw-r--r--core/inetutils/rlogin.pam13
-rw-r--r--core/inetutils/rlogin.socket9
-rw-r--r--core/inetutils/rlogin@.service7
-rw-r--r--core/inetutils/rsh.pam11
-rw-r--r--core/inetutils/rsh.socket9
-rw-r--r--core/inetutils/rsh@.service7
-rw-r--r--core/inetutils/talk.service12
-rw-r--r--core/inetutils/talk.socket9
-rw-r--r--core/inetutils/telnet.socket10
-rw-r--r--core/inetutils/telnet@.service7
-rw-r--r--core/iproute2/PKGBUILD17
-rw-r--r--core/iproute2/unwanted-link-help.patch17
-rw-r--r--core/iptables/PKGBUILD6
-rw-r--r--core/isl/PKGBUILD4
-rw-r--r--core/kbd/PKGBUILD19
-rw-r--r--core/kbd/fix-alt_is_meta.patch212
-rw-r--r--core/kbd/merge-fullline_singleline.patch104
-rw-r--r--core/krb5/CVE-2002-2443.patch69
-rw-r--r--core/krb5/PKGBUILD38
-rw-r--r--core/krb5/krb5-1.10.1-gcc47.patch11
-rw-r--r--core/krb5/krb5-kadmind.service2
-rw-r--r--core/krb5/krb5-kdc.service2
-rw-r--r--core/krb5/krb5-kpropd.service2
-rw-r--r--core/krb5/krb5-kpropd@.service2
-rw-r--r--core/libarchive/PKGBUILD4
-rw-r--r--core/libnl/PKGBUILD10
-rw-r--r--core/libpcap/PKGBUILD10
-rw-r--r--core/libpipeline/PKGBUILD14
-rw-r--r--core/lvm2/PKGBUILD8
-rw-r--r--core/make/PKGBUILD17
-rw-r--r--core/make/make-4.0-char-cast.patch43
-rw-r--r--core/mdadm/PKGBUILD5
-rw-r--r--core/mpfr/PKGBUILD8
-rw-r--r--core/mpfr/mpfr-3.1.2-p5.patch (renamed from core/mpfr/mpfr-3.1.2-p3.patch)126
-rw-r--r--core/nfs-utils/PKGBUILD8
-rw-r--r--core/openldap/PKGBUILD6
-rw-r--r--core/openssh/PKGBUILD6
-rw-r--r--core/openssl/PKGBUILD18
-rw-r--r--core/openssl/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch31
-rw-r--r--core/openssl/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch32
-rw-r--r--core/openvpn/PKGBUILD50
-rw-r--r--core/openvpn/openvpn-2.3.0-fix-systemd-ask-password-path.patch11
-rw-r--r--core/openvpn/openvpn.install8
-rw-r--r--core/openvpn/openvpn@.service1
-rw-r--r--core/pcre/PKGBUILD8
-rw-r--r--core/procps-ng/PKGBUILD18
-rw-r--r--core/s-nail/PKGBUILD18
-rw-r--r--core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch29
-rw-r--r--core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch36
-rw-r--r--core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch102
-rw-r--r--core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch55
-rw-r--r--core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch22
-rw-r--r--core/systemd/0005-mount-service-drop-FsckPassNo-support.patch364
-rw-r--r--core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch81
-rw-r--r--core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch95
-rw-r--r--core/systemd/PKGBUILD41
-rw-r--r--core/sysvinit-tools/0001-simplify-writelog.patch126
-rw-r--r--core/sysvinit-tools/0002-remove-ansi-escape-codes-from-log-file.patch80
-rw-r--r--core/sysvinit-tools/PKGBUILD42
-rw-r--r--core/tar/PKGBUILD6
-rw-r--r--core/texinfo/PKGBUILD15
-rw-r--r--core/texinfo/texinfo-5.2-C-n-fix.patch10
-rw-r--r--core/util-linux/0001-lsblk-fix-D-segfault.patch45
-rw-r--r--core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch30
-rw-r--r--core/util-linux/PKGBUILD15
-rw-r--r--extra/abook/PKGBUILD6
-rw-r--r--extra/abook/vcard.patch23
-rw-r--r--extra/accountsservice/PKGBUILD15
-rw-r--r--extra/accountsservice/avoid-deleting-the-root-user.patch47
-rw-r--r--extra/aisleriot/PKGBUILD6
-rw-r--r--extra/akonadi/PKGBUILD8
-rw-r--r--extra/amule/PKGBUILD10
-rw-r--r--extra/anjuta/PKGBUILD6
-rw-r--r--extra/apr-util/PKGBUILD13
-rw-r--r--extra/apr/PKGBUILD11
-rw-r--r--extra/ardour/PKGBUILD13
-rw-r--r--extra/ardour/ardour.install17
-rw-r--r--extra/asio/PKGBUILD10
-rw-r--r--extra/aspell-de/PKGBUILD8
-rw-r--r--extra/at-spi2-atk/PKGBUILD6
-rw-r--r--extra/at-spi2-core/PKGBUILD6
-rw-r--r--extra/aubio/PKGBUILD6
-rw-r--r--extra/autogen/PKGBUILD6
-rw-r--r--extra/avidemux/PKGBUILD20
-rw-r--r--extra/avidemux/PKGBUILD.WIP13
-rw-r--r--extra/avogadro/PKGBUILD4
-rw-r--r--extra/bigloo/PKGBUILD5
-rw-r--r--extra/bijiben/PKGBUILD6
-rw-r--r--extra/bluedevil/PKGBUILD19
-rw-r--r--extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch59
-rw-r--r--extra/bluez/PKGBUILD143
-rw-r--r--extra/bluez/bluetooth.modprobe3
-rw-r--r--extra/bluez4/PKGBUILD87
-rw-r--r--extra/boost/001-log_fix_dump_avx2.patch13
-rw-r--r--extra/boost/PKGBUILD75
-rw-r--r--extra/boost/boost-1.53.0-python3.patch96
-rw-r--r--extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch35
-rw-r--r--extra/boost/fix-new-glibc.patch14
-rw-r--r--extra/brasero/PKGBUILD26
-rw-r--r--extra/brasero/bug655513.patch37
-rw-r--r--extra/bullet/PKGBUILD (renamed from community/bullet/PKGBUILD)2
-rw-r--r--extra/bullet/bullet.pc (renamed from community/bullet/bullet.pc)0
-rw-r--r--extra/burp/PKGBUILD10
-rw-r--r--extra/calligra/PKGBUILD8
-rw-r--r--extra/caribou/PKGBUILD21
-rw-r--r--extra/cfitsio/PKGBUILD9
-rw-r--r--extra/check/PKGBUILD13
-rw-r--r--extra/cheese/PKGBUILD12
-rw-r--r--extra/chemtool/PKGBUILD8
-rw-r--r--extra/chromaprint/PKGBUILD6
-rw-r--r--extra/cifs-utils/PKGBUILD6
-rw-r--r--extra/cinepaint/LICENSE25
-rw-r--r--extra/cinepaint/PKGBUILD60
-rw-r--r--extra/cinepaint/cinepaint-libpng15.patch452
-rw-r--r--extra/cinepaint/cinepaint-missing-include.patch11
-rw-r--r--extra/cinepaint/cinepaint.install11
-rw-r--r--extra/claws-mail/PKGBUILD12
-rw-r--r--extra/clucene/PKGBUILD9
-rw-r--r--extra/clutter/PKGBUILD6
-rw-r--r--extra/cmake/PKGBUILD14
-rw-r--r--extra/cmake/findfreetype.patch26
-rw-r--r--extra/colord/PKGBUILD8
-rw-r--r--extra/conky/PKGBUILD14
-rw-r--r--extra/cups/PKGBUILD9
-rw-r--r--extra/cups/cups-final-content-type.patch18
-rw-r--r--extra/cvsps/PKGBUILD6
-rw-r--r--extra/digikam/PKGBUILD5
-rw-r--r--extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch49
-rw-r--r--extra/dnsmasq/PKGBUILD12
-rw-r--r--extra/docker-tray/PKGBUILD (renamed from extra/docker/PKGBUILD)18
-rw-r--r--extra/dovecot/PKGBUILD12
-rw-r--r--extra/doxygen/PKGBUILD18
-rw-r--r--extra/doxygen/doxygen-configure-python2.patch11
-rw-r--r--extra/e_dbus/PKGBUILD6
-rw-r--r--extra/ecore/PKGBUILD6
-rw-r--r--extra/edje/PKGBUILD6
-rw-r--r--extra/eet/PKGBUILD6
-rw-r--r--extra/eeze/PKGBUILD6
-rw-r--r--extra/efreet/PKGBUILD6
-rw-r--r--extra/eina/PKGBUILD6
-rw-r--r--extra/eio/PKGBUILD6
-rw-r--r--extra/ekiga/PKGBUILD4
-rw-r--r--extra/elementary/PKGBUILD6
-rw-r--r--extra/embryo/PKGBUILD6
-rw-r--r--extra/emotion/PKGBUILD6
-rw-r--r--extra/empathy/PKGBUILD6
-rw-r--r--extra/enblend-enfuse/PKGBUILD4
-rw-r--r--extra/enlightenment16/PKGBUILD (renamed from extra/enlightenment/PKGBUILD)10
-rw-r--r--extra/enlightenment17/PKGBUILD17
-rw-r--r--extra/eog/PKGBUILD13
-rw-r--r--extra/ethumb/PKGBUILD6
-rw-r--r--extra/evas/PKGBUILD6
-rw-r--r--extra/evas_generic_loaders/PKGBUILD8
-rw-r--r--extra/evince/PKGBUILD8
-rw-r--r--extra/evolution-data-server/PKGBUILD6
-rw-r--r--extra/evolution-ews/PKGBUILD6
-rw-r--r--extra/evolution/PKGBUILD6
-rw-r--r--extra/exo/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch53
-rw-r--r--extra/exo/PKGBUILD17
-rw-r--r--extra/expac/PKGBUILD (renamed from community/expac/PKGBUILD)21
-rw-r--r--extra/f-spot/0004-Fix-build-error-with-recent_gtk-sharp.patch15
-rw-r--r--extra/f-spot/PKGBUILD41
-rw-r--r--extra/fakechroot/PKGBUILD19
-rw-r--r--extra/farstream-0.1/PKGBUILD40
-rw-r--r--extra/farstream-0.1/codec-discovery-intersect.patch72
-rw-r--r--extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch132
-rw-r--r--extra/farstream-0.1/rtp-memleak.patch24
-rw-r--r--extra/ffmpeg-compat/PKGBUILD19
-rw-r--r--extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch50
-rw-r--r--extra/ffmpeg/PKGBUILD16
-rw-r--r--extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch28
-rw-r--r--extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch73
-rw-r--r--extra/ffmpegthumbnailer/PKGBUILD10
-rw-r--r--extra/five-or-more/PKGBUILD6
-rw-r--r--extra/fltk/PKGBUILD13
-rw-r--r--extra/fltk/fltk-config-dynlibs.patch37
-rw-r--r--extra/folks/PKGBUILD6
-rw-r--r--extra/fping/PKGBUILD9
-rw-r--r--extra/freeciv/PKGBUILD9
-rw-r--r--extra/freetype2/PKGBUILD20
-rw-r--r--extra/freetype2/freetype-2.5.1-enable-sph.patch (renamed from extra/freetype2/freetype-2.4.11-enable-sph.patch)10
-rw-r--r--extra/freetype2/freetype-2.5.1-enable-spr.patch (renamed from extra/freetype2/freetype-2.3.0-enable-spr.patch)8
-rw-r--r--extra/gdb/PKGBUILD6
-rw-r--r--extra/gdk-pixbuf2/PKGBUILD6
-rw-r--r--extra/gdm/PKGBUILD10
-rw-r--r--extra/gdm/gdm.install11
-rw-r--r--extra/gdm/libgdm.install11
-rw-r--r--extra/gedit/PKGBUILD6
-rw-r--r--extra/giflib/PKGBUILD22
-rw-r--r--extra/giflib/giflib-4.2.1-quantize.patch679
-rw-r--r--extra/giflib/giflib-5.0.4-include-stddef.patch11
-rw-r--r--extra/gifsicle/PKGBUILD6
-rw-r--r--extra/git/PKGBUILD10
-rw-r--r--extra/glade/PKGBUILD6
-rw-r--r--extra/glib-networking/PKGBUILD6
-rw-r--r--extra/glibmm/PKGBUILD6
-rw-r--r--extra/glpk/PKGBUILD4
-rw-r--r--extra/gnome-calculator/PKGBUILD6
-rw-r--r--extra/gnome-chess/PKGBUILD10
-rw-r--r--extra/gnome-control-center/PKGBUILD13
-rw-r--r--extra/gnome-control-center/buildfix.patch15
-rw-r--r--extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch67
-rw-r--r--extra/gnome-desktop/PKGBUILD17
-rw-r--r--extra/gnome-documents/PKGBUILD8
-rw-r--r--extra/gnome-mahjongg/PKGBUILD6
-rw-r--r--extra/gnome-online-accounts/PKGBUILD8
-rw-r--r--extra/gnome-online-miners/PKGBUILD6
-rw-r--r--extra/gnome-photos/PKGBUILD6
-rw-r--r--extra/gnome-screenshot/PKGBUILD6
-rw-r--r--extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch37
-rw-r--r--extra/gnome-settings-daemon/PKGBUILD22
-rw-r--r--extra/gnome-shell/PKGBUILD31
-rw-r--r--extra/gnome-shell/git-fixes.patch195
-rw-r--r--extra/gnome-system-monitor/PKGBUILD6
-rw-r--r--extra/gnome-terminal/PKGBUILD6
-rw-r--r--extra/gnome-user-share/PKGBUILD8
-rw-r--r--extra/gnuplot/PKGBUILD27
-rw-r--r--extra/gnuplot/gnuplot-doc2texi-el.patch13
-rw-r--r--extra/gnutls/PKGBUILD8
-rw-r--r--extra/gnutls/tls_fix.diff32
-rw-r--r--extra/gpart/PKGBUILD37
-rw-r--r--extra/gpart/gpart-0.1h-errno.patch20
-rw-r--r--extra/gpart/gpart-0.1h-l64seek.patch71
-rw-r--r--extra/gpart/gpart-0.1h-ntfs.patch75
-rw-r--r--extra/gpart/gpart-0.1h-openmode.patch11
-rw-r--r--extra/gpart/gpart-0.1h-reiserfs-3.6.patch443
-rw-r--r--extra/gpart/gpart-0.1h-vfat.patch17
-rw-r--r--extra/gparted/PKGBUILD8
-rw-r--r--extra/grantlee/PKGBUILD15
-rw-r--r--extra/graphicsmagick/PKGBUILD36
-rw-r--r--extra/graphicsmagick/benign.patch43
-rw-r--r--extra/graphite/PKGBUILD6
-rw-r--r--extra/gsl/PKGBUILD8
-rw-r--r--extra/gst-libav/PKGBUILD6
-rw-r--r--extra/gst-plugins-base/PKGBUILD6
-rw-r--r--extra/gst-plugins-good/PKGBUILD6
-rw-r--r--extra/gst-plugins-ugly/PKGBUILD9
-rw-r--r--extra/gstreamer-vaapi/PKGBUILD45
-rw-r--r--extra/gstreamer/PKGBUILD6
-rw-r--r--extra/gstreamer0.10-base/PKGBUILD50
-rw-r--r--extra/gstreamer0.10-base/ayuv64-lanczos.patch236
-rw-r--r--extra/gstreamer0.10-base/colorbalance-fix-abi.patch23
-rw-r--r--extra/gstreamer0.10-base/fix-crash-0-byte-ogg.patch22
-rw-r--r--extra/gstreamer0.10-base/gstaudio-symbols.patch10
-rw-r--r--extra/gstreamer0.10-base/revert-decodebin-playbin-removal.patch122
-rw-r--r--extra/gstreamer0.10-base/videoscale-fix-negotiation.patch171
-rw-r--r--extra/gstreamer0.10-ffmpeg/PKGBUILD25
-rw-r--r--extra/gstreamer0.10-good/PKGBUILD32
-rw-r--r--extra/gstreamer0.10-good/linux-3.6.patch31
-rw-r--r--extra/gstreamer0.10-good/test-rtp-payloading.patch422
-rw-r--r--extra/gstreamer0.10-ugly/PKGBUILD30
-rw-r--r--extra/gstreamer0.10/PKGBUILD24
-rw-r--r--extra/gstreamer0.10/bison3.patch31
-rw-r--r--extra/gthumb/PKGBUILD6
-rw-r--r--extra/gtk-vnc/PKGBUILD10
-rw-r--r--extra/gtk3/PKGBUILD9
-rw-r--r--extra/gucharmap/PKGBUILD6
-rw-r--r--extra/gupnp-av/PKGBUILD6
-rw-r--r--extra/gupnp/PKGBUILD6
-rw-r--r--extra/gvfs/PKGBUILD6
-rw-r--r--extra/harfbuzz/PKGBUILD6
-rw-r--r--extra/haskell-parsec/PKGBUILD3
-rw-r--r--extra/haveged/PKGBUILD (renamed from community/haveged/PKGBUILD)2
-rw-r--r--extra/haveged/cleanexit.patch21
-rw-r--r--extra/haveged/service (renamed from community/haveged/service)0
-rw-r--r--extra/hugin/PKGBUILD4
-rw-r--r--extra/hwloc/PKGBUILD8
-rw-r--r--extra/icewm/PKGBUILD32
-rw-r--r--extra/icewm/ignore_workarea_hints.patch2
-rw-r--r--extra/icewm/no_proc_acpi.patch17
-rw-r--r--extra/icewm/use_ICEWM_deprecated.patch21
-rw-r--r--extra/icewm/wmclient.patch25
-rw-r--r--extra/imagemagick/PKGBUILD17
-rw-r--r--extra/imake/PKGBUILD33
-rw-r--r--extra/imake/gccmakedep-cpp-4.8-compat.patch8
-rw-r--r--extra/imake/imake-cpp-4.8-compat.patch19
-rw-r--r--extra/inkscape/PKGBUILD22
-rw-r--r--extra/inkscape/build_fix.diff15
-rw-r--r--extra/intel-tbb/PKGBUILD6
-rw-r--r--extra/irssi/PKGBUILD4
-rw-r--r--extra/jasper/PKGBUILD8
-rw-r--r--extra/joe/PKGBUILD29
-rw-r--r--extra/kactivities/PKGBUILD6
-rw-r--r--extra/kdeaccessibility-jovie/PKGBUILD6
-rw-r--r--extra/kdeaccessibility-kaccessible/PKGBUILD6
-rw-r--r--extra/kdeaccessibility-kmag/PKGBUILD6
-rw-r--r--extra/kdeaccessibility-kmousetool/PKGBUILD6
-rw-r--r--extra/kdeaccessibility-kmouth/PKGBUILD6
-rw-r--r--extra/kdeadmin-kcron/PKGBUILD6
-rw-r--r--extra/kdeadmin-ksystemlog/PKGBUILD6
-rw-r--r--extra/kdeadmin-kuser/PKGBUILD6
-rw-r--r--extra/kdeartwork/PKGBUILD13
-rw-r--r--extra/kdebase-konsole/PKGBUILD6
-rw-r--r--extra/kdebase-workspace/PKGBUILD8
-rw-r--r--extra/kdebase/PKGBUILD6
-rw-r--r--extra/kdebindings-kimono/PKGBUILD6
-rw-r--r--extra/kdebindings-korundum/PKGBUILD6
-rw-r--r--extra/kdebindings-kross/PKGBUILD6
-rw-r--r--extra/kdebindings-perlkde/PKGBUILD6
-rw-r--r--extra/kdebindings-perlqt/PKGBUILD6
-rw-r--r--extra/kdebindings-python/PKGBUILD6
-rw-r--r--extra/kdebindings-qtruby/PKGBUILD6
-rw-r--r--extra/kdebindings-qyoto/PKGBUILD6
-rw-r--r--extra/kdebindings-smokegen/PKGBUILD6
-rw-r--r--extra/kdebindings-smokekde/PKGBUILD6
-rw-r--r--extra/kdebindings-smokeqt/PKGBUILD14
-rw-r--r--extra/kdeedu-analitza/PKGBUILD16
-rw-r--r--extra/kdeedu-blinken/PKGBUILD6
-rw-r--r--extra/kdeedu-cantor/PKGBUILD6
-rw-r--r--extra/kdeedu-kalgebra/PKGBUILD6
-rw-r--r--extra/kdeedu-kalzium/PKGBUILD6
-rw-r--r--extra/kdeedu-kanagram/PKGBUILD6
-rw-r--r--extra/kdeedu-kbruch/PKGBUILD6
-rw-r--r--extra/kdeedu-kgeography/PKGBUILD6
-rw-r--r--extra/kdeedu-khangman/PKGBUILD6
-rw-r--r--extra/kdeedu-kig/PKGBUILD6
-rw-r--r--extra/kdeedu-kiten/PKGBUILD6
-rw-r--r--extra/kdeedu-klettres/PKGBUILD6
-rw-r--r--extra/kdeedu-kmplot/PKGBUILD6
-rw-r--r--extra/kdeedu-kstars/PKGBUILD8
-rw-r--r--extra/kdeedu-ktouch/PKGBUILD6
-rw-r--r--extra/kdeedu-kturtle/PKGBUILD6
-rw-r--r--extra/kdeedu-kwordquiz/PKGBUILD6
-rw-r--r--extra/kdeedu-marble/PKGBUILD14
-rw-r--r--extra/kdeedu-pairs/PKGBUILD6
-rw-r--r--extra/kdeedu-parley/PKGBUILD6
-rw-r--r--extra/kdeedu-rocs/PKGBUILD6
-rw-r--r--extra/kdeedu-step/PKGBUILD6
-rw-r--r--extra/kdegames-bomber/PKGBUILD6
-rw-r--r--extra/kdegames-bovo/PKGBUILD6
-rw-r--r--extra/kdegames-granatier/PKGBUILD6
-rw-r--r--extra/kdegames-kapman/PKGBUILD6
-rw-r--r--extra/kdegames-katomic/PKGBUILD6
-rw-r--r--extra/kdegames-kblackbox/PKGBUILD6
-rw-r--r--extra/kdegames-kblocks/PKGBUILD6
-rw-r--r--extra/kdegames-kbounce/PKGBUILD6
-rw-r--r--extra/kdegames-kbreakout/PKGBUILD6
-rw-r--r--extra/kdegames-kdiamond/PKGBUILD6
-rw-r--r--extra/kdegames-kfourinline/PKGBUILD6
-rw-r--r--extra/kdegames-kgoldrunner/PKGBUILD6
-rw-r--r--extra/kdegames-kigo/PKGBUILD6
-rw-r--r--extra/kdegames-killbots/PKGBUILD6
-rw-r--r--extra/kdegames-kiriki/PKGBUILD6
-rw-r--r--extra/kdegames-kjumpingcube/PKGBUILD6
-rw-r--r--extra/kdegames-klickety/PKGBUILD6
-rw-r--r--extra/kdegames-klines/PKGBUILD6
-rw-r--r--extra/kdegames-kmahjongg/PKGBUILD6
-rw-r--r--extra/kdegames-kmines/PKGBUILD6
-rw-r--r--extra/kdegames-knavalbattle/PKGBUILD6
-rw-r--r--extra/kdegames-knetwalk/PKGBUILD6
-rw-r--r--extra/kdegames-kolf/PKGBUILD6
-rw-r--r--extra/kdegames-kollision/PKGBUILD6
-rw-r--r--extra/kdegames-konquest/PKGBUILD6
-rw-r--r--extra/kdegames-kpatience/PKGBUILD6
-rw-r--r--extra/kdegames-kreversi/PKGBUILD6
-rw-r--r--extra/kdegames-kshisen/PKGBUILD6
-rw-r--r--extra/kdegames-ksirk/PKGBUILD6
-rw-r--r--extra/kdegames-ksnakeduel/PKGBUILD6
-rw-r--r--extra/kdegames-kspaceduel/PKGBUILD6
-rw-r--r--extra/kdegames-ksquares/PKGBUILD6
-rw-r--r--extra/kdegames-ksudoku/PKGBUILD6
-rw-r--r--extra/kdegames-ktuberling/PKGBUILD6
-rw-r--r--extra/kdegames-kubrick/PKGBUILD6
-rw-r--r--extra/kdegames-lskat/PKGBUILD6
-rw-r--r--extra/kdegames-palapeli/PKGBUILD6
-rw-r--r--extra/kdegames-picmi/PKGBUILD6
-rw-r--r--extra/kdegraphics-gwenview/PKGBUILD6
-rw-r--r--extra/kdegraphics-kamera/PKGBUILD6
-rw-r--r--extra/kdegraphics-kcolorchooser/PKGBUILD6
-rw-r--r--extra/kdegraphics-kgamma/PKGBUILD6
-rw-r--r--extra/kdegraphics-kolourpaint/PKGBUILD6
-rw-r--r--extra/kdegraphics-kruler/PKGBUILD6
-rw-r--r--extra/kdegraphics-ksaneplugin/PKGBUILD6
-rw-r--r--extra/kdegraphics-ksnapshot/PKGBUILD6
-rw-r--r--extra/kdegraphics-mobipocket/PKGBUILD16
-rw-r--r--extra/kdegraphics-okular/PKGBUILD19
-rw-r--r--extra/kdegraphics-strigi-analyzer/PKGBUILD6
-rw-r--r--extra/kdegraphics-svgpart/PKGBUILD6
-rw-r--r--extra/kdegraphics-thumbnailers/PKGBUILD6
-rw-r--r--extra/kdelibs3/PKGBUILD9
-rw-r--r--extra/kdelibs3/kdelibs3.install12
-rw-r--r--extra/kdemultimedia-audiocd-kio/PKGBUILD6
-rw-r--r--extra/kdemultimedia-dragonplayer/PKGBUILD6
-rw-r--r--extra/kdemultimedia-ffmpegthumbs/PKGBUILD6
-rw-r--r--extra/kdemultimedia-juk/PKGBUILD6
-rw-r--r--extra/kdemultimedia-kmix/PKGBUILD6
-rw-r--r--extra/kdemultimedia-kscd/PKGBUILD6
-rw-r--r--extra/kdemultimedia-mplayerthumbs/PKGBUILD6
-rw-r--r--extra/kdenetwork-filesharing/PKGBUILD6
-rw-r--r--extra/kdenetwork-kdnssd/PKGBUILD6
-rw-r--r--extra/kdenetwork-kget/PKGBUILD6
-rw-r--r--extra/kdenetwork-kppp/PKGBUILD6
-rw-r--r--extra/kdenetwork-krdc/PKGBUILD6
-rw-r--r--extra/kdenetwork-krfb/PKGBUILD6
-rw-r--r--extra/kdenetwork-strigi-analyzers/PKGBUILD6
-rw-r--r--extra/kdepim-runtime/PKGBUILD6
-rw-r--r--extra/kdepim/PKGBUILD77
-rw-r--r--extra/kdepimlibs/PKGBUILD6
-rw-r--r--extra/kdeplasma-addons/PKGBUILD6
-rw-r--r--extra/kdeplasma-applets-plasma-nm/PKGBUILD17
-rw-r--r--extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch322
-rw-r--r--extra/kdesdk-cervisia/PKGBUILD6
-rw-r--r--extra/kdesdk-dev-scripts/PKGBUILD6
-rw-r--r--extra/kdesdk-dev-utils/PKGBUILD6
-rw-r--r--extra/kdesdk-dolphin-plugins/PKGBUILD6
-rw-r--r--extra/kdesdk-kapptemplate/PKGBUILD6
-rw-r--r--extra/kdesdk-kate/PKGBUILD15
-rw-r--r--extra/kdesdk-kcachegrind/PKGBUILD6
-rw-r--r--extra/kdesdk-kioslaves/PKGBUILD6
-rw-r--r--extra/kdesdk-kompare/PKGBUILD13
-rw-r--r--extra/kdesdk-lokalize/PKGBUILD6
-rw-r--r--extra/kdesdk-okteta/PKGBUILD6
-rw-r--r--extra/kdesdk-poxml/PKGBUILD6
-rw-r--r--extra/kdesdk-strigi-analyzers/PKGBUILD6
-rw-r--r--extra/kdesdk-thumbnailers/PKGBUILD6
-rw-r--r--extra/kdesdk-umbrello/PKGBUILD6
-rw-r--r--extra/kdetoys-amor/PKGBUILD6
-rw-r--r--extra/kdetoys-kteatime/PKGBUILD6
-rw-r--r--extra/kdetoys-ktux/PKGBUILD6
-rw-r--r--extra/kdeutils-filelight/PKGBUILD6
-rw-r--r--extra/kdeutils-kcalc/PKGBUILD6
-rw-r--r--extra/kdeutils-kcharselect/PKGBUILD6
-rw-r--r--extra/kdeutils-kdf/PKGBUILD6
-rw-r--r--extra/kdeutils-kfloppy/PKGBUILD6
-rw-r--r--extra/kdeutils-kgpg/PKGBUILD6
-rw-r--r--extra/kdeutils-kremotecontrol/PKGBUILD6
-rw-r--r--extra/kdeutils-ktimer/PKGBUILD6
-rw-r--r--extra/kdeutils-kwallet/PKGBUILD6
-rw-r--r--extra/kdeutils-print-manager/PKGBUILD6
-rw-r--r--extra/kdeutils-superkaramba/PKGBUILD6
-rw-r--r--extra/kdeutils-sweeper/PKGBUILD6
-rw-r--r--extra/kdevelop-php/PKGBUILD10
-rw-r--r--extra/kdevelop-python/PKGBUILD11
-rw-r--r--extra/kdevelop/PKGBUILD6
-rw-r--r--extra/kdevplatform/PKGBUILD8
-rw-r--r--extra/kdewebdev/PKGBUILD6
-rw-r--r--extra/kino/PKGBUILD36
-rw-r--r--extra/kino/kino.install13
-rw-r--r--extra/kino/videodev-header.patch26
-rw-r--r--extra/kscreen/PKGBUILD11
-rw-r--r--extra/lensfun/PKGBUILD12
-rw-r--r--extra/lensfun/lensfun-0.2.3-as-needed.patch13
-rw-r--r--extra/lensfun/lensfun-0.2.3-glibc-2.10.patch11
-rw-r--r--extra/lensfun/lensfun-0.2.8-make-4.0.patch11
-rw-r--r--extra/lftp/PKGBUILD12
-rw-r--r--extra/libbluedevil/PKGBUILD24
-rw-r--r--extra/libbluray/PKGBUILD6
-rw-r--r--extra/libburn/PKGBUILD6
-rw-r--r--extra/libconfig/PKGBUILD2
-rw-r--r--extra/libdrm/PKGBUILD13
-rw-r--r--extra/libdvbpsi/PKGBUILD6
-rw-r--r--extra/libftdi-compat/PKGBUILD26
-rw-r--r--extra/libftdi/PKGBUILD33
-rw-r--r--extra/libgda/PKGBUILD10
-rw-r--r--extra/libgdata/PKGBUILD8
-rw-r--r--extra/libgdiplus/PKGBUILD5
-rw-r--r--extra/libgpod/PKGBUILD4
-rw-r--r--extra/libiec61883/PKGBUILD8
-rw-r--r--extra/libindi/PKGBUILD4
-rw-r--r--extra/libisoburn/PKGBUILD10
-rw-r--r--extra/libisofs/PKGBUILD6
-rw-r--r--extra/libjpeg-turbo/PKGBUILD15
-rw-r--r--extra/libjpeg-turbo/cve-2013-6629.patch36
-rw-r--r--extra/libkcddb/PKGBUILD6
-rw-r--r--extra/libkcompactdisc/PKGBUILD6
-rw-r--r--extra/libkdcraw/PKGBUILD16
-rw-r--r--extra/libkdeedu/PKGBUILD6
-rw-r--r--extra/libkdegames/PKGBUILD6
-rw-r--r--extra/libkexiv2/PKGBUILD6
-rw-r--r--extra/libkgapi/PKGBUILD16
-rw-r--r--extra/libkipi/PKGBUILD14
-rw-r--r--extra/libkmahjongg/PKGBUILD6
-rw-r--r--extra/libkolabxml/PKGBUILD6
-rw-r--r--extra/libkomparediff2/PKGBUILD32
-rw-r--r--extra/libksane/PKGBUILD6
-rw-r--r--extra/libkscreen/PKGBUILD10
-rw-r--r--extra/libmikmod/PKGBUILD10
-rw-r--r--extra/libmm-qt/PKGBUILD10
-rw-r--r--extra/libmp4v2/PKGBUILD4
-rw-r--r--extra/libmtp/PKGBUILD4
-rw-r--r--extra/libnet/PKGBUILD4
-rw-r--r--extra/libnm-qt/PKGBUILD8
-rw-r--r--extra/libnova/PKGBUILD8
-rw-r--r--extra/libpng/PKGBUILD10
-rw-r--r--extra/libpst/PKGBUILD4
-rw-r--r--extra/libqmi/PKGBUILD10
-rw-r--r--extra/libquvi/PKGBUILD8
-rw-r--r--extra/libraw/PKGBUILD (renamed from community/libraw/PKGBUILD)28
-rw-r--r--extra/libreoffice/PKGBUILD16
-rw-r--r--extra/libreoffice/PKGBUILD.42672
-rw-r--r--extra/libreoffice/fix_install.diff82
-rw-r--r--extra/librsvg/PKGBUILD6
-rw-r--r--extra/libseccomp/PKGBUILD6
-rw-r--r--extra/libsidplay/PKGBUILD10
-rw-r--r--extra/libsigsegv/PKGBUILD4
-rw-r--r--extra/libsoup/PKGBUILD6
-rw-r--r--extra/libtasn1/PKGBUILD8
-rw-r--r--extra/libtorrent-rasterbar/PKGBUILD4
-rw-r--r--extra/libupnp/PKGBUILD6
-rw-r--r--extra/libva-intel-driver/PKGBUILD6
-rw-r--r--extra/libvpx/PKGBUILD39
-rw-r--r--extra/libxcb/PKGBUILD26
-rw-r--r--extra/libxcb/libxcb-1.1-no-pthread-stubs.patch4
-rw-r--r--extra/libxcb/reorder-configure.patch29
-rw-r--r--extra/libxft/PKGBUILD12
-rw-r--r--extra/libxft/freetype_header.patch30
-rw-r--r--extra/libxkbcommon/PKGBUILD8
-rw-r--r--extra/libxmi/PKGBUILD4
-rw-r--r--extra/libxshmfence/COPYING21
-rw-r--r--extra/libxshmfence/PKGBUILD22
-rw-r--r--extra/libzip/PKGBUILD4
-rw-r--r--extra/licq/PKGBUILD4
-rw-r--r--extra/lighttpd/PKGBUILD27
-rw-r--r--extra/link-grammar/PKGBUILD6
-rw-r--r--extra/live-media/PKGBUILD6
-rw-r--r--extra/lua/PKGBUILD40
-rw-r--r--extra/lua51/PKGBUILD77
-rw-r--r--extra/lyx/PKGBUILD4
-rw-r--r--extra/mariadb/PKGBUILD22
-rw-r--r--extra/maxima/PKGBUILD12
-rw-r--r--extra/mercurial/PKGBUILD6
-rw-r--r--extra/mesa/PKGBUILD18
-rw-r--r--extra/mjpegtools/PKGBUILD6
-rw-r--r--extra/mkvtoolnix/PKGBUILD8
-rw-r--r--extra/modemmanager/PKGBUILD4
-rw-r--r--extra/mpc/PKGBUILD8
-rw-r--r--extra/mpd/PKGBUILD21
-rw-r--r--extra/musicbrainz/PKGBUILD4
-rw-r--r--extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch29
-rw-r--r--extra/mutter-wayland/PKGBUILD13
-rw-r--r--extra/mutter/0001-monitor-expose-min-backlight-step.patch29
-rw-r--r--extra/mutter/PKGBUILD19
-rw-r--r--extra/nepomuk-core/PKGBUILD8
-rw-r--r--extra/nepomuk-widgets/PKGBUILD6
-rw-r--r--extra/netcdf-cxx/PKGBUILD4
-rw-r--r--extra/netcdf/PKGBUILD4
-rw-r--r--extra/network-manager-applet/PKGBUILD8
-rw-r--r--extra/nspr/PKGBUILD10
-rw-r--r--extra/nss/PKGBUILD8
-rw-r--r--extra/numactl/PKGBUILD2
-rw-r--r--extra/obexd/PKGBUILD49
-rw-r--r--extra/octave/PKGBUILD15
-rw-r--r--extra/opal/PKGBUILD4
-rw-r--r--extra/opencv/PKGBUILD45
-rw-r--r--extra/opencv/cldetect.patch23
-rw-r--r--extra/opencv/fsh.patch111
-rw-r--r--extra/opencv/pkgconfig.patch12
-rw-r--r--extra/openobex/PKGBUILD20
-rw-r--r--extra/opus/PKGBUILD8
-rw-r--r--extra/orage/PKGBUILD15
-rw-r--r--extra/oxygen-gtk2/PKGBUILD11
-rw-r--r--extra/oxygen-gtk3/PKGBUILD11
-rw-r--r--extra/pango/PKGBUILD6
-rw-r--r--extra/parted/PKGBUILD4
-rw-r--r--extra/perl-dbd-mysql/PKGBUILD8
-rw-r--r--extra/perl-net-dns/PKGBUILD26
-rw-r--r--extra/perl-sdl/PKGBUILD4
-rw-r--r--extra/phonon-gstreamer/PKGBUILD8
-rw-r--r--extra/phonon-vlc/PKGBUILD13
-rw-r--r--extra/phonon/PKGBUILD69
-rw-r--r--extra/php/PKGBUILD13
-rw-r--r--extra/php/php-fpm.conf.in.patch6
-rw-r--r--extra/php/php.ini.patch12
-rw-r--r--extra/pigeonhole/PKGBUILD6
-rw-r--r--extra/pixman/PKGBUILD12
-rw-r--r--extra/pkgfile/PKGBUILD6
-rw-r--r--extra/plotutils/PKGBUILD4
-rw-r--r--extra/poppler/PKGBUILD15
-rw-r--r--extra/postgresql-old-upgrade/PKGBUILD8
-rw-r--r--extra/postgresql/PKGBUILD13
-rw-r--r--extra/postgresql/postgresql.install4
-rw-r--r--extra/psiconv/PKGBUILD4
-rw-r--r--extra/pycrypto/PKGBUILD33
-rw-r--r--extra/pygobject/PKGBUILD6
-rw-r--r--extra/python-geoip/PKGBUILD9
-rw-r--r--extra/python-lxml/PKGBUILD6
-rwxr-xr-xextra/python-numpy/PKGBUILD34
-rw-r--r--extra/python/PKGBUILD32
-rw-r--r--extra/python/python-3.3.2-CVE-2013-2099.patch49
-rw-r--r--extra/python/python-3.3.2-CVE-2013-4238.patch255
-rw-r--r--extra/python2/PKGBUILD20
-rw-r--r--extra/python2/python-2.7.5-CVE-2013-4238.patch267
-rw-r--r--extra/qca-ossl/PKGBUILD13
-rw-r--r--extra/qca-ossl/no-whirlpool.patch21
-rw-r--r--extra/qca-ossl/qca-ossl-openssl-1.0.0.patch155
-rw-r--r--extra/qemu/PKGBUILD12
-rw-r--r--extra/qpdf/PKGBUILD12
-rw-r--r--extra/qscintilla/PKGBUILD38
-rw-r--r--extra/qt4/CVE-2013-4549.patch233
-rw-r--r--extra/qt4/PKGBUILD23
-rw-r--r--extra/qt4/libmng2.patch35
-rw-r--r--extra/qt5/PKGBUILD142
-rw-r--r--extra/qt5/bison3.patch38
-rw-r--r--extra/qt5/use-python2.patch140
-rw-r--r--extra/qtchooser/PKGBUILD14
-rw-r--r--extra/qtcreator/PKGBUILD (renamed from community/qtcreator/PKGBUILD)31
-rw-r--r--extra/qtcreator/qtcreator.desktop (renamed from community/qtcreator/qtcreator.desktop)0
-rw-r--r--extra/qtcreator/qtcreator.install (renamed from community/qtcreator/qtcreator.install)0
-rw-r--r--extra/quadrapassel/PKGBUILD6
-rw-r--r--extra/quazip/PKGBUILD29
-rw-r--r--extra/qwt/PKGBUILD8
-rw-r--r--extra/raptor/PKGBUILD8
-rw-r--r--extra/rasqal/PKGBUILD6
-rw-r--r--extra/rcs/PKGBUILD11
-rw-r--r--extra/rdesktop/PKGBUILD54
-rw-r--r--extra/rdesktop/rdesktop-libao.patch12
-rw-r--r--extra/rdesktop/rdesktop-r1729.patch33
-rw-r--r--extra/rdesktop/rdesktop-r1731.patch13
-rw-r--r--extra/rdesktop/rdesktop-r1732.patch73
-rw-r--r--extra/rdesktop/rdesktop-tcp.patch11
-rw-r--r--extra/refind-efi/PKGBUILD6
-rw-r--r--extra/rosegarden/PKGBUILD6
-rw-r--r--extra/rtmpdump/PKGBUILD26
-rw-r--r--extra/rubberband/PKGBUILD4
-rw-r--r--extra/ruby/PKGBUILD6
-rw-r--r--extra/rygel/PKGBUILD6
-rw-r--r--extra/samba/PKGBUILD6
-rw-r--r--extra/sbcl/PKGBUILD6
-rw-r--r--extra/sdl2/PKGBUILD4
-rw-r--r--extra/sdl2_gfx/PKGBUILD11
-rw-r--r--extra/sdl_gfx/PKGBUILD8
-rw-r--r--extra/serf/PKGBUILD17
-rw-r--r--extra/serf/serf-ssl-allocator-v2.patch57
-rw-r--r--extra/signon/PKGBUILD14
-rw-r--r--extra/slim/PKGBUILD8
-rw-r--r--extra/smb4k/PKGBUILD6
-rw-r--r--extra/snappy/PKGBUILD8
-rw-r--r--extra/snd/PKGBUILD10
-rw-r--r--extra/snd/snd.install3
-rw-r--r--extra/snd/type_error.patch32
-rw-r--r--extra/source-highlight/PKGBUILD11
-rw-r--r--extra/spice/CVE-2013-4282.patch104
-rw-r--r--extra/spice/PKGBUILD15
-rw-r--r--extra/sqlite/PKGBUILD18
-rw-r--r--extra/sqlite/xbmc.patch22
-rw-r--r--extra/subversion/PKGBUILD7
-rw-r--r--extra/suitesparse/PKGBUILD3
-rw-r--r--extra/syslog-ng/PKGBUILD55
-rw-r--r--extra/syslog-ng/syslog-ng.conf2
-rw-r--r--extra/syslog-ng/syslog-ng.install9
-rw-r--r--extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch12
-rw-r--r--extra/system-config-printer/PKGBUILD16
-rw-r--r--extra/tali/PKGBUILD6
-rw-r--r--extra/tamu-anova/PKGBUILD3
-rw-r--r--extra/tcpdump/PKGBUILD14
-rw-r--r--extra/tevent/PKGBUILD6
-rw-r--r--extra/thinkfinger/PKGBUILD4
-rw-r--r--extra/totem-plparser/PKGBUILD4
-rw-r--r--extra/tracker/PKGBUILD6
-rw-r--r--extra/twisted/PKGBUILD6
-rw-r--r--extra/vala/PKGBUILD6
-rw-r--r--extra/valgrind/PKGBUILD29
-rw-r--r--extra/vamp-plugin-sdk/PKGBUILD4
-rw-r--r--extra/varnish/PKGBUILD10
-rw-r--r--extra/varnish/varnish.service2
-rw-r--r--extra/vigra/PKGBUILD4
-rw-r--r--extra/vim/PKGBUILD8
-rw-r--r--extra/vinagre/PKGBUILD6
-rw-r--r--extra/vlc/PKGBUILD37
-rw-r--r--extra/w3m/PKGBUILD20
-rw-r--r--extra/w3m/form_unknown.patch15
-rw-r--r--extra/wcslib/PKGBUILD13
-rw-r--r--extra/webkitgtk/PKGBUILD8
-rw-r--r--extra/weechat/PKGBUILD10
-rw-r--r--extra/whois/PKGBUILD12
-rw-r--r--extra/windowmaker/PKGBUILD8
-rw-r--r--extra/wxmaxima/PKGBUILD4
-rw-r--r--extra/x11vnc/PKGBUILD7
-rw-r--r--extra/x264/PKGBUILD31
-rw-r--r--extra/x2goclient/PKGBUILD13
-rw-r--r--extra/x2goserver/PKGBUILD9
-rw-r--r--extra/xaos/PKGBUILD16
-rw-r--r--extra/xaos/xaos-3.5-libpng15.patch131
-rw-r--r--extra/xf86-input-synaptics/PKGBUILD6
-rw-r--r--extra/xf86-video-mga/PKGBUILD12
-rw-r--r--extra/xf86-video-modesetting/PKGBUILD10
-rw-r--r--extra/xf86-video-nouveau/PKGBUILD6
-rw-r--r--extra/xf86-video-vmware/PKGBUILD18
-rw-r--r--extra/xf86-video-vmware/xatracker-v2-fixes.patch1583
-rw-r--r--extra/xfce4-terminal/PKGBUILD6
-rw-r--r--extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch50
-rw-r--r--extra/xmlto/PKGBUILD6
-rw-r--r--extra/xorg-server/PKGBUILD6
-rw-r--r--extra/xorg-xinit/PKGBUILD24
-rw-r--r--extra/xorg-xinit/cpp-4.8-compat.patch22
-rw-r--r--extra/xorg-xinit/fix-globals-shadowing.patch58
-rw-r--r--extra/xsd/PKGBUILD4
-rw-r--r--extra/xterm/PKGBUILD6
-rw-r--r--extra/zenity/PKGBUILD6
-rw-r--r--java/antlr2/PKGBUILD6
-rw-r--r--java/antlr2/runantlr2.sh2
-rwxr-xr-xjava/apache-ant/PKGBUILD118
-rw-r--r--java/closure-compiler/PKGBUILD14
-rw-r--r--java/jakarta-oro/PKGBUILD24
-rw-r--r--java/java-json-android/PKGBUILD4
-rw-r--r--java/junit/PKGBUILD14
-rw-r--r--kernels/linux-libre-knock/Kbuild19
-rw-r--r--kernels/linux-libre-knock/Kbuild.platforms6
-rw-r--r--kernels/linux-libre-knock/PKGBUILD425
-rw-r--r--kernels/linux-libre-knock/boot-logo.patch23167
-rw-r--r--kernels/linux-libre-knock/change-default-console-loglevel.patch12
-rw-r--r--kernels/linux-libre-knock/config.i686 (renamed from libre/linux-libre/config.i686.3.12)24
-rw-r--r--kernels/linux-libre-knock/config.x86_64 (renamed from libre/linux-libre/config.x86_64.3.12)27
-rw-r--r--kernels/linux-libre-knock/criu-no-expert.patch22
-rw-r--r--kernels/linux-libre-knock/linux-libre-knock.install35
-rw-r--r--kernels/linux-libre-knock/linux-libre-knock.preset14
-rw-r--r--kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch32
-rw-r--r--kernels/linux-libre-pae/3.12-btrfs-relocate-csums.patch63
-rw-r--r--kernels/linux-libre-pae/PKGBUILD28
-rw-r--r--kernels/linux-libre-pae/boot-logo.patch2486
-rw-r--r--kernels/linux-libre-pae/config140
-rw-r--r--kernels/linux-libre-rt/3.10.6-logitech-dj.patch172
-rw-r--r--kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch24
-rw-r--r--kernels/linux-libre-rt/PKGBUILD34
-rw-r--r--kernels/linux-libre-rt/boot-logo.patch28
-rw-r--r--kernels/linux-libre-rt/change-default-console-loglevel.patch4
-rw-r--r--kernels/linux-libre-rt/config.i686500
-rw-r--r--kernels/linux-libre-rt/config.x86_64500
-rw-r--r--kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch32
-rw-r--r--kernels/linux-libre-xen/3.12-btrfs-relocate-csums.patch63
-rw-r--r--kernels/linux-libre-xen/PKGBUILD28
-rw-r--r--kernels/linux-libre-xen/boot-logo.patch2486
-rw-r--r--kernels/linux-libre-xen/config140
-rw-r--r--libre/angband-libre/PKGBUILD42
-rw-r--r--libre/angband-libre/libre.patch814
-rw-r--r--libre/angband-libre/sound.patch154
-rw-r--r--libre/avidemux-libre/PKGBUILD20
-rw-r--r--libre/avidemux-libre/PKGBUILD.WIP6
-rw-r--r--libre/bbswitch-libre/PKGBUILD13
-rw-r--r--libre/bbswitch-libre/bbswitch.install2
-rw-r--r--libre/bfgminer-libre/PKGBUILD11
-rw-r--r--libre/bitlbee-libre/PKGBUILD12
-rw-r--r--libre/bitlbee-libre/bitlbee.install21
-rw-r--r--libre/bitlbee-libre/xinetd2
-rw-r--r--libre/blender-addon-luxrender/PKGBUILD14
-rw-r--r--libre/blender-libre/PKGBUILD17
-rw-r--r--libre/calibre-libre/PKGBUILD22
-rw-r--r--libre/calibre-libre/desktop_integration.patch26
-rw-r--r--libre/cdrkit-libre/PKGBUILD6
-rw-r--r--libre/clementine-libre/PKGBUILD8
-rw-r--r--libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch6
-rw-r--r--libre/cups-filters-libre/PKGBUILD13
-rw-r--r--libre/doublecmd-libre/PKGBUILD11
-rw-r--r--libre/dvdrtools-libre/PKGBUILD53
-rw-r--r--libre/ecasound-libre/PKGBUILD5
-rw-r--r--libre/epiphany-libre/PKGBUILD8
-rw-r--r--libre/file-roller-libre/PKGBUILD10
-rw-r--r--libre/grub/PKGBUILD198
-rw-r--r--libre/grub/grub.cfg139
-rw-r--r--libre/grub/grub.default3
-rw-r--r--libre/grub/parabola_grub_mkconfig_fixes.patch64
-rw-r--r--libre/gst-plugins-bad-libre/PKGBUILD10
-rw-r--r--libre/gstreamer0.10-bad-libre/PKGBUILD43
-rw-r--r--libre/gstreamer0.10-bad-libre/disable-assrender-test.patch11
-rw-r--r--libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch10
-rw-r--r--libre/gummiboot/PKGBUILD21
-rw-r--r--libre/gummiboot/splash-parabola.bmpbin0 -> 470410 bytes
-rw-r--r--libre/hplip-libre/PKGBUILD20
-rw-r--r--libre/hplip-libre/disable_upgrade.patch14
-rw-r--r--libre/icecat-noscript/PKGBUILD6
-rw-r--r--libre/icecat/PKGBUILD24
-rw-r--r--libre/icecat/cairo.patch33
-rw-r--r--libre/icecat/libre.patch24
-rw-r--r--libre/icedove-l10n/PKGBUILD114
-rw-r--r--libre/icedove-libre/PKGBUILD6
-rw-r--r--libre/icedove-libre/replace-urls.txt25
-rw-r--r--libre/iceweasel-l10n/PKGBUILD178
-rw-r--r--libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch4
-rw-r--r--libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch108
-rw-r--r--libre/iceweasel-libre/PKGBUILD64
-rw-r--r--libre/iceweasel-libre/gnu_headshadow.pngbin0 -> 6785 bytes
-rw-r--r--libre/iceweasel-libre/iceweasel-install-dir.patch22
-rw-r--r--libre/iceweasel-libre/iceweasel.install4
-rw-r--r--libre/iceweasel-libre/libre.patch737
-rw-r--r--libre/iceweasel-libre/mozconfig1
-rw-r--r--libre/iceweasel-libre/replace-urls.txt25
-rw-r--r--libre/iceweasel-noscript/PKGBUILD6
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD6
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD8
-rw-r--r--libre/kdelibs-libre/PKGBUILD8
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD19
-rw-r--r--libre/kdenetwork-kopete-libre/libotr3.patch71
-rw-r--r--libre/kdenetwork-kopete-libre/mediastreamer29.patch22
-rw-r--r--libre/kdepim-libre/PKGBUILD79
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD6
-rw-r--r--libre/libquicktime-libre/PKGBUILD5
-rw-r--r--libre/libretools/PKGBUILD16
-rw-r--r--libre/linux-libre-api-headers/PKGBUILD10
-rw-r--r--libre/linux-libre-firmware/PKGBUILD14
-rw-r--r--libre/linux-libre-lts/PKGBUILD14
-rw-r--r--libre/linux-libre-lts/config.i6862
-rw-r--r--libre/linux-libre-lts/config.x86_642
-rw-r--r--libre/linux-libre-manpages/PKGBUILD8
-rw-r--r--libre/linux-libre-tools/PKGBUILD14
-rw-r--r--libre/linux-libre/3.11-haswell-intel_pstate.patch32
-rw-r--r--libre/linux-libre/PKGBUILD30
-rw-r--r--libre/linux-libre/boot-logo.patch2486
-rw-r--r--libre/linux-libre/config.i686140
-rw-r--r--libre/linux-libre/config.x86_64140
-rw-r--r--libre/lirc-libre/PKGBUILD58
-rw-r--r--libre/lirc-libre/lirc.install2
-rw-r--r--libre/lsb-release/PKGBUILD14
-rw-r--r--libre/lsb-release/lsb_release_description.patch11
-rw-r--r--libre/luxrender-libre/PKGBUILD24
-rw-r--r--libre/luxrender-libre/force_python3.diff12
-rw-r--r--libre/mc-libre/PKGBUILD34
-rw-r--r--libre/mc-libre/fs36962.diff77
-rw-r--r--libre/mc-libre/unar.in64
-rw-r--r--libre/mcomix-libre/PKGBUILD5
-rw-r--r--libre/mesa-libcl/PKGBUILD5
-rw-r--r--libre/midori-gtk3-libre/PKGBUILD27
-rw-r--r--libre/midori-libre/PKGBUILD22
-rw-r--r--libre/mplayer-libre/PKGBUILD13
-rw-r--r--libre/mplayer-vaapi-libre/PKGBUILD4
-rw-r--r--libre/ogmrip-libre/PKGBUILD6
-rw-r--r--libre/ogmrip-libre/ogmrip.changelog3
-rw-r--r--libre/ogre-libre/PKGBUILD28
-rw-r--r--libre/pacman-mirrorlist-libre/PKGBUILD17
-rw-r--r--libre/parabola-xdg-menu/PKGBUILD6
-rw-r--r--libre/parabolaweb-utils/PKGBUILD15
-rw-r--r--libre/povray-libre/PKGBUILD64
-rw-r--r--libre/povray-libre/povray3.7.0_rc3-user-conf.patch27
-rw-r--r--libre/python2-jsmin/PKGBUILD4
-rw-r--r--libre/qupzilla-libre/PKGBUILD73
-rw-r--r--libre/reflector/PKGBUILD42
-rw-r--r--libre/reflector/rebranding.patch63
-rw-r--r--libre/spectrwm-libre/PKGBUILD6
-rw-r--r--libre/stuntrally-data-libre/PKGBUILD10
-rw-r--r--libre/stuntrally-data-libre/libre.patch6
-rw-r--r--libre/syslinux/PKGBUILD75
-rw-r--r--libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch12
-rw-r--r--libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch621
-rw-r--r--libre/syslinux/syslinux-install_update5
-rw-r--r--libre/syslinux/syslinux.install53
-rw-r--r--libre/texlive-bin-libre/PKGBUILD12
-rw-r--r--libre/tp_smapi-libre-lts/PKGBUILD3
-rw-r--r--libre/tp_smapi-libre/PKGBUILD8
-rw-r--r--libre/tp_smapi-libre/tp_smapi.install2
-rwxr-xr-xlibre/unar/PKGBUILD6
-rw-r--r--libre/vhba-module-libre/PKGBUILD10
-rw-r--r--libre/vim-runtime/PKGBUILD9
-rw-r--r--libre/wings3d-libre/PKGBUILD65
-rw-r--r--libre/wings3d-libre/wings3d.install (renamed from community/wings3d/wings3d.install)0
-rw-r--r--libre/wings3d-libre/wings3d.pngbin0 -> 25466 bytes
-rw-r--r--libre/wings3d-libre/wings3d.sh (renamed from community/wings3d/wings3d.sh)0
-rw-r--r--libre/xbmc-libre/PKGBUILD40
-rw-r--r--libre/xbmc-libre/polkit.rules11
-rw-r--r--libre/xbmc-libre/xbmc.service4
-rw-r--r--libre/xscreensaver-libre/LICENSE3
-rw-r--r--libre/xscreensaver-libre/PKGBUILD10
-rw-r--r--nonprism/bitlbee-libre-nonprism/PKGBUILD11
-rw-r--r--nonprism/bitlbee-libre-nonprism/bitlbee.install21
-rw-r--r--nonprism/bitlbee-libre-nonprism/xinetd2
-rw-r--r--nonprism/claws-mail-nonprism/PKGBUILD13
-rw-r--r--nonprism/evolution-data-server-nonprism/PKGBUILD9
-rw-r--r--nonprism/gnome-online-accounts-nonprism/PKGBUILD9
-rw-r--r--nonprism/icedove-libre-nonprism/PKGBUILD146
-rw-r--r--nonprism/icedove-libre-nonprism/icedove.desktop13
-rw-r--r--nonprism/icedove-libre-nonprism/icedove.install (renamed from community/blueman/blueman.install)5
-rw-r--r--nonprism/icedove-libre-nonprism/mozconfig46
-rw-r--r--nonprism/icedove-libre-nonprism/vendor.js9
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD19
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch71
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch18
-rw-r--r--nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch22
-rw-r--r--nonprism/kdepim-runtime-nonprism/PKGBUILD6
-rw-r--r--nonprism/sylpheed-nonprism/PKGBUILD6
-rw-r--r--pcr/9mount/PKGBUILD (renamed from ~lukeshu/9mount/PKGBUILD)4
-rw-r--r--pcr/9mount/fix-checks.patch (renamed from ~lukeshu/9mount/fix-checks.patch)0
-rw-r--r--pcr/aseprite/PKGBUILD33
-rw-r--r--pcr/aseprite/aseprite.desktop9
-rw-r--r--pcr/blender-addon-ogre/PKGBUILD6
-rw-r--r--pcr/cherokee/PKGBUILD100
-rw-r--r--pcr/cherokee/cherokee.logrotate9
-rw-r--r--pcr/cherokee/cherokee.rc65
-rw-r--r--pcr/cherokee/cherokee.service9
-rw-r--r--pcr/cinclude2dot/PKGBUILD (renamed from ~lukeshu/cinclude2dot/PKGBUILD)2
-rw-r--r--pcr/cpuminer/PKGBUILD32
-rw-r--r--pcr/cpuminer/libcurl.m4251
-rw-r--r--pcr/galera/PKGBUILD29
-rw-r--r--pcr/gimp-pcr/PKGBUILD58
-rw-r--r--pcr/gimp-pcr/gimp.install (renamed from pcr/gnome-boxes/gnome-boxes.install)1
-rw-r--r--pcr/gimp-pcr/gnu.gpl19
-rw-r--r--pcr/gimp-pcr/uri-backend-libcurl.patch77
-rw-r--r--pcr/git-remote-mediawiki/PKGBUILD31
-rw-r--r--pcr/gnome-boxes-libre/PKGBUILD44
-rw-r--r--pcr/gnome-boxes-libre/free-distros.patch11
-rw-r--r--pcr/gnome-boxes-libre/gnome-boxes.install17
-rw-r--r--pcr/gnome-boxes-libre/logos.patch39
-rw-r--r--pcr/gnome-boxes/PKGBUILD33
-rw-r--r--pcr/gnuhealth/PKGBUILD22
-rw-r--r--pcr/hunspell-pt-br/PKGBUILD10
-rw-r--r--pcr/libav/PKGBUILD18
-rw-r--r--pcr/libixp-hg/PKGBUILD38
-rw-r--r--pcr/libosinfo-libre/PKGBUILD63
-rw-r--r--pcr/libosinfo-libre/data.patch137
-rw-r--r--pcr/libosinfo-libre/free-distros.patch123
-rw-r--r--pcr/libosinfo-libre/po.patch34
-rw-r--r--pcr/libosinfo-libre/test.patch87
-rw-r--r--pcr/libquvi-scripts-current/PKGBUILD4
-rw-r--r--pcr/litecoin-qt/PKGBUILD36
-rw-r--r--pcr/litecoin-qt/litecoin-qt.desktop12
-rw-r--r--pcr/litecoin-qt/litecoin-qt.install11
-rw-r--r--pcr/lostfiles/PKGBUILD17
-rw-r--r--pcr/lprof/PKGBUILD44
-rw-r--r--pcr/lprof/lcms-117.patch12
-rw-r--r--pcr/mariadb-galera/PKGBUILD107
-rw-r--r--pcr/mariadb-galera/mariadb-post.sh8
-rw-r--r--pcr/mariadb-galera/mariadb-tmpfile.conf1
-rw-r--r--pcr/mariadb-galera/mariadb.install47
-rw-r--r--pcr/mariadb-galera/mariadb.service16
-rw-r--r--pcr/mathjax/PKGBUILD23
-rwxr-xr-xpcr/md5deep/PKGBUILD45
-rw-r--r--pcr/ocsync/PKGBUILD8
-rw-r--r--pcr/openicc/PKGBUILD23
-rw-r--r--pcr/owncloud-client/PKGBUILD7
-rw-r--r--pcr/perl-mediawiki-api/PKGBUILD30
-rw-r--r--pcr/plowshare/PKGBUILD4
-rw-r--r--pcr/python2-pywebdav/PKGBUILD4
-rw-r--r--pcr/python2-renpy/PKGBUILD6
-rw-r--r--pcr/qemu-usbredir/65-kvm.rules2
-rw-r--r--pcr/qemu-usbredir/PKGBUILD77
-rw-r--r--pcr/qemu-usbredir/qemu.install23
-rw-r--r--pcr/quvi-current/PKGBUILD6
-rw-r--r--pcr/radicale/radicale.install10
-rw-r--r--pcr/renpy/PKGBUILD6
-rw-r--r--pcr/ryzom-hg/PKGBUILD14
-rw-r--r--pcr/stow/PKGBUILD (renamed from ~lukeshu/stow/PKGBUILD)6
-rw-r--r--pcr/trytond-account-invoice/PKGBUILD15
-rw-r--r--pcr/trytond-account-product/PKGBUILD15
-rw-r--r--pcr/trytond-account/PKGBUILD16
-rw-r--r--pcr/trytond-calendar/PKGBUILD8
-rw-r--r--pcr/trytond-company/PKGBUILD8
-rw-r--r--pcr/trytond-country/PKGBUILD8
-rw-r--r--pcr/trytond-currency/PKGBUILD8
-rw-r--r--pcr/trytond-party/PKGBUILD8
-rw-r--r--pcr/trytond-product/PKGBUILD8
-rw-r--r--pcr/trytond-stock-lot/PKGBUILD8
-rw-r--r--pcr/trytond-stock/PKGBUILD8
-rw-r--r--pcr/trytond/PKGBUILD10
-rw-r--r--pcr/twinkle/PKGBUILD50
-rw-r--r--pcr/twinkle/twinkle-1.4.2-ccrtp.patch24
-rw-r--r--pcr/unittestpp/PKGBUILD37
-rw-r--r--pcr/wdiff/PKGBUILD (renamed from ~lukeshu/wdiff/PKGBUILD)0
-rw-r--r--pcr/wmii-hg/PKGBUILD56
-rw-r--r--pcr/xrdp/PKGBUILD41
-rw-r--r--pcr/xrdp/xrdp-sesman.service15
-rw-r--r--pcr/xrdp/xrdp.service14
-rw-r--r--pcr/youtube-dl-current/PKGBUILD7
-rw-r--r--~drtan/parabola-artwork/PKGBUILD18
-rw-r--r--~drtan/parabola-gnome/PKGBUILD19
-rw-r--r--~drtan/parabola-gnome/parabola-gnome.install29
-rw-r--r--~drtan/parabola-gnome/parabola.xml20
-rw-r--r--~lukeshu/freeglut26/2.6.0-GFX_radeon.patch28
-rw-r--r--~lukeshu/freeglut26/PKGBUILD39
-rw-r--r--~lukeshu/kdeutils-ark-unarchiver/PKGBUILD184
-rw-r--r--~lukeshu/kdeutils-ark-unarchiver/add-ark-cliunarchiverplugin.patch235
-rw-r--r--~lukeshu/kdeutils-ark-unarchiver/kdeutils.install11
-rw-r--r--~lukeshu/libdwarf/PKGBUILD44
-rw-r--r--~lukeshu/md/PKGBUILD42
-rw-r--r--~lukeshu/not-working/codeanalyst/PKGBUILD91
-rw-r--r--~lukeshu/not-working/codeanalyst/codeanalyst.desktop9
-rw-r--r--~lukeshu/not-working/codeanalyst/codeanalyst.install29
-rw-r--r--~lukeshu/not-working/codeanalyst/codeanalyst.sudo1
-rw-r--r--~lukeshu/not-working/codeanalyst/codeanalyst.svg59
-rw-r--r--~lukeshu/not-working/codeanalyst/gcc47.patch72
-rw-r--r--~lukeshu/not-working/codeanalyst/kernel3.4.patch72
-rw-r--r--~lukeshu/not-working/codeanalyst/skipSetup.patch68
-rw-r--r--~lukeshu/pacman-vcsget/PKGBUILD100
-rw-r--r--~lukeshu/python-pyproxyfs/PKGBUILD27
-rw-r--r--~lukeshu/thingutils-git/PKGBUILD48
1612 files changed, 52718 insertions, 22678 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index 6325cb3f7..b4c2ff3af 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 96786 2013-09-05 07:34:19Z svenstaro $
+# $Id: PKGBUILD 103111 2013-12-26 13:52:36Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
pkgname=0ad
-pkgver=a14
-_pkgver=0.0.14-alpha
+pkgver=a15
+_pkgver=0.0.15-alpha
pkgrel=1
pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
arch=('i686' 'x86_64')
url="http://play0ad.com/"
license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu')
+depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu' 'gloox' 'miniupnpc' 'libsm')
makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
-md5sums=('5bbaffa02b6e9082cbd5142d43f9b700')
+md5sums=('a651d81eb9b31da01e376ddaa597e954')
build() {
cd "$srcdir/$pkgname-$_pkgver/build/workspaces"
@@ -22,6 +22,7 @@ build() {
./update-workspaces.sh \
--with-system-enet \
+ --with-system-miniupnpc \
--bindir=/usr/bin \
--libdir=/usr/lib/0ad \
--datadir=/usr/share/${pkgname}/data
diff --git a/community/alex/PKGBUILD b/community/alex/PKGBUILD
index 25345ec7e..9c2cdff22 100644
--- a/community/alex/PKGBUILD
+++ b/community/alex/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 89285 2013-04-28 16:52:06Z td123 $
+# $Id: PKGBUILD 102107 2013-12-05 10:44:35Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Philip Nilsson <pnilsson@nullref.se>
pkgname=alex
-pkgver=3.0.5
-pkgrel=2
+pkgver=3.1.3
+pkgrel=1
pkgdesc='Lexical analyser generator for Haskell'
arch=('x86_64' 'i686')
url='http://hackage.haskell.org/package/alex'
license=('custom:BSD3')
depends=('gmp')
-makedepends=('ghc=7.6.3-1' 'haskell-quickcheck>=2')
+makedepends=('ghc=7.6.3-1' 'haskell-quickcheck>=2' 'happy')
source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('c3326417a0538e355e5ad1871ab931b9c8145391e8b2ff79668eb643d9b99659')
+sha256sums=('8d41a6e72a016155f00c846f7146ab4b27fe9640668a4b592d6a9b856f970a92')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
runghc Setup.lhs configure --prefix=/usr --datasubdir="$pkgname"
runghc Setup.lhs build
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
runghc Setup.lhs copy --destdir="$pkgdir"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/alex/BSD3"
- # doc only contains the license
+ # Doc only contains the license
rm -rf $pkgdir/usr/share/doc
}
diff --git a/community/almanah/PKGBUILD b/community/almanah/PKGBUILD
index f9d20b165..b1c9aa742 100644
--- a/community/almanah/PKGBUILD
+++ b/community/almanah/PKGBUILD
@@ -1,33 +1,21 @@
-# $Id: PKGBUILD 98185 2013-10-07 12:08:18Z jgc $
+# $Id: PKGBUILD 101727 2013-11-30 15:46:56Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=almanah
-pkgver=0.10.1
-pkgrel=4
+pkgver=0.11.0
+pkgrel=1
pkgdesc="Small GTK+ application to allow you to keep a diary of your life"
arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/Almanah_Diary"
+url="https://wiki.gnome.org/Apps/Almanah_Diary"
license=('GPL')
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')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('82085a3884d6820e843fe388040a124cf7c23b4cc6dade54fa484ae75a8b712d')
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"
-
- autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --disable-schemas-compile
make
@@ -35,6 +23,5 @@ build() {
package() {
cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir/" install
}
diff --git a/community/almanah/eds-3.8.patch b/community/almanah/eds-3.8.patch
deleted file mode 100644
index dea51eb74..000000000
--- a/community/almanah/eds-3.8.patch
+++ /dev/null
@@ -1,2609 +0,0 @@
-From e481f5abdb46d41ac00ee3393332e92f605b55e7 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-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 <libecal/libecal.h>
- #include <libedataserver/libedataserver.h>
--#include <libedataserverui/libedataserverui.h>
-+
-+#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 <config.h>
-+#endif
-+
-+#include "e-cell-renderer-color.h"
-+
-+#include <string.h>
-+#include <glib/gi18n-lib.h>
-+
-+#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 <gtk/gtk.h>
-+
-+/* 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 <ettore@ximian.com>
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
-+#include <string.h>
-+
-+#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 <ettore@ximian.com>
-+ */
-+
-+#ifndef E_SOURCE_SELECTOR_H
-+#define E_SOURCE_SELECTOR_H
-+
-+#include <gtk/gtk.h>
-+#include <libedataserver/libedataserver.h>
-+
-+/* 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/almanah/update-gtkspell3-support.patch b/community/almanah/update-gtkspell3-support.patch
deleted file mode 100644
index aa2a81159..000000000
--- a/community/almanah/update-gtkspell3-support.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 114c4f78ac9882be51c4154751760bd4fea48403 Mon Sep 17 00:00:00 2001
-From: Álvaro Peña <alvaropg@gmail.com>
-Date: Wed, 06 Feb 2013 10:12:54 +0000
-Subject: Update GtkSpell 3 support
-
----
-diff --git a/configure.ac b/configure.ac
-index b89ba74..fbe6889 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -95,7 +95,7 @@ AC_SUBST(EVO_LIBS)
-
- dnl Spell checking
- if test $spell_checking = "true"; then
-- PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell-3.0)
-+ PKG_CHECK_MODULES(SPELL_CHECKING, gtkspell3-3.0)
- AC_SUBST(SPELL_CHECKING_CFLAGS)
- AC_SUBST(SPELL_CHECKING_LIBS)
- fi
-diff --git a/src/main-window.c b/src/main-window.c
-index fb931e1..2fe01ef 100644
---- a/src/main-window.c
-+++ b/src/main-window.c
-@@ -1109,7 +1109,7 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain
- AlmanahEventManager *event_manager;
- GDate calendar_date;
- #ifdef ENABLE_SPELL_CHECKING
-- GtkSpell *gtkspell;
-+ GtkSpellChecker *gtkspell;
- #endif /* ENABLE_SPELL_CHECKING */
- AlmanahMainWindowPrivate *priv = main_window->priv;
- AlmanahEntry *entry;
-@@ -1166,9 +1166,9 @@ mw_calendar_day_selected_cb (AlmanahCalendarButton *calendar_button, AlmanahMain
-
- #ifdef ENABLE_SPELL_CHECKING
- /* Ensure the spell-checking is updated */
-- gtkspell = gtkspell_get_from_text_view (priv->entry_view);
-+ gtkspell = gtk_spell_checker_get_from_text_view (priv->entry_view);
- if (gtkspell != NULL) {
-- gtkspell_recheck_all (gtkspell);
-+ gtk_spell_checker_recheck_all (gtkspell);
- gtk_widget_queue_draw (GTK_WIDGET (priv->entry_view));
- }
- #endif /* ENABLE_SPELL_CHECKING */
-@@ -1326,13 +1326,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
- {
- AlmanahApplication *application;
- GSettings *settings;
-- GtkSpell *gtkspell;
-+ GtkSpellChecker *gtkspell;
- gchar *spelling_language;
- GtkTextTagTable *table;
- GtkTextTag *tag;
-
- /* Bail out if spell checking's already enabled */
-- if (gtkspell_get_from_text_view (self->priv->entry_view) != NULL)
-+ if (gtk_spell_checker_get_from_text_view (self->priv->entry_view) != NULL)
- return TRUE;
-
- /* If spell checking wasn't already enabled, we have a dummy gtkspell-misspelled text tag to destroy */
-@@ -1353,7 +1353,9 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
- spelling_language = NULL;
- }
-
-- gtkspell = gtkspell_new_attach (self->priv->entry_view, spelling_language, error);
-+ gtkspell = gtk_spell_checker_new ();
-+ gtk_spell_checker_set_language (gtkspell, spelling_language, error);
-+ gtk_spell_checker_attach (gtkspell, self->priv->entry_view);
- g_free (spelling_language);
-
- if (gtkspell == NULL)
-@@ -1364,13 +1366,13 @@ enable_spell_checking (AlmanahMainWindow *self, GError **error)
- static void
- disable_spell_checking (AlmanahMainWindow *self)
- {
-- GtkSpell *gtkspell;
-+ GtkSpellChecker *gtkspell;
- GtkTextTagTable *table;
- GtkTextTag *tag;
-
-- gtkspell = gtkspell_get_from_text_view (self->priv->entry_view);
-+ gtkspell = gtk_spell_checker_get_from_text_view (self->priv->entry_view);
- if (gtkspell != NULL)
-- gtkspell_detach (gtkspell);
-+ gtk_spell_checker_detach (gtkspell);
-
- /* Remove the old gtkspell-misspelling text tag */
- table = gtk_text_buffer_get_tag_table (self->priv->entry_buffer);
---
-cgit v0.9.1
diff --git a/community/argyllcms/PKGBUILD b/community/argyllcms/PKGBUILD
index ef7dd7bb4..21110bd41 100644
--- a/community/argyllcms/PKGBUILD
+++ b/community/argyllcms/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99402 2013-10-28 11:10:04Z tredaelli $
+# $Id: PKGBUILD 102451 2013-12-11 14:31:37Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com)
pkgname=argyllcms
_pkgname=Argyll
-pkgver=1.6.1
+pkgver=1.6.2
_pkgver="V${pkgver}"
pkgrel=1
pkgdesc="An ICC compatible color management system with support for different colorimeter hardware"
@@ -15,35 +15,33 @@ source=(http://www.argyllcms.com/${_pkgname}_${_pkgver}_src.zip)
url="http://www.argyllcms.com/"
license=("GPL" "AGPL")
install=${pkgname}.install
-md5sums=('aed439b76054ef8e8b065106d314681c')
+sha256sums=('c21591d5615a584df438ecbfe7858fde571f6066e56da436c541d08ca899ac9f')
build() {
- cd "${srcdir}"/${_pkgname}_${_pkgver}
+ cd ${_pkgname}_${_pkgver}
echo "***running makeall.sh***"
sh ./makeall.sh
echo "***running makeinstall.sh***"
sh ./makeinstall.sh
echo "***running makepackagebin.sh***"
sh ./makepackagebin.sh
- rm "${srcdir}"/${_pkgname}_${_pkgver}/bin/License.txt
- rm "${srcdir}"/${_pkgname}_${_pkgver}/ref/License.txt
- rm "${srcdir}"/${_pkgname}_${_pkgver}/ref/afiles
- rm "${srcdir}"/${_pkgname}_${_pkgver}/doc/afiles
+ rm {bin,ref}/License.txt
+ rm {doc,ref}/afiles
}
package() {
mkdir -p "${pkgdir}"/usr/bin
- install -m755 "${srcdir}"/${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin
+ install -m755 ${_pkgname}_${_pkgver}/bin/* "${pkgdir}"/usr/bin
mkdir -p "${pkgdir}"/usr/share/${pkgname}/ref
- install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref
- install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref
- install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref
+ install -m644 ${_pkgname}_${_pkgver}/ref/*.* "${pkgdir}"/usr/share/${pkgname}/ref
+ install -m644 ${_pkgname}_${_pkgver}/profile/*.sp "${pkgdir}"/usr/share/${pkgname}/ref
+ install -m644 ${_pkgname}_${_pkgver}/scanin/*.c?? "${pkgdir}"/usr/share/${pkgname}/ref
# Because there is just html documentation we have to move it
mkdir -p "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs
- install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs
- install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc
+ install -m644 ${_pkgname}_${_pkgver}/doc/ccmxs/*.ccmx "${pkgdir}"/usr/share/${pkgname}/doc/ccmxs
+ install -m644 ${_pkgname}_${_pkgver}/doc/*.* "${pkgdir}"/usr/share/${pkgname}/doc
mkdir -p "${pkgdir}"/usr/lib/udev/rules.d
- install -m644 "${srcdir}"/${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules
+ install -m644 ${_pkgname}_${_pkgver}/usb/55-Argyll.rules "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules
sed -i 's|IMPORT{program}="usb|#IMPORT{program}="usb|' "${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules
cat <<EOF >>"${pkgdir}"/usr/lib/udev/rules.d/55-Argyll.rules
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index 24c4e4b91..60f5d78b3 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99071 2013-10-24 08:15:38Z bpiotrowski $
+# $Id: PKGBUILD 103183 2013-12-28 20:42:34Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,7 +6,7 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=aria2
-pkgver=1.18.1
+pkgver=1.18.2
pkgrel=1
pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ url='http://aria2.sourceforge.net/'
license=('GPL')
depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
checkdepends=('cppunit')
-source=(http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.xz)
-sha256sums=('14179cec7d476204faa52c4220fd8332a1036edd2c16fa3a9a29fd5d8b763968')
+source=(http://downloads.sourceforge.net/aria2/aria2-$pkgver.tar.xz)
+sha256sums=('b4c99eea9e11d265ed90ab685571f7328a20f5c5a438da93ecdba0959170f460')
build() {
cd $pkgname-$pkgver
@@ -34,10 +34,9 @@ check() {
package() {
cd $pkgname-$pkgver
-
make DESTDIR="$pkgdir" install
- # add bash completion (aria2 automatically installs to a temporary target directory)
+ # add bash completion
install -d "$pkgdir"/usr/share/bash-completion/completions
install -m644 "$pkgdir"/usr/share/doc/aria2/bash_completion/aria2c \
"$pkgdir"/usr/share/bash-completion/completions
diff --git a/extra/arj/001_arches_align.patch b/community/arj/001_arches_align.patch
index c55d17ec4..c55d17ec4 100644
--- a/extra/arj/001_arches_align.patch
+++ b/community/arj/001_arches_align.patch
diff --git a/extra/arj/002_no_remove_static_const.patch b/community/arj/002_no_remove_static_const.patch
index 3656ba504..3656ba504 100644
--- a/extra/arj/002_no_remove_static_const.patch
+++ b/community/arj/002_no_remove_static_const.patch
diff --git a/extra/arj/003_64_bit_clean.patch b/community/arj/003_64_bit_clean.patch
index 7cd602ea5..7cd602ea5 100644
--- a/extra/arj/003_64_bit_clean.patch
+++ b/community/arj/003_64_bit_clean.patch
diff --git a/extra/arj/PKGBUILD b/community/arj/PKGBUILD
index 47aa5dc5f..23ea9e5e4 100644
--- a/extra/arj/PKGBUILD
+++ b/community/arj/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195286 2013-09-29 21:24:32Z eric $
+# $Id: PKGBUILD 101269 2013-11-21 12:18:33Z bpiotrowski $
# Maintainer:
# Contributor: Travis Willard <travisw@wmpub.ca>
# Contributor: Gergely Tamas <dice@mfa.kfki.hu>
diff --git a/extra/arj/arj-3.10.22-custom-printf.patch b/community/arj/arj-3.10.22-custom-printf.patch
index b789dd5c7..b789dd5c7 100644
--- a/extra/arj/arj-3.10.22-custom-printf.patch
+++ b/community/arj/arj-3.10.22-custom-printf.patch
diff --git a/community/arpwatch/PKGBUILD b/community/arpwatch/PKGBUILD
index cc8c7acc9..de54db83f 100644
--- a/community/arpwatch/PKGBUILD
+++ b/community/arpwatch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94834 2013-07-31 01:12:04Z seblu $
+# $Id: PKGBUILD 102230 2013-12-07 00:44:42Z seblu $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sébastien Luttringer
pkgname=arpwatch
pkgver=2.1a15
-pkgrel=12
+pkgrel=13
pkgdesc='Ethernet/FDDI station activity monitor'
arch=('i686' 'x86_64' 'mips64el')
url='ftp://ftp.ee.lbl.gov/'
@@ -15,7 +15,7 @@ source=("ftp://ftp.ee.lbl.gov/$pkgname-$pkgver.tar.gz"
'LICENSE'
"$pkgname.service")
md5sums=('cebfeb99c4a7c2a6cee2564770415fe7'
- '0a47a4e7a0f2ede5c8c7f22ec678fa72'
+ 'c5abd91d8852f68bf5bf49ed9e80dba0'
'9359518c500562281e76cdb0b2fa9062'
'43e2358ba0532da38e5296250a7fcfd8')
diff --git a/community/arpwatch/ethercodes.dat.xz b/community/arpwatch/ethercodes.dat.xz
index 1838c8194..70ad1dcaf 100644
--- a/community/arpwatch/ethercodes.dat.xz
+++ b/community/arpwatch/ethercodes.dat.xz
Binary files differ
diff --git a/extra/aspell-it/PKGBUILD b/community/aspell-it/PKGBUILD
index 40cee32ef..03cf6e144 100644
--- a/extra/aspell-it/PKGBUILD
+++ b/community/aspell-it/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143713 2011-11-28 16:36:02Z giovanni $
+# $Id: PKGBUILD 102316 2013-12-08 09:19:12Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Eric Johnson <eric@coding-zone.com>
diff --git a/community/astyle/PKGBUILD b/community/astyle/PKGBUILD
index 440117efc..c778b1588 100644
--- a/community/astyle/PKGBUILD
+++ b/community/astyle/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92315 2013-06-03 21:55:18Z lfleischer $
+# $Id: PKGBUILD 103213 2013-12-30 12:53:05Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Thomas Mader <thezema@gmail.com>
@@ -6,7 +6,7 @@
# Contributor: tardo <tardo@nagi-fanboi.net>
pkgname=astyle
-pkgver=2.03
+pkgver=2.04
pkgrel=1
pkgdesc='A free, fast and small automatic formatter for C, C++, C#, and Java source code.'
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ url='http://sourceforge.net/projects/astyle/'
license=('LGPL')
depends=('gcc-libs')
source=("http://downloads.sourceforge.net/sourceforge/astyle/${pkgname}_${pkgver}_linux.tar.gz")
-md5sums=('ba84eaa8564155babd4ba1458d4eaa11')
+md5sums=('30b1193a758b0909d06e7ee8dd9627f6')
build() {
cd "$srcdir/$pkgname/build/gcc"
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index 5fa26701f..3e9f2fc67 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 99687 2013-10-30 23:01:49Z allan $
+# $Id: PKGBUILD 102540 2013-12-13 11:46:14Z mtorromeo $
# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
# Contributor: Connor Behan <connor.behan@gmail.com>
# Contributor: henning mueller <henning@orgizm.net>
pkgname=audit
pkgver=2.3.2
-pkgrel=2
+pkgrel=3
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"
+url="http://people.redhat.com/sgrubb/audit"
arch=(i686 x86_64 mips64el)
depends=(krb5 libcap-ng)
makedepends=(libldap swig linux-headers python2)
@@ -15,7 +15,7 @@ license=(GPL)
options=(emptydirs)
backup=(
etc/libaudit.conf
- etc/audit/rules.d/audit.rules
+ etc/audit/audit.rules
etc/audit/auditd.conf
etc/audisp/audispd.conf
etc/audisp/audisp-remote.conf
@@ -38,7 +38,7 @@ build() {
--with-python=yes \
--enable-gssapi-krb5=yes \
--enable-systemd=yes \
- --with-libcap-ng=yes #--with-apparmor=yes
+ --with-libcap-ng=yes
make
}
@@ -56,6 +56,7 @@ package() {
usr/lib/systemd/system/auditd.service
chmod 644 usr/lib/systemd/system/auditd.service
+ mv "$pkgdir"/etc/audit/{rules.d/,}audit.rules
}
sha256sums=('8872e0b5392888789061db8034164305ef0e1b34543e1e7004d275f039081d29')
diff --git a/community/autocutsel/PKGBUILD b/community/autocutsel/PKGBUILD
index 64e405130..d1ad343ee 100644
--- a/community/autocutsel/PKGBUILD
+++ b/community/autocutsel/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 64911 2012-02-18 20:21:56Z jelle $
+# $Id: PKGBUILD 101226 2013-11-20 07:48:32Z jelle $
# Contributor: Tom Killian <tom@archlinux.org>
# Contributor: Nikos Kouremenos (zeppelin) kourem at gmail dot com
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=autocutsel
-pkgver=0.9.0
-pkgrel=7
+pkgver=0.9.1
+pkgrel=1
pkgdesc="synchronizes the two copy/paste buffers mainly used by X applications"
arch=('i686' 'x86_64' 'mips64el')
depends=('libxaw')
-source=(http://lepton.fr/tools/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('ba4a6f632cb4815ae4e5c3027c24cfc5')
-url="http://lepton.fr/tools/autocutsel/"
+source=(https://github.com/sigmike/autocutsel/releases/download/$pkgver/autocutsel-$pkgver.tar.gz)
+url="http://www.nongnu.org/autocutsel/"
install=autocutsel.install
license=('GPL')
+md5sums=('7bf76b1ea7a15592f05d02b4c086d4cd')
+
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr
diff --git a/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch b/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch
deleted file mode 100644
index 572ca97fd..000000000
--- a/community/autofs/0001-autofs-5.0.5-include-krb5-library.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From e467755fac27630730be25c4b41e5d0cfcd89c67 Mon Sep 17 00:00:00 2001
-From: Ian Kent <raven@themaw.net>
-Date: Tue, 10 Aug 2010 15:48:21 +0800
-Subject: [PATCH 1/2] autofs-5.0.5 - include krb5 library
-
-Since the Cyrus SASL module calls Kerberos directly we should be
-linking against the Kerberos librarys.
----
- Makefile.conf.in | 2 +
- aclocal.m4 | 19 +++++++++++++++
- configure | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
- configure.in | 5 +++-
- modules/Makefile | 4 +-
- 5 files changed, 93 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.conf.in b/Makefile.conf.in
-index f0287c3..a9bcf8c 100644
---- a/Makefile.conf.in
-+++ b/Makefile.conf.in
-@@ -31,6 +31,8 @@ XML_FLAGS = @XML_FLAGS@
- SASL = @HAVE_SASL@
- LIBSASL= @LIBSASL@
- SASL_FLAGS = @SASL_FLAGS@
-+KRB5_LIBS=@KRB5_LIBS@
-+KRB5_FLAGS=@KRB5_FLAGS@
-
- # NIS+ support: yes (1) no (0)
- NISPLUS = @HAVE_NISPLUS@
-diff --git a/aclocal.m4 b/aclocal.m4
-index e7f1a30..750a159 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -215,6 +215,25 @@ else
- fi])
-
- dnl --------------------------------------------------------------------------
-+dnl AF_CHECK_KRB5
-+dnl
-+dnl Check for Kerberos 5
-+dnl --------------------------------------------------------------------------
-+AC_DEFUN([AF_CHECK_KRB5],
-+[AC_PATH_PROGS(KRB5_CONFIG, krb5-config, no)
-+AC_MSG_CHECKING(for Kerberos library)
-+if test "$KRB5_CONFIG" = "no"
-+then
-+ AC_MSG_RESULT(no)
-+ HAVE_KRB5=0
-+else
-+ AC_MSG_RESULT(yes)
-+ HAVE_KRB5=1
-+ KRB5_LIBS=`$KRB5_CONFIG --libs`
-+ KRB5_FLAGS=`$KRB5_CONFIG --cflags`
-+fi])
-+
-+dnl --------------------------------------------------------------------------
- dnl AF_CHECK_LIBHESIOD
- dnl
- dnl Check for lib hesiod
-diff --git a/configure b/configure
-index 159f25f..500411c 100755
---- a/configure
-+++ b/configure
-@@ -640,6 +640,8 @@ ac_subst_vars='LTLIBOBJS
- LIBOBJS
- DAEMON_LDFLAGS
- DAEMON_CFLAGS
-+KRB5_FLAGS
-+KRB5_LIBS
- LIBSASL
- HAVE_SASL
- SASL_FLAGS
-@@ -657,6 +659,7 @@ LIBHESIOD
- HAVE_HESIOD
- LIBRESOLV
- LIBNSL
-+KRB5_CONFIG
- XML_CONFIG
- PATH_RPCGEN
- RPCGEN
-@@ -3723,7 +3726,7 @@ $as_echo "no" >&6; }
- fi
- fi
-
--# LDAP SASL auth need libxml
-+# LDAP SASL auth needs libxml and Kerberos
- for ac_prog in xml2-config
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -3801,6 +3804,66 @@ _ACEOF
- fi
- fi
- fi
-+for ac_prog in krb5-config
-+do
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+$as_echo_n "checking for $ac_word... " >&6; }
-+if test "${ac_cv_path_KRB5_CONFIG+set}" = set; then
-+ $as_echo_n "(cached) " >&6
-+else
-+ case $KRB5_CONFIG in
-+ [\\/]* | ?:[\\/]*)
-+ ac_cv_path_KRB5_CONFIG="$KRB5_CONFIG" # Let the user override the test with a path.
-+ ;;
-+ *)
-+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_path_KRB5_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+done
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+fi
-+KRB5_CONFIG=$ac_cv_path_KRB5_CONFIG
-+if test -n "$KRB5_CONFIG"; then
-+ { $as_echo "$as_me:$LINENO: result: $KRB5_CONFIG" >&5
-+$as_echo "$KRB5_CONFIG" >&6; }
-+else
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+ test -n "$KRB5_CONFIG" && break
-+done
-+test -n "$KRB5_CONFIG" || KRB5_CONFIG="no"
-+
-+{ $as_echo "$as_me:$LINENO: checking for Kerberos library" >&5
-+$as_echo_n "checking for Kerberos library... " >&6; }
-+if test "$KRB5_CONFIG" = "no"
-+then
-+ { $as_echo "$as_me:$LINENO: result: no" >&5
-+$as_echo "no" >&6; }
-+ HAVE_KRB5=0
-+else
-+ { $as_echo "$as_me:$LINENO: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ HAVE_KRB5=1
-+ KRB5_LIBS=`$KRB5_CONFIG --libs`
-+ KRB5_FLAGS=`$KRB5_CONFIG --cflags`
-+fi
-
- #
- # glibc/libc 6 new libraries
-@@ -5178,6 +5241,8 @@ fi
-
-
-
-+
-+
- LDFLAGS="${AF_tmp_ldflags}"
-
- #
-diff --git a/configure.in b/configure.in
-index f649a58..70b45e8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -144,8 +144,9 @@ AF_CHECK_PROG(RPCGEN, rpcgen, , $searchpath)
- #
- AF_SLOPPY_MOUNT()
-
--# LDAP SASL auth need libxml
-+# LDAP SASL auth needs libxml and Kerberos
- AF_CHECK_LIBXML()
-+AF_CHECK_KRB5()
-
- #
- # glibc/libc 6 new libraries
-@@ -274,6 +275,8 @@ AC_SUBST(XML_LIBS)
- AC_SUBST(SASL_FLAGS)
- AC_SUBST(HAVE_SASL)
- AC_SUBST(LIBSASL)
-+AC_SUBST(KRB5_LIBS)
-+AC_SUBST(KRB5_FLAGS)
- LDFLAGS="${AF_tmp_ldflags}"
-
- #
-diff --git a/modules/Makefile b/modules/Makefile
-index 13b3bd8..2389196 100644
---- a/modules/Makefile
-+++ b/modules/Makefile
-@@ -42,8 +42,8 @@ ifeq ($(LDAP), 1)
- MODS += lookup_ldap.so
- ifeq ($(SASL), 1)
- SASL_OBJ = cyrus-sasl.o
-- LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE
-- LIBLDAP += $(LIBSASL) $(XML_LIBS)
-+ LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) $(KRB5_FLAGS) -DLDAP_THREAD_SAFE
-+ LIBLDAP += $(LIBSASL) $(XML_LIBS) $(KRB5_LIBS)
- endif
- endif
-
---
-1.7.5.1
-
diff --git a/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
deleted file mode 100644
index e4e480e82..000000000
--- a/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 205c305922cdbded91ff8fadbaad7959bdb497bc Mon Sep 17 00:00:00 2001
-From: Ian Kent <raven@themaw.net>
-Date: Wed, 11 Aug 2010 09:33:09 +0800
-Subject: [PATCH 2/2] autofs-5.0.5 - remove ERR_remove_state() openssl call
-
-autofs should never have had to use ERR_remove_state() so remove that call.
-
-Lukas: Resolve a conflict in "CHANGELOG" that occured due to cherry
-picking Kerberos related patches from the 5.0.6 development branch.
-
-Conflicts:
-
- CHANGELOG
-
-Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
----
- CHANGELOG | 4 ++++
- modules/lookup_ldap.c | 12 +-----------
- 2 files changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/CHANGELOG b/CHANGELOG
-index e734cb3..1a20a81 100644
---- a/CHANGELOG
-+++ b/CHANGELOG
-@@ -1,3 +1,7 @@
-+??/??/20?? autofs-5.0.6
-+-----------------------
-+- remove ERR_remove_state() openssl call.
-+
- 03/09/2009 autofs-5.0.5
- -----------------------
- - fix dumb libxml2 check
-diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c
-index 2ecf5fe..1221c2c 100644
---- a/modules/lookup_ldap.c
-+++ b/modules/lookup_ldap.c
-@@ -168,18 +168,8 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c
- int rv;
-
- #ifdef WITH_SASL
-- /*
-- * The OpenSSL library can't handle having its message and error
-- * string database loaded multiple times and segfaults if the
-- * TLS environment is not reset at the right times. As there
-- * is no ldap_stop_tls call in the openldap library we have
-- * to do the job ourselves, here and in lookup_done when the
-- * module is closed.
-- */
-- if (ctxt->use_tls == LDAP_TLS_RELEASE) {
-- ERR_remove_state(0);
-+ if (ctxt->use_tls == LDAP_TLS_RELEASE)
- ctxt->use_tls = LDAP_TLS_INIT;
-- }
- autofs_sasl_unbind(ctxt);
- #endif
-
---
-1.7.5.1
-
diff --git a/community/autofs/PKGBUILD b/community/autofs/PKGBUILD
index 9404d5f3a..f6cfa98e9 100644
--- a/community/autofs/PKGBUILD
+++ b/community/autofs/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 92244 2013-06-03 11:15:10Z allan $
+# $Id: PKGBUILD 103218 2013-12-30 14:30:57Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=autofs
-pkgver=5.0.7
-pkgrel=3
+pkgver=5.0.8
+pkgrel=1
pkgdesc='A kernel-based automounter for Linux.'
arch=('i686' 'x86_64' 'mips64el')
url='http://freshmeat.net/projects/autofs'
@@ -18,19 +18,17 @@ backup=('etc/default/autofs'
'etc/autofs/auto.master'
'etc/autofs/auto.misc')
options=(!makeflags)
-install='autofs.install'
-source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
- 'auto.master'
- 'auto.misc')
-md5sums=('bc46838dece83c02d800ff144ed9f431'
- 'a6cefb591e77b31b79dbb7243646c96b'
- 'd8a15ec9186c5c0b36e5cea1e2739e8a')
+source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('32c41fb4e3439f18400468e84dc82fbbd4b14156bef6b9a7f09196ecd9299d52')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ sed -i -e 's|/etc/auto.misc|/etc/autofs/auto.misc|' \
+ -e 's|/etc/auto.master.d|/etc/autofs/auto.master.d|' samples/auto.master
+}
- sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
- Makefile.rules
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc/autofs --sbindir=/usr/bin \
--with-mapdir=/etc/autofs --without-hesiod \
@@ -42,11 +40,8 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make INSTALLROOT="${pkgdir}" install
-
- install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master"
- install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc"
-
- install -Dm0644 "samples/autofs.service" "${pkgdir}/usr/lib/systemd/system/autofs.service"
+ rm -r "$pkgdir/run"
+ install -dm755 "$pkgdir/etc/autofs/auto.master.d"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/autofs/auto.master b/community/autofs/auto.master
deleted file mode 100644
index be4ea73ae..000000000
--- a/community/autofs/auto.master
+++ /dev/null
@@ -1,6 +0,0 @@
-# Sample auto.master file
-# Format of this file:
-# mountpoint map options
-# For details of the format look at autofs(5).
-
-#/media /etc/autofs/auto.media
diff --git a/community/autofs/auto.misc b/community/autofs/auto.misc
deleted file mode 100644
index 569156626..000000000
--- a/community/autofs/auto.misc
+++ /dev/null
@@ -1,7 +0,0 @@
-# This is an automounter map and it has the following format
-# key [ -mount-options-separated-by-comma ] location
-# Details may be found in the autofs(5) manpage
-
-cdrom -fstype=iso9660,ro,nodev,nosuid :/dev/cdrom
-floppy -fstype=auto,async,nodev,nosuid,umask=000 :/dev/fl
-usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1
diff --git a/community/autofs/autofs.install b/community/autofs/autofs.install
deleted file mode 100644
index 34ae75f1e..000000000
--- a/community/autofs/autofs.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install(){
- echo "> In autofs5 --ghost option isn't valid. In order to start autofs you"
- echo "> must remove that option from your /etc/conf.d/autofs."
-}
diff --git a/community/avrdude/PKGBUILD b/community/avrdude/PKGBUILD
index b2c4ecb20..57ab41554 100644
--- a/community/avrdude/PKGBUILD
+++ b/community/avrdude/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 97484 2013-09-21 11:43:49Z jelle $
+# $Id: PKGBUILD 102091 2013-12-05 02:01:26Z eric $
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
# Maintainer: Brad Fanella <bradfanella@archlinux.us>
pkgname=avrdude
pkgver=6.0.1
-pkgrel=1
+pkgrel=3
pkgdesc="Download/upload/manipulate the ROM and EEPROM contents of AVR microcontrollers"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.nongnu.org/avrdude/"
license=('GPL')
-depends=('libusbx' 'readline' 'libftdi')
+depends=('readline' 'libftdi' 'libusb-compat')
source=(http://download.savannah.gnu.org/releases/avrdude/${pkgname}-${pkgver}.tar.gz{,.sig})
md5sums=('346ec2e46393a54ac152b95abf1d9850'
'SKIP')
@@ -26,5 +26,5 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/barcode/PKGBUILD b/community/barcode/PKGBUILD
index 53e113990..64580063d 100644
--- a/extra/barcode/PKGBUILD
+++ b/community/barcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 181063 2013-03-31 07:43:24Z giovanni $
+# $Id: PKGBUILD 102195 2013-12-06 13:05:07Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=barcode
diff --git a/extra/barcode/barcode.install b/community/barcode/barcode.install
index 83966a37d..83966a37d 100644
--- a/extra/barcode/barcode.install
+++ b/community/barcode/barcode.install
diff --git a/community/bind/PKGBUILD b/community/bind/PKGBUILD
index f7276fc65..37045a227 100644
--- a/community/bind/PKGBUILD
+++ b/community/bind/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99697 2013-10-30 23:05:52Z allan $
+# $Id: PKGBUILD 100668 2013-11-08 00:08:48Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
# Contributor: Mario Vazquez <mario_vazq@hotmail.com>
pkgname=bind
-_pkgver=9.9.4
+_pkgver=9.9.4-P1
pkgver=${_pkgver//-/.}
pkgrel=1
pkgdesc='The ISC BIND nameserver'
@@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"{,.asc}
'named.logrotate'
'localhost.zone'
'127.0.0.zone')
-sha1sums=('d7be390e6c2546f37a7280e1975e1cd134565f62'
+sha1sums=('35dd28de21626fd6327230c38d0f164dd2263bed'
'SKIP'
'029f89c49550c40ec7a95116b6a33f0e5a041094'
'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
diff --git a/community/bird/PKGBUILD b/community/bird/PKGBUILD
index e40f8b216..f8bcf2a45 100644
--- a/community/bird/PKGBUILD
+++ b/community/bird/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98871 2013-10-20 22:53:38Z seblu $
+# $Id: PKGBUILD 101733 2013-11-30 16:20:26Z seblu $
# Maintainer: Sébastien Luttringer
pkgbase=bird
pkgname=('bird' 'bird6')
-pkgver=1.3.11
-pkgrel=2
+pkgver=1.4.0
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://bird.network.cz/'
license=('GPL2')
@@ -12,7 +12,7 @@ depends=('readline' 'ncurses')
source=("ftp://bird.network.cz/pub/bird/${pkgname}-${pkgver}.tar.gz"
'bird.service'
'bird6.service')
-md5sums=('8ad2eb997fb8251bc5b24cf32619571b'
+md5sums=('4e5a47308335b1b0bf4691cac6c4174f'
'69221e063a3f07dcad519d5eeacaae75'
'5b172bd052b523efd95ee018e891e181')
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 3a0166376..24a8d44e8 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 97296 2013-09-16 16:48:10Z tredaelli $
+# $Id: PKGBUILD 102409 2013-12-10 14:39:27Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: shahid <helllamer@gmail.com>
pkgbase=bitcoin
pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.8.5
+pkgver=0.8.6
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.bitcoin.org/"
makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
license=('MIT')
source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz)
-sha256sums=('84543f10de5e82ce6e88dd5a501db37c6327edf79a2a04f29199c24843e71f63')
+sha256sums=('73495de53d1a30676884961e39ff46c3851ff770eeaa767331d065ff0ce8dd0c')
build() {
cd "$srcdir/$pkgbase-$pkgver-linux/src"
diff --git a/community/blobby2/PKGBUILD b/community/blobby2/PKGBUILD
index 79beb15dd..a93ba23a1 100644
--- a/community/blobby2/PKGBUILD
+++ b/community/blobby2/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 79399 2012-11-04 04:36:25Z svenstaro $
+# $Id: PKGBUILD 102240 2013-12-07 10:36:24Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Urs Wolfer <uwolfer @ fwo.ch>
pkgname=blobby2
-pkgver=1.0rc3
+pkgver=1.0rc4
arch=('x86_64' 'i686' 'mips64el')
pkgrel=1
pkgdesc="A beach ball game with blobs of goo"
url="http://sourceforge.net/projects/blobby/"
license=('GPL')
-depends=('sdl' 'physfs' 'libgl')
+depends=('sdl' 'sdl2' 'physfs' 'libgl')
makedepends=('cmake' 'boost' 'mesa' 'zip')
source=(http://downloads.sourceforge.net/blobby/$pkgname-linux-$pkgver.tar.gz
$pkgname.desktop
$pkgname.png)
-md5sums=('c4b7d3133e99806dc8b60a59da296906'
+md5sums=('0124ebbb6cf06d053d6a1bcc12b1a89d'
'ab05bed794ee78db693fd3036393275a'
'c1bc427b41a0a3facd771ac83c7fb412')
diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD
deleted file mode 100644
index cb0be796a..000000000
--- a/community/blueman/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 100136 2013-11-01 20:21:28Z spupykin $
-# Contributor: Ionut Biru <ibiru@archlinux.org
-# Contributor: Abhishek Dasgupta <abhidg@gmail.com>
-
-pkgname=blueman
-pkgver=20131021git
-pkgrel=2
-pkgdesc="GTK+ bluetooth manager"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="https://github.com/cschramm/blueman"
-depends=('bluez' 'bluez-libs' 'gnome-icon-theme' 'libpulse' 'obex-data-server'
- 'python2-dbus' 'python2-notify' 'startup-notification' 'xdg-utils')
-makedepends=('pyrex' 'intltool' 'git')
-optdepends=('dnsmasq: For creating PAN network'
- 'modemmanager: For modem management service'
- 'notification-daemon: For desktop notifications'
- 'polkit-gnome: For privileged actions'
- 'pulseaudio: To use the pulseaudio plugin'
- 'python2-gconf: For gconf configuration support')
-install=$pkgname.install
-source=("blueman::git://github.com/cschramm/blueman.git")
-md5sums=('SKIP')
-
-prepare() {
- cd "${srcdir}/${pkgname}"
- for file in apps/blueman*; do
- sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
- done
- sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py
-}
-
-build() {
- cd "${srcdir}/${pkgname}"
- export PYTHON=python2
- ./autogen.sh
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib/blueman \
- --with-no-runtime-deps-check
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}"
- make DESTDIR="${pkgdir}" install
- echo "NotShowIn=KDE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop
-}
diff --git a/community/bomberclone/PKGBUILD b/community/bomberclone/PKGBUILD
index a127c664c..61b60d0c3 100644
--- a/community/bomberclone/PKGBUILD
+++ b/community/bomberclone/PKGBUILD
@@ -1,37 +1,47 @@
-# $Id: PKGBUILD 66517 2012-02-25 22:47:19Z lfleischer $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# $Id: PKGBUILD 102211 2013-12-06 14:28:46Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: arjan <arjan@archlinux.org>
# Contributor: Aurelien Foret <orelien@chez.com>
pkgname=bomberclone
pkgver=0.11.9
-pkgrel=2
-pkgdesc='A clone of the game AtomicBomberMan.'
+pkgrel=3
+pkgdesc='Clone of the game AtomicBomberMan'
arch=('i686' 'x86_64' 'mips64el')
url="http://www.bomberclone.de/"
license=('GPL')
depends=('sdl_mixer' 'sdl_image')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'bomberclone-0.11.9-build-fix.patch'
- 'bomberclone.desktop')
-md5sums=('3edcfcf69b88dbd2eab42541f236e072'
- '88def2b6faf7a6ac7acd96f617fc460e'
- '2c0151859e7e9aebd1fc95a1455f0c3b')
+makedepends=('gendesk')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+ 'bomberclone-0.11.9-build-fix.patch')
+sha256sums=('71eb2788f95c136fd3eecaee15d05a80dea07221b5b3530dc869e433e02ff68d'
+ 'ee8bbff24f261951379ca55c510df04deb5a0fd17c2c3149b63bbcaf1cfb0549')
+
+prepare() {
+ gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'BomberClone'
+}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$pkgname-$pkgver"
# add build fix extracted from upstream CVS (fixes FS#26942)
patch -p0 -i ../bomberclone-0.11.9-build-fix.patch
sed -i 's/-Werror//' configure
./configure --prefix=/usr
- make AM_CFLAGS=-lm
+ make CFLAGS="-lm -O2 `pkg-config sdl --cflags` $CFLAGS"
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
- install -Dm0644 "${srcdir}/bomberclone.desktop" \
- "${pkgdir}/usr/share/applications/bomberclone.desktop"
+ make DESTDIR="$pkgdir" install
+
+ # Desktop shortcut and icon
+ install -Dm644 "$srcdir/$pkgname.desktop" \
+ "$pkgdir/usr/share/applications/$pkgname.desktop"
+ install -Dm644 "$pkgdir/usr/share/games/$pkgname/pixmaps/$pkgname.png" \
+ "$pkgdir/usr/share/pixmaps/$pkgname.png"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/bomberclone/bomberclone.desktop b/community/bomberclone/bomberclone.desktop
deleted file mode 100644
index affc0d8ad..000000000
--- a/community/bomberclone/bomberclone.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=BomberClone
-GenericName=BomberClone
-Comment=Atomic Bomberman clone
-Icon=/usr/share/games/bomberclone/pixmaps/bomberclone.png
-TryExec=bomberclone
-Exec=bomberclone
-Terminal=false
-Categories=Qt;KDE;GNOME;Game;
diff --git a/community/botan/PKGBUILD b/community/botan/PKGBUILD
index caf945b04..a8e63da39 100644
--- a/community/botan/PKGBUILD
+++ b/community/botan/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87983 2013-04-09 20:48:46Z arodseth $
+# $Id: PKGBUILD 103215 2013-12-30 13:50:26Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
# Contributor: d'Ronin <daronin@2600.com>
pkgname=botan
-pkgver=1.10.5
+pkgver=1.10.7
pkgrel=1
pkgdesc='Crypto library written in C++'
license=('BSD')
@@ -14,23 +14,23 @@ url='http://botan.randombit.net/'
depends=('gcc-libs' 'sh')
makedepends=('python2')
source=("http://files.randombit.net/botan/Botan-${pkgver}.tbz")
-sha256sums=('2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3')
+sha256sums=('19f79ae670cb2ea7c290244ff6ff564ce74b45d8845af52787a30c646e16324d')
build() {
- cd "$srcdir/Botan-$pkgver"
+ cd "Botan-$pkgver"
sed -i 's:env python:env python2:' configure.py
sed -i 's/mabi=64/mabi=n32/g' src/build-data/cc/gcc.txt
- ./configure.py --prefix=/usr
+ python2 configure.py --prefix=/usr
make
}
package() {
- cd "$srcdir/Botan-$pkgver"
+ cd "Botan-$pkgver"
make DESTDIR="$pkgdir/usr" install
- install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
find "$pkgdir/usr/share/doc" -type f -exec chmod 0644 {} \;
+ install -Dm644 doc/license.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/box2d/PKGBUILD b/community/box2d/PKGBUILD
index 7f748aced..76cfe3ee8 100644
--- a/community/box2d/PKGBUILD
+++ b/community/box2d/PKGBUILD
@@ -1,44 +1,45 @@
-# $Id: PKGBUILD 64742 2012-02-18 03:45:38Z svenstaro $
+# $Id: PKGBUILD 100620 2013-11-06 13:54:05Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=box2d
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.3.0
+pkgrel=1
pkgdesc="2D rigid body simulation library for games"
url="http://www.box2d.org/"
license=('zlib')
arch=('i686' 'x86_64' 'mips64el')
#depends=('freeglut')
-makedepends=('cmake')
+makedepends=('cmake' 'doxygen')
optdepends=()
-source=(http://box2d.googlecode.com/files/Box2D_v${pkgver}.zip)
-md5sums=('9e9d32a34fb5554c47f0f9cade0fa611')
+source=(svn+http://box2d.googlecode.com/svn/tags/v${pkgver})
+md5sums=('SKIP')
build() {
- cd ${srcdir}/Box2D_v${pkgver}
+ cd ${srcdir}/v${pkgver}/Box2D
msg "Starting build"
[[ -d build ]] && rm -r build
mkdir build && cd build
cmake .. \
-DBOX2D_INSTALL=ON \
+ -DBOX2D_INSTALL_DOC=ON \
-DBOX2D_BUILD_SHARED=ON \
- -DBOX2D_BUILD_STATIC=ON \
+ -DBOX2D_BUILD_STATIC=OFF \
-DBOX2D_BUILD_EXAMPLES=OFF \
-DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
- cd ${srcdir}/Box2D_v${pkgver}/build
+ cd ${srcdir}/v${pkgver}/Box2D
- make DESTDIR=${pkgdir} install
+ cd Documentation
+ doxygen
+
+ cd ../build
- mkdir -p ${pkgdir}/usr/share/doc/box2d/
- cp -r ${srcdir}/Box2D_v${pkgver}/Documentation/* ${pkgdir}/usr/share/doc/box2d/
- find ${pkgdir}/usr/share/doc/box2d/ -type f | xargs chmod 644
- find ${pkgdir}/usr/share/doc/box2d/ -type d | xargs chmod 755
+ make DESTDIR=${pkgdir} install
- install -Dm644 ${srcdir}/Box2D_v${pkgver}/License.txt ${pkgdir}/usr/share/licenses/box2d/LICENSE
+ install -Dm644 ${srcdir}/v${pkgver}/Box2D/License.txt ${pkgdir}/usr/share/licenses/box2d/LICENSE
}
# vim: sw=2 ts=2 et:
diff --git a/community/brise/PKGBUILD b/community/brise/PKGBUILD
index efbeccd76..aa81fd222 100644
--- a/community/brise/PKGBUILD
+++ b/community/brise/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 90136 2013-05-07 05:26:31Z fyan $
+# $Id: PKGBUILD 103210 2013-12-30 09:12:40Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: GONG Chen <chen dot sst at gmail dot com>
pkgname=brise
-pkgver=0.22
+pkgver=0.32
pkgrel=1
pkgdesc="Rime schema repository"
arch=('i686' 'x86_64')
url="http://code.google.com/p/rimeime/"
license=('GPL3')
depends=()
-makedepends=('cmake' 'librime>=0.9.9')
+makedepends=('cmake' 'librime>=1.1')
provides=('librime-data')
-conflicts=('librime<0.9.9' 'ibus-rime<0.9.9')
+conflicts=('librime<1.1' 'ibus-rime<1.1')
source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz")
build() {
- cd "${srcdir}/$pkgname"
+ cd $pkgname
make
}
package() {
- cd "${srcdir}/$pkgname"
+ cd $pkgname
make DESTDIR="$pkgdir" install
}
-md5sums=('d9a55bc0b6bdd49e2622b76df43ef12f')
+
+sha512sums=('c41d4a7399a963b9e023015e1268f0f63693091d0ae2edff9db68397d223bb25ea6c392d2649f7817edd40998b1ed144d63478a01241cdaa5f2e84fd846e24d7')
diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index ccae0fa43..669983619 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99706 2013-10-30 23:09:03Z allan $
+# $Id: PKGBUILD 102095 2013-12-05 08:00:44Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=c++-gtk-utils
-pkgver=2.0.20
+pkgver=2.0.21
pkgrel=1
pkgdesc="Classes and functions for programming in GTK+"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
depends=('gtk3')
options=('!docs' '!emptydirs')
source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8af461ec1f2696e92a1fe1c62a08730b')
+md5sums=('98f5f211907c89dd978255e48d31a9ca')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cairo-dock/PKGBUILD b/community/cairo-dock/PKGBUILD
index 3026acb13..32b494016 100755
--- a/community/cairo-dock/PKGBUILD
+++ b/community/cairo-dock/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 99668 2013-10-30 22:32:44Z alucryd $
+# $Id: PKGBUILD 103144 2013-12-27 15:18:35Z alucryd $
# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
# Contributor: Tofe <chris dot chapuis at gmail dot com>
# Contributor: erm67 <erm67 at yahoo dot it>
pkgname=cairo-dock
pkgver=3.3.2
-pkgrel=1
+pkgrel=2
pkgdesc='Light eye-candy fully themable animated dock'
arch=('i686' 'x86_64' 'mips64el')
url="https://launchpad.net/${pkgname}-core"
license=('GPL')
-depends=('curl' 'dbus-glib' 'gtk3' 'librsvg')
+depends=('curl' 'dbus-glib' 'glu' 'gtk3' 'librsvg')
makedepends=('cmake')
optdepends=('cairo-dock-plugins: Plugins for Cairo-Dock')
source=("${url}/${pkgver%.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
index 15bada28a..ff78a7dcd 100644
--- a/community/cantata/PKGBUILD
+++ b/community/cantata/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 97316 2013-09-17 09:33:55Z bpiotrowski $
+# $Id: PKGBUILD 101406 2013-11-24 23:10:10Z cinelli $
# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
# Contributor: MisterFred <mister.fred[at]free[dot]fr>
pkgname=cantata
-pkgver=1.1.2
+pkgver=1.1.3
pkgdesc="A KDE client for the music player daemon (MPD)"
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://kde-apps.org/content/show.php/Cantata?content=147733"
license=('GPL')
-depends=('kdebase-runtime' 'taglib-extras' 'mpg123' 'libmtp' 'libcddb' 'libmusicbrainz5')
+depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'taglib-extras')
+optdepends=('perl-uri: dynamic playlist'
+ 'mpd: playback')
makedepends=('cmake' 'automoc4')
install="$pkgname.install"
source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('628991865a505284a7ce56e117cd36cc')
-
+md5sums=('22691c1ba9e0f94200f6cdb849be726a')
build() {
cd "$srcdir/$pkgname-$pkgver"
mkdir build
diff --git a/extra/ccache/PKGBUILD b/community/ccache/PKGBUILD
index b69b5fb0d..4b242c6f8 100644
--- a/extra/ccache/PKGBUILD
+++ b/community/ccache/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174762 2013-01-07 00:33:58Z giovanni $
+# $Id: PKGBUILD 102197 2013-12-06 13:08:34Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
diff --git a/community/ccgo/PKGBUILD b/community/ccgo/PKGBUILD
new file mode 100644
index 000000000..affc75102
--- /dev/null
+++ b/community/ccgo/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 101516 2013-11-26 20:38:54Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Guillem Rieu <guillemr@gmx.net>
+
+pkgname=ccgo
+pkgver=0.3.6.4
+pkgrel=3
+pkgdesc='Play the game of Go with gnugo or against other players on IGS'
+arch=('x86_64' 'i686')
+url='http://ccdw.org/~cjj/prog/ccgo/'
+license=('GPL')
+depends=('gtkmm' 'gconfmm')
+source=("http://ccdw.org/~cjj/prog/$pkgname/src/$pkgname-$pkgver.tar.gz")
+sha256sums=('1975a4e9b6661f6613dd3a00b3ee7e176b80244f555a184b258b50ef4352a890')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ make -C "$srcdir/$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index a22590b01..f8328af12 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 98755 2013-10-17 15:45:53Z giovanni $
+# $Id: PKGBUILD 102093 2013-12-05 07:50:08Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
pkgname=ccid
-pkgver=1.4.13
+pkgver=1.4.14
pkgrel=1
pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('LGPL' 'GPL')
depends=('pcsclite' 'libusbx')
makedepends=('pkg-config')
backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/file/3959/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('89c167a873df1f8bc0dc907ce209e5ff')
+source=("https://alioth.debian.org/frs/download.php/file/3971/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('4596f82e85e2996f7877e892b5c18382')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index f3dd9657d..0becf46f2 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98184 2013-10-07 12:07:00Z jgc $
+# $Id: PKGBUILD 102241 2013-12-07 10:36:26Z bpiotrowski $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: joyfulgirl@archlinux.us
# Contributor: nathan owe ndowens04 at gmail dot com
pkgname=cclive
-pkgver=0.9.2
-pkgrel=1
+pkgver=0.9.3
+pkgrel=3
pkgdesc='Commandline downloader for popular video websites.'
arch=('i686' 'x86_64' 'mips64el')
url='http://cclive.sourceforge.net/'
@@ -13,7 +13,7 @@ license=('AGPL3')
depends=('boost-libs' 'pcre' 'curl' 'libquvi' 'glibmm')
makedepends=('boost')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('b21f2ed68242901dc0439132a4ea6629')
+md5sums=('c336f97e29327d92ead62765a0ef0b65')
build() {
cd $pkgname-$pkgver
diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD
index c0374dbaf..97ae477b2 100644
--- a/community/cdemu-daemon/PKGBUILD
+++ b/community/cdemu-daemon/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 92546 2013-06-08 00:40:57Z heftig $
+# $Id: PKGBUILD 102785 2013-12-20 01:23:58Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
pkgname=cdemu-daemon
-pkgver=2.1.0
+pkgver=2.1.1
pkgrel=1
pkgdesc="CD/DVD-ROM device emulator daemon"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ backup=(etc/conf.d/cdemu-daemon
install=cdemu-daemon.install
source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
system-arch.patch)
-sha256sums=('8224a5d8d16cbd9a2294e9c7ab544d61059d9870023e48705699af7366846580'
+sha256sums=('d26782071184d555b06ad5def7d1c22916cbeb73377328879499b91e1196f36f'
'29507da7367983bdc5f541e9f9252f189412041076842b8d08a5c4dac29f23cd')
prepare() {
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index 621dd71fa..d3f435475 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,30 +1,32 @@
-# $Id: PKGBUILD 94870 2013-08-01 06:54:43Z bpiotrowski $
+# $Id: PKGBUILD 103093 2013-12-26 11:56:21Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>,
# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl>
pkgname=cegui
-pkgver=0.8.2
-pkgrel=5
+pkgver=0.8.3
+pkgrel=2
pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
arch=('i686' 'x86_64' 'mips64el')
url="http://crayzedsgui.sourceforge.net"
license=("MIT")
depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua51' 'silly' 'glfw')
-makedepends=('cmake' 'python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht' 'glm' 'mesa')
+makedepends=('cmake' 'python2' 'doxygen' 'ogre' 'gtk2' 'boost' 'graphviz' 'irrlicht' 'glm' 'mesa' 'mercurial' 'tolua++')
optdepends=("python2: python bindings"
"ogre: ogre module"
"gtk2: gtk2 module"
"irrlicht: irrlicht module")
-source=(http://downloads.sourceforge.net/crayzedsgui/cegui-$pkgver.tar.gz)
-md5sums=('f72951f0cc0374bb2294035cb639bb83')
+source=("hg+ssh://hg@bitbucket.org/cegui/cegui#tag=v0-8-3"
+ "freetype.patch")
+md5sums=('SKIP'
+ '4c5f81f109f36718045bb4ba5ba25602')
build() {
- cd "$srcdir/cegui-${pkgver}"
+ cd "$srcdir/cegui"
+ patch -Np1 < "$srcdir/freetype.patch"
sed -i "s/lib64/lib/g" CMakeLists.txt
- sed -i "s/lib32/lib/g" CMakeLists.txt
[[ -d build ]] && rm -r build
mkdir build && cd build
@@ -32,20 +34,17 @@ build() {
cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCEGUI_LIB_INSTALL_DIR=lib \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
+ -DCEGUI_BUILD_PYTHON_MODULES=OFF # currently broken :(
+ # -PYTHON_EXECUTABLE=/usr/bin/python2
make
make html
}
package() {
- cd "$srcdir/cegui-${pkgver}"
+ cd "$srcdir/cegui"/build
- cd build
-
make DESTDIR="${pkgdir}" install
- cd ..
-
- install -Dm644 doc/COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm644 ../doc/COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/community/cegui/freetype.patch b/community/cegui/freetype.patch
new file mode 100644
index 000000000..6fdb9e30b
--- /dev/null
+++ b/community/cegui/freetype.patch
@@ -0,0 +1,14 @@
+diff -r 319182022f9f cmake/FindFreetype.cmake
+--- a/cmake/FindFreetype.cmake Sat Dec 07 09:00:48 2013 +0000
++++ b/cmake/FindFreetype.cmake Tue Dec 17 05:02:30 2013 +0100
+@@ -3,8 +3,8 @@
+ ################################################################################
+ include(FindPackageHandleStandardArgs)
+
+-find_path(FREETYPE_H_PATH_ft2build NAMES ft2build.h)
+-find_path(FREETYPE_H_PATH_ftconfig NAMES freetype/config/ftconfig.h PATH_SUFFIXES freetype2)
++find_path(FREETYPE_H_PATH_ft2build NAMES ft2build.h PATH_SUFFIXES freetype2)
++find_path(FREETYPE_H_PATH_ftconfig NAMES config/ftconfig.h PATH_SUFFIXES freetype2)
+ find_library(FREETYPE_LIB NAMES freetype2 freetype libfreetype PATH_SUFFIXES dynamic)
+ find_library(FREETYPE_LIB_DBG NAMES freetype_d libfreetype_d PATH_SUFFIXES dynamic)
+ mark_as_advanced(FREETYPE_H_PATH_ft2build FREETYPE_H_PATH_ftconfig FREETYPE_LIB FREETYPE_LIB_DBG)
diff --git a/community/chuck/PKGBUILD b/community/chuck/PKGBUILD
index a8a8b127f..509102e12 100644
--- a/community/chuck/PKGBUILD
+++ b/community/chuck/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98759 2013-10-17 17:27:23Z arodseth $
+# $Id: PKGBUILD 101520 2013-11-26 22:50:13Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Laurent Carlier <lordheavym@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -8,24 +8,25 @@
pkgname=chuck
pkgver=1.3.2.0
-pkgrel=1
+pkgrel=2
pkgdesc='Concurrent, on-the-fly audio programming language'
arch=('x86_64' 'i686' 'mips64el')
url='http://chuck.cs.princeton.edu/'
license=('GPL')
-depends=('gcc-libs' 'libsndfile')
+ depends=('gcc-libs' 'libsndfile' 'jack')
source=("http://chuck.cs.princeton.edu/release/files/$pkgname-$pkgver.tgz")
sha256sums=('ee0c7d94cd4053f9683f84007350992b7e7552fcc190eeba21a66de8deaf3948')
build() {
- make -C "$pkgname-$pkgver/src" linux-alsa # linux-jack linux-oss osx win32
+ # Other build alternatives are: linux-alsa linux-oss osx win32
+ make -C "$pkgname-$pkgver/src" linux-jack
}
package() {
cd "$pkgname-$pkgver/src"
install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
- mkdir -p "$pkgdir/usr/share/doc/$pkgname"
+ install -d "$pkgdir/usr/share/doc/$pkgname"
cp -r ../examples "$pkgdir/usr/share/doc/$pkgname"
}
diff --git a/community/cinnamon-control-center/PKGBUILD b/community/cinnamon-control-center/PKGBUILD
index d699e9c3f..3d90821e7 100644
--- a/community/cinnamon-control-center/PKGBUILD
+++ b/community/cinnamon-control-center/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99709 2013-10-30 23:10:13Z allan $
+# $Id: PKGBUILD 101563 2013-11-28 01:18:16Z faidoc $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com
# Based on gnome-control-center:
# Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Jan de Groot <jgc@archlinux.org>
pkgname=cinnamon-control-center
-pkgver=2.0.6
+pkgver=2.0.9
pkgrel=1
pkgdesc="The Control Center for Cinnamon"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ license=('GPL')
options=('!emptydirs')
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-control-center/archive/$pkgver.tar.gz"
region.patch)
-sha256sums=('4871c7893bd6d215df76abbc69f9f75340a5997cdca00669544c7e63eb3c6a2f'
+sha256sums=('63bb179a50d5f873ed1c19de97966592eedbc055ce2829e4298223a75fc33b4e'
'077cb8d6814c32a4df85f71c2b8fa84da25e5260263a6e0536c6e1626051f022')
prepare() {
diff --git a/community/cinnamon-desktop/PKGBUILD b/community/cinnamon-desktop/PKGBUILD
index eb3ca73d2..a7f25a2ea 100644
--- a/community/cinnamon-desktop/PKGBUILD
+++ b/community/cinnamon-desktop/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jan de Groot <jan@archlinux.org>
pkgname=cinnamon-desktop
-pkgver=2.0.3
+pkgver=2.0.4
pkgrel=1
pkgdesc="Library with common API for various Cinnamon modules"
arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=(intltool gobject-introspection gnome-common)
url="https://github.com/linuxmint/cinnamon-desktop"
install=cinnamon-desktop.install
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-desktop/archive/${pkgver}.tar.gz")
-sha256sums=('bd9c50df70432d2e37a7c11728dcdf264af235b261b3f378eade61dc4ef101c3')
+sha256sums=('039a789fc8fca52cf1ceaeec8b7ad9ccc122ea38990186cabea814118e8ddcb3')
build() {
cd $pkgname-$pkgver
diff --git a/community/cinnamon-session/PKGBUILD b/community/cinnamon-session/PKGBUILD
index 785176c4c..60944dee0 100644
--- a/community/cinnamon-session/PKGBUILD
+++ b/community/cinnamon-session/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=cinnamon-session
-pkgver=2.0.4
+pkgver=2.0.6
pkgrel=1
pkgdesc="The Cinnamon Session Handler"
arch=(i686 x86_64)
@@ -16,7 +16,7 @@ url="https://github.com/linuxmint/cinnamon-session"
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-session/archive/${pkgver}.tar.gz
remove_sessionmigration.patch
timeout.patch)
-sha256sums=('6de02197c89bde698e4f28cba51653967e1322c17c55ebc5f81ca30b14f58278'
+sha256sums=('831a63f31bd5c0f5dcaee833d3e43e50e8c9d540cbe931e71b8e0f79ede14567'
'f3c0bc1a3debfaa686230f19ba371b08dd4645064d90ead0c34f465c7d416736'
'ef421a14814c7858490b3a806568ab4ec8a0dc21d390e94f801771c1261bb24a')
diff --git a/community/cinnamon-settings-daemon/PKGBUILD b/community/cinnamon-settings-daemon/PKGBUILD
index fbe01d17f..162f2684c 100644
--- a/community/cinnamon-settings-daemon/PKGBUILD
+++ b/community/cinnamon-settings-daemon/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=cinnamon-settings-daemon
-pkgver=2.0.6
+pkgver=2.0.8
pkgrel=1
pkgdesc="The Cinnamon Settings daemon"
arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ url="https://github.com/linuxmint/cinnamon-settings-daemon"
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/linuxmint/cinnamon-settings-daemon/archive/${pkgver}.tar.gz"
keyboard.patch
automount-plugin.patch)
-sha256sums=('50d9d2799415f2a98fbb2ec05a66aa807c861562d87c0371631ab30b9f7e26d3'
+sha256sums=('6889f021acab93d146c78fe8aa540a83a12260232e1ea5f697037a7c94c877fd'
'3c05b978cb414c8fc1530f211bab58627a64ac9c156630c9d486f5926a85109c'
'4fc2b3a354b53d41d92d7f95d175a6a18382330353a0579d29c2d33b9400a837')
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index f03a6bd3f..9507b9290 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100528 2013-11-05 14:09:17Z faidoc $
+# $Id: PKGBUILD 101561 2013-11-28 01:14:22Z faidoc $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
# Contributor: M0Rf30
# Contributor: unifiedlinux
# Contributor: CReimer
pkgname=cinnamon
-pkgver=2.0.10
+pkgver=2.0.14
pkgrel=1
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/archive/
"keyboard_applet.patch"
"input_keybindings.patch"
"org.archlinux.pkexec.cinnamon-settings-users.policy")
-sha256sums=('d63c1681da7fa16a0385c64dd93af71ae4ad17fb2a0b112ddfa1aa5232a27596'
+sha256sums=('447f65ceb22a40717656d3d708d16ad450802298d783b23004b6e8d3c8d7da85'
'2e10ba71fd9ba40afd7e9492b2fc0d5bcc27874bcde543cfd8a47ad20c52354a'
'6acb07393105ddced8a4c3c869a596350d1a7d81a808ca5307d2ad770653a9d3'
'e28c40eb844105154fa6106f5b4de3151a22805b3a7b2f84be9ea6c15cec3de6'
diff --git a/community/clearsilver/PKGBUILD b/community/clearsilver/PKGBUILD
index d2863b6ec..3b9f09e1e 100644
--- a/community/clearsilver/PKGBUILD
+++ b/community/clearsilver/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100518 2013-11-05 11:31:11Z spupykin $
+# $Id: PKGBUILD 102895 2013-12-23 15:16:31Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer : Aaron Griffin <aaron@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=clearsilver
pkgver=0.10.5
-pkgrel=11
+pkgrel=12
pkgdesc="clearsilver is a fast, powerful, and language-neutral HTML template system"
arch=('i686' 'x86_64' 'mips64el')
url='http://www.clearsilver.net'
@@ -17,12 +17,8 @@ source=("http://www.clearsilver.net/downloads/$pkgname-$pkgver.tar.gz"
md5sums=('b8c0c7fbe0ef5e06e0c935f134304d44'
'd9db4e5985254e1b0d63e9ff042773f4')
-build()
-{
+prepare() {
cd $srcdir/$pkgname-$pkgver
-
- ./configure --disable-csharp --prefix=/usr --with-python=/usr/bin/python2
-
sed -i "s@/usr/local/bin/python@/usr/bin/env python2@g" scripts/document.py
sed -i "s@install.rb install@install.rb install --prefix=$pkgdir@g" ruby/Makefile
patch -p1 <$srcdir/clearsilver-ruby-1.9.patch
@@ -36,7 +32,12 @@ build()
> versite = subprefix.call(c['vendorlibdir'])
> sodir = subprefix.call(c['vendorarchdir'])
EOF
+ sed -i 's|LIBRARIES = inserted + LIBRARIES|LIBRARIES = LIBRARIES + inserted|' python/setup.py
+}
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --disable-csharp --prefix=/usr --with-python=/usr/bin/python2
make
}
diff --git a/community/clinica/PKGBUILD b/community/clinica/PKGBUILD
deleted file mode 100644
index 2ac7218f2..000000000
--- a/community/clinica/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 94204 2013-07-16 17:21:04Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Gianmarco Brocchi <gianmarcobrocchi@gmail.com>
-
-pkgname=clinica
-pkgver=0.3.0
-pkgrel=1
-pkgdesc="Simple medical records manager"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/clinica-project"
-license=('GPL3')
-depends=('libgee06' 'libpeas' 'jansson' 'libsoup' 'librsvg' 'yelp')
-makedepends=('cmake' 'vala' 'intltool')
-optdepends=('python2-gobject: for Agenzia del Farmaco plugin')
-install=clinica.install
-options=('!makeflags')
-source=("https://launchpad.net/clinica-project/stable/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('dae10a4e10c7d148f05ae56d1b0ae47d')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i -e "s:-Werror=format-security:-Wformat -Werror=format-security:g" CMakeLists.txt
- sed -i 's@^#!.*python$@#!/usr/bin/python2@' plugins/AgenziaDelFarmaco.py
- sed -i -e "s:Application;GTK;:Office;GTK;:g" data/clinica.desktop
-
- mkdir build
- cd build
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DGSETTINGS_COMPILE=OFF \
- -DGSETTINGS_COMPILE_IN_PLACE=OFF \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON ..
-
- LC_ALL=C LANG=C make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}/build"
-
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD
index 4cdd8fddf..fe480af51 100644
--- a/community/codeblocks/PKGBUILD
+++ b/community/codeblocks/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 99714 2013-10-30 23:12:02Z allan $
+# $Id: PKGBUILD 103157 2013-12-28 06:25:03Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Robert Hollencamp <rhollencamp@gmail.com>
# Contributor: Daniel J Griffiths <griffithsdj@inbox.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=codeblocks
-pkgver=12.11
-pkgrel=4
+pkgver=13.12
+pkgrel=1
pkgdesc='Open source and cross-platform C/C++ IDE'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.codeblocks.org'
license=('GPL3')
depends=('boost-libs' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache'
- 'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk')
+ 'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk' 'libsm')
makedepends=('boost' 'zip')
install=codeblocks.install
source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}-1.tar.gz)
-md5sums=('4fa8980a8c578b8b5589fceb9b0890d6')
+md5sums=('4b450f620d9f1875ecf6882ab3c11402')
build() {
- cd $pkgname-${pkgver}release*
-
- LDFLAGS+=' -lX11'
+ cd $pkgname-$pkgver
./configure --prefix=/usr --with-contrib-plugins=all
make
}
package() {
- cd $pkgname-${pkgver}release*
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/community/confuse/PKGBUILD b/community/confuse/PKGBUILD
index a2c4d8586..b5952d2b5 100644
--- a/community/confuse/PKGBUILD
+++ b/community/confuse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99717 2013-10-30 23:13:11Z allan $
+# $Id: PKGBUILD 101339 2013-11-22 22:46:04Z ttoepper $
# Contributor : Ionut Biru <ibiru@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org>
@@ -6,7 +6,7 @@
pkgname=confuse
pkgver=2.7
-pkgrel=2.1
+pkgrel=3
pkgdesc="C-library for parsing configuration files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.nongnu.org/confuse"
diff --git a/community/connman/PKGBUILD b/community/connman/PKGBUILD
index 2434554df..4bf3244cc 100644
--- a/community/connman/PKGBUILD
+++ b/community/connman/PKGBUILD
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD 100369 2013-11-02 21:44:13Z dwallace $
+#$Id: PKGBUILD 102949 2013-12-24 22:58:06Z dwallace $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Lucas De Marchi <lucas.de.marchi@gmail.com>
pkgname=connman
-pkgver=1.19
+pkgver=1.20
pkgrel=1
pkgdesc="Wireless LAN network manager"
url="http://connman.net/"
@@ -17,7 +17,7 @@ optdepends=('bluez: Support for Bluetooth devices'
makedepends=('bluez' 'wpa_supplicant' 'openconnect' 'openvpn' 'ppp')
source=("http://www.kernel.org/pub/linux/network/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
'allow_group_network.diff')
-md5sums=('562181545fe04ec8442ab4774963154d'
+md5sums=('5e4c7b61321994a772ddccbb5835684d'
'a8d22ee089fb0ed725130d16ad393047')
prepare(){
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 3579c5c98..610f58c41 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99619 2013-10-30 16:13:52Z giovanni $
+# $Id: PKGBUILD 102097 2013-12-05 08:05:48Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: archtux <antonio.arias99999 at gmail.com>
pkgname=converseen
-pkgver=0.6.5
+pkgver=0.6.6
pkgrel=1
pkgdesc="The batch image converter and resizer"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp')
makedepends=('cmake')
install=converseen.install
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('7db27020d6071f73eea23655d5272055')
+md5sums=('500c5aedec23a13e119ad0ece1ebca1d')
build() {
cd "${srcdir}"
diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD
index 143bf1f9c..7d47045fc 100644
--- a/community/couchdb/PKGBUILD
+++ b/community/couchdb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99720 2013-10-30 23:14:13Z allan $
+# $Id: PKGBUILD 100600 2013-11-06 13:21:19Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
# Contributor: Michael Fellinger <m.fellinger@gmail.com>
pkgname=couchdb
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
arch=('i686' 'x86_64' 'mips64el')
url="http://couchdb.apache.org"
@@ -20,7 +20,7 @@ backup=('etc/couchdb/local.ini'
source=("http://www.eu.apache.org/dist/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc}
"couchdb.service"
"couchdb.tmpfiles")
-md5sums=('9d2ecad195f2991098a542a0904ec0a5'
+md5sums=('55a2f86469e0697817da8defee730f04'
'SKIP'
'8914a7ffc6745f94106d96206709acb4'
'1e254ebe32eeb061be64193bafa35dbf')
diff --git a/community/csfml/PKGBUILD b/community/csfml/PKGBUILD
index 498410736..b07e48861 100644
--- a/community/csfml/PKGBUILD
+++ b/community/csfml/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 95028 2013-08-03 22:28:51Z svenstaro $
+# $Id: PKGBUILD 103137 2013-12-27 11:10:36Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=csfml
pkgver=2.1
-pkgrel=1
+pkgrel=2
pkgdesc='C bindings for sfml'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.sfml-dev.org/'
license=('zlib')
-depends=("sfml=${pkgver}")
+depends=("sfml")
makedepends=('cmake' 'doxygen')
source=("${pkgname}-${pkgver}::https://github.com/LaurentGomila/CSFML/archive/${pkgver}.tar.gz")
md5sums=('960085220e6978c720a62b02cc4a2ec4')
diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD
index c31fc124f..744e10132 100644
--- a/community/dante/PKGBUILD
+++ b/community/dante/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100144 2013-11-01 20:22:44Z spupykin $
+# $Id: PKGBUILD 101630 2013-11-29 15:58:15Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Guillem Rieu <guillemr@gmx.net>
pkgname=dante
-pkgver=1.3.2
-pkgrel=6
+pkgver=1.4.0
+pkgrel=1
pkgdesc="SOCKS v4 and v5 compatible proxy server and client"
url="http://www.inet.no/dante"
arch=(i686 x86_64 'mips64el')
@@ -14,7 +14,7 @@ backup=('etc/socks.conf'
'etc/sockd.conf')
source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz
sockd.service)
-md5sums=('250c6456cd3fefa17f07fa80c9ccf6bd'
+md5sums=('c117a3ce25afb936f13b76f1d2524879'
'9bb18a0165764092bd01da0ff6303fbf')
build() {
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index af3e661c7..e3181d4ed 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99723 2013-10-30 23:19:15Z allan $
+# $Id: PKGBUILD 103146 2013-12-27 15:54:52Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Christian Himpel <chressie at gmail dot com>
# Contributor: Johannes Hanika <hanatos at gmail dot com>
pkgname=darktable
-pkgver=1.2.3
-_pkgver=1.2
+pkgver=1.4
+_pkgver=1.4
pkgrel=1
pkgdesc="Utility to organize and develop raw images"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ makedepends=('intltool>=0.40' 'cmake' 'librsvg')
optdepends=('librsvg')
install=darktable.install
source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz)
-md5sums=('7eaa89aa5257b5f61cc7462db08ce164')
+md5sums=('896416931ded4579f528cd11edad470c')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/dart/PKGBUILD b/community/dart/PKGBUILD
index 7eb295604..d4ad316cc 100644
--- a/community/dart/PKGBUILD
+++ b/community/dart/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100438 2013-11-04 12:04:12Z arodseth $
+# $Id: PKGBUILD 100999 2013-11-14 15:05:53Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: T. Jameson Little <t.jameson.little at gmail dot com>
# Contributor: Usagi Ito <usagi@WonderRabbitProject.net>
@@ -6,51 +6,42 @@
# Contributor: Julien Nicoulaud <julien.nicoulaud@gmail.com>
pkgname=dart
-pkgver=0.8.7.0
-pkgrel=2
-pkgdesc='The dart programming language (includes SDK and editor)'
+pkgver=1.0
+pkgrel=1
+pkgdesc='The dart programming language SDK'
arch=('x86_64' 'i686')
url='http://www.dartlang.org/'
-license=('BSD' 'EPL')
-depends=('java-runtime' 'gtk2' 'desktop-file-utils' 'gconf')
-makedepends=('gendesk' 'setconf')
-backup=("opt/$pkgname/DartEditor.ini")
+license=('BSD')
+optdepends=('java-runtime: for dartanalyzer')
+makedepends=('setconf')
options=('!strip')
if [[ $CARCH == x86_64 ]]; then
- source=("https://storage.googleapis.com/dart-editor-archive-integration/latest/darteditor-linux-64.zip"
- 'darteditor.png::https://www.dartlang.org/tools/images/dart-logo-48.png')
- sha256sums=('230d53fc95f873e4d2e7cd2377706693196dbfc154c80493d57cf409d2908d72'
- 'd90f14b0cfa2dd36502ed5e5854466d54c8d0cf0ac9a5d9ec823274c1a33a00e')
+ source=("http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip"
+ "license.html::https://code.google.com/intl/no/google_bsd_license.html")
+ sha256sums=('9bc14660399c3570fddd262eb9aa11b3e6e19b7a3c547d3b10d60ad905c52c9b'
+ 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
else
- source=("https://storage.googleapis.com/dart-editor-archive-integration/latest/darteditor-linux-32.zip"
- 'darteditor.png::https://www.dartlang.org/tools/images/dart-logo-48.png')
- sha256sums=('4752ad56ca58611cf67474d3ebb979a2e5f26e477a3c508cf5847c7207e837a1'
- 'd90f14b0cfa2dd36502ed5e5854466d54c8d0cf0ac9a5d9ec823274c1a33a00e')
+ source=("http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-ia32-release.zip"
+ "license.html::https://code.google.com/intl/no/google_bsd_license.html")
+ sha256sums=('131afed9a220b2035375aee71e6b791248e6de51ee2612a21be3f6797e5bbfe6'
+ 'de16a5ac94310b1bdfc27a2a6d620531172bb31af894caeced37af41fb8e2650')
fi
prepare() {
# Fix permissions
- find "$pkgname" -type d -exec chmod 0755 '{}' + \
+ find "$pkgname-sdk" -type d -exec chmod 0755 '{}' + \
-or -type f -exec chmod 0644 '{}' +
- chmod +x "$pkgname/DartEditor"
- chmod +x "$pkgname/dart-sdk/bin/"*
-
- # Remove Dartium (takes 309,31 MB, available in the dartium-bin package on AUR)
- rm -r "$pkgname/chromium"
-
- # Prepare a desktop shortcut
- gendesk -n -f --pkgname 'darteditor' --name 'Dart Editor' \
- --exec 'darteditor %U' --pkgdesc 'Editor for the dart programming language'
+ chmod +x "$pkgname-sdk/bin/"*
# Fix paths
- cd "$pkgname/dart-sdk/bin"
- setconf dart2js BIN_DIR "/opt/$pkgname/dart-sdk/bin"
- setconf dart2js PROG_NAME "/opt/$pkgname/dart-sdk/bin/dart2js"
- setconf dartanalyzer SCRIPT_DIR "/opt/$pkgname/dart-sdk/bin"
- setconf dartdoc BIN_DIR "/opt/$pkgname/dart-sdk/bin"
- setconf pub BIN_DIR "/opt/$pkgname/dart-sdk/bin"
- setconf pub SDK_DIR "/opt/$pkgname/dart-sdk"
+ cd "$pkgname-sdk/bin"
+ setconf dart2js BIN_DIR "/opt/$pkgname-sdk/bin"
+ setconf dart2js PROG_NAME "/opt/$pkgname-sdk/bin/dart2js"
+ setconf dartanalyzer SCRIPT_DIR "/opt/$pkgname-sdk/bin"
+ setconf dartdoc BIN_DIR "/opt/$pkgname-sdk/bin"
+ setconf pub BIN_DIR "/opt/$pkgname-sdk/bin"
+ setconf pub SDK_DIR "/opt/$pkgname-sdk/"
# Fix missing "fi" and missing newline
echo -e "fi\n" >> pub
@@ -58,28 +49,24 @@ prepare() {
package() {
# Create directories
- install -d "$pkgdir"{"/opt/$pkgname",/usr/{bin,"share/doc/$pkgname"}}
+ install -d "$pkgdir"{"/opt/$pkgname-sdk",/usr/{bin,"share/doc/$pkgname-sdk"}}
# Package the files
- cp -a dart/* "$pkgdir/opt/$pkgname/"
+ cp -a "$pkgname-sdk/"* "$pkgdir/opt/$pkgname-sdk/"
# Set up symbolic links for the executables
for f in dart dart2js dartanalyzer dartdoc pub; do
- ln -s "/opt/$pkgname/dart-sdk/bin/$f" "$pkgdir/usr/bin/$f"
+ ln -s "/opt/$pkgname-sdk/bin/$f" "$pkgdir/usr/bin/$f"
done
- ln -s "/opt/$pkgname/DartEditor" "$pkgdir/usr/bin/darteditor"
# Package samples and documentation
for f in samples about.html about_files; do
- echo mv "$pkgdir/opt/$pkgname/$f" "$pkgdir/usr/share/doc/$pkgname/"
+ echo mv "$pkgdir/opt/$pkgname-sdk/$f" "$pkgdir/usr/share/doc/$pkgname/"
done
- # Set up a symbolic link for the configuration
- echo ln -s "/opt/$pkgname/DartEditor.ini" "$pkgdir/etc/darteditor.ini"
-
- # Package desktop shortcut and icon
- install -Dm644 'darteditor.desktop' "$pkgdir/usr/share/applications/$pkgname.desktop"
- install -Dm644 'darteditor.png' "$pkgdir/usr/share/pixmaps/darteditor.png"
+ # BSD License
+ install -Dm644 license.html \
+ "$pkgdir/usr/share/licenses/$pkgname/license.html"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD
index a53ba5c49..388b6a5db 100644
--- a/community/dbmail/PKGBUILD
+++ b/community/dbmail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99724 2013-10-30 23:19:36Z allan $
+# $Id: PKGBUILD 102778 2013-12-19 17:41:26Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com>
pkgname=dbmail
-pkgver=3.1.7
-pkgrel=4
+pkgver=3.1.8
+pkgrel=2
pkgdesc="Fast and scalable sql based mail services"
arch=('i686' 'x86_64' 'mips64el')
depends=('gmime' 'libzdb' 'mhash' 'libevent')
@@ -26,19 +26,16 @@ source=("dbmail-$pkgver::git://git.subdir.eu/paul/dbmail#branch=dbmail_3_1"
"dbmail-lmtpd.xinetd"
"dbmail-pop3d.xinetd"
"dbmail-timsieved.xinetd"
- "dbmail-6-sieve.patch::http://git.dbmail.eu/paul/dbmail/patch/?id=92b98094a01eda5efe3ba3080e529482d08945a2"
"dbmail-7-systemd.diff")
md5sums=('SKIP'
'890de13361afbdf4fed12d6d7eb53e66'
'961593658cd596297d03d25eb9c9e98f'
'4cb764894abd3914802e90602bf90a0c'
'e78dc86355f9aaf24590bc7c6611162f'
- 'b1063893dd0e74bc0ddee454bb65bf01'
'a781a4ebe2dd75ed635c9b4a239b38d8')
prepare() {
cd $srcdir/dbmail-${pkgver}/
- patch -p1 <$srcdir/dbmail-6-sieve.patch
patch -Rp1 <$srcdir/dbmail-7-systemd.diff
aclocal
automake --add-missing
diff --git a/community/dd_rescue/PKGBUILD b/community/dd_rescue/PKGBUILD
new file mode 100644
index 000000000..05f098682
--- /dev/null
+++ b/community/dd_rescue/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 100624 2013-11-06 14:17:22Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Zerial <fernando@zerial.org>
+# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
+# Contributor: Jose Riha <jose1711 gmail com>
+
+pkgname=dd_rescue
+pkgver=1.40
+pkgrel=2
+pkgdesc="A dd version that is very useful for data-recovery"
+url="http://www.garloff.de/kurt/linux/ddrescue/"
+license=("GPL")
+depends=('glibc')
+arch=('x86_64' 'i686')
+source=("http://www.garloff.de/kurt/linux/ddrescue/$pkgname-${pkgver}.tar.gz")
+md5sums=('690bc25884272461d994aca10f620b98')
+
+build() {
+ cd $pkgname
+ make
+}
+
+package() {
+ cd $pkgname
+ make DESTDIR="$pkgdir" INSTALLDIR="$pkgdir/usr/bin" install
+}
diff --git a/community/deadbeef/PKGBUILD b/community/deadbeef/PKGBUILD
index d52881653..817547e0b 100644
--- a/community/deadbeef/PKGBUILD
+++ b/community/deadbeef/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99725 2013-10-30 23:19:58Z allan $
+# $Id: PKGBUILD 103173 2013-12-28 18:20:21Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Alexey Yakovenko <waker@users.sourceforge.net>
pkgname=deadbeef
-pkgver=0.5.6
-pkgrel=2
-pkgdesc='An audio player for GNU/Linux based on GTK2.'
+pkgver=0.6.0
+pkgrel=1
+pkgdesc='A GTK+ audio player for GNU/Linux.'
arch=('i686' 'x86_64' 'mips64el')
url='http://deadbeef.sourceforge.net'
license=('GPL2')
@@ -31,12 +31,12 @@ optdepends=('libsamplerate: for Resampler plugin'
'libzip: for vfs_zip plugin')
install='deadbeef.install'
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('26b6036ca7e59c88267d3de4f42c4d01')
+md5sums=('f1bbb1a0164ed7bcba9c0c8cd1dddcb5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --disable-ffmpeg --enable-gtk3
+ ./configure --prefix=/usr --enable-gtk3
make
}
diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
deleted file mode 100644
index db1c79638..000000000
--- a/community/deadbeef/deadbeef-0.5.1-ffmpeg-AV_VERSION_INT.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 2bb5828e58fa8c187377f8ba75f8eb73a53ed7ca Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Mon, 4 Jul 2011 16:47:25 +0400
-Subject: [PATCH 1/2] ffmpeg: define fallback macro AV_VERSION_INT()
-
-For ffmpeg < 0.5. Copied from libavutil 0.5.
-
-ffmpeg: don't use deprecated CODEC_TYPE_AUDIO with new lavc
-
-fixes build with lavc 53.
-
-ffmpeg: fix erroneous version comparisons
-
-Comparing versions this way: (x.y < x1.y1) is obviously equivalent to
-(x < x1 || (x == x1 && y < y1)), not to (x <= x1 && y < y1).
-
-ffmpeg: use av_register_protocol2() if available
-
-fixes usage with ffmpeg-0.8
----
- plugins/ffmpeg/ffmpeg.c | 37 ++++++++++++++++++++++++++++++-------
- 1 files changed, 30 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index cd7edf4..0cb9955 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -44,6 +44,10 @@
- #define av_register_protocol register_protocol
- #endif
-
-+#ifndef AV_VERSION_INT
-+#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-+#endif
-+
- #endif
-
- //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
-@@ -140,7 +144,12 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_playItem_t *it) {
- for (i = 0; i < info->fctx->nb_streams; i++)
- {
- info->ctx = info->fctx->streams[i]->codec;
-- if (info->ctx->codec_type == CODEC_TYPE_AUDIO)
-+ if (info->ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ AVMEDIA_TYPE_AUDIO)
-+#else
-+ CODEC_TYPE_AUDIO)
-+#endif
- {
- info->codec = avcodec_find_decoder (info->ctx->codec_id);
- if (info->codec != NULL) {
-@@ -279,10 +288,10 @@ ffmpeg_read (DB_fileinfo_t *_info, char *bytes, int size) {
- int out_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
- int len;
- //trace ("in: out_size=%d(%d), size=%d\n", out_size, AVCODEC_MAX_AUDIO_FRAME_SIZE, size);
--#if (LIBAVCODEC_VERSION_MAJOR <= 52) && (LIBAVCODEC_VERSION_MINOR <= 25)
-- len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
--#else
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,25,0)
- len = avcodec_decode_audio3 (info->ctx, (int16_t *)info->buffer, &out_size, &info->pkt);
-+#else
-+ len = avcodec_decode_audio2 (info->ctx, (int16_t *)info->buffer, &out_size, info->pkt.data, info->pkt.size);
- #endif
- trace ("out: out_size=%d, len=%d\n", out_size, len);
- if (len <= 0) {
-@@ -418,7 +427,7 @@ static const char *map[] = {
-
- static int
- ffmpeg_read_metadata_internal (DB_playItem_t *it, AVFormatContext *fctx) {
--#if LIBAVFORMAT_VERSION_MAJOR <= 52 && LIBAVFORMAT_VERSION_MINOR < 43
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(52,43,0)
- if (!strlen (fctx->title)) {
- // title is empty, this call will set track title to filename without extension
- deadbeef->pl_add_meta (it, "title", NULL);
-@@ -490,7 +499,12 @@ ffmpeg_insert (ddb_playlist_t *plt, DB_playItem_t *after, const char *fname) {
- for (i = 0; i < fctx->nb_streams; i++)
- {
- ctx = fctx->streams[i]->codec;
-- if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+ if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ AVMEDIA_TYPE_AUDIO)
-+#else
-+ CODEC_TYPE_AUDIO)
-+#endif
- {
- codec = avcodec_find_decoder(ctx->codec_id);
- if (codec != NULL && !strcasecmp (codec->name, "alac")) { // only open alac streams
-@@ -704,7 +718,11 @@ ffmpeg_start (void) {
- ffmpeg_init_exts ();
- avcodec_init ();
- av_register_all ();
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
-+#else
- av_register_protocol (&vfswrapper);
-+#endif
- return 0;
- }
-
-@@ -745,7 +763,12 @@ ffmpeg_read_metadata (DB_playItem_t *it) {
- for (i = 0; i < fctx->nb_streams; i++)
- {
- ctx = fctx->streams[i]->codec;
-- if (ctx->codec_type == CODEC_TYPE_AUDIO)
-+ if (ctx->codec_type ==
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+ AVMEDIA_TYPE_AUDIO)
-+#else
-+ CODEC_TYPE_AUDIO)
-+#endif
- {
- codec = avcodec_find_decoder(ctx->codec_id);
- if (codec != NULL)
---
-1.7.8.4
-
diff --git a/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch b/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
deleted file mode 100644
index af8c282c0..000000000
--- a/community/deadbeef/deadbeef-0.5.1-ffmpeg-version-check-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9cbd09b81028679a507f751c206e8f6769fd450c Mon Sep 17 00:00:00 2001
-From: Igor Murzov <e-mail@date.by>
-Date: Thu, 7 Jul 2011 22:31:44 +0400
-Subject: [PATCH 2/2] ffmpeg: version check fix
-
----
- plugins/ffmpeg/ffmpeg.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/plugins/ffmpeg/ffmpeg.c b/plugins/ffmpeg/ffmpeg.c
-index 0cb9955..37c7e80 100644
---- a/plugins/ffmpeg/ffmpeg.c
-+++ b/plugins/ffmpeg/ffmpeg.c
-@@ -718,7 +718,7 @@ ffmpeg_start (void) {
- ffmpeg_init_exts ();
- avcodec_init ();
- av_register_all ();
--#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
-+#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 69, 0)
- av_register_protocol2 (&vfswrapper, sizeof(vfswrapper));
- #else
- av_register_protocol (&vfswrapper);
---
-1.7.8.4
-
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index 3d1ca4431..d61e565dc 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 99727 2013-10-30 23:20:50Z allan $
+# $Id: PKGBUILD 102121 2013-12-05 14:32:13Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
# Contributor: Gnud <ach.gnud@gmail.com>
pkgname=denemo
-pkgver=1.0.4
+pkgver=1.1.0
pkgrel=1
pkgdesc="A music score editor"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.denemo.org"
license=('GPL')
depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw'
- 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi')
+ 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi'
+ 'rubberband')
makedepends=('intltool')
backup=('etc/denemo/denemo.conf')
source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1d633ad7741ab12dab865219a20559f0')
+md5sums=('5e708247b2abd9b3b196e8e2e033bf11')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/desmume/PKGBUILD b/community/desmume/PKGBUILD
index 9edb3900b..f39c822f9 100644
--- a/community/desmume/PKGBUILD
+++ b/community/desmume/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89975 2013-05-06 15:32:51Z schuay $
+# $Id: PKGBUILD 101801 2013-12-01 11:51:18Z schuay $
# Maintainer: schuay <jakob.gruber@gmail.com>
# Contributor: Jonathan Conder <jonno dot conder at gmail dot com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
@@ -12,21 +12,24 @@
# Contributor: Asher256 <achrafcherti at gmail dot com>
pkgname=desmume
-pkgver=0.9.9
+pkgver=0.9.10
pkgrel=2
pkgdesc="Nintendo DS emulator"
arch=('i686' 'x86_64' 'mips64el')
url="http://desmume.org/"
license=('GPL')
-depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap'
- 'soundtouch' 'alsa-lib' 'zziplib' 'glu')
+depends=('desktop-file-utils' 'libpcap' 'soundtouch' 'alsa-lib' 'glu' 'sdl' 'gtk2' 'zziplib')
makedepends=('intltool' 'mesa')
install=desmume.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.tar"
+ "glx_3Demu.patch")
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # http://sourceforge.net/p/desmume/code/4907/
+ patch -Np2 < "$srcdir"/glx_3Demu.patch
+
# See https://bugs.archlinux.org/task/35086 and
# https://sourceforge.net/tracker/?func=detail&aid=3612768&group_id=164579&atid=832291
sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in
@@ -41,4 +44,5 @@ package() {
make DESTDIR="$pkgdir/" install
}
-md5sums=('458b5f8b3dbb38a47e6d0518f97aa82a')
+md5sums=('a6aedfe5d6437d481aa9ac5fb5aebbea'
+ '352ea0ffa109f68da2fb79f30d2c85e2')
diff --git a/community/desmume/glx_3Demu.patch b/community/desmume/glx_3Demu.patch
new file mode 100644
index 000000000..a47342595
--- /dev/null
+++ b/community/desmume/glx_3Demu.patch
@@ -0,0 +1,25 @@
+--- src/desmume-0.9.10/src/gtk/glx_3Demu.cpp 2013-11-28 01:36:53.712615822 +0100
++++ glx_3Demu.cpp 2013-11-28 22:08:52.762390897 +0100
+@@ -41,11 +41,7 @@
+ glXDestroyContext(dpy, ctx);
+
+ XCloseDisplay(dpy);
+-
+- return true;
+ }
+-
+- return false;
+ }
+
+ int init_glx_3Demu(void)
+--- src/desmume-0.9.10/src/gtk/glx_3Demu.cpp 2013-11-28 01:36:53.712615822 +0100
++++ glx_3Demu.cpp 2013-11-28 22:14:34.529740137 +0100
+@@ -31,7 +31,7 @@
+ static GLXContext ctx;
+ static GLXPbuffer pbuf;
+
+-void deinit_glx_3Demu(void)
++int deinit_glx_3Demu(void)
+ {
+ Display *dpy = glXGetCurrentDisplay();
+
diff --git a/community/dietlibc/PKGBUILD b/community/dietlibc/PKGBUILD
index 4c93f57be..55bedd6e1 100644
--- a/community/dietlibc/PKGBUILD
+++ b/community/dietlibc/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 100146 2013-11-01 20:23:04Z spupykin $
+# $Id: PKGBUILD 100866 2013-11-12 15:53:53Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Tino Reichardt <milky-archlinux@mcmilk.de>
pkgname=dietlibc
pkgver=0.33
-pkgrel=2
+pkgrel=3
pkgdesc="a libc optimized for small size"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.fefe.de/dietlibc/"
license=("GPL")
+options=('staticlibs')
#source=(http://www.kernel.org/pub/linux/libs/dietlibc/$pkgname-$pkgver.tar.bz2)
source=("http://www.fefe.de/dietlibc/dietlibc-$pkgver.tar.bz2")
md5sums=('9d541b9a6623b04ec12e5248b82db7c0')
diff --git a/extra/diffstat/PKGBUILD b/community/diffstat/PKGBUILD
index 0caa7aecf..701b9c9d5 100644
--- a/extra/diffstat/PKGBUILD
+++ b/community/diffstat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198590 2013-10-30 15:58:57Z giovanni $
+# $Id: PKGBUILD 102318 2013-12-08 09:22:50Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Matthias-Christian Ott <matthias.christian.at.tiscali.de>
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index 72037c483..f1d7b0640 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98383 2013-10-09 11:50:00Z dicebot $
+# $Id: PKGBUILD 100583 2013-11-06 11:18:29Z dicebot $
# Maintainer: Mihails Strasunse <public@dicebot.lv>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
@@ -9,21 +9,19 @@
pkgname=('dmd' 'libphobos-devel' 'libphobos' 'dtools')
groups=('dlang' 'dlang-dmd')
pkgbase=dmd
-pkgver=2.063.2
-pkgrel=4
+pkgver=2.064.2
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.dlang.org"
makedepends=('git' 'gcc' 'make')
source=("git+http://github.com/D-Programming-Language/dmd.git#tag=v$pkgver"
"git+http://github.com/D-Programming-Language/druntime.git#tag=v$pkgver"
"git+http://github.com/D-Programming-Language/phobos.git#tag=v$pkgver"
- "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver"
- "soname.diff")
+ "git+http://github.com/D-Programming-Language/tools#tag=v$pkgver")
sha1sums=('SKIP'
'SKIP'
'SKIP'
- 'SKIP'
- '5a2198e8a024e1e6494034da569f0df18fabcf9d')
+ 'SKIP')
[[ $CARCH == "x86_64" ]] && _archbits="64"
[[ $CARCH == "i686" ]] && _archbits="32"
@@ -36,8 +34,6 @@ build() {
make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1
cd $srcdir/phobos
- # will be in upstream in next release but making naming change as early as possible
- git apply $srcdir/soname.diff
make -f posix.mak MODEL=$_archbits DMD=$srcdir/dmd/src/dmd RELEASE=1
cd $srcdir/tools
@@ -82,6 +78,7 @@ package_dmd() {
package_libphobos-devel() {
pkgdesc="The Phobos standard library for D programming language. Modules and static library."
depends=("dmd")
+ options=("staticlibs")
provides=("d-runtime=$pkgver" "d-stdlib=$pkgver")
license=("custom")
@@ -123,5 +120,5 @@ package_dtools() {
ln -s dtools-dustmite usr/bin/dustmite
# same Boost license as Phobos
- install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE-phobos
+ install -Dm644 $srcdir/phobos/LICENSE_1_0.txt usr/share/licenses/$pkgname/LICENSE
}
diff --git a/community/dmd/soname.diff b/community/dmd/soname.diff
deleted file mode 100644
index 7d155a52a..000000000
--- a/community/dmd/soname.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/posix.mak b/posix.mak
-index 8fd953e..3776bb4 100644
---- a/posix.mak
-+++ b/posix.mak
-@@ -153,8 +153,8 @@ DDOC=$(DMD)
- VERSION=../dmd/VERSION
-
- # Set SONAME, the name of the shared library.
--# The awk script will produce the last 2 digits of the version string, i.e. 2.063 produces 63
--SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$NF + 0 }' $(VERSION))
-+# The awk script will return the second group without leading zeros of the version string, i.e. 2.063.2 produces 63
-+SONAME = libphobos2.so.0.$(shell awk -F. '{ print $$2 + 0 }' $(VERSION))
-
- # Set LIB, the ultimate target
- ifeq (,$(findstring win,$(OS)))
diff --git a/community/dnscrypt-proxy/PKGBUILD b/community/dnscrypt-proxy/PKGBUILD
index 8fc4d9fcc..be3e273d3 100644
--- a/community/dnscrypt-proxy/PKGBUILD
+++ b/community/dnscrypt-proxy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97435 2013-09-20 02:21:56Z fyan $
+# $Id: PKGBUILD 101137 2013-11-18 07:26:01Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Techlive Zheng <techlivezheng at gmail dot com>
# Contributor: peace4all <markspost at rocketmail dot com>
pkgname=dnscrypt-proxy
pkgver=1.3.3
-pkgrel=2
+pkgrel=3
pkgdesc="A tool for securing communications between a client and a DNS resolver"
arch=('i686' 'x86_64')
url="http://dnscrypt.org/"
@@ -17,13 +17,13 @@ source=(http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2
backup=(etc/conf.d/dnscrypt-proxy)
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
CFLAGS="$CFLAGS -fPIC" ./configure --prefix=/usr --sbindir=/usr/bin
make -j2
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/{usr/share/{licenses,doc}/$pkgname,etc/conf.d,usr/lib/systemd/system}
@@ -31,9 +31,8 @@ package() {
install -m 644 AUTHORS NEWS README README.markdown "$pkgdir"/usr/share/doc/$pkgname
install -m 644 "$srcdir"/conf.d.file "$pkgdir"/etc/conf.d/$pkgname
install -m 644 "$srcdir"/dnscrypt-proxy.service "$pkgdir"/usr/lib/systemd/system
- rm -rf "$pkgdir"/usr/{lib/*.{l,}a,include}
}
sha512sums=('c8e9484485f060aa90a36ef097506b1042348c85b74d0e5bfdeefa8bf8f80e42ae79d4568f524bb6de0754b125ed4f4b39a177f6fdee9e4616e7d0c3641aec0b'
- '2271eab1baf1a7192a8daaa1b271c24a3a3fa498432ac99c2e4fb3c939590f09aab582427ae874fce7969ece365ccb7a2e946566e5a0c650d93c34d23b536b61'
- 'bfff47fc9a515a26d835e08dfeeffba07ff66b09fd887df6c961802c2f8d584f9cd05e83bdcd7ccc274215744e4a05a328aec96152dee70e2fdfe12e12b390d3')
+ '26e5ce3198c25ff25542dc399f2bb5467ac349dbc11c2ebd6d3ba978ffaef09607088d9401e62ba33c6f50b8b29a59f56fe97d964f55e63ee9d8ca23862c3e00'
+ '9a1072f83e83e55dcdd7b80d1943f60963fa240da8a50d7491cc219797c6b85b8d79d087c0f7bb9766a4d467dec58eaae2bef31b759652545ace65a6a8afb608')
diff --git a/community/dnscrypt-proxy/conf.d.file b/community/dnscrypt-proxy/conf.d.file
index fae760f21..32be16a16 100644
--- a/community/dnscrypt-proxy/conf.d.file
+++ b/community/dnscrypt-proxy/conf.d.file
@@ -1,3 +1,7 @@
DNSCRYPT_LOCALIP=127.0.0.1
DNSCRYPT_LOCALPORT=53
DNSCRYPT_USER=nobody
+DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.opendns.com
+DNSCRYPT_PROVIDER_KEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79
+DNSCRYPT_RESOLVERIP=208.67.220.220
+DNSCRYPT_RESOLVERPORT=443
diff --git a/community/dnscrypt-proxy/dnscrypt-proxy.service b/community/dnscrypt-proxy/dnscrypt-proxy.service
index 5d38fd908..200090c5a 100644
--- a/community/dnscrypt-proxy/dnscrypt-proxy.service
+++ b/community/dnscrypt-proxy/dnscrypt-proxy.service
@@ -8,6 +8,9 @@ After=network.target
EnvironmentFile=/etc/conf.d/dnscrypt-proxy
ExecStart=/usr/bin/dnscrypt-proxy \
--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
+ --resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
+ --provider-name=${DNSCRYPT_PROVIDER_NAME} \
+ --provider-key=${DNSCRYPT_PROVIDER_KEY} \
--user=${DNSCRYPT_USER}
Restart=on-abort
diff --git a/community/docbook2x/PKGBUILD b/community/docbook2x/PKGBUILD
index f79fa2062..ac94e850a 100644
--- a/community/docbook2x/PKGBUILD
+++ b/community/docbook2x/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 67604 2012-03-13 14:04:01Z spupykin $
+# $Id: PKGBUILD 101319 2013-11-22 17:09:45Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
@@ -17,18 +17,24 @@ source=(http://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
md5sums=('b9b76a6af198c4f44574cfd17a322f01'
'826fae88a435d9278c4f9614991d55a1')
-build() {
+prepare() {
cd $srcdir/docbook2X-$pkgver
patch -p1 <$srcdir/datadir.diff
+ sed -e 's/AM_CONFIG_HEADER(/AC_CONFIG_HEADERS(/' -i configure.ac
+}
- autoreconf
+build() {
+ cd $srcdir/docbook2X-$pkgver
+ autoreconf -i -f
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
--program-transform-name 's,2x-,2,' \
-
make
+}
+package() {
+ cd $srcdir/docbook2X-$pkgver
make DESTDIR=$pkgdir install
install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/license
sed -i 's|http://docbook2x.sf.net/latest|/usr/share/docbook2X|g' \
diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD
new file mode 100644
index 000000000..9215782e4
--- /dev/null
+++ b/community/docker/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 102652 2013-12-17 09:06:19Z seblu $
+# Maintainer: Sébastien "Seblu" Luttringer
+
+pkgname=docker
+pkgver=0.7.2
+pkgrel=1
+epoch=1
+pkgdesc='Pack, ship and run any application as a lightweight container'
+arch=('x86_64')
+url='http://www.docker.io/'
+license=('Apache')
+depends=('bridge-utils' 'iproute2' 'device-mapper' 'lxc' 'sqlite' 'systemd')
+makedepends=('git' 'go')
+# don't strip binaries! A sha1 is used to check binary consistency.
+options=('!strip')
+install=$pkgname.install
+source=("git+https://github.com/dotcloud/docker.git#tag=v$pkgver")
+md5sums=('SKIP')
+# magic harcoded path
+_magic=src/github.com/dotcloud
+
+prepare() {
+ mkdir -p "$_magic"
+ ln -sfn "../../../docker" "$_magic/docker"
+}
+
+build() {
+ cd "$_magic/docker"
+ export GOPATH="$srcdir:$srcdir/$_magic/docker/vendor"
+ ./hack/make.sh dynbinary
+}
+
+check() {
+ cd "$_magic/docker"
+ # Will be added upstream soon
+ #./hack/make.sh dyntest
+}
+
+package() {
+ cd "$_magic/docker"
+ install -Dm755 "bundles/$pkgver/dynbinary/docker-$pkgver" "$pkgdir/usr/bin/docker"
+ install -Dm755 "bundles/$pkgver/dynbinary/dockerinit-$pkgver" "$pkgdir/usr/lib/docker/dockerinit"
+ # completion
+ install -Dm644 "contrib/completion/bash/docker" "$pkgdir/usr/share/bash-completion/completions/docker"
+ install -Dm644 "contrib/completion/zsh/_docker" "$pkgdir/usr/share/zsh/site-functions/_docker"
+ # systemd
+ install -Dm644 "contrib/init/systemd/docker.service" "$pkgdir/usr/lib/systemd/system/docker.service"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/docker/docker.install b/community/docker/docker.install
new file mode 100644
index 000000000..f730503de
--- /dev/null
+++ b/community/docker/docker.install
@@ -0,0 +1,18 @@
+# arg 1: the new package version
+post_install() {
+ # create docker group (FS#38029)
+ getent group docker >/dev/null || groupadd -g 142 docker
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+ (( $(vercmp $2 '1:0.7.1-1') < 0 )) && post_install "$1" || true
+}
+
+# arg 1: the old package version
+post_remove() {
+ groupdel docker >/dev/null 2>&1 || true
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/docker/docker.service b/community/docker/docker.service
new file mode 100644
index 000000000..b96d19ddb
--- /dev/null
+++ b/community/docker/docker.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Docker Application Container Engine
+Documentation=http://docs.docker.io
+After=network.target
+
+[Service]
+ExecStartPre=/usr/bin/mount --make-rprivate /
+ExecStart=/usr/bin/docker -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/dolphin-emu/Dolphin_Logo.png b/community/dolphin-emu/Dolphin_Logo.png
new file mode 100644
index 000000000..63450da00
--- /dev/null
+++ b/community/dolphin-emu/Dolphin_Logo.png
Binary files differ
diff --git a/community/dolphin-emu/PKGBUILD b/community/dolphin-emu/PKGBUILD
new file mode 100644
index 000000000..1dbe03bb0
--- /dev/null
+++ b/community/dolphin-emu/PKGBUILD
@@ -0,0 +1,43 @@
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Jeremy Newton (Mystro256)
+
+pkgname=dolphin-emu
+pkgver=4.0.2
+pkgrel=1
+epoch=1
+pkgdesc='A Gamecube / Wii / Triforce emulator'
+arch=('i686' 'x86_64')
+url='http://dolphin-emu.org'
+license=('GPL2')
+
+makedepends=('cmake' 'git' 'opencl-headers')
+depends=('bluez-libs' 'ffmpeg' 'glew' 'libao' 'miniupnpc' 'openal' 'portaudio' 'sdl2' 'soundtouch' 'wxgtk2.9')
+optdepends=('pulseaudio: PulseAudio backend')
+
+source=("${pkgname%-*}::git+https://code.google.com/p/dolphin-emu/#tag=${pkgver}"
+ 'dolphin-emu.desktop'
+ 'Dolphin_Logo.png')
+
+# TODO: Drop the custom icon and .desktop file, apparently dolphin ships these now.
+
+build() {
+ cd "${srcdir}/${pkgname%-*}"
+
+ mkdir build && cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-2.9
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname%-*}/build"
+
+ make DESTDIR=${pkgdir} install
+
+ install -Dm644 "${srcdir}/dolphin-emu.desktop" \
+ "${pkgdir}/usr/share/applications/dolphin-emu.desktop"
+ install -Dm644 "${srcdir}/Dolphin_Logo.png" "${pkgdir}/usr/share/pixmaps/dolphin-emu.png"
+}
+
+md5sums=('SKIP'
+ 'feed4580c2e6bfbc7f6c67dad861daae'
+ 'd15c51f547b4bd47e510faac40bcc9d6')
diff --git a/community/dolphin-emu/dolphin-emu.desktop b/community/dolphin-emu/dolphin-emu.desktop
new file mode 100644
index 000000000..96317d168
--- /dev/null
+++ b/community/dolphin-emu/dolphin-emu.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Dolphin
+Categories=Game;Emulator;GTK;
+GenericName=GameCube and Wii Emulator
+Comment=An emulator for the GameCube and Wii consoles
+Exec=dolphin-emu
+Icon=dolphin-emu
+StartupNotify=false
+Name[en_US]=Dolphin
diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD
index bad27de08..0e3ced5cc 100644
--- a/community/doublecmd/PKGBUILD
+++ b/community/doublecmd/PKGBUILD
@@ -1,13 +1,13 @@
# vim:set ft=sh:
-# $Id: PKGBUILD 99033 2013-10-22 19:21:49Z idevolder $
+# $Id: PKGBUILD 103165 2013-12-28 11:02:28Z idevolder $
# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
# Contributor: (sirocco AT ngs.ru)
pkgbase=doublecmd
pkgname=('doublecmd-gtk2' 'doublecmd-qt')
-pkgver=0.5.7
+pkgver=0.5.8
_helpver=0.5.5
-pkgrel=2
+pkgrel=1
url="http://doublecmd.sourceforge.net/"
arch=('i686' 'x86_64')
license=('GPL')
@@ -23,8 +23,6 @@ source=(
"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz"
"http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz"
)
-sha256sums=('8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343'
- '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
build() {
cp -a $pkgbase-$pkgver $pkgbase-gtk
@@ -72,3 +70,5 @@ package_doublecmd-qt() {
cp -a * "$pkgdir/usr/share/$pkgbase/doc/"
}
+sha256sums=('bfa85693b6cc06b7fd28ec8bd443ad9fb9d79d27a541e4f4d54bb9da2fb052ea'
+ '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
diff --git a/community/dstep/PKGBUILD b/community/dstep/PKGBUILD
new file mode 100644
index 000000000..cc1e93ea4
--- /dev/null
+++ b/community/dstep/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Dicebot <public@dicebot.lv>
+pkgname=dstep
+pkgver=0.1.0
+pkgrel=1
+pkgdesc="Automatic C header to D module translator"
+arch=('i686' 'x86_64')
+groups=('dlang')
+url="https://github.com/jacob-carlborg/dstep"
+license=('custom')
+depends=('clang')
+makedepends=('git' 'dmd' 'libphobos-devel' 'dtools')
+source=(
+ "git+https://github.com/jacob-carlborg/dstep.git#tag=v$pkgver"
+ "tango::git+https://github.com/SiegeLord/Tango-D2.git"
+ "http://www.boost.org/LICENSE_1_0.txt"
+)
+sha1sums=(
+ 'SKIP'
+ 'SKIP'
+ '3cba29011be2b9d59f6204d6fa0a386b1b2dbd90'
+)
+
+build ()
+{
+ cd $srcdir/tango
+ ARCH=$CARCH make -f build/Makefile
+
+ cd $srcdir/dstep
+ git submodule update --init --recursive
+ rdmd --build-only -debug -gc -ofbin/dstep -Idstack/mambo -Idstack -I$srcdir/tango -L-L$srcdir/tango -I/usr/include/dlang -L-lclang -L-ltango-dmd dstep/driver/DStep.d
+}
+
+package ()
+{
+ mkdir -p $pkgdir/usr/bin
+ install -m755 $srcdir/dstep/bin/dstep $pkgdir/usr/bin/dstep
+ mkdir -p $pkgdir/usr/share/licenses/$pkgname
+ install -m644 $srcdir/LICENSE_1_0.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt
+}
diff --git a/community/dub/PKGBUILD b/community/dub/PKGBUILD
index 94580a0c2..908b3c2d5 100644
--- a/community/dub/PKGBUILD
+++ b/community/dub/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Mihails Strasuns <public@dicebot.lv>
# Contributor: Moritz Maxeiner <moritz@ucworks.org>
pkgname=dub
-pkgver=0.9.19
-pkgrel=1
+pkgver=0.9.20
+pkgrel=2
pkgdesc="Developer package manager for D programming language"
arch=('i686' 'x86_64')
url="https://github.com/rejectedsoftware/dub"
@@ -16,9 +16,12 @@ sha256sums=('SKIP')
build()
{
cd "${srcdir}/${pkgname}"
+
+ echo Generating version file...
GITVER=$(git describe) || GITVER=unknown
echo "module dub.version_; enum dubVersion = \"$GITVER\";" > source/dub/version_.d
- dmd -ofbin/dub -g -debug -w -Isource -L-lcurl @build-files.txt
+
+ dmd -ofbin/dub -g -debug -w -version=DubUseCurl -Isource -L-lcurl @build-files.txt
}
package()
diff --git a/community/dvdisaster/PKGBUILD b/community/dvdisaster/PKGBUILD
index 6a6cda0f3..1deef5779 100644
--- a/community/dvdisaster/PKGBUILD
+++ b/community/dvdisaster/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 97061 2013-09-12 03:38:41Z eric $
+# $Id: PKGBUILD 101531 2013-11-27 02:32:12Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=dvdisaster
-pkgver=0.72.4
-pkgrel=2
+pkgver=0.72.5
+pkgrel=1
pkgdesc="Provides a margin of safety against data loss on CD and DVD media caused by aging or scratches"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.dvdisaster.com/"
license=('GPL')
-depends=('gtk2' 'hicolor-icon-theme')
+depends=('gtk2')
options=('!makeflags')
install=dvdisaster.install
-source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2{,.gpg})
-sha1sums=('2b47fb5a5535d90641f24a599cd8ae8ffd86b972'
- 'SKIP')
+source=(http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2
+ ${pkgname}-${pkgver}.tar.bz2.sig::http://dvdisaster.net/downloads/${pkgname}-${pkgver}.tar.bz2.gpg)
+sha1sums=('cc89c7eaf838ba1a88be4ed1a567276a911f76b0'
+ '7bffbbd282c009986938811ee6bd22d10b1a95f4')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/community/dvdrtools/PKGBUILD b/community/dvdrtools/PKGBUILD
deleted file mode 100644
index 6371ae6fc..000000000
--- a/community/dvdrtools/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 76869 2012-10-01 14:50:59Z bisson $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=dvdrtools
-pkgver=0.3.1
-pkgrel=3.1
-pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://savannah.nongnu.org/projects/dvdrtools/"
-license=('GPL')
-depends=('file' 'bash')
-makedepends=('transcode')
-optdepends=('transcode: video/DVD ripper and encoder for the terminal/console')
-conflicts=('cdrkit')
-source=(ftp://ftp.archlinux.org/other/dvdrtools/$pkgname-$pkgver.tar.gz)
-md5sums=('5707b7e877b853e258cd738938833006')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/extra/dvgrab/PKGBUILD b/community/dvgrab/PKGBUILD
index bda720c49..8010ba139 100644
--- a/extra/dvgrab/PKGBUILD
+++ b/community/dvgrab/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143735 2011-11-28 17:46:25Z giovanni $
+# $Id: PKGBUILD 102099 2013-12-05 09:01:04Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
diff --git a/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch b/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
deleted file mode 100644
index 9ce462240..000000000
--- a/community/dvtm/0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4ab5ed57a3b53e0271cf50f256cd7904c50cac55 Mon Sep 17 00:00:00 2001
-From: Douglas Jerome <douglas@ttylinux.org>
-Date: Wed, 15 May 2013 14:33:31 +0200
-Subject: [PATCH] Makefile: respect ${DESTDIR} in tic invocation
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ff85deb..eb849f4 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ install: dvtm
- @sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1
- @echo installing terminfo description
-- @tic -s dvtm.info
-+ @tic -o ${DESTDIR}/usr/share/terminfo -s dvtm.info
-
- uninstall:
- @echo removing executable file from ${DESTDIR}${PREFIX}/bin
---
-1.8.3.450.gf3f2a46
-
diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD
index 8ed499f09..56c5f9122 100644
--- a/community/dvtm/PKGBUILD
+++ b/community/dvtm/PKGBUILD
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD 92416 2013-06-04 19:05:34Z lfleischer $
+# $Id: PKGBUILD 103206 2013-12-30 02:12:50Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Giorgio Lando <patroclo7@gmail.com>
# Contributor: bender02 at gmx dot com
pkgname=dvtm
-pkgver=0.9
-pkgrel=2
+pkgver=0.10
+pkgrel=1
pkgdesc='Dynamic virtual terminal manager.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.brain-dump.org/projects/dvtm/'
license=('MIT')
depends=('ncurses')
source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'config.h'
- '0001-Makefile-respect-DESTDIR-in-tic-invocation.patch')
-md5sums=('7de1103abb0ca410f7250cf89f019a38'
- '41107e5e84a8572f70d6cb111b4e07f8'
- 'c85d8265ced45d014a7d3f05134bf6a1')
+ 'config.h')
+md5sums=('0c7167dc898df1693c20e2a34ba3e947'
+ '15dd5c17d39fca0e043577985ee1c6a6')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../0001-Makefile-respect-DESTDIR-in-tic-invocation.patch
-
cp "${srcdir}/config.h" .
sed -i 's/CFLAGS =/CFLAGS +=/' config.mk
}
diff --git a/community/dvtm/config.h b/community/dvtm/config.h
index 48367695a..727dce4c1 100644
--- a/community/dvtm/config.h
+++ b/community/dvtm/config.h
@@ -77,7 +77,6 @@ static Key keys[] = {
{ MOD, '8', { focusn, { "8" } } },
{ MOD, '9', { focusn, { "9" } } },
{ MOD, 'q', { quit, { NULL } } },
- { MOD, 'G', { escapekey, { NULL } } },
{ MOD, 'a', { togglerunall, { NULL } } },
{ MOD, 'r', { redraw, { NULL } } },
{ MOD, 'X', { lock, { NULL } } },
@@ -89,6 +88,7 @@ static Key keys[] = {
{ MOD, KEY_PPAGE, { scrollback, { "-1" } } },
{ MOD, KEY_NPAGE, { scrollback, { "1" } } },
{ MOD, KEY_F(1), { create, { "man dvtm", "dvtm help" } } },
+ { MOD, MOD, { send, { (const char []){MOD, 0} } } },
};
static const ColorRule colorrules[] = {
diff --git a/community/easystroke/PKGBUILD b/community/easystroke/PKGBUILD
index fac3b9565..d56928730 100644
--- a/community/easystroke/PKGBUILD
+++ b/community/easystroke/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=easystroke
pkgver=0.6.0
-pkgrel=3
+pkgrel=4
pkgdesc='Use mouse gestures to initiate commands and hotkeys.'
arch=('i686' 'x86_64' 'mips64el')
url='http://easystroke.sourceforge.net/'
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index 0593cca62..17260bbb5 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,36 +1,88 @@
-# $Id: PKGBUILD 93139 2013-06-25 15:54:26Z spupykin $
+# $Id: PKGBUILD 102533 2013-12-13 10:32:00Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
pkgname=ejabberd
-pkgver=2.1.13
+pkgver=13.12
pkgrel=1
pkgdesc="Jabber server written in Erlang"
arch=('x86_64' 'i686' 'mips64el')
url="http://www.ejabberd.im/"
license=("GPL")
-depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2')
-backup=('etc/ejabberd/ejabberd.cfg'
+depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2' 'erlang-unixodbc' 'libyaml')
+makedepends=('git' 'rebar')
+backup=('etc/ejabberd/ejabberd.yml'
'etc/ejabberd/ejabberdctl.cfg'
'etc/logrotate.d/ejabberd')
install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/v$pkgver.tar.gz"
+replaces=('ejabberd-mod_mysql' 'ejabberd-mod_mysql-svn'
+ 'ejabberd-mod_pgsql' 'ejabberd-mod_pgsql-svn')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/$pkgver.tar.gz"
+ "p1_cache_tab::git://github.com/processone/cache_tab"
+ "p1_tls::git://github.com/processone/tls"
+ "p1_stringprep::git://github.com/processone/stringprep"
+ "p1_xml::git://github.com/processone/xml"
+ "p1_yaml::git://github.com/processone/p1_yaml"
+ "git://github.com/rds13/xmlrpc"
+ "p1_pam::git://github.com/processone/epam"
+ "p1_zlib::git://github.com/processone/zlib"
+ "git://github.com/basho/lager"
+ "p1_iconv::git://github.com/processone/eiconv"
+ "git://github.com/DeadZen/goldrush.git"
+ "p1_mysql::git://github.com/processone/mysql.git"
+ "p1_pgsql::git://github.com/processone/pgsql.git"
+ "p1_stun::git://github.com/processone/stun"
+ "git://github.com/davisp/jiffy"
+ "git://github.com/cmullaparthi/ibrowse"
+ "git://github.com/esl/lhttpc"
"$pkgname.logrotate"
- "ejabberd.service")
-md5sums=('2a7c3b711b4f7091f811c51b52beb735'
+ "ejabberd.service"
+ "crash-fix.patch")
+md5sums=('6eadb6f190d55c8a679de5496ca0c4a9'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
'f97c8a96160f30e0aecc9526c12e6606'
- 'df32aa17e40a7bc5d9946d3ba6fe5e16')
+ 'a437aff9d7d477fb036d527205617e18'
+ 'ef3dd667dec1627c1597c7f6f3cfcd4a')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 <$srcdir/crash-fix.patch
+
+ mkdir -p "$srcdir/$pkgname-$pkgver/deps"
+ for i in goldrush lager p1_cache_tab p1_iconv p1_pam \
+ p1_stringprep p1_tls p1_xml p1_yaml p1_zlib xmlrpc \
+ p1_mysql p1_pgsql p1_stun jiffy ibrowse lhttpc; do
+ rm -rf "$srcdir/$pkgname-$pkgver/deps/$i"
+ mv $srcdir/$i "$srcdir/$pkgname-$pkgver/deps"
+ done
+}
build() {
- cd "$srcdir/$pkgname-$pkgver/src"
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --enable-pam --enable-odbc
+ --enable-all
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver/src"
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
install -d "$pkgdir/var/lib/$pkgname"
install -D -m0644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
@@ -40,6 +92,8 @@ package() {
chmod a+rx "$pkgdir/usr/bin/ejabberdctl" "$pkgdir/usr/lib/ejabberd/priv/bin/captcha.sh"
rm -rf "$pkgdir/var/lock" "$pkgdir/usr/sbin"
install -Dm0644 $srcdir/ejabberd.service $pkgdir/usr/lib/systemd/system/ejabberd.service
+ # workaround
+ ln -s mod_configure.beam $pkgdir/usr/lib/ejabberd/ebin/configure.beam
}
# vim:set ts=2 sw=2 et:
diff --git a/community/ejabberd/crash-fix.patch b/community/ejabberd/crash-fix.patch
new file mode 100644
index 000000000..7ab803bfe
--- /dev/null
+++ b/community/ejabberd/crash-fix.patch
@@ -0,0 +1,14 @@
+diff -wbBur ejabberd-13.10/src/ejabberd_c2s.erl ejabberd-13.10.q/src/ejabberd_c2s.erl
+--- ejabberd-13.10/src/ejabberd_c2s.erl 2013-09-27 13:19:22.000000000 +0400
++++ ejabberd-13.10.q/src/ejabberd_c2s.erl 2013-11-16 03:37:15.525501597 +0400
+@@ -536,8 +536,8 @@
+ [StateData#state.socket,
+ jlib:jid_to_string(JID), AuthModule]),
+ SID = {now(), self()},
+- Conn = (StateData#state.sockmod):get_conn_type(
+- StateData#state.socket),
++ Conn = get_conn_type(
++ StateData),
+ Info = [{ip, StateData#state.ip}, {conn, Conn},
+ {auth_module, AuthModule}],
+ Res = jlib:make_result_iq_reply(
diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install
index 6e586229d..572667084 100644
--- a/community/ejabberd/ejabberd.install
+++ b/community/ejabberd/ejabberd.install
@@ -3,18 +3,14 @@ post_install() {
useradd -r -G jabber -d /var/lib/ejabberd ejabberd
chown -R ejabberd.jabber /var/log/ejabberd
chown -R ejabberd.jabber /var/lib/ejabberd
- chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
- chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
- chmod 4750 /usr/lib/ejabberd/priv/bin/epam
+ chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
}
post_upgrade() {
chown -R ejabberd.jabber /var/log/ejabberd
chown -R ejabberd.jabber /var/lib/ejabberd
- chown root:ejabberd /etc/ejabberd/ejabberd.cfg /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
- chown root:ejabberd /usr/lib/ejabberd/priv/bin/epam
- chmod 4750 /usr/lib/ejabberd/priv/bin/epam
- echo ">> ejabberd looks into /var/lib/ejabberd for mnesia db now"
+ chown root:ejabberd /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberdctl.cfg /etc/ejabberd
+ echo "!!! it is major update. Config must be converted to yaml format."
}
post_remove() {
diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service
index 036cc7c53..7de4e8d00 100644
--- a/community/ejabberd/ejabberd.service
+++ b/community/ejabberd/ejabberd.service
@@ -7,7 +7,8 @@ Type=forking
User=ejabberd
LimitNOFILE=16000
RestartSec=5
-ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"
+ExecStart=/usr/bin/ejabberdctl start
+ExecStop=/usr/bin/ejabberdctl stop
[Install]
WantedBy=multi-user.target
diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD
new file mode 100644
index 000000000..edcc42159
--- /dev/null
+++ b/community/elasticsearch/PKGBUILD
@@ -0,0 +1,75 @@
+# $Id: PKGBUILD 102806 2013-12-20 13:45:23Z mtorromeo $
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
+# Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
+
+pkgname=elasticsearch
+pkgver=0.90.8
+pkgrel=2
+pkgdesc="Distributed RESTful search engine built on top of Lucene"
+arch=('i686' 'x86_64')
+url="http://www.elasticsearch.org/"
+license=('APACHE')
+depends=('java-runtime' 'bash')
+install='elasticsearch.install'
+source=(
+ "http://download.elasticsearch.org/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
+ elasticsearch.service
+ elasticsearch-tmpfile.conf
+)
+
+backup=('etc/elasticsearch/elasticsearch.yml'
+ 'etc/elasticsearch/logging.yml')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ for script in plugin elasticsearch; do
+ sed 's|^ES_HOME=.*dirname.*|ES_HOME=/usr/share/elasticsearch|' \
+ -i bin/$script
+
+ for java in jre jdk; do
+ sed "/^CDPATH/i [ -f /etc/profile.d/$java.sh ] && . /etc/profile.d/$java.sh" \
+ -i bin/$script
+ done
+ done
+
+ sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh
+
+ echo -e '\nJAVA_OPTS="$JAVA_OPTS -Des.path.conf=/etc/elasticsearch"' >> bin/elasticsearch.in.sh
+
+ sed -e 's/# \(path\.conf: \).*$/\1\/etc\/elasticsearch/' \
+ -e '0,/# \(path\.data: \).*$/s//\1\/var\/lib\/elasticsearch/' \
+ -e 's/# \(path\.work: \).*$/\1\/tmp\/elasticsearch/' \
+ -e 's/# \(path\.logs: \).*$/\1\/var\/log\/elasticsearch/' \
+ -i config/elasticsearch.yml
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ install -dm755 "$pkgdir/etc/elasticsearch"
+ install -dm755 "$pkgdir/var/lib/elasticsearch"
+ install -dm755 "$pkgdir/var/log/elasticsearch"
+
+ if [ $CARCH = 'x86_64' ]; then
+ install -Dm644 lib/sigar/libsigar-amd64-linux.so "$pkgdir/usr/lib/elasticsearch/sigar/libsigar-amd64-linux.so"
+ else
+ install -Dm644 lib/sigar/libsigar-x86-linux.so "$pkgdir/usr/lib/elasticsearch/sigar/libsigar-x86-linux.so"
+ fi
+ cp lib/sigar/sigar*.jar "$pkgdir/usr/lib/elasticsearch/sigar/"
+ cp lib/*.jar "$pkgdir/usr/lib/elasticsearch/"
+
+ cp config/* "$pkgdir/etc/elasticsearch/"
+
+ install -Dm755 bin/elasticsearch "$pkgdir/usr/bin/elasticsearch"
+ install -Dm755 bin/plugin "$pkgdir/usr/bin/elasticsearch-plugin"
+ install -Dm644 bin/elasticsearch.in.sh "$pkgdir/usr/share/elasticsearch/elasticsearch.in.sh"
+
+ install -Dm644 "$srcdir/elasticsearch.service" "$pkgdir/usr/lib/systemd/system/elasticsearch.service"
+
+ install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf"
+}
+
+sha256sums=('4006e9aa9382f386e79a1c44a14c1aef34765eb5480fb6b29a2facf62ab3a321'
+ '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb'
+ '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f')
diff --git a/community/elasticsearch/elasticsearch-tmpfile.conf b/community/elasticsearch/elasticsearch-tmpfile.conf
new file mode 100644
index 000000000..b2844a919
--- /dev/null
+++ b/community/elasticsearch/elasticsearch-tmpfile.conf
@@ -0,0 +1 @@
+d /run/elasticsearch 0755 elasticsearch elasticsearch - \ No newline at end of file
diff --git a/community/elasticsearch/elasticsearch.install b/community/elasticsearch/elasticsearch.install
new file mode 100644
index 000000000..82ff64dbb
--- /dev/null
+++ b/community/elasticsearch/elasticsearch.install
@@ -0,0 +1,24 @@
+post_install() {
+ getent group elasticsearch >/dev/null 2>&1 || groupadd -g 114 elasticsearch &>/dev/null
+ getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null
+
+ chown -R elasticsearch:elasticsearch /usr/share/elasticsearch
+ chown -R elasticsearch:elasticsearch /var/lib/elasticsearch
+ chown -R elasticsearch:elasticsearch /var/log/elasticsearch
+
+ usr/bin/systemd-tmpfiles --create elasticsearch.conf
+}
+
+post_upgrade(){
+ getent group elasticsearch >/dev/null 2>&1 || groupadd -g 114 elasticsearch &>/dev/null
+ getent passwd elasticsearch >/dev/null 2>&1 || useradd -u 114 -g elasticsearch -d /usr/share/elasticsearch -s /bin/false elasticsearch &>/dev/null
+}
+
+post_remove() {
+ if getent passwd elasticsearch >/dev/null 2>&1; then
+ userdel elasticsearch
+ fi
+ if getent group elasticsearch >/dev/null 2>&1; then
+ groupdel elasticsearch
+ fi
+}
diff --git a/community/elasticsearch/elasticsearch.service b/community/elasticsearch/elasticsearch.service
new file mode 100644
index 000000000..28364b878
--- /dev/null
+++ b/community/elasticsearch/elasticsearch.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=ElasticSearch
+After=network.target
+
+[Service]
+User=elasticsearch
+Type=forking
+PIDFile=/run/elasticsearch/elasticsearch.pid
+ExecStart=/usr/bin/elasticsearch -p /run/elasticsearch/elasticsearch.pid
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 141d8f575..5d1d861f5 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96070 2013-08-19 20:07:30Z eric $
+# $Id: PKGBUILD 102244 2013-12-07 10:36:28Z bpiotrowski $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=electricsheep
pkgver=2.7b33
-pkgrel=11
+pkgrel=12
pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
arch=('i686' 'x86_64' 'mips64el')
url="http://community.electricsheep.org/"
diff --git a/community/elfkickers/PKGBUILD b/community/elfkickers/PKGBUILD
new file mode 100644
index 000000000..a084b36d6
--- /dev/null
+++ b/community/elfkickers/PKGBUILD
@@ -0,0 +1,24 @@
+# $Id: PKGBUILD 101261 2013-11-21 10:29:03Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Mikko Sysikaski <mikko.sysikaski@gmail.com>
+pkgname=elfkickers
+pkgver=3.0a
+pkgrel=1
+pkgdesc='Collection of ELF utilities (includes sstrip)'
+arch=('x86_64' 'i686')
+license=('GPL')
+source=("http://www.muppetlabs.com/~breadbox/pub/software/ELFkickers-$pkgver.tar.gz")
+url='http://www.muppetlabs.com/~breadbox/software/elfkickers.html'
+sha256sums=('c3429957142169c21ff550e0c06bbb0d48bb76437c4ccbc67164bf56b6e9774f')
+
+build() {
+ make -C "ELFkickers-$pkgver"
+}
+
+package() {
+ install -d "$pkgdir/usr/bin"
+ install -d "$pkgdir/usr/share/man/man1"
+ make -C "ELFkickers-$pkgver" prefix="$pkgdir/usr" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index 79857cc7e..cd36df66e 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99736 2013-10-30 23:24:04Z allan $
+# $Id: PKGBUILD 102245 2013-12-07 10:36:29Z bpiotrowski $
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Sven Kauber, <celeon@gmail.com>
@@ -6,7 +6,7 @@
pkgname=encfs
pkgver=1.7.4
-pkgrel=11
+pkgrel=12
pkgdesc='Encrypted filesystem in user-space'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.arg0.net/encfs'
@@ -28,5 +28,5 @@ build(){
package() {
cd ${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
}
diff --git a/community/envoy/PKGBUILD b/community/envoy/PKGBUILD
new file mode 100644
index 000000000..868b969a9
--- /dev/null
+++ b/community/envoy/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 101179 2013-11-18 17:42:55Z eric $
+# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
+
+pkgname=envoy
+pkgver=5
+pkgrel=1
+pkgdesc="A ssh-agent/gpg-agent keychain and process monitor"
+arch=('i686' 'x86_64')
+url="http://github.com/vodik/envoy"
+license=('GPL')
+depends=('openssh' 'systemd')
+optdepends=('gnupg: gpg-agent support')
+makedepends=('ragel')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/vodik/$pkgname/archive/v$pkgver.tar.gz"
+ "clique.tar.gz::https://github.com/vodik/clique/archive/v0.1.tar.gz")
+md5sums=('feee9b1a0eed31360324ea868d081801'
+ '8c4f3fd488fc8f92196a8aa42ac9567e')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ rm -fr clique
+ ln -s ../clique-0.1 clique
+}
+
+build() {
+ make -C "$pkgname-$pkgver"
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
+
+# vim: ft=sh syn=sh et
diff --git a/community/erlang-nox/PKGBUILD b/community/erlang-nox/PKGBUILD
index 49ce66717..c90038f3c 100644
--- a/community/erlang-nox/PKGBUILD
+++ b/community/erlang-nox/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99621 2013-10-30 16:14:28Z arodseth $
+# $Id: PKGBUILD 102627 2013-12-16 21:55:26Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Lukas Fleischer <archlinux@cryptocrack.de>
# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -7,7 +7,7 @@
# Contributor: Ricardo Catalinas Jiménez <jimenezrick@gmail.com>
pkgname=erlang-nox
-pkgver=R16B02
+pkgver=R16B03
pkgrel=2
pkgdesc='General-purpose concurrent functional programming language developed by Ericsson (headless version)'
arch=('x86_64' 'i686')
@@ -21,9 +21,15 @@ optdepends=('erlang-unixodbc: database support'
'lksctp-tools: for SCTP support')
options=('staticlibs')
source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
- "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz")
-sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85'
- 'b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789')
+ "http://www.erlang.org/download/otp_doc_man_${pkgver/_/-}.tar.gz"
+ 'epmd.service'
+ 'epmd.socket'
+ 'epmd.conf')
+sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06'
+ 'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452'
+ 'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
+ '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
+ '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2')
build() {
cd "otp_src_${pkgver/_1/}"
@@ -53,6 +59,12 @@ package() {
# Remove files that are packaged as erlang-unixodbc
rm -r "$pkgdir/usr/lib/erlang/"{lib/odbc*,man/man3/odbc.3.gz}
+
+ # epmd service, socket and conf
+ cd "$srcdir"
+ install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service"
+ install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket"
+ install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/erlang-nox/epmd.conf b/community/erlang-nox/epmd.conf
new file mode 100644
index 000000000..e4f831c39
--- /dev/null
+++ b/community/erlang-nox/epmd.conf
@@ -0,0 +1,3 @@
+#ERL_EPMD_ADDRESS=
+#ERL_EPMD_PORT=4369
+#ERL_EPMD_RELAXED_COMMAND_CHECK=
diff --git a/community/erlang-nox/epmd.service b/community/erlang-nox/epmd.service
new file mode 100644
index 000000000..643eff3b2
--- /dev/null
+++ b/community/erlang-nox/epmd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Erlang Port Mapper Daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/epmd
+ExecStart=/usr/bin/epmd -daemon $EPMD_OPTS
+ExecStop=/usr/bin/epmd -kill
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/erlang-nox/epmd.socket b/community/erlang-nox/epmd.socket
new file mode 100644
index 000000000..ae3594242
--- /dev/null
+++ b/community/erlang-nox/epmd.socket
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=epmd.service
+
+[Socket]
+ListenStream=4369
+Accept=no
+
+[Install]
+WantedBy=sockets.target
diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index 81ef8a261..729afd716 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99617 2013-10-30 15:44:14Z arodseth $
+# $Id: PKGBUILD 102626 2013-12-16 21:55:05Z arodseth $
# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de>
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
@@ -8,7 +8,7 @@
pkgbase=erlang
pkgname=('erlang' 'erlang-unixodbc')
-pkgver=R16B02
+pkgver=R16B03
pkgrel=2
arch=('x86_64' 'i686' 'mips64el')
url='http://www.erlang.org/'
@@ -20,8 +20,8 @@ source=("http://www.erlang.org/download/otp_src_${pkgver/_/-}.tar.gz"
'epmd.service'
'epmd.socket'
'epmd.conf')
-sha256sums=('6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85'
- 'b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789'
+sha256sums=('6133b3410681a5c934e54c76eee1825f96dead8d6a12c31a64f6e160daf0bb06'
+ 'a2038d32e7c940d5d04f7338406e11b723cac0d26e82d7834596105eea492452'
'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
'998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34'
'78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2')
@@ -67,8 +67,8 @@ package_erlang() {
# epmd service, socket and conf
cd "$srcdir"
- install -Dm644 epmd.service "$pkgdir/etc/systemd/system/epmd.service"
- install -Dm644 epmd.socket "$pkgdir/etc/systemd/system/epmd.socket"
+ install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service"
+ install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket"
install -Dm644 epmd.conf "$pkgdir/etc/conf.d/epmd"
}
diff --git a/community/etl/PKGBUILD b/community/etl/PKGBUILD
deleted file mode 100644
index 08b259e8d..000000000
--- a/community/etl/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 90600 2013-05-13 10:14:49Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Franco Iacomella <yaco@gnu.org>
-
-pkgname=etl
-pkgver=0.04.16
-pkgrel=1
-pkgdesc="VoriaETL: C++ STL complementory multiplatform template library"
-arch=(i686 x86_64 'mips64el')
-url="http://synfig.org"
-license=('GPL2')
-depends=()
-conflicts=('synfig-etl')
-replaces=('synfig-etl')
-#source=(http://arch.p5n.pp.ru/~sergej/dl/synfig-0.63.04.tar.gz)
-source=(http://downloads.sourceforge.net/project/synfig/ETL/$pkgver/ETL-$pkgver.tar.gz)
-md5sums=('e330d2045e980d424beb054423c73797')
-
-build() {
- cd $srcdir/ETL-$pkgver
- [ -f Makefile ] || ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/ETL-$pkgver
- make DESTDIR=$pkgdir install
-}
diff --git a/community/extremetuxracer/PKGBUILD b/community/extremetuxracer/PKGBUILD
index b3945e6e3..1f5382f1e 100644
--- a/community/extremetuxracer/PKGBUILD
+++ b/community/extremetuxracer/PKGBUILD
@@ -1,46 +1,33 @@
-# $Id: PKGBUILD 90020 2013-05-06 19:36:49Z foutrelis $
+# $Id: PKGBUILD 101299 2013-11-22 05:31:02Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Eric Belanger <eric.archlinux.org>
# Contributor: Fabio Scotoni <CCuleX.gmail.com>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
pkgname=extremetuxracer
-pkgver=0.4
-pkgrel=6
+pkgver=0.6.0
+pkgrel=1
pkgdesc="Downhill racing game starring Tux"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.extremetuxracer.com"
+url="http://sourceforge.net/projects/extremetuxracer/"
license=('GPL')
-depends=('gcc-libs' 'sdl_mixer' 'tcl>=8.5.0' 'libpng>=1.4.0' 'freetype2' 'glu')
-makedepends=('mesa' 'libxi' 'libxmu')
+depends=('sdl_image' 'sdl_mixer' 'glu' 'freetype2')
+#depends=('libpng' )
+#makedepends=('mesa' 'libxi' 'libxmu')
conflicts=('ppracer' 'etracer')
replaces=('ppracer' 'etracer')
-source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz"
- "$pkgname.png"
- "$pkgname.desktop"
- "libpng15.patch")
-sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d'
- 'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb'
- '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8'
- '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8')
+source=("http://downloads.sourceforge.net/$pkgname/etr-$pkgver.tar.xz")
+sha256sums=('44312719a1e9aa33e5aa0c8ad50bb52df702d64fd2d16bf2abda62ee27bf893a')
build() {
- cd "$srcdir/extremetuxracer-$pkgver"
-
- patch -Np1 -i "${srcdir}/libpng15.patch"
- sed -i -e 's/libpng12/libpng15/g' configure
+ cd "$srcdir/etr-$pkgver"
./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/extremetuxracer-$pkgver"
+ cd "$srcdir/etr-$pkgver"
make DESTDIR="$pkgdir" install
-
- # Install icon and desktop file
- install -Dm644 "$srcdir/$pkgname.desktop" \
- "$pkgdir/usr/share/applications/$pkgname.desktop"
- install -Dm644 "$srcdir/$pkgname.png" \
- "$pkgdir/usr/share/pixmaps/$pkgname.png"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/extremetuxracer/extremetuxracer.desktop b/community/extremetuxracer/extremetuxracer.desktop
deleted file mode 100644
index 6593607b8..000000000
--- a/community/extremetuxracer/extremetuxracer.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Encoding=UTF-8
-Name=Extreme Tux Racer
-Comment=Open source racing game featuring Tux the Linux Penguin.
-Icon=/usr/share/pixmaps/extremetuxracer.png
-Exec=etracer
-Terminal=false
-StartupNotify=true
-Categories=Application;Game;ArcadeGame
-
diff --git a/community/extremetuxracer/extremetuxracer.png b/community/extremetuxracer/extremetuxracer.png
deleted file mode 100644
index 6c4aec00b..000000000
--- a/community/extremetuxracer/extremetuxracer.png
+++ /dev/null
Binary files differ
diff --git a/community/extremetuxracer/libpng15.patch b/community/extremetuxracer/libpng15.patch
deleted file mode 100644
index 5c9999857..000000000
--- a/community/extremetuxracer/libpng15.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
---- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp 2007-09-01 19:38:12.000000000 +0300
-+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp 2010-01-25 03:47:21.000000000 +0200
-@@ -53,7 +53,7 @@
- if (!info_ptr)
- {
- png_destroy_read_struct(&png_ptr,
-- (png_infopp)NULL, (png_infopp)NULL);
-+ NULL, NULL);
- fclose(fp);
- return;
- }
-@@ -62,7 +62,7 @@
- if (!end_info)
- {
- png_destroy_read_struct(&png_ptr, &info_ptr,
-- (png_infopp)NULL);
-+ NULL);
- fclose(fp);
- return;
- }
-@@ -77,7 +77,7 @@
-
-
- png_get_IHDR(png_ptr, info_ptr, &width, &height,
-- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+ &bit_depth, &color_type, &interlace_type, NULL, NULL);
-
- if(bit_depth == 16)
- png_set_strip_16(png_ptr);
-@@ -88,7 +88,7 @@
- png_set_expand(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
- png_get_IHDR(png_ptr, info_ptr, &width, &height,
-- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+ &bit_depth, &color_type, &interlace_type, NULL, NULL);
- }
-
- if( color_type == PNG_COLOR_TYPE_GRAY ||
-@@ -96,7 +96,7 @@
- png_set_gray_to_rgb(png_ptr);
- png_read_update_info(png_ptr, info_ptr);
- png_get_IHDR(png_ptr, info_ptr, &width, &height,
-- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
-+ &bit_depth, &color_type, &interlace_type, NULL, NULL);
- }
-
- this->width=width;
-@@ -114,7 +114,7 @@
- }
-
- png_read_end(png_ptr, info_ptr);
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- fclose(fp);
- }
-
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index 2eaf2f2cf..e6ac0ec5d 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97703 2013-09-27 17:44:03Z stativ $
+# $Id: PKGBUILD 102246 2013-12-07 10:36:30Z bpiotrowski $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=fatrat
pkgver=1.2.0_beta2
-pkgrel=9
+pkgrel=11
pkgdesc="Qt4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
arch=('i686' 'x86_64' 'mips64el')
url="http://fatrat.dolezel.info/"
diff --git a/community/fbreader/PKGBUILD b/community/fbreader/PKGBUILD
index d4b5dccc3..3303b96b9 100644
--- a/community/fbreader/PKGBUILD
+++ b/community/fbreader/PKGBUILD
@@ -1,18 +1,25 @@
-# $Id: PKGBUILD 98932 2013-10-21 13:19:58Z spupykin $
+# $Id: PKGBUILD 102366 2013-12-09 14:03:20Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=fbreader
pkgver=0.99.4
-pkgrel=3
+pkgrel=4
pkgdesc="An e-book reader for Linux"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.fbreader.org/"
license=('GPL')
depends=('fribidi' 'bzip2' 'curl' 'qt4' 'libunibreak' 'sqlite')
makedepends=('ccache')
-source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz)
-md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d')
+source=(http://www.fbreader.org/files/desktop/fbreader-sources-$pkgver.tgz
+ "fbreader-0.99.4.patch::http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/fbreader/files/fbreader-0.99.4.patch?revision=1.1")
+md5sums=('ed13a9c3aeb68aaa98a1dd6f7947a31d'
+ 'bc8975fc8235f393ef011b564addf300')
+
+prepare() {
+ cd $srcdir/fbreader-$pkgver
+ patch -p1 <$srcdir/fbreader-0.99.4.patch
+}
build() {
export TARGET_ARCH=desktop
diff --git a/community/fcitx-cloudpinyin/PKGBUILD b/community/fcitx-cloudpinyin/PKGBUILD
index fd2573134..36c0996b4 100644
--- a/community/fcitx-cloudpinyin/PKGBUILD
+++ b/community/fcitx-cloudpinyin/PKGBUILD
@@ -1,30 +1,28 @@
-# $Id: PKGBUILD 93364 2013-07-02 09:47:21Z fyan $
+# $Id: PKGBUILD 100943 2013-11-13 14:18:13Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: poplarch <poplarch@gmail.com>
pkgname=fcitx-cloudpinyin
-pkgver=0.3.2
+pkgver=0.3.3
pkgrel=1
pkgdesc='Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates'
arch=('i686' 'x86_64' 'mips64el')
url="https://github.com/fcitx/fcitx-cloudpinyin"
license=('GPL')
-depends=('curl' 'fcitx>=4.2.7')
+depends=('curl' 'fcitx')
makedepends=('cmake')
source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz")
build() {
- cd "$srcdir/${pkgname}-${pkgver}"
- mkdir -p build
- cd build
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+ cd ${pkgname}-${pkgver}
+
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .
make
}
package() {
- cd "$srcdir/${pkgname}-${pkgver}/build"
+ cd ${pkgname}-${pkgver}
make DESTDIR="$pkgdir" install
}
-sha512sums=('ddda528f72ffd200ae78b4b2d9791e20576a220d0b15e4c55e9bd1977188c65696ca2a522acbb27177b2b22b33cdc41774d1ce111eb090adaba8fcc97f12cd8e')
+sha512sums=('874c2b1f037c14e8f6cdbd174c86014d9f6b2035d1828ecf3c8debc704a5f3469eff7ead50638f26080986d912c6e93fe82b78f1a9161f09b738461d07614814')
diff --git a/community/fcitx-rime/PKGBUILD b/community/fcitx-rime/PKGBUILD
index 6ab9ec328..b72135fb0 100644
--- a/community/fcitx-rime/PKGBUILD
+++ b/community/fcitx-rime/PKGBUILD
@@ -1,32 +1,29 @@
-# $Id: PKGBUILD 94200 2013-07-16 16:25:08Z fyan $
+# $Id: PKGBUILD 100939 2013-11-13 14:17:32Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: lh <jason52lh@gmail.com>
pkgname=fcitx-rime
-pkgver=0.2.2
-pkgrel=1
+pkgver=0.3.0
+pkgrel=2
pkgdesc='Fcitx Wrapper for librime'
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/fcitx"
license=('GPL')
-depends=('fcitx>=4.2.8.1' "librime" "brise")
+depends=('fcitx' "librime" "brise")
makedepends=('cmake')
install=fcitx-rime.install
source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz")
build() {
- cd "$pkgname-$pkgver"
+ cd $pkgname-$pkgver
- mkdir -p build
- cd build
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+ cmake -DCMAKE_INSTALL_PREFIX=/usr .
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver/build"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
-sha512sums=('4497cfdf38e6fd85e358b0c8b52efa21b54a8c46cf5f6a640ca1c1f91a30df2a2033f46eec2d123bfadf9c8c58e4b8f6ec96b1564d32b2b8157261ca14a2855b')
+sha512sums=('8dbb8fddf4d372d4af9707d2f1bbdb7c15eb29602ad5de8f0cec5dfca81074087fb2873980afd8cdd09f78316620b086708761d91b820b714539a5100bc156a8')
diff --git a/community/flashrom/PKGBUILD b/community/flashrom/PKGBUILD
index 8f97104d0..9cc1bb68c 100644
--- a/community/flashrom/PKGBUILD
+++ b/community/flashrom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95621 2013-08-15 04:30:28Z giovanni $
+# $Id: PKGBUILD 102000 2013-12-03 16:51:55Z eric $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Cilyan Olowen <gaknar@gmail.com>
# Contributor: fill <mailbox@fillo.ru>
@@ -6,20 +6,25 @@
pkgname=flashrom
pkgver=0.9.7
-pkgrel=1
+pkgrel=2
pkgdesc="Utility for reading, writing, erasing and verifying flash ROM chips"
url="http://www.flashrom.org/"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-depends=('libftdi' 'pciutils')
+depends=('libftdi-compat' 'pciutils')
[ "$CARCH" != "mips64el" ] && optdepends=('dmidecode: for SMBIOS/DMI table decoder support')
source=("http://download.flashrom.org/releases/${pkgname}-${pkgver}.tar.bz2")
md5sums=('d239bafa1b46619d851f70f84a5b122a')
+prepare() {
+cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i "s:sbin:bin:g" Makefile
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i "s:sbin:bin:g" Makefile
make
}
diff --git a/community/flightgear/PKGBUILD b/community/flightgear/PKGBUILD
index d38942ee4..c61451431 100644
--- a/community/flightgear/PKGBUILD
+++ b/community/flightgear/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97537 2013-09-23 17:38:40Z spupykin $
+# $Id: PKGBUILD 101480 2013-11-26 11:05:15Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: William Rea <sillywilly@gmail.com>
# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
pkgname=flightgear
-pkgver=2.12.0
+pkgver=2.12.1
pkgrel=1
pkgdesc="An open-source, multi-platform flight simulator"
arch=(i686 x86_64)
@@ -16,7 +16,7 @@ options=('!makeflags')
#source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
#source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2")
source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2")
-md5sums=('23e2de5f311f4cbe94ec3386736ee8a5')
+md5sums=('0e57582b9e83d7d44e82761792a79793')
build() {
cd $srcdir/flightgear-$pkgver
diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD
index cdf008dec..069e6b2a5 100644
--- a/community/fox/PKGBUILD
+++ b/community/fox/PKGBUILD
@@ -1,22 +1,34 @@
-# $Id: PKGBUILD 100152 2013-11-01 20:24:18Z spupykin $
+# $Id: PKGBUILD 102384 2013-12-09 23:15:34Z bgyorgy $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Ben <ben@benmazer.net>
pkgname=fox
pkgver=1.6.49
-pkgrel=3
+pkgrel=4
pkgdesc="Free Objects for X: GUI Toolkit for C++"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.fox-toolkit.org/"
license=('LGPL' 'custom')
depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'libxi' 'libpng' 'libtiff' 'glu')
-makedepends=('mesa')
+makedepends=('mesa' 'gendesk' 'imagemagick')
optdepends=('perl')
source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz)
md5sums=('e120647d26a27ed37cd5fed8b75c8a3d')
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ gendesk -n -f --pkgname=adie --pkgdesc="Fast and convenient programming text editor" --categories="Utility;TextEditor"
+ gendesk -n -f --pkgname=calculator --name="FOX Calculator" --pkgdesc="Simple desktop calculator" --categories="Utility;Calculator"
+ gendesk -n -f --pkgname=ControlPanel --name="FOX Desktop Setup" --pkgdesc="Setup desktop appearance for FOX applications" --categories="Settings;DesktopSettings"
+ gendesk -n -f --pkgname=PathFinder --pkgdesc="File browser" --categories="System;FileTools;FileManager"
+}
+
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ convert adie/big_gif.gif adie.png
+ convert calculator/bigcalc.gif calculator.png
+ convert pathfinder/file_gif.gif PathFinder.png
+
export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2"
./configure --prefix=/usr \
--enable-release \
@@ -36,8 +48,15 @@ build() {
package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
- cd ${srcdir}/${pkgname}-${pkgver}/tests
+
+ pushd tests
make ControlPanel
- install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/
- install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+ install -m755 .libs/ControlPanel ${pkgdir}/usr/bin/
+ popd
+
+ install -Dm644 LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+
+ install -dm755 ${pkgdir}/usr/share/{applications,pixmaps}
+ install -m644 *.png ${pkgdir}/usr/share/pixmaps/
+ install -m644 *.desktop ${pkgdir}/usr/share/applications/
}
diff --git a/community/freedroidrpg/PKGBUILD b/community/freedroidrpg/PKGBUILD
index 7d47d21b4..930326c60 100644
--- a/community/freedroidrpg/PKGBUILD
+++ b/community/freedroidrpg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90026 2013-05-06 19:36:57Z foutrelis $
+# $Id: PKGBUILD 100931 2013-11-13 12:48:36Z heftig $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: nut543 <kfs1@online.no>
pkgname='freedroidrpg'
pkgver=0.15.1
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64' 'mips64el')
depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'glu')
makedepends=('mesa')
diff --git a/community/g15daemon/PKGBUILD b/community/g15daemon/PKGBUILD
new file mode 100644
index 000000000..4adcbd3c3
--- /dev/null
+++ b/community/g15daemon/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 101656 2013-11-29 20:21:32Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: Valeriy Lyasotskiy <onestep@ukr.net>
+
+pkgname=g15daemon
+pkgver=1.9.5.3
+pkgrel=7
+pkgdesc="A daemon that makes it possible to use the G-Buttons and draw on the G15 LCD"
+arch=('i686' 'x86_64')
+url="http://www.g15tools.com/"
+license=('GPL')
+depends=('libg15render>=1.2')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ g15daemon.service
+ ${pkgname}-${pkgver}-uinput.patch
+ ${pkgname}-${pkgver}-config-write.patch
+ ${pkgname}-${pkgver}-recv-oob-answer.patch)
+md5sums=('2cd8b4f1bd039bf804f1f472216742f0'
+ 'c259d875f33a2fba53f9c2200a913c11'
+ '6c3d5b2b7c585dc095118f80e4d72204'
+ 'd47755aa8387e89fedffdb28ff3b18de'
+ '275c28e4950e05336086419873ff8e45')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-uinput.patch"
+ patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-config-write.patch"
+ patch -Np1 -i "${srcdir}/${pkgname}-${pkgver}-recv-oob-answer.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --sbindir=/usr/bin --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ install -D -m 644 "${srcdir}/g15daemon.service" \
+ "${pkgdir}/usr/lib/systemd/system/g15daemon.service"
+}
diff --git a/community/g15daemon/g15daemon-1.9.5.3-config-write.patch b/community/g15daemon/g15daemon-1.9.5.3-config-write.patch
new file mode 100644
index 000000000..6f52d231f
--- /dev/null
+++ b/community/g15daemon/g15daemon-1.9.5.3-config-write.patch
@@ -0,0 +1,12 @@
+diff -Nuar g15daemon-1.9.5.3.orig/g15daemon/utility_funcs.c g15daemon-1.9.5.3/g15daemon/utility_funcs.c
+--- g15daemon-1.9.5.3.orig/g15daemon/utility_funcs.c 2008-01-26 07:02:07.000000000 +0200
++++ g15daemon-1.9.5.3/g15daemon/utility_funcs.c 2011-11-09 09:19:43.000000000 +0200
+@@ -356,7 +356,7 @@
+ config_items_t * item=NULL;
+ char line[1024];
+
+- config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC);
++ config_fd = open(filename,O_CREAT|O_RDWR|O_TRUNC, 0644);
+ if(config_fd){
+ snprintf(line,1024,"# G15Daemon Configuration File\n# any items entered before a [section] header\n# will be in the Global config space\n# comments you wish to keep should start with a semicolon';'\n");
+ write(config_fd,line,strlen(line));
diff --git a/community/g15daemon/g15daemon-1.9.5.3-recv-oob-answer.patch b/community/g15daemon/g15daemon-1.9.5.3-recv-oob-answer.patch
new file mode 100644
index 000000000..adb4dccc4
--- /dev/null
+++ b/community/g15daemon/g15daemon-1.9.5.3-recv-oob-answer.patch
@@ -0,0 +1,11 @@
+--- g15daemon-1.9.5.3.orig/libg15daemon_client/g15daemon_net.c
++++ g15daemon-1.9.5.3/libg15daemon_client/g15daemon_net.c
+@@ -217,7 +217,7 @@
+ if(poll(pfd,1,100)>0){
+ if(pfd[0].revents & POLLPRI && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) {
+ memset(packet,0,sizeof(packet));
+- msgret = recv(sock, packet, 10 , MSG_OOB);
++ msgret = recv(sock, packet, sizeof(packet) , MSG_OOB);
+ if (msgret < 1) {
+ return -1;
+ }
diff --git a/community/g15daemon/g15daemon-1.9.5.3-uinput.patch b/community/g15daemon/g15daemon-1.9.5.3-uinput.patch
new file mode 100644
index 000000000..f91843281
--- /dev/null
+++ b/community/g15daemon/g15daemon-1.9.5.3-uinput.patch
@@ -0,0 +1,35 @@
+Index: g15daemon-1.9.5.3/g15daemon/g15_plugin_uinput.c
+===================================================================
+--- g15daemon-1.9.5.3/plugins/g15_plugin_uinput.c
++++ g15daemon-1.9.5.3/plugins/g15_plugin_uinput.c
+@@ -125,6 +125,14 @@
+ event.value = G15KEY_DOWN;
+
+ write (uinp_fd, &event, sizeof(event));
++
++ /* Need to write sync event */
++ memset(&event, 0, sizeof(event));
++ event.type = EV_SYN;
++ event.code = SYN_REPORT;
++ event.value = 0;
++ write(uinp_fd, &event, sizeof(event));
++
+ }
+
+ static void g15_uinput_keyup(unsigned char code)
+@@ -137,6 +145,14 @@
+ event.value = G15KEY_UP;
+
+ write (uinp_fd, &event, sizeof(event));
++
++ /* Need to write sync event */
++ memset(&event, 0, sizeof(event));
++ event.type = EV_SYN;
++ event.code = SYN_REPORT;
++ event.value = 0;
++ write(uinp_fd, &event, sizeof(event));
++
+ }
+
+ void (*keyup)(unsigned char code) = &g15_uinput_keyup;
+
diff --git a/community/g15daemon/g15daemon.service b/community/g15daemon/g15daemon.service
new file mode 100644
index 000000000..46855ea40
--- /dev/null
+++ b/community/g15daemon/g15daemon.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Logitech G15 Support Daemon
+Documentation=man:g15daemon(1)
+
+[Service]
+Type=forking
+PIDFile=/run/g15daemon.pid
+ExecStart=/usr/bin/g15daemon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index b66bbb5b5..c80f85c19 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99337 2013-10-27 11:13:45Z lcarlier $
+# $Id: PKGBUILD 101792 2013-12-01 09:52:05Z andyrtr $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
# Contributor : sebikul <sebikul@gmail.com>
@@ -15,8 +15,8 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb
'gambas3-gb-openssl' 'gambas3-gb-report' 'gambas3-gb-sdl-sound' 'gambas3-gb-sdl' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb'
'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web')
pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples')
-pkgver=3.5.0
-pkgrel=3
+pkgver=3.5.1
+pkgrel=2
pkgdesc="A free development environment based on a Basic interpreter."
arch=('i686' 'x86_64' 'mips64el')
url="http://gambas.sourceforge.net/"
@@ -31,7 +31,7 @@ makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-uti
'gmime')
options=('!emptydirs' 'libtool')
source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('20274da44d043104adb6fca02e6b5fab')
+md5sums=('40f9057cd3686020fbe66a043a2ea400')
create_dirs() {
install -dm755 ${pkgdir}/usr/lib/gambas3
diff --git a/community/gambas3/gambas3-3.4.1-llvm-3.3.patch b/community/gambas3/gambas3-3.4.1-llvm-3.3.patch
deleted file mode 100644
index a5f75fe78..000000000
--- a/community/gambas3/gambas3-3.4.1-llvm-3.3.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -up gambas3-3.4.1/gb.jit/configure.ac.jx gambas3-3.4.1/gb.jit/configure.ac
---- gambas3-3.4.1/gb.jit/configure.ac.jx 2013-03-24 13:34:31.000000000 -0400
-+++ gambas3-3.4.1/gb.jit/configure.ac 2013-05-02 13:42:02.911687100 -0400
-@@ -32,7 +32,7 @@ fi
-
- GB_COMPONENT(
- jit, JIT, gb.jit, [src],
-- [GB_FIND(llvm/LLVMContext.h, /usr/lib/llvm* /usr/local/lib /usr/local /usr/lib /usr `$LLVM_CONFIG --prefix`, include)],
-+ [GB_FIND(llvm/IR/LLVMContext.h, /usr/lib/llvm* /usr/local/lib /usr/local /usr/lib /usr `$LLVM_CONFIG --prefix`, include)],
- [GB_FIND(libLLVM-$LLVM_VERSION.$SHLIBEXT, /usr/lib/llvm* /usr/local /usr `$LLVM_CONFIG --prefix`, lib)],
- [$C_LIB `$LLVM_CONFIG --ldflags` -lLLVM-$LLVM_VERSION],
- [-I../../main/gbx -I../../main/share -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS])
-diff -up gambas3-3.4.1/gb.jit/src/jit_codegen.cpp.jx gambas3-3.4.1/gb.jit/src/jit_codegen.cpp
---- gambas3-3.4.1/gb.jit/src/jit_codegen.cpp.jx 2013-03-24 13:34:31.000000000 -0400
-+++ gambas3-3.4.1/gb.jit/src/jit_codegen.cpp 2013-05-02 13:54:30.344186594 -0400
-@@ -3614,11 +3614,7 @@ void TryExpression::codegen(){
- create_gep(temp_errcontext1, TARGET_BITS, 0, TARGET_BITS, 0));
-
- llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p"));
--#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2)
-- f->addFnAttr(llvm::Attributes::ReturnsTwice);
--#else
- f->addFnAttr(llvm::Attribute::ReturnsTwice);
--#endif
-
- llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf);
-
-@@ -3669,11 +3665,7 @@ void LargeTryExpression::codegen(){
- create_gep(temp_errcontext2, TARGET_BITS, 0, TARGET_BITS, 0));
-
- llvm::Function* f = llvm::cast<llvm::Function>(get_global_function(_setjmp, 'i', "p"));
--#if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2)
-- f->addFnAttr(llvm::Attributes::ReturnsTwice);
--#else
- f->addFnAttr(llvm::Attribute::ReturnsTwice);
--#endif
-
- llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf);
-
-diff -up gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp.jx gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp
---- gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp.jx 2013-03-24 13:34:31.000000000 -0400
-+++ gambas3-3.4.1/gb.jit/src/jit_gambas_pass.cpp 2013-05-02 13:42:02.912687103 -0400
-@@ -24,9 +24,9 @@
- ***************************************************************************/
-
- #include "llvm/Pass.h"
--#include "llvm/Function.h"
-+#include "llvm/IR/Function.h"
- #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2)
--#include "llvm/IRBuilder.h"
-+#include "llvm/IR/IRBuilder.h"
- #else
- #include "llvm/Support/IRBuilder.h"
- #endif
-diff -up gambas3-3.4.1/gb.jit/src/jit.h.jx gambas3-3.4.1/gb.jit/src/jit.h
---- gambas3-3.4.1/gb.jit/src/jit.h.jx 2013-03-24 13:34:31.000000000 -0400
-+++ gambas3-3.4.1/gb.jit/src/jit.h 2013-05-02 13:42:02.912687103 -0400
-@@ -26,13 +26,13 @@
- #ifndef __JIT_H
- #define __JIT_H
-
--#include "llvm/LLVMContext.h"
--#include "llvm/Module.h"
-+#include "llvm/IR/LLVMContext.h"
-+#include "llvm/IR/Module.h"
- #include "llvm/Analysis/Verifier.h"
--#include "llvm/Constants.h"
--#include "llvm/DerivedTypes.h"
--#include "llvm/Intrinsics.h"
--#include "llvm/Instructions.h"
-+#include "llvm/IR/Constants.h"
-+#include "llvm/IR/DerivedTypes.h"
-+#include "llvm/IR/Intrinsics.h"
-+#include "llvm/IR/Instructions.h"
- #include "llvm/ExecutionEngine/JIT.h"
- #include "llvm/ExecutionEngine/Interpreter.h"
- #include "llvm/ExecutionEngine/GenericValue.h"
-@@ -40,7 +40,7 @@
- #include "llvm/Support/ManagedStatic.h"
- #include "llvm/Support/raw_ostream.h"
- #if LLVM_VERSION_MAJOR > 3 || (LLVM_VERSION_MAJOR == 3 && LLVM_VERSION_MINOR >= 2)
--#include "llvm/IRBuilder.h"
-+#include "llvm/IR/IRBuilder.h"
- #else
- #include "llvm/Support/IRBuilder.h"
- #endif
diff --git a/community/garmindev/PKGBUILD b/community/garmindev/PKGBUILD
index 9e7f12efd..b5acba513 100644
--- a/community/garmindev/PKGBUILD
+++ b/community/garmindev/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97782 2013-09-29 17:08:41Z jlichtblau $
+# $Id: PKGBUILD 103010 2013-12-25 16:23:30Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Matthias Maennich <arch@maennich.net>
pkgname=garmindev
pkgver=0.3.4
-pkgrel=6
+pkgrel=7
pkgdesc="Garmin Device Drivers for QlandkarteGT"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.qlandkarte.org/"
diff --git a/community/garmindev/garmindev.changelog b/community/garmindev/garmindev.changelog
index 64bb867ea..474c70a0f 100644
--- a/community/garmindev/garmindev.changelog
+++ b/community/garmindev/garmindev.changelog
@@ -1,4 +1,7 @@
-2013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * garmindev 0.3.4-7 static libraries removed
+
+"013-09-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* garmindev 0.3.4-6 install file update FS#36141
2011-11-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
diff --git a/community/gcolor2/PKGBUILD b/community/gcolor2/PKGBUILD
index 79d02392a..71c285b75 100644
--- a/community/gcolor2/PKGBUILD
+++ b/community/gcolor2/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=gcolor2
pkgver=0.4
-pkgrel=6.1
+pkgrel=7
pkgdesc="A simple GTK+2 color selector"
arch=('i686' 'x86_64' 'mips64el')
url="http://gcolor2.sf.net/"
@@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.t
gcolor2-0.4-amd64.patch gcolor2.desktop)
md5sums=('02de9d925ad5921522685f402caec3ec'
'5791378f6f86dd25a302ad8586292dd6'
- '9523da11b40dd167964d1b50b40250d5')
+ '1bbc11865df2a0529757cdbdf806b079')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/gcolor2/gcolor2.desktop b/community/gcolor2/gcolor2.desktop
index 754df94d3..22d17be47 100644
--- a/community/gcolor2/gcolor2.desktop
+++ b/community/gcolor2/gcolor2.desktop
@@ -2,6 +2,7 @@
Name=Gcolor2
GenericName=A simple GTK+2 color selector
Comment=Choose colours from palette or screen
+Keywords=select;pick;detect;choose;colors;palette
Exec=gcolor2
Icon=/usr/share/pixmaps/gcolor2/icon.png
Type=Application
diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD
index 18f1b0828..93e6f1412 100644
--- a/community/gcompris/PKGBUILD
+++ b/community/gcompris/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 99747 2013-10-30 23:28:02Z allan $
+# $Id: PKGBUILD 100632 2013-11-06 16:42:49Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de>
pkgname=gcompris
-pkgver=12.11
-pkgrel=2
+pkgver=13.11
+pkgrel=1
pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10"
arch=('i686' 'x86_64' 'mips64el')
url="http://gcompris.net/"
license=('GPL3')
depends=('pygtk' 'librsvg' 'python2-pysqlite' 'gstreamer0.10-base-plugins')
optdepends=('gnucap: for computer simulation within the electricity activity'
- 'tuxpaint: for the painting activity'
- 'gnuchess: for the chess activity')
-makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess')
+ 'tuxpaint: for the painting activity')
+makedepends=('texinfo' 'texi2html' 'intltool' 'gettext')
source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('97b688497963cc907e3d91f844483fb006a07b22010528dafb09ae5380523b20')
+sha256sums=('418dad2c8f0fc90e16e97ab67b6700e3af5f33ae05d83f28f3b1117183f88c57')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ sed -i 's/"$GNUCHESS"/"gcompris-gnuchess"/' configure
+}
build() {
cd $pkgname-$pkgver
@@ -25,7 +30,7 @@ build() {
}
package() {
- depends+=('gcompris-data')
+ depends+=("gcompris-data=$pkgver-$pkgrel")
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install-exec
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index 709c8c69b..52450d1dd 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99749 2013-10-30 23:28:45Z allan $
+# $Id: PKGBUILD 102765 2013-12-19 13:49:34Z fyan $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=gdal
pkgver=1.10.0
-pkgrel=5
+pkgrel=6
pkgdesc="A translator library for raster geospatial data formats"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gdal.org/"
diff --git a/community/gdc/PKGBUILD b/community/gdc/PKGBUILD
index aa3224743..3ed37cf9a 100644
--- a/community/gdc/PKGBUILD
+++ b/community/gdc/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=('gdc' 'libgphobos-devel')
pkgver=4.8.2
-pkgrel=1
+pkgrel=3
arch=('i686' 'x86_64')
url="https://github.com/D-Programming-GDC/GDC"
license=('GPL')
@@ -90,6 +90,12 @@ package_libgphobos-devel()
cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/$pkgver/core
cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/$pkgver/gcc
+ # workaround for auto-generated libbacktrace issue
+ # script needs to be re-written to first call normal gcc instalaltion targets to
+ # avoid such problems in future
+ cp $srcdir/gcc-build/$CHOST/libphobos/libdruntime/gcc/libbacktrace.d $pkgdir/usr/include/dlang/gdc/$pkgver/gcc
+ rm $pkgdir/usr/include/dlang/gdc/$pkgver/gcc/libbacktrace.d.in
+
# phobos
cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d
cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std
diff --git a/community/gearmand/PKGBUILD b/community/gearmand/PKGBUILD
new file mode 100644
index 000000000..f0f325628
--- /dev/null
+++ b/community/gearmand/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 102452 2013-12-11 14:33:31Z mtorromeo $
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+# Contributor: Lev Lybin <lev.lybin@gmail.com>
+# Contributor: Vadym Abramchuk <abramm@gmail.com>
+# Contributor: John Gerritse <reaphsharc@gmail.com>
+
+pkgname=gearmand
+pkgver=1.1.11
+pkgrel=1
+pkgdesc="Distributed job queue server."
+arch=('i686' 'x86_64')
+depends=('libevent' 'boost-libs' 'libmariadbclient' 'postgresql-libs' 'sqlite')
+makedepends=('boost' 'gperf' 'python-sphinx')
+conflicts=('gearman')
+replaces=('gearman')
+provides=("gearman=$pkgver")
+url="http://gearman.org/"
+license=('CUSTOM')
+install=$pkgname.install
+backup=('etc/gearmand.conf')
+source=(https://launchpad.net/$pkgname/1.2/$pkgver/+download/$pkgname-$pkgver.tar.gz
+ gearmand.service
+ gearmand.conf)
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ export LDFLAGS="$LDFLAGS -lboost_system"
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --localstatedir=/run \
+ --disable-static \
+ --enable-ssl
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+
+ cd "$srcdir"
+ install -Dm644 gearmand.service "$pkgdir/usr/lib/systemd/system/gearmand.service"
+ install -Dm644 gearmand.conf "$pkgdir/etc/gearmand.conf"
+}
+
+sha256sums=('a175cbdeabe8102796418a516532adad58abd5e355365c78b6a234e544655825'
+ 'dee38ad4e614969047253b8c4996b8cdf33c981b0df215b6627356fd4cbafa33'
+ '6c14fdcd94105338e13bdd59dbed4f9b77430a517b2c125ac2e6d3bc43bdf506')
diff --git a/community/gearmand/gearmand.conf b/community/gearmand/gearmand.conf
new file mode 100644
index 000000000..2ea39fb2f
--- /dev/null
+++ b/community/gearmand/gearmand.conf
@@ -0,0 +1 @@
+--syslog --log-file stderr
diff --git a/community/gearmand/gearmand.install b/community/gearmand/gearmand.install
new file mode 100644
index 000000000..56d8ac86b
--- /dev/null
+++ b/community/gearmand/gearmand.install
@@ -0,0 +1,12 @@
+post_install() {
+ getent group gearmand >/dev/null 2>&1 || groupadd -g 113 gearmand &>/dev/null
+ getent passwd gearmand >/dev/null 2>&1 || useradd -u 113 -g gearmand -d /dev/null -s /bin/false gearmand &>/dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ userdel gearmand
+}
diff --git a/community/gearmand/gearmand.service b/community/gearmand/gearmand.service
new file mode 100644
index 000000000..a1a8d5a23
--- /dev/null
+++ b/community/gearmand/gearmand.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Gearmand distributed job system
+After=syslog.target network.target
+
+[Service]
+User=gearmand
+Type=forking
+ExecStart=/usr/bin/gearmand -d
+Restart=on-failure
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD
index 4fdcbe03c..7a1f56786 100755
--- a/community/geary/PKGBUILD
+++ b/community/geary/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 98024 2013-10-04 08:12:31Z alucryd $
+# $Id: PKGBUILD 102595 2013-12-16 08:40:54Z alucryd $
# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
# Contributor : sebikul <sebikul@gmail.com>
# Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgname=geary
-pkgver=0.4.0
+pkgver=0.5.0
pkgrel=1
-pkgdesc="A lightweight email client for the GNOME desktop"
+pkgdesc='A lightweight email client for the GNOME desktop'
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.yorba.org/projects/geary/"
+url='http://www.yorba.org/projects/geary/'
license=('GPL3')
-depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee' 'libnotify' 'libunique3' 'webkitgtk3')
+depends=('desktop-file-utils' 'gmime' 'libcanberra' 'libgee' 'libnotify' 'webkitgtk')
makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala')
install="${pkgname}.install"
-source=("http://www.yorba.org/download/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('eb6418fe48ee2d25350999e6fc8fd23de15da5670569f4c2478f9435fe2a2ae1')
+source=("https://download.gnome.org/sources/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('7f3f442b2b7349e339b380de474d94e9a8ad625d16277277ea500747c3b7a5af')
build() {
cd ${pkgname}-${pkgver}
@@ -24,7 +24,7 @@ build() {
fi
mkdir build && cd build
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='OFF'
+ cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -D{DESKTOP_UPDATE,GSETTINGS_COMPILE{,_IN_PLACE},ICON_UPDATE}='OFF'
make
}
diff --git a/community/gedit-plugins/PKGBUILD b/community/gedit-plugins/PKGBUILD
index 215f352d6..22e8db5e6 100644
--- a/community/gedit-plugins/PKGBUILD
+++ b/community/gedit-plugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99756 2013-10-30 23:31:18Z allan $
+# $Id: PKGBUILD 102711 2013-12-17 18:09:28Z bgyorgy $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Hugo Doria <hugo@archlinux.org>
@@ -6,7 +6,7 @@
# Contributor: zhuqin <zhuqin83@gmail.com>
pkgname=gedit-plugins
-pkgver=3.10.0
+pkgver=3.10.1
pkgrel=1
pkgdesc="Plugins for gedit"
arch=('x86_64' 'i686' 'mips64el')
@@ -20,7 +20,7 @@ optdepends=('gucharmap: for charmap plugin'
options=('!emptydirs')
install=gedit-plugins.install
source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz")
-sha256sums=('17cb703a09a0346b6a73d0e34eec87cde9073ffd5e0168741f0830a419ab57cd')
+sha256sums=('b30e30d5a0efb9a711c6583748b37c1ed3e45222505e08f920b78c6de0bc4a9d')
build() {
cd $pkgname-$pkgver
diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD
index c8b0d9211..f3168f4a4 100644
--- a/community/gendesk/PKGBUILD
+++ b/community/gendesk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97501 2013-09-22 21:35:55Z arodseth $
+# $Id: PKGBUILD 102201 2013-12-06 13:22:28Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
pkgname=gendesk
-pkgver=0.5.5
+pkgver=0.6
pkgrel=1
pkgdesc='Utility to generate .desktop files and download icons'
arch=('x86_64' 'i686')
@@ -12,7 +12,7 @@ makedepends=('go')
depends=('glibc')
source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz"
'http://roboticoverlords.org/images/default.png')
-sha256sums=('52a13d3952f0c00a65f05d01a9ca0fc1f5337f3379ff6017aafb686e5caf0942'
+sha256sums=('ccfe024a2258beb81a82217598b432cb98006af5d7b6cc8e6012d263d82f1b5d'
'4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837')
build() {
diff --git a/extra/gif2png/PKGBUILD b/community/gif2png/PKGBUILD
index d5269af36..da690beda 100644
--- a/extra/gif2png/PKGBUILD
+++ b/community/gif2png/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184383 2013-05-06 19:37:29Z foutrelis $
+# $Id: PKGBUILD 102199 2013-12-06 13:12:30Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: eric <eric@archlinux.org>
# Contributor: Andrew Rose <ody@netrux.com>
diff --git a/community/girara/PKGBUILD b/community/girara/PKGBUILD
index b4c25e50b..5d19bb909 100644
--- a/community/girara/PKGBUILD
+++ b/community/girara/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 100160 2013-11-01 20:46:36Z spupykin $
+# $Id: PKGBUILD 101151 2013-11-18 15:15:09Z spupykin $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: mlq <mlq@pwmt.org>
pkgbase=girara
pkgname=(girara-common girara-gtk2 girara-gtk3)
-pkgver=0.1.7
-pkgrel=2
+pkgver=0.1.9
+pkgrel=1
pkgdesc="user interface library"
arch=('i686' 'x86_64' 'mips64el')
url="http://pwmt.org/projects/girara"
license=('custom')
makedepends=('gtk3' 'gtk2')
source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz)
-md5sums=('ff73bf26b56cdc28a4a2dcce46f4aa20')
+md5sums=('0b51fc07b5763b506d46598576e5576e')
build() {
true
diff --git a/community/glabels/PKGBUILD b/community/glabels/PKGBUILD
index b0a2f5db4..d59115a86 100644
--- a/community/glabels/PKGBUILD
+++ b/community/glabels/PKGBUILD
@@ -1,27 +1,23 @@
-# $Id: PKGBUILD 99761 2013-10-30 23:33:09Z allan $
+# $Id: PKGBUILD 101750 2013-11-30 17:42:47Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
# Contributor: yugrotavele <yugrotavele at archlinux dot us>
# Contributor: Damir Perisa <damir@archlinux.org>
pkgname=glabels
-pkgver=3.0.1
-pkgrel=3
+pkgver=3.2.0
+pkgrel=1
pkgdesc="Creating labels and business cards the very easy way"
arch=('i686' 'x86_64' 'mips64el')
url="http://glabels.org/"
license=('GPL' 'LGPL')
depends=('librsvg' 'evolution-data-server' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils')
-makedepends=('barcode' 'intltool' 'gnome-doc-utils')
+makedepends=('intltool' 'itstool')
install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- glabels-3.0.0-new-eds.patch)
-sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2'
- 'f02ecf12e10b1d406607bad65f81e53ebd5d56fabe46035a47bd6fe1ec8bf70b')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c4c5b2c911be7b6513ee5cfeda6cd78434623c24dd741bd29cc3573f90b374c9')
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 -i "$srcdir/glabels-3.0.0-new-eds.patch"
-
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --disable-schemas-compile
make
@@ -29,6 +25,5 @@ build() {
package() {
cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir/" install
}
diff --git a/community/glabels/glabels-3.0.0-new-eds.patch b/community/glabels/glabels-3.0.0-new-eds.patch
deleted file mode 100644
index 9cae4c076..000000000
--- a/community/glabels/glabels-3.0.0-new-eds.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c
---- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200
-+++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200
-@@ -29,7 +29,7 @@
-
- #include "merge-evolution.h"
-
--#include <libebook/e-book.h>
-+#include <libebook/libebook.h>
- #include <glib/gi18n.h>
- #include <stdio.h>
- #include <string.h>
-@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon
- /*--------------------------------------------------------------------------*/
- /* Open merge source. */
- /*--------------------------------------------------------------------------*/
-+static EBook *
-+gl_open_system_addressbook (GError **error)
-+{
-+ ESourceRegistry *registry;
-+ EBook *book = NULL;
-+ ESource *source;
-+
-+ registry = e_source_registry_new_sync (NULL, error);
-+ if (!registry)
-+ return NULL;
-+
-+ source = e_source_registry_ref_builtin_address_book (registry);
-+ if (!source) {
-+ g_object_unref (registry);
-+ return NULL;
-+ }
-+
-+ book = e_book_new (source, error);
-+
-+ g_object_unref (source);
-+ g_object_unref (registry);
-+
-+ return book;
-+}
-+
- static void
- gl_merge_evolution_open (glMerge *merge)
- {
-@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge)
- return;
- }
-
-- merge_evolution->priv->book = e_book_new_system_addressbook(&error);
-+ merge_evolution->priv->book = gl_open_system_addressbook(&error);
- if (!merge_evolution->priv->book) {
- g_warning ("Couldn't open addressbook.");
- if (error)
- {
-- g_warning ("e_book_new_system_addressbook: %s", error->message);
-+ g_warning ("gl_open_system_addressbook: %s", error->message);
- g_error_free (error);
- }
- e_book_query_unref(query);
-diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c
---- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200
-+++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200
-@@ -27,7 +27,7 @@
-
- #include "merge-vcard.h"
-
--#include <libebook/e-contact.h>
-+#include <libebook/libebook.h>
- #include <stdio.h>
- #include <string.h>
- #include <errno.h>
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index d27106429..24f740c59 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 94023 2013-07-13 12:32:16Z svenstaro $
+# $Id: PKGBUILD 102248 2013-12-07 10:36:32Z bpiotrowski $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
pkgname=glob2
pkgver=0.9.4.4
-pkgrel=19
-pkgdesc='RTS game which minimizes micro-management by automatically assigning tasks to units'
+pkgrel=21
+pkgdesc='RTS game which minimizes micro-management'
arch=('x86_64' 'i686' 'mips64el')
url='http://www.globulation2.org/'
license=('GPL3')
depends=('boost-libs' 'sdl_net' 'sdl_image' 'sdl_ttf' 'libvorbis' 'speex' 'glu'
- 'fribidi' 'xdg-utils' 'libgl')
-makedepends=('scons' 'boost' 'mesa-libgl')
+ 'fribidi' 'xdg-utils' 'libgl' 'hicolor-icon-theme')
+makedepends=('scons' 'boost' 'mesa')
install="$pkgname.install"
source=("http://dl.sv.nongnu.org/releases/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.gz"
"$pkgname-${pkgver%.*}.1-gcc44.patch")
@@ -20,19 +20,19 @@ sha256sums=('0f4d898ec6b05ce27b4a12ef242cc26571304b90d2509932a4743c71311314b8'
'3a0cfc06696d1aaf2d7948b5f6a09a8ce96492767039dc09bfc25182b92d7b7a')
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
patch -Np0 -i "$srcdir/$pkgname-${pkgver%.*}.1-gcc44.patch"
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
scons LINKFLAGS="-lboost_system"
}
package () {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
scons install BINDIR="$pkgdir/usr/bin" INSTALLDIR="$pkgdir/usr/share"
find "$pkgdir/usr/share" -type f -exec chmod 644 '{}' \;
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 716b75f59..aad6f49cd 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 99763 2013-10-30 23:33:51Z allan $
+# $Id: PKGBUILD 102249 2013-12-07 10:36:33Z bpiotrowski $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=glom
-pkgver=1.24.1
-pkgrel=1
+pkgver=1.24.2
+pkgrel=2
pkgdesc="An easy-to-use database designer and user interface"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.glom.org/"
@@ -14,8 +14,9 @@ license=('GPL')
depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost')
install=$pkgname.install
+changelog=$pkgname.changelog
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.24/$pkgname-$pkgver.tar.xz)
-sha256sums=('eae586be8d3fc36ee80e5ca0ef5d877e76d346cbfe451c9abff5be27692030d1')
+sha256sums=('7bd16c9ac0db15d273667c1a39c1f5056669281d69e9c779548b1f6bdaef798b')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/glom/glom.changelog b/community/glom/glom.changelog
new file mode 100644
index 000000000..4e02bf969
--- /dev/null
+++ b/community/glom/glom.changelog
@@ -0,0 +1,2 @@
+2013-11-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * glom-1.24.2-1
diff --git a/community/glusterfs/PKGBUILD b/community/glusterfs/PKGBUILD
index 7206aaa56..7a5ca0534 100644
--- a/community/glusterfs/PKGBUILD
+++ b/community/glusterfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100446 2013-11-04 12:12:13Z spupykin $
+# $Id: PKGBUILD 102127 2013-12-05 14:49:23Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributors:
# Andrei Antoukh - niwi@niwi.be - http://www.niwi.be
@@ -7,19 +7,15 @@
pkgname=glusterfs
pkgver=3.4.1
_basever=`echo $pkgver | cut -f1-2 -d.`
-pkgrel=1
+pkgrel=2
pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
arch=(i686 x86_64 mips64el)
url='http://www.gluster.org/'
license=(GPL2 LGPL3)
depends=(fuse python2 libxml2)
makedepends=(flex bison)
-source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz
- glusterd.service)
-sha256sums=('2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8'
- '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b')
-sha256sums=('b5f1b4e3c6b86ecdfc5ff1b870ae3d3384bb2e3943565d6907c29ee6e21ab739'
- '18e6c3bcca396a4524d866977d3fa86135377d7bf5d28a130e697ae2e85f043b')
+source=(http://download.gluster.org/pub/gluster/glusterfs/$_basever/$pkgver/glusterfs-$pkgver.tar.gz)
+md5sums=('dce3d066b7351b360454ea9ca4cabe4c')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -32,6 +28,7 @@ build() {
--localstatedir=/var \
--mandir=/usr/share/man \
--libexecdir=/usr/lib/$pkgname \
+ --with-systemddir=/usr/lib/systemd/system \
PYTHON=python2
make
@@ -51,10 +48,6 @@ package() {
$srcdir/$pkgname-$pkgver/{README,INSTALL,COPYING*} \
$pkgdir/usr/share/doc/glusterfs/
- install -D -m 644 \
- $srcdir/glusterd.service \
- $pkgdir/usr/lib/systemd/system/glusterd.service
-
cp -rf \
$srcdir/$pkgname-$pkgver/doc/* \
$pkgdir/usr/share/doc/glusterfs/
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index 411d28e49..a0a3a160f 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99532 2013-10-29 11:26:02Z spupykin $
+# $Id: PKGBUILD 102358 2013-12-09 12:50:15Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: farid <farid at archlinuc-br.org>
@@ -6,7 +6,7 @@
pkgbase=gmic
pkgname=("gmic" "gimp-plugin-gmic" "zart")
-pkgver=1.5.7.2
+pkgver=1.5.8.0
pkgrel=1
arch=("i686" "x86_64" "mips64el")
url="http://gmic.sourceforge.net"
@@ -15,7 +15,7 @@ makedepends=('gimp' 'qt4' 'fftw' 'openexr' 'opencv' 'mesa' 'gtk2')
#options=('!emptydirs')
source=("http://downloads.sourceforge.net/sourceforge/gmic/gmic_${pkgver}.tar.gz"
"opencv-buildfix.patch")
-md5sums=('08aa65f01b5bec9cb0ff71b30102cf4e'
+md5sums=('286d99392a80aaaf2dbcda2ec95f021e'
'120319b0d6c81c5af186abe2281b79ca')
prepare() {
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index ef0c49064..567b21e2f 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99769 2013-10-30 23:36:07Z allan $
+# $Id: PKGBUILD 102250 2013-12-07 10:36:34Z bpiotrowski $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=gnash
pkgname=(gnash-common gnash-gtk)
pkgver=0.8.10
-pkgrel=10
+pkgrel=11
arch=(i686 x86_64 mips64el)
url="http://www.gnu.org/software/gnash/"
license=(GPL3)
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index 61f935720..f2ef8ee2d 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -1,43 +1,52 @@
-# $Id: PKGBUILD 99771 2013-10-30 23:36:54Z allan $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 103047 2013-12-25 19:18:23Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: Johannes Sjolund <j.sjolund@gmail.com>
pkgname=gnome-commander
-pkgver=1.2.8.15
+pkgver=1.2.8.16
pkgrel=1
-pkgdesc="A graphical two-pane filemanager for Gnome"
+pkgdesc='Graphical two-pane filemanager for Gnome'
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.nongnu.org/gcmd/"
+url='http://www.nongnu.org/gcmd/'
license=('GPL')
depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm')
-makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool')
-install=gnome-commander.install
+makedepends=('perlxml' 'gnome-doc-utils' 'intltool')
+install=$pkgname.install
source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz
- gnome-commander-1.2.8.15-build.patch)
-sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f'
- '856e9c1a17acbb97772ed93d01d81746098e03f5c06375cc976fc784a0011088')
+ gnome-commander-1.2.8.15-build.patch)
+sha256sums=('84d653fab2eaec233b6d899f339099c2fa2d2d5cbdb7a33bd7022c34ed901347'
+ '856e9c1a17acbb97772ed93d01d81746098e03f5c06375cc976fc784a0011088')
-build() {
- cd "$srcdir/$pkgname-$pkgver"
+# mips64el patch
+prepare() {
+ cd "$pkgname-$pkgver"
patch -Np1 -i ${srcdir}/gnome-commander-1.2.8.15-build.patch
- # python2 fix
- for file in doc/*/gnome-commander.xml; do
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # Python 2 fix
+ for f in doc/*/gnome-commander.xml; do
+ sed -i 's:env python:env python2:' "$f"
done
./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper --enable-python
-
+ --localstatedir=/var --disable-scrollkeeper --enable-python
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+ cd "$pkgname-$pkgver"
- mkdir -p "$pkgdir"/usr/share/gconf/schemas
- gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/$pkgname.schemas \
- --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas
- rm -rf "$pkgdir"/etc/gconf/schemas/
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+ install -d "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
+ --domain "$pkgname" "$pkgdir/etc/gconf/schemas/"*.schemas
+ rm -rf "$pkgdir/etc/gconf/schemas/"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gnome-commander/gnome-commander.install b/community/gnome-commander/gnome-commander.install
index e1b6d3a0c..1c0d43e16 100644
--- a/community/gnome-commander/gnome-commander.install
+++ b/community/gnome-commander/gnome-commander.install
@@ -1,7 +1,7 @@
pkgname=gnome-commander
post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
+ gconfpkg --install "$pkgname"
update-desktop-database -q
}
@@ -14,9 +14,11 @@ post_upgrade() {
}
pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
+ gconfpkg --uninstall "$pkgname"
}
post_remove() {
update-desktop-database -q
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gnome-packagekit/PKGBUILD b/community/gnome-packagekit/PKGBUILD
index f4dd9b4d4..f17f8dd90 100644
--- a/community/gnome-packagekit/PKGBUILD
+++ b/community/gnome-packagekit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99773 2013-10-30 23:37:38Z allan $
+# $Id: PKGBUILD 102874 2013-12-23 07:07:51Z bgyorgy $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
pkgname=gnome-packagekit
-pkgver=3.8.2
+pkgver=3.10.1
pkgrel=1
pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop'
arch=('i686' 'x86_64' 'mips64el')
@@ -11,12 +11,19 @@ license=('GPL')
depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify'
'packagekit')
makedepends=('gconf' 'gtk-doc' 'intltool' 'itstool' 'libcanberra' 'upower')
-optdepends=('polkit-gnome: required for privileged actions'
- 'gnome-settings-daemon-updates: update and message notifications')
+optdepends=('gnome-settings-daemon-updates: update and message notifications')
options=('!emptydirs')
install="$pkgname.install"
-source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('f13481d477a47295fa204b73ae7590f61d5576a8c889e5644cee0bc1f5cf530c')
+source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
+ "packagekit-0.8.patch")
+sha256sums=('40f11968e6a40606486f232fd6f61348eb75dc465f25deb2f157f6546bbe4e26'
+ '717ba4d281adbafc9409202538ad1c8ce9a2bb41a6a0bc127e8dd5c4c1da1d65')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -RNp1 -i "$srcdir/packagekit-0.8.patch"
+}
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/gnome-packagekit/packagekit-0.8.patch b/community/gnome-packagekit/packagekit-0.8.patch
new file mode 100644
index 000000000..e1b1b2f97
--- /dev/null
+++ b/community/gnome-packagekit/packagekit-0.8.patch
@@ -0,0 +1,65 @@
+From 4077ba3ea30354ef070d640a5af4b6a913e97f4b Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Tue, 18 Jun 2013 12:56:05 +0000
+Subject: Ignore package progress updates when the transaction is being simulated
+
+PackageKit backends do not have to issue INFO_FINISHED when simulating, and most
+don't bother. As we didn't special-case simulation, we set up the activity
+spinner on the Package(INFO_UPDATING) event and do not cancel the signal.
+
+This leaves every row in the update viewer with a spinning cursor, which due to
+the way the code was structured lead to an O(n*n) exposion of updates to the
+cell renderers for each update. For a dozen or so updates it was not noticable,
+and nobody noticed the slight increase of CPU usage.
+
+Now that TeX Live has officially jumped the shark and has many hundreds of
+sub-packages, it's quite plausible to have *thousands* of small packages to
+update. This means that the O(n*n) bug stops being a minor increase in CPU and
+starts to use the CPU at 100% for many hours before completing.
+
+Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=969852
+---
+diff --git a/src/gpk-update-viewer.c b/src/gpk-update-viewer.c
+index 53be9cf..a2182a1 100644
+--- a/src/gpk-update-viewer.c
++++ b/src/gpk-update-viewer.c
+@@ -841,6 +841,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
+ gchar *text;
+ gint percentage;
+ GtkWidget *widget;
++ guint64 transaction_flags;
+ PkInfoEnum info;
+ PkRoleEnum role;
+ PkStatusEnum status;
+@@ -853,6 +854,7 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
+ "percentage", &percentage,
+ "package", &package,
+ "allow-cancel", &allow_cancel,
++ "transaction-flags", &transaction_flags,
+ NULL);
+
+ if (type == PK_PROGRESS_TYPE_PACKAGE) {
+@@ -864,6 +866,10 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
+ GtkTreePath *path;
+ gboolean scroll;
+
++ /* ignore simulation phase */
++ if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE))
++ goto out;
++
+ /* add the results, not the progress */
+ if (role == PK_ROLE_ENUM_GET_UPDATES)
+ goto out;
+@@ -1040,6 +1046,10 @@ gpk_update_viewer_progress_cb (PkProgress *progress,
+ guint size_display;
+ PkItemProgress *item_progress;
+
++ /* ignore simulation phase */
++ if (pk_bitfield_contain (transaction_flags, PK_TRANSACTION_FLAG_ENUM_SIMULATE))
++ goto out;
++
+ g_object_get (progress,
+ "item-progress", &item_progress,
+ NULL);
+--
+cgit v0.9.2
diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD
index b7cd44c95..75e3b7a29 100644
--- a/community/gnome-screensaver/PKGBUILD
+++ b/community/gnome-screensaver/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 98193 2013-10-07 12:08:28Z jgc $
+# $Id: PKGBUILD 101767 2013-11-30 20:33:20Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-screensaver
pkgver=3.6.1
-pkgrel=6
+pkgrel=7
pkgdesc="Legacy GNOME screensaver"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-url="http://live.gnome.org/GnomeScreensaver"
+url="https://wiki.gnome.org/Projects/GnomeScreensaver"
backup=(etc/pam.d/gnome-screensaver)
depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop')
makedepends=('intltool' 'gnome-common')
@@ -18,12 +18,16 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p
gnome-screensaver.pam
move-desktop-file.patch
fix-autoconf.patch
- lock_screen_on_suspend.patch)
+ fix-systemd-support.patch
+ lock_screen_on_suspend.patch
+ lightdm_switch_user.patch)
sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0'
'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda'
'4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974'
'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb'
- '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8')
+ '8aa387578c1756e573f6558a66be25fc96d7e8567fb7bee580159479841f5f45'
+ '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8'
+ '5d40bd6e1843150912dc52932eaa94c0f6d57931fd45a3769ef40e2335fe3c6f')
prepare() {
cd "$pkgname-$pkgver"
@@ -34,13 +38,18 @@ prepare() {
# Fix build
patch -Np1 -i "$srcdir/fix-autoconf.patch"
+ # Fix systemd support
+ patch -Np1 -i "$srcdir/fix-systemd-support.patch"
+
# Lock screen on suspend with systemd
patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch"
+
+ # Add support for user switch with LightDM
+ patch -Np1 -i "$srcdir/lightdm_switch_user.patch"
}
build() {
cd "$pkgname-$pkgver"
-
autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
--with-mit-ext
diff --git a/community/gnome-screensaver/fix-systemd-support.patch b/community/gnome-screensaver/fix-systemd-support.patch
new file mode 100644
index 000000000..61db06029
--- /dev/null
+++ b/community/gnome-screensaver/fix-systemd-support.patch
@@ -0,0 +1,91 @@
+From cac2c0ad8f4f40b6b175b9fbcde06935859f1bbc Mon Sep 17 00:00:00 2001
+From: Peter de Ridder <peter@xfce.org>
+Date: Wed, 20 Mar 2013 20:44:51 +0100
+Subject: [PATCH] Use the session path instead of the session id.
+
+---
+ src/gs-listener-dbus.c | 47 +++++++++++++++++++++++++++--------------------
+ 1 file changed, 27 insertions(+), 20 deletions(-)
+
+diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c
+index 703d9e1..11fb95e 100644
+--- a/src/gs-listener-dbus.c
++++ b/src/gs-listener-dbus.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <time.h>
+ #include <string.h>
++#include <unistd.h>
+
+ #include <glib/gi18n.h>
+
+@@ -116,19 +117,8 @@ enum {
+ if (listener->priv->session_id == NULL)
+ return FALSE;
+
+-#ifdef WITH_SYSTEMD
+- /* The bus object path is simply the actual session ID
+- * prefixed to make it a bus path */
+- if (listener->priv->have_systemd)
+- return g_str_has_prefix (ssid, SYSTEMD_LOGIND_SESSION_PATH "/")
+- && strcmp (ssid + sizeof (SYSTEMD_LOGIND_SESSION_PATH),
+- listener->priv->session_id) == 0;
+-#endif
+-
+-#ifdef WITH_CONSOLE_KIT
+ if (strcmp (ssid, listener->priv->session_id) == 0)
+ return TRUE;
+-#endif
+
+ return FALSE;
+ }
+@@ -416,20 +406,37 @@ enum {
+
+ #ifdef WITH_SYSTEMD
+ if (listener->priv->have_systemd) {
+- char *t;
+- int r;
++ dbus_uint32_t pid = getpid();
+
+- r = sd_pid_get_session (0, &t);
+- if (r < 0) {
+- gs_debug ("Couldn't determine our own session id: %s", strerror (-r));
++ message = dbus_message_new_method_call (SYSTEMD_LOGIND_SERVICE, SYSTEMD_LOGIND_PATH, SYSTEMD_LOGIND_INTERFACE, "GetSessionByPID");
++ if (message == NULL) {
++ gs_debug ("Couldn't allocate the dbus message");
+ return NULL;
+ }
+
+- /* t is allocated with malloc(), we need it with g_malloc() */
+- ssid = g_strdup(t);
+- free (t);
++ if (dbus_message_append_args (message, DBUS_TYPE_UINT32, &pid, DBUS_TYPE_INVALID) == FALSE) {
++ gs_debug ("Couldn't add args to the dbus message");
++ return NULL;
++ }
++
++ /* FIXME: use async? */
++ reply = dbus_connection_send_with_reply_and_block (listener->priv->system_connection,
++ message,
++ -1, &error);
++ dbus_message_unref (message);
++
++ if (dbus_error_is_set (&error)) {
++ gs_debug ("%s raised:\n %s\n\n", error.name, error.message);
++ dbus_error_free (&error);
++ return NULL;
++ }
++
++ dbus_message_iter_init (reply, &reply_iter);
++ dbus_message_iter_get_basic (&reply_iter, &ssid);
++
++ dbus_message_unref (reply);
+
+- return ssid;
++ return g_strdup (ssid);
+ }
+ #endif
+
+--
+1.8.4
+
diff --git a/community/gnome-screensaver/lightdm_switch_user.patch b/community/gnome-screensaver/lightdm_switch_user.patch
new file mode 100644
index 000000000..27f67efc7
--- /dev/null
+++ b/community/gnome-screensaver/lightdm_switch_user.patch
@@ -0,0 +1,100 @@
+Description: Under lightdm, use dbus to switch to greeter instead of
+ calling gdmflexiserver
+Author: Marc Deslauriers <marc.deslauriers@canonical.com>
+Forwarded: No, upstream uses GDM
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/950583
+
+Index: gnome-screensaver-3.4.2/src/gs-lock-plug.c
+===================================================================
+--- gnome-screensaver-3.4.2.orig/src/gs-lock-plug.c 2012-06-28 10:50:53.955326278 +1200
++++ gnome-screensaver-3.4.2/src/gs-lock-plug.c 2012-06-28 10:50:58.055326137 +1200
+@@ -148,28 +148,60 @@
+ static void
+ do_user_switch (GSLockPlug *plug)
+ {
+- GAppInfo *app;
+- GAppLaunchContext *context;
+- GError *error;
+- char *command;
+-
+- command = g_strdup_printf ("%s %s",
+- GDM_FLEXISERVER_COMMAND,
+- GDM_FLEXISERVER_ARGS);
++ GError *error = NULL;
+
+- error = NULL;
+- context = (GAppLaunchContext*)gdk_app_launch_context_new ();
+- app = g_app_info_create_from_commandline (command, "gdmflexiserver", 0, &error);
+- if (app)
+- g_app_info_launch (app, NULL, context, &error);
+-
+- g_free (command);
+- g_object_unref (context);
+- g_object_unref (app);
++ /* If running under LightDM switch to the greeter using dbus */
++ if (g_getenv("XDG_SEAT_PATH")) {
++ GDBusConnection *bus;
++ GVariant *result = NULL;
++
++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error);
++ if (error)
++ g_warning ("Failed to get system bus: %s", error->message);
++ g_clear_error (&error);
++
++ if (bus)
++ result = g_dbus_connection_call_sync (bus,
++ "org.freedesktop.DisplayManager",
++ g_getenv ("XDG_SEAT_PATH"),
++ "org.freedesktop.DisplayManager.Seat",
++ "SwitchToGreeter",
++ g_variant_new ("()"),
++ G_VARIANT_TYPE ("()"),
++ G_DBUS_CALL_FLAGS_NONE,
++ -1,
++ NULL,
++ &error);
++ if (error)
++ g_warning ("Failed to switch to greeter: %s", error->message);
++ g_clear_error (&error);
+
+- if (error != NULL) {
+- gs_debug ("Unable to start GDM greeter: %s", error->message);
+- g_error_free (error);
++ if (result)
++ g_variant_unref (result);
++ } else {
++
++ GAppInfo *app;
++ GAppLaunchContext *context;
++ char *command;
++
++ command = g_strdup_printf ("%s %s",
++ GDM_FLEXISERVER_COMMAND,
++ GDM_FLEXISERVER_ARGS);
++
++ error = NULL;
++ context = (GAppLaunchContext*)gdk_app_launch_context_new ();
++ app = g_app_info_create_from_commandline (command, "gdmflexiserver", 0, &error);
++ if (app)
++ g_app_info_launch (app, NULL, context, &error);
++
++ g_free (command);
++ g_object_unref (context);
++ g_object_unref (app);
++
++ if (error != NULL) {
++ gs_debug ("Unable to start GDM greeter: %s", error->message);
++ g_error_free (error);
++ }
+ }
+ }
+
+@@ -1026,7 +1058,7 @@
+ if (switch_enabled) {
+ gboolean found;
+ found = is_program_in_path (GDM_FLEXISERVER_COMMAND);
+- if (found) {
++ if (found || g_getenv("XDG_SEAT_PATH")) {
+ gtk_widget_show (plug->priv->auth_switch_button);
+ } else {
+ gs_debug ("Waring: GDM flexiserver command not found: %s", GDM_FLEXISERVER_COMMAND);
diff --git a/community/gnome-settings-daemon-updates/PKGBUILD b/community/gnome-settings-daemon-updates/PKGBUILD
index aae1c29a1..e05c0fe58 100644
--- a/community/gnome-settings-daemon-updates/PKGBUILD
+++ b/community/gnome-settings-daemon-updates/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99775 2013-10-30 23:38:21Z allan $
+# $Id: PKGBUILD 102872 2013-12-23 06:37:43Z bgyorgy $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
_pkgname=gnome-settings-daemon
pkgname=$_pkgname-updates
-pkgver=3.8.2
+pkgver=3.10.2
pkgrel=1
pkgdesc="Updates plugin for the GNOME Settings daemon"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,15 +14,21 @@ options=('!emptydirs')
install=$_pkgname.install
url="http://www.gnome.org"
source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"
+ 'packagekit-0.8.patch'
'arch.patch')
-sha256sums=('e2118024549b1a3b24e338403d3451211b8cde5c68e387d9a0081e137191b0be'
- '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea')
+sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264'
+ '2fd5ee457f5d57bfd9edef049719f55ab1cab5fe6d0fb422f91fe363c02e6efd'
+ '217004c112b18cf136c535ef3d6cc90f0cecc495573cfb8653ff089230d248bb')
-build() {
+prepare() {
cd "$srcdir/$_pkgname-$pkgver"
-
+ patch -RNp1 -i "$srcdir/packagekit-0.8.patch"
patch -Np1 -i "$srcdir/arch.patch"
- autoreconf
+ autoreconf -fi
+}
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
@@ -31,7 +37,8 @@ build() {
#https://bugzilla.gnome.org/show_bug.cgi?id=656231
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make -s
+ make -C 'gnome-settings-daemon'
+ make -C 'plugins/updates'
}
package() {
diff --git a/community/gnome-settings-daemon-updates/arch.patch b/community/gnome-settings-daemon-updates/arch.patch
index df70cd9f8..297b98a48 100644
--- a/community/gnome-settings-daemon-updates/arch.patch
+++ b/community/gnome-settings-daemon-updates/arch.patch
@@ -35,6 +35,17 @@ index 81c7179..6fd3534 100644
libupdates_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
+@@ -58,7 +60,9 @@ gsd_test_updates_SOURCES = \
+ gsd-updates-firmware.h \
+ gsd-updates-firmware.c \
+ gsd-updates-manager.h \
+- gsd-updates-manager.c
++ gsd-updates-manager.c \
++ gsd-updates-watch.h \
++ gsd-updates-watch.c
+
+ gsd_test_updates_CPPFLAGS = \
+ -I$(top_srcdir)/data/ \
diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
index 95ee1c4..7b26c06 100644
--- a/plugins/updates/gsd-updates-manager.c
diff --git a/community/gnome-settings-daemon-updates/packagekit-0.8.patch b/community/gnome-settings-daemon-updates/packagekit-0.8.patch
new file mode 100644
index 000000000..eae0105e0
--- /dev/null
+++ b/community/gnome-settings-daemon-updates/packagekit-0.8.patch
@@ -0,0 +1,60 @@
+From 5f4f1ed45747343f26f280401bc4915d92b71d89 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 30 Sep 2013 12:06:22 +0000
+Subject: updates: Raise the dep on PackageKit to avoid complexity
+
+---
+diff --git a/configure.ac b/configure.ac
+index 87eb473..199542c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -306,7 +306,7 @@ AC_ARG_ENABLE(packagekit,
+ [WANT_PACKAGEKIT=yes]) dnl Default value
+
+ if test x$WANT_PACKAGEKIT = xyes ; then
+- PK_REQUIRED_VERSION=0.7.4
++ PK_REQUIRED_VERSION=0.8.1
+ PKG_CHECK_MODULES(PACKAGEKIT, glib-2.0 packagekit-glib2 >= $PK_REQUIRED_VERSION upower-glib >= $UPOWER_REQUIRED_VERSION gudev-1.0 libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
+ [have_packagekit=true
+ AC_DEFINE(HAVE_PACKAGEKIT, 1, [Define if PackageKit should be used])],
+diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c
+index 3aff29a..0f73a42 100644
+--- a/plugins/updates/gsd-updates-manager.c
++++ b/plugins/updates/gsd-updates-manager.c
+@@ -742,7 +742,6 @@ auto_download_updates (GsdUpdatesManager *manager)
+ package_ids[i] = g_strdup (pk_package_get_id (pkg));
+ }
+
+-#if PK_CHECK_VERSION(0,8,1)
+ /* we've set only-download in PkTask */
+ pk_task_update_packages_async (manager->priv->task,
+ package_ids,
+@@ -750,16 +749,6 @@ auto_download_updates (GsdUpdatesManager *manager)
+ NULL, NULL,
+ (GAsyncReadyCallback) package_download_finished_cb,
+ manager);
+-#else
+- /* download them all */
+- pk_client_download_packages_async (PK_CLIENT(manager->priv->task),
+- package_ids,
+- NULL, /* this means system cache */
+- manager->priv->cancellable,
+- NULL, NULL,
+- (GAsyncReadyCallback) package_download_finished_cb,
+- manager);
+-#endif
+ g_strfreev (package_ids);
+ }
+
+@@ -1506,9 +1495,7 @@ gsd_updates_manager_start (GsdUpdatesManager *manager,
+ g_object_set (manager->priv->task,
+ "background", TRUE,
+ "interactive", FALSE,
+-#if PK_CHECK_VERSION(0,8,1)
+ "only-download", TRUE,
+-#endif
+ NULL);
+
+ /* watch UDev for missing firmware */
+--
+cgit v0.9.2
diff --git a/community/gnuchess/PKGBUILD b/community/gnuchess/PKGBUILD
index cbc34b8a9..968d29dd4 100644
--- a/community/gnuchess/PKGBUILD
+++ b/community/gnuchess/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 88493 2013-04-18 15:55:51Z jsteel $
-# Maintainer: Jonathan Steel <mail@jsteel.org>
+# $Id: PKGBUILD 101444 2013-11-25 18:39:13Z jsteel $
+# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gnuchess
-pkgver=6.0.3
+pkgver=6.1.1
pkgrel=1
-pkgdesc="Lets most modern computers play a full game of chess"
-url="http://www.gnu.org/software/chess/chess.html"
+pkgdesc="Play chess against the computer on a terminal and an engine for graphical chess frontends"
arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-depends=('glibc' 'ncurses' 'readline')
-optdepends=('xboard: for a GUI')
-source=(ftp://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz)
-md5sums=('28625afb8f48b86211ee1d217c308064')
+url="http://www.gnu.org/software/chess/chess.html"
+license=('GPL3')
+depends=('bash')
+optdepends=('xboard: graphical frontend')
+install=$pkgname.install
+source=(http://ftp.gnu.org/pub/gnu/chess/$pkgname-$pkgver.tar.gz)
+md5sums=('1299cbd0025a7cf4fbba21e6c2ef6278')
build() {
cd "$srcdir"/$pkgname-$pkgver
diff --git a/community/gnuchess/gnuchess.install b/community/gnuchess/gnuchess.install
new file mode 100644
index 000000000..43d005279
--- /dev/null
+++ b/community/gnuchess/gnuchess.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(gnuchess.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
+ done
+}
diff --git a/community/gnuradio/PKGBUILD b/community/gnuradio/PKGBUILD
index 3200dee0a..32dcfb539 100644
--- a/community/gnuradio/PKGBUILD
+++ b/community/gnuradio/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 100355 2013-11-02 16:17:09Z kkeen $
+# $Id: PKGBUILD 102721 2013-12-17 19:43:24Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Dominik Heidler <dheidler@gmail.com>
+# Contributor: Jonatan Sastre <jsastreh [ at ] hotmail.com>
pkgname=gnuradio
-pkgver=3.7.1
-pkgrel=8
-pkgdesc="General purpose DSP and SDR toolkit. Supports usrp and fcd."
+pkgver=3.7.2.1
+pkgrel=1
+pkgdesc="General purpose DSP and SDR toolkit. With drivers for usrp and fcd."
arch=('i686' 'x86_64')
url="http://gnuradio.org"
license=('GPL')
@@ -14,27 +15,41 @@ optdepends=('python2-cheetah: gnuradio-companion'
'python2-lxml: gnuradio-companion'
'pygtk: gnuradio-companion'
'wxpython: gr-wxgui'
- 'qwtplot3d: gr-qtgui'
- 'pyqwt: gr-qtgui'
- 'doxygen: autogenerated documentation'
- 'pkgconfig: ?')
+ 'pkgconfig: libuhd')
conflicts=('gnuradio-git')
install=gnuradio.install
+# gr-qtgui todo
+# talk to ronald about adding qwt5 to qwt package
+# bring pyqwt in from AUR
+# update optdepends
+# 'qwtplot3d: gr-qtgui'
+# 'pyqwt: gr-qtgui'
+# update makedepends
+# 'qwtplot3d'
+
# todo
# add gr-osmosdr-git to optdepends
# split the gui components?
# build doxygen docs?
# icons
+# comedilib: gr-comedi
+# zeroc-ice: gr-ctrlport
+# doxygen: C++ autogenerated documentation
+# python2-sphinx: Python autogenerated documentation
+
source=("http://gnuradio.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"
"21-fcd.rules")
-md5sums=('6c5e67da6ed8724dd900d8e343b64be4'
+md5sums=('f2ea23a30cb02802870fe8cb9bf272c9'
'465e12c454c6a22ebec9849181af7bdc')
build() {
export PYTHON=python2
cd "$srcdir/$pkgname-$pkgver"
+ sed -i -e "s|GR_PKG_LIBEXEC_DIR|GR_RUNTIME_DIR|" grc/freedesktop/CMakeLists.txt
+ sed -i -e "s|/qwt$|/qwt5|" -e "s| qwt | qwt5 |" cmake/Modules/FindQwt.cmake
+ sed -i -e "s| sphinx-build$| sphinx-build2|" cmake/Modules/FindSphinx.cmake
msg "Starting build."
mkdir -p build
cd build
@@ -43,7 +58,7 @@ build() {
-DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
-DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
-DENABLE_GRC=ON \
- -DCMAKE_INSTALL_PREFIX=/usr ../
+ -DCMAKE_INSTALL_PREFIX=/usr -Wno-dev ../
make
}
diff --git a/community/gnuradio/gnuradio.install b/community/gnuradio/gnuradio.install
index e111ef946..1166dd05e 100644
--- a/community/gnuradio/gnuradio.install
+++ b/community/gnuradio/gnuradio.install
@@ -1,11 +1,50 @@
-post_install() {
+
+# clean up for anyone silly enough to run this as root
+
+# it would be great if pkgname and not just pkgver was passed in the arg list
+
+_pkg='gnuradio'
+_cpython='cpython-33'
+
+post_upgrade() {
+ while read _f; do
+ if [[ "${_f:(-3)}" != ".py" ]]; then
+ continue
+ fi
+ if [[ ! -f "$_f" ]]; then
+ continue
+ fi
+ if [[ -e "${_f}c" ]]; then
+ rm -f "${_f}c"
+ fi
+ if [[ -e "${_f}o" ]]; then
+ rm -f "${_f}o"
+ fi
+ _thisdir="$(dirname "$_f")/__pycache__"
+ if [[ ! -d "$_thisdir" ]]; then
+ continue
+ fi
+ _thisfile="$(basename "$_f")"
+ _thisfile="${_thisfile/%.py/.${_cpython}.py}"
+ if [[ -e "${_thisdir}/${_thisfile}c" ]]; then
+ rm -f "${_thisdir}/${_thisfile}c"
+ fi
+ if [[ -e "${_thisdir}/${_thisfile}o" ]]; then
+ rm -f "${_thisdir}/${_thisfile}o"
+ fi
+ # no good way to test for empty dir
+ # would be 25% faster if there were
+ rmdir --ignore-fail-on-non-empty "$_thisdir" &> /dev/null
+ done <<< "$(pacman -Qql $_pkg | grep '\.py$')"
+
update-desktop-database -q
}
-post_upgrade() {
- post_install
+post_install() {
+ post_upgrade $1
}
-post_remove() {
- post_install
+pre_remove() {
+ post_upgrade $1
}
+
diff --git a/community/gnustep-gui/PKGBUILD b/community/gnustep-gui/PKGBUILD
index f6e97944a..d855785a3 100644
--- a/community/gnustep-gui/PKGBUILD
+++ b/community/gnustep-gui/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 98740 2013-10-17 14:01:47Z andyrtr $
+# $Id: PKGBUILD 101191 2013-11-19 11:01:21Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Sebastian Sareyko <public@nooms.de>
pkgname=gnustep-gui
pkgver=0.23.1
-pkgrel=4
+pkgrel=5
pkgdesc="The GNUstep GUI class library"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnustep.org/"
license=('LGPL')
-depends=('gnustep-back' 'libungif' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao')
+depends=('gnustep-back' 'aspell' 'gcc-libs' 'libcups' 'audiofile' 'libsndfile' 'giflib' 'libao')
makedepends=('gcc-objc' 'gnustep-base' 'gnustep-make')
conflicts=('gnustep-gui-svn')
groups=('gnustep-core')
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index 8515479de..52f9e77a8 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99613 2013-10-30 14:46:57Z arodseth $
+# $Id: PKGBUILD 101866 2013-12-02 13:37:29Z arodseth $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Rémy Oudompheng <remy@archlinux.org>
@@ -9,8 +9,8 @@
# Contributor: Daniel YC Lin <dlin.tw@gmail.com>
pkgname=go
-pkgver=1.1.2
-pkgrel=3
+pkgver=1.2
+pkgrel=1
epoch=2
pkgdesc='Compiler and tools for the Go programming language from Google'
arch=('x86_64' 'i686')
@@ -19,19 +19,20 @@ license=('custom')
depends=('perl' 'gawk')
makedepends=('inetutils')
options=('!strip' 'staticlibs')
+optdepends=('liteide: IDE for editing and building projects written in Go')
install="$pkgname.install"
backup=('usr/lib/go/bin')
if [ "$CARCH" == 'x86_64' ]; then
source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz"
"$pkgname.sh")
- sha256sums=('ad583ff91bd2955fc48d24001785587e3c3b5ce5c09e4971a37028db4c3f6a98'
- '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181')
+ sha256sums=('1252ca0aa0a96d53c0592fbc4ea9c9ff5c6b588169c92e08d06da9d89d9d91f2'
+ 'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
else
source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz"
"$pkgname.sh")
- sha256sums=('56f384c973e58c098ec462bcd892a7c1166b9a392461970ddb22d57ed4d495af'
- '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181')
+ sha256sums=('3f51aacc7af60c520fe1071f3cb1d9ceee5db0e8fdfb7168a73e12fd7603e651'
+ 'b6209904c88bde96efcac846c267e308e4dc39c8a45f2690204c2175de4b9b0a')
fi
build() {
@@ -50,6 +51,7 @@ build() {
# Enable ARM crosscompilation for linux
export GOOS=linux
export GOARCH=arm
+
bash make.bash
# Crosscompilation for various platforms (including linux)
diff --git a/community/go/go.install b/community/go/go.install
index 755f0a442..e0610f3c5 100644
--- a/community/go/go.install
+++ b/community/go/go.install
@@ -1,13 +1,10 @@
-post_upgrade() {
- # Friendly message to the user
- echo "Example use of the \"go\" tool as a user:"
- echo " mkdir ~/go"
- echo " export GOPATH=~/go"
- echo " go get website.com/user/module"
-}
-
post_install() {
- post_upgrade
+ # Friendly message for new users
+ echo "Example use of the \"go\" tool:"
+ echo ' mkdir ~/mygoproject'
+ echo ' export GOPATH=~/mygoproject'
+ echo ' export PATH=\$PATH:\$GOPATH/bin'
+ echo ' go get github.com/codegangsta/martini'
}
# vim:set ts=2 sw=2 et:
diff --git a/community/go/go.sh b/community/go/go.sh
index 51c6e7677..8393dc8d2 100644
--- a/community/go/go.sh
+++ b/community/go/go.sh
@@ -1,2 +1 @@
-export GOPATH=/usr/lib/go/site
export GOROOT=/usr/lib/go
diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
index 54b43ad5b..0d3a76514 100644
--- a/community/goaccess/PKGBUILD
+++ b/community/goaccess/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98175 2013-10-07 01:47:21Z fyan $
+# $Id: PKGBUILD 102738 2013-12-18 10:42:12Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Josh VanderLinden <arch@cloudlery.com>
# Contributor: Nicolas Storme <nicolas@atelier-web.com>
pkgname=goaccess
-pkgver=0.6.1
+pkgver=0.7
pkgrel=1
pkgdesc="An open source real-time web log analyzer and interactive viewer"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,14 +14,14 @@ depends=('ncurses' 'geoip' 'glib2')
source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./configure --enable-geoip
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make prefix="$pkgdir/usr" install
}
-sha512sums=('67712e4af16c6e039ca46f6f8d8302a58be1e0cfd0c76930068c03a9989c35b58b61f7b1e6a9e79cbb978c8f492b80782b8c7b894abc2e067f0a520e2981f98b')
+sha512sums=('0817f6b7429d464fdd2070941b4bf6abaa5398a4b720e31af5af8fd8cd41169e5b71f90157101121cc904d06fb5bd6c7a109c4260fe8f829a19a75ff4b489146')
diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD
index 6732c0371..cb591bd08 100644
--- a/community/goocanvas/PKGBUILD
+++ b/community/goocanvas/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99781 2013-10-30 23:40:49Z allan $
+# $Id: PKGBUILD 102669 2013-12-17 12:22:44Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=goocanvas
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
pkgdesc="A cairo canvas widget for GTK+"
arch=(i686 x86_64 'mips64el')
url="http://live.gnome.org/GooCanvas"
@@ -13,8 +13,7 @@ license=("LGPL")
depends=('gtk3')
makedepends=('gobject-introspection' 'python-gobject2')
source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/2.0/goocanvas-$pkgver.tar.xz)
-sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553')
-sha256sums=('0c3a595a6d2a4fe0f1a1a5243637e66aa1bfbaf6492455bfd0b51e0dec9b1553')
+sha256sums=('f20e5fbef8d1a2633033edbd886dd13146a1b948d1813a9c353a80a29295d1d0')
build() {
cd $srcdir/goocanvas-$pkgver
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index 9a9643bed..701199e19 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94883 2013-08-01 06:54:59Z bpiotrowski $
+# $Id: PKGBUILD 102252 2013-12-07 10:36:37Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
# Contributor: Olivier Ramonat <olivier at ramonat dot fr>
pkgname=gource
pkgver=0.40
-pkgrel=3
+pkgrel=4
pkgdesc="software version control visualization"
license=(GPL3)
arch=(i686 x86_64 'mips64el')
diff --git a/community/gpointing-device-settings/PKGBUILD b/community/gpointing-device-settings/PKGBUILD
index 075e53f0f..4e1ccb46b 100644
--- a/community/gpointing-device-settings/PKGBUILD
+++ b/community/gpointing-device-settings/PKGBUILD
@@ -1,28 +1,33 @@
-# $Id: PKGBUILD 99786 2013-10-30 23:42:41Z allan $
+# $Id: PKGBUILD 102693 2013-12-17 14:10:52Z bgyorgy $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Thomas Mudrunka <harvie@@email..cz>
pkgname=gpointing-device-settings
pkgver=1.5.1
-pkgrel=4
+pkgrel=5
pkgdesc="GUI tool for setting pointing device such as TrackPoint or Touchpad"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-url="http://live.gnome.org/GPointingDeviceSettings"
+url="https://wiki.gnome.org/Attic/GPointingDeviceSettings"
depends=('gtk2' 'gconf')
makedepends=('gnome-settings-daemon' 'intltool')
-source=("http://keihanna.dl.sourceforge.jp/gsynaptics/45812/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1d1491473df8eabca3c15c997a975d7f')
+source=("http://sourceforge.jp/frs/redir.php?m=iij&f=/gsynaptics/45812/$pkgname-$pkgver.tar.gz"
+ "fix-build.patch")
+md5sums=('1d1491473df8eabca3c15c997a975d7f'
+ 'cc42b7bcd69fb43ae5bfbe6e1d540713')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # Enable deprecations
- sed -i -e '/DISABLE_DEPRECATED/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+ # Fix build
+ patch -Np1 -i "${srcdir}/fix-build.patch"
# Disable GSD plugin (won't build with GSD 3.8)
sed -i 's/ gnome-settings-daemon-plugins//' modules/Makefile.am
+}
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
autoreconf -fi
./configure --prefix=/usr --sysconfdir=/etc \
--disable-static --disable-schemas-install \
diff --git a/community/gpointing-device-settings/fix-build.patch b/community/gpointing-device-settings/fix-build.patch
new file mode 100644
index 000000000..341d96fc9
--- /dev/null
+++ b/community/gpointing-device-settings/fix-build.patch
@@ -0,0 +1,26 @@
+diff -Naur gpointing-device-settings-1.5.1.orig/configure.ac gpointing-device-settings-1.5.1/configure.ac
+--- gpointing-device-settings-1.5.1.orig/configure.ac 2010-02-05 00:38:20.000000000 +0100
++++ gpointing-device-settings-1.5.1/configure.ac 2013-12-17 15:00:08.394574115 +0100
+@@ -3,10 +3,9 @@
+
+ AC_INIT(gpointing-device-settings, 1.5.1,
+ [http://bugzilla.gnome.org/enter_bug.cgi?product=GPointingDeviceSettings])
+-AM_INIT_AUTOMAKE([1.9 tar-pax])
+-AM_INIT_AUTOMAKE([foreign])
++AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
+ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+
+ AM_PROG_LIBTOOL
+@@ -146,9 +145,6 @@
+
+ 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 -DGPDS_MODULEDIR=\\\"\"\$(gpds_moduledir)\"\\\""
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_DATADIR=\\\"\"\$(gpds_datadir)\"\\\""
+ GPDS_CFLAGS="$GPDS_CFLAGS -DGPDS_UIDIR=\\\"\"\$(gpds_uidir)\"\\\""
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index c1e642f31..61d0ba5eb 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94027 2013-07-13 12:32:55Z svenstaro $
+# $Id: PKGBUILD 102253 2013-12-07 10:36:38Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Maintainer: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=gpsdrive
pkgver=2.11
_pkgver=20120928
-pkgrel=19
+pkgrel=20
pkgdesc="A car (bike, ship, plane) navigation system"
arch=("i686" "x86_64" 'mips64el')
url="http://www.gpsdrive.de/"
@@ -57,6 +57,8 @@ build() {
-DWITH_SPEECH=OFF \
-DWITH_DBUS=OFF \
-DLIBGPS_OLD=OFF \
+ -DFREETYPE2_INCLUDE_DIRS=/usr/include/freetype2 \
+ -DFREETYPE2_LIBRARIES=/usr/lib \
"$srcdir/gpsdrive-${_pkgver}"
make
}
diff --git a/community/granite/PKGBUILD b/community/granite/PKGBUILD
index 45930bbfe..3af80216c 100644
--- a/community/granite/PKGBUILD
+++ b/community/granite/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 99110 2013-10-24 13:12:55Z alucryd $
+# $Id: PKGBUILD 102691 2013-12-17 13:25:28Z alucryd $
# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
# Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk>
pkgname=granite
-pkgver=0.2.2
-pkgrel=3
-pkgdesc="An extension of GTK+ libraries"
+pkgver=0.2.3
+pkgrel=1
+pkgdesc='An extension of GTK+ libraries'
arch=('i686' 'x86_64')
-url="https://launchpad.net/granite"
+url='https://launchpad.net/granite'
license=('LGPL3')
depends=('gtk3' 'libgee06')
makedepends=('cmake' 'gobject-introspection' 'vala')
install="${pkgname}.install"
-source=("https://launchpad.net/${pkgname}/${pkgver%\.?}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('341f94cd8c2af60fc072fb8602e1406bccd77189aad76424b172c3ce08c173cc')
+source=("${url}/${pkgver%\.?}/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
+sha256sums=('e0a448e647ee4b6dcff543b1d8695e9cb7e630e38c31ba741cf6b19eddae71f1')
build() {
cd ${pkgname}-${pkgver}
diff --git a/community/gsimplecal/PKGBUILD b/community/gsimplecal/PKGBUILD
index ede1ac540..8f1688ad4 100644
--- a/community/gsimplecal/PKGBUILD
+++ b/community/gsimplecal/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 76303 2012-09-15 15:56:51Z jsteel $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
+# $Id: PKGBUILD 101058 2013-11-15 19:09:26Z jsteel $
+# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
# Contributor: DrZaius <lou at fakeoutdoorsman dot com>
# Contributor: Victor Feight <vrfeight3 at gmail dot com>
pkgname=gsimplecal
-pkgver=1.6
+pkgver=2.0
pkgrel=1
pkgdesc="Simple and lightweight GTK calendar"
arch=('i686' 'x86_64' 'mips64el')
url="http://dmedvinsky.github.com/$pkgname"
license=('BSD')
-depends=('gtk2')
-source=(https://github.com/downloads/dmedvinsky/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('05a596de37491e52b646a0c71ec14841')
+depends=('gtk3')
+source=(https://github.com/dmedvinsky/$pkgname/archive/v$pkgver.tar.gz)
+md5sums=('ae839d5470c9f9a80d2b6a12164ae232')
build() {
cd "$srcdir"/$pkgname-$pkgver
+ ./autogen.sh
./configure --prefix=/usr
make
diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD
index 4c067e51b..a3e1f8e85 100644
--- a/community/gsoap/PKGBUILD
+++ b/community/gsoap/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 100170 2013-11-01 20:48:34Z spupykin $
+# $Id: PKGBUILD 101476 2013-11-26 09:44:41Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tor Krill <tor@krill.nu>
# Contributor: Lee.MaRS <leemars@gmail.com>
pkgname=gsoap
pkgver=2.8.16
-pkgrel=2
+pkgrel=3
pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++"
url="http://www.cs.fsu.edu/~engelen/soap.html"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'custom')
depends=('openssl' 'zlib' 'gcc-libs')
makedepends=('autoconf' 'automake')
+options=('staticlibs')
source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip
LICENSE)
md5sums=('274d16bea12b111681bcac2283c4c24a'
diff --git a/community/gtk2hs-buildtools/PKGBUILD b/community/gtk2hs-buildtools/PKGBUILD
index edf0440f6..ab7a8e97f 100644
--- a/community/gtk2hs-buildtools/PKGBUILD
+++ b/community/gtk2hs-buildtools/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 89286 2013-04-28 16:52:07Z td123 $
+# $Id: PKGBUILD 102051 2013-12-04 14:18:24Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=gtk2hs-buildtools
-pkgver=0.12.4
-pkgrel=2
+pkgver=0.12.5.1
+pkgrel=1
pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries."
url="http://hackage.haskell.org/package/gtk2hs-buildtools"
license=('GPL2')
@@ -13,7 +13,7 @@ depends=('gmp')
options=('strip')
provides=('haskell-gtk2hs-buildtools')
source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz)
-md5sums=('ad3d78bf7c25fdb4c713c3528d137a81')
+md5sums=('2f8f761559185c7375b0b31354d791c8')
build() {
cd ${srcdir}/gtk2hs-buildtools-$pkgver
diff --git a/extra/gtkglextmm/PKGBUILD b/community/gtkglextmm/PKGBUILD
index 2c7f02d66..04ddf09c7 100644
--- a/extra/gtkglextmm/PKGBUILD
+++ b/community/gtkglextmm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198074 2013-10-30 12:38:35Z allan $
+# $Id: PKGBUILD 102157 2013-12-06 11:32:53Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Bastien Bouclet <bastien.bouclet@gmail.com>
# Contributor: SpepS <dreamspepser at yahoo dot it>
diff --git a/extra/gtkglextmm/gdkspanfunc.patch b/community/gtkglextmm/gdkspanfunc.patch
index ae5672a8c..ae5672a8c 100644
--- a/extra/gtkglextmm/gdkspanfunc.patch
+++ b/community/gtkglextmm/gdkspanfunc.patch
diff --git a/extra/gtkimageview/PKGBUILD b/community/gtkimageview/PKGBUILD
index f5752f333..fb5ceaf50 100644
--- a/extra/gtkimageview/PKGBUILD
+++ b/community/gtkimageview/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198077 2013-10-30 12:39:44Z allan $
+# $Id: PKGBUILD 102159 2013-12-06 11:35:48Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan Blazek <appolito@gmail.com>
# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index 80354ec1e..68112a3b9 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92578 2013-06-08 21:06:37Z kkeen $
+# $Id: PKGBUILD 100853 2013-11-12 01:40:23Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Jared Casper <jaredcasper@gmail.com>
pkgname=gtkwave
-pkgver=3.3.47
+pkgver=3.3.52
pkgrel=1
pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
makedepends=('gperf')
install='gtkwave.install'
source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('fdb257ed42220a9a7526b70d1746054a')
+md5sums=('1a7b7fbfede6f1f91fe26845b3b36f48')
build() {
cd "${srcdir}/gtkwave-${pkgver}"
diff --git a/community/guichan/PKGBUILD b/community/guichan/PKGBUILD
index 4c7c841d3..0464b30d1 100644
--- a/community/guichan/PKGBUILD
+++ b/community/guichan/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99805 2013-10-30 23:49:55Z allan $
+# $Id: PKGBUILD 103044 2013-12-25 17:53:57Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Bjørn Lindeijer <bjorn@lindeijer.nl>
pkgname=guichan
pkgver=0.8.2
-pkgrel=3
+pkgrel=4
pkgdesc="A portable C++ GUI library designed for games using Allegro, SDL and/or OpenGL."
arch=('i686' 'x86_64' 'mips64el')
url="http://guichan.sourceforge.net/"
@@ -16,17 +16,17 @@ source=(http://guichan.googlecode.com/files/$pkgname-$pkgver.tar.gz)
sha256sums=('eedf206eae5201eaae027b133226d0793ab9a287bfd74c5f82c7681e3684eeab')
build() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}"/$pkgname-$pkgver
CXXFLAGS="-g" ./configure --prefix=/usr
make
}
package() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}"/$pkgname-$pkgver
- make prefix=${pkgdir}/usr install
+ make prefix="${pkgdir}"/usr install
# Install the license, as required for BSD
- install -m644 -D COPYING ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+ install -m644 -D COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/community/guitarix2/PKGBUILD b/community/guitarix2/PKGBUILD
index a6835ffa7..8af491c5e 100644
--- a/community/guitarix2/PKGBUILD
+++ b/community/guitarix2/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 95211 2013-08-06 18:27:47Z speps $
+# $Id: PKGBUILD 102254 2013-12-07 10:36:38Z bpiotrowski $
# Maintainer: speps <speps at aur dot archlinux dot org>
pkgname=guitarix2
-pkgver=0.28.2
-pkgrel=1
+pkgver=0.28.3
+pkgrel=2
pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
arch=('i686' 'x86_64')
url="http://guitarix.sourceforge.net/"
license=('GPL')
-depends=('gtkmm' 'jack' 'librsvg' 'liblrdf' 'boost-libs'
+depends=('gtkmm' 'jack' 'librsvg' 'liblrdf' 'bluez-libs' 'boost-libs'
'zita-convolver' 'zita-resampler' 'desktop-file-utils')
makedepends=('python2' 'boost' 'intltool' 'lv2')
optdepends=('meterbridge: sound meters')
@@ -17,7 +17,7 @@ conflicts=('guitarix' 'gx_head')
replaces=('guitarix' 'gx_head')
install="$pkgname.install"
source=("http://download.sourceforge.net/project/guitarix/guitarix/$pkgname-$pkgver.tar.bz2")
-md5sums=('d957c28e4d68318427f2478257307235')
+md5sums=('9b535512a07d5a48e67a5cec01ee6944')
build() {
cd "$srcdir/guitarix-$pkgver"
diff --git a/community/guvcview/PKGBUILD b/community/guvcview/PKGBUILD
index 628244fa7..c655e8916 100644
--- a/community/guvcview/PKGBUILD
+++ b/community/guvcview/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94885 2013-08-01 06:55:00Z bpiotrowski $
+# $Id: PKGBUILD 102513 2013-12-12 16:22:48Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com>
pkgname=guvcview
-pkgver=1.7.1
-pkgrel=2
+pkgver=1.7.2
+pkgrel=1
pkgdesc="A video viewer and capturer for the linux uvc driver"
arch=('i686' 'x86_64' 'mips64el')
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=('5ca1b9c89d2b9370ee203dcc24efd695')
+md5sums=('93fa335e6ce52bb730541d5280ed0dad')
build() {
cd "${srcdir}/${pkgname}-src-${pkgver}"
diff --git a/community/haddock/PKGBUILD b/community/haddock/PKGBUILD
index c67a180f2..e0d57ca63 100644
--- a/community/haddock/PKGBUILD
+++ b/community/haddock/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99417 2013-10-28 12:23:37Z arodseth $
+# $Id: PKGBUILD 102045 2013-12-04 13:09:12Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Vesa Kaihlavirta <vesa@archlinux.org>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
pkgname=haddock
-pkgver=2.13.2
-pkgrel=2
+pkgver=2.13.2.1
+pkgrel=1
pkgdesc='Tool for generating documentation for Haskell libraries'
url='http://hackage.haskell.org/package/haddock/'
license=('custom:BSD3')
@@ -14,7 +14,7 @@ makedepends=('alex' 'happy')
depends=('ghc' 'haskell-xhtml' 'haskell-ghc-paths')
install="$pkgname.install"
source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz")
-sha256sums=('25e7d5819d38cbb1c9b1ff967e2a4093c776c3defaa0a249c8eabba1e70892e3')
+sha256sums=('c9cfe2bd2e8e1201870f88bc9a2ccdb0173315d0a8c734b459ec344feb1af34e')
options=('staticlibs')
build() {
diff --git a/community/haskell-bytestring-show/PKGBUILD b/community/haskell-bytestring-show/PKGBUILD
index 7ed57a380..d5892f4f4 100644
--- a/community/haskell-bytestring-show/PKGBUILD
+++ b/community/haskell-bytestring-show/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 100508 2013-11-05 10:55:19Z spupykin $
+# $Id: PKGBUILD 102053 2013-12-04 14:18:45Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-bytestring-show
-pkgver=0.3.5.4
-pkgrel=5
+pkgver=0.3.5.5
+pkgrel=1
pkgdesc="Efficient conversion of values into readable byte strings."
url="http://hackage.haskell.org/package/bytestring-show"
license=("BSD3")
arch=('i686' 'x86_64')
depends=("ghc")
+options=('staticlibs')
install="${pkgname}.install"
source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz")
-md5sums=('2a4ab243c4b6fffed1fc663975a9ec6d')
+md5sums=('7ed08495da103ecc17b90dce70d1ca39')
build() {
cd ${srcdir}/bytestring-show-${pkgver}
diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD
index 751d2ee54..7fb276bb9 100644
--- a/community/haskell-cairo/PKGBUILD
+++ b/community/haskell-cairo/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 92370 2013-06-04 12:29:46Z spupykin $
+# $Id: PKGBUILD 102055 2013-12-04 14:19:06Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-cairo
-pkgver=0.12.4
-pkgrel=5
+pkgver=0.12.5.0
+pkgrel=1
pkgdesc="Binding to the cairo library for Gtk2Hs."
url="http://hackage.haskell.org/package/cairo"
license=('LGPL2.1')
arch=('i686' 'x86_64')
# deps adjusted to specific versions in package()
-depends=('ghc' 'cairo' 'haskell-mtl')
+depends=('ghc' 'cairo' 'haskell-mtl' 'haskell-utf8-string')
makedepends=("gtk2hs-buildtools")
-options=('strip')
+options=('strip' 'staticlibs')
conflicts=('gtk2hs-cairo')
provides=('gtk2hs-cairo')
replaces=('gtk2hs-cairo')
install=gtk2hs-cairo.install
source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz)
-md5sums=('b9d7e8de6ba4db680c222958622d6ee6')
+md5sums=('234b2a5f1e30844838aeb8adb28f0bf3')
build() {
cd ${srcdir}/cairo-$pkgver
@@ -34,7 +34,7 @@ build() {
package() {
_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
_hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-`
- depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hmtlver}")
+ depends=("ghc=${_ghcver}" "cairo" "haskell-mtl=${_hmtlver}" 'haskell-utf8-string')
cd ${srcdir}/cairo-${pkgver}
install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh
diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD
index 6d73d2e55..71fb08a97 100644
--- a/community/haskell-glib/PKGBUILD
+++ b/community/haskell-glib/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 89302 2013-04-28 16:52:23Z td123 $
+# $Id: PKGBUILD 102057 2013-12-04 14:19:25Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-glib
-pkgver=0.12.4
-pkgrel=4
+pkgver=0.12.5.0
+pkgrel=1
pkgdesc="Binding to the GLIB library for Gtk2Hs."
url="http://hackage.haskell.org/package/glib"
license=('LGPL2.1')
arch=('i686' 'x86_64')
# deps adjusted to specific versions in package()
-depends=('ghc' 'glib2')
+depends=('ghc' 'glib2' 'haskell-utf8-string')
makedepends=("gtk2hs-buildtools")
-options=('strip')
+options=('strip' 'staticlibs')
install=gtk2hs-glib.install
provides=('gtk2hs-glib')
replaces=('gtk2hs-glib')
conflicts=('gtk2hs-glib')
source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz)
-md5sums=('3172907258183466f1e604a435285c51')
+md5sums=('fa94e2f40641dd2fa0d01a0da3fd7b50')
build() {
cd glib-$pkgver
@@ -33,7 +33,7 @@ build() {
package() {
_ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
- depends=("ghc=${_ghcver}" "glib2")
+ depends=("ghc=${_ghcver}" "glib2" 'haskell-utf8-string')
cd ${srcdir}/glib-${pkgver}
install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh
diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD
index c7b150561..af497ad9a 100644
--- a/community/haskell-gtk/PKGBUILD
+++ b/community/haskell-gtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 89303 2013-04-28 16:52:24Z td123 $
+# $Id: PKGBUILD 102059 2013-12-04 14:19:51Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-gtk
-pkgver=0.12.4
-pkgrel=4
+pkgver=0.12.5.0
+pkgrel=1
pkgdesc="Binding to the gtk library for Gtk2Hs."
url="http://hackage.haskell.org/package/gtk"
license=('LGPL2.1')
@@ -13,11 +13,11 @@ makedepends=("gtk2hs-buildtools")
provides=('gtk2hs-gtk')
replaces=('gtk2hs-gtk')
conflicts=('gtk2hs-gtk')
-options=('strip')
+options=('strip' 'staticlibs')
install=gtk2hs-gtk.install
source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz
ghc-7.6.1.patch)
-md5sums=('165a04134cdc3aec9a9aa149c421b1de'
+md5sums=('d34d2da37f3e4e15dbc0b6a6aef0cd8f'
'5fb93f37fe3f494b30ee682a36b8f1b6')
build() {
diff --git a/community/haskell-hslogger/PKGBUILD b/community/haskell-hslogger/PKGBUILD
index a27bad530..852677c11 100644
--- a/community/haskell-hslogger/PKGBUILD
+++ b/community/haskell-hslogger/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 100510 2013-11-05 10:55:37Z spupykin $
+# $Id: PKGBUILD 102061 2013-12-04 14:20:16Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Arch Haskell Team <arch-haskell@haskell.org>
pkgname=haskell-hslogger
-pkgver=1.2.1
-pkgrel=5
+pkgver=1.2.3
+pkgrel=1
pkgdesc="Versatile logging framework"
url="http://hackage.haskell.org/package/hslogger"
license=('LGPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('ghc' 'haskell-mtl' 'haskell-network')
+options=('staticlibs')
install=${pkgname}.install
source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz)
-md5sums=('d94e39cd6a262565cf0758a6ead74919')
+md5sums=('4047e50789860c8ac3e8998f7de68ca5')
build() {
cd ${srcdir}/hslogger-${pkgver}
diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD
index 2d52b6be3..7c486d507 100644
--- a/community/haskell-pango/PKGBUILD
+++ b/community/haskell-pango/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 89311 2013-04-28 16:52:32Z td123 $
+# $Id: PKGBUILD 102063 2013-12-04 14:20:35Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-pango
-pkgver=0.12.4
-pkgrel=4
+pkgver=0.12.5.0
+pkgrel=1
pkgdesc="Binding to the pango library for Gtk2Hs."
url="http://hackage.haskell.org/package/pango"
license=('LGPL2.1')
@@ -14,10 +14,10 @@ makedepends=("gtk2hs-buildtools")
provides=('gtk2hs-pango')
replaces=('gtk2hs-pango')
conflicts=('gtk2hs-pango')
-options=('strip')
+options=('strip' 'staticlibs')
install=gtk2hs-pango.install
source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz)
-md5sums=('e498beb2d10b45ebf08bffc2296e1195')
+md5sums=('6dca381064ad8488baa69a783b05e28b')
build() {
cd ${srcdir}/pango-${pkgver}
diff --git a/community/haskell-primitive/PKGBUILD b/community/haskell-primitive/PKGBUILD
index 088f5e029..3b03198e4 100644
--- a/community/haskell-primitive/PKGBUILD
+++ b/community/haskell-primitive/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 89313 2013-04-28 16:52:35Z td123 $
+# $Id: PKGBUILD 101124 2013-11-17 20:46:26Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-primitive
-pkgver=0.5.0.1
-pkgrel=4
+pkgver=0.5.1.0
+pkgrel=1
pkgdesc="Wrappers for primitive operations"
url="http://hackage.haskell.org/package/primitive"
license=("custom:BSD3")
arch=('i686' 'x86_64')
makedepends=()
depends=("ghc")
-options=('strip')
+options=('strip' 'staticlibs')
install="${pkgname}.install"
source=("http://hackage.haskell.org/packages/archive/primitive/${pkgver}/primitive-${pkgver}.tar.gz")
sha256sums=('526c9d4d06b7b379cb1aaffeffbb30bef810e771f29617ef6d0d99df711f4313')
+sha256sums=('8817a5f307c4605709b37857c048caa22fcc7550d681d64a2eea756126721529')
build() {
cd ${srcdir}/primitive-${pkgver}
@@ -28,6 +29,9 @@ build() {
}
package() {
+ _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-`
+ depends=("ghc=${_ghcver}")
+
cd ${srcdir}/primitive-${pkgver}
install -Dm744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh
install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh
diff --git a/community/haskell-syb/PKGBUILD b/community/haskell-syb/PKGBUILD
index dee27a3c4..2aff699a1 100644
--- a/community/haskell-syb/PKGBUILD
+++ b/community/haskell-syb/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
_hkgname=syb
pkgname=haskell-syb
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.4.1
+pkgrel=1
pkgdesc="A library for client-side HTTP"
url="http://hackage.haskell.org/package/${_hkgname}"
license=('custom:BSD3')
@@ -12,7 +12,8 @@ depends=('ghc=7.6.3-1' sh)
options=('strip')
source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz)
install=${pkgname}.install
-md5sums=('ec2719d444a6561b2424dcef10b4fe34')
+options=('staticlibs')
+md5sums=('28df3b70cef652fa6c04e6353c580a7a')
build() {
cd ${srcdir}/${_hkgname}-${pkgver}
diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD
index b6fa033e1..4202d98db 100644
--- a/community/haskell-vector/PKGBUILD
+++ b/community/haskell-vector/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100512 2013-11-05 10:55:55Z spupykin $
+# $Id: PKGBUILD 101632 2013-11-29 15:58:32Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=haskell-vector
-pkgver=0.10.0.1
-pkgrel=5
+pkgver=0.10.9.1
+pkgrel=1
pkgdesc="Efficient Arrays"
url="http://code.haskell.org/vector"
license=("custom:BSD3")
@@ -11,10 +11,12 @@ arch=('i686' 'x86_64')
makedepends=()
# deps adjusted to specific versions in package()
depends=("ghc" "haskell-primitive")
-options=('strip')
+options=('strip' 'staticlibs')
install="${pkgname}.install"
source=("http://hackage.haskell.org/packages/archive/vector/${pkgver}/vector-${pkgver}.tar.gz")
sha256sums=('ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af')
+sha256sums=('23a8ab9a5257781db2513a0741a01f0d5f60c6d0730cd88136abfe7ae44c330d')
+sha256sums=('205656e9741aad406e427e988dbf1665bf5dbdf3e9d574e309c274be4e06bde5')
build() {
cd ${srcdir}/vector-${pkgver}
diff --git a/community/hedgewars/PKGBUILD b/community/hedgewars/PKGBUILD
index db7c957a7..cd4ef71eb 100644
--- a/community/hedgewars/PKGBUILD
+++ b/community/hedgewars/PKGBUILD
@@ -1,10 +1,12 @@
-# $Id: PKGBUILD 97071 2013-09-12 10:11:10Z spupykin $
+# $Id: PKGBUILD 103142 2013-12-27 12:15:28Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=hedgewars
-pkgver=0.9.19
-pkgrel=4
-pkgdesc="Free Worms-like turn based strategy game"
+pkgver=0.9.20
+pkgrel=1
+pkgdesc="turn based strategy, artillery, action and comedy game, featuring the
+ antics of pink hedgehogs with attitude as they battle from the depths of hell
+ to the depths of space."
arch=('i686' 'x86_64' 'mips64el')
url="http://hedgewars.org"
license=('GPL' 'custom')
@@ -20,19 +22,9 @@ makedepends=('fpc' 'cmake'
'haskell-vector'
'haskell-random')
source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
- hedgewars.png
- build-fix.patch
- ffmpeg2.0.patch)
-md5sums=('51d84ad6ea00e9894e6119b118b4a523'
- 'eeb14d50df39063549ac5eca9dbc65d1'
- 'a9d7b0ba72cbeb7fc74fce459db9dd90'
- 'da84d64a252579236d3ff0cc6e008e72')
-
-prepare() {
- cd $pkgname-src-$pkgver
- patch -Rp1 <$srcdir/build-fix.patch
- patch -Np1 -i ../ffmpeg2.0.patch
-}
+ hedgewars.png)
+md5sums=('7ee1b23e51053d34feb84464184f60fa'
+ 'eeb14d50df39063549ac5eca9dbc65d1')
build() {
cd $pkgname-src-$pkgver
@@ -40,8 +32,7 @@ build() {
-DCMAKE_BUILD_TYPE="Release" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DDATA_INSTALL_DIR=/usr/share/hedgewars \
- -DWITH_SERVER=1 \
- -DSYSTEM_PHYSFS=OFF .
+ -DNOSERVER=0 .
make
}
diff --git a/community/hedgewars/build-fix.patch b/community/hedgewars/build-fix.patch
deleted file mode 100644
index 90a4365f2..000000000
--- a/community/hedgewars/build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas
---- /home/sergej/tmp/BUILD/extra-i686/sergej/build/hedgewars/src/hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-06-03 20:01:14.212121255 +0400
-+++ hedgewars-src-0.9.19/hedgewars/uPhysFSLayer.pas 2013-05-31 00:07:33.000000000 +0400
-@@ -9,7 +9,6 @@
- {$IFNDEF WIN32}
- {$linklib physfs}
- {$linklib physlayer}
-- {$linklib gcc_s}
-
- {statically linking physfs brings IOKit dependency on OSX}
- {divdi3 is found in stdc++ on linux x86 and in gcc_s.1 on osx ppc32}
diff --git a/community/hedgewars/ffmpeg2.0.patch b/community/hedgewars/ffmpeg2.0.patch
deleted file mode 100644
index 67f123ae3..000000000
--- a/community/hedgewars/ffmpeg2.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp
---- a/QTfrontend/util/LibavInteraction.cpp 2013-05-30 20:07:33.000000000 +0000
-+++ b/QTfrontend/util/LibavInteraction.cpp 2013-07-22 16:24:42.564768844 +0000
-@@ -32,7 +32,7 @@ extern "C"
-
- struct Codec
- {
-- CodecID id;
-+ AVCodecID id;
- bool isAudio;
- QString shortName; // used for identification
- QString longName; // used for displaying to user
-@@ -52,7 +52,7 @@ QList<Codec> codecs;
- QMap<QString,Format> formats;
-
- // test if given format supports given codec
--bool FormatQueryCodec(AVOutputFormat *ofmt, enum CodecID codec_id)
-+bool FormatQueryCodec(AVOutputFormat *ofmt, enum AVCodecID codec_id)
- {
- #if LIBAVFORMAT_VERSION_MAJOR >= 54
- return avformat_query_codec(ofmt, codec_id, FF_COMPLIANCE_NORMAL) == 1;
diff --git a/extra/hexedit/PKGBUILD b/community/hexedit/PKGBUILD
index d585d744f..f761e9907 100644
--- a/extra/hexedit/PKGBUILD
+++ b/community/hexedit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179485 2013-03-05 16:24:22Z giovanni $
+# $Id: PKGBUILD 102214 2013-12-06 14:31:06Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Paul Mattal <pjmattal@elys.com>
diff --git a/community/hitori/PKGBUILD b/community/hitori/PKGBUILD
index ec3be8210..45a7e4e25 100644
--- a/community/hitori/PKGBUILD
+++ b/community/hitori/PKGBUILD
@@ -1,28 +1,26 @@
-# $Id: PKGBUILD 95244 2013-08-07 13:38:52Z bgyorgy $
+# $Id: PKGBUILD 101773 2013-11-30 21:21:43Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=hitori
-pkgver=0.4.1
+pkgver=0.4.2
pkgrel=1
pkgdesc="GTK+ application to generate and let you play games of Hitori"
arch=('i686' 'x86_64' 'mips64el')
-url="https://live.gnome.org/Hitori"
+url="https://wiki.gnome.org/Apps/Hitori"
license=('GPL')
depends=('gtk3' 'hicolor-icon-theme' 'xdg-utils')
makedepends=('intltool' 'itstool')
install=$pkgname.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('7a34ea697086cabd48ef740370f69995c9487def78ad7c9f280279eea2f282af')
+sha256sums=('0df62df7f41ca1648d6a53362aa3c00d90406e39f5d063f9b9d51dbc465c77eb')
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/community/i3-wm/PKGBUILD b/community/i3-wm/PKGBUILD
index bb8f96f4e..221086e01 100644
--- a/community/i3-wm/PKGBUILD
+++ b/community/i3-wm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 95252 2013-08-07 20:52:39Z ttoepper $
+# $Id: PKGBUILD 102909 2013-12-23 21:00:35Z ttoepper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
pkgname=i3-wm
_pkgsourcename=i3
-pkgver=4.6
+pkgver=4.7
pkgrel=1
pkgdesc='An improved dynamic tiling window manager'
arch=('i686' 'x86_64' 'mips64el')
@@ -11,8 +11,8 @@ url='http://i3wm.org/'
license=('BSD')
replaces=('i3' 'i3bar')
groups=('i3')
-depends=('libxcursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl'
- 'startup-notification' 'pango' 'perl')
+depends=('xcb-util-cursor' 'xcb-util-keysyms' 'xcb-util-wm' 'libev' 'yajl'
+ 'startup-notification' 'pango')
makedepends=('bison' 'flex')
optdepends=('dmenu: As menu.'
'i3lock: For locking your screen.'
@@ -20,7 +20,7 @@ optdepends=('dmenu: As menu.'
options=('docs' '!strip')
source=("http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2"
"http://i3wm.org/downloads/${_pkgsourcename}-${pkgver}.tar.bz2.asc")
-md5sums=('11901176eea90632384434c371840cfd'
+md5sums=('34dade2bc69e241ab3e3ffaa81122266'
'SKIP')
build() {
diff --git a/community/ibam/PKGBUILD b/community/ibam/PKGBUILD
index b2d22e403..4af9dc3ec 100644
--- a/community/ibam/PKGBUILD
+++ b/community/ibam/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96802 2013-09-05 18:01:44Z bgyorgy $
+# $Id: PKGBUILD 100846 2013-11-11 19:51:58Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com>
# Contributor: Penguin <TGates81.at.gmail.dot.com>
pkgname=ibam
pkgver=0.5.2
-pkgrel=6
+pkgrel=7
pkgdesc="An intelligent battery monitor"
arch=('i686' 'x86_64' 'mips64el')
url="http://ibam.sourceforge.net/"
@@ -15,19 +15,24 @@ makedepends=('sed' 'make')
optdepends=('gnuplot: graphs support')
install="ibam.install"
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
- 03acpi-check.dpatch)
+ 03acpi-check.dpatch
+ ibam-0.5.2-sysfs.patch)
md5sums=('2d5222ff504dd19e7c1ea8acc2f13cf5'
- '2f27fc97932bd59cabacbad063a13f0e')
+ '2f27fc97932bd59cabacbad063a13f0e'
+ '2a50027f73276d91555105b713687a4d')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
sed -i \
-e "s|/local/bin|/bin|g" \
-e "s|^CFLAGS=-O3|CFLAGS=${CFLAGS}|g" \
Makefile
patch -p1 <$srcdir/03acpi-check.dpatch
+ patch -p1 <$srcdir/ibam-0.5.2-sysfs.patch
+}
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
make
}
diff --git a/community/ibam/ibam-0.5.2-sysfs.patch b/community/ibam/ibam-0.5.2-sysfs.patch
index d9d73f924..a20b83db2 100644
--- a/community/ibam/ibam-0.5.2-sysfs.patch
+++ b/community/ibam/ibam-0.5.2-sysfs.patch
@@ -1,16 +1,16 @@
-diff -wbBur ibam-0.5.2/ibam.inl ibam-0.5.2.my/ibam.inl
---- ibam-0.5.2/ibam.inl 2009-03-09 16:53:20.000000000 +0000
-+++ ibam-0.5.2.my/ibam.inl 2011-03-24 19:41:32.000000000 +0000
+diff -wbBur ibam-0.5.2/ibam.inl ibam-0.5.2.q/ibam.inl
+--- ibam-0.5.2/ibam.inl 2009-03-09 19:53:20.000000000 +0300
++++ ibam-0.5.2.q/ibam.inl 2013-11-11 23:45:39.197066574 +0400
@@ -959,7 +959,13 @@
acpi.close();
apm = new acpi_status();
} else {
-+ sysfs.open((sysfs_path+"/BAT0/charge_full").c_str());
+ sysfs.open((sysfs_path+"/BAT0/present").c_str());
+ if(!sysfs.is_open()) {
- sysfs.open((sysfs_path+"/BAT1/charge_full").c_str());
++ sysfs.open((sysfs_path+"/BAT1/present").c_str());
+ }
+ if(!sysfs.is_open()) {
-+ sysfs.open((sysfs_path+"/BAT2/charge_full").c_str());
++ sysfs.open((sysfs_path+"/BAT2/present").c_str());
+ }
if(sysfs.is_open()) {
#ifdef IBAM_DEBUG
diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD
index c47a83bc1..56f79bc4e 100644
--- a/community/ibus-chewing/PKGBUILD
+++ b/community/ibus-chewing/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80968 2012-12-08 02:26:09Z fyan $
+# $Id: PKGBUILD 102761 2013-12-19 11:22:34Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Rainy <rainylau(at)gmail(dot)com>
@@ -6,20 +6,19 @@
# Contributor: Hiroshi Yui <hiroshiyui@gmail.com>
pkgname=ibus-chewing
-pkgver=1.4.3
-pkgrel=2
+pkgver=1.4.4
+pkgrel=1
pkgdesc='Chinese Chewing Engine for IBus Framework'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url='http://ibus.googlecode.com'
depends=('ibus' 'libchewing' 'libxtst' 'gconf')
makedepends=('swig' 'cmake' 'gob2')
-options=('!makeflags')
install=ibus-chewing.install
source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz")
build() {
- cd "${srcdir}/${pkgname}-${pkgver}-Source"
+ cd ${pkgname}-${pkgver}-Source
cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONF_INSTALL_DIR=/usr/share \
-DLIBEXEC_DIR=/usr/lib/ibus
@@ -27,7 +26,12 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}-Source"
+ cd ${pkgname}-${pkgver}-Source
make DESTDIR="${pkgdir}" install
+
+ mkdir -p "$pkgdir/usr/share/gconf/schemas"
+ mv "$pkgdir/etc/gconf/schemas/${pkgname}.schemas" "$pkgdir/usr/share/gconf/schemas/"
+ rm -r "$pkgdir/etc"
}
-md5sums=('20b1d553ba14cecabcf7418e91da353b')
+
+sha512sums=('47581bca46d1a8f0f10f13887d5db37cf1ca3531e1a05fea516ea10fec59d4b0c2f629b5a291b1aed77e642efa3d456670c8f7fcaff460b187e3b7fc8220f2d6')
diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD
index 1d69d1497..b160e9d2c 100644
--- a/community/ibus-kkc/PKGBUILD
+++ b/community/ibus-kkc/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
pkgname=ibus-kkc
-pkgver=1.5.18
+pkgver=1.5.19
pkgrel=1
pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus"
arch=('i686' 'x86_64' 'mips64el')
@@ -23,4 +23,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums=('06212fd6d851ab68ad2ca003d52d67c87d65a2cd776d575e5110c5d39d9feb8f3648608024823bfd2caed6e536e250a1416f186b3e702f5398dd9afe60a07756')
+sha512sums=('4f74557974404e8bf945d964b681516fb42eff204920f582474a7ec9c229bddd8fb38a000ec6a1976bd1d6e3fcbd87a877e04dc35550af1a90fd294ed208b756')
diff --git a/community/ibus-rime/PKGBUILD b/community/ibus-rime/PKGBUILD
index 982f52d35..9ed0c5bc1 100644
--- a/community/ibus-rime/PKGBUILD
+++ b/community/ibus-rime/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 90137 2013-05-07 05:26:33Z fyan $
+# $Id: PKGBUILD 103211 2013-12-30 09:12:41Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: GONG Chen <chen dot sst at gmail dot com>
# Contributor: 網軍總司令
pkgname=ibus-rime
-pkgver=0.9.9
+pkgver=1.1
pkgrel=1
pkgdesc="Rime input method engine for ibus"
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/rimeime/"
license=('GPL3')
-depends=('ibus' 'libnotify' 'librime>=0.9.9' 'brise')
+depends=('ibus' 'libnotify' 'librime>=1.1' 'brise')
makedepends=('cmake')
install='ibus-rime.install'
source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz")
build() {
- cd "$srcdir/$pkgname"
+ cd $pkgname
make
}
package() {
- cd "$srcdir/$pkgname"
+ cd $pkgname
make DESTDIR="$pkgdir" install
}
-sha512sums=('b18e6f3ba6c97e3b55900d9c4cb70d58f24b202bf2ae894ca861af10ddb028c193d9ac97e609f3b4f0f183b212b74180a02e5d823f235b4c799733933a48afb7')
+sha512sums=('2510f9019045013f85af5b8401286b338b739fa0e908a3e30e1d59971a43c32212f388d367b51942292e236859feb1a70d7e7b8deb17eafd8b4f878cc7ba018f')
diff --git a/extra/id3/PKGBUILD b/community/id3/PKGBUILD
index 365eeb3b6..9a4d71b73 100644
--- a/extra/id3/PKGBUILD
+++ b/community/id3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137772 2011-09-10 18:35:00Z eric $
+# $Id: PKGBUILD 102161 2013-12-06 11:40:12Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jochem Kossen <j.kossen@home.nl>
diff --git a/extra/id3/id3-0.78-gcc44.patch b/community/id3/id3-0.78-gcc44.patch
index 63c4d93b1..63c4d93b1 100644
--- a/extra/id3/id3-0.78-gcc44.patch
+++ b/community/id3/id3-0.78-gcc44.patch
diff --git a/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch b/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch
new file mode 100644
index 000000000..fdb9bbb39
--- /dev/null
+++ b/community/ifuse/0001-Updated-for-libimobiledevice-1.1.5.patch
@@ -0,0 +1,83 @@
+From 9ac32aa3cb2ed5242c0fe3c58ef5f571bf2b95d7 Mon Sep 17 00:00:00 2001
+From: Nikias Bassen <nikias@gmx.li>
+Date: Sun, 24 Mar 2013 02:45:23 +0100
+Subject: [PATCH 1/1] Updated for libimobiledevice >= 1.1.5
+
+---
+ configure.ac | 4 ++++
+ src/ifuse.c | 20 +++++++++++++++++++-
+ 2 files changed, 23 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 85d131a..ca518ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -17,6 +17,10 @@ PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.0, libimobiled
+ if test x"$libimobiledevice_1_1" = xyes; then
+ AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1], 1, [Define if libimobiledevice is using 1.1.0 API])
+ fi
++PKG_CHECK_MODULES(libimobiledevice11, libimobiledevice-1.0 >= 1.1.5, libimobiledevice_1_1_5=yes, libimobiledevice_1_1_5=no)
++if test x"$libimobiledevice_1_1_5" = xyes; then
++ AC_DEFINE([HAVE_LIBIMOBILEDEVICE_1_1_5], 1, [Define if libimobiledevice is using 1.1.5 API])
++fi
+ libimobiledevice_VERSION=`$PKG_CONFIG --modversion "libimobiledevice-1.0" 2>&1`
+ PKG_CHECK_MODULES(libfuse, fuse >= 2.7.0)
+ PKG_CHECK_MODULES(libplist, libplist)
+diff --git a/src/ifuse.c b/src/ifuse.c
+index b5735ee..9fafb47 100644
+--- a/src/ifuse.c
++++ b/src/ifuse.c
+@@ -71,7 +71,11 @@ static struct {
+ char *appid;
+ #endif
+ char *service_name;
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
++ lockdownd_service_descriptor_t service;
++#else
+ uint16_t port;
++#endif
+ } opts;
+
+ enum {
+@@ -402,7 +406,11 @@ void *ifuse_init(struct fuse_conn_info *conn)
+ afc_client_new_from_house_arrest_client(house_arrest, &afc);
+ } else {
+ #endif
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
++ afc_client_new(phone, opts.service, &afc);
++#else
+ afc_client_new(phone, opts.port, &afc);
++#endif
+ #ifdef HAVE_LIBIMOBILEDEVICE_1_1
+ }
+ #endif
+@@ -744,7 +752,13 @@ int main(int argc, char *argv[])
+ return EXIT_FAILURE;
+ }
+
+- if ((lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port) {
++ if (
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
++ (lockdownd_start_service(control, opts.service_name, &opts.service) != LOCKDOWN_E_SUCCESS) || !opts.service
++#else
++ (lockdownd_start_service(control, opts.service_name, &opts.port) != LOCKDOWN_E_SUCCESS) || !opts.port
++#endif
++ ) {
+ lockdownd_client_free(control);
+ idevice_free(phone);
+ fprintf(stderr, "Failed to start AFC service '%s' on the device.\n", opts.service_name);
+@@ -757,7 +771,11 @@ int main(int argc, char *argv[])
+
+ #ifdef HAVE_LIBIMOBILEDEVICE_1_1
+ if (!strcmp(opts.service_name, HOUSE_ARREST_SERVICE_NAME)) {
++#ifdef HAVE_LIBIMOBILEDEVICE_1_1_5
++ house_arrest_client_new(phone, opts.service, &house_arrest);
++#else
+ house_arrest_client_new(phone, opts.port, &house_arrest);
++#endif
+ if (!house_arrest) {
+ fprintf(stderr, "Could not start document sharing service!\n");
+ return EXIT_FAILURE;
+--
+1.8.4.2
+
diff --git a/community/ifuse/PKGBUILD b/community/ifuse/PKGBUILD
index 7f9a651de..eac8cba7e 100644
--- a/community/ifuse/PKGBUILD
+++ b/community/ifuse/PKGBUILD
@@ -1,18 +1,25 @@
-# $Id: PKGBUILD 90343 2013-05-11 16:17:25Z tomegun $
+# $Id: PKGBUILD 100637 2013-11-06 19:54:56Z cinelli $
# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Gabriel Martinez < reitaka at gmail dot com >
pkgname=ifuse
pkgver=1.1.2
-pkgrel=4
+pkgrel=5
pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch'
url='http://libimobiledevice.org/'
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL2.1')
depends=('libimobiledevice' 'fuse')
-source=("http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2")
-md5sums=('4152526b2ac3c505cb41797d997be14d')
+source=("http://www.libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2"
+ '0001-Updated-for-libimobiledevice-1.1.5.patch')
+md5sums=('4152526b2ac3c505cb41797d997be14d'
+ 'ca4d4af7f830c10645b605f1572c0ba6')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i "$srcdir/0001-Updated-for-libimobiledevice-1.1.5.patch"
+}
build() {
cd "$pkgname-$pkgver"
diff --git a/community/inputattach/0001-Add-w8001-flag.patch b/community/inputattach/0001-Add-w8001-flag.patch
deleted file mode 100644
index ba6f9394b..000000000
--- a/community/inputattach/0001-Add-w8001-flag.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 729257077e328e0b2fa1bba5a5509c09a743d5d0 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 13 Jul 2010 11:49:47 +1000
-Subject: [PATCH 2/3] Add w8001 flag for serial Wacom devices.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- inputattach.c | 3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/inputattach.c b/inputattach.c
-index a7de302..0382954 100644
---- a/inputattach.c
-+++ b/inputattach.c
-@@ -495,6 +495,9 @@ static struct input_types input_types[] = {
- { "--dump", "-dump", "Just enable device",
- B2400, CS8,
- 0, 0x00, 0x00, 0, dump_init },
-+{ "--w8001", "-w8001", "Wacom W8001",
-+ B38400, CS8,
-+ SERIO_W8001, 0x00, 0x00, 0, NULL },
- { NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, NULL }
- };
-
---
-1.7.2.3
-
diff --git a/community/inputattach/0002-Allow-for-custom-baud-rates.patch b/community/inputattach/0002-Allow-for-custom-baud-rates.patch
deleted file mode 100644
index 78f5d19c8..000000000
--- a/community/inputattach/0002-Allow-for-custom-baud-rates.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 5d9373f24f1b519c030024b2f36277ba9713697c Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Wed, 21 Jul 2010 14:41:04 +1000
-Subject: [PATCH 3/3] Allow for custom baud rates.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- inputattach.c | 25 ++++++++++++++++++++++++-
- 1 files changed, 24 insertions(+), 1 deletions(-)
-
-diff --git a/inputattach.c b/inputattach.c
-index 0382954..6806fc8 100644
---- a/inputattach.c
-+++ b/inputattach.c
-@@ -506,7 +506,7 @@ static void show_help(void)
- struct input_types *type;
-
- puts("");
-- puts("Usage: inputattach [--daemon] <mode> <device>");
-+ puts("Usage: inputattach [--daemon] [--baud <baud>] <mode> <device>");
- puts("");
- puts("Modes:");
-
-@@ -530,6 +530,7 @@ int main(int argc, char **argv)
- int i;
- char c;
- int retval;
-+ int baud = -1;
-
- for (i = 1; i < argc; i++) {
- if (!strcasecmp(argv[i], "--help")) {
-@@ -540,6 +541,15 @@ int main(int argc, char **argv)
- } else if (need_device) {
- device = argv[i];
- need_device = 0;
-+ } else if (!strcasecmp(argv[i], "--baud")) {
-+ if (argc <= i + 1) {
-+ show_help();
-+ fprintf(stderr,
-+ "inputattach: require baud rate\n");
-+ return EXIT_FAILURE;
-+ }
-+
-+ baud = atoi(argv[++i]);
- } else {
- if (type && type->name) {
- fprintf(stderr,
-@@ -580,6 +590,19 @@ int main(int argc, char **argv)
- return 1;
- }
-
-+ switch(baud) {
-+ case -1: break;
-+ case 2400: type->speed = B2400; break;
-+ case 4800: type->speed = B4800; break;
-+ case 9600: type->speed = B9600; break;
-+ case 19200: type->speed = B19200; break;
-+ case 38400: type->speed = B38400; break;
-+ default:
-+ fprintf(stderr, "inputattach: invalid baud rate '%d'\n",
-+ baud);
-+ return EXIT_FAILURE;
-+ }
-+
- setline(fd, type->flags, type->speed);
-
- if (type->flush)
---
-1.7.2.3
-
diff --git a/community/inputattach/PKGBUILD b/community/inputattach/PKGBUILD
deleted file mode 100644
index 1e66de54b..000000000
--- a/community/inputattach/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 91882 2013-05-28 18:09:11Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
-
-pkgname=inputattach
-pkgver=1.24
-pkgrel=10
-pkgdesc="Attach serial mice, keyboards and other input devices to the kernel input system"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://linuxconsole.sourceforge.net/"
-license=('GPL')
-depends=('bash')
-makedepends=('gcc')
-backup=(etc/conf.d/inputattach)
-source=('http://arch.p5n.pp.ru/~sergej/dl/2011/inputattach.c'
- 'http://arch.p5n.pp.ru/~sergej/dl/2011/serio-ids.h'
- 'inputattach.conf.d'
- 'inputattach.service'
- 'inputattachctl'
- '0001-Add-w8001-flag.patch'
- '0002-Allow-for-custom-baud-rates.patch')
-md5sums=('eb595a766ca363edb3b14c25404596ce'
- '93d34d96cd3ad19ea1aeca7f68a66b4a'
- '7ca903e54829764c8241233af5069216'
- 'c19b9ed38b243191cf5378b87a42a4cc'
- '7dd0690a9d2fe5e1052900650906e273'
- 'f1b3ddae308351357f557cbd5c6cda81'
- '8f76908449cae24a95adbf0bc0a17721')
-
-build() {
- cd "$srcdir"
-
- mkdir src
- cp inputattach.c serio-ids.h src/
- cd src
-
- # Add support for serial wacom tablets
- patch -Np1 -i "$srcdir/0001-Add-w8001-flag.patch"
- patch -Np1 -i "$srcdir/0002-Allow-for-custom-baud-rates.patch"
-
- cc $CFLAGS inputattach.c -o inputattach
-}
-
-package() {
- cd "$srcdir/src"
- install -Dm755 inputattach "$pkgdir/usr/bin/inputattach"
- install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
- install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
- install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
-}
diff --git a/community/intel-gpu-tools/PKGBUILD b/community/intel-gpu-tools/PKGBUILD
index 20eac3d15..bdb70f216 100644
--- a/community/intel-gpu-tools/PKGBUILD
+++ b/community/intel-gpu-tools/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 99814 2013-10-31 01:52:21Z allan $
+# $Id: PKGBUILD 100643 2013-11-07 05:56:05Z thestinger $
# Maintainer: Daniel Micay <danielmicay@gmail.com>
# Contributor: Mikael Eriksson <mikael_eriksson@miffe.org>
# Originally by: Denis Smirnov <detanator@gmail.com>
pkgname=intel-gpu-tools
-pkgver=1.4
+pkgver=1.5
pkgrel=1
pkgdesc="Tools for development and testing of the Intel DRM driver"
arch=(i686 x86_64)
license=(MIT)
-url="http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/"
-depends=('libdrm' 'libpciaccess' 'cairo' python)
+url='http://cgit.freedesktop.org/xorg/app/intel-gpu-tools/'
+depends=(libdrm libpciaccess cairo python dri2proto)
makedepends=(swig)
source=(http://xorg.freedesktop.org/releases/individual/app/$pkgname-$pkgver.tar.bz2)
-md5sums=('bfa2ff70c09c95fcad46e7d332e08d28')
+md5sums=('6165a9054de2609f5b1bf0ca0d913f31')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 1b64a8c69..f808fc005 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 98333 2013-10-08 15:40:43Z stativ $
+# $Id: PKGBUILD 102772 2013-12-19 14:18:19Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=intellij-idea-libs
-pkgver=12.1.6
-_pkgver=129.1359
+pkgver=13.0.1
+_pkgver=133.331
pkgrel=1
pkgdesc="Architecture dependent libraries needed by the Intellij Idea IDE"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,15 +11,16 @@ license=('Apache')
depends=('glibc')
options=(!strip)
source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('5731ad2d6113ea7e8aedffc011480cb8')
+md5sums=('14ca0ad374cfd96ec4b8d3d3bfec9e76')
package() {
- install -d -m755 "$pkgdir/usr/share/intellijidea-ce/bin"
- install -d -m755 "$pkgdir/usr/lib"
-
[ $CARCH == "x86_64" ] && SUFFIX=64
- install -m755 "idea-IC-$_pkgver"/bin/fsnotifier${SUFFIX} "$pkgdir"/usr/share/intellijidea-ce/bin/
- install -m644 "idea-IC-$_pkgver"/bin/libbreakgen${SUFFIX}.so "$pkgdir"/usr/lib
+ install -D -m755 "idea-IC-$_pkgver"/bin/fsnotifier${SUFFIX} "$pkgdir"/usr/share/intellijidea-ce/bin/fsnotifier${SUFFIX}
+ install -D -m644 "idea-IC-$_pkgver"/bin/libbreakgen${SUFFIX}.so "$pkgdir"/usr/lib/libbreakgen${SUFFIX}.so
+
+ # libpty
+ [ $CARCH == "x86_64" ] && _ARCH=x86_64 || _ARCH=x86
+ install -D -m644 "idea-IC-$_pkgver"/lib/libpty/linux/$_ARCH/libpty.so "$pkgdir"/usr/share/intellijidea-ce/lib/libpty/linux/$_ARCH/libpty.so
}
# vim:set ts=2 sw=2 et:
diff --git a/community/io/PKGBUILD b/community/io/PKGBUILD
index 52ddc03cb..76c2b1e26 100644
--- a/community/io/PKGBUILD
+++ b/community/io/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99046 2013-10-23 12:00:03Z arodseth $
+# $Id: PKGBUILD 102465 2013-12-11 18:14:42Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Gergely Imreh <imrehg(at)gmail(dot)com>
pkgname=io
-pkgver=2011.09.12
+pkgver=2013.12.04
pkgrel=1
pkgdesc='IO programming language'
arch=('x86_64' 'i686')
@@ -13,19 +13,21 @@ depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff'
makedepends=('cmake')
source=("$pkgname-$pkgver.tar.gz::https://github.com/stevedekorte/io/tarball/$pkgver")
options=('!makeflags' '!buildflags')
-sha256sums=('7b4cb97a0aa3abb562703e1dbfe46925c22820eeca6969865b979c397799d092')
+sha256sums=('a5ca07b4d211995a0cd9442e1d752b2824444bee018c6db31899ddd6c5c87c4f')
build() {
- mkdir -p stevedekorte-io-23afbcc/build
- cd stevedekorte-io-23afbcc/build
+ cd stevedekorte-io-*
+ sed -i "s:20110905:${pkgver//./}:" libs/iovm/source/IoVersion.h
+ mkdir -p build
+ cd build
cmake -DCMAKE_INSTALL_PREFIX=/usr ..
make
}
package() {
- cd stevedekorte-io-23afbcc/build
- make DESTDIR="$pkgdir" install
- install -Dm644 ../license/bsd_license.txt \
+ cd stevedekorte-io-*
+ make -C build DESTDIR="$pkgdir" install
+ install -Dm644 license/bsd_license.txt \
"$pkgdir/usr/share/licenses/$pkgname/bsd_license.txt"
}
diff --git a/community/iodine/PKGBUILD b/community/iodine/PKGBUILD
index c84453015..c50b3c9d4 100644
--- a/community/iodine/PKGBUILD
+++ b/community/iodine/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96596 2013-09-02 07:16:12Z fyan $
+# $Id: PKGBUILD 101503 2013-11-26 16:10:21Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Christian Hesse <mail@eworm.de>
# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
@@ -6,13 +6,15 @@
pkgname=iodine
pkgver=0.6.0rc1
-pkgrel=2
+pkgrel=3
pkgdesc='Tunnel IPv4 data through a DNS server'
arch=('i686' 'x86_64')
url='http://code.kryo.se/iodine'
license=('custom:ISC')
depends=('zlib')
-source=("http://code.kryo.se/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz")
+source=("http://code.kryo.se/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz"
+ 'iodined.service'
+ 'iodined.conf.d')
build() {
cd ${pkgname}-${pkgver/rc/-rc}/
@@ -26,6 +28,11 @@ package() {
make prefix=/usr sbindir=/usr/bin DESTDIR="${pkgdir}" install
install -d "${pkgdir}/usr/share/licenses/iodine"
sed -n '/AUTHORS & LICENSE/,$p' README > "${pkgdir}/usr/share/licenses/iodine/LICENSE"
+
+ install -Dm644 "$srcdir/iodined.service" "$pkgdir/usr/lib/systemd/system/iodined.service"
+ install -Dm644 "$srcdir/iodined.conf.d" "$pkgdir/etc/conf.d/iodined"
}
-sha256sums=('dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60')
+sha256sums=('dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60'
+ '4d2c45ab783ce07911afe48403884edc0ee5ccbb463bc4026f83b511d5dde418'
+ '6babc497d86e7b142f61e529f9facacb95e868e920b15dcf66e039891b02929b')
diff --git a/community/iodine/iodined.conf.d b/community/iodine/iodined.conf.d
new file mode 100644
index 000000000..ae0870d78
--- /dev/null
+++ b/community/iodine/iodined.conf.d
@@ -0,0 +1,17 @@
+# Address and subnet to use for the tunnel (default mask is /27)
+TUN_IP="172.18.42.1/24"
+
+# Password (32 characters max)
+IODINE_PASSWORD="mypassword"
+
+# The domain you control, see documentation.
+TOP_DOMAIN="example.com"
+
+# UDP port iodined should listen on.
+IODINE_PORT="53"
+
+# Local IP address iodined should bind to.
+IODINE_BIND_ADDRESS="0.0.0.0"
+
+# External IP of your iodined server, used in DNS answers.
+IODINE_EXT_IP=""
diff --git a/community/iodine/iodined.service b/community/iodine/iodined.service
new file mode 100644
index 000000000..00f0c1f39
--- /dev/null
+++ b/community/iodine/iodined.service
@@ -0,0 +1,10 @@
+[Unit]
+After=network.target
+Requires=network.target
+
+[Service]
+EnvironmentFile=/etc/conf.d/iodined
+ExecStart=/usr/bin/iodined -f -c -l $IODINE_BIND_ADDRESS -n $IODINE_EXT_IP -p $IODINE_PORT -P $IODINE_PASSWORD $TUN_IP $TOP_DOMAIN
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/ioping/PKGBUILD b/community/ioping/PKGBUILD
index bf874df9b..e556c71aa 100644
--- a/community/ioping/PKGBUILD
+++ b/community/ioping/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93783 2013-07-10 08:34:25Z seblu $
+# $Id: PKGBUILD 103240 2013-12-30 22:20:06Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Kovivchak Evgen <oneonfire@gmail.com>
pkgname=ioping
-pkgver=0.7
+pkgver=0.8
pkgrel=1
pkgdesc='Simple disk I/0 latency measuring tool'
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL3')
url='http://ioping.googlecode.com'
depends=('glibc')
source=("http://ioping.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha1sums=('f841244149830506daca1b052694965d94fe2408')
+sha1sums=('7d4fe1414cdd5887c332426a8844e17eca5e5646')
build() {
cd $pkgname-$pkgver
diff --git a/community/irrlicht/PKGBUILD b/community/irrlicht/PKGBUILD
index c02fadd97..34258a9cc 100644
--- a/community/irrlicht/PKGBUILD
+++ b/community/irrlicht/PKGBUILD
@@ -1,13 +1,14 @@
-# $Id: PKGBUILD 79765 2012-11-12 07:14:50Z svenstaro $
+# $Id: PKGBUILD 102440 2013-12-11 11:35:15Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Hilton Medeiros <medeiros.hilton AT gmail DOT com>
# Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
# Contributor: Paolo Fagni <paolo.fagni AT mail DOT com>
# Contributor: Lukas Kropatschek <lukas.krop AT gmail DOT com>
-pkgname=irrlicht
-pkgver=1.8
-pkgrel=1
+pkgbase=irrlicht
+pkgname=('irrlicht' 'irrlicht-docs')
+pkgver=1.8.1
+pkgrel=2
pkgdesc="An open source high performance realtime 3D graphics engine."
arch=('i686' 'x86_64' 'mips64el')
url="http://irrlicht.sourceforge.net/"
@@ -17,54 +18,43 @@ makedepends=('mesa' 'unzip' 'libxcursor')
optdepends=('libxcursor: run examples')
source=("http://downloads.sourceforge.net/irrlicht/$pkgname-$pkgver.zip")
noextract=($pkgname-$pkgver.zip)
-md5sums=('d06329d8f466658caaf4838ba349e393')
+md5sums=('db97cce5e92da9b053f4546c652e9bd5')
build() {
- unzip $pkgname-$pkgver.zip
+ unzip $pkgbase-$pkgver.zip
- cd $srcdir/$pkgname-$pkgver
-
- cd source/Irrlicht
- sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" \
- Makefile
+ cd $srcdir/$pkgbase-$pkgver/source/Irrlicht
make NDEBUG=1 sharedlib
+}
- make NDEBUG=1
+package_irrlicht() {
+ cd $srcdir/$pkgbase-$pkgver/source/Irrlicht
- install -d $pkgdir/usr/lib \
- $pkgdir/usr/share/licenses/$pkgname \
- $pkgdir/usr/share/$pkgname/examples/bin \
- $pkgdir/usr/share/doc/$pkgname
+ sed -i "/^INSTALL_DIR/s:=.*:=$pkgdir/usr/lib:" Makefile
make install
- cd $srcdir/$pkgname-$pkgver/
- install -m644 readme.txt $pkgdir/usr/share/licenses/$pkgname
-
- # Install static library and fix headers permissions
- install -m644 lib/Linux/libIrrlicht.a $pkgdir/usr/lib
- chmod 644 $pkgdir/usr/include/$pkgname/*
+ cd $srcdir/$pkgbase-$pkgver/
+ install -Dm644 readme.txt $pkgdir/usr/share/licenses/$pkgbase/LICENSE
- # Install media files for examples
- cp -r media $pkgdir/usr/share/$pkgname
-
- # Install documentation
- cp -r doc/* $pkgdir/usr/share/doc/$pkgname
- rm -f $pkgdir/usr/share/doc/$pkgname/*.txt
+ # fix headers permissions
+ chmod 644 $pkgdir/usr/include/$pkgbase/*
cd $pkgdir/usr/lib
ln -s libIrrlicht.so.$pkgver libIrrlicht.so.1
+}
- # Just a helper for examples compilation
- ln -s libIrrlicht.so.$pkgver $srcdir/$pkgname-$pkgver/lib/Linux/libIrrlicht.so
+package_irrlicht-docs() {
+ cd $srcdir/$pkgbase-$pkgver/
- # Edit, build and install the examples
- cd $srcdir/$pkgname-$pkgver/examples
- sed -i '/define USE_IRRKLANG/s:.*://&:' ./Demo/CDemo.h
- sed -i '/^CXXFLAGS/d' $(grep -Rl "^CXXFLAGS =" *)
+ install -d $pkgdir/usr/share/$pkgbase \
+ $pkgdir/usr/share/doc/$pkgbase
- make
+ # install media files for examples
+ cp -r media $pkgdir/usr/share/$pkgbase
- install -m755 ../bin/Linux/* /$pkgdir/usr/share/$pkgname/examples/bin/
+ # install documentation
+ cp -r doc/* $pkgdir/usr/share/doc/$pkgbase
+ rm -f $pkgdir/usr/share/doc/$pkgbase/*.txt
}
diff --git a/community/irrlicht/irrlicht-1.7.2-libpng15.patch b/community/irrlicht/irrlicht-1.7.2-libpng15.patch
deleted file mode 100644
index a1426bf29..000000000
--- a/community/irrlicht/irrlicht-1.7.2-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- source/Irrlicht/CImageLoaderPNG.cpp
-+++ source/Irrlicht/CImageLoaderPNG.cpp
-@@ -28,7 +28,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- // PNG function for file reading
-@@ -37,7 +37,7 @@
- png_size_t check;
-
- // changed by zola {
-- io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;
-+ io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);
- check=(png_size_t) file->read((void*)data,(u32)length);
- // }
-
---- source/Irrlicht/CImageWriterPNG.cpp
-+++ source/Irrlicht/CImageWriterPNG.cpp
-@@ -35,7 +35,7 @@
- static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)
- {
- os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);
-- longjmp(png_ptr->jmpbuf, 1);
-+ longjmp(png_jmpbuf(png_ptr), 1);
- }
-
- // PNG function for file writing
-@@ -43,7 +43,7 @@
- {
- png_size_t check;
-
-- io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;
-+ io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);
- check=(png_size_t) file->write((const void*)data,(u32)length);
-
- if (check != length)
diff --git a/extra/isapnptools/PKGBUILD b/community/isapnptools/PKGBUILD
index b5227742f..696ca681f 100644
--- a/extra/isapnptools/PKGBUILD
+++ b/community/isapnptools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188739 2013-06-19 02:11:11Z eric $
+# $Id: PKGBUILD 102163 2013-12-06 11:42:51Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=isapnptools
@@ -9,6 +9,7 @@ url="http://www.roestock.demon.co.uk/isapnptools/"
depends=('glibc')
arch=('i686' 'x86_64')
license=('GPL')
+options=('staticlibs')
#source=("ftp://metalab.unc.edu/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz")
source=("http://ibiblio.org/pub/Linux/system/hardware/${pkgname}-${pkgver}.tgz")
md5sums=('b997ba56583dc850fce9b93d658dfa0c')
diff --git a/community/javasqlite/PKGBUILD b/community/javasqlite/PKGBUILD
index e6b174c40..aa99dea4f 100644
--- a/community/javasqlite/PKGBUILD
+++ b/community/javasqlite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99817 2013-10-31 01:53:22Z allan $
+# $Id: PKGBUILD 102709 2013-12-17 18:05:22Z guillaume $
# Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
pkgname=javasqlite
-pkgver=20120209
+pkgver=20131124
pkgrel=1
pkgdesc="Java support for SQLite database engine"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,7 @@ license=('custom:BSD-style')
depends=('java-runtime' 'sqlite')
makedepends=('java-environment')
source=(http://www.ch-werner.de/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a5c4f7760ed002749560068b2bd4bb25')
-sha1sums=('76aebb0a11b9e1f861ebaeab9ea3e5818b753ab3')
+sha256sums=('681b58556ea3f565b815efb830993d11c798c93dd961f6b6e7477485591585e2')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/jbigkit/PKGBUILD b/community/jbigkit/PKGBUILD
index 64b27e5e8..0e60b8068 100644
--- a/community/jbigkit/PKGBUILD
+++ b/community/jbigkit/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 100180 2013-11-01 20:59:44Z spupykin $
+# $Id: PKGBUILD 101141 2013-11-18 10:37:45Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
# Contributor: Frank Ickstadt (frank dot ickstadt at gmail dot com)
pkgname=jbigkit
pkgver=2.0
-pkgrel=4
+pkgrel=5
pkgdesc="Data compression library/utilities for bi-level high-resolution images"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
license=('GPL')
depends=('glibc')
+options=('staticlibs')
source=(http://www.cl.cam.ac.uk/~mgk25/download/jbigkit-$pkgver.tar.gz)
md5sums=('3dd87f605abb1a97a22dc79d8b3e8f6c')
diff --git a/extra/js185/PKGBUILD b/community/js185/PKGBUILD
index 28b851668..b20cbf9f8 100644
--- a/extra/js185/PKGBUILD
+++ b/community/js185/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 183425 2013-04-21 22:11:08Z heftig $
+# $Id: PKGBUILD 101265 2013-11-21 12:14:23Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=js185
diff --git a/community/kdbg/PKGBUILD b/community/kdbg/PKGBUILD
index 9a983df84..1d4061459 100644
--- a/community/kdbg/PKGBUILD
+++ b/community/kdbg/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 99820 2013-10-31 01:54:27Z allan $
+# $Id: PKGBUILD 100788 2013-11-10 20:07:06Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Eric Belanger <belanger@astro.umontreal.ca>
# Contributor: Jason Taylor <jftaylor21@gmail.com>
# Contributor: Georg Grabler <ggrabler@chello.at>
pkgname=kdbg
-pkgver=2.5.3
-pkgrel=2
+pkgver=2.5.4
+pkgrel=1
pkgdesc="A gdb GUI for KDE"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.kdbg.org"
@@ -14,7 +14,7 @@ license=('GPL')
depends=('kdebase-runtime' 'gdb')
makedepends=('automoc4' 'cmake' 'optipng')
source=("http://downloads.sourceforge.net/project/kdbg/Source%20Code/$pkgver/kdbg-$pkgver.tar.gz")
-md5sums=('345183d07eb11a9c841d3dc34b734613')
+md5sums=('715219a810f39e02b493cab9c4a845a1')
build() {
cd $srcdir
diff --git a/community/keepalived/PKGBUILD b/community/keepalived/PKGBUILD
index a3cae7c4b..8096339be 100644
--- a/community/keepalived/PKGBUILD
+++ b/community/keepalived/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96808 2013-09-05 18:47:07Z seblu $
+# $Id: PKGBUILD 100797 2013-11-11 03:42:38Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Andrea Zucchelli <zukka77@gmail.com>
pkgname=keepalived
-pkgver=1.2.8
+pkgver=1.2.9
pkgrel=1
pkgdesc='Failover and monitoring daemon for LVS clusters'
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ backup=('etc/keepalived/keepalived.conf')
depends=('openssl' 'popt' 'libnl1')
source=("http://www.keepalived.org/software/$pkgname-$pkgver.tar.gz"
'keepalived.service')
-md5sums=('8a362b6cea145fd4393bf004d09b4057'
+md5sums=('adfad98a2cc34230867d794ebc633492'
'0a5171f4298528315e8a8004b55befb7')
build() {
diff --git a/community/keepassx/ChangeLog b/community/keepassx/ChangeLog
deleted file mode 100644
index 7e326dab6..000000000
--- a/community/keepassx/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-2008-12-08 Alexander Fehr <pizzapunk gmail com>
-
- * keepassx-0.3.4-1:
- New upstream release.
-
-2008-08-14 Alexander Fehr <pizzapunk gmail com>
-
- * keepassx-0.3.3-1:
- New upstream release.
-
-2008-07-31 Alexander Fehr <pizzapunk gmail com>
-
- * keepassx-0.3.2-1:
- New upstream release.
- Added dependency on libxtst.
- Added ChangeLog.
diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD
index d51c05a25..36ac427e8 100644
--- a/community/keepassx/PKGBUILD
+++ b/community/keepassx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89961 2013-05-06 10:41:03Z spupykin $
+# $Id: PKGBUILD 101314 2013-11-22 17:06:59Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Greg Bouzakis <gregbouzakis@gmail.com>
# Contributor: Alexander Fehr <pizzapunk gmail com>
diff --git a/community/kid3/PKGBUILD b/community/kid3/PKGBUILD
index d025bc4bf..a38702116 100644
--- a/community/kid3/PKGBUILD
+++ b/community/kid3/PKGBUILD
@@ -1,40 +1,64 @@
-# $Id: PKGBUILD 100349 2013-11-02 14:50:28Z jlichtblau $
+# $Id: PKGBUILD 101955 2013-12-02 22:15:37Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alois Nespor <alois.nespor@gmail.com>
-pkgname=kid3
-pkgver=3.0.1
-pkgrel=1
-pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor for KDE"
+pkgbase=kid3
+pkgname=('kid3' 'kid3-qt')
+pkgver=3.0.2
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://kid3.sourceforge.net/"
license=('GPL')
-depends=('chromaprint' 'id3lib' 'taglib' 'kdebase-runtime')
-makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl')
-options=('!makeflags')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-sha256sums=('ebbae8b277c14083f87d49bcde5a86295c1874c4004fc5db2d5764ff53f15d59')
+makedepends=('automoc4' 'cmake' 'docbook-xml' 'docbook-xsl' 'phonon-qt4' 'chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'kdebase-runtime')
+install=$pkgbase.install
+changelog=$pkgbase.changelog
+source=(http://downloads.sourceforge.net/$pkgbase/$pkgbase-$pkgver.tar.gz)
+sha256sums=('31492e01039e78d2e73ba342a2d2c837395597eb48a101366b160c36fcdcfab4')
build() {
- cd ${pkgname}-${pkgver}
-
cd ${srcdir}
+ [[ ! -d build ]] && mkdir build
+ mkdir build-qt
- mkdir build
+#kid3
cd build
cmake \
- ../${pkgname}-${pkgver} \
+ ../${pkgbase}-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
+ -DWITH_APPS="CLI;KDE"
+
+ make
+
+#kid3-qt
+ cd $srcdir/build-qt
+
+ cmake \
+ ../${pkgbase}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_APPS="CLI;Qt"
make
}
-package() {
- cd build
+package_kid3() {
+pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, KDE version"
+depends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'kdebase-runtime')
+conflicts=('kid3-qt')
+
+ cd $srcdir/build
+
+ make DESTDIR=${pkgdir} install
+}
+
+package_kid3-qt() {
+pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, QT version"
+depends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2' 'qt4')
+conflicts=('kid3')
+provides=('kid3')
+
+ cd $srcdir/build-qt
make DESTDIR=${pkgdir} install
}
diff --git a/community/kid3/kid3.changelog b/community/kid3/kid3.changelog
index 270612022..d71b20678 100644
--- a/community/kid3/kid3.changelog
+++ b/community/kid3/kid3.changelog
@@ -1,3 +1,9 @@
+2013-12-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * kid3 3.0.2-2 FS#37642 fixed, package split
+
+2013-12-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * kid3 3.0.2-1
+
2013-11-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* kid3 3.0.1-1
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index fc1b827cf..11375c709 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96005 2013-08-19 10:06:38Z andrea $
+# $Id: PKGBUILD 103167 2013-12-28 11:16:04Z lcarlier $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
@@ -7,7 +7,7 @@
pkgname=kphotoalbum
pkgver=4.4
-pkgrel=2
+pkgrel=3
pkgdesc="KDE Photo Album, picture collection manager"
url="http://www.kphotoalbum.org/"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/ktoblzcheck/PKGBUILD b/community/ktoblzcheck/PKGBUILD
index a3a1e5e61..2cc5109b7 100644
--- a/community/ktoblzcheck/PKGBUILD
+++ b/community/ktoblzcheck/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99823 2013-10-31 01:55:26Z allan $
+# $Id: PKGBUILD 101147 2013-11-18 10:59:32Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
pkgname=ktoblzcheck
-pkgver=1.42
+pkgver=1.43
pkgrel=1
pkgdesc="A library to check account numbers and bank codes of German banks"
arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ depends=('gcc-libs' 'python')
optdepends=('perl')
source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz
ktoblzcheck-python3.patch)
-md5sums=('86f25d5c6a07313638bb74d6b11eb57c'
+md5sums=('1052f9a97bd2f9cbf03e316d289acbe3'
'a81a697bb3aaeffb7fac0ad7d9166e3f')
build() {
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index ca895708a..ff7d70bb0 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96456 2013-08-29 15:09:01Z spupykin $
+# $Id: PKGBUILD 101243 2013-11-20 11:52:08Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
# Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
pkgbase=lazarus
pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
-pkgver=1.0.12
+pkgver=1.0.14
_pkgsubver=0
pkgrel=1
url='http://www.lazarus.freepascal.org/'
@@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync')
options=('!emptydirs' '!makeflags')
source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz"
'lazcontrols2.diff')
-md5sums=('daeb68f09e9ec9939f91c992f52305d5'
+md5sums=('11de0f79cf44eb25ee1c460561cc103b'
'288bca6ad5ade79deec34c3602daaaa9')
build() {
@@ -75,7 +75,7 @@ package_lazarus() {
rm -r $pkgdir/usr/lib/lazarus/install
# license files: /usr/lib/lazarus/COPYING*
- install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgbase/COPYING.modifiedLGPL
+ install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL
}
package_lazarus-gtk2() {
@@ -98,6 +98,9 @@ package_lazarus-gtk2() {
-e 's|\.png|\.xpm|' -i install/lazarus.desktop
install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop
install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png
+
+ # license files: /usr/lib/lazarus/COPYING*
+ install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL
}
package_lazarus-qt() {
@@ -120,5 +123,9 @@ package_lazarus-qt() {
-e 's|\.png|\.xpm|' -i install/lazarus.desktop
install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop
install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png
+
+ # license files: /usr/lib/lazarus/COPYING*
+ install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL
}
+
# vim:set ts=2 sts=2 sw=2 et:
diff --git a/extra/lbreakout2/PKGBUILD b/community/lbreakout2/PKGBUILD
index 03144c063..9019ed6cc 100644
--- a/extra/lbreakout2/PKGBUILD
+++ b/community/lbreakout2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 184401 2013-05-06 19:38:14Z foutrelis $
+# $Id: PKGBUILD 102169 2013-12-06 11:49:11Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
diff --git a/extra/lbreakout2/lbreakout2.desktop b/community/lbreakout2/lbreakout2.desktop
index c8ef945da..c8ef945da 100644
--- a/extra/lbreakout2/lbreakout2.desktop
+++ b/community/lbreakout2/lbreakout2.desktop
diff --git a/extra/lbreakout2/lbreakout2.png b/community/lbreakout2/lbreakout2.png
index f9541e184..f9541e184 100644
--- a/extra/lbreakout2/lbreakout2.png
+++ b/community/lbreakout2/lbreakout2.png
Binary files differ
diff --git a/extra/lcab/PKGBUILD b/community/lcab/PKGBUILD
index f3ead6e60..85a5a2391 100644
--- a/extra/lcab/PKGBUILD
+++ b/community/lcab/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154275 2012-03-25 09:39:03Z giovanni $
+# $Id: PKGBUILD 102167 2013-12-06 11:48:03Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
diff --git a/community/lcdproc/PKGBUILD b/community/lcdproc/PKGBUILD
index 4d5b863d6..dd4ec25fe 100644
--- a/community/lcdproc/PKGBUILD
+++ b/community/lcdproc/PKGBUILD
@@ -1,28 +1,24 @@
-# $Id: PKGBUILD 92663 2013-06-11 09:24:01Z idevolder $
+# $Id: PKGBUILD 102962 2013-12-25 04:58:31Z bgyorgy $
# Maintainer: BlackEagle <ike DOT devolder AT gmail DOT com>
# Contributor: Bernhard Walle <bernhard.walle@gmx.de>
pkgname=lcdproc
pkgver=0.5.6
-pkgrel=3
+pkgrel=4
pkgdesc="Utility to drive one or more LCD (and LCD-like) devices"
+arch=('i686' 'x86_64' 'mips64el')
url="http://lcdproc.omnipotent.net/"
-license="GPL"
-depends=('libusb-compat')
-optdepends=(
- 'perl: needed for some lcdproc tools'
-)
-backup=(
- 'etc/LCDd.conf'
+license=('GPL')
+depends=('libftdi-compat')
+optdepends=('perl: needed for some lcdproc tools')
+backup=('etc/LCDd.conf'
'etc/lcdexec.conf'
'etc/lcdproc.conf'
- 'etc/lcdvc.conf'
-)
-arch=('i686' 'x86_64' 'mips64el')
-source=(
- "http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
- 'lcdd.service'
-)
+ 'etc/lcdvc.conf')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+ 'lcdd.service')
+sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a'
+ '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638')
build() {
cd "$pkgname-$pkgver"
@@ -43,6 +39,3 @@ package() {
sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" -i "$pkgdir/etc/LCDd.conf"
install -Dm644 "$srcdir/lcdd.service" "$pkgdir/usr/lib/systemd/system/lcdd.service"
}
-
-sha256sums=('bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a'
- '0acdc0fb9668e6d5e023349874301153a16935e1ad757d550c426a9a7ac64638')
diff --git a/community/ldc/PKGBUILD b/community/ldc/PKGBUILD
index b93f4c0e5..5fcea7099 100644
--- a/community/ldc/PKGBUILD
+++ b/community/ldc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99051 2013-10-23 12:11:03Z dicebot $
+# $Id: PKGBUILD 101888 2013-12-02 15:58:18Z dicebot $
# Maintainer: Mihails Strasuns <public@dicebot.lv>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=('ldc' 'liblphobos-devel')
groups=('dlang' 'dlang-ldc')
-pkgver=0.12.0
+pkgver=0.12.1
epoch=1
pkgrel=1
pkgdesc="A D Compiler based on the LLVM Compiler Infrastructure including D runtime and libphobos2"
@@ -35,7 +35,7 @@ build() {
}
package_ldc() {
- optdepends=("liblphobos-devel: stadard library, static one + imports, LDC version")
+ optdepends=("liblphobos-devel: standard library, static one + imports, LDC version")
backup=("etc/ldc2.conf"
"etc/ldc2.rebuild.conf"
)
diff --git a/community/libcec/PKGBUILD b/community/libcec/PKGBUILD
index 68c88279c..679ed3922 100644
--- a/community/libcec/PKGBUILD
+++ b/community/libcec/PKGBUILD
@@ -1,33 +1,27 @@
-# $Id: PKGBUILD 99035 2013-10-22 19:26:05Z idevolder $
+# $Id: PKGBUILD 103164 2013-12-28 11:02:04Z idevolder $
# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
# Contributor: Philippe Cherel <philippe.cherel@mayenne.org>
# vim: ft=sh:
pkgname=libcec
-pkgver=2.1.3
-pkgrel=3
+pkgver=2.1.4
+pkgrel=1
pkgdesc="Pulse-Eight's libcec for the Pulse-Eight USB-CEC adapter"
arch=('i686' 'x86_64' 'mips64el')
-url="https://github.com/Pulse-Eight/libcec"
+url="http://libcec.pulse-eight.com/"
license=('GPL')
depends=('udev' 'lockdev')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/libcec/tarball/$pkgname-$pkgver")
-_srcfolder=Pulse-Eight-libcec-54be21e
-sha256sums=('2aa88451b528184b02077ee8c6cd10e2f89121a6a05b1b35b4b792b03108a9d1')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/Pulse-Eight/$pkgname/archive/$pkgname-$pkgver.tar.gz")
build() {
- mv "$_srcfolder" "$pkgname-$pkgver"
-
- cd "$pkgname-$pkgver"
- export CFLAGS="$CFLAGS -fPIC"
- export CXXFLAGS="$CXXFLAGS -fPIC"
- export LDFLAGS="$LDFLAGS -fPIC"
+ cd "$pkgname-$pkgname-$pkgver"
autoreconf -vif
./configure --prefix=/usr
make
}
package() {
- cd "$pkgname-$pkgver"
+ cd "$pkgname-$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
+sha256sums=('79bef5232a5c9ab987ca3a2d4bfcaeb80480fd26f502dc1a996fe845d90fe147')
diff --git a/community/libcuefile/PKGBUILD b/community/libcuefile/PKGBUILD
index 7d20e122b..7725fafed 100644
--- a/community/libcuefile/PKGBUILD
+++ b/community/libcuefile/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 57124 2011-10-22 02:51:18Z ebelanger $
-# Maintainer: Corrado Primier <bardo@aur.archlinux.org>
+# $Id: PKGBUILD 103016 2013-12-25 16:52:28Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor: Corrado Primier <bardo@aur.archlinux.org>
pkgname=libcuefile
pkgver=475
-pkgrel=1
+pkgrel=2
pkgdesc="A library to work with CUE files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.musepack.net/index.php?pg=src"
diff --git a/community/libdaq/PKGBUILD b/community/libdaq/PKGBUILD
index 744a8d92d..3cddc17de 100644
--- a/community/libdaq/PKGBUILD
+++ b/community/libdaq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99826 2013-10-31 01:56:41Z allan $
+# $Id: PKGBUILD 102862 2013-12-22 20:59:29Z bpiotrowski $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
pkgname=libdaq
-pkgver=1.1.1
+pkgver=2.0.1
pkgrel=1
pkgdesc='Data Acquisition library for packet I/O.'
arch=('i686' 'x86_64' 'mips64el')
@@ -10,15 +10,14 @@ url='http://www.snort.org/'
license=('GPL')
depends=('libpcap')
makedepends=('ca-certificates')
-source=("http://www.snort.org/dl/snort-current/daq-${pkgver}.tar.gz"{,.sig})
-md5sums=('bc204ea09165b4ecbb1bb49c7c1a2ad4'
- '3ec4c252249b09adaf5c96e2626a1f74')
+source=(http://www.snort.org/dl/snort-current/daq-${pkgver}.tar.gz{,.sig})
+md5sums=('044aa3663d44580d005293eeb8ccf175'
+ 'SKIP')
build() {
cd "${srcdir}/daq-${pkgver}"
-
./configure --prefix=/usr
- make
+ make -j1
}
package() {
diff --git a/community/libdbi-drivers/PKGBUILD b/community/libdbi-drivers/PKGBUILD
index b8d5419c2..db89222d8 100644
--- a/community/libdbi-drivers/PKGBUILD
+++ b/community/libdbi-drivers/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99828 2013-10-31 01:57:20Z allan $
+# $Id: PKGBUILD 101343 2013-11-22 23:07:08Z ttoepper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Contributor: Olivier Médoc <o_medoc@yahoo.fr>
# Contributor: Ashok `ScriptDevil` Gautham <ScriptDevil.Arch@gmail.com>
pkgname=libdbi-drivers
pkgver=0.9.0
-pkgrel=1
+pkgrel=2
pkgdesc="Database drivers for libdbi (MySQL, PostgreSQL, and SQLite)"
url="http://libdbi-drivers.sourceforge.net/"
license=('GPL')
@@ -16,6 +16,7 @@ optdepends=("postgresql-libs: To work with postgresql using libdbdpgsql "
"sqlite3: To work with sqlite3 using libdbdsqlite3"
"libmariadbclient: To work with mysql using libdbdmysql"
"sqlite2: To work with sqlite2 using libdbdsqlite")
+options=(!libtool)
install=libdbi-drivers.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz")
sha1sums=('8472875d30c216540d48d591b442e40ba4f7df5d')
@@ -24,7 +25,6 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
--disable-docs \
- --with-libdbi \
--with-mysql \
--with-pgsql \
--with-sqlite \
@@ -34,6 +34,6 @@ build() {
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
+ make DESTDIR=${pkgdir} localstatedir=/var install
}
diff --git a/community/libestr/PKGBUILD b/community/libestr/PKGBUILD
index 0c7fdb6a3..b2c3876f0 100644
--- a/community/libestr/PKGBUILD
+++ b/community/libestr/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 100192 2013-11-01 21:08:24Z spupykin $
+# $Id: PKGBUILD 100616 2013-11-06 13:35:13Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Brian Knox <taotetek@gmail.com>
pkgname=libestr
-pkgver=0.1.5
-pkgrel=2
+pkgver=0.1.9
+pkgrel=1
pkgdesc="essentials for string handling (and a bit more)"
url="http://libestr.adiscon.com/"
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL2.1')
depends=()
source=("http://libestr.adiscon.com/files/download/libestr-$pkgver.tar.gz")
-md5sums=('f180c0cdc82883d161eba3f2e8a34eb4')
+md5sums=('681ca0ed7e5ae6ddff70fdec413096e4')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/libfaketime/PKGBUILD b/community/libfaketime/PKGBUILD
index 1ed0c439f..a43fbb58b 100644
--- a/community/libfaketime/PKGBUILD
+++ b/community/libfaketime/PKGBUILD
@@ -1,28 +1,20 @@
-# $Id: PKGBUILD 62627 2012-01-22 21:34:26Z lfleischer $
+# $Id: PKGBUILD 103175 2013-12-28 18:39:16Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Dan Serban
# Contributor: Ross Melin <rdmelin@gmail.com>
pkgname=libfaketime
-pkgver=0.9.1
+pkgver=0.9.5
pkgrel=1
pkgdesc='Report fake dates and times to programs without having to change the system-wide time.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.code-wizards.com/projects/libfaketime/'
license=('GPL2')
-source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'libfaketime-0.9.1-fix-as-needed.patch'
- 'libfaketime-0.9.1-fix-README-NEWS.patch')
-md5sums=('ce3f996dfd5826b4ac62f1a7cc36ea27'
- '90873e4df35283463ef54b159c318686'
- 'b1b641a8e2298aa1646982e3bde96117')
+source=("http://www.code-wizards.com/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('89b5c71e6c6a93b1c6feba374ac37719')
build() {
cd "${pkgname}-${pkgver}"
-
- patch -p1 -i ../libfaketime-0.9.1-fix-as-needed.patch
- patch -p1 -i ../libfaketime-0.9.1-fix-README-NEWS.patch
-
make
}
diff --git a/community/libg15/PKGBUILD b/community/libg15/PKGBUILD
new file mode 100644
index 000000000..082bbc1f1
--- /dev/null
+++ b/community/libg15/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 101647 2013-11-29 19:08:51Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: onestep_ua <onestep at ukr dot net>
+
+pkgname=libg15
+pkgver=1.2.7
+pkgrel=1
+pkgdesc="Provides low-level access to the Logitech G15 and G11 keyboards and Z10 speakers"
+arch=('i686' 'x86_64')
+url="http://www.g15tools.com/"
+license=('GPL')
+depends=('libusb-compat')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/g15tools/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('718c8e1d0d0d4657f95427593d90a27a')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/community/libg15render/PKGBUILD b/community/libg15render/PKGBUILD
new file mode 100644
index 000000000..90d48a9a2
--- /dev/null
+++ b/community/libg15render/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 101648 2013-11-29 19:09:04Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: onestep_ua <onestep at ukr dot net>
+
+pkgname=libg15render
+pkgver=1.2
+pkgrel=3
+pkgdesc="A small graphics library optimised for drawing on an LCD"
+arch=('i686' 'x86_64')
+url="http://www.g15tools.com/"
+license=('GPL')
+depends=('libg15')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/g15tools/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('a5a2a833d098926c3d289aeae452cc53')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/community/libgringotts/PKGBUILD b/community/libgringotts/PKGBUILD
index 8b15c485f..c986c5f9e 100644
--- a/community/libgringotts/PKGBUILD
+++ b/community/libgringotts/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99846 2013-10-31 02:03:26Z allan $
+# $Id: PKGBUILD 103022 2013-12-25 17:07:40Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=libgringotts
pkgver=1.2.1
-pkgrel=10
+pkgrel=11
pkgdesc="Encryption backend for Gringotts"
arch=('i686' 'x86_64' 'mips64el')
url="http://developer.berlios.de/projects/gringotts"
@@ -14,7 +14,7 @@ source=(http://download.berlios.de/gringotts/$pkgname-$pkgver.tar.bz2)
md5sums=('b2b1bad56ef33153f251ccd9500860be')
build() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}"/$pkgname-$pkgver
autoconf
./configure --prefix=/usr --build=$CHOST
@@ -22,9 +22,9 @@ build() {
}
package() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}"/$pkgname-$pkgver
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
- rm -fr ${pkgdir}/usr/share
+ rm -fr "${pkgdir}"/usr/share
}
diff --git a/community/libgringotts/libgringotts.changelog b/community/libgringotts/libgringotts.changelog
index a2357a924..d046639ba 100644
--- a/community/libgringotts/libgringotts.changelog
+++ b/community/libgringotts/libgringotts.changelog
@@ -1,6 +1,9 @@
+2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * libgringotts 1.2.1-11 static libraries remoed
+
2012-05-01 Andrea Scarpino <andrea@archlinux.org>
- * Remove libtool dependence
- * Remove .la file
+ * Remove libtool dependence
+ * Remove .la file
2009-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* osmo dependency, moved to [community]
diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD
index 2ff6438c6..a5cc932ae 100644
--- a/community/libkkc/PKGBUILD
+++ b/community/libkkc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99853 2013-10-31 02:05:47Z allan $
+# $Id: PKGBUILD 102736 2013-12-18 10:42:09Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
pkgname=libkkc
-pkgver=0.3.1
+pkgver=0.3.2
pkgrel=1
pkgdesc="Japanese Kana Kanji conversion library"
arch=('i686' 'x86_64')
@@ -30,4 +30,4 @@ package() {
"${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/"
}
-sha512sums=('6b237930ec0fd0f788364a301b2cf97a0607d708c109cf619b73321255ec50f08c396afde767856a9db6f8e8ceb0117a95eda3a17f3c9c8065a32843b1e97fc0')
+sha512sums=('ae3aa5278aabece7e883a1c336211249b4123cd66d23bf0f8db146de1df7c17d12f091b02f0eb0471646c513aba1732777cf80b5f6aab2f2e091df13ef441067')
diff --git a/community/liblockfile/PKGBUILD b/community/liblockfile/PKGBUILD
index 2aaf6e987..391f3a811 100644
--- a/community/liblockfile/PKGBUILD
+++ b/community/liblockfile/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100202 2013-11-01 21:13:53Z spupykin $
+# $Id: PKGBUILD 102144 2013-12-05 21:13:52Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
pkgname=liblockfile
pkgver=1.08_4
_basever=1.08
-pkgrel=3
+pkgrel=4
pkgdesc="a library with NFS-safe locking functions"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -22,7 +22,7 @@ build() {
for p in `cat ../debian/patches/series` ; do
patch -p1 < ../debian/patches/$p
done
- ./configure --prefix=/usr --mandir=/usr/share/man
+ LDCONFIG=/usr/bin/true ./configure --enable-shared --prefix=/usr --mandir=/usr/share/man
make
}
diff --git a/community/libmediainfo/PKGBUILD b/community/libmediainfo/PKGBUILD
index 712949278..cdd16bdd1 100644
--- a/community/libmediainfo/PKGBUILD
+++ b/community/libmediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99856 2013-10-31 02:07:03Z allan $
+# $Id: PKGBUILD 101323 2013-11-22 17:32:16Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: hydro <hydro@freenet.de>
pkgname=libmediainfo
-pkgver=0.7.64
+pkgver=0.7.65
pkgrel=1
pkgdesc="shared library for mediainfo"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=( 'curl' 'libmms' 'libzen')
makedepends=('libtool' 'automake' 'autoconf')
source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2
libmediainfo-0.7.50-libmms.patch)
-md5sums=('27a6afbf5993c894bd38fab9b8e0fc27'
+md5sums=('51f62420b58a61c27ec9406e82ab3999'
'2f4b21cc250f663d52b497dedb963e3b')
build() {
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 5a2721991..b8cf31a36 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100208 2013-11-01 21:16:12Z spupykin $
+# $Id: PKGBUILD 102393 2013-12-10 10:04:03Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
# Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,8 +6,8 @@
# Contributor: Mathias Rohnstock <linksoft@gmx.de>
pkgname=libmicrohttpd
-pkgver=0.9.27
-pkgrel=2
+pkgver=0.9.32
+pkgrel=1
pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/libmicrohttpd/"
@@ -15,7 +15,7 @@ license=('LGPL')
depends=('gnutls' 'libgcrypt')
install=libmicrohttpd.install
source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('a10496b7f1b495aaf6897584da52f51b')
+md5sums=('29dcc1c201c36044be2c3f816c64a5bb')
build() {
cd ${pkgname}-${pkgver}
diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD
index 1c9d76c81..aa5b9e24f 100644
--- a/community/libmirage/PKGBUILD
+++ b/community/libmirage/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99858 2013-10-31 02:07:43Z allan $
+# $Id: PKGBUILD 102784 2013-12-20 01:20:37Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
pkgname=libmirage
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
pkgdesc="CD-ROM image (B6T/C2D/CCD/CDI/CIF/CUE/ISO/MDS/MDX/NRG/TOC) access library"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
@@ -13,11 +13,15 @@ license=(GPL)
depends=(glib2 libsndfile libsamplerate zlib bzip2 xz shared-mime-info)
makedepends=(gtk-doc gobject-introspection cmake)
install=libmirage.install
-source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2)
-sha256sums=('fb30eea15b8c1fc55e194e1af55127fa3b3860a79fec0b6c60588cf9ae8d1ca9')
+source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2
+ missing-xml.patch)
+sha256sums=('f606391095200df510b923201881bfbadb6ab032035ce9a67aa24fcae3145108'
+ 'c20e5d8d0695e3832971646eef2d735f1d12a4da767da1ff4f9c9af92ad7ad02')
prepare() {
mkdir build
+ cd $pkgname-$pkgver
+ patch -Np2 -i ../missing-xml.patch
}
build() {
@@ -25,7 +29,8 @@ build() {
cmake ../$pkgname-$pkgver \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DPOST_INSTALL_HOOKS:BOOL=OFF
make
}
diff --git a/community/libmirage/missing-xml.patch b/community/libmirage/missing-xml.patch
new file mode 100644
index 000000000..58dfebfeb
--- /dev/null
+++ b/community/libmirage/missing-xml.patch
@@ -0,0 +1,24 @@
+diff --git i/libmirage/src/filters/filter-daa/CMakeLists.txt w/libmirage/src/filters/filter-daa/CMakeLists.txt
+index ebd2890..e7021c1 100644
+--- i/libmirage/src/filters/filter-daa/CMakeLists.txt
++++ w/libmirage/src/filters/filter-daa/CMakeLists.txt
+@@ -35,6 +35,7 @@ if (${ZLIB_FOUND})
+
+ # Install MIME type
+ install(FILES "libmirage-${filter_short}.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
++ install(FILES "libmirage-gbi.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
+ if (POST_INSTALL_HOOKS)
+ install(CODE "execute_process (COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${CMAKE_INSTALL_FULL_DATADIR}/mime)")
+ endif ()
+diff --git i/libmirage/src/parsers/image-mds/CMakeLists.txt w/libmirage/src/parsers/image-mds/CMakeLists.txt
+index c97be8f..bb0ee2b 100644
+--- i/libmirage/src/parsers/image-mds/CMakeLists.txt
++++ w/libmirage/src/parsers/image-mds/CMakeLists.txt
+@@ -20,6 +20,7 @@ if (TRUE)
+
+ # Install MIME type
+ install(FILES "libmirage-${parser_short}.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
++ install(FILES "libmirage-xmd.xml" DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages)
+ if (POST_INSTALL_HOOKS)
+ install(CODE "execute_process (COMMAND ${UPDATE_MIME_DATABASE_EXECUTABLE} ${CMAKE_INSTALL_FULL_DATADIR}/mime)")
+ endif ()
diff --git a/community/libnfs/PKGBUILD b/community/libnfs/PKGBUILD
index 7aa7fa0f3..e4bc6184b 100644
--- a/community/libnfs/PKGBUILD
+++ b/community/libnfs/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 99036 2013-10-22 19:26:33Z idevolder $
+# $Id: PKGBUILD 101449 2013-11-25 20:44:51Z idevolder $
# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
pkgname=libnfs
-pkgver=1.7.0
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
pkgdesc="client library for accessing NFS shares"
arch=('i686' 'x86_64' 'mips64el')
url="https://github.com/sahlberg/libnfs"
license=('GPL')
depends=('glibc')
source=("https://github.com/sahlberg/$pkgname/archive/$pkgname-$pkgver.tar.gz")
-sha256sums=('724e0b15cb2099ab3bbdb8456eaab54bc6d1de76da4b4f3251323471523e2114')
+sha256sums=('e4d766efba85e79b04c18038070506d0a9df5b7e0f08aa54ab402892cd1542cc')
build() {
cd "$pkgname-$pkgname-$pkgver"
diff --git a/community/libpar2/PKGBUILD b/community/libpar2/PKGBUILD
index 7c05827c2..0417aa174 100644
--- a/community/libpar2/PKGBUILD
+++ b/community/libpar2/PKGBUILD
@@ -1,16 +1,17 @@
+# $Id: PKGBUILD 103025 2013-12-25 17:18:28Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Paul Bredbury <brebs@sent.com>
# Contributor: Matt McDonald <metzen@gmail.com>
pkgname=libpar2
pkgver=0.2
-pkgrel=6
+pkgrel=7
pkgdesc="Parity checking library"
arch=('i686' 'x86_64' 'mips64el')
url="http://parchive.sourceforge.net/"
license=('GPL')
depends=('libsigc++2.0')
-makedepends=('autoconf' 'automake' 'pkgconfig')
+makedepends=('autoconf' 'automake' 'pkgconfig' 'patch')
source=(http://downloads.sourceforge.net/sourceforge/parchive/${pkgname}-${pkgver}.tar.gz
libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch)
sha256sums=('074fbf840f73b1e13e0405fce261078c81c8c0a4859e30a7bba10510f9199908'
diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD
index 4019029f3..b0860c659 100644
--- a/community/libpinyin/PKGBUILD
+++ b/community/libpinyin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100397 2013-11-03 12:30:24Z fyan $
+# $Id: PKGBUILD 101539 2013-11-27 09:04:03Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Yangtse <yangtsesu@gmail.com>
# Contributor: WU Jun <quark at lihdd dot net>
pkgname=libpinyin
-pkgver=0.9.94
+pkgver=1.0.0
_modelver=7
pkgrel=1
pkgdesc="Library to deal with pinyin"
@@ -12,12 +12,13 @@ arch=('i686' 'x86_64' 'mips64el')
url="https://github.com/libpinyin/libpinyin"
license=('GPL')
depends=('db' 'glib2')
-source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz"
+makedepends=('git')
+source=("git+https://github.com/$pkgname/${pkgname}.git#tag=$pkgver"
"http://downloads.sourceforge.net/libpinyin/model${_modelver}.text.tar.gz")
noextract=("model${_modelver}.text.tar.gz")
build() {
- cd ${pkgname}-${pkgver}
+ cd ${pkgname}
cp ../model${_modelver}.text.tar.gz data/
sed -i "/wget.*model${_modelver}\.text\.tar\.gz/ d" data/Makefile.am
@@ -27,9 +28,9 @@ build() {
}
package() {
- cd ${pkgname}-$pkgver
+ cd ${pkgname}
make DESTDIR="${pkgdir}" install
}
-sha512sums=('733083a8ed1dc0d230c8830e67c4d23b28ecf4c2b4adf386aee5f1e3cd9849363951c60720d5ae5fe9c075b4dbdda88969473c19bb1a8c8187cbc21e35445108'
+sha512sums=('SKIP'
'74a56a23cdca24124037f688ed85a921089155a1b9a0b61e646f805b2bb698c56682c5d6a47ff86657c8b131a831dbee9d5cc5165d4c1f235b77fcd5b2e480ad')
diff --git a/community/libraw/libraw.changelog b/community/libraw/libraw.changelog
deleted file mode 100644
index 0c3b4b6fa..000000000
--- a/community/libraw/libraw.changelog
+++ /dev/null
@@ -1,20 +0,0 @@
-2013-09-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * libraw 0.15.4-1
-
-2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * libraw 0.15.2-1
-
-2013-06-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * libraw 0.14.8-1
-
-2012-09-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * libraw 0.14.7-1
-
-2012-04-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * libraw 0.14.6-1
-
-2012-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * libraw 0.14.5-1
-
-2011-12-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * libraw 0.14.4-1
diff --git a/community/libreplaygain/PKGBUILD b/community/libreplaygain/PKGBUILD
index c4b978d51..3682e2953 100644
--- a/community/libreplaygain/PKGBUILD
+++ b/community/libreplaygain/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 57695 2011-11-01 10:46:06Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 103013 2013-12-25 16:46:04Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Corrado Primier <bardo@aur.archlinux.org>
pkgname=libreplaygain
pkgver=475
-pkgrel=1
+pkgrel=2
pkgdesc="A library to adjust audio gain"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.musepack.net/index.php?pg=src"
@@ -16,6 +16,7 @@ md5sums=('e27b3b1249b7fbae92d656d9e3d26633')
build() {
cd "${srcdir}"
+
mkdir build
cd build
cmake ../${pkgname}_r${pkgver}/ \
@@ -26,9 +27,10 @@ build() {
package() {
cd "${srcdir}"/build
+
make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/usr/include/replaygain/"
+ install -d "${pkgdir}"/usr/include/replaygain/
install -Dm644 "${srcdir}"/${pkgname}_r${pkgver}/include/replaygain/* \
- "${pkgdir}/usr/include/replaygain/"
+ "${pkgdir}"/usr/include/replaygain/
}
diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD
index 38c3c941d..635b5353b 100644
--- a/community/librime/PKGBUILD
+++ b/community/librime/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 94029 2013-07-13 12:33:16Z svenstaro $
+# $Id: PKGBUILD 103209 2013-12-30 09:12:39Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: GONG Chen <chen dot sst at gmail dot com>
# Contributor: 網軍總司令
pkgname=librime
-pkgver=0.9.9
-pkgrel=3
+pkgver=1.1
+pkgrel=1
pkgdesc="Rime input method engine"
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/rimeime/"
license=('GPL3')
-depends=('boost' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp>=0.5')
+depends=('boost-libs' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp>=0.5')
optdepends=('brise: Rime schema repository')
-makedepends=('cmake')
+makedepends=('cmake' 'boost')
source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz")
build() {
- cd "${srcdir}/$pkgname"
+ cd $pkgname
make
}
package() {
- cd "${srcdir}/$pkgname"
+ cd $pkgname
make DESTDIR="$pkgdir" install
}
-md5sums=('bd705cd3e4c7ab6e47d983b07044769f')
+sha512sums=('deb0142fe193f7d445f5008f2cfebb813e4db662f5c474dcb5b8d9f1a9ea8c2e7dc384f3dfae32e7fd13c08f55852124089db08cb96928b98e94128b10847af0')
diff --git a/community/libsodium/PKGBUILD b/community/libsodium/PKGBUILD
index 193e5eb5b..da1b341a7 100644
--- a/community/libsodium/PKGBUILD
+++ b/community/libsodium/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99151 2013-10-25 05:03:48Z fyan $
+# $Id: PKGBUILD 100860 2013-11-12 10:28:49Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: namelessjon <jonathan.stott@gmail.com>
# Contributor: Alessio Sergi <asergi at archlinux dot us>
pkgname=libsodium
pkgver=0.4.5
-pkgrel=1
+pkgrel=2
pkgdesc="P(ortable|ackageable) NaCl-based crypto library"
arch=('i686' 'x86_64')
url="https://github.com/jedisct1/libsodium"
@@ -34,4 +34,4 @@ package() {
}
# vim:set ts=2 sw=2 et:
-sha512sums=('8c446b62c0400ed972f11c399a03f334cead80fc48513c4b5eba6f569725e28cf98d71cd6d46da5602fc553719a18e74598008c311fe02b2f05b61c7bc72525b')
+sha512sums=('6105bb91982e040420312f042bb71547f0208ed9b2928b1740a68134b82dd4566f18c0761b8959a85d13b6770edbd977d989bc74eabc9bfa5e0000f5ab5c7b32')
diff --git a/community/libstatgrab/PKGBUILD b/community/libstatgrab/PKGBUILD
index fee9a815c..66a3e63c0 100644
--- a/community/libstatgrab/PKGBUILD
+++ b/community/libstatgrab/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99883 2013-10-31 02:16:04Z allan $
+# $Id: PKGBUILD 103029 2013-12-25 17:24:20Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Hugo Ideler <hugoideler@dse.nl>
pkgname=libstatgrab
pkgver=0.17
-pkgrel=3
+pkgrel=4
pkgdesc="A library that provides cross platform access to statistics about the system on which it's run"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.i-scream.org/libstatgrab"
@@ -17,14 +17,14 @@ source=(http://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/$pkgnam
sha256sums=('bbaa88c6bde8bd3cf2720b81a26528cc055a7e83e4ea3bdb1d0a3c4287cceb88')
build() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}"/$pkgname-$pkgver
./configure --prefix=/usr
make
}
package() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}"/$pkgname-$pkgver
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
}
diff --git a/community/libstatgrab/libstatgrab.changelog b/community/libstatgrab/libstatgrab.changelog
index ee8f7860f..6b1e7f6db 100644
--- a/community/libstatgrab/libstatgrab.changelog
+++ b/community/libstatgrab/libstatgrab.changelog
@@ -1,3 +1,6 @@
+2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * libstatgrab 0.17-4 static library removal
+
2011-01-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* libstatgrab 0.17-1
@@ -9,3 +12,4 @@
* libstatgrab 0.16-1
* Upstream update
* Added ChangeLog
+
diff --git a/community/libstrl/PKGBUILD b/community/libstrl/PKGBUILD
new file mode 100644
index 000000000..0a25f255a
--- /dev/null
+++ b/community/libstrl/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 102397 2013-12-10 10:41:46Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Nathan Phillip Brink <binki@gentoo.org>
+
+pkgname=libstrl
+pkgver=0.5.1
+pkgrel=1
+pkgdesc="Implementations of certain GNU-only or BSD-only string-related libc functions, such as strlcpy() and getdelim(), for compat purposes"
+url="http://ohnopub.net/~ohnobinki/libstrl"
+license=('LGPL3')
+arch=(i686 x86_64)
+depends=()
+makedepends=(doxygen libtool pkg-config)
+options=(!libtool)
+source=(ftp://mirror.ohnopub.net/mirror/${pkgname}-${pkgver}.tar.bz2{,.asc})
+md5sums=('d22fcd8107526d802428be6f0e8f0f60'
+ 'SKIP')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ ./configure --prefix=/usr --with-doxygen
+ make
+}
+
+check() {
+ make -C "${srcdir}"/${pkgname}-${pkgver} check
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ # doxygen workaround
+ sed -i 's|man0/strl.h.0|man30/strl.h.30|g' Makefile
+ install -Dm0644 man/man30/strl.h.30 $pkgdir/usr/share/man/man0/strl.h.0
+
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/community/libtaginfo/PKGBUILD b/community/libtaginfo/PKGBUILD
index a24121fc6..1eddbfc5c 100644
--- a/community/libtaginfo/PKGBUILD
+++ b/community/libtaginfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99234 2013-10-26 09:47:13Z fyan $
+# $Id: PKGBUILD 102566 2013-12-15 04:07:29Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=libtaginfo
-pkgver=0.1.6
-pkgrel=2
+pkgver=0.2.0
+pkgrel=1
pkgdesc="Library for reading media metadata"
arch=('i686' 'x86_64' 'mips64el')
url="https://bitbucket.org/shuerhaaken/libtaginfo"
@@ -12,14 +12,14 @@ license=('GPL2')
source=("https://bitbucket.org/shuerhaaken/libtaginfo/downloads/$pkgname-$pkgver.tar.gz")
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./autogen.sh --prefix=/usr
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
-md5sums=('781361a667767e8553735682d63670ca')
+md5sums=('db4358e6328609e262c291f365ec8e81')
diff --git a/community/libuhd/PKGBUILD b/community/libuhd/PKGBUILD
index c3758b43d..e33eaf34f 100644
--- a/community/libuhd/PKGBUILD
+++ b/community/libuhd/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 99249 2013-10-26 12:30:40Z kkeen $
+# $Id: PKGBUILD 102256 2013-12-07 10:36:40Z bpiotrowski $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Dominik Heidler <dheidler@gmail.com>
pkgname=libuhd
pkgver=3.5.4
_verstring=003_005_004
-pkgrel=2
+pkgrel=4
pkgdesc="Universal Software Radio Peripheral (USRP) userspace driver"
arch=('x86_64' 'i686')
url="http://code.ettus.com/redmine/ettus/projects/uhd/wiki"
license=('GPL')
depends=('boost-libs' 'orc' 'libusbx')
makedepends=('cmake' 'boost' 'python2-cheetah')
-install='libuhd.install'
source=("libuhd-$pkgver.tar.gz::https://codeload.github.com/EttusResearch/uhd/tar.gz/release_$_verstring")
md5sums=('e90c95483a52b75cacc85f4fb0ef63ed')
diff --git a/community/libuhd/libuhd.install b/community/libuhd/libuhd.install
deleted file mode 100644
index 8a8592faf..000000000
--- a/community/libuhd/libuhd.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
- ldconfig
-}
-
-post_upgrade() {
- ldconfig
-}
diff --git a/community/libvdpau-va-gl/PKGBUILD b/community/libvdpau-va-gl/PKGBUILD
new file mode 100644
index 000000000..b5f7deb53
--- /dev/null
+++ b/community/libvdpau-va-gl/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 101594 2013-11-28 16:02:19Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Behem0th <grantipak@gmail.com>
+
+pkgname=libvdpau-va-gl
+pkgver=0.2.1
+pkgrel=1
+pkgdesc='VDPAU driver with OpenGL/VAAPI backend'
+arch=('i686' 'x86_64')
+url='https://github.com/i-rinat/libvdpau-va-gl'
+license=('LGPL3')
+depends=('libvdpau' 'libva' 'libgl' 'ffmpeg' 'glu')
+makedepends=('cmake')
+source=('https://github.com/i-rinat/${pkgname}/archive/v'${pkgver}'.zip')
+md5sums=('bb14c2ec9763c025b1abde96df845512')
+
+build() {
+ cd $pkgname-$pkgver
+ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
diff --git a/community/libvirt-python/PKGBUILD b/community/libvirt-python/PKGBUILD
new file mode 100644
index 000000000..3e592fdfd
--- /dev/null
+++ b/community/libvirt-python/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 101980 2013-12-03 09:48:38Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jonathan Wiersma <archaur at jonw dot org>
+
+pkgname=libvirt-python
+pkgver=1.2.0
+pkgrel=2
+pkgdesc="libvirt python binding"
+arch=('i686' 'x86_64')
+url="http://libvirt.org/"
+license=('LGPL')
+depends=('python2' 'libvirt')
+options=('emptydirs')
+install="libvirt-python.install"
+source=("ftp://libvirt.org/libvirt/python/$pkgname-$pkgver.tar.gz"
+ "python-fix.patch::http://libvirt.org/git/?p=libvirt-python.git;a=patch;h=9d9e2513c09e7ba7474c94455e5f82b3d00e6396")
+md5sums=('38158e5740be65f17eef9f99ffa5dadf'
+ 'ba2e5b0d5906a25a6e8a857156d55b61')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -p1 <$srcdir/python-fix.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py build
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ python2 setup.py install --root=$pkgdir
+}
diff --git a/community/libvirt-python/libvirt-python.install b/community/libvirt-python/libvirt-python.install
new file mode 100644
index 000000000..216f08a7c
--- /dev/null
+++ b/community/libvirt-python/libvirt-python.install
@@ -0,0 +1,3 @@
+post_remove() {
+ rm -f /usr/lib/python[0-9].[0-9]/site-packages/libvirt.pyc
+}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 2bd806bc9..2d81f175d 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100495 2013-11-05 10:05:13Z spupykin $
+# $Id: PKGBUILD 101981 2013-12-03 09:49:12Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jonathan Wiersma <archaur at jonw dot org>
pkgname=libvirt
-pkgver=1.1.4
+pkgver=1.2.0
pkgrel=1
pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
arch=('i686' 'x86_64' 'mips64el')
@@ -33,7 +33,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
libvirtd.conf.d
libvirtd-guests.conf.d
libvirt.tmpfiles.d)
-md5sums=('0b21e97ad5d3c27d18806896e16ef82b'
+md5sums=('f74f78059def4e68d69b975ad6e6c3e2'
'3ed0e24f5b5e25bf553f5427d64915e6'
'0a96ed876ffb1fcb9dff5a9b3a609c1e'
'020971887442ebbf1b6949e031c8dd3f')
diff --git a/community/libwww/PKGBUILD b/community/libwww/PKGBUILD
index ef82322c1..4c2349a38 100644
--- a/community/libwww/PKGBUILD
+++ b/community/libwww/PKGBUILD
@@ -1,24 +1,33 @@
-# $Id: PKGBUILD 99890 2013-10-31 02:18:38Z allan $
+# $Id: PKGBUILD 101040 2013-11-15 12:42:59Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Buharev Vasilij <buharev.v.p@gmail.com>
pkgname=libwww
pkgver=5.4.0
-pkgrel=5
+pkgrel=6
pkgdesc="A general-purpose client side WEB API"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.w3.org/Library/"
license=('W3C')
-depends=()
+depends=('openssl')
makedepends=('gcc pkgconfig perl zlib openssl')
source=(http://www.w3.org/Library/Distribution/w3c-$pkgname-$pkgver.tgz)
md5sums=('c3734ca6caa405707e134cc8c6d7e422')
+prepare() {
+ cd "$srcdir/w3c-$pkgname-$pkgver"
+ sed -i 's|\${CC-cc}|${CC-cc} -O2 |g' ./configure
+}
+
build() {
cd "$srcdir/w3c-$pkgname-$pkgver"
+ unset LDFLAGS
[ -f Makefile ] || ./configure --prefix=/usr \
- --with-md5 --with-zlib --with-expat --with-regex --with-ssl --host=$CHOST
- sed -i 's#Examples##' Library/Makefile
+ --with-md5 --with-zlib --with-expat --with-regex --with-ssl --host=$CHOST
make
+}
+
+package() {
+ cd "$srcdir/w3c-$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
diff --git a/community/libx86/PKGBUILD b/community/libx86/PKGBUILD
index 99cd709f4..a945dfa61 100644
--- a/community/libx86/PKGBUILD
+++ b/community/libx86/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55525 2011-09-14 07:30:42Z andrea $
+# $Id: PKGBUILD 103236 2013-12-30 17:06:11Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: tardo <tardo@nagi-fanboi.net>
@@ -6,7 +6,7 @@
pkgname=libx86
pkgver=1.1
-pkgrel=3
+pkgrel=4
pkgdesc="Provides an lrmi interface that works on x86, am64 and alpha"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.codon.org.uk/~mjg59/libx86/"
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index d868449c1..899aad3e2 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100484 2013-11-05 08:34:50Z alucryd $
+# $Id: PKGBUILD 101357 2013-11-23 12:07:27Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Morfeo <morfeo89@hotmail.it>
pkgbase=lightdm
pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
-pkgver=1.8.4
-pkgrel=1
+pkgver=1.8.5
+pkgrel=2
epoch=1
pkgdesc="A lightweight display manager"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,14 +20,14 @@ source=("https://launchpad.net/lightdm/${pkgver%.*}/${pkgver}/+download/${pkgbas
'lightdm.rules'
'lightdm-default-config.patch'
'Xsession')
-sha256sums=('92242d397628256c237dc5d66ac08a85207f4a6ddcc2e5c485ccb4b0b253cc56'
+sha256sums=('c1a55800628c7a683a529e32646eae4be32295a09af049c9b15387acff0232a2'
'0d2adba25cdbe59e97ffd302083db9d5e23920780f41e04f64512cd6b633289a'
'b29521fbd7a48a8f60b93ecca3b30c30bcb71560de8033c8d39b25c22c6f696f'
'e8c4c5fd3b801a390d201166fd1fb9730e78a5c62928768103b870b6bd980ea0'
'33e3c3d6e16c8d30756754ea3f31f5457c5be0343686aad287692be34958984a'
'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
'0b2f740616110887d5c8662e40f1a8350fc0dfa6c7e99f6e3a5636c6b0ca714f'
- '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
+ '4d5674906742200b3c171f978457e943560f2c10a2b9156fcd44da3796d185a2')
prepare() {
cd ${pkgbase}-${pkgver}
diff --git a/community/lightdm/Xsession b/community/lightdm/Xsession
index 589205342..6af8f3f61 100644
--- a/community/lightdm/Xsession
+++ b/community/lightdm/Xsession
@@ -52,22 +52,6 @@ if [ -d "$xinitdir" ]; then
done
fi
-# Load xsession scripts
-xsessionddir="/etc/X11/xsession.d"
-if [ -d "$xsessionddir" ]; then
- for i in `ls $xsessionddir`; do
- script="$xsessionddir/$i"
- echo "Loading X session script $script"
- if [ -r "$script" -a -f "$script" ] && expr "$i" : '^[[:alnum:]_-]\+$' > /dev/null; then
- . "$script"
- fi
- done
-fi
-if [ -x "$HOME/.xsession" -a -f "$HOME/.xsession" ]; then
- echo "Loading user X session script"
- . "$HOME/.xsession"
-fi
-
echo "X session wrapper complete, running session $@"
exec $@
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index 8290c3659..13d35b6a8 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92554 2013-06-08 11:18:50Z bpiotrowski $
+# $Id: PKGBUILD 103224 2013-12-30 15:18:05Z bgyorgy $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -6,7 +6,7 @@
pkgname=lilypond
pkgver=2.16.2
-pkgrel=3
+pkgrel=5
pkgdesc="An automated music engraving system"
arch=('i686' 'x86_64' 'mips64el')
url="http://lilypond.org"
@@ -15,9 +15,13 @@ depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
'gsfonts' 'texi2html')
options=('emptydirs')
-install=lilypond.install
-source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz)
-md5sums=('6db27f17d47e4f66a3b0716c65db3041')
+#install=lilypond.install
+source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz
+ lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
+ lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch)
+md5sums=('6db27f17d47e4f66a3b0716c65db3041'
+ '121ac86f1004338ae20ad55a5690c0ad'
+ 'fa5073506f0e4dd96fb1858e3a75e08e')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
@@ -31,7 +35,11 @@ prepare() {
sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
- rm -rf python/out/
+ rm -rf lily/out/ python/out/
+
+ # Fix build
+ patch -Np1 -i "$srcdir/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch"
+ patch -Np1 -i "$srcdir/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch"
}
build() {
@@ -39,6 +47,7 @@ build() {
export PYTHON=/usr/bin/python2
export GUILE=/usr/bin/guile1.8
export GUILE_CONFIG=/usr/bin/guile-config1.8
+ export LDFLAGS="$LDFLAGS -lpthread"
./configure --prefix=/usr --disable-documentation
make
}
diff --git a/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch b/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
new file mode 100644
index 000000000..57b5b8ef6
--- /dev/null
+++ b/community/lilypond/lilypond.git-1ca9814191d16fd3c571d93035247db039254fc1.patch
@@ -0,0 +1,29 @@
+From: Julien Rioux <julien.rioux@gmail.com>
+Date: Mon, 28 Oct 2013 20:42:43 +0000 (+0100)
+Subject: Build: Fix compilation with GNU make 4.0
+X-Git-Tag: release/2.17.95-1~4^2
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=1ca9814191d16fd3c571d93035247db039254fc1;hp=025f0236ebab947e6fe2047f20b7f74f4cec3fc4
+
+Build: Fix compilation with GNU make 4.0
+
+Fix "recipes commence before first target" error.
+
+Patch from Thomas Klausner.
+---
+
+diff --git a/stepmake/stepmake/po-targets.make b/stepmake/stepmake/po-targets.make
+index 8919dab..8a0dd76 100644
+--- a/stepmake/stepmake/po-targets.make
++++ b/stepmake/stepmake/po-targets.make
+@@ -37,10 +37,10 @@ ifneq ($(strip $(ALL_PO_SOURCES)),)
+ --keyword=_ --keyword=_f --keyword=_i \
+ $(XGETTEXT_FLAGS) $(ALL_PO_SOURCES)
+ endif
+-endif
+ sed -i '1,2d' $(po-outdir)/$(package).po
+ sed -i -e 's/^\# This file is distributed.*/$(sed-header)/' $(po-outdir)/$(package).po
+ sed -i -e 's/^\"Content-Type: text\/plain.*/$(sed-content)/' $(po-outdir)/$(package).po
++endif
+
+
+ po-update: po
diff --git a/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
new file mode 100644
index 000000000..ad0c3d4fe
--- /dev/null
+++ b/community/lilypond/lilypond.git-7705e46966bfa05015fb9fb20c68da844ab88028.patch
@@ -0,0 +1,63 @@
+From: Werner Lemberg <wl@gnu.org>
+Date: Thu, 5 Dec 2013 14:01:48 +0000 (+0100)
+Subject: Issue 3694: Use standard inclusion scheme for FreeType headers.
+X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=commitdiff_plain;h=7705e46966bfa05015fb9fb20c68da844ab88028;hp=88435714e762229ebe2715bcf6863eb89c1f8dff
+
+Issue 3694: Use standard inclusion scheme for FreeType headers.
+
+The most recent FreeType release (2.5.1) has changed locations for header
+files. Using the standard way, this is not visible to applications.
+---
+
+diff --git a/lily/freetype-error.cc b/lily/freetype-error.cc
+index 00e5cae..88af76c 100644
+--- a/lily/freetype-error.cc
++++ b/lily/freetype-error.cc
+@@ -31,7 +31,7 @@ const struct Freetype_error_message
+ const char *err_msg;
+ } ft_errors[] =
+
+-#include <freetype/fterrors.h>
++#include FT_ERRORS_H
+
+ ;
+
+diff --git a/lily/open-type-font.cc b/lily/open-type-font.cc
+index df6a744..837a1f2 100644
+--- a/lily/open-type-font.cc
++++ b/lily/open-type-font.cc
+@@ -23,7 +23,7 @@
+
+ using namespace std;
+
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+
+ #include "dimensions.hh"
+ #include "freetype.hh"
+diff --git a/lily/pango-font.cc b/lily/pango-font.cc
+index ee986fc..b148a5b 100644
+--- a/lily/pango-font.cc
++++ b/lily/pango-font.cc
+@@ -22,7 +22,7 @@
+ #define PANGO_ENABLE_BACKEND
+
+ #include <pango/pangoft2.h>
+-#include <freetype/ftxf86.h>
++#include FT_XFREE86_H
+
+ #include <map>
+ #include <cstdio>
+diff --git a/lily/ttf.cc b/lily/ttf.cc
+index eaeb67a..6d7f97b 100644
+--- a/lily/ttf.cc
++++ b/lily/ttf.cc
+@@ -20,7 +20,7 @@
+ #include <cstdio>
+ #include "freetype.hh"
+
+-#include <freetype/tttables.h>
++#include FT_TRUETYPE_TABLES_H
+
+ #include "international.hh"
+ #include "memory-stream.hh"
diff --git a/community/lincity-ng/PKGBUILD b/community/lincity-ng/PKGBUILD
index 77e4b96b0..0165aaa48 100644
--- a/community/lincity-ng/PKGBUILD
+++ b/community/lincity-ng/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 75818 2012-09-01 20:39:35Z heftig $
+# $Id: PKGBUILD 100932 2013-11-13 12:48:37Z heftig $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=lincity-ng
pkgver=2.0
-pkgrel=5.1
+pkgrel=6
pkgdesc="A city simulation game"
arch=('i686' 'x86_64' 'mips64el')
-url="https://fedorahosted.org/LinCity-NG"
+url="http://sourceforge.net/projects/lincity-ng.berlios/"
license=('GPL' 'custom')
-depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'gcc-libs' 'libgl')
-makedepends=('ftjam' 'mesa')
+depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'libgl')
+makedepends=('ftjam' 'mesa' 'glu')
source=(http://sourceforge.net/projects/${pkgname}.berlios/files/${pkgname}-${pkgver}.tar.bz2)
sha1sums=('2961a3f60f7481b33858d7d5ef7cf9c788d01077')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
jam
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
jam -sprefix="${pkgdir}/usr" install
install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt"
install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt"
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
new file mode 100644
index 000000000..9a061562f
--- /dev/null
+++ b/community/linux-tools/PKGBUILD
@@ -0,0 +1,166 @@
+# $Id: PKGBUILD 102150 2013-12-05 21:53:38Z seblu $
+# Maintainer: Sébastien Luttringer
+
+pkgbase=linux-tools
+pkgname=('linux-tools-meta'
+ 'libtraceevent'
+ 'perf'
+ 'cpupower'
+ 'x86_energy_perf_policy'
+ 'usbip')
+pkgver=3.12
+pkgrel=2
+license=('GPL2')
+arch=('i686' 'x86_64')
+url='http://www.kernel.org'
+options=('!strip')
+# split packages need all package dependencies set manually in makedepends
+# kernel source deps
+makedepends=('asciidoc' 'xmlto')
+# perf deps
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+# cpupower deps
+makedepends+=('pciutils')
+# usbip deps
+makedepends+=('glib2' 'sysfsutils')
+groups=("$pkgbase")
+source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz"
+ "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.3.xz"
+ 'cpupower.default'
+ 'cpupower.systemd'
+ 'cpupower.service'
+ 'usbipd.service')
+# http://www.kernel.org/pub/linux/kernel/v3.x/sha256sums.asc
+sha256sums=('2e120ec7fde19fa51dc6b6cc11c81860a0775defcad5a5bf910ed9a50e845a02'
+ '22f2f3249e9014693a487c9734dc4142d89ed8bd9e3b2a74128208f5ea7e47d6'
+ '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
+ 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
+ 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
+ '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
+
+#prepare() {
+# # apply stable patching set
+# cd linux-$pkgver
+# patch -N -p1 -i "$srcdir/patch-$pkgver.5"
+#}
+
+build() {
+ msg2 'Build libtraceevent'
+ pushd linux-$pkgver/tools/lib/traceevent
+ make
+ popd
+
+ msg2 'Build perf'
+ pushd linux-$pkgver/tools/perf
+ make \
+ WERROR=0 \
+ DESTDIR="$pkgdir/usr" \
+ perfexecdir='lib/perf' \
+ PYTHON=python2 \
+ NO_GTK2=1 \
+ PERF_VERSION=$pkgver-$pkgrel \
+ all man
+ popd
+
+ msg2 'Build cpupower'
+ pushd linux-$pkgver/tools/power/cpupower
+ # we cannot use --as-needed
+ LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
+ make VERSION=$pkgver-$pkgrel
+ popd
+
+ msg2 'Build x86_energy_perf_policy'
+ pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+ make
+ popd
+
+ msg2 'Build usbip'
+ pushd linux-$pkgver/drivers/staging/usbip/userspace
+ # fix missing man page
+ sed -i 's/usbip_bind_driver.8//' Makefile.am
+ ./autogen.sh
+ ./configure --prefix=/usr --sbindir=/usr/bin
+ make
+ popd
+}
+
+package_linux-tools-meta() {
+ pkgdesc='Linux kernel tools meta package'
+ groups=()
+ depends=('libtraceevent' 'perf' 'cpupower' 'x86_energy_perf_policy' 'usbip')
+}
+
+package_libtraceevent() {
+ pkgdesc='Linux kernel trace event library'
+ depends=('glibc')
+
+ cd linux-$pkgver/tools/lib/traceevent
+ install -dm 755 "$pkgdir/usr/lib"
+ install -m 644 libtraceevent.a libtraceevent.so "$pkgdir/usr/lib"
+}
+
+package_perf() {
+ pkgdesc='Linux kernel performance auditing tool'
+ depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
+
+ cd linux-$pkgver/tools/perf
+ make \
+ WERROR=0 \
+ DESTDIR="$pkgdir/usr" \
+ perfexecdir='lib/perf' \
+ PYTHON=python2 \
+ NO_GTK2=1 \
+ PERF_VERSION=$pkgver-$pkgrel \
+ install install-man
+ # move completion in new directory
+ cd "$pkgdir"
+ install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/perf
+ rm -r usr/etc
+}
+
+package_cpupower() {
+ pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
+ backup=('etc/default/cpupower')
+ depends=('bash' 'pciutils')
+ conflicts=('cpufrequtils')
+ replaces=('cpufrequtils')
+ install=cpupower.install
+
+ pushd linux-$pkgver/tools/power/cpupower
+ make \
+ DESTDIR="$pkgdir" \
+ sbindir='/usr/bin' \
+ mandir='/usr/share/man' \
+ docdir='/usr/share/doc/cpupower' \
+ install install-man
+ popd
+ # install startup scripts
+ install -Dm 644 $pkgname.default "$pkgdir/etc/default/$pkgname"
+ install -Dm 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+ install -Dm 755 $pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$pkgname"
+}
+
+package_x86_energy_perf_policy() {
+ pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
+ depends=('glibc')
+
+ cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
+ install -Dm 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
+ install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+}
+
+package_usbip() {
+ pkgdesc='An USB device sharing system over IP network'
+ depends=('glib2' 'sysfsutils')
+
+ pushd linux-$pkgver/drivers/staging/usbip/userspace
+ make install DESTDIR="$pkgdir"
+ popd
+ # module loading
+ install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ # systemd
+ install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/linuxconsole/PKGBUILD b/community/linuxconsole/PKGBUILD
new file mode 100644
index 000000000..b7e9de300
--- /dev/null
+++ b/community/linuxconsole/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: PKGBUILD 100995 2013-11-14 11:37:01Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Andrzej Giniewicz <gginiu@gmail.com>
+
+pkgname=linuxconsole
+pkgver=1.4.6
+pkgrel=1
+pkgdesc="Set of utilities for joysticks and serial devices"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/linuxconsole/"
+license=('GPL')
+makedepends=('sdl')
+provides=('joystick' 'inputattach')
+replaces=('joystick' 'inputattach')
+optdepends=('sdl: for ffmvforce utility')
+source=(http://prdownloads.sourceforge.net/linuxconsole/linuxconsoletools-$pkgver.tar.bz2
+ 'inputattach.conf.d'
+ 'inputattach.service'
+ 'inputattachctl')
+md5sums=('9115e08e3a2193b62da46d0e02852787'
+ '7ca903e54829764c8241233af5069216'
+ 'c19b9ed38b243191cf5378b87a42a4cc'
+ '7dd0690a9d2fe5e1052900650906e273')
+
+build() {
+ cd "${srcdir}"/linuxconsoletools-$pkgver
+ make
+}
+
+package() {
+ cd "${srcdir}"/linuxconsoletools-$pkgver
+ make PREFIX=/usr DESTDIR="${pkgdir}" install
+
+ install -Dm755 $srcdir/inputattachctl $pkgdir/usr/bin/inputattachctl
+ install -Dm644 $srcdir/inputattach.conf.d "$pkgdir/etc/conf.d/inputattach"
+ install -Dm644 $srcdir/inputattach.service $pkgdir/usr/lib/systemd/system/inputattach.service
+}
diff --git a/community/inputattach/inputattach.conf.d b/community/linuxconsole/inputattach.conf.d
index ae8d1842a..ae8d1842a 100644
--- a/community/inputattach/inputattach.conf.d
+++ b/community/linuxconsole/inputattach.conf.d
diff --git a/community/inputattach/inputattach.service b/community/linuxconsole/inputattach.service
index 2ec902c09..2ec902c09 100644
--- a/community/inputattach/inputattach.service
+++ b/community/linuxconsole/inputattach.service
diff --git a/community/inputattach/inputattachctl b/community/linuxconsole/inputattachctl
index 05dfa4af5..05dfa4af5 100755
--- a/community/inputattach/inputattachctl
+++ b/community/linuxconsole/inputattachctl
diff --git a/community/linuxdoc-tools/PKGBUILD b/community/linuxdoc-tools/PKGBUILD
index f5c5c32f7..39774fadd 100644
--- a/community/linuxdoc-tools/PKGBUILD
+++ b/community/linuxdoc-tools/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: David Ell <david at bytesizebits dot net>
pkgname=linuxdoc-tools
-pkgver=0.9.68
+pkgver=0.9.69
pkgrel=1
pkgdesc="Convert LinuxDoc SGML source into other formats"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,13 +11,17 @@ url="http://packages.debian.org/sid/linuxdoc-tools"
license=('GPL')
depends=('jade')
optdepends=('groff' 'texlive-bin')
-source=(http://ftp.de.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver}.tar.gz)
-md5sums=('68434f800ab3b68f44da790cc61cf766')
+source=(http://ftp.de.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz)
+md5sums=('1d13d500918a7a145b0edc2f16f61dd1')
build() {
cd "$srcdir/$pkgname-$pkgver"
sed -i '/extern int yyleng;/d' rtf-fix/rtf2rtf.l
./configure --prefix=/usr --mandir=/usr/share/man
make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
}
diff --git a/community/linuxtv-dvb-apps/PKGBUILD b/community/linuxtv-dvb-apps/PKGBUILD
index 268ac07de..e846220e8 100644
--- a/community/linuxtv-dvb-apps/PKGBUILD
+++ b/community/linuxtv-dvb-apps/PKGBUILD
@@ -1,32 +1,40 @@
-# $Id: PKGBUILD 80369 2012-11-21 04:04:30Z jconder $
+# $Id: PKGBUILD 102879 2013-12-23 10:19:57Z bgyorgy $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Camille Moncelier <pix@devlife.org>
pkgname=linuxtv-dvb-apps
-pkgver=1486
+pkgver=1504
pkgrel=1
-_hgrev=3fc7dfa68484
-pkgdesc='Viewer programs for DVB cards'
+_hgrev=d40083fff895
+pkgdesc='Linux DVB API applications and utilities'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.linuxtv.org/'
license=('GPL')
-source=("http://linuxtv.org/hg/dvb-apps/archive/$_hgrev.tar.bz2")
-sha256sums=('60cfd45fe7417a4445a7814ce6e645ddaad0f8e934015c09d53eb93c8739b35a')
+depends=('glibc')
+makedepends=('mercurial')
+source=("hg+http://linuxtv.org/hg/dvb-apps/#revision=$_hgrev")
+sha256sums=('SKIP')
-build() {
- cd "dvb-apps-$_hgrev"
- rm -rf include
-
- make -C lib
- make -C util
+pkgver() {
+ cd "dvb-apps"
+ echo $(hg identify -n)
}
-package() {
- cd "dvb-apps-$_hgrev"
+prepare() {
+ cd "dvb-apps"
+ # Fix build
+ sed -i '/$(sharedir)\/dvb\//d' util/scan/Makefile
+}
- make -C lib DESTDIR="$pkgdir" install
- make -C util DESTDIR="$pkgdir" install
+build() {
+ cd "dvb-apps"
+ make
+}
- chmod 755 "$pkgdir"/usr/lib/*.so*
+package() {
+ cd "dvb-apps"
+ make DESTDIR="$pkgdir" install
+ # Remove conflict with xbase (FS#37862)
+ mv "$pkgdir"/usr/bin/{zap,dvbzap}
}
diff --git a/community/liteide/PKGBUILD b/community/liteide/PKGBUILD
index d94bb5526..9069d0264 100644
--- a/community/liteide/PKGBUILD
+++ b/community/liteide/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 99195 2013-10-25 12:43:33Z arodseth $
+# $Id: PKGBUILD 103220 2013-12-30 14:57:33Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: spambanane <happy.house@gmx.de>
# Contributor: Matteo <matteo.dek@gmail.com>
+# Contributor: Matthew Zimmerman <mzimmerman@gmail.com>
pkgname=liteide
-pkgver=19
-pkgrel=4
+pkgver=20.1
+pkgrel=1
pkgdesc='IDE for editing and building projects written in the Go programming language ("golangide")'
license=('LGPL')
arch=('x86_64' 'i686')
@@ -13,25 +14,29 @@ url='https://github.com/visualfc/liteide'
depends=('go' 'qt5-webkit')
replaces=('golangide')
conflicts=('golangide')
-makedepends=('gendesk')
+makedepends=('gendesk' 'git')
options=('!strip' '!emptydirs')
source=("$pkgname.zip::https://github.com/visualfc/liteide/archive/x$pkgver.zip"
- 'liteide.png'
- 'liteide.sh')
-sha256sums=('182694341940878cf5df4f083a750659bffc97eb4ae517410e157bebc14f97df'
- '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697'
- '5d6f05b072586c31e3a4a08ea2d7332dd0a78f5db6b2d088fb76e8cb032672f0')
+ 'liteide.png')
+sha256sums=('3a3e664e9a76745308fd14eb89b4376f1fb1ac1195b8e2cefcef922e8e93dde2'
+ '47c52b22326034bd3d6a7b11b05a53c8b3838c08e145171cf5cad2ca00260697')
prepare() {
- gendesk -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc"
+ gendesk -f -n --name 'Golang IDE' --pkgname "$pkgname" --pkgdesc "$pkgdesc"
cd "liteide-x$pkgver/build"
- chmod +x build_linux.sh
+ chmod +x *_*.sh
}
build() {
cd "liteide-x$pkgver/build"
- QTDIR=/usr ./build_linux.sh
+ export QTDIR=/usr
+
+ mkdir -p go
+ export GOPATH=`pwd`/go
+
+ ./update_pkg.sh
+ ./build_linux.sh
# Fixing insecure RPATH, need to test if this is still needed
cd ../liteidex
@@ -40,7 +45,7 @@ build() {
}
package() {
- cd "liteide-x$pkgver/build/liteide"
+ cd "liteide-x$pkgver/build/liteide"
msg2 'Creating directories...'
mkdir -p \
@@ -49,12 +54,10 @@ package() {
"$pkgdir/usr/share/doc/$pkgname"
msg2 'Packaging executables...'
- for binary in goastview goapi goexec godocview; do
+ for binary in goastview goapi goexec godocview liteide; do
install -Dm755 "bin/$binary" "$pkgdir/usr/bin/$binary"
done
- install -Dm755 bin/liteide "$pkgdir/usr/bin/liteide.elf"
- install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
- install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/golangide"
+ ln -s /usr/bin/liteide "$pkgdir/usr/bin/golangide"
cd "$srcdir/liteide-x$pkgver/liteidex"
diff --git a/community/liteide/liteide.sh b/community/liteide/liteide.sh
deleted file mode 100644
index 3fe9adf82..000000000
--- a/community/liteide/liteide.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-ELF=/usr/bin/liteide.elf
-if [ ! -z $GOROOT -a -e $GOROOT ]; then
- $ELF $@
-else
- GOROOT=/usr/lib/go $ELF $@
-fi
diff --git a/community/lockdev/PKGBUILD b/community/lockdev/PKGBUILD
index 24dc14c8f..a44f22db5 100644
--- a/community/lockdev/PKGBUILD
+++ b/community/lockdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97056 2013-09-11 21:00:47Z bgyorgy $
+# $Id: PKGBUILD 102542 2013-12-13 15:59:07Z bgyorgy $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andreas Wagner <a.wagner@stud.uni-frankfurt.de>
@@ -6,29 +6,32 @@
pkgname=lockdev
pkgver=1.0.3_1.5
_pkgver=1.0.3
-pkgrel=3
+pkgrel=4
pkgdesc='Run-time shared library for locking devices, using _both_ FSSTND and SVr4 methods.'
url='http://packages.qa.debian.org/l/lockdev.html'
license=("GPL")
arch=('i686' 'x86_64' 'mips64el')
+depends=('glibc')
source=("http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${_pkgver}.orig.tar.gz"
"http://ftp.debian.org/debian/pool/main/l/${pkgname}/${pkgname}_${pkgver/_/-}.diff.gz"
- 'build.patch')
+ 'build.patch'
+ 'gcc-4.7.patch')
md5sums=('64b9c1b87b125fc348e892e24625524a'
'c4e8a5a2e46b76b48339c232b358f579'
- '2db93cadf6670ddcd01de4bfc22a35e1')
+ '2db93cadf6670ddcd01de4bfc22a35e1'
+ 'e16faebfa2d162d40830ef6f2700b7ba')
prepare() {
cd "${pkgname}-${_pkgver}"
patch -p1 -i "../${pkgname}_${pkgver/_/-}.diff"
sed -i "s|CFLAGS = -g|CFLAGS = -g -fPIC|" Makefile
patch -p1 -i ../build.patch # FS#33280
+ patch -p1 -i ../gcc-4.7.patch # FS#34457
}
build() {
cd "${pkgname}-${_pkgver}"
- make shared CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
- make static CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
+ make CFLAGS="${CFLAGS} -D_PATH_LOCK=\\\"/run/lock/lockdev\\\" -fPIC"
}
package() {
diff --git a/community/lockdev/gcc-4.7.patch b/community/lockdev/gcc-4.7.patch
new file mode 100644
index 000000000..3b11e0b92
--- /dev/null
+++ b/community/lockdev/gcc-4.7.patch
@@ -0,0 +1,18 @@
+diff -Naur lockdev-1.0.3.orig/src/ttylock.h lockdev-1.0.3/src/ttylock.h
+--- lockdev-1.0.3.orig/src/ttylock.h 2013-12-13 15:34:52.195877321 +0000
++++ lockdev-1.0.3/src/ttylock.h 2013-12-13 15:38:16.131190480 +0000
+@@ -36,10 +36,10 @@
+
+ /* API of the library */
+
+-int ttylock (char * devname);
+-int ttywait (char * devname);
+-int ttyunlock (char * devname);
+-int ttylocked (char * devname);
++static inline int ttylock (char * devname);
++static inline int ttywait (char * devname);
++static inline int ttyunlock (char * devname);
++static inline int ttylocked (char * devname);
+
+
+ static inline int
diff --git a/community/log4cpp/PKGBUILD b/community/log4cpp/PKGBUILD
index ada721110..58707b4f7 100644
--- a/community/log4cpp/PKGBUILD
+++ b/community/log4cpp/PKGBUILD
@@ -1,20 +1,21 @@
-# $Id: PKGBUILD 99897 2013-10-31 02:20:59Z allan $
+# $Id: PKGBUILD 102767 2013-12-19 14:04:47Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Contributor : Geraud Le Falher <daureg@gmail.com>
pkgname=log4cpp
-pkgver=1.1
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
pkgdesc="A library of C++ classes for flexible logging to files, syslog, IDSA and other destinations."
arch=('i686' 'x86_64' 'mips64el')
url="http://log4cpp.sourceforge.net/"
license=('LGPL')
depends=('gcc-libs')
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('b9ef6244baa5e5e435f35e0b9474b35d')
+md5sums=('1e173df8ee97205f412ff84aa93b8fbe')
build() {
cd "$srcdir/$pkgname"
+ export CXXFLAGS="$CXXFLAGS -lpthread"
./configure --prefix=/usr --disable-doxygen --disable-dot --without-idsa \
--build=$CHOST
make
diff --git a/community/lorcon/PKGBUILD b/community/lorcon/PKGBUILD
index 54f483b48..fdff25510 100644
--- a/community/lorcon/PKGBUILD
+++ b/community/lorcon/PKGBUILD
@@ -1,42 +1,45 @@
-# $Id: PKGBUILD 99899 2013-10-31 02:21:39Z allan $
+# $Id: PKGBUILD 101007 2013-11-14 20:43:40Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: fnord0 [fnord0 <AT> riseup <DOT> net]
# Contributor: dninja <dninja@gmail.com>
+# Contributor: Jon Gjengset <jon@thesquareplanet.com>
pkgname=lorcon
-pkgver=224
-pkgrel=2
-pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames"
+pkgver=2.0.0.20091101
+pkgrel=1
+epoch=1
+pkgdesc='Generic library for injecting 802.11 frames'
url='http://802.11ninja.net/'
license=('GPL')
arch=('x86_64' 'i686' 'mips64el')
depends=('libpcap')
-makedepends=('subversion')
-replaces=('lorcon-old-svn')
-_svntrunk="http://802.11ninja.net/svn/lorcon/trunk"
-_svnrev=$pkgver
+makedepends=('git')
+source=('git+https://code.google.com/p/lorcon/')
+md5sums=('SKIP')
+
+pkgver() {
+ cd "$pkgname"
+
+ major=$(cat Makefile.in | grep -E "^MAJOR " | sed 's/^.*= *//')
+ minor=$(cat Makefile.in | grep -E "^MINOR " | sed 's/^.*= *//')
+ tiny=$(cat Makefile.in | grep -E "^TINY " | sed 's/^.*= *//')
+ version=$(cat Makefile.in | grep -E "^VERSION " | sed 's/^.*= *//')
+ echo "$major.$minor.$tiny.$version"
+}
+
+prepare() {
+ cd "$pkgname"
-build() {
- cd "$srcdir"
-
- if [ -d "$_svnmod/.svn" ]; then
- (cd "$_svnmod" && svn up -r "$_svnrev")
- else
- svn co "$_svntrunk/$_svnmod" --config-dir ./ -r \
- "$_svnrev" "$_svnmod"
- fi
- msg "SVN checkout done or server timeout"
- cd "$_svnmod"
-
./configure --prefix=/usr --mandir=/usr/share/man
- make
}
-package() {
- cd "$_svnmod"
+build() {
+ make -C "$pkgname"
+}
- make DESTDIR="$pkgdir" install
+package() {
+ make -C "$pkgname" DESTDIR="$pkgdir" install
}
# vim:set ts=2 sw=2 et:
diff --git a/community/love/PKGBUILD b/community/love/PKGBUILD
index 8ee8a18cf..6eb29bf4e 100644
--- a/community/love/PKGBUILD
+++ b/community/love/PKGBUILD
@@ -2,31 +2,20 @@
# Contributor: Linus Sjögren <thelinx@unreliablepollution.net>
# Contributor: Eric Forgeot < http://anamnese.online.fr >, dreeze
pkgname=love
-pkgver=0.8.0
+pkgver=0.9.0
pkgrel=2
pkgdesc="An open-source 2D game engine which uses the versatile Lua scripting language to create dynamic gaming experiences"
arch=(i686 x86_64 mips64el)
url="http://love2d.org/"
license=('zlib')
-depends=('luajit' 'physfs' 'freetype2' 'devil' 'mpg123' 'openal' 'libvorbis' 'libmodplug' 'sdl' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
+depends=('luajit' 'physfs' 'freetype2' 'devil' 'mpg123' 'openal' 'libvorbis' 'libmodplug' 'sdl2' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils')
install=love.install
-source=("https://bitbucket.org/rude/love/downloads/love-${pkgver}-linux-src.tar.gz"
- "https://bitbucket.org/rude/love/raw/$pkgver/license.txt"
- "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/app.svg"
- "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/game.svg"
- "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/love.desktop"
- "https://bitbucket.org/rude/love/raw/$pkgver/platform/unix/love.xml")
-md5sums=('9db9c32585fc7c7da3eba7e438783099'
- '5c22904008b003a8d5a23b6b35de1be3'
- 'a1e19f91420cc519a683af360f5b1120'
- '16f2ecc899c9ffc8b7b7c807f8967861'
- '971bec1bffe4f424972eef2a26d27bec'
- 'b4f00fb1cb80057a0a371a994100d418')
+source=("https://bitbucket.org/rude/love/downloads/love-${pkgver}-linux-src.tar.gz")
+md5sums=('6591752af4e33f521d616d9b048aa894')
build() {
cd "$srcdir"/love-$pkgver
- #./platform/unix/automagic
- ./configure --prefix=/usr --with-luajit #LDFLAGS="$LDFLAGS -Wl,--no-as-needed"
+ ./configure --prefix=/usr
make
}
@@ -35,17 +24,7 @@ package() {
make DESTDIR="$pkgdir" install
- mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
- mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/mimetypes"
- mkdir -p "$pkgdir/usr/share/icons/hicolor/scalable/apps"
- mkdir -p "$pkgdir/usr/share/applications"
- mkdir -p "$pkgdir/usr/share/mime/packages"
-
- install -Dm0644 "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -Dm0644 "$srcdir/app.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/love.svg"
- install -Dm0644 "$srcdir/game.svg" "$pkgdir/usr/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-love-game.svg"
- install -Dm0644 "$srcdir/love.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
- install -Dm0644 "$srcdir/love.xml" "$pkgdir/usr/share/mime/packages/love.xml"
+ install -Dm0644 "license.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/love/love.install b/community/love/love.install
index dbc25459b..5badb6372 100644
--- a/community/love/love.install
+++ b/community/love/love.install
@@ -1,6 +1,6 @@
post_install() {
update-desktop-database -q
- update-mime-database usr/share/mime
+ update-mime-database usr/share/mime &> /dev/null
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
diff --git a/community/love08/PKGBUILD b/community/love08/PKGBUILD
new file mode 100644
index 000000000..245a75b9f
--- /dev/null
+++ b/community/love08/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Linus Sjögren <thelinx@unreliablepollution.net>
+# Contributor: Eric Forgeot < http://anamnese.online.fr >, dreeze
+pkgname=love08
+pkgver=0.8.0
+pkgrel=1
+pkgdesc="An open-source 2D game engine which uses the versatile Lua scripting language to create dynamic gaming experiences"
+arch=(i686 x86_64)
+url="http://love2d.org/"
+license=('zlib')
+depends=('luajit' 'physfs' 'freetype2' 'devil' 'mpg123' 'openal' 'libvorbis' 'libmodplug' 'sdl' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'libgl' 'glu')
+makedepends=('mesa')
+source=("https://bitbucket.org/rude/love/downloads/love-${pkgver}-linux-src.tar.gz")
+md5sums=('9db9c32585fc7c7da3eba7e438783099')
+
+build() {
+ cd "$srcdir"/love-$pkgver
+ sed -i "s|freetype/|freetype2/|g" src/modules/font/freetype/{TrueTypeRasterizer.h,Font.h}
+ ./configure --program-suffix=08 --prefix=/usr --with-luajit
+ make
+}
+
+package() {
+ cd "$srcdir"/love-$pkgver
+
+ make DESTDIR="$pkgdir" install
+
+ install -Dm0644 "license.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ltris/PKGBUILD b/community/ltris/PKGBUILD
index d51179880..da6924068 100644
--- a/community/ltris/PKGBUILD
+++ b/community/ltris/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 100352 2013-11-02 15:47:29Z jlichtblau $
+# $Id: PKGBUILD 102907 2013-12-23 20:48:51Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: SmackleFunky <smacklefunky@optusnet.com.au>
pkgname=ltris
pkgver=1.0.19
-pkgrel=1
+pkgrel=2
pkgdesc="A tetris clone where you have a bowl with blocks falling down"
arch=('i686' 'x86_64' 'mips64el')
url="http://lgames.sourceforge.net/index.php?project=LTris"
@@ -31,4 +31,6 @@ package() {
install -d ${pkgdir}/usr/share/pixmaps
install -m644 icons/ltris{16,32,48}.xpm ${pkgdir}/usr/share/pixmaps
+#FS#37951 fix
+ chmod 775 ${pkgdir}/var/games
}
diff --git a/community/ltris/ltris.changelog b/community/ltris/ltris.changelog
index 325b8d524..948c4fce3 100644
--- a/community/ltris/ltris.changelog
+++ b/community/ltris/ltris.changelog
@@ -1,3 +1,8 @@
+2013-12-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+
+ * ltris 1.0.19-2
+ * FS#37951 fix
+
2013-11-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* ltris 1.0.19-1
diff --git a/community/luajit/PKGBUILD b/community/luajit/PKGBUILD
index 4751c7273..0db24b3ed 100644
--- a/community/luajit/PKGBUILD
+++ b/community/luajit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92307 2013-06-03 20:18:47Z bpiotrowski $
+# $Id: PKGBUILD 102287 2013-12-07 10:57:57Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Chris Brannon <chris@the-brannons.com>
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
@@ -6,7 +6,7 @@
pkgname=luajit
pkgver=2.0.2
-pkgrel=1
+pkgrel=2
pkgdesc='Just-in-time compiler and drop-in replacement for Lua 5.1'
arch=('i686' 'x86_64' 'mips64el')
url='http://luajit.org/'
@@ -16,17 +16,14 @@ source=(http://luajit.org/download/LuaJIT-${pkgver/rc/-rc}.tar.gz)
sha256sums=('c05202974a5890e777b181908ac237625b499aece026654d7cc33607e3f46c38')
build() {
- cd $srcdir/LuaJIT-$pkgver
-
+ cd LuaJIT-$pkgver
[ "$CARCH" = "mips64el" ] && extra="XCFLAGS=-DLUAJIT_DISABLE_JIT"
-
make amalg PREFIX=/usr
}
package() {
- cd $srcdir/LuaJIT-$pkgver
- make install DESTDIR=$pkgdir PREFIX=/usr
+ cd LuaJIT-$pkgver
+ make install DESTDIR="$pkgdir" PREFIX=/usr
- install -Dm644 $srcdir/LuaJIT-$pkgver/COPYRIGHT \
- $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
+ install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
}
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index fd6f427da..e1711b762 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99666 2013-10-30 21:24:19Z stativ $
+# $Id: PKGBUILD 102257 2013-12-07 10:36:41Z bpiotrowski $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=('luxrays' 'luxmark')
-pkgver=1.3
-_pkgver=d16b0f132b4a
-pkgrel=1
+pkgver=1.3.1
+_pkgver=7459cd8a9583
+pkgrel=2
pkgdesc="Accelerate the ray intersection process by using GPUs"
arch=('i686' 'x86_64')
url="http://www.luxrender.net/"
@@ -14,7 +14,7 @@ options=('staticlibs')
source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2 \
http://www.luxrender.net/release/luxmark/room_scene_v2.1.zip \
luxmark_scenes_path.diff QTBUG-22829.diff)
-md5sums=('1bece7823fe1f9e177fec4efdf637ca5'
+md5sums=('859999e5e07550553fb310a7f48530a4'
'ae917f025e32e20b1d20ebf8d22204cb'
'1fd2a6f32e2822b5e0f147304292a1b9'
'6e20ee7ea64c578431d51065d0871abc')
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 63cdfe77b..28cddd8cf 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,24 +1,25 @@
-#$Id: PKGBUILD 99433 2013-10-28 19:01:06Z bpiotrowski $
+#$Id: PKGBUILD 101232 2013-11-20 09:52:30Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=lxappearance
pkgver=0.5.3
-pkgrel=1
+pkgrel=2
pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
url='http://lxde.org/'
groups=('lxde')
-depends=('gtk2')
+depends=('gtk2' 'dbus-glib')
makedepends=('intltool')
source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
md5sums=('9dfdc9bd45519d51b9df2ad6650c36f5')
build() {
cd $pkgname-$pkgver
- ./configure --sysconfdir=/etc --prefix=/usr
+ ./configure --sysconfdir=/etc --prefix=/usr \
+ --enable-dbus
make
}
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index dd256109d..f0583f4d6 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 93086 2013-06-24 09:48:17Z spupykin $
+# $Id: PKGBUILD 103083 2013-12-26 10:01:37Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andrea Zucchelli <zukka77@gmail.com>
# Contributor: Daniel Micay <danielmicay@gmail.com>
@@ -8,16 +8,21 @@
pkgname=lxc
pkgver=0.9.0
epoch=1
-pkgrel=4
+pkgrel=5
pkgdesc="Linux Containers"
arch=('i686' 'x86_64' 'mips64el')
-url="http://lxc.sourceforge.net/"
+url="http://linuxcontainers.org"
depends=('bash' 'perl' 'libseccomp')
makedepends=('docbook2x')
optdepends=('arch-install-scripts: for archlinux template')
license=('LGPL')
-source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
-md5sums=('8552a4479090616f4bc04d8473765fc9')
+install=lxc.install
+source=("http://linuxcontainers.org/downloads/$pkgname-${pkgver}.tar.gz"
+ "lxc.tmpfiles.d"
+ "lxc@.service")
+md5sums=('8552a4479090616f4bc04d8473765fc9'
+ 'df94c9fb8a753011c86ee664e9f521ff'
+ '8003139e60ea66c05460660f31780706')
prepare() {
cd "$srcdir/$pkgname-${pkgver/_/-}"
@@ -45,6 +50,8 @@ package() {
make DESTDIR="$pkgdir" install
install -d -m755 "$pkgdir/var/lib/lxc"
+ install -D -m644 ${srcdir}/lxc@.service ${pkgdir}/usr/lib/systemd/system/lxc@.service
+ install -D -m644 ${srcdir}/lxc.tmpfiles.d ${pkgdir}/usr/lib/tmpfiles.d/lxc.conf
cd doc
find . -type f -name '*.1' -exec install -D -m644 "{}" "$pkgdir/usr/share/man/man1/{}" \;
diff --git a/community/lxc/lxc.install b/community/lxc/lxc.install
new file mode 100644
index 000000000..618910953
--- /dev/null
+++ b/community/lxc/lxc.install
@@ -0,0 +1,8 @@
+post_upgrade() {
+ [[ $(vercmp "$1" 1:1) -le 0 ]] && return 0
+ cat << EOF
+* Since v1.0, lxc-shutdown(1) is gone and its functionality is provided by
+* lxc-stop(1) by default. The old lxc-stop(1) behavior can be recovered
+* with 'lxc-stop --kill'.
+EOF
+}
diff --git a/community/lxc/lxc.tmpfiles.d b/community/lxc/lxc.tmpfiles.d
new file mode 100644
index 000000000..04bac4db4
--- /dev/null
+++ b/community/lxc/lxc.tmpfiles.d
@@ -0,0 +1 @@
+w /sys/fs/cgroup/memory/memory.use_hierarchy - - - - 1
diff --git a/community/glusterfs/glusterd.service b/community/lxc/lxc@.service
index b1dd5c18d..7bc87b5dd 100644
--- a/community/glusterfs/glusterd.service
+++ b/community/lxc/lxc@.service
@@ -1,10 +1,11 @@
[Unit]
-Description=Distributed filesystem daemon
+Description=%I LXC
After=network.target
[Service]
Type=forking
-ExecStart=/usr/bin/glusterd
+ExecStart=/usr/bin/lxc-start -d -n %I
+ExecStop=/usr/bin/lxc-stop -n %I
[Install]
WantedBy=multi-user.target
diff --git a/community/lxdm/PKGBUILD b/community/lxdm/PKGBUILD
index d75f5715a..1655db580 100644
--- a/community/lxdm/PKGBUILD
+++ b/community/lxdm/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 97132 2013-09-13 13:17:58Z bgyorgy $
+# $Id: PKGBUILD 101508 2013-11-26 19:15:27Z bgyorgy $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: AndyRTR <andyrtr@archlinux.org>
# Contributor: kiefer <jorgelmadrid@gmail.com>
pkgname=lxdm
pkgver=0.4.1
-pkgrel=27
+pkgrel=29
pkgdesc='Lightweight X11 Display Manager'
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/lxdm/"
license=('GPL')
groups=('lxde')
-depends=('gtk2' 'xorg-server' 'iso-codes')
-makedepends=('intltool')
+depends=('gtk2' 'xorg-server')
+makedepends=('intltool' 'iso-codes')
optdepends=('gtk-engines: default GTK+ theme'
'librsvg: display the default background')
install=$pkgname.install
@@ -21,10 +21,14 @@ backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession'
'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown')
source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
git-fixes.patch
- default-config.patch)
+ default-config.patch
+ lxdm.pam
+ Xsession)
md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821'
- '03d0779fbac1a9964776c82e69fbc53e'
- 'c61ec8ffd3fe8bd2a6a9178393622f4c')
+ 'e9367cec197fa2919531f5c623ecec47'
+ '2ba18992efef43f84061717f0550e4b6'
+ 'c941ef896248bc7c03901b513490425c'
+ 'd9c8f8c9e6de52dbc389696454c8f572')
prepare(){
cd "$srcdir/$pkgname-$pkgver"
@@ -35,8 +39,12 @@ prepare(){
# Adjust Arch-specific settings
patch -Np1 -i ../default-config.patch
- # Fix version number
- sed -i 's/3.6.0/3.8/' gnome-shell/LXDM_User_Switch@dgod/metadata.json
+ # Use our custom pam and Xsession files
+ cp ../lxdm.pam pam/lxdm
+ cp ../Xsession data/Xsession
+
+ # Fix for pulseaudio
+ echo 'test -x /usr/bin/pax11publish && /usr/bin/pax11publish -r' >>data/PostLogout.in
}
build() {
@@ -56,8 +64,4 @@ package() {
install -dm 755 "$pkgdir/var/lib/lxdm"
echo 'GDK_CORE_DEVICE_EVENTS=true' > "$pkgdir"/var/lib/lxdm/.pam_environment
chown -R 121:121 "$pkgdir/var/lib/lxdm"
-
- # GNOME Shell extension
- mkdir -p "$pkgdir/usr/share/gnome-shell/extensions"
- cp -r gnome-shell/LXDM_User_Switch@dgod "$pkgdir/usr/share/gnome-shell/extensions"
}
diff --git a/community/lxdm/Xsession b/community/lxdm/Xsession
new file mode 100755
index 000000000..c34de14eb
--- /dev/null
+++ b/community/lxdm/Xsession
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# LXDM wrapper to run around X sessions.
+
+echo "Running X session wrapper"
+
+if [ $# -eq 1 -a -n "$1" ]; then
+ LXSESSION=$1
+else
+# default session
+ LXSESSION=/usr/bin/startlxde
+fi
+
+# Load profile
+for file in "/etc/profile" "$HOME/.profile" "/etc/xprofile" "$HOME/.xprofile"; do
+ if [ -f "$file" ]; then
+ echo "Loading profile from $file";
+ . "$file"
+ fi
+done
+
+# Load resources
+for file in "/etc/X11/Xresources" "$HOME/.Xresources"; do
+ if [ -f "$file" ]; then
+ echo "Loading resource: $file"
+ xrdb -nocpp -merge "$file"
+ fi
+done
+
+# Load keymaps
+for file in "/etc/X11/Xkbmap" "$HOME/.Xkbmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading keymap: $file"
+ setxkbmap `cat "$file"`
+ XKB_IN_USE=yes
+ fi
+done
+
+# Load xmodmap if not using XKB
+if [ -z "$XKB_IN_USE" ]; then
+ for file in "/etc/X11/Xmodmap" "$HOME/.Xmodmap"; do
+ if [ -f "$file" ]; then
+ echo "Loading modmap: $file"
+ xmodmap "$file"
+ fi
+ done
+fi
+
+unset XKB_IN_USE
+
+# Run all system xinitrc shell scripts.
+xinitdir="/etc/X11/xinit/xinitrc.d"
+if [ -d "$xinitdir" ]; then
+ for script in $xinitdir/*; do
+ echo "Loading xinit script $script"
+ if [ -x "$script" -a ! -d "$script" ]; then
+ . "$script"
+ fi
+ done
+fi
+
+echo "X session wrapper complete, running session $LXSESSION"
+
+exec $LXSESSION
diff --git a/community/lxdm/default-config.patch b/community/lxdm/default-config.patch
index 78c9bc00b..67435f94b 100644
--- a/community/lxdm/default-config.patch
+++ b/community/lxdm/default-config.patch
@@ -10,7 +10,7 @@ diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in
# uncomment this if you really want xserver listen to tcp
# tcp_listen=1
# uncoment this if you want reset the xserver after logou
-@@ -34,7 +34,7 @@
+@@ -34,13 +34,13 @@
gtk_theme=Clearlooks
## background of the greeter
@@ -19,61 +19,10 @@ diff -Naur lxdm.orig/data/lxdm.conf.in lxdm/data/lxdm.conf.in
## if show bottom pane
bottom_pane=1
-diff -Naur lxdm.orig/data/lxdm.in lxdm/data/lxdm.in
---- lxdm.orig/data/lxdm.in 2013-08-30 17:56:16.097006000 +0200
-+++ lxdm/data/lxdm.in 2013-09-04 01:57:56.950799946 +0200
-@@ -1,21 +1,13 @@
- #!/bin/sh
--[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n
--
--if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then
-- . /etc/sysconfig/language
-- if [ -n "$RC_LANG"]; then
-- LANG=$RC_LANG
-- fi
-+if [ -r /etc/profile.d/locale.sh ]; then
-+ . /etc/profile.d/locale.sh
- fi
+ ## if show language select control
+-lang=1
++lang=0
- if [ -n "$LANG" ]; then
- export LANG
- fi
-
--[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop
--[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager
--
- if [ -n "$DEFAULT_WM" ]; then
- PREFERRED=$DEFAULT_WM
- fi
-diff -Naur lxdm.orig/data/Xsession lxdm/data/Xsession
---- lxdm.orig/data/Xsession 2013-08-30 17:56:16.097006000 +0200
-+++ lxdm/data/Xsession 2013-09-04 01:58:19.941348762 +0200
-@@ -9,6 +9,8 @@
- LXSESSION=/usr/bin/startlxde
- fi
-
-+[ -f /etc/profile ] && . /etc/profile
-+[ -f ~/.profile ] && . ~/.profile
- [ -f /etc/xprofile ] && . /etc/xprofile
- [ -f ~/.xprofile ] && . ~/.xprofile
-
-diff -Naur lxdm.orig/pam/lxdm lxdm/pam/lxdm
---- lxdm.orig/pam/lxdm 2013-08-30 17:56:16.100339000 +0200
-+++ lxdm/pam/lxdm 2013-08-30 17:58:35.543771605 +0200
-@@ -1,9 +1,7 @@
- #%PAM-1.0
--auth substack system-auth
--auth optional pam_gnome_keyring.so
--account include system-auth
--session optional pam_keyinit.so force revoke
--session include system-auth
--session optional pam_console.so
--session optional pam_gnome_keyring.so auto_start
--session optional pam_selinux.so
-+auth include system-login
-+-auth optional pam_gnome_keyring.so
-+account include system-login
-+password include system-login
-+session include system-login
-+-session optional pam_gnome_keyring.so auto_start
+ ## if show keyboard layout select control
+ keyboard=0
diff --git a/community/lxdm/git-fixes.patch b/community/lxdm/git-fixes.patch
index 6a331cf0b..fed4800ee 100644
--- a/community/lxdm/git-fixes.patch
+++ b/community/lxdm/git-fixes.patch
@@ -20,7 +20,7 @@ index bfac56b..6f997b8 100644
rpmbuild -bb \
--define "_sourcedir `pwd`" \
diff --git a/configure.ac b/configure.ac
-index e952473..8958c9c 100644
+index e952473..22d2e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
@@ -30,7 +30,7 @@ index e952473..8958c9c 100644
-AC_INIT([lxdm], [0.4.1], [http://lxde.org/])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AC_INIT([lxdm], [0.5.0], [http://lxde.org/])
-+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz])
AC_CONFIG_SRCDIR([src/lxdm.c])
AC_CONFIG_HEADERS([config.h])
@@ -690,7 +690,7 @@ index 51ffda4..41c95f4 100644
session optional pam_gnome_keyring.so auto_start
+session optional pam_selinux.so
diff --git a/src/Makefile.am b/src/Makefile.am
-index 7fdfd99..4f9a11c 100644
+index 7fdfd99..8b27291 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,7 @@ lxdm_binary_CFLAGS = \
@@ -706,7 +706,7 @@ index 7fdfd99..4f9a11c 100644
lxdm_binary_SOURCES = \
- lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h \
-+ lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h auth.c lxcommon.h \
++ lxdm.c lxdm.h ui.c lxcom.c lxcom.h xconn.c xconn.h auth.c auth.h lxcommon.h \
$(NULL)
-libexec_PROGRAMS = lxdm-greeter-gdk lxdm-numlock lxdm-greeter-gtk
@@ -748,10 +748,10 @@ index 7fdfd99..4f9a11c 100644
+
diff --git a/src/auth.c b/src/auth.c
new file mode 100644
-index 0000000..10c047c
+index 0000000..7651fbb
--- /dev/null
+++ b/src/auth.c
-@@ -0,0 +1,632 @@
+@@ -0,0 +1,638 @@
+/*
+ * lxdm.c - main entry of lxdm
+ *
@@ -851,8 +851,8 @@ index 0000000..10c047c
+{
+ struct passwd *pw;
+ struct spwd *sp;
-+ char *real;
-+ char *enc;
++ char *real;
++ char *enc;
+ if(!user || !user[0])
+ {
+ g_debug("user==NULL\n");
@@ -866,45 +866,45 @@ index 0000000..10c047c
+ return AUTH_BAD_USER;
+ }
+ if(strstr(pw->pw_shell, "nologin"))
-+ {
-+ g_debug("user %s have nologin shell\n",user);
-+ return AUTH_PRIV;
-+ }
-+ if(type==AUTH_TYPE_AUTO_LOGIN && !pass)
-+ {
++ {
++ g_debug("user %s have nologin shell\n",user);
++ return AUTH_PRIV;
++ }
++ if(type==AUTH_TYPE_AUTO_LOGIN && !pass)
++ {
+ goto out;
+ }
-+ sp = getspnam(user);
-+ if( !sp )
-+ {
++ sp = getspnam(user);
++ if( !sp )
++ {
++ return AUTH_FAIL;
++ }
++ endspent();
++ real = sp->sp_pwdp;
++ if( !real || !real[0] )
++ {
++ if( !pass || !pass[0] )
++ {
++ *ppw = pw;
++ g_debug("user %s auth with no password ok\n",user);
++ return AUTH_SUCCESS;
++ }
++ else
++ {
++ g_debug("user %s password not match\n",user);
++ return AUTH_FAIL;
++ }
++ }
++ enc = crypt(pass, real);
++ if( strcmp(real, enc) )
++ {
++ g_debug("user %s password not match\n",user);
+ return AUTH_FAIL;
+ }
-+ endspent();
-+ real = sp->sp_pwdp;
-+ if( !real || !real[0] )
-+ {
-+ if( !pass || !pass[0] )
-+ {
-+ *ppw = pw;
-+ g_debug("user %s auth with no password ok\n",user);
-+ return AUTH_SUCCESS;
-+ }
-+ else
-+ {
-+ g_debug("user %s password not match\n",user);
-+ return AUTH_FAIL;
-+ }
-+ }
-+ enc = crypt(pass, real);
-+ if( strcmp(real, enc) )
-+ {
-+ g_debug("user %s password not match\n",user);
-+ return AUTH_FAIL;
-+ }
+out:
-+ g_debug("user %s auth ok\n",pw->pw_name);
++ g_debug("user %s auth ok\n",pw->pw_name);
+ passwd_copy(&a->pw,pw);
-+ return AUTH_SUCCESS;
++ return AUTH_SUCCESS;
+}
+
+int lxdm_auth_session_begin(LXDM_AUTH *a,int tty,int display,char mcookie[16])
@@ -1004,10 +1004,10 @@ index 0000000..10c047c
+ return AUTH_BAD_USER;
+ }
+ if(strstr(pw->pw_shell, "nologin"))
-+ {
-+ g_debug("user %s have nologin shell\n",user);
-+ return AUTH_PRIV;
-+ }
++ {
++ g_debug("user %s have nologin shell\n",user);
++ return AUTH_PRIV;
++ }
+ if(a->handle) pam_end(a->handle,0);
+ if(PAM_SUCCESS != pam_start("lxdm", pw->pw_name, &conv, (pam_handle_t**)&a->handle))
+ {
@@ -1046,15 +1046,15 @@ index 0000000..10c047c
+ char x[256];
+
+ if(!a->handle)
-+ {
-+ g_message("begin session without auth\n");
-+ return -1;
-+ }
++ {
++ g_message("begin session without auth\n");
++ return -1;
++ }
+ sprintf(x, "tty%d", tty);
-+ pam_set_item(a->handle, PAM_TTY, x);
++ pam_set_item(a->handle, PAM_TTY, x);
+#ifdef PAM_XDISPLAY
+ sprintf(x,":%d",display);
-+ pam_set_item(a->handle, PAM_XDISPLAY, x);
++ pam_set_item(a->handle, PAM_XDISPLAY, x);
+#endif
+#if !defined(DISABLE_XAUTH) && defined(PAM_XAUTHDATA)
+ struct pam_xauth_data value;
@@ -1064,28 +1064,34 @@ index 0000000..10c047c
+ value.datalen=16;
+ pam_set_item (a->handle, PAM_XAUTHDATA, &value);
+#endif
-+ if(name && name[0])
-+ {
-+ char *env;
-+ env = g_strdup_printf ("DESKTOP_SESSION=%s", name);
-+ pam_putenv (a->handle, env);
-+ g_free (env);
-+ }
++ if(name && name[0])
++ {
++ char *env;
++ env = g_strdup_printf ("DESKTOP_SESSION=%s", name);
++ pam_putenv (a->handle, env);
++ g_free (env);
++ }
+ err = pam_open_session(a->handle, 0); /* FIXME pam session failed */
-+ if( err != PAM_SUCCESS )
-+ g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err));
++ if( err != PAM_SUCCESS )
++ g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err));
++ else
++ a->in_session=1;
+ return 0;
+}
+
+int lxdm_auth_session_end(LXDM_AUTH *a)
+{
+ int err;
-+ if(!a->handle)
++ if(!a->handle)
+ return 0;
-+ err = pam_close_session(a->handle, 0);
-+ pam_end(a->handle, err);
-+ a->handle = NULL;
-+ passwd_clean(&a->pw);
++ if(a->in_session)
++ {
++ err = pam_close_session(a->handle, 0);
++ a->in_session=0;
++ }
++ pam_end(a->handle, err);
++ a->handle = NULL;
++ passwd_clean(&a->pw);
+ return 0;
+}
+
@@ -1268,7 +1274,7 @@ index 0000000..10c047c
+#include <assert.h>
+int lxdm_auth_session_begin(LXDM_AUTH *a,const char *name,int tty,int display,char mcookie[16])
+{
-+ char temp[32];
++ char temp[256];
+ char res[8];
+ gchar *b64;
+ int ret;
@@ -1386,10 +1392,10 @@ index 0000000..10c047c
+
diff --git a/src/auth.h b/src/auth.h
new file mode 100644
-index 0000000..84d2267
+index 0000000..5db944e
--- /dev/null
+++ b/src/auth.h
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,45 @@
+/*
+ * lxdm.c - main entry of lxdm
+ *
@@ -1418,6 +1424,7 @@ index 0000000..84d2267
+ struct passwd pw;
+ int pipe[2];
+ int child;
++ int in_session;
+}LXDM_AUTH;
+
+enum{
@@ -2158,10 +2165,74 @@ index 095227b..2c6e5be 100644
g_free(str);
return TRUE;
diff --git a/src/lxcom.c b/src/lxcom.c
-index 02763eb..eef3d1b 100644
+index 02763eb..9491cb2 100644
--- a/src/lxcom.c
+++ b/src/lxcom.c
-@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
+@@ -12,37 +12,56 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
++
++#if defined(__sun)
++#include <ucred.h>
++#include <sys/filio.h>
++#elif !defined(linux) && !defined(__NetBSD__)
++#include <sys/ucred.h>
++#endif
++
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/ioctl.h>
+-#if !defined(linux) && !defined(__NetBSD__)
+-#include <sys/ucred.h>
+-#endif
+
+ #ifndef SCM_CREDS
+-#define SCM_CREDS SCM_CREDENTIALS
++ #if defined(SCM_CREDENTIALS)
++ #define SCM_CREDS SCM_CREDENTIALS
++ #elif defined(SCM_UCRED)
++ #define SCM_CREDS SCM_UCRED
++ #else
++ #error not support unix socket creds
++ #endif
+ #endif
+
+ #ifndef linux
+-# ifndef __NetBSD__
++# if defined(__sun)
++# define LXDM_PEER_UID(c) ucred_geteuid(c)
++# define LXDM_PEER_GID(c) ucred_getegid(c)
++# define LXDM_PEER_PID(c) ucred_getpid(c)
++# elif !defined(__NetBSD__)
+ # define LXDM_PEER_UID(c) ((c)->cr_uid)
+ # define LXDM_PEER_GID(c) ((c)->cr_groups[0])
++# define LXDM_PEER_PID -1
+ # else
+ # define LXDM_PEER_UID(c) ((c)->sc_uid)
+ # define LXDM_PEER_GID(c) ((c)->sc_gid)
++# define LXDM_PEER_PID -1
+ # endif
+-# define LXDM_PEER_PID -1
+ #else
+ # define LXDM_PEER_UID(c) ((c)->uid)
+ # define LXDM_PEER_GID(c) ((c)->gid)
+ # define LXDM_PEER_PID(c) ((c)->pid)
+ #endif
+
+-#ifdef __NetBSD__
++#if defined(__NetBSD__)
+ typedef struct sockcred LXDM_CRED;
++#elif defined(__sun)
++typedef ucred_t LXDM_CRED;
+ #else
+ typedef struct ucred LXDM_CRED;
+ #endif
++
+ #include <glib.h>
+ #include "lxcom.h"
+
+@@ -89,13 +108,13 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
static gboolean lxcom_check(GSource *source)
{
@@ -2170,7 +2241,51 @@ index 02763eb..eef3d1b 100644
}
static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
-@@ -272,6 +272,7 @@ void lxcom_init(const char *sock)
+ {
+ char buf[4096];
+- char ctrl[CMSG_SPACE(sizeof(struct ucred))];
++ char ctrl[/*CMSG_SPACE(sizeof(LXDM_CRED))*/1024];
+ struct sockaddr_un peer;
+ struct iovec v={buf,sizeof(buf)};
+ struct msghdr h={&peer,sizeof(peer),&v,1,ctrl,sizeof(ctrl),0};
+@@ -118,16 +137,18 @@ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer us
+ char **argv;
+ GString *res;
+
+- #ifndef __NetBSD__
+- size = sizeof(LXDM_CRED);
+- #else
++ #if defined(__sun)
++ size = ucred_size();
++ #elif defined(__NetBSD__)
+ if (cmptr->cmsg_len < SOCKCREDSIZE(0)) break;
+ size = SOCKCREDSIZE(((cred *)CMSG_DATA(cmptr))->sc_ngroups);
++ #else
++ size = sizeof(LXDM_CRED);
+ #endif
+ if (cmptr->cmsg_len != CMSG_LEN(size)) break;
+- if (cmptr->cmsg_level != SOL_SOCKET) break;
+- if (cmptr->cmsg_type != SCM_CREDS) break;
+- c=(LXDM_CRED*)CMSG_DATA(cmptr);
++ if (cmptr->cmsg_level != SOL_SOCKET) break;
++ if (cmptr->cmsg_type != SCM_CREDS) break;
++ c=(LXDM_CRED*)CMSG_DATA(cmptr);
+ if(g_shell_parse_argv(buf,&argc,&argv,NULL))
+ {
+ res=((LXComFunc)callback)(user_data,LXDM_PEER_UID(c),LXDM_PEER_PID(c),argc,argv);
+@@ -259,7 +280,11 @@ void lxcom_init(const char *sock)
+ strcpy(su.sun_path,sock);
+ self_server_fd=socket(AF_UNIX,SOCK_DGRAM,0);
+ assert(self_server_fd!=-1);
++#if defined(__sun)
++ ret=setsockopt(self_server_fd,SOL_SOCKET,SO_RECVUCRED,&on,sizeof(on));
++#else
+ ret=setsockopt(self_server_fd,SOL_SOCKET,SO_PASSCRED,&on,sizeof(on));
++#endif
+ assert(ret==0);
+ fcntl(self_server_fd,F_SETFL,O_NONBLOCK|fcntl(self_server_fd,F_GETFL));
+ ret=bind(self_server_fd,(struct sockaddr*)&su,sizeof(su));
+@@ -272,6 +297,7 @@ void lxcom_init(const char *sock)
s->poll.fd=self_server_fd;
s->poll.events=G_IO_IN;
@@ -2178,6 +2293,55 @@ index 02763eb..eef3d1b 100644
g_source_add_poll((GSource*)s,&s->poll);
self_source_id=g_source_attach((GSource*)s,NULL);
+@@ -289,22 +315,28 @@ void lxcom_init(const char *sock)
+ static ssize_t lxcom_write(int s,const void *buf,size_t count)
+ {
+ struct iovec iov[1] ={{(void*)buf,count,}};
+- struct msghdr msg = { 0, 0, iov, 1, 0, 0, 0 };
++ struct msghdr msg = { 0, 0, iov, 1, 0, 0, 0 };
+ #if !defined(linux) && !defined(__NetBSD__)
+- char ctrl[CMSG_SPACE(sizeof(LXDM_CRED))];
+- struct cmsghdr *cmptr;
++
++#if defined(__sun)
++ int size = ucred_size();
++#else
++ int size = sizeof(LXDM_CRED);
++#endif
++ char ctrl[CMSG_SPACE(size)];
++ struct cmsghdr *cmptr;
+ char *p;
+ int i;
+
+- msg.msg_control = ctrl;
+- msg.msg_controllen = sizeof(ctrl);
++ msg.msg_control = ctrl;
++ msg.msg_controllen = sizeof(ctrl);
+
+- cmptr = CMSG_FIRSTHDR(&msg);
+- cmptr->cmsg_len = CMSG_LEN(sizeof(LXDM_CRED));
+- cmptr->cmsg_level = SOL_SOCKET;
+- cmptr->cmsg_type = SCM_CREDS;
++ cmptr = CMSG_FIRSTHDR(&msg);
++ cmptr->cmsg_len = CMSG_LEN(size);
++ cmptr->cmsg_level = SOL_SOCKET;
++ cmptr->cmsg_type = SCM_CREDS;
+ p=(char*)CMSG_DATA(cmptr);
+- for(i=0;i<sizeof(LXDM_CRED);i++)
++ for(i=0;i<size;i++)
+ p[i]=0;
+ #endif
+ return sendmsg(s,&msg,0);
+@@ -332,9 +364,6 @@ gboolean lxcom_send(const char *sock,const char *buf,char **res)
+ su.sun_family=AF_UNIX;
+ s=socket(AF_UNIX,SOCK_DGRAM,0);
+ assert(s!=-1);
+- fcntl(s,F_SETFL,O_NONBLOCK|fcntl(self_server_fd,F_GETFL));
+- s=socket(AF_UNIX,SOCK_DGRAM,0);
+- assert(s!=-1);
+ fcntl(s,F_SETFL,O_NONBLOCK|fcntl(self_client_fd,F_GETFL));
+ strcpy(su.sun_path,sock);
+ ret=connect(s,(struct sockaddr*)&su,sizeof(su));
diff --git a/src/lxcommon.h b/src/lxcommon.h
new file mode 100644
index 0000000..24a6c38
@@ -2192,7 +2356,7 @@ index 0000000..24a6c38
+#endif /*_LXCOMMON_H_*/
+
diff --git a/src/lxdm.c b/src/lxdm.c
-index 5c279af..8ac8478 100644
+index 5c279af..638c30f 100644
--- a/src/lxdm.c
+++ b/src/lxdm.c
@@ -24,9 +24,6 @@
@@ -2398,7 +2562,7 @@ index 5c279af..8ac8478 100644
if(plymouth)
{
nr_tty=1;
-@@ -550,13 +559,13 @@ void lxdm_quit_self(int code)
+@@ -550,20 +559,20 @@ void lxdm_quit_self(int code)
static void log_init(void)
{
int fd_log;
@@ -2413,27 +2577,39 @@ index 5c279af..8ac8478 100644
}
static void log_ignore(const gchar *log_domain, GLogLevelFlags log_level,
-@@ -647,6 +656,19 @@ static void replace_env(char** env, const char* name, const char* new_val)
- *(penv + 1) = NULL;
+ const gchar *message, gpointer user_data)
+ {
}
+-
++#if 0
+ GSList *do_scan_xsessions(void)
+ {
+ GSList *xsessions = NULL;
+@@ -630,22 +639,7 @@ void free_xsessions(GSList *l)
+ }
+ g_slist_free(l);
+ }
+-
+-static void replace_env(char** env, const char* name, const char* new_val)
+-{
+- register char** penv;
+- for(penv = env; *penv; ++penv)
+- {
+- if(g_str_has_prefix(*penv, name))
+- {
+- g_free(*penv);
+- *penv = g_strconcat(name, new_val, NULL);
+- return;
+- }
+- }
+- *penv = g_strconcat(name, new_val, NULL);
+- *(penv + 1) = NULL;
+-}
++#endif
-+static const char *get_env(char **env, const char *name)
-+{
-+ register char** penv;
-+ for(penv = env; *penv; ++penv)
-+ {
-+ if(g_str_has_prefix(*penv, name))
-+ {
-+ return *penv+strlen(name);
-+ }
-+ }
-+ return NULL;
-+}
-+
#ifndef DISABLE_XAUTH
- static inline void xauth_write_uint16(int fd,uint16_t data)
-@@ -665,15 +687,20 @@ static inline void xauth_write_string(int fd,const char *s)
+@@ -665,15 +659,20 @@ static inline void xauth_write_string(int fd,const char *s)
write(fd,s,len);
}
@@ -2458,7 +2634,7 @@ index 5c279af..8ac8478 100644
xauth_write_string(fd,"MIT-MAGIC-COOKIE-1");
xauth_write_uint16(fd,16);
write(fd,data,16);
-@@ -695,139 +722,55 @@ static void create_server_auth(LXSession *s)
+@@ -695,139 +694,57 @@ static void create_server_auth(LXSession *s)
authfile = g_strdup_printf("/var/run/lxdm/lxdm-:%d.auth",s->display);
@@ -2471,7 +2647,7 @@ index 5c279af..8ac8478 100644
}
-static void create_client_auth(char *home,char **env)
-+static void create_client_auth(struct passwd *pw,char **env)
++static char ** create_client_auth(struct passwd *pw,char **env)
{
LXSession *s;
char *authfile;
@@ -2479,19 +2655,21 @@ index 5c279af..8ac8478 100644
- char *path;
- if((user=getuid())== 0 ) /* root don't need it */
+- return;
+ if(pw->pw_uid==0) /* root don't need it */
- return;
++ return env;
- s=lxsession_find_user(user);
+ s=lxsession_find_user(pw->pw_uid);
if(!s)
- return;
+- return;
-
- path=g_key_file_get_string(config,"base","xauth_path",NULL);
- if(path)
++ return env;
+
+ /* pam_mktemp may provide XAUTHORITY to DM, just use it */
-+ if((authfile=(char*)get_env(env,"XAUTHORITY="))!=NULL)
++ if((authfile=(char*)g_environ_getenv(env,"XAUTHORITY"))!=NULL)
{
- authfile = g_strdup_printf("%s/.Xauth%d", path,getuid());
- g_free(path);
@@ -2514,10 +2692,13 @@ index 5c279af..8ac8478 100644
}
remove(authfile);
- xauth_write_file(authfile,s->mcookie);
+- replace_env(env,"XAUTHORITY=",authfile);
+ xauth_write_file(authfile,s->display,s->mcookie);
- replace_env(env,"XAUTHORITY=",authfile);
++ env=g_environ_setenv(env,"XAUTHORITY",authfile,TRUE);
+ chown(authfile,pw->pw_uid,pw->pw_gid);
g_free(authfile);
++
++ return env;
}
#endif
@@ -2525,8 +2706,7 @@ index 5c279af..8ac8478 100644
-static char *user_pass[2];
-
-static int do_conv(int num, const struct pam_message **msg,struct pam_response **resp, void *arg)
-+int lxdm_auth_user(int type,char *user, char *pass, struct passwd **ppw)
- {
+-{
- int result = PAM_SUCCESS;
- int i;
- *resp = (struct pam_response *) calloc(num, sizeof(struct pam_response));
@@ -2555,7 +2735,8 @@ index 5c279af..8ac8478 100644
-#endif
-
-int lxdm_auth_user(char *user, char *pass, struct passwd **ppw)
--{
++int lxdm_auth_user(int type,char *user, char *pass, struct passwd **ppw)
+ {
- struct passwd *pw;
-#if !HAVE_LIBPAM
- struct spwd *sp;
@@ -2622,7 +2803,7 @@ index 5c279af..8ac8478 100644
s=lxsession_find_greeter();
if(!s) s=lxsession_find_idle();
if(!s) s=lxsession_add();
-@@ -836,97 +779,12 @@ int lxdm_auth_user(char *user, char *pass, struct passwd **ppw)
+@@ -836,97 +753,12 @@ int lxdm_auth_user(char *user, char *pass, struct passwd **ppw)
g_critical("lxsession_add fail\n");
exit(0);
}
@@ -2724,7 +2905,7 @@ index 5c279af..8ac8478 100644
static void close_left_fds(void)
{
struct dirent **list;
-@@ -945,9 +803,15 @@ static void close_left_fds(void)
+@@ -945,32 +777,35 @@ static void close_left_fds(void)
close(fd);
}
free(list);
@@ -2739,19 +2920,137 @@ index 5c279af..8ac8478 100644
-void switch_user(struct passwd *pw, char *run, char **env)
+void switch_user(struct passwd *pw, const char *run, char **env)
{
- int fd;
+- int fd;
++ int fd;
-@@ -968,9 +832,6 @@ void switch_user(struct passwd *pw, char *run, char **env)
- dup2(fd,STDERR_FILENO);
- close(fd);
- }
+- setenv("USER",pw->pw_name,1);
+- setenv("LOGNAME",pw->pw_name,1);
+- setenv("SHELL",pw->pw_shell,1);
+- setenv("HOME",pw->pw_dir,1);
+-
+- g_spawn_command_line_sync ("/etc/lxdm/PreLogin",NULL,NULL,NULL,NULL);
+-
+- if( !pw || initgroups(pw->pw_name, pw->pw_gid) ||
+- setgid(pw->pw_gid) || setuid(pw->pw_uid) || setsid() == -1 )
+- exit(EXIT_FAILURE);
+- chdir(pw->pw_dir);
+- fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR);
+- if(fd!=-1)
+- {
+- dup2(fd,STDERR_FILENO);
+- close(fd);
+- }
-#ifndef DISABLE_XAUTH
- create_client_auth(pw->pw_dir,env);
-#endif
++ setenv("USER",pw->pw_name,1);
++ setenv("LOGNAME",pw->pw_name,1);
++ setenv("SHELL",pw->pw_shell,1);
++ setenv("HOME",pw->pw_dir,1);
++
++ g_spawn_command_line_sync ("/etc/lxdm/PreLogin",NULL,NULL,NULL,NULL);
++
++ if( !pw || initgroups(pw->pw_name, pw->pw_gid) ||
++ setgid(pw->pw_gid) || setuid(pw->pw_uid) || setsid() == -1 )
++ exit(EXIT_FAILURE);
++ chdir(pw->pw_dir);
++ fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR);
++ if(fd!=-1)
++ {
++ dup2(fd,STDERR_FILENO);
++ close(fd);
++ }
/* reset signal */
signal(SIGCHLD, SIG_DFL);
-@@ -1114,7 +975,7 @@ void lxdm_startx(LXSession *s)
+@@ -987,45 +822,45 @@ void switch_user(struct passwd *pw, char *run, char **env)
+
+ static void get_lock(void)
+ {
+- FILE *fp;
+- char *lockfile;
++ FILE *fp;
++ char *lockfile;
+
+- lockfile = g_key_file_get_string(config, "base", "lock", 0);
+- if( !lockfile ) lockfile = g_strdup("/var/run/lxdm.pid");
++ lockfile = g_key_file_get_string(config, "base", "lock", 0);
++ if( !lockfile ) lockfile = g_strdup("/var/run/lxdm.pid");
+
+- fp = fopen(lockfile, "r");
+- if( fp )
+- {
+- int pid;
+- int ret;
+- ret = fscanf(fp, "%d", &pid);
+- fclose(fp);
+- if(ret == 1 && pid!=getpid())
++ fp = fopen(lockfile, "r");
++ if( fp )
++ {
++ int pid;
++ int ret;
++ ret = fscanf(fp, "%d", &pid);
++ fclose(fp);
++ if(ret == 1 && pid!=getpid())
+ {
+- if(kill(pid, 0) == 0 || (ret == -1 && errno == EPERM))
+- {
+- /* we should only quit if the pid running is lxdm */
++ if(kill(pid, 0) == 0 || (ret == -1 && errno == EPERM))
++ {
++ /* we should only quit if the pid running is lxdm */
+ #ifdef __linux__
+- char path[64],buf[128];
+- sprintf(path,"/proc/%d/exe",pid);
+- ret=readlink(path,buf,128);
+- if(ret<128 && ret>0 && strstr(buf,"lxdm-binary"))
+- lxdm_quit_self(1);
+-#else
++ char path[64],buf[128];
++ sprintf(path,"/proc/%d/exe",pid);
++ ret=readlink(path,buf,128);
++ if(ret<128 && ret>0 && strstr(buf,"lxdm-binary"))
+ lxdm_quit_self(1);
++#else
++ lxdm_quit_self(1);
+ #endif
+- }
++ }
+ }
+- }
+- fp = fopen(lockfile, "w");
+- if( !fp )
+- {
+- g_critical("open lock file %s fail\n",lockfile);
+- lxdm_quit_self(0);
+- }
+- fprintf( fp, "%d", getpid() );
+- fclose(fp);
+- g_free(lockfile);
++ }
++ fp = fopen(lockfile, "w");
++ if( !fp )
++ {
++ g_critical("open lock file %s fail\n",lockfile);
++ lxdm_quit_self(0);
++ }
++ fprintf( fp, "%d", getpid() );
++ fclose(fp);
++ g_free(lockfile);
+ }
+
+ static void put_lock(void)
+@@ -1083,6 +918,8 @@ void lxdm_startx(LXSession *s)
+ int i;
+ char display[16];
+
++ lxsession_set_active(s);
++
+ sprintf(display,":%d",s->display);
+ setenv("DISPLAY",display,1);
+
+@@ -1114,7 +951,7 @@ void lxdm_startx(LXSession *s)
g_strfreev(args);
lxcom_add_child_watch(s->server, on_xserver_stop, s);
@@ -2760,7 +3059,7 @@ index 5c279af..8ac8478 100644
for( i = 0; i < 100; i++ )
{
if(lxcom_last_sig==SIGINT || lxcom_last_sig==SIGTERM)
-@@ -1124,6 +985,7 @@ void lxdm_startx(LXSession *s)
+@@ -1124,6 +961,7 @@ void lxdm_startx(LXSession *s)
g_usleep(50 * 1000);
//g_message("retry %d\n",i);
}
@@ -2768,7 +3067,7 @@ index 5c279af..8ac8478 100644
if(s->dpy==NULL)
exit(EXIT_FAILURE);
-@@ -1200,6 +1062,11 @@ static void on_session_stop(void *data,int pid, int status)
+@@ -1200,6 +1038,11 @@ static void on_session_stop(void *data,int pid, int status)
{
lxsession_free(s);
}
@@ -2780,7 +3079,7 @@ index 5c279af..8ac8478 100644
gchar *argv[] = { "/etc/lxdm/PostLogout", NULL };
g_spawn_async(NULL, argv, s->env, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
}
-@@ -1212,7 +1079,7 @@ gboolean lxdm_get_session_info(char *session,char **pname,char **pexec)
+@@ -1212,7 +1055,7 @@ gboolean lxdm_get_session_info(char *session,char **pname,char **pexec)
name=g_key_file_get_string(config, "base", "session", 0);
if(!name && getenv("PREFERRED"))
name = g_strdup(getenv("PREFERRED"));
@@ -2789,7 +3088,7 @@ index 5c279af..8ac8478 100644
name = g_strdup(getenv("DESKTOP"));
if(!name) name=g_strdup("LXDE");
}
-@@ -1291,7 +1158,7 @@ static void lxdm_save_login(char *session,char *lang)
+@@ -1291,7 +1134,7 @@ static void lxdm_save_login(char *session,char *lang)
lang="";
var=g_key_file_new();
g_key_file_set_list_separator(var, ' ');
@@ -2798,7 +3097,7 @@ index 5c279af..8ac8478 100644
old=g_key_file_get_string(var,"base","last_session",0);
if(0!=g_strcmp0(old,session))
{
-@@ -1343,7 +1210,7 @@ static void lxdm_save_login(char *session,char *lang)
+@@ -1343,7 +1186,7 @@ static void lxdm_save_login(char *session,char *lang)
char* data = g_key_file_to_data(var, &len, NULL);
mkdir("/var/lib/lxdm",0755);
chmod("/var/lib/lxdm",0755);
@@ -2807,7 +3106,7 @@ index 5c279af..8ac8478 100644
g_free(data);
}
g_key_file_free(var);
-@@ -1357,6 +1224,8 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+@@ -1357,6 +1200,8 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
LXSession *s,*prev;
lxdm_save_login(session,lang);
@@ -2816,7 +3115,16 @@ index 5c279af..8ac8478 100644
if(!session ||!session[0] || !lang || !lang[0])
{
-@@ -1423,12 +1292,10 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+@@ -1398,7 +1243,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+ }
+ prev=lxsession_find_user(pw->pw_uid);
+ s=lxsession_find_greeter();
+- if(prev)
++ if(prev && prev->child>0)
+ {
+ if(s) lxsession_free(s);
+ lxsession_set_active(prev);
+@@ -1423,12 +1268,10 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
s->ckc=NULL;
}
#endif
@@ -2831,7 +3139,7 @@ index 5c279af..8ac8478 100644
#else
if(!s->ckc)
#endif
-@@ -1451,9 +1318,20 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
+@@ -1451,49 +1294,58 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
"x11-display", &n,
"is-local",&is_local,
NULL))
@@ -2849,18 +3157,51 @@ index 5c279af..8ac8478 100644
+ g_message("create ConsoleKit connector fail\n");
}
#endif
-+
- char** env, *path;
- int n_env,i;
- n_env = g_strv_length(environ);
-@@ -1483,17 +1361,22 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option)
- replace_env(env, "LANGUAGE=", lang);
+- char** env, *path;
+- int n_env,i;
+- n_env = g_strv_length(environ);
+- /* copy all environment variables and override some of them */
+- env = g_new(char*, n_env + 1 + 13);
+- for( i = 0; i < n_env; ++i )
+- env[i] = g_strdup(environ[i]);
+- env[i] = NULL;
+-
+- replace_env(env, "HOME=", pw->pw_dir);
+- replace_env(env, "SHELL=", pw->pw_shell);
+- replace_env(env, "USER=", pw->pw_name);
+- replace_env(env, "LOGNAME=", pw->pw_name);
++ char **env, *path;
++ env=g_get_environ();
++
++ env=g_environ_setenv(env, "HOME", pw->pw_dir, TRUE);
++ env=g_environ_setenv(env, "SHELL", pw->pw_shell, TRUE);
++ env=g_environ_setenv(env, "USER", pw->pw_name, TRUE);
++ env=g_environ_setenv(env, "LOGNAME", pw->pw_name, TRUE);
+
+ /* override $PATH if needed */
+ path = g_key_file_get_string(config, "base", "path", 0);
+ if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */
+- replace_env(env, "PATH=", path); /* override current $PATH with config value */
++ env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */
+ else /* don't use the global env, they are bad for user */
+- replace_env(env, "PATH=", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin"); /* set proper default */
++ env=g_environ_setenv(env, "PATH", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", TRUE); /* set proper default */
+ g_free(path);
+ /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */
+ if( lang && lang[0] )
+ {
+- replace_env(env, "LANG=", lang);
+- replace_env(env, "LC_MESSAGES=", lang);
+- replace_env(env, "LANGUAGE=", lang);
++ env=g_environ_setenv(env, "LANG", lang, TRUE);
++ env=g_environ_setenv(env, "LC_MESSAGES", lang, TRUE);
++ env=g_environ_setenv(env, "LANGUAGE", lang, TRUE);
}
- s->env = env;
+
+#ifndef DISABLE_XAUTH
-+ create_client_auth(pw,env);
++ env=create_client_auth(pw,env);
+#endif
+ s->env = env;
- s->child = pid = fork();
+ /*s->child = pid = fork();
@@ -2882,7 +3223,7 @@ index 5c279af..8ac8478 100644
g_free(session_name);
g_free(session_exec);
if(alloc_session)
-@@ -1519,7 +1402,7 @@ void lxdm_do_shutdown(void)
+@@ -1519,7 +1371,7 @@ void lxdm_do_shutdown(void)
char *cmd;
cmd = g_key_file_get_string(config, "cmd", "shutdown", 0);
if( !cmd ) cmd = g_strdup("shutdown -h now");
@@ -2891,7 +3232,7 @@ index 5c279af..8ac8478 100644
g_spawn_command_line_async(cmd,0);
g_free(cmd);
lxdm_quit_self(0);
-@@ -1548,10 +1431,30 @@ int lxdm_do_auto_login(void)
+@@ -1548,10 +1400,30 @@ int lxdm_do_auto_login(void)
if(count==1)
pass = g_key_file_get_string(config, "base", "password", 0);
#endif
@@ -2922,7 +3263,7 @@ index 5c279af..8ac8478 100644
if(p[0]=='@')
{
option=p+1;
-@@ -1559,11 +1462,16 @@ int lxdm_do_auto_login(void)
+@@ -1559,11 +1431,16 @@ int lxdm_do_auto_login(void)
session=g_key_file_get_string(config,option,"session",0);
lang=g_key_file_get_string(config,option,"lang",0);
}
@@ -2940,7 +3281,7 @@ index 5c279af..8ac8478 100644
if(ret==AUTH_SUCCESS)
{
lxdm_do_login(pw,session,lang,option);
-@@ -1571,9 +1479,11 @@ int lxdm_do_auto_login(void)
+@@ -1571,9 +1448,11 @@ int lxdm_do_auto_login(void)
}
g_free(user);g_free(session);g_free(lang);
}
@@ -2953,7 +3294,7 @@ index 5c279af..8ac8478 100644
}
static void log_sigsegv(void)
-@@ -1677,8 +1587,23 @@ GKeyFile *lxdm_user_list(void)
+@@ -1677,8 +1556,23 @@ GKeyFile *lxdm_user_list(void)
g_key_file_set_comment(kf,NULL,NULL,"lxdm user list",NULL);
while((pw=getpwent())!=NULL)
{
@@ -2977,7 +3318,7 @@ index 5c279af..8ac8478 100644
if(strncmp(pw->pw_dir,"/home/",6))
{
if(!strv_find(white,pw->pw_name))
-@@ -1780,21 +1705,21 @@ int main(int arc, char *arg[])
+@@ -1780,21 +1674,21 @@ int main(int arc, char *arg[])
return res?0:-1;
}
}
@@ -3003,7 +3344,7 @@ index 5c279af..8ac8478 100644
g_log_set_handler(NULL, G_LOG_LEVEL_DEBUG, log_ignore, NULL);
}
-@@ -1832,3 +1757,4 @@ int main(int arc, char *arg[])
+@@ -1832,3 +1726,4 @@ int main(int arc, char *arg[])
return 0;
}
@@ -3028,10 +3369,10 @@ index 4c79ca3..568573f 100644
{
diff --git a/src/pam.c b/src/pam.c
new file mode 100644
-index 0000000..810e44f
+index 0000000..7277a50
--- /dev/null
+++ b/src/pam.c
-@@ -0,0 +1,578 @@
+@@ -0,0 +1,586 @@
+/*
+ * lxdm.c - main entry of lxdm
+ *
@@ -3075,6 +3416,7 @@ index 0000000..810e44f
+#include <dirent.h>
+#include <errno.h>
+#include <poll.h>
++#include <sys/stat.h>
+
+#include <pwd.h>
+#include <grp.h>
@@ -3123,8 +3465,8 @@ index 0000000..810e44f
+{
+ struct passwd *pw;
+ struct spwd *sp;
-+ char *real;
-+ char *enc;
++ char *real;
++ char *enc;
+ if(!user || !user[0])
+ {
+ g_debug("user==NULL\n");
@@ -3138,44 +3480,44 @@ index 0000000..810e44f
+ return AUTH_BAD_USER;
+ }
+ if(strstr(pw->pw_shell, "nologin"))
-+ {
-+ g_debug("user %s have nologin shell\n",user);
-+ return AUTH_PRIV;
-+ }
-+ if(type==AUTH_TYPE_AUTO_LOGIN && !pass)
-+ {
++ {
++ g_debug("user %s have nologin shell\n",user);
++ return AUTH_PRIV;
++ }
++ if(type==AUTH_TYPE_AUTO_LOGIN && !pass)
++ {
+ goto out;
+ }
-+ sp = getspnam(user);
-+ if( !sp )
-+ {
++ sp = getspnam(user);
++ if( !sp )
++ {
+ return AUTH_FAIL;
+ }
-+ endspent();
-+ real = sp->sp_pwdp;
-+ if( !real || !real[0] )
-+ {
-+ if( !pass || !pass[0] )
-+ {
-+ *ppw = pw;
-+ g_debug("user %s auth with no password ok\n",user);
-+ return AUTH_SUCCESS;
-+ }
-+ else
-+ {
-+ g_debug("user %s password not match\n",user);
-+ return AUTH_FAIL;
-+ }
-+ }
-+ enc = crypt(pass, real);
-+ if( strcmp(real, enc) )
-+ {
-+ g_debug("user %s password not match\n",user);
-+ return AUTH_FAIL;
-+ }
-+ g_debug("user %s auth ok\n",pw->pw_name);
++ endspent();
++ real = sp->sp_pwdp;
++ if( !real || !real[0] )
++ {
++ if( !pass || !pass[0] )
++ {
++ *ppw = pw;
++ g_debug("user %s auth with no password ok\n",user);
++ return AUTH_SUCCESS;
++ }
++ else
++ {
++ g_debug("user %s password not match\n",user);
++ return AUTH_FAIL;
++ }
++ }
++ enc = crypt(pass, real);
++ if( strcmp(real, enc) )
++ {
++ g_debug("user %s password not match\n",user);
++ return AUTH_FAIL;
++ }
++ g_debug("user %s auth ok\n",pw->pw_name);
+ passwd_copy(&a->pw,pw);
-+ return AUTH_SUCCESS;
++ return AUTH_SUCCESS;
+}
+
+int lxdm_auth_session_begin(LXDM_AUTH *a,int tty,int display,char mcookie[16])
@@ -3329,6 +3671,8 @@ index 0000000..810e44f
+ err = pam_open_session(a->handle, 0); /* FIXME pam session failed */
+ if( err != PAM_SUCCESS )
+ g_warning( "pam open session error \"%s\"\n", pam_strerror(a->handle, err));
++ else
++ a->in_session=1;
+ return 0;
+}
+
@@ -3337,9 +3681,13 @@ index 0000000..810e44f
+ int err;
+ if(!a->handle)
+ return 0;
-+ err = pam_close_session(a->handle, 0);
++ if(a->in_session)
++ {
++ err = pam_close_session(a->handle, 0);
++ a->in_session=0;
++ }
+ pam_end(a->handle, err);
-+ a->handle = NULL;
++ a->handle = NULL;
+ passwd_clean(&a->pw);
+ return 0;
+}
@@ -3413,7 +3761,7 @@ index 0000000..810e44f
+void switch_user(struct passwd *pw, const char *run, char **env)
+{
+ int fd;
-+
++
+ setenv("USER",pw->pw_name,1);
+ setenv("LOGNAME",pw->pw_name,1);
+ setenv("SHELL",pw->pw_shell,1);
@@ -3424,13 +3772,13 @@ index 0000000..810e44f
+ if( !pw || initgroups(pw->pw_name, pw->pw_gid) ||
+ setgid(pw->pw_gid) || setuid(pw->pw_uid)/* || setsid() == -1 */)
+ exit(EXIT_FAILURE);
-+ chdir(pw->pw_dir);
-+ fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR);
-+ if(fd!=-1)
-+ {
-+ dup2(fd,STDERR_FILENO);
-+ close(fd);
-+ }
++ chdir(pw->pw_dir);
++ fd=open(".xsession-errors",O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR);
++ if(fd!=-1)
++ {
++ dup2(fd,STDERR_FILENO);
++ close(fd);
++ }
+
+ /* reset signal */
+ signal(SIGCHLD, SIG_DFL);
@@ -3441,7 +3789,7 @@ index 0000000..810e44f
+ close_left_fds();
+
+ g_spawn_command_line_async ("/etc/lxdm/PostLogin",NULL);
-+ execle("/etc/lxdm/Xsession", "/etc/lxdm/Xsession", run, NULL, environ);
++ execl("/etc/lxdm/Xsession","/etc/lxdm/Xsession",run,NULL);
+ perror("execle");
+ exit(EXIT_FAILURE);
+}
@@ -3606,6 +3954,7 @@ index 0000000..810e44f
+ }
+ //fprintf(stderr,"end\n");
+ }
++ lxdm_auth_session_end(&a);
+ lxdm_auth_cleanup(&a);
+ return 0;
+}
@@ -3666,6 +4015,22 @@ index 2691a03..f233589 100644
if( AUTH_SUCCESS == ret && pw != NULL )
{
ui_drop();
+diff --git a/src/xconn.c b/src/xconn.c
+index f0bdbf2..5c62d4b 100644
+--- a/src/xconn.c
++++ b/src/xconn.c
+@@ -55,9 +55,9 @@ void xconn_clean(xconn_t c)
+ unsigned int nchildren;
+ unsigned int i;
+ Window Root;
+-
++
+ if(!c) return;
+-
++
+ XSetErrorHandler(CatchErrors);
+ XSetIOErrorHandler(CatchIOErrors);
+
diff --git a/systemd/Makefile.am b/systemd/Makefile.am
new file mode 100644
index 0000000..b568c5a
diff --git a/community/lxdm/lxdm.pam b/community/lxdm/lxdm.pam
new file mode 100644
index 000000000..76b8869a2
--- /dev/null
+++ b/community/lxdm/lxdm.pam
@@ -0,0 +1,7 @@
+#%PAM-1.0
+auth include system-login
+-auth optional pam_gnome_keyring.so
+account include system-login
+password include system-login
+session include system-login
+-session optional pam_gnome_keyring.so auto_start
diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD
index 63592c1d1..9625a66d5 100644
--- a/community/lxlauncher/PKGBUILD
+++ b/community/lxlauncher/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 96678 2013-09-03 01:34:25Z bgyorgy $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 101965 2013-12-03 01:02:57Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=lxlauncher
pkgver=0.2.2
-pkgrel=4
+pkgrel=5
pkgdesc='Open source clone of the Asus launcher for EeePC'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
@@ -13,7 +14,8 @@ url='http://lxde.org/'
groups=('lxde')
depends=('gtk2' 'startup-notification' 'lxmenu-data' 'menu-cache')
makedepends=('intltool')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz
+backup=('etc/xdg/lxlauncher/gtkrc' 'etc/xdg/lxlauncher/settings.conf')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
fix-empty-launcher.patch)
md5sums=('16df627447838b170a72cc3a9ee21497'
'4dd715f9cccf04ef87c662cee1dcb798')
diff --git a/community/lxmusic/PKGBUILD b/community/lxmusic/PKGBUILD
index 5bb12620b..846ac848c 100644
--- a/community/lxmusic/PKGBUILD
+++ b/community/lxmusic/PKGBUILD
@@ -1,30 +1,36 @@
-# $Id: PKGBUILD 71871 2012-06-02 14:59:08Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# $Id: PKGBUILD 102077 2013-12-04 20:12:10Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Marcus Schulderinsky <mmaacceess at gmail dot com>
pkgname=lxmusic
pkgver=0.4.5
-pkgrel=1
+pkgrel=2
pkgdesc='Lightweight XMMS2 client'
arch=('i686' 'x86_64' 'mips64el')
url="http://lxde.org/"
license=('GPL')
groups=('lxde')
-depends=('gtk2' 'xmms2')
-makedepends=('pkgconfig' 'intltool')
+depends=('gtk2' 'libnotify' 'xmms2')
+makedepends=('intltool')
source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
libnotify-0.7.patch)
md5sums=('9c3e5eb636f05e8c190d359cd0c8b679'
'770c63254a7369613daeb6d1260d123f')
-build() {
- cd $srcdir/$pkgname-$pkgver
+prepare() {
+ cd $pkgname-$pkgver
+ # Port to libnotify-0.7
patch -Np1 -i $srcdir/libnotify-0.7.patch
+}
+
+build() {
+ 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/lxpolkit/PKGBUILD b/community/lxpolkit/PKGBUILD
index 2455ab0be..f212c37ef 100644
--- a/community/lxpolkit/PKGBUILD
+++ b/community/lxpolkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96579 2013-09-01 20:36:18Z bgyorgy $
+# $Id: PKGBUILD 102844 2013-12-22 01:57:44Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=lxpolkit
pkgver=0.1.0
-pkgrel=2
-pkgdesc="Simple policykit authentication agent for LXDE"
+pkgrel=3
+pkgdesc="Simple polkit authentication agent for LXDE"
arch=('i686' 'x86_64')
url="http://blog.lxde.org/?p=674"
license=('GPL')
@@ -14,14 +14,20 @@ makedepends=('intltool')
source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz)
md5sums=('2597b00035fe1d695219e0f9bfa8c26f')
+prepare() {
+ cd $pkgname-$pkgver
+ # Don't conflict with MATE and Razor-qt (they have their own polkit agents)
+ sed -i '/^NotShowIn/ s/GNOME;KDE;/GNOME;KDE;MATE;Razor;/' data/lxpolkit.desktop.in.in
+}
+
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/community/lxsession/PKGBUILD b/community/lxsession/PKGBUILD
index 9205a549f..f403a9c52 100644
--- a/community/lxsession/PKGBUILD
+++ b/community/lxsession/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 95018 2013-08-03 12:52:23Z bpiotrowski $
+# $Id: PKGBUILD 100813 2013-11-11 11:27:29Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
pkgname=lxsession
pkgver=0.4.6.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc='Lightweight X11 session manager'
arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ conflicts=('lxsession-lite' 'lxde-settings-daemon')
source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
lxsession-0.4.6.1-logind-support.patch)
md5sums=('e456b64c5ab3652a4dec661ec706dc6e'
- 'd99fb337cba343306df71c85034def3b')
+ '0ec60da2c876b14928ea22a6c29fc0a7')
prepare() {
cd $pkgname-$pkgver
diff --git a/community/lxsession/lxsession-0.4.6.1-logind-support.patch b/community/lxsession/lxsession-0.4.6.1-logind-support.patch
index 2c12a01c5..978223207 100644
--- a/community/lxsession/lxsession-0.4.6.1-logind-support.patch
+++ b/community/lxsession/lxsession-0.4.6.1-logind-support.patch
@@ -436,13 +436,13 @@
+{
+ const gchar* program = NULL;
+
-+ if (g_find_program_in_path("xdg-screensaver"))
++ if (g_find_program_in_path("lxlock"))
+ {
-+ program = "xdg-screensaver lock";
++ program = "lxlock";
+ }
-+ else if (g_find_program_in_path("lxlock"))
++ else if (g_find_program_in_path("xdg-screensaver"))
+ {
-+ program = "lxlock";
++ program = "xdg-screensaver lock";
+ }
+ return program;
+}
diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD
index ea5e83ec7..0fc508a3f 100644
--- a/community/lz4/PKGBUILD
+++ b/community/lz4/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 100408 2013-11-03 17:44:50Z seblu $
+# $Id: PKGBUILD 103238 2013-12-30 22:18:53Z seblu $
# Maintainer: Sébastien Luttringer
# Contacted by mail, author use svn commit as release version.
# He only push tested release code into svn and support using revision as version
pkgname=lz4
-pkgver=108
+pkgver=110
pkgrel=1
pkgdesc='Very fast lossless compression algorithm'
arch=('i686' 'x86_64')
url='https://code.google.com/p/lz4/'
-license=('BSD' 'GPL2')
+license=('GPL2')
makedepends=('svn')
depends=('glibc')
source=("$pkgname::svn+http://lz4.googlecode.com/svn/trunk/#revision=$pkgver")
@@ -18,14 +18,12 @@ md5sums=('SKIP')
build() {
cd $pkgname
- make lz4 lz4c
+ make
}
package() {
cd $pkgname
- install -Dm755 lz4 "$pkgdir/usr/bin/lz4"
- install -Dm755 lz4c "$pkgdir/usr/bin/lz4c"
- install -Dm644 cmake/pack/release_COPYING.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ make install DESTDIR="$pkgdir"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/macchanger/PKGBUILD b/community/macchanger/PKGBUILD
index a42f7aa87..fbcdea6ab 100644
--- a/community/macchanger/PKGBUILD
+++ b/community/macchanger/PKGBUILD
@@ -1,14 +1,16 @@
-# $Id: PKGBUILD 87606 2013-04-04 02:46:04Z kkeen $
+# $Id: PKGBUILD 101347 2013-11-23 01:20:53Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=macchanger
pkgver=1.6.0
-pkgrel=1
+pkgrel=2
pkgdesc="A small utility to change your NIC's MAC address"
arch=('i686' 'x86_64' 'mips64el')
url="http://ftp.gnu.org/gnu/macchanger"
license=('GPL')
+depends=('glibc')
+install='macchanger.install'
source=(http://ftp.gnu.org/gnu/macchanger/${pkgname}-${pkgver}.tar.gz)
md5sums=('1257b18e9067a8192c9747da52aabdda')
@@ -16,7 +18,7 @@ build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
--mandir=/usr/share/man \
- --infodir=/usr/share/man
+ --infodir=/usr/share/info
make
}
diff --git a/community/macchanger/macchanger.install b/community/macchanger/macchanger.install
new file mode 100644
index 000000000..c595c6290
--- /dev/null
+++ b/community/macchanger/macchanger.install
@@ -0,0 +1,21 @@
+infodir=/usr/share/info
+filelist=(macchanger.info)
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ usr/bin/install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ usr/bin/install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
diff --git a/community/mailman/PKGBUILD b/community/mailman/PKGBUILD
index 5bbe42856..02c73f151 100644
--- a/community/mailman/PKGBUILD
+++ b/community/mailman/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99571 2013-10-29 21:25:25Z seblu $
+# $Id: PKGBUILD 101380 2013-11-24 00:43:57Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=mailman
-pkgver=2.1.16
+pkgver=2.1.17
pkgrel=1
pkgdesc='The GNU Mailing List Manager'
arch=(i686 x86_64)
@@ -20,7 +20,7 @@ source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
"$pkgname.profile.sh"
"$pkgname.profile.csh"
"$pkgname.service")
-md5sums=('ab8969dc68661f7a7af3beb797a46b3e'
+md5sums=('39043257f91eb876082fa90470aa8d28'
'ed04d062379eb21e39ce1e70e6b1ade2'
'a9c71ec940c56173415fbd49087d10b0'
'85a8c30ffc444e677b286f54df530482'
diff --git a/extra/manedit/PKGBUILD b/community/manedit/PKGBUILD
index d620506a4..849a5477b 100644
--- a/extra/manedit/PKGBUILD
+++ b/community/manedit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143901 2011-11-30 20:13:10Z giovanni $
+# $Id: PKGBUILD 102171 2013-12-06 11:59:39Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
diff --git a/extra/manedit/manedit-1.2.1-fix-man-page.patch b/community/manedit/manedit-1.2.1-fix-man-page.patch
index 77aad9a79..77aad9a79 100644
--- a/extra/manedit/manedit-1.2.1-fix-man-page.patch
+++ b/community/manedit/manedit-1.2.1-fix-man-page.patch
diff --git a/extra/manedit/manedit.desktop b/community/manedit/manedit.desktop
index 030fb0ccf..030fb0ccf 100644
--- a/extra/manedit/manedit.desktop
+++ b/community/manedit/manedit.desktop
diff --git a/community/mangler/PKGBUILD b/community/mangler/PKGBUILD
new file mode 100644
index 000000000..f2c0e140d
--- /dev/null
+++ b/community/mangler/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 101650 2013-11-29 19:09:30Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: Simon Perry <pezz at sanxion dot net>
+# Contributor: Sigitas Mazaliauskas <sigisnn at gmail dot com>
+# Contributor: LinkMaster03 <linkmaster032000 at gmail dot com>
+
+pkgname=mangler
+pkgver=1.2.5
+pkgrel=2
+pkgdesc="Ventrilo compatible VOIP client for Linux"
+arch=('i686' 'x86_64')
+url="http://www.mangler.org/"
+license=('GPL3')
+depends=('dbus-glib' 'gsm' 'gtkmm' 'libpulse' 'speex')
+makedepends=('librsvg' 'pkg-config')
+optdepends=('alsa-lib: ALSA support'
+ 'celt: CELT codec support'
+ 'espeak: TTS support'
+ 'g15daemon: G15 keyboard support'
+ 'xosd: Information overlay support')
+conflicts=('mangler-svn')
+source=(http://www.mangler.org/downloads/$pkgname-$pkgver.tar.bz2)
+md5sums=('28bb40c91d8e778a95a0845f858be503')
+options=(!libtool)
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index a466fe4c1..c720ff4c4 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98743 2013-10-17 14:01:50Z andyrtr $
+# $Id: PKGBUILD 102259 2013-12-07 10:36:44Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: David Dent <thewinch@gmail.com>
# Contributor: orbisvicis <orbisvicis@gmail.com>
pkgname=mapnik
pkgver=2.2.0
-pkgrel=4
+pkgrel=5
pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
arch=('i686' 'x86_64' 'mips64el')
url="http://mapnik.org/"
diff --git a/community/mediainfo-gui/PKGBUILD b/community/mediainfo-gui/PKGBUILD
index 9e5634b80..583cda1f5 100644
--- a/community/mediainfo-gui/PKGBUILD
+++ b/community/mediainfo-gui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99528 2013-10-29 10:58:03Z spupykin $
+# $Id: PKGBUILD 101328 2013-11-22 17:36:49Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: hydro <hydro@freenet.de>
pkgname=mediainfo-gui
-pkgver=0.7.64
+pkgver=0.7.65
pkgrel=1
pkgdesc="GUI for mediainfo"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('libmediainfo' 'wxgtk')
makedepends=('libtool' 'automake' 'autoconf')
install=mediainfo-gui.install
source=(http://downloads.sourceforge.net/mediainfo/mediainfo_${pkgver}.tar.bz2)
-md5sums=('f5cb798cf3b121359ab3173d70526518')
+md5sums=('19d7992a7d0cba0f5f731f993e8c537c')
build() {
cd $srcdir/MediaInfo/Project/GNU/GUI
diff --git a/community/mediainfo/PKGBUILD b/community/mediainfo/PKGBUILD
index a27414701..daf640f31 100644
--- a/community/mediainfo/PKGBUILD
+++ b/community/mediainfo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99526 2013-10-29 10:57:46Z spupykin $
+# $Id: PKGBUILD 101325 2013-11-22 17:32:35Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: hydro <hydro@freenet.de>
pkgname=mediainfo
-pkgver=0.7.64
+pkgver=0.7.65
pkgrel=1
pkgdesc="supplies technical and tag information about a video or audio file"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
depends=('libmediainfo')
makedepends=('libtool' 'automake' 'autoconf')
source=(http://downloads.sourceforge.net/mediainfo/${pkgname}_${pkgver}.tar.bz2)
-md5sums=('f5cb798cf3b121359ab3173d70526518')
+md5sums=('19d7992a7d0cba0f5f731f993e8c537c')
build() {
cd $srcdir/MediaInfo/Project/GNU/CLI
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index 13d8d02b2..eabe06044 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 94891 2013-08-01 06:55:07Z bpiotrowski $
+# $Id: PKGBUILD 101155 2013-11-18 15:23:29Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
pkgname=megaglest
-pkgver=3.8.0beta1
-_pkgver=3.8.0-beta1
-pkgrel=2
+pkgver=3.9.0
+_pkgver=3.9.0
+pkgrel=1
pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/megaglest/"
@@ -14,7 +14,7 @@ depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' '
'libircclient' 'miniupnpc' 'wxgtk' 'glu')
makedepends=('ftjam' 'cmake' 'mesa')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz")
-md5sums=('1da8707d435ffb2342f03ca466d4eeed')
+md5sums=('b599e8a71376640bc0d191d6c92c9073')
build() {
cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/
diff --git a/community/metamail/PKGBUILD b/community/metamail/PKGBUILD
deleted file mode 100644
index 593c17190..000000000
--- a/community/metamail/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 100520 2013-11-05 11:41:56Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sekenre <sekenre at ukfsn dot org>
-# Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
-
-pkgname=metamail
-pkgver=2.7
-pkgrel=7
-pkgdesc="Used to display and process MIME messages"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://packages.debian.org/stable/mail/metamail"
-license=('custom')
-depends=('ncurses')
-noextract=(metamail_$pkgver-52.diff.gz)
-source=("ftp://ftp.archlinux.org/other/community/metamail/metamail_$pkgver.orig.tar.gz" \
- "ftp://ftp.archlinux.org/other/community/metamail/metamail_$pkgver-54.diff.gz" \
- license)
-md5sums=('c6967e9bc5d3c919764b02df24efca01'
- '2071dc7b9c33345443ab9a619e640a69'
- '38be502570f3ce5b5a2bafd6a876373f')
-
-build() {
- cd $srcdir/metamail-$pkgver.orig
-
- patch -p1 <$srcdir/metamail_$pkgver-54.diff
- sed -i 's|getline|xgetline|' metamail/uue.c src/metamail/uue.c
-
- sh ./bootstrap
- sh ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/metamail-$pkgver.orig
- make DESTDIR=$pkgdir install
- install -D -m0644 $srcdir/license $pkgdir/usr/share/licenses/$pkgname/license
-}
diff --git a/community/metamail/license b/community/metamail/license
deleted file mode 100644
index 3b186faa4..000000000
--- a/community/metamail/license
+++ /dev/null
@@ -1,37 +0,0 @@
-This is the Debian GNU/Linux prepackaged version of Metamail.
-
-This package was put together by Michael Meskes <meskes@debian.org>,
-from sources obtained from:
- ftp.bellcore.com:/pub/nsb/mm2.7.tar.Z and /pub/nsb/contrib2.7.tar.Z
-
-This package was then worked on by Herbert Xu <herbert@debian.org>.
-
-****************************************************************
-Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
-
-Permission to use, copy, modify, and distribute this material
-for any purpose and without fee is hereby granted, provided
-that the above copyright notice and this permission notice
-appear in all copies, and that the name of Bellcore not be
-used in advertising or publicity pertaining to this
-material without the specific, prior written permission
-of an authorized representative of Bellcore. BELLCORE
-MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS",
-WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
-****************************************************************
-
-Most scripts are:
-
-# Conversion from C shell to Bourne shell by Z-Code Software Corp.
-# Conversion Copyright (c) 1992 Z-Code Software Corp.
-# Permission to use, copy, modify, and distribute this material
-# for any purpose and without fee is hereby granted, provided
-# that the above copyright notice and this permission notice
-# appear in all copies, and that the name of Z-Code Software not
-# be used in advertising or publicity pertaining to this
-# material without the specific, prior written permission
-# of an authorized representative of Z-Code. Z-CODE SOFTWARE
-# MAKES NO REPRESENTATIONS ABOUT THE ACCURACY OR SUITABILITY
-# OF THIS MATERIAL FOR ANY PURPOSE. IT IS PROVIDED "AS IS",
-# WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES.
diff --git a/community/milkytracker/PKGBUILD b/community/milkytracker/PKGBUILD
index 45c6ed0aa..6cb66d3ca 100644
--- a/community/milkytracker/PKGBUILD
+++ b/community/milkytracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 88664 2013-04-21 13:23:51Z arodseth $
+# $Id: PKGBUILD 101204 2013-11-19 15:27:04Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Christopher O'Neill <milkytracker@chrisoneill.co.uk>
# Contributor: Maks Verver <maksverver@geocities.com>
pkgname=milkytracker
-pkgver=0.90.85
-pkgrel=8
+pkgver=0.90.86
+pkgrel=1
pkgdesc='Fast Tracker II inspired music tracker'
arch=('x86_64' 'i686' 'mips64el')
url="http://www.milkytracker.org/"
@@ -15,29 +15,23 @@ makedepends=('jack-audio-connection-kit' 'gendesk')
optdepends=('jack-audio-connection-kit: JACK audio support')
options=('docs' '!strip')
install="$pkgname.install"
-source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2"
- "$pkgname.patch")
-sha256sums=('59a0d294d63752be74b157e07b0c70252c9198c312d9b1ad0ca460129fe5bd80'
- '0b701bf97375343f13d1af8a30df052c85b526e527bf6402634c37c7e9fa5b42')
-_name=('MilkyTracker')
-_categories=('AudioVideo;Audio;AudioVideoEditing;')
+source=("http://milkytracker.org/files/$pkgname-$pkgver.tar.bz2")
+sha256sums=('eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed')
prepare() {
- cd "$srcdir"
-
- gendesk -n
- patch -p0 -i "$pkgname.patch"
+ gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name 'MilkyTracker' \
+ --categories 'AudioVideo;Audio;AudioVideoEditing;'
}
build() {
cd "$pkgname-$pkgver"
./configure --prefix=/usr --with-alsa --with-jack
- make
+ make CXXFLAGS="$CXXFLAGS -lasound"
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir/usr/share/applications" \
diff --git a/community/milkytracker/milkytracker.patch b/community/milkytracker/milkytracker.patch
deleted file mode 100644
index ee292a87c..000000000
--- a/community/milkytracker/milkytracker.patch
+++ /dev/null
@@ -1,632 +0,0 @@
-*** milkytracker-0.90.85/src/tracker/sdl/SDL_Main.cpp 2009-02-22 10:20:39.140388000 +0000
---- milkytracker-trunk/src/tracker/sdl/SDL_Main.cpp 2010-01-03 18:11:52.541377210 +0000
-***************
-*** 751,758 ****
- case SDLUserEventLMouseRepeat:
- {
- PPPoint p;
-! p.x = (pp_int32)event.data1;
-! p.y = (pp_int32)event.data2;
- PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint));
- RaiseEventSerialized(&myEvent);
- break;
---- 751,758 ----
- case SDLUserEventLMouseRepeat:
- {
- PPPoint p;
-! p.x = reinterpret_cast<intptr_t> (event.data1);
-! p.y = reinterpret_cast<intptr_t> (event.data2);
- PPEvent myEvent(eLMouseRepeat, &p, sizeof(PPPoint));
- RaiseEventSerialized(&myEvent);
- break;
-***************
-*** 761,768 ****
- case SDLUserEventRMouseRepeat:
- {
- PPPoint p;
-! p.x = (pp_int32)event.data1;
-! p.y = (pp_int32)event.data2;
- PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint));
- RaiseEventSerialized(&myEvent);
- break;
---- 761,768 ----
- case SDLUserEventRMouseRepeat:
- {
- PPPoint p;
-! p.x = reinterpret_cast<intptr_t> (event.data1);
-! p.y = reinterpret_cast<intptr_t> (event.data2);
- PPEvent myEvent(eRMouseRepeat, &p, sizeof(PPPoint));
- RaiseEventSerialized(&myEvent);
- break;
-***************
-*** 770,777 ****
-
- case SDLUserEventMidiKeyDown:
- {
-! pp_int32 note = (pp_int32)event.data1;
-! pp_int32 volume = (pp_int32)event.data2;
- globalMutex->lock();
- myTracker->sendNoteDown(note, volume);
- globalMutex->unlock();
---- 770,777 ----
-
- case SDLUserEventMidiKeyDown:
- {
-! pp_int32 note = reinterpret_cast<intptr_t> (event.data1);
-! pp_int32 volume = reinterpret_cast<intptr_t> (event.data2);
- globalMutex->lock();
- myTracker->sendNoteDown(note, volume);
- globalMutex->unlock();
-***************
-*** 780,786 ****
-
- case SDLUserEventMidiKeyUp:
- {
-! pp_int32 note = (pp_int32)event.data1;
- globalMutex->lock();
- myTracker->sendNoteUp(note);
- globalMutex->unlock();
---- 780,786 ----
-
- case SDLUserEventMidiKeyUp:
- {
-! pp_int32 note = reinterpret_cast<intptr_t> (event.data1);
- globalMutex->lock();
- myTracker->sendNoteUp(note);
- globalMutex->unlock();
-diff -c -x .svn milkytracker-0.90.85/docs/FAQ.html milkytracker-trunk/docs/FAQ.html
-*** milkytracker-0.90.85/docs/FAQ.html 2010-01-01 23:00:57.183928000 +0000
---- milkytracker-trunk/docs/FAQ.html 2010-01-05 10:34:37.212763931 +0000
-***************
-*** 49,65 ****
- {
- questions = document.getElementsByTagName('a');
- answers = document.getElementsByTagName('ul');
-! for (i = 1; i <= questions.length; i++)
- {
-! questions.item(i-1).id = "q"+i;
-! var question = questions.item(i-1).id;
-! document.getElementById(question).href="javascript:flip('a"+i+"')";
- }
-! for (i = 1; i <= answers.length; i++)
- {
-! answers.item(i-1).id = "a"+i;
-! var answer = answers.item(i-1).id;
-! document.getElementById(answer).style.display="none";
- }
- }
- }
---- 49,66 ----
- {
- questions = document.getElementsByTagName('a');
- answers = document.getElementsByTagName('ul');
-! q = 0;
-! for (i = 0; i < questions.length; i++)
- {
-! if(questions.item(i).href != "") continue;
-! questions.item(i).id = "q"+q;
-! questions.item(i).href="javascript:flip('a"+q+"')";
-! q++;
- }
-! for (i = 0; i < answers.length; i++)
- {
-! answers.item(i).id = "a"+i;
-! answers.item(i).style.display="none";
- }
- }
- }
-***************
-*** 87,96 ****
- <ol>
-
- <li>
-! <a>Where can I find a list of all the effect codes?</a>
- <ul>
- <li>
-! Read the manual: <a href="milkytracker.html">milkytracker.html</a>
- </li>
- </ul>
- </li>
---- 88,97 ----
- <ol>
-
- <li>
-! <a id="question">Where can I find a list of all the effect codes?</a>
- <ul>
- <li>
-! Read the manual: <a href="MilkyTracker.html">milkytracker.html</a>
- </li>
- </ul>
- </li>
-***************
-*** 99,105 ****
- <a>Where can I find a list of all the keyboard shortcuts?</a>
- <ul>
- <li>
-! Read the manual: <a href="milkytracker.html">milkytracker.html</a>
- </li>
- </ul>
-
---- 100,106 ----
- <a>Where can I find a list of all the keyboard shortcuts?</a>
- <ul>
- <li>
-! Read the manual: <a href="MilkyTracker.html">milkytracker.html</a>
- </li>
- </ul>
-
-diff -c -x .svn milkytracker-0.90.85/docs/MilkyTracker.html milkytracker-trunk/docs/MilkyTracker.html
-*** milkytracker-0.90.85/docs/MilkyTracker.html 2010-01-01 23:00:57.183928000 +0000
---- milkytracker-trunk/docs/MilkyTracker.html 2010-01-05 10:34:37.212763931 +0000
-***************
-*** 183,189 ****
- <body>
- <h1>MilkyTracker Manual <span id="version" style="font-size: 10pt; font-weight: normal;">v0.90.85</span></h1>
- <p>
-! Hello and welcome to MilkyTracker, an open source multi-platform Fasttracker II compatible music tracker program. This document holds a lot of valuable information about the tracker but it's not a tracking manual. If you want to learn more about tracking and how it's done, the Internet is your friend. We host some resources on <a href="http://www.milkytracker.net/">MilkyTracker.net</a> as well.
- </p>
- <h4>Disclaimer:</h4>
- <p>
---- 183,189 ----
- <body>
- <h1>MilkyTracker Manual <span id="version" style="font-size: 10pt; font-weight: normal;">v0.90.85</span></h1>
- <p>
-! Hello and welcome to MilkyTracker, an open source multi-platform Fasttracker II compatible music tracker program. This document holds a lot of valuable information about the tracker but it's not a tracking manual. If you want to learn more about tracking and how it's done, the Internet is your friend. We host some resources on <a href="http://www.milkytracker.org/">MilkyTracker.net</a> as well.
- </p>
- <h4>Disclaimer:</h4>
- <p>
-***************
-*** 3111,3122 ****
- and everybody who donated or dropped a letter.
- </p>
- <p>
-! Special greetings to everyone at <a href="http://www.milkytracker.net/?community">#MilkyTracker</a> for making it a daily active channel.
- </p>
-
- <h2><a id="contact">10. Contact</a></h2>
- <p>
-! You can contact the MilkyTracker team by email (<span class="email">ten.rekcartyklim@troppus</span>), through the forum at <a href="http://www.milkytracker.net/?community">http://www.milkytracker.net/?community</a> or in IRC. To chat with the community live, you can connect to #MilkyTracker on <a href="http://www.esper.net/">EsperNet</a> with your IRC client or use the java client on our website.
- </p>
-
-
---- 3111,3122 ----
- and everybody who donated or dropped a letter.
- </p>
- <p>
-! Special greetings to everyone at <a href="http://www.milkytracker.org/?community">#MilkyTracker</a> for making it a daily active channel.
- </p>
-
- <h2><a id="contact">10. Contact</a></h2>
- <p>
-! You can contact the MilkyTracker team by email (<span class="email">ten.rekcartyklim@troppus</span>), through the forum at <a href="http://www.milkytracker.org/?community">http://www.milkytracker.org/?community</a> or in IRC. To chat with the community live, you can connect to #MilkyTracker on <a href="http://www.esper.net/">EsperNet</a> with your IRC client or use the java client on our website.
- </p>
-
-
-Only in milkytracker-0.90.85/docs/: MilkyTracker.rtf
---- milkytracker-0.90.85/src/compression/DecompressorGZIP.cpp 2012-08-28 17:54:46.000000000 +0200
-+++ milkytracker-trunk/src/compression/DecompressorGZIP.cpp 2012-08-28 17:55:21.000000000 +0200
-@@ -57,11 +57,11 @@
-
- bool DecompressorGZIP::decompress(const PPSystemString& outFileName, Hints hint)
- {
-- gzFile *gz_input_file = NULL;
-+ gzFile gz_input_file = NULL;
- int len = 0;
- pp_uint8 *buf;
-
-- if ((gz_input_file = (void **)gzopen (fileName.getStrBuffer(), "r")) == NULL)
-+ if ((gz_input_file = gzopen (fileName.getStrBuffer(), "r")) == NULL)
- return false;
-
- if ((buf = new pp_uint8[0x10000]) == NULL)
-diff -cx .svn milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp
-*** milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp 2009-03-28 11:19:41.392162000 +0000
---- milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.cpp 2010-01-03 18:48:15.616918068 +0000
-***************
-*** 102,124 ****
- // Each function has to be cast.. surely there must be an easier way?
- dlerror();
- jack_port_get_buffer = (void* (*)(jack_port_t*, jack_nframes_t))
-! dlsym(libJack, "jack_port_get_buffer");
- jack_client_new = (jack_client_t* (*)(const char*))
-! dlsym(libJack, "jack_client_new");
- jack_port_register = (jack_port_t* (*)(jack_client_t*, const char*, const char*, long unsigned int, long unsigned int))
-! dlsym(libJack, "jack_port_register");
- jack_set_process_callback = (int (*)(jack_client_t*, int (*)(jack_nframes_t, void*), void*))
-! dlsym(libJack, "jack_set_process_callback");
- jack_get_buffer_size = (jack_nframes_t (*)(jack_client_t*))
-! dlsym(libJack, "jack_get_buffer_size");
- jack_deactivate = (int (*)(jack_client_t*))
-! dlsym(libJack, "jack_deactivate");
- jack_client_close = (int (*)(jack_client_t*))
-! dlsym(libJack, "jack_client_close");
- jack_activate = (int (*)(jack_client_t*))
-! dlsym(libJack, "jack_activate");
- jack_get_sample_rate = (jack_nframes_t (*)(jack_client_t *))
-! dlsym(libJack, "jack_get_sample_rate");
- if(dlerror()) {
- fprintf(stderr, "JACK: An error occured whilst loading symbols, aborting.\n");
- return -1;
---- 102,130 ----
- // Each function has to be cast.. surely there must be an easier way?
- dlerror();
- jack_port_get_buffer = (void* (*)(jack_port_t*, jack_nframes_t))
-! dlsym(libJack, "jack_port_get_buffer");
- jack_client_new = (jack_client_t* (*)(const char*))
-! dlsym(libJack, "jack_client_new");
- jack_port_register = (jack_port_t* (*)(jack_client_t*, const char*, const char*, long unsigned int, long unsigned int))
-! dlsym(libJack, "jack_port_register");
- jack_set_process_callback = (int (*)(jack_client_t*, int (*)(jack_nframes_t, void*), void*))
-! dlsym(libJack, "jack_set_process_callback");
- jack_get_buffer_size = (jack_nframes_t (*)(jack_client_t*))
-! dlsym(libJack, "jack_get_buffer_size");
- jack_deactivate = (int (*)(jack_client_t*))
-! dlsym(libJack, "jack_deactivate");
- jack_client_close = (int (*)(jack_client_t*))
-! dlsym(libJack, "jack_client_close");
- jack_activate = (int (*)(jack_client_t*))
-! dlsym(libJack, "jack_activate");
- jack_get_sample_rate = (jack_nframes_t (*)(jack_client_t *))
-! dlsym(libJack, "jack_get_sample_rate");
-! jack_get_ports = (const char** (*)(jack_client_t *, const char *, const char *, unsigned long))
-! dlsym(libJack, "jack_get_ports");
-! jack_connect = (int (*)(jack_client_t *, const char *source_port, const char *destination_port))
-! dlsym(libJack, "jack_connect");
-! jack_port_name = (const char* (*)(const jack_port_t *))
-! dlsym(libJack, "jack_port_name");
- if(dlerror()) {
- fprintf(stderr, "JACK: An error occured whilst loading symbols, aborting.\n");
- return -1;
-***************
-*** 179,184 ****
---- 185,196 ----
-
- mp_sint32 AudioDriver_JACK::start()
- {
-+ jack_get_ports = (const char** (*)(jack_client_t *, const char *, const char *, unsigned long))
-+ dlsym(libJack, "jack_get_ports");
-+ jack_connect = (int (*)(jack_client_t *, const char *source_port, const char *destination_port))
-+ dlsym(libJack, "jack_connect");
-+ jack_port_name = (const char* (*)(const jack_port_t *))
-+ dlsym(libJack, "jack_port_name");
- jack_activate(hJack);
- deviceHasStarted = true;
- return 0;
-diff -cx .svn milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.h milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.h
-*** milkytracker-0.90.85/src/milkyplay/drivers/jack/AudioDriver_JACK.h 2009-03-28 11:19:41.392162000 +0000
---- milkytracker-trunk/src/milkyplay/drivers/jack/AudioDriver_JACK.h 2010-01-03 18:38:35.835648568 +0000
-***************
-*** 57,74 ****
- jack_client_t *(*jack_client_new) (const char *client_name);
- int (*jack_client_close) (jack_client_t *client);
- int (*jack_set_process_callback) (jack_client_t *client,
-! JackProcessCallback process_callback,
-! void *arg);
- int (*jack_activate) (jack_client_t *client);
- int (*jack_deactivate) (jack_client_t *client);
- jack_port_t *(*jack_port_register) (jack_client_t *client,
-! const char *port_name,
-! const char *port_type,
-! unsigned long flags,
-! unsigned long buffer_size);
- void *(*jack_port_get_buffer) (jack_port_t *, jack_nframes_t);
- jack_nframes_t (*jack_get_buffer_size) (jack_client_t *);
- jack_nframes_t (*jack_get_sample_rate) (jack_client_t *);
-
- public:
- AudioDriver_JACK();
---- 57,83 ----
- jack_client_t *(*jack_client_new) (const char *client_name);
- int (*jack_client_close) (jack_client_t *client);
- int (*jack_set_process_callback) (jack_client_t *client,
-! JackProcessCallback process_callback,
-! void *arg);
- int (*jack_activate) (jack_client_t *client);
- int (*jack_deactivate) (jack_client_t *client);
- jack_port_t *(*jack_port_register) (jack_client_t *client,
-! const char *port_name,
-! const char *port_type,
-! unsigned long flags,
-! unsigned long buffer_size);
- void *(*jack_port_get_buffer) (jack_port_t *, jack_nframes_t);
- jack_nframes_t (*jack_get_buffer_size) (jack_client_t *);
- jack_nframes_t (*jack_get_sample_rate) (jack_client_t *);
-+ const char ** (*jack_get_ports) (jack_client_t *,
-+ const char *port_name_pattern,
-+ const char *type_name_pattern,
-+ unsigned long flags);
-+ int (*jack_connect) (jack_client_t *,
-+ const char *source_port,
-+ const char *destination_port);
-+ const char* (*jack_port_name) (const jack_port_t *);
-+
-
- public:
- AudioDriver_JACK();
-*** milkytracker-0.90.85/configure.in 2009-09-17 20:35:47.231496000 +0100
---- milkytracker-trunk/configure.in 2010-01-05 10:03:17.292774154 +0000
-***************
-*** 43,49 ****
-
- AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),)
- #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
-! PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
-
- SDL_VERSION=1.2.0
- AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL]))
---- 43,49 ----
-
- AC_SEARCH_LIBS(gzopen, z, AC_DEFINE([HAVE_LIBZ], [1], [Define to 1 if you have the 'libz' library.]),)
- #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
-! #PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
-
- SDL_VERSION=1.2.0
- AM_PATH_SDL($SDL_VERSION,, AC_MSG_ERROR([Please install libSDL]))
-*** milkytracker-0.90.85/configure 2010-01-02 00:03:37.602601121 +0000
---- milkytracker-trunk/configure 2010-01-05 10:03:38.372781464 +0000
-***************
-*** 599,607 ****
- SDL_LIBS
- SDL_CFLAGS
- SDL_CONFIG
-- ZZIP_LIBS
-- ZZIP_CFLAGS
-- PKG_CONFIG
- ALSA_LIBS
- ALSA_CFLAGS
- RTMIDI_DIR
---- 599,604 ----
-***************
-*** 717,726 ****
- CCC
- CC
- CFLAGS
-! CPP
-! PKG_CONFIG
-! ZZIP_CFLAGS
-! ZZIP_LIBS'
-
-
- # Initialize some variables set by options.
---- 714,720 ----
- CCC
- CC
- CFLAGS
-! CPP'
-
-
- # Initialize some variables set by options.
-***************
-*** 1363,1371 ****
- CC C compiler command
- CFLAGS C compiler flags
- CPP C preprocessor
-- PKG_CONFIG path to pkg-config utility
-- ZZIP_CFLAGS C compiler flags for ZZIP, overriding pkg-config
-- ZZIP_LIBS linker flags for ZZIP, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
---- 1357,1362 ----
-***************
-*** 5313,5524 ****
- fi
-
- #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
-!
-!
-! if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-! if test -n "$ac_tool_prefix"; then
-! # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-! set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-! $as_echo_n "checking for $ac_word... " >&6; }
-! if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-! $as_echo_n "(cached) " >&6
-! else
-! case $PKG_CONFIG in
-! [\\/]* | ?:[\\/]*)
-! ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-! ;;
-! *)
-! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-! for as_dir in $PATH
-! do
-! IFS=$as_save_IFS
-! test -z "$as_dir" && as_dir=.
-! for ac_exec_ext in '' $ac_executable_extensions; do
-! if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-! ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-! break 2
-! fi
-! done
-! done
-! IFS=$as_save_IFS
-!
-! ;;
-! esac
-! fi
-! PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-! if test -n "$PKG_CONFIG"; then
-! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-! $as_echo "$PKG_CONFIG" >&6; }
-! else
-! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-! $as_echo "no" >&6; }
-! fi
-!
-!
-! fi
-! if test -z "$ac_cv_path_PKG_CONFIG"; then
-! ac_pt_PKG_CONFIG=$PKG_CONFIG
-! # Extract the first word of "pkg-config", so it can be a program name with args.
-! set dummy pkg-config; ac_word=$2
-! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-! $as_echo_n "checking for $ac_word... " >&6; }
-! if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-! $as_echo_n "(cached) " >&6
-! else
-! case $ac_pt_PKG_CONFIG in
-! [\\/]* | ?:[\\/]*)
-! ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-! ;;
-! *)
-! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-! for as_dir in $PATH
-! do
-! IFS=$as_save_IFS
-! test -z "$as_dir" && as_dir=.
-! for ac_exec_ext in '' $ac_executable_extensions; do
-! if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-! ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-! $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-! break 2
-! fi
-! done
-! done
-! IFS=$as_save_IFS
-!
-! ;;
-! esac
-! fi
-! ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-! if test -n "$ac_pt_PKG_CONFIG"; then
-! { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-! $as_echo "$ac_pt_PKG_CONFIG" >&6; }
-! else
-! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-! $as_echo "no" >&6; }
-! fi
-!
-! if test "x$ac_pt_PKG_CONFIG" = x; then
-! PKG_CONFIG=""
-! else
-! case $cross_compiling:$ac_tool_warned in
-! yes:)
-! { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-! ac_tool_warned=yes ;;
-! esac
-! PKG_CONFIG=$ac_pt_PKG_CONFIG
-! fi
-! else
-! PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-! fi
-!
-! fi
-! if test -n "$PKG_CONFIG"; then
-! _pkg_min_version=0.9.0
-! { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-! $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-! if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-! $as_echo "yes" >&6; }
-! else
-! { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-! $as_echo "no" >&6; }
-! PKG_CONFIG=""
-! fi
-!
-! fi
-!
-! pkg_failed=no
-! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZZIP" >&5
-! $as_echo_n "checking for ZZIP... " >&6; }
-!
-! if test -n "$PKG_CONFIG"; then
-! if test -n "$ZZIP_CFLAGS"; then
-! pkg_cv_ZZIP_CFLAGS="$ZZIP_CFLAGS"
-! else
-! if test -n "$PKG_CONFIG" && \
-! { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
-! ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
-! ac_status=$?
-! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-! test $ac_status = 0; }; then
-! pkg_cv_ZZIP_CFLAGS=`$PKG_CONFIG --cflags "zziplib >= 0.10.75" 2>/dev/null`
-! else
-! pkg_failed=yes
-! fi
-! fi
-! else
-! pkg_failed=untried
-! fi
-! if test -n "$PKG_CONFIG"; then
-! if test -n "$ZZIP_LIBS"; then
-! pkg_cv_ZZIP_LIBS="$ZZIP_LIBS"
-! else
-! if test -n "$PKG_CONFIG" && \
-! { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zziplib >= 0.10.75\""; } >&5
-! ($PKG_CONFIG --exists --print-errors "zziplib >= 0.10.75") 2>&5
-! ac_status=$?
-! $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-! test $ac_status = 0; }; then
-! pkg_cv_ZZIP_LIBS=`$PKG_CONFIG --libs "zziplib >= 0.10.75" 2>/dev/null`
-! else
-! pkg_failed=yes
-! fi
-! fi
-! else
-! pkg_failed=untried
-! fi
-!
-!
-!
-! if test $pkg_failed = yes; then
-!
-! if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-! _pkg_short_errors_supported=yes
-! else
-! _pkg_short_errors_supported=no
-! fi
-! if test $_pkg_short_errors_supported = yes; then
-! ZZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
-! else
-! ZZIP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zziplib >= 0.10.75"`
-! fi
-! # Put the nasty error message in config.log where it belongs
-! echo "$ZZIP_PKG_ERRORS" >&5
-!
-! as_fn_error "Package requirements (zziplib >= 0.10.75) were not met:
-!
-! $ZZIP_PKG_ERRORS
-!
-! Consider adjusting the PKG_CONFIG_PATH environment variable if you
-! installed software in a non-standard prefix.
-!
-! Alternatively, you may set the environment variables ZZIP_CFLAGS
-! and ZZIP_LIBS to avoid the need to call pkg-config.
-! See the pkg-config man page for more details.
-! " "$LINENO" 5
-! elif test $pkg_failed = untried; then
-! { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-! as_fn_error "The pkg-config script could not be found or is too old. Make sure it
-! is in your PATH or set the PKG_CONFIG environment variable to the full
-! path to pkg-config.
-!
-! Alternatively, you may set the environment variables ZZIP_CFLAGS
-! and ZZIP_LIBS to avoid the need to call pkg-config.
-! See the pkg-config man page for more details.
-!
-! To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-! See \`config.log' for more details." "$LINENO" 5; }
-! else
-! ZZIP_CFLAGS=$pkg_cv_ZZIP_CFLAGS
-! ZZIP_LIBS=$pkg_cv_ZZIP_LIBS
-! { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-! $as_echo "yes" >&6; }
-! :
-! fi
-
- SDL_VERSION=1.2.0
-
---- 5304,5310 ----
- fi
-
- #AC_CHECK_LIB(zzip, zzip_file_open,,AC_MSG_ERROR("Cannot find -lzzip"))
-! #PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.10.75])
-
- SDL_VERSION=1.2.0
-
diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD
index a4673ea18..f54209b0f 100644
--- a/community/minetest/PKGBUILD
+++ b/community/minetest/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 92558 2013-06-08 12:13:58Z lcarlier $
+# $Id: PKGBUILD 101392 2013-11-24 18:49:30Z lcarlier $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
# Contributor: Konsta Kokkinen <kray@tsundere.fi>
pkgname=minetest
-pkgver=0.4.7
+pkgver=0.4.8
pkgrel=1
pkgdesc='An Infiniminer/Minecraft inspired game'
arch=('i686' 'x86_64')
url='http://minetest.net/'
license=('GPL')
-depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'hicolor-icon-theme')
-makedepends=('cmake' 'irrlicht' 'mesa')
+depends=('sqlite' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'irrlicht' 'hicolor-icon-theme')
+makedepends=('cmake')
install=minetest.install
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver})
-md5sums=('232b87ef5c4300ddad7bc883f8f1a1c5'
- '30a9965667470ebc785979de665d4df4')
+md5sums=('90dd6a3c2c587a3e55df59ba4458cd65'
+ 'df88f4a28ad10e9ab8c445bd28a504e2')
build() {
cd "$srcdir"/minetest-minetest-*
diff --git a/community/mingw-w64-binutils/PKGBUILD b/community/mingw-w64-binutils/PKGBUILD
new file mode 100644
index 000000000..469ced17d
--- /dev/null
+++ b/community/mingw-w64-binutils/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 101172 2013-11-18 17:41:58Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+
+_targets="i686-w64-mingw32 x86_64-w64-mingw32"
+
+pkgname=mingw-w64-binutils
+pkgver=2.23.2
+pkgrel=2
+pkgdesc="Cross binutils for the MinGW-w64 cross-compiler"
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/binutils"
+license=('GPL')
+groups=('mingw-w64-toolchain' 'mingw-w64')
+depends=('zlib')
+options=('!libtool' '!emptydirs')
+source=("http://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz"
+ "binutils-2.23.2-texinfo-5.0.patch.txt")
+md5sums=('cda9dcc08c86ff2fd3f27e4adb250f6f'
+ '34e439ce23213a91e2af872dfbb5094c')
+
+prepare() {
+ cd ${srcdir}/binutils-${pkgver}
+ # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
+ # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
+ patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch.txt
+
+ #do not install libiberty
+ sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+ # hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
+}
+
+build() {
+ for _target in $_targets; do
+ msg "Building ${_target} cross binutils"
+ mkdir -p ${srcdir}/binutils-${_target} && cd "${srcdir}/binutils-${_target}"
+ $srcdir/binutils-${pkgver}/configure --prefix=/usr \
+ --target=${_target} \
+ --infodir=/usr/share/info/${_target} \
+ --enable-lto --enable-plugins \
+ --disable-multilib --disable-nls
+ make
+ done
+}
+
+package() {
+ for _target in ${_targets}; do
+ msg "Installing ${_target} cross binutils"
+ cd ${srcdir}/binutils-${_target}
+ make DESTDIR=${pkgdir} install
+ done
+}
diff --git a/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt b/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt
new file mode 100644
index 000000000..38dc19fb0
--- /dev/null
+++ b/community/mingw-w64-binutils/binutils-2.23.2-texinfo-5.0.patch.txt
@@ -0,0 +1,162 @@
+diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
+index 45ffa73..3aa3300 100644
+--- a/bfd/doc/bfd.texinfo
++++ b/bfd/doc/bfd.texinfo
+@@ -322,7 +324,7 @@ All of BFD lives in one directory.
+ @printindex cp
+
+ @tex
+-% I think something like @colophon should be in texinfo. In the
++% I think something like @@colophon should be in texinfo. In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -333,7 +335,7 @@ All of BFD lives in one directory.
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+
+ @bye
+diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi
+index 56a0510..fb1802b 100644
+--- a/binutils/doc/binutils.texi
++++ b/binutils/doc/binutils.texi
+@@ -148,18 +148,18 @@ in the section entitled ``GNU Free Documentation License''.
+ * objcopy:: Copy and translate object files
+ * objdump:: Display information from object files
+ * ranlib:: Generate index to archive contents
+-* readelf:: Display the contents of ELF format files
+ * size:: List section sizes and total size
+ * strings:: List printable strings from files
+ * strip:: Discard symbols
+-* elfedit:: Update the ELF header of ELF files
+ * c++filt:: Filter to demangle encoded C++ symbols
+ * cxxfilt: c++filt. MS-DOS name for c++filt
+ * addr2line:: Convert addresses to file and line
+ * nlmconv:: Converts object code into an NLM
+-* windres:: Manipulate Windows resources
+ * windmc:: Generator for Windows message resources
++* windres:: Manipulate Windows resources
+ * dlltool:: Create files needed to build and use DLLs
++* readelf:: Display the contents of ELF format files
++* elfedit:: Update the ELF header of ELF files
+ * Common Options:: Command-line options for all utilities
+ * Selecting the Target System:: How these utilities determine the target
+ * Reporting Bugs:: Reporting Bugs
+@@ -2907,7 +2907,7 @@ the Info entries for @file{binutils}.
+ @c man end
+ @end ignore
+
+-@node c++filt, addr2line, elfedit, Top
++@node c++filt, addr2line, strip, Top
+ @chapter c++filt
+
+ @kindex c++filt
+@@ -4384,7 +4384,7 @@ equivalent. At least one of the @option{--output-mach},
+
+ @table @env
+
+-@itemx --input-mach=@var{machine}
++@item --input-mach=@var{machine}
+ Set the matching input ELF machine type to @var{machine}. If
+ @option{--input-mach} isn't specified, it will match any ELF
+ machine types.
+@@ -4392,21 +4392,21 @@ machine types.
+ The supported ELF machine types are, @var{L1OM}, @var{K1OM} and
+ @var{x86-64}.
+
+-@itemx --output-mach=@var{machine}
++@item --output-mach=@var{machine}
+ Change the ELF machine type in the ELF header to @var{machine}. The
+ supported ELF machine types are the same as @option{--input-mach}.
+
+-@itemx --input-type=@var{type}
++@item --input-type=@var{type}
+ Set the matching input ELF file type to @var{type}. If
+ @option{--input-type} isn't specified, it will match any ELF file types.
+
+ The supported ELF file types are, @var{rel}, @var{exec} and @var{dyn}.
+
+-@itemx --output-type=@var{type}
++@item --output-type=@var{type}
+ Change the ELF file type in the ELF header to @var{type}. The
+ supported ELF types are the same as @option{--input-type}.
+
+-@itemx --input-osabi=@var{osabi}
++@item --input-osabi=@var{osabi}
+ Set the matching input ELF file OSABI to @var{osabi}. If
+ @option{--input-osabi} isn't specified, it will match any ELF OSABIs.
+
+@@ -4416,7 +4416,7 @@ The supported ELF OSABIs are, @var{none}, @var{HPUX}, @var{NetBSD},
+ @var{FreeBSD}, @var{TRU64}, @var{Modesto}, @var{OpenBSD}, @var{OpenVMS},
+ @var{NSK}, @var{AROS} and @var{FenixOS}.
+
+-@itemx --output-osabi=@var{osabi}
++@item --output-osabi=@var{osabi}
+ Change the ELF OSABI in the ELF header to @var{osabi}. The
+ supported ELF OSABI are the same as @option{--input-osabi}.
+
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index c7ae2a5..4777ad5 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -142,12 +144,12 @@ in the section entitled ``GNU Free Documentation License''.
+ @ifset ARM
+ * ARM:: ld and the ARM family
+ @end ifset
+-@ifset HPPA
+-* HPPA ELF32:: ld and HPPA 32-bit ELF
+-@end ifset
+ @ifset M68HC11
+ * M68HC11/68HC12:: ld and the Motorola 68HC11 and 68HC12 families
+ @end ifset
++@ifset HPPA
++* HPPA ELF32:: ld and HPPA 32-bit ELF
++@end ifset
+ @ifset M68K
+ * M68K:: ld and Motorola 68K family
+ @end ifset
+@@ -6012,6 +6014,9 @@ functionality are not listed.
+ @ifset I960
+ * i960:: @command{ld} and the Intel 960 family
+ @end ifset
++@ifset M68HC11
++* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
++@end ifset
+ @ifset ARM
+ * ARM:: @command{ld} and the ARM family
+ @end ifset
+@@ -6027,9 +6032,6 @@ functionality are not listed.
+ @ifset MSP430
+ * MSP430:: @command{ld} and MSP430
+ @end ifset
+-@ifset M68HC11
+-* M68HC11/68HC12:: @code{ld} and the Motorola 68HC11 and 68HC12 families
+-@end ifset
+ @ifset POWERPC
+ * PowerPC ELF32:: @command{ld} and PowerPC 32-bit ELF Support
+ @end ifset
+@@ -7877,7 +7879,7 @@ If you have more than one @code{SECT} statement for the same
+ @printindex cp
+
+ @tex
+-% I think something like @colophon should be in texinfo. In the
++% I think something like @@colophon should be in texinfo. In the
+ % meantime:
+ \long\def\colophon{\hbox to0pt{}\vfill
+ \centerline{The body of this manual is set in}
+@@ -7888,7 +7890,7 @@ If you have more than one @code{SECT} statement for the same
+ \centerline{{\sl\fontname\tensl\/}}
+ \centerline{are used for emphasis.}\vfill}
+ \page\colophon
+-% Blame: doc@cygnus.com, 28mar91.
++% Blame: doc@@cygnus.com, 28mar91.
+ @end tex
+
+ @bye
+--
+1.7.1
+
diff --git a/community/mingw-w64-gcc-base/PKGBUILD b/community/mingw-w64-gcc-base/PKGBUILD
new file mode 100644
index 000000000..d1d33407e
--- /dev/null
+++ b/community/mingw-w64-gcc-base/PKGBUILD
@@ -0,0 +1,61 @@
+# $Id: PKGBUILD 101177 2013-11-18 17:42:31Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+
+_targets="i686-w64-mingw32 x86_64-w64-mingw32"
+
+pkgname=mingw-w64-gcc-base
+pkgver=4.8.2
+pkgrel=2
+pkgdesc="Cross GCC for the MinGW-w64 cross-compiler (bootstrap)"
+arch=('i686' 'x86_64')
+url="http://gcc.gnu.org"
+license=('GPL' 'LGPL' 'FDL' 'custom')
+groups=('mingw-w64-bootstrap' 'mingw-w64')
+depends=('zlib' 'libmpc' 'ppl' 'cloog' 'mingw-w64-binutils' 'mingw-w64-headers' 'mingw-w64-headers-bootstrap')
+conflicts=('mingw-w64-gcc')
+options=('staticlibs' '!emptydirs')
+source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2)
+md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d')
+
+prepare() {
+ cd ${srcdir}/gcc-${pkgver}
+
+ #do not install libiberty
+ sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+ # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+}
+
+build() {
+ for _target in ${_targets}; do
+ msg "Building ${_target} GCC C compiler"
+ mkdir -p ${srcdir}/gcc-build-${_target} && cd ${srcdir}/gcc-build-${_target}
+
+ ${srcdir}/gcc-${pkgver}/configure --prefix=/usr \
+ --target=${_target} \
+ --enable-languages=c,lto \
+ --enable-shared --enable-static \
+ --enable-threads=win32 \
+ --with-system-zlib --enable-cloog-backend=isl \
+ --disable-cloog-version-check --disable-isl-version-check \
+ --enable-lto --disable-dw2-exceptions --enable-libgomp \
+ --disable-nls --enable-version-specific-runtime-libs \
+ --disable-multilib --enable-checking=release
+ make all-gcc
+ done
+}
+
+package() {
+ for _target in ${_targets}; do
+ msg "Installing ${_target} GCC C compiler"
+ cd ${srcdir}/gcc-build-${_target}
+ make DESTDIR=${pkgdir} install-gcc
+ strip ${pkgdir}/usr/bin/${_target}-*
+ strip ${pkgdir}/usr/libexec/gcc/${_target}/${pkgver}/{cc1,collect2,lto*}
+ done
+ # remove unnecessary files
+ msg "Removing man and info pages"
+ rm -r ${pkgdir}/usr/share/man
+ rm -r ${pkgdir}/usr/share/info
+}
diff --git a/community/mingw-w64-gcc/PKGBUILD b/community/mingw-w64-gcc/PKGBUILD
new file mode 100644
index 000000000..999fc9584
--- /dev/null
+++ b/community/mingw-w64-gcc/PKGBUILD
@@ -0,0 +1,74 @@
+# $Id: PKGBUILD 101210 2013-11-19 19:03:58Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: rubenvb vanboxem <dottie> ruben <attie> gmail <dottie> com
+
+_targets="i686-w64-mingw32 x86_64-w64-mingw32"
+
+pkgname=mingw-w64-gcc
+pkgver=4.8.2
+pkgrel=4
+pkgdesc="Cross GCC for the MinGW-w64 cross-compiler"
+arch=('i686' 'x86_64')
+url="http://gcc.gnu.org"
+license=('GPL' 'LGPL' 'FDL' 'custom')
+groups=('mingw-w64-toolchain' 'mingw-w64')
+depends=('zlib' 'libmpc' 'ppl' 'cloog' 'mingw-w64-crt' 'mingw-w64-binutils' 'mingw-w64-winpthreads' 'mingw-w64-headers' 'mingw-w64-headers-bootstrap')
+makedepends=("gcc-ada=${pkgver}" 'mingw-w64-gcc-base')
+#checkdepends=('dejagnu') # Windows executables could run on Arch through bin_mft and Wine
+optdepends=()
+provides=('mingw-w64-gcc-base')
+conflicts=('mingw-w64-gcc-base')
+replaces=()
+backup=()
+options=('!strip' 'staticlibs' '!emptydirs' '!buildflags')
+source=("ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2"
+ 'gcc-make-xmmintrin-header-cplusplus-compatible.patch')
+md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d'
+ 'da6c9ba6baebe1286f3219d4181cdbb8')
+
+prepare() {
+ cd ${srcdir}/gcc-${pkgver}
+
+ #do not install libiberty
+ sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
+ # hack! - some configure tests for header files using "$CPP $CPPFLAGS"
+ sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure
+
+ # The file xmmintrin.h doesn't contain an extern "C" part
+ # This conflicts with mingw-w64 intrin.h and results in build
+ # failure like this one in mingw-w64-qt5-qtbase:
+ # /usr/lib/gcc/i686-w64-mingw32/4.8.0/include/xmmintrin.h:997:1: error: previous declaration of 'int _m_pextrw(__m64, int)' with 'C++' linkage
+ # /usr/i686-w64-mingw32/include/intrin.h:561:28: error: conflicts with new declaration with 'C' linkage
+ patch -p0 -i ${srcdir}/gcc-make-xmmintrin-header-cplusplus-compatible.patch
+}
+
+build() {
+ for _target in ${_targets}; do
+ mkdir -p ${srcdir}/gcc-build-${_target} && cd ${srcdir}/gcc-build-${_target}
+
+ ${srcdir}/gcc-${pkgver}/configure --prefix=/usr \
+ --target=${_target} \
+ --enable-languages=c,lto,c++,objc,obj-c++,fortran,ada \
+ --enable-shared --enable-static \
+ --enable-threads=posix --enable-fully-dynamic-string --enable-libstdcxx-time=yes \
+ --with-system-zlib --enable-cloog-backend=isl \
+ --disable-cloog-version-check --disable-isl-version-check \
+ --enable-lto --disable-dw2-exceptions --enable-libgomp \
+ --disable-multilib --enable-checking=release
+ make all
+ done
+}
+
+package() {
+ for _target in ${_targets}; do
+ cd ${srcdir}/gcc-build-${_target}
+ make DESTDIR=${pkgdir} install
+ ${_target}-strip ${pkgdir}/usr/${_target}/lib/*.dll
+ strip ${pkgdir}/usr/bin/${_target}-*
+ strip ${pkgdir}/usr/libexec/gcc/${_target}/${pkgver}/{cc1*,collect2,gnat1,f951,lto*}
+ ln -s ${_target}-gcc $pkgdir/usr/bin/${_target}-cc
+ done
+ strip ${pkgdir}/usr/bin/*
+ # remove unnecessary files
+ rm -r ${pkgdir}/usr/share
+}
diff --git a/community/mingw-w64-gcc/gcc-make-xmmintrin-header-cplusplus-compatible.patch b/community/mingw-w64-gcc/gcc-make-xmmintrin-header-cplusplus-compatible.patch
new file mode 100644
index 000000000..c5ca43209
--- /dev/null
+++ b/community/mingw-w64-gcc/gcc-make-xmmintrin-header-cplusplus-compatible.patch
@@ -0,0 +1,24 @@
+--- gcc/config/i386/xmmintrin.h.orig 2013-01-18 14:57:27.762645582 +0100
++++ gcc/config/i386/xmmintrin.h 2013-01-18 14:58:27.604561940 +0100
+@@ -37,6 +37,10 @@
+ /* Get _mm_malloc () and _mm_free (). */
+ #include <mm_malloc.h>
+
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ /* The Intel API is flexible enough that we must allow aliasing with other
+ vector types, and their scalar components. */
+ typedef float __m128 __attribute__ ((__vector_size__ (16), __may_alias__));
+@@ -1241,6 +1245,10 @@
+ (row3) = __builtin_ia32_movhlps (__t3, __t2); \
+ } while (0)
+
++#ifdef __cplusplus
++}
++#endif
++
+ /* For backward source compatibility. */
+ #ifdef __SSE2__
+ # include <emmintrin.h>
diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD
deleted file mode 100644
index 2e29dbaa5..000000000
--- a/community/mingw32-binutils/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 83337 2013-01-29 19:58:19Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Ondrej Jirman <megous@megous.com>
-# Contributor: mosra <mosra@centrum.cz>
-
-pkgname=mingw32-binutils
-pkgver=2.23.1
-pkgrel=3
-_uprel=1
-arch=(i686 x86_64 'mips64el')
-url="https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/"
-pkgdesc="A set of programs to assemble and manipulate binary and object files (mingw)"
-depends=('glibc' 'zlib')
-license=(GPL)
-source=("https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma"
- "260cd952.patch::http://sourceware.org/git/?p=binutils.git;a=patch;h=260cd95271cdf002ed8e419898fd29c42e257841")
-md5sums=('5d76604f545b151230d1c86e1b8cfab3'
- 'ad86b2b889424fd1a3b07e7c54ecf646')
-
-build() {
- [ $NOEXTRACT -eq 1 ] || tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma
- [ $NOEXTRACT -eq 1 ] || tar xjf binutils-$pkgver-${_uprel}-mingw32-src/binutils-$pkgver.tar.bz2
-
- cd $srcdir/binutils-$pkgver
- patch -Np1 <$srcdir/260cd952.patch || true
- ./configure \
- --target=i486-mingw32 \
- --host=$CHOST \
- --build=$CHOST \
- --prefix=/usr \
- --disable-nls \
- --enable-shared
- make
- make install DESTDIR=$pkgdir
- rm -rf $pkgdir/usr/lib
- rm -rf $pkgdir/usr/share/{info,man}
-}
diff --git a/community/mingw32-gcc-base/PKGBUILD b/community/mingw32-gcc-base/PKGBUILD
deleted file mode 100644
index 73f13fce9..000000000
--- a/community/mingw32-gcc-base/PKGBUILD
+++ /dev/null
@@ -1,80 +0,0 @@
-# $Id: PKGBUILD 79594 2012-11-08 15:25:54Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Ondrej Jirman <megous@megous.com>
-
-pkgname=mingw32-gcc-base
-pkgver=4.7.2
-_w32apiver=3.17
-_runtimever=3.20
-_uprel=1
-_upw32rel=1
-pkgrel=1
-arch=(i686 x86_64)
-pkgdesc="A C cross-compiler for building Windows executables on Linux"
-depends=(mingw32-binutils)
-makedepends=(p7zip mingw32-runtime mingw32-w32api)
-conflicts=(mingw32-gcc)
-options=(!strip)
-license=(GPL LGPL)
-url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/"
-source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma
- http://downloads.sourceforge.net/project/mingw/MinGW/Base/w32api/w32api-${_w32apiver}/w32api-${_w32apiver}-${_upw32rel}-mingw32-src.tar.lzma
- http://downloads.sourceforge.net/project/mingw/MinGW/Base/mingw-rt/mingwrt-${_runtimever}/mingwrt-${_runtimever}-mingw32-src.tar.gz
- gcc-1-mingw-float.patch)
-md5sums=('bc2d1828dd6c53683600545ca6a901e1'
- '89e5800096aa334009f98e7c1743d825'
- '26c0886cc60729b94956cc6d81cd076c'
- '2407123c35c0aa92ee5ffc27decca9a7')
-
-build()
-{
- if [ $NOEXTRACT -ne 1 ]; then
- # prepare headers
- mkdir -p $srcdir/mingw/include/
- cp -r $srcdir/w32api-${_w32apiver}-${_upw32rel}-mingw32/include/* \
- $srcdir/mingwrt-${_runtimever}-mingw32/include/* \
- $srcdir/mingw/include/
-
- unset CFLAGS CXXFLAGS
-
-# tar xJf gcc-$pkgver-${_uprel}-mingw32-src.tar.xz
- cd $srcdir
- tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2
-
- patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch
-
- mkdir -p $srcdir/build
- cd $srcdir/build
-
- chmod ugo+x $srcdir/gcc-$pkgver/configure
- chmod ugo+x $srcdir/gcc-$pkgver/move-if-change
-
- $srcdir/gcc-$pkgver/configure \
- --target=i486-mingw32 \
- --host=$CHOST \
- --build=$CHOST \
- --prefix=/usr \
- --enable-languages=c \
- --enable-sjlj-exceptions \
- --enable-hash-synchronization \
- --disable-nls \
- --disable-shared \
- --disable-libssp \
- --disable-libgomp \
- --with-build-sysroot=$srcdir \
- --with-headers=$srcdir/include
- else
- cd $srcdir/build
- fi
-
- make
- make install DESTDIR=$pkgdir
-
- cd $pkgdir
- rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \
- usr/{include,lib/libiberty.a} usr/i486-mingw32 \
- usr/share/{info,man} usr/i486-mingw32
- strip usr/bin/*
- strip usr/libexec/gcc/i486-mingw32/$pkgver/{cc1*,collect2}
- i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a
-}
diff --git a/community/mingw32-gcc-base/gcc-1-mingw-float.patch b/community/mingw32-gcc-base/gcc-1-mingw-float.patch
deleted file mode 100644
index 365949ad7..000000000
--- a/community/mingw32-gcc-base/gcc-1-mingw-float.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
-http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435
-
-diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h
---- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200
-+++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200
-@@ -275,3 +275,7 @@
- #endif /* __STDC_WANT_DEC_FP__ */
-
- #endif /* _FLOAT_H___ */
-+
-+#ifdef __MINGW32__
-+#include_next<float.h>
-+#endif
diff --git a/community/mingw32-gcc/PKGBUILD b/community/mingw32-gcc/PKGBUILD
deleted file mode 100644
index b3c07a59b..000000000
--- a/community/mingw32-gcc/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 79591 2012-11-08 15:24:17Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Ondrej Jirman <megous@megous.com>
-
-pkgname=mingw32-gcc
-pkgver=4.7.2
-pkgrel=1
-_uprel=1
-arch=(i686 x86_64 mips64el)
-pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux"
-depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api'
- 'libmpc' 'elfutils' 'gmp')
-replaces=('mingw32-gcc-base')
-provides=('mingw32-gcc-base')
-options=(!strip)
-url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/"
-license=(GPL LGPL)
-source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma
- gcc-1-mingw-float.patch)
-md5sums=('bc2d1828dd6c53683600545ca6a901e1'
- '2407123c35c0aa92ee5ffc27decca9a7')
-
-build()
-{
- [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2
-
- patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch
-
- mkdir -p $srcdir/build
- cd $srcdir/build
-
- unset CFLAGS CXXFLAGS
-
- chmod ugo+x $srcdir/gcc-$pkgver/configure
- chmod ugo+x $srcdir/gcc-$pkgver/move-if-change
-
- msg "gcc"
- [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \
- --target=i486-mingw32 \
- --host=$CHOST \
- --build=$CHOST \
- --prefix=/usr \
- --libexecdir=/usr/lib \
- --with-bugurl=https://bugs.parabolagnulinux.org/ \
- --enable-languages=c,c++ \
- --enable-shared \
- --enable-sjlj-exceptions \
- --enable-hash-synchronization \
- --disable-nls \
- --disable-libssp \
- --enable-libgomp
-
- make
- make install DESTDIR=$pkgdir
-
- msg "libgcc"
- make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install
-
- msg "libstdc++"
- make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install
-
- msg "fixes"
- cd $pkgdir/usr/i486-mingw32/lib
- mkdir -p $pkgdir/usr/i486-mingw32/bin/
- for i in `ls -1 *.dll`; do
- ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i
- done
-
- cd $pkgdir
- rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \
- usr/{include,lib/libiberty.a} \
- usr/share/{info,man} \
- usr/share/gcc-$pkgver/python
-
- strip usr/bin/*
- strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2}
- i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a
-}
diff --git a/community/mingw32-gcc/gcc-1-mingw-float.patch b/community/mingw32-gcc/gcc-1-mingw-float.patch
deleted file mode 100644
index 365949ad7..000000000
--- a/community/mingw32-gcc/gcc-1-mingw-float.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html
-http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435
-
-diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h
---- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200
-+++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200
-@@ -275,3 +275,7 @@
- #endif /* __STDC_WANT_DEC_FP__ */
-
- #endif /* _FLOAT_H___ */
-+
-+#ifdef __MINGW32__
-+#include_next<float.h>
-+#endif
diff --git a/community/mingw32-pthreads/PKGBUILD b/community/mingw32-pthreads/PKGBUILD
deleted file mode 100644
index 11f1be71a..000000000
--- a/community/mingw32-pthreads/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 73530 2012-07-09 08:46:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Marcel Schneider marcelATcoopmastersDOTde
-
-pkgname=mingw32-pthreads
-pkgver=2.9.1
-pkgrel=1
-arch=(i686 x86_64 mips64el)
-pkgdesc="The POSIX 1003.1-2001 standard for writing multithreaded applications."
-license=(LGPL)
-makedepends=('mingw32-gcc-base' 'mingw32-runtime' 'mingw32-w32api')
-url="http://sourceware.org/pthreads-win32/"
-options=(!strip)
-source=(ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${pkgver//./-}-release.tar.gz)
-md5sums=('36ba827d6aa0fa9f9ae740a35626e2e3')
-
-build() {
- cd $srcdir/pthreads-w32-${pkgver//./-}-release
- make CROSS=i486-mingw32- clean GC
-}
-
-package() {
- cd $srcdir/pthreads-w32-${pkgver//./-}-release
- mkdir $pkgdir/usr
- mkdir $pkgdir/usr/i486-mingw32
- mkdir $pkgdir/usr/i486-mingw32/include
- mkdir $pkgdir/usr/i486-mingw32/lib
- install $srcdir/pthreads-w32-${pkgver//./-}-release/pthread.h $pkgdir/usr/i486-mingw32/include/pthread.h
- install $srcdir/pthreads-w32-${pkgver//./-}-release/sched.h $pkgdir/usr/i486-mingw32/include/sched.h
- install $srcdir/pthreads-w32-${pkgver//./-}-release/semaphore.h $pkgdir/usr/i486-mingw32/include/semaphore.h
- install $srcdir/pthreads-w32-${pkgver//./-}-release/libpthreadGC2.a $pkgdir/usr/i486-mingw32/lib/libpthread.a
- install $srcdir/pthreads-w32-${pkgver//./-}-release/pthreadGC2.dll $pkgdir/usr/i486-mingw32/lib/
-}
diff --git a/extra/minicom/PKGBUILD b/community/minicom/PKGBUILD
index 425852d48..2b8e06a05 100644
--- a/extra/minicom/PKGBUILD
+++ b/community/minicom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179491 2013-03-05 16:42:11Z giovanni $
+# $Id: PKGBUILD 102303 2013-12-07 19:40:29Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
pkgname=minicom
pkgver=2.6.2
-pkgrel=1
+pkgrel=2
pkgdesc="A serial communication program"
arch=('i686' 'x86_64' 'mips64el')
url="http://alioth.debian.org/projects/minicom/"
@@ -14,7 +14,7 @@ license=('GPL')
depends=('bash')
optdepends=('lrzsz: for xmodem, ymodem and zmodem file transfer protocols')
backup=('etc/minirc.dfl')
-source=("http://alioth.debian.org/frs/download.php/3869/${pkgname}-${pkgver}.tar.gz")
+source=("https://alioth.debian.org/frs/download.php/file/3869/${pkgname}-${pkgver}.tar.gz")
md5sums=('203c56c4b447f45e2301b0cc4e83da3c')
build() {
diff --git a/community/minidlna/PKGBUILD b/community/minidlna/PKGBUILD
index fdd66999c..e6a3f32fe 100644
--- a/community/minidlna/PKGBUILD
+++ b/community/minidlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94892 2013-08-01 06:55:08Z bpiotrowski $
+# $Id: PKGBUILD 101843 2013-12-02 10:48:01Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer:Biginoz < biginoz AT free point fr>
# Contributor: Ignacio Galmarino <igalmarino@gmail.com>
@@ -6,8 +6,8 @@
# Contributor: Kamil Kaminski <kyle@kkaminsk.com>
pkgname=minidlna
-pkgver=1.1.0
-pkgrel=3
+pkgver=1.1.1
+pkgrel=2
pkgdesc="A DLNA/UPnP-AV Media server (aka ReadyDLNA)"
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/minidlna/"
@@ -20,7 +20,7 @@ changelog=changelog
source=(http://downloads.sourceforge.net/project/minidlna/minidlna/$pkgver/minidlna-$pkgver.tar.gz
minidlna.service
minidlna.tmpfiles)
-md5sums=('26484a84af3fceafdee26595aae097f7'
+md5sums=('653405555ac3f8eb4aacc54c1be7b5fa'
'7e3890ee50aa4dfa4d1754261e6cc965'
'26de27b12d6a37c47d9714107d07aac9')
@@ -36,4 +36,6 @@ package() {
install -Dm644 minidlna.conf ${pkgdir}/etc/minidlna.conf
install -Dm0644 $srcdir/minidlna.tmpfiles $pkgdir/usr/lib/tmpfiles.d/minidlna.conf
install -Dm0644 $srcdir/minidlna.service $pkgdir/usr/lib/systemd/system/minidlna.service
+ install -Dm644 $srcdir/$pkgname-$pkgver/minidlna.conf.5 $pkgdir/usr/share/man/man5/minidlna.conf.5
+ install -Dm644 $srcdir/$pkgname-$pkgver/minidlnad.8 $pkgdir/usr/share/man/man8/minidlnad.8
}
diff --git a/community/minidlna/minidlna.install b/community/minidlna/minidlna.install
index c9cdc0f13..0f6951379 100644
--- a/community/minidlna/minidlna.install
+++ b/community/minidlna/minidlna.install
@@ -1,5 +1,7 @@
post_install() {
systemd-tmpfiles --create minidlna.conf
+ touch var/log/minidlna.log
+ chown nobody:nobody var/log/minidlna.log
}
post_upgrade() {
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index 65e91383f..66ca7bc61 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100481 2013-11-05 02:40:41Z fyan $
+# $Id: PKGBUILD 102260 2013-12-07 10:36:45Z bpiotrowski $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
pkgname=mongodb
pkgver=2.4.8
-pkgrel=1
+pkgrel=2
pkgdesc='A high-performance, open source, schema-free document-oriented database'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.mongodb.org'
diff --git a/community/mosh/PKGBUILD b/community/mosh/PKGBUILD
index 9b4aaf29e..c99089c94 100644
--- a/community/mosh/PKGBUILD
+++ b/community/mosh/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=mosh
pkgver=1.2.4
-pkgrel=1
+pkgrel=2
pkgdesc='Mobile shell, surviving disconnects with local echo and line editing'
arch=('x86_64' 'i686' 'mips64el')
url='http://mosh.mit.edu/'
@@ -13,11 +13,10 @@ license=('GPL3')
depends=('protobuf' 'ncurses' 'zlib' 'openssh' 'perl' 'perl-io-tty' 'libutempter')
source=("http://$pkgname.mit.edu/$pkgname-$pkgver.tar.gz")
sha256sums=('e74d0d323226046e402dd469a176075fc2013b69b0e67cea49762c957175df46')
-optdepends=('ufw-extras')
options=('!emptydirs')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
./autogen.sh
./configure --prefix=/usr
@@ -25,10 +24,8 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
- install -Dm644 "conf/bash_completion.d/$pkgname" \
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+ install -Dm644 "$pkgname-$pkgver/conf/bash_completion.d/$pkgname" \
"$pkgdir/usr/share/bash-completion/completions/$pkgname"
}
diff --git a/community/mpv/PKGBUILD b/community/mpv/PKGBUILD
index 4ea19c68e..ba55e1e7a 100644
--- a/community/mpv/PKGBUILD
+++ b/community/mpv/PKGBUILD
@@ -1,53 +1,49 @@
-# $Id: PKGBUILD 100387 2013-11-03 11:15:18Z bpiotrowski $
+# $Id: PKGBUILD 103194 2013-12-29 19:04:18Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Eivind Uggedal <eivind@uggedal.com>
pkgname=mpv
-pkgver=0.2.2
+pkgver=0.3.0
pkgrel=1
pkgdesc='Video player based on MPlayer/mplayer2'
arch=('i686' 'x86_64')
license=('GPL')
url='http://mpv.io'
depends=(
- 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libxinerama'
- 'libquvi' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils'
- 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua51'
+ 'portaudio' 'ffmpeg' 'lcms2' 'libdvdread' 'libcdio-paranoia' 'libquvi'
+ 'libxinerama' 'mpg123' 'libxv' 'libxkbcommon' 'libva' 'lirc-utils'
+ 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'lua' 'libdvdnav'
)
-makedepends=('mesa' 'python-docutils')
-options=(!emptydirs)
+makedepends=('mesa' 'python-docutils' 'waf')
+options=('!emptydirs' '!buildflags')
install=mpv.install
source=(https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz)
-md5sums=('632d1ee368fe7355563047bbdcd7b08a')
+md5sums=('47c9ea5fc8cf0c15cc6a15631bfbc770')
build() {
- unset CFLAGS
- unset LDFLAGS
-
cd $pkgname-$pkgver
- ./configure --prefix=/usr \
+ waf configure --prefix=/usr \
--confdir=/etc/mpv \
- --disable-lircc \
- --disable-joystick \
+ --enable-joystick \
+ --enable-wayland \
--disable-radio \
--disable-radio-capture \
--disable-radio-v4l2 \
- --disable-rpath \
--disable-libbs2b \
--disable-direct3d \
--disable-corevideo \
--disable-cocoa \
--disable-coreaudio
- make
+ waf build
}
package() {
cd $pkgname-$pkgver
- make -j1 DESTDIR="$pkgdir" install
+ waf install --destdir="$pkgdir"
install -d "$pkgdir"/usr/share/doc/mpv/examples
- install -m644 etc/{input,example,encoding-example-profiles}.conf \
+ install -m644 etc/{input,example}.conf \
"$pkgdir"/usr/share/doc/mpv/examples
install -m644 DOCS/{encoding.rst,tech-overview.txt} \
"$pkgdir"/usr/share/doc/mpv
diff --git a/community/muffin/PKGBUILD b/community/muffin/PKGBUILD
index 2be9654e6..c8dbe0926 100644
--- a/community/muffin/PKGBUILD
+++ b/community/muffin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99916 2013-10-31 02:27:20Z allan $
+# $Id: PKGBUILD 101571 2013-11-28 01:27:47Z faidoc $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
# Contributor: Adam Hani Schakaki <adam@schakaki.net>
# Contributor: Ner0
pkgname=muffin
-pkgver=2.0.3
+pkgver=2.0.5
pkgrel=1
pkgdesc="Cinnamon window manager based on Mutter"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('intltool' 'gnome-doc-utils' 'gnome-common')
options=('!emptydirs')
install=$pkgname.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/muffin/archive/$pkgver.tar.gz")
-sha256sums=('5d3f3916dce25f1e4398b28452688db540800eec379cf8891a925d4d56322b8c')
+sha256sums=('81a57d452ea88ea926b284248033f021960400b3b9d13f5a334a77cf3bd4c7ee')
build() {
cd ${pkgname}-${pkgver}
diff --git a/community/multitail/PKGBUILD b/community/multitail/PKGBUILD
index 7225827ae..e286de8e6 100644
--- a/community/multitail/PKGBUILD
+++ b/community/multitail/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92994 2013-06-21 13:00:51Z kkeen $
+# $Id: PKGBUILD 101979 2013-12-03 09:00:37Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Kevin Piche <kevin@archlinux.org>
# Contributor: Roberto Carvajal <roberto@archlinux.org>
pkgname=multitail
-pkgver=5.2.13
+pkgver=6.0
pkgrel=1
pkgdesc="Lets you view one or multiple files like the original tail program"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +13,12 @@ url="http://www.vanheusden.com/multitail"
depends=('ncurses')
backup=('etc/multitail.conf')
source=("${url}/${pkgname}-${pkgver}.tgz")
-md5sums=('71a774b6d6bb430672c8a9252baac6e6')
+md5sums=('fb8efc547d389257021885fe5402255c')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ sed -i 's|ncursesw/panel.h|panel.h|' mt.h
+ sed -i 's|ncursesw/ncurses.h|ncurses.h|' mt.h
make
}
diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD
index 016e0deba..82029c433 100644
--- a/community/mupen64plus/PKGBUILD
+++ b/community/mupen64plus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94277 2013-07-18 16:50:52Z jelle $
+# $Id: PKGBUILD 102261 2013-12-07 10:36:45Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Laurent Carlier <lordheavym@gmail.com>
@@ -7,7 +7,7 @@
pkgname=mupen64plus
pkgver=2.0
-pkgrel=1
+pkgrel=2
pkgdesc='Nintendo64 Emulator'
arch=('i686' 'x86_64')
url='http://code.google.com/p/mupen64plus/'
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index b937f5ace..1645dc773 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94034 2013-07-13 12:34:24Z svenstaro $
+# $Id: PKGBUILD 102262 2013-12-07 10:36:46Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Andrew Belitsky <belitsky.a@gmail.com>
pkgbase=mygui
pkgname=('mygui' 'mygui-docs')
pkgver=3.2.0
-pkgrel=6
+pkgrel=9
pkgdesc="A multilayer and overlappable GUI System for OGRE"
arch=('i686' 'x86_64' 'mips64el')
url="http://mygui.info/"
@@ -37,25 +37,19 @@ build() {
-DMYGUI_INSTALL_TOOLS=TRUE \
-DMYGUI_INSTALL_DOCS=TRUE \
-DMYGUI_INSTALL_MEDIA=TRUE \
- -DCMAKE_BUILD_TYPE=Release # set=Debug for debugging version
+ -DFREETYPE_INCLUDE_DIR=/usr/include/freetype2/ \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_SHARED_LIBS=TRUE
- # compile
make
-
- # generate docs
- if [[ $(which dot) && $(which doxygen) ]]; then
- make api-docs 2>/dev/null
- fi
+ make api-docs
}
package_mygui() {
optdepends=('mygui-docs: documentation')
- cd $srcdir/MyGUI_$pkgver
+ cd $srcdir/MyGUI_$pkgver/build
- cd build
-
- # install the whole bunch
make DESTDIR="$pkgdir" install
# make demos work
@@ -67,10 +61,8 @@ package_mygui-docs() {
pkgdesc="Documentation for mygui"
depends=()
- cd $srcdir/MyGUI_$pkgver
+ cd $srcdir/MyGUI_$pkgver/build
- cd build
-
# install docs
install -d $pkgdir/usr/share/doc/
cp -r Docs/html $pkgdir/usr/share/doc/MYGUI
diff --git a/community/myodbc/PKGBUILD b/community/myodbc/PKGBUILD
index 84deacad3..c138d9f78 100644
--- a/community/myodbc/PKGBUILD
+++ b/community/myodbc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 94357 2013-07-22 11:20:31Z spupykin $
+# $Id: PKGBUILD 100622 2013-11-06 14:11:22Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=myodbc
-pkgver=5.2.5
+pkgver=5.2.6
pkgrel=1
pkgdesc="ODBC driver/connector for mariadb"
arch=(i686 x86_64 mips64el)
@@ -12,12 +12,16 @@ makedepends=('cmake')
license=('GPL')
options=('libtool')
source=("http://cdn.mysql.com/Downloads/Connector-ODBC/5.2/mysql-connector-odbc-$pkgver-src.tar.gz")
-md5sums=('909e0c3c9c341fe777d0a620c4084442')
+md5sums=('066bfed7dc472ef4b68bafc95ca45027')
build() {
cd $srcdir/mysql-connector-odbc-${pkgver}-src
- unset LDFLAGS
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_UNIXODBC=1 .
+ unset CFLAGS
+ export LDFLAGS="-lpthread -ldl"
+ cmake -G "Unix Makefiles" \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DMYSQLCLIENT_LIB_NAME=libmysqlclient_r.so \
+ -DWITH_UNIXODBC=1 .
make
}
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 880831d93..211d5ae20 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99365 2013-10-27 17:21:57Z jconder $
+# $Id: PKGBUILD 102726 2013-12-17 20:17:14Z bgyorgy $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -14,7 +14,7 @@ pkgname=('mythplugins-mytharchive'
'mythplugins-mythweb'
'mythplugins-mythzoneminder')
pkgver=0.27
-pkgrel=2
+pkgrel=4
epoch=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.mythtv.org"
@@ -23,28 +23,28 @@ makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif'
'libvorbis' 'mesa' 'mesa-libgl' 'mplayer' 'mythtv'
'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
- 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging'
+ 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python2-pillow'
'python2-pycurl' 'zlib')
-source=("mythtv-$pkgver.tar.gz::http://www.mythtv.org/download/mythtv/$pkgver"
- "mythweb-$pkgver.tar.gz::http://www.mythtv.org/download/mythweb/$pkgver"
+source=("mythtv-$pkgver.tar.gz::https://github.com/MythTV/mythtv/archive/v$pkgver.tar.gz"
+ "mythweb-$pkgver.tar.gz::https://github.com/MythTV/mythweb/archive/v$pkgver.tar.gz"
'cdparanoia.patch')
-sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46'
- 'c6574a9d3029e00ef9e2fb4eff33be60804d06c71d517ad8cae27bed9b5275d3'
- '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c')
+sha256sums=('494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0'
+ '7e54d6b388e2e8f3e50515c3fe46113f4217e3989242459a0fa73c928dcca494'
+ '004f1e4734830709d2ab5ebb804560514f2bf525abc2f11142501a81eba0754c')
prepare() {
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase"
find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
patch -Np1 -i "$srcdir/cdparanoia.patch"
- cd "$srcdir/mythweb-fixes-$pkgver"
+ cd "$srcdir/mythweb-$pkgver"
sed -re 's@/usr/local.*/usr/share@/usr/share@' -i 'mythweb.php'
}
build() {
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase"
./configure --prefix=/usr \
--enable-all \
@@ -56,9 +56,9 @@ build() {
package_mythplugins-mytharchive() {
pkgdesc="Create DVDs or archive recorded shows in MythTV"
depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'mythtv'
- 'python-imaging')
+ 'python2-pillow')
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mytharchive"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mytharchive"
make INSTALL_ROOT="$pkgdir" install
}
@@ -66,7 +66,7 @@ package_mythplugins-mythbrowser() {
pkgdesc="Mini web browser for MythTV"
depends=('mythtv')
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythbrowser"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythbrowser"
make INSTALL_ROOT="$pkgdir" install
}
@@ -74,7 +74,7 @@ package_mythplugins-mythgallery() {
pkgdesc="Image gallery plugin for MythTV"
depends=('libexif' 'mythtv')
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgallery"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythgallery"
make INSTALL_ROOT="$pkgdir" install
}
@@ -82,7 +82,7 @@ package_mythplugins-mythgame() {
pkgdesc="Game emulator plugin for MythTV"
depends=('mythtv')
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythgame"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythgame"
make INSTALL_ROOT="$pkgdir" install
}
@@ -90,7 +90,7 @@ package_mythplugins-mythmusic() {
pkgdesc="Music playing plugin for MythTV"
depends=('mythtv' 'libcdio-paranoia')
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythmusic"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythmusic"
make INSTALL_ROOT="$pkgdir" install
}
@@ -98,7 +98,7 @@ package_mythplugins-mythnetvision() {
pkgdesc="MythNetvision plugin for MythTV"
depends=('mythtv' 'python2-oauth')
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnetvision"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythnetvision"
make INSTALL_ROOT="$pkgdir" install
}
@@ -106,7 +106,7 @@ package_mythplugins-mythnews() {
pkgdesc="News checking plugin for MythTV"
depends=('mythtv')
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythnews"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythnews"
make INSTALL_ROOT="$pkgdir" install
}
@@ -116,7 +116,7 @@ package_mythplugins-mythweather() {
'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
'perl-datetime-format-iso8601')
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythweather"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythweather"
make INSTALL_ROOT="$pkgdir" install
}
@@ -128,7 +128,7 @@ package_mythplugins-mythweb() {
install='mythplugins-mythweb.install'
mkdir -p "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
- cp -R "$srcdir/mythweb-fixes-$pkgver"/* "$pkgdir/var/lib/mythtv/mythweb"
+ cp -R "$srcdir/mythweb-$pkgver"/* "$pkgdir/var/lib/mythtv/mythweb"
chown -R http:http "$pkgdir/var/lib/mythtv/mythweb"
chmod g+rw "$pkgdir/var/lib/mythtv/mythweb"/{image_cache,php_sessions}
}
@@ -138,6 +138,6 @@ package_mythplugins-mythzoneminder() {
depends=('mythtv')
install='mythplugins-mythzoneminder.install'
- cd "$srcdir/mythtv-fixes-$pkgver/$pkgbase/mythzoneminder"
+ cd "$srcdir/mythtv-$pkgver/$pkgbase/mythzoneminder"
make INSTALL_ROOT="$pkgdir" install
}
diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD
index 669c837ad..cf58bb1ac 100644
--- a/community/mythtv/PKGBUILD
+++ b/community/mythtv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99201 2013-10-25 13:44:56Z giovanni $
+# $Id: PKGBUILD 102723 2013-12-17 19:52:17Z bgyorgy $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=mythtv
pkgver=0.27
-pkgrel=3
+pkgrel=6
epoch=1
pkgdesc="A Homebrew PVR project"
arch=('i686' 'x86_64')
@@ -22,27 +22,27 @@ optdepends=('glew: for GPU commercial flagging'
'libcec: for consumer electronics control capabilities'
'libxml2: to read blu-ray metadata'
'openssl: for AirTunes (RAOP) support'
+ 'udisks: detect changes to removable media'
'xmltv: to download tv listings')
conflicts=('myththemes' 'mythplugins-mythvideo')
replaces=('myththemes' 'mythplugins-mythvideo')
-backup=()
install='mythtv.install'
-source=("$pkgname-$pkgver.tar.gz::http://www.$pkgname.org/download/$pkgname/$pkgver"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/MythTV/$pkgname/archive/v$pkgver.tar.gz"
'mythbackend.service'
'http://code.mythtv.org/trac/raw-attachment/ticket/11338/libcec-2-support.2.patch')
-sha256sums=('49789de705be73275325b1a4984b727cf8284fdc4ae6b041ad152857c830dc46'
- 'f628f44164ce773ae54d320fb2f65353cacf9deec16981e4e56316ac33000a2f'
+sha256sums=('494ebd7ee384e751c05ee0a1b3dcd3618caf72f1e94810381c09c2b5d1c799f0'
+ 'ecfde779ded8332cc62c86fac6b432b09cbf5d254135798287ada688af9a1302'
'8270407c2074b305e0c32151f89c84f6bf980a32665a2da8e4727405fa3911f3')
prepare() {
- cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname"
+ cd "$srcdir/$pkgname-$pkgver/$pkgname"
find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
patch -Np2 -i "$srcdir/libcec-2-support.2.patch"
}
build() {
- cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname"
+ cd "$srcdir/$pkgname-$pkgver/$pkgname"
ARCH="${CARCH/_/-}"
./configure --prefix=/usr \
@@ -61,7 +61,7 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-fixes-$pkgver/$pkgname"
+ cd "$srcdir/$pkgname-$pkgver/$pkgname"
make INSTALL_ROOT="$pkgdir" install
install -D -m644 "$srcdir/mythbackend.service" "$pkgdir/usr/lib/systemd/system/mythbackend.service"
diff --git a/community/mythtv/mythbackend.service b/community/mythtv/mythbackend.service
index 2a2b8b7db..aa9427ced 100644
--- a/community/mythtv/mythbackend.service
+++ b/community/mythtv/mythbackend.service
@@ -1,5 +1,6 @@
[Unit]
Description=MythTV Backend
+Wants=network-online.target
After=network.target mysqld.service
[Service]
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index 77d77082a..6e98f7a9d 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96567 2013-09-01 12:07:41Z svenstaro $
+# $Id: PKGBUILD 101824 2013-12-02 01:03:13Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Christian Hesse <mail@eworm.de>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Gerhard Brauer <gerbra@archlinux.de>
pkgname=nbd
-pkgver=3.4
+pkgver=3.5
pkgrel=1
pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
backup=('etc/nbd-server/config')
depends=('glib2')
install=nbd.install
-md5sums=('40ce12dfe408288b4eab36103b48fec0'
+md5sums=('d89133bf9b681c17ed9d09a21b19f1ee'
'2d05d426b8c2708d5f8a0d028fcbae05'
'5d1acc143018117174f79eff15afa038')
diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD
index 2dd5819df..0f1f3b8bc 100644
--- a/community/ncmpcpp/PKGBUILD
+++ b/community/ncmpcpp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 80358 2012-11-20 16:00:53Z bpiotrowski $
+# $Id: PKGBUILD 101796 2013-12-01 11:32:10Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski
# Contributor: graysky <graysky AT archlinux DOT us>
# Contributor: Mateusz Herych <heniekk@gmail.com>
@@ -6,7 +6,7 @@
pkgname=ncmpcpp
pkgver=0.5.10
-pkgrel=4
+pkgrel=5
pkgdesc='Almost exact clone of ncmpc with some new features'
arch=('i686' 'x86_64' 'mips64el')
url='http://ncmpcpp.rybczak.net/'
@@ -17,22 +17,22 @@ source=(http://ncmpcpp.rybczak.net/stable/$pkgname-$pkgver.tar.bz2)
md5sums=('298ed66325bcfe358e37e186c7ea4861')
build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr \
- --enable-clock \
- --enable-outputs \
- --enable-unicode \
- --enable-visualizer \
- --with-curl \
- --with-fftw \
- --with-taglib
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr \
+ --enable-clock \
+ --enable-outputs \
+ --enable-unicode \
+ --enable-visualizer \
+ --with-curl \
+ --with-fftw \
+ --with-taglib
make
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
- make -C extras/
- install -Dm755 extras/artist_to_albumartist $pkgdir/usr/bin/
+ make -C extras
+ install -Dm755 extras/artist_to_albumartist "$pkgdir"/usr/bin/
}
diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD
index ccf82a992..e748b77b3 100644
--- a/community/nemo/PKGBUILD
+++ b/community/nemo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100532 2013-11-05 14:18:02Z faidoc $
+# $Id: PKGBUILD 101573 2013-11-28 01:30:36Z faidoc $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
# Contributor: Ner0
pkgname=nemo
-pkgver=2.0.5
+pkgver=2.0.8
pkgrel=1
pkgdesc="Cinnamon file manager (Nautilus fork)"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('gtk-doc' 'gobject-introspection' 'intltool' 'gnome-common')
options=('!emptydirs')
install=nemo.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver")
-sha256sums=('5c737c4ede5f4e000fbfe247d1f86086c885f4b0d0f38790db885bf62ac51fc6')
+sha256sums=('6a40868e46fd2ed6c27e694e76c160996d16e2d27681bf5126e6b0e647c24033')
prepare() {
cd linuxmint-nemo-*
diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD
index dd63f4890..9f0fdc398 100644
--- a/community/nginx/PKGBUILD
+++ b/community/nginx/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 98429 2013-10-10 07:58:09Z seblu $
+# $Id: PKGBUILD 102927 2013-12-24 08:43:25Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Maintainer: Sébastien Luttringer
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl>
pkgname=nginx
-pkgver=1.4.3
-pkgrel=1
+pkgver=1.4.4
+pkgrel=2
pkgdesc='Lightweight HTTP server and IMAP/POP3 proxy server'
arch=('i686' 'x86_64' 'mips64el')
url='http://nginx.org'
@@ -26,7 +26,7 @@ install=install
source=("http://nginx.org/download/nginx-$pkgver.tar.gz"
'service'
'logrotate')
-sha256sums=('ae123885c923a6c3f5bab0a8b7296ef21c4fdf6087834667ebbc16338177de84'
+sha256sums=('7c989a58e5408c9593da0bebcd0e4ffc3d892d1316ba5042ddb0be5b0b4102b9'
'05fdc0c0483410944b988d7f4beabb00bec4a44a41bd13ebc9b78585da7d3f9b'
'272907d3213d69dac3bd6024d6d150caa23cb67d4f121e4171f34ba5581f9e98')
@@ -41,7 +41,7 @@ build() {
--user=http \
--group=http \
--http-log-path=/var/log/nginx/access.log \
- --error-log-path=/var/log/nginx/error.log \
+ --error-log-path=stderr \
--http-client-body-temp-path=/var/lib/nginx/client-body \
--http-proxy-temp-path=/var/lib/nginx/proxy \
--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
diff --git a/community/ngircd/PKGBUILD b/community/ngircd/PKGBUILD
index d67765f04..6b3a21db8 100644
--- a/community/ngircd/PKGBUILD
+++ b/community/ngircd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96762 2013-09-04 10:49:37Z kkeen $
+# $Id: PKGBUILD 101976 2013-12-03 08:19:51Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Alexander Rødseth <rodseth@gmail.com>
pkgname=ngircd
-pkgver=20.3
+pkgver=21
pkgrel=1
pkgdesc="Next Generation IRC Daemon"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ license=('GPL')
depends=('openssl' 'libident')
source=("http://ngircd.barton.de/pub/ngircd/ngircd-$pkgver.tar.gz"
ngircd.service)
-sha256sums=('55d7c74c6df790b11a68c07f39836d581965087efb618d3e9a6bec855364c2f9'
+sha256sums=('0edbd41304186e43f9d907a7017b40520cc90c2ce29b1339bdcd7622fffe19a0'
'f02e30f6864ba1130bcc85bedc44ad782687f572c06f10e0501b0ddcf532b404')
build() {
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 0b41637b6..b03915e39 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98813 2013-10-19 09:02:32Z bpiotrowski $
+# $Id: PKGBUILD 102828 2013-12-21 15:00:24Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
# Contributor: TIanyi Cui <tianyicui@gmail.com>
pkgname=nodejs
-pkgver=0.10.21
+pkgver=0.10.24
pkgrel=1
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ makedepends=('python2')
checkdepends=('curl')
options=('!emptydirs')
source=(http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz)
-sha256sums=('7c125bf22c1756064f2a68310d4822f77c8134ce178b2faa6155671a8124140d')
+sha256sums=('610cd733186842cb7f554336d6851a61b2d3d956050d62e49fa359a47640377a')
prepare() {
cd node-v$pkgver
diff --git a/community/nomacs/PKGBUILD b/community/nomacs/PKGBUILD
index 2d68c1826..ce73fca29 100644
--- a/community/nomacs/PKGBUILD
+++ b/community/nomacs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 98765 2013-10-17 21:51:03Z speps $
+# $Id: PKGBUILD 102808 2013-12-20 19:30:50Z speps $
# Maintainer: speps <speps at aur dot archlinux dot org>
pkgname=nomacs
-pkgver=1.6.0.2
+pkgver=1.6.2
pkgrel=1
pkgdesc="A Qt image viewer"
arch=(i686 x86_64)
@@ -11,19 +11,23 @@ license=('GPL3')
depends=('qt4' 'exiv2' 'libraw' 'opencv')
makedepends=('cmake')
install="$pkgname.install"
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-${pkgver%.*}/$pkgname-$pkgver-source.tar.bz2")
-md5sums=('a5556ca94053eec9539c11454f633316')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver-source.tar.bz2")
+md5sums=('3e8782b7bf792933ba673a2e9340841b')
+
+prepare() {
+ cd $pkgname-$pkgver
+ [ -d b ] || mkdir b
+}
build() {
- cd "$srcdir/$pkgname-$pkgver"
- [ -d bld ] || mkdir bld && cd bld
+ cd $pkgname-$pkgver/b
cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver/bld"
+ cd $pkgname-$pkgver/b
make DESTDIR="$pkgdir/" install
}
diff --git a/community/notion/PKGBUILD b/community/notion/PKGBUILD
index e4922e438..934655ccc 100644
--- a/community/notion/PKGBUILD
+++ b/community/notion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88793 2013-04-22 10:31:24Z spupykin $
+# $Id: PKGBUILD 102889 2013-12-23 13:28:04Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Eugen Zagorodniy e dot zagorodniy at gmail dot com
# Contributor: aunoor
pkgname=notion
-pkgver=20130422
+pkgver=20131223
pkgrel=1
pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
url="http://sourceforge.net/projects/notion/"
@@ -16,15 +16,15 @@ makedepends=('git' 'pkgconfig' 'libxinerama' 'libxrandr'
'rubber' 'latex2html' 'texlive-htmlxml' 'texlive-latexextra')
provides=('libtu' 'libextl')
changelog=ChangleLog
-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")
+source=("notion::git://notion.git.sourceforge.net/gitroot/notion/notion"
+ "$pkgname-libtu::git://notion.git.sourceforge.net/gitroot/notion/libtu"
+ "$pkgname-libextl::git://notion.git.sourceforge.net/gitroot/notion/libextl"
+ "$pkgname-notion-doc::git://notion.git.sourceforge.net/gitroot/notion/notion-doc"
+ "$pkgname-mod_xinerama::git://notion.git.sourceforge.net/gitroot/notion/mod_xinerama"
+ "$pkgname-mod_xkbevents::git://notion.git.sourceforge.net/gitroot/notion/mod_xkbevents"
+ "$pkgname-mod_xrandr::git://notion.git.sourceforge.net/gitroot/notion/mod_xrandr"
+ "$pkgname-mod_notionflux::git://notion.git.sourceforge.net/gitroot/notion/mod_notionflux"
+ "$pkgname-contrib::git://notion.git.sourceforge.net/gitroot/notion/contrib")
md5sums=('SKIP'
'SKIP'
'SKIP'
@@ -35,22 +35,30 @@ md5sums=('SKIP'
'SKIP'
'SKIP')
-build() {
+prepare() {
cd ${srcdir}
+ sed -i 's|lua5.2|lua|g' notion/system-autodetect.mk
+ sed -i 's|luac5.2|luac|g' notion{,-libextl}/system-autodetect.mk
for i in libextl libtu mod_xinerama mod_xkbevents mod_xrandr mod_notionflux notion-doc; do
- cp -r ${srcdir}/$i ${srcdir}/notion/
+ mkdir -p ${srcdir}/notion/$i
+ cp -r ${srcdir}/$pkgname-$i/* ${srcdir}/notion/$i/
done
- # build notion
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/' \
+ -e 's|/usr/local|/usr|g' \
-i system-autodetect.mk
- make INCLUDES=-I${srcdir}/notion
+}
+
+build() {
+ cd ${srcdir}/notion
+
+ # build notion
+ make INCLUDES=-I${srcdir}/notion PREFIX=/usr ETCDIR=/etc/notion
# build doc and modules
for i in mod_xinerama mod_xkbevents mod_xrandr; do
@@ -70,12 +78,12 @@ package() {
for i in mod_xinerama mod_xkbevents mod_xrandr notion-doc; do
(cd $i && make PREFIX=${pkgdir}/usr ETCDIR=${pkgdir}/etc/notion TOPDIR=.. install)
done
- cp ${srcdir}/mod_xinerama/*.lua $pkgdir/etc/notion/
- cp ${srcdir}/mod_xkbevents/*.lua $pkgdir/etc/notion/
+ cp ${srcdir}/notion/mod_xinerama/*.lua $pkgdir/etc/notion/
+ cp ${srcdir}/notion/mod_xkbevents/*.lua $pkgdir/etc/notion/
# contrib
mkdir -p $pkgdir/usr/share/notion/contrib
- cp -a ${srcdir}/contrib/* $pkgdir/usr/share/notion/contrib
+ cp -a ${srcdir}/$pkgname-contrib/* $pkgdir/usr/share/notion/contrib
# license
install -Dm0644 LICENSE ${pkgdir}/usr/share/licenses/notion/LICENSE
diff --git a/community/nss-pam-ldapd/PKGBUILD b/community/nss-pam-ldapd/PKGBUILD
index 57786e88f..cab27a3d3 100644
--- a/community/nss-pam-ldapd/PKGBUILD
+++ b/community/nss-pam-ldapd/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=nss-pam-ldapd
pkgver=0.8.13
-pkgrel=4
+pkgrel=5
pkgdesc='LDAP module for NSS and PAM'
arch=('i686' 'x86_64' 'mips64el')
url="http://arthurdejong.org/$pkgname/"
diff --git a/community/nss-pam-ldapd/nss-pam-ldapd.install b/community/nss-pam-ldapd/nss-pam-ldapd.install
index a8b93f218..e4b0a1f1d 100644
--- a/community/nss-pam-ldapd/nss-pam-ldapd.install
+++ b/community/nss-pam-ldapd/nss-pam-ldapd.install
@@ -1,12 +1,11 @@
post_install() {
- getent passwd nslcd >> /dev/null || useradd -r -M -d /var/run/nslcd -s /bin/false nslcd
+ getent passwd nslcd >> /dev/null || useradd -r -M -U -d /var/run/nslcd -s /bin/false nslcd
}
post_upgrade() {
- getent passwd nslcd >> /dev/null || useradd -r -M -s /bin/false nslcd
+ getent passwd nslcd >> /dev/null || useradd -r -M -U -d /var/run/nslcd -s /bin/false nslcd
}
pre_remove() {
userdel nslcd >/dev/null 2>&1 || true
}
-
diff --git a/community/ntop/PKGBUILD b/community/ntop/PKGBUILD
index bc3713b89..0435fddb8 100644
--- a/community/ntop/PKGBUILD
+++ b/community/ntop/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 99930 2013-10-31 02:32:10Z allan $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=ntop
pkgver=5.0.1
-pkgrel=4
+pkgrel=5
pkgdesc='A network traffic probe that shows the network usage.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.ntop.org/'
diff --git a/extra/obexftp/PKGBUILD b/community/obexftp/PKGBUILD
index 43a9b8842..c70a26780 100644
--- a/extra/obexftp/PKGBUILD
+++ b/community/obexftp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198348 2013-10-30 14:19:17Z allan $
+# $Id: PKGBUILD 102177 2013-12-06 12:11:56Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD
index 83a8cf36a..c5ff14548 100644
--- a/community/ocaml-findlib/PKGBUILD
+++ b/community/ocaml-findlib/PKGBUILD
@@ -5,8 +5,8 @@
# Contributor: scj <scj archlinux us>
pkgname=ocaml-findlib
-pkgver=1.3.3
-pkgrel=2
+pkgver=1.4
+pkgrel=1
license=('MIT')
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='Objective Caml (OCaml) package manager'
@@ -14,7 +14,7 @@ url='http://projects.camlcity.org/projects/findlib.html'
depends=('ocaml')
source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz")
options=('!strip' 'zipman') # otherwise the bytecode gets broken
-md5sums=('a4c22ad5e0d38367a73cf58a25fcbebd')
+md5sums=('5d1f8238c53964fdd14387b87b48b5d9')
build() {
cd "$srcdir/findlib-$pkgver"
diff --git a/extra/ocrad/PKGBUILD b/community/ocrad/PKGBUILD
index 9bf2bef38..7e3967877 100644
--- a/extra/ocrad/PKGBUILD
+++ b/community/ocrad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 190021 2013-07-12 22:00:10Z giovanni $
+# $Id: PKGBUILD 102179 2013-12-06 12:13:24Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=ocrad
@@ -10,6 +10,7 @@ url="http://www.gnu.org/software/ocrad/ocrad.html"
license=('GPL3')
depends=('gcc-libs' 'texinfo')
install=ocrad.install
+options=('staticlibs')
source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz")
md5sums=('e84f0fb0dcd9b7b067201f9a3b89e06c')
diff --git a/extra/ocrad/ocrad.install b/community/ocrad/ocrad.install
index eb599d04e..eb599d04e 100644
--- a/extra/ocrad/ocrad.install
+++ b/community/ocrad/ocrad.install
diff --git a/extra/ode/PKGBUILD b/community/ode/PKGBUILD
index ed1abb91b..cd6b103a7 100644
--- a/extra/ode/PKGBUILD
+++ b/community/ode/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198349 2013-10-30 14:19:37Z allan $
+# $Id: PKGBUILD 102181 2013-12-06 12:14:44Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Adam Griffiths <adam_griffithsAATTdart.net.au>
pkgname=ode
pkgver=0.12
-pkgrel=4
+pkgrel=5
pkgdesc="An open source, high performance library for simulating rigid body dynamics"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.ode.org"
diff --git a/extra/ogmtools/PKGBUILD b/community/ogmtools/PKGBUILD
index 447447cb8..443144259 100644
--- a/extra/ogmtools/PKGBUILD
+++ b/community/ogmtools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137699 2011-09-10 12:46:29Z pierre $
+# $Id: PKGBUILD 102185 2013-12-06 12:18:26Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=ogmtools
diff --git a/community/opencolorio/PKGBUILD b/community/opencolorio/PKGBUILD
index 03af2a79f..517499f23 100644
--- a/community/opencolorio/PKGBUILD
+++ b/community/opencolorio/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Dumitru Ursu <dima@ceata.org>
pkgname=opencolorio
-pkgver=1.0.8
+pkgver=1.0.9
pkgrel=1
pkgdesc="A color management framework for visual effects and animation"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('BSD')
depends=('python' 'lcms2' 'tinyxml')
makedepends=('cmake')
source=(http://github.com/imageworks/OpenColorIO/tarball/v$pkgver)
-sha1sums=('9b9bac9ed85c84f53775686eb72f3d612b148fef')
+sha1sums=('a015cb51b9b0ea0cdb3989fc23e1c18ad69511e0')
build()
{
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index e735ca6a5..4b03b9895 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 100261 2013-11-02 08:44:51Z spupykin $
+# $Id: PKGBUILD 102395 2013-12-10 10:40:58Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Thomas Jost <schnouki@schnouki.net>
pkgname=opendkim
-pkgver=2.8.4
-pkgrel=2
+pkgver=2.9.0
+pkgrel=1
pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
arch=(i686 x86_64)
url="http://www.opendkim.org/"
license=('BSD' 'custom:Sendmail')
-depends=("db" "openssl")
+depends=("db" "openssl" "libstrl")
makedepends=("libmilter")
options=(!emptydirs)
backup=(etc/conf.d/opendkim)
@@ -17,7 +17,7 @@ install=opendkim.install
source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz
opendkim.conf
opendkim.service)
-md5sums=('17f667d022c167c7874a993e928d4a6d'
+md5sums=('af682e58877bf9153b6af4400aad6d4d'
'3e2bb1058ac0662f01e675aa6ac7ee8f'
'85010750a21954e2d3cf5d57fe210d3f')
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index 55314055a..8f47b1d4d 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96492 2013-08-30 17:23:45Z svenstaro $
+# $Id: PKGBUILD 102264 2013-12-07 10:36:49Z bpiotrowski $
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=openimageio
-pkgver=1.2.1
+pkgver=1.2.3
pkgrel=1
pkgdesc="A library for reading and writing images, including classes, utilities, and applications"
arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa')
optdepends=('qt4: iv image viewer'
'python2: bindings support')
source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
-md5sums=('c98d002c9ec843b7cc35d7aec5f03326')
+md5sums=('20066ae0e9026717242f64f107f7ee8e')
build() {
cd "$srcdir"/$_pkgname*
diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD
index 9d97f05f1..7ac80b987 100644
--- a/community/openocd/PKGBUILD
+++ b/community/openocd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100265 2013-11-02 08:45:37Z spupykin $
+# $Id: PKGBUILD 102001 2013-12-03 16:51:56Z eric $
# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
# Contributor: Matthias Bauch <matthias.bauch@gmail.com>
# Contributor: Laszlo Papp <djszapi2 at gmail com>
@@ -6,12 +6,12 @@
pkgname=openocd
pkgver=0.7.0
-pkgrel=2
+pkgrel=3
pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices'
arch=('i686' 'x86_64' 'mips64el')
url='http://openocd.berlios.de'
license=('GPL')
-depends=('libftdi')
+depends=('libftdi' 'libusb-compat')
options=(!strip)
install=openocd.install
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
@@ -19,8 +19,17 @@ sha256sums=('52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63')
_features=(amtjtagaccel arm-jtag-ew at91rm9200 buspirate ep93xx ft2232_libftdi ftdi gw16012 jlink oocd_trace opendous osbdm parport presto_libftdi remote-bitbang rlink stlink ti-icdi ulink usbprog vsllink)
+# FIXME: needs /dev/bus/usb and cannot be compiled in chroot
+prepare() {
+ cd $pkgname-$pkgver
+ sed -i 's|$CC -E|$CC -O2 -E|g' configure
+ sed -i 's|\${CC} -E|$CC -O2 -E|g' configure
+ sed -i 's|-lftdi -lusb|-lftdi1 -lusb-1.0|g' configure src/Makefile*
+}
+
build() {
cd $pkgname-$pkgver
+ export CFLAGS="-I/usr/include/libftdi1"
./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror
make
}
diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD
index 04e565ad8..f663d9ac9 100644
--- a/community/openshadinglanguage/PKGBUILD
+++ b/community/openshadinglanguage/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 96490 2013-08-30 17:18:19Z svenstaro $
+# $Id: PKGBUILD 102265 2013-12-07 10:36:50Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=openshadinglanguage
-pkgver=1.3.3
-pkgrel=4
+pkgver=1.4.0
+pkgrel=2
pkgdesc="Advanced shading language for production GI renderers"
arch=(i686 x86_64)
url="https://github.com/imageworks/OpenShadingLanguage"
@@ -10,7 +10,7 @@ license=('custom')
depends=('boost-libs' 'openimageio' 'openexr' 'intel-tbb' 'freetype2' 'libpng' 'libtiff' 'llvm')
makedepends=('boost' 'cmake' 'clang')
source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
-md5sums=('17aaa01987963220e164522c29281f14')
+md5sums=('dcc7b6dfbc68d7af0d5cfa2940ff205b')
build() {
cd OpenShadingLanguage-Release-$pkgver
@@ -23,7 +23,7 @@ build() {
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLLVM_STATIC=0 \
- ..
+ ../..
make
}
diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD
index b4e5e9038..8106378cf 100644
--- a/community/opensmtpd/PKGBUILD
+++ b/community/opensmtpd/PKGBUILD
@@ -1,50 +1,45 @@
-# $Id: PKGBUILD 93322 2013-07-01 22:20:09Z seblu $
+# $Id: PKGBUILD 102612 2013-12-16 18:31:48Z seblu $
# Maintainer: Sébastien Luttringer
pkgname=opensmtpd
-pkgver=5.3.3p1
-pkgrel=1
+pkgver=5.4.1p1
+pkgrel=2
pkgdesc='Free implementation of the server-side SMTP protocol'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.opensmtpd.org/'
license=('custom')
-depends=('libevent')
+depends=('libevent' 'openssl')
provides=('smtp-server' 'smtp-forwarder')
conflicts=('smtp-server' 'smtp-forwarder')
backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases')
+options=('emptydirs')
install=opensmtpd.install
source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz"
'smtpd.service'
'smtpd.socket')
-md5sums=('795982f9b0b45c7645f897ba2ead0024'
+md5sums=('74551342985b78eb687995f7953d1790'
'a278f272d97a9fe5a8aac784a7c98d67'
'c2c01e9ca78df3f65efe40a7c0e17ee0')
prepare() {
- cd $pkgname-$pkgver
- sed -i 's,etc/aliases,etc/smtpd/aliases,' smtpd/smtpd.conf
- # regen configure. don't use bootstrap script (doesn't support automake 1.14)
- libtoolize --copy --force
- aclocal -I m4
- autoconf
- autoheader
- automake --foreign --add-missing --copy
+ sed -ri 's,/etc/mail,/etc/smtpd,g' $pkgname-$pkgver/smtpd/smtpd.conf
}
build() {
cd $pkgname-$pkgver
+ # Remove _FORTIFY_SOURCES: FS#38124
+ export CPPFLAGS=''
./configure \
--prefix=/usr \
--sysconfdir=/etc/smtpd \
--sbindir=/usr/bin \
- --libexecdir=/usr/bin \
+ --libexecdir=/usr/lib/smtpd \
--with-maildir=/var/spool/mail \
--with-privsep-path=/var/empty \
--with-sock-dir=/run \
+ --with-ca-file=/etc/ssl/certs/ca-certificates.crt \
--with-privsep-user=smtpd \
- --with-lookup-user=smtpd \
--with-queue-user=smtpq \
- --with-filter-user=smtpf \
--with-pam
make
}
@@ -56,17 +51,11 @@ package() {
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
# working directory
cd "$pkgdir"
- install -dm711 var/spool/smtpd
+ # install systemd units
install -Dm644 "$srcdir/smtpd.service" usr/lib/systemd/system/smtpd.service
install -Dm644 "$srcdir/smtpd.socket" usr/lib/systemd/system/smtpd.socket
- # remove duplicate hardlink into a subfolder
- rm -vr usr/bin/opensmtpd
# empty aliases file (used by default config)
- install -Dm644 /dev/null "$pkgdir/etc/smtpd/aliases"
- # fake sendmail binary (used to be smtp-forwarder)
- # use hardlink as upstream does
- cd "$pkgdir/usr/bin"
- ln smtpctl "$pkgdir/usr/bin/sendmail"
+ install -Dm644 /dev/null etc/smtpd/aliases
}
# vim:set ts=2 sw=2 et:
diff --git a/community/opensmtpd/opensmtpd.install b/community/opensmtpd/opensmtpd.install
index 48366c15c..4b0df73c6 100644
--- a/community/opensmtpd/opensmtpd.install
+++ b/community/opensmtpd/opensmtpd.install
@@ -3,10 +3,7 @@ post_install() {
# create users
getent passwd smtpd >/dev/null || useradd -d / -u 91 -g 1 smtpd
getent passwd smtpq >/dev/null || useradd -d /var/spool/smtpd -u 92 -g 1 smtpq
- getent passwd smtpf >/dev/null || useradd -d / -u 93 -g 1 smtpf
- # initialise aliase db
- #[[ -e /etc/smtpd/aliases.db ]] || makemap -t aliases /etc/smtpd/aliases
- true
+ :
}
# arg 1: the new package version
@@ -17,13 +14,22 @@ post_upgrade() {
echo 'Configuration files have been moved to /etc/smtpd.'
echo 'New users have been added.'
echo 'Check your configuration!'
+ elif (( $(vercmp $2 5.4) < 0 )); then
+ echo 'User smtpf is no more required. It will be removed!'
+ echo 'Check your configuration!'
+ userdel -f smtpf
fi
+ :
}
# arg 1: the old package version
post_remove() {
- for _u in smtpd smtpq smtpf; do userdel -f "$_u"; done
- true
+ userdel -f smtpd
+ userdel -f smtpq
+ if (( $(vercmp $1 5.4) <= 0 )); then
+ userdel -f smtpf
+ fi
+ :
}
# vim:set ts=2 sw=2 et:
diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD
index ab236ce97..fe1f4db28 100644
--- a/community/openttd/PKGBUILD
+++ b/community/openttd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 98744 2013-10-17 14:01:51Z andyrtr $
+# $Id: PKGBUILD 102297 2013-12-07 12:05:54Z lcarlier $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
pkgname=openttd
-pkgver=1.3.2
-pkgrel=2
+pkgver=1.3.3
+pkgrel=1
pkgdesc='An engine for running Transport Tycoon Deluxe.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.openttd.org'
@@ -13,7 +13,7 @@ install=openttd.install
optdepends=('openttd-opengfx: free graphics'
'openttd-opensfx: free soundset')
source=("http://binaries.openttd.org/releases/${pkgver}/${pkgname}-${pkgver}-source.tar.xz")
-sha256sums=('f6efc0cd0c4f4315a98844c331acc2e02322d5671ec376b9f0a11795b0eb270b')
+sha256sums=('6991ed2c0170481800c3a92a1b43546821a658de91d3ac7efe868588387eca5d')
package() {
cd ${pkgname}-${pkgver}
diff --git a/community/opus-tools/PKGBUILD b/community/opus-tools/PKGBUILD
index 404f7c376..48292908d 100644
--- a/community/opus-tools/PKGBUILD
+++ b/community/opus-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96976 2013-09-09 15:45:45Z bpiotrowski $
+# $Id: PKGBUILD 102289 2013-12-07 11:00:38Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Michael Düll <mail@akurei.me>
# Contributor: pumbur
pkgname=opus-tools
-pkgver=0.1.7
+pkgver=0.1.8
pkgrel=1
pkgdesc='Collection of tools for Opus audio codec'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url='http://wiki.xiph.org/Opus-tools'
license=('BSD')
depends=('flac' 'libogg' 'opus')
source=(http://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz)
-md5sums=('62af32d1669bcabf1aabaf7187a377f6')
+md5sums=('b424790eda9357a4df394e2d7ca19eac')
build(){
cd $pkgname-$pkgver
diff --git a/community/opusfile/PKGBUILD b/community/opusfile/PKGBUILD
index 0baa6a90f..c3765b3c8 100644
--- a/community/opusfile/PKGBUILD
+++ b/community/opusfile/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 99942 2013-10-31 02:36:12Z allan $
+# $Id: PKGBUILD 102291 2013-12-07 11:02:30Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
pkgname=opusfile
-pkgver=0.2
-pkgrel=3
+pkgver=0.4
+pkgrel=1
pkgdesc='Library for opening, seeking, and decoding .opus files'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.opus-codec.org/'
license=('custom')
depends=('libogg' 'openssl' 'opus')
source=(http://downloads.xiph.org/releases/opus/${pkgname}-${pkgver}.tar.gz)
-md5sums=('454375f51fb2f84bef9bf2fbf9535bb1')
+md5sums=('80f3d4106106905255ff84def1b5d9ae')
build() {
cd $pkgname-$pkgver
diff --git a/community/packagekit/PKGBUILD b/community/packagekit/PKGBUILD
index 84177351e..c826d008f 100644
--- a/community/packagekit/PKGBUILD
+++ b/community/packagekit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99944 2013-10-31 02:36:53Z allan $
+# $Id: PKGBUILD 102883 2013-12-23 10:36:15Z bgyorgy $
# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
pkgbase='packagekit'
pkgname=('packagekit' 'packagekit-qt2' 'python2-packagekit')
pkgver=0.7.6
-pkgrel=10
+pkgrel=11
pkgdesc="A system designed to make installation and updates of packages easier."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.packagekit.org"
@@ -20,7 +20,7 @@ sha256sums=('82c0a553075d49add3c4f58e6e93f7f3613938809a4b8e36f46476e86981b45d'
'c7f6da04f5b8f09e6d884ae4f480c064eae10de1d2528bf14d2f55b34e472c23'
'0d3798c8992afdc0930aa271b3e44deb55c046ab4adee25b4ec4c33bcdd950e2')
-build() {
+prepare() {
cd "$srcdir/PackageKit-$pkgver"
sed -i 's@SUBDIRS = test@SUBDIRS =@' 'backends/Makefile.in'
@@ -31,6 +31,10 @@ build() {
patch -Np1 -i "$srcdir/alpm.patch"
patch -Np1 -i "$srcdir/libarchive.patch"
sed -i 's@sbin_PROGRAMS@bin_PROGRAMS@' 'contrib/device-rebind/Makefile.am'
+}
+
+build() {
+ cd "$srcdir/PackageKit-$pkgver"
export PYTHON=/usr/bin/python2
./autogen.sh --prefix=/usr \
diff --git a/community/pantheon-terminal/PKGBUILD b/community/pantheon-terminal/PKGBUILD
new file mode 100644
index 000000000..06579d00f
--- /dev/null
+++ b/community/pantheon-terminal/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 102538 2013-12-13 11:19:00Z alucryd $
+# Maintainer: alucryd <alucryd at gmail dot com>
+
+pkgname=pantheon-terminal
+pkgver=0.2.4.1
+pkgrel=3
+pkgdesc='The Pantheon Terminal Emulator'
+arch=('i686' 'x86_64')
+url="https://launchpad.net/${pkgname}"
+license=('GPL3')
+depends=('desktop-file-utils' 'granite' 'libnotify' 'vte3')
+makedepends=('cmake' 'vala')
+install="${pkgname}.install"
+source=("${url}/0.x/${pkgver}/+download/${pkgname}-${pkgver}.tgz")
+sha256sums=('0c03dc4023d3a78924d8b21658c62dd23ea0c93cd55af2f398686d28574dac04')
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ if [[ -d build ]]; then
+ rm -rf build
+ fi
+ mkdir build && cd build
+
+ cmake .. -DCMAKE_BUILD_TYPE='Release' -DCMAKE_INSTALL_PREFIX='/usr' -DGSETTINGS_COMPILE='OFF'
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}/build
+
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/clinica/clinica.install b/community/pantheon-terminal/pantheon-terminal.install
index 326aa98a2..77c350fb9 100644
--- a/community/clinica/clinica.install
+++ b/community/pantheon-terminal/pantheon-terminal.install
@@ -1,5 +1,6 @@
post_install() {
glib-compile-schemas usr/share/glib-2.0/schemas
+ update-desktop-database -q
}
post_upgrade() {
@@ -9,3 +10,5 @@ post_upgrade() {
post_remove() {
post_install
}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/par2cmdline/PKGBUILD b/community/par2cmdline/PKGBUILD
index bf5f1d59f..4b7f6eda4 100644
--- a/community/par2cmdline/PKGBUILD
+++ b/community/par2cmdline/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 63354 2012-01-31 06:44:37Z seblu $
+# $Id: PKGBUILD 102557 2013-12-14 14:03:38Z idevolder $
+# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com >
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org
-# Contributor: BlackEagle < ike DOT devolder AT gmail DOT com >
pkgname=par2cmdline
-pkgver=0.5.4
+pkgver=0.6.3
pkgrel=1
pkgdesc='A PAR 2.0 compatible file verification and repair tool'
url='https://github.com/BlackIkeEagle/par2cmdline'
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
-source=("https://github.com/downloads/BlackIkeEagle/$pkgname/$pkgname-$pkgver.tar.xz")
-md5sums=('96b4fb91859c0214d2c562636abea3af')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/BlackIkeEagle/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('903bff9d1720523683cb04db76d37169ebab3a5157f0ae1d5f9065f371929288')
build() {
- cd ${pkgname}-${pkgver}
+ cd "$pkgname-$pkgver"
aclocal
automake --add-missing
autoconf
./configure --prefix=/usr
- make
+ make
}
check() {
- cd ${pkgname}-${pkgver}
+ cd "$pkgname-$pkgver"
make check
}
package() {
- cd ${pkgname}-${pkgver}
+ cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
}
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD
index 52e18a49c..30174e6a8 100644
--- a/community/parcellite/PKGBUILD
+++ b/community/parcellite/PKGBUILD
@@ -1,18 +1,25 @@
-# $Id: PKGBUILD 99050 2013-10-23 12:05:36Z spupykin $
+# $Id: PKGBUILD 100807 2013-11-11 10:58:12Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Alexander Fehr <pizzapunk gmail com>
pkgname=parcellite
-pkgver=1.1.6
-pkgrel=1
+pkgver=1.1.7
+pkgrel=2
pkgdesc="Lightweight GTK+ clipboard manager"
arch=('i686' 'x86_64' 'mips64el')
url="http://parcellite.sourceforge.net/"
license=('GPL3')
depends=('gtk2')
makedepends=('intltool')
-source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz)
-md5sums=('4b0a89aeb885a2f7d2ace3e4ea7e153e')
+source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz
+ fix-crash.patch)
+md5sums=('a542aab0df50ac7a7de6501957e78fb3'
+ 'f2cc1986e573d49c92ea3d81efd5d574')
+
+prepare() {
+ cd "$srcdir/parcellite-$pkgver"
+ patch -Np1 <$srcdir/fix-crash.patch
+}
build() {
cd "$srcdir/parcellite-$pkgver"
diff --git a/community/parcellite/fix-crash.patch b/community/parcellite/fix-crash.patch
new file mode 100644
index 000000000..a8ce712e1
--- /dev/null
+++ b/community/parcellite/fix-crash.patch
@@ -0,0 +1,11 @@
+--- a/src/preferences.c.orig 2013-11-11 14:39:32.000000000 +0400
++++ b/src/preferences.c 2013-11-11 14:40:03.970776522 +0400
+@@ -381,7 +381,7 @@
+ }
+ /**now go through and make sure we have no duplicates */
+ for (i=0;NULL != keylist[i].name; ++i){
+- if(0 != keylist[i].keyval[0]){
++ if(NULL != keylist[i].keyval && 0 != keylist[i].keyval[0]){
+ /**see if it exists elsewhere */
+ for (l=0;NULL != keylist[l].name; ++l){
+ if(l!=i && 0 != keylist[l].keyval[0]){
diff --git a/community/parcellite/history_menu_crash_patch b/community/parcellite/history_menu_crash_patch
deleted file mode 100644
index 961106839..000000000
--- a/community/parcellite/history_menu_crash_patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: main.c
-===================================================================
---- main.c (revision 232)
-+++ main.c (working copy)
-@@ -1199,24 +1199,28 @@
- {
- GString* string = g_string_new((gchar*)element->data);
- /* Ellipsize text */
-- if (string->len > prefs.item_length)
-+ glong len = g_utf8_strlen(string->str, string->len);
-+ if (len > prefs.item_length)
- {
- switch (prefs.ellipsize)
- {
- case PANGO_ELLIPSIZE_START:
-- string = g_string_erase(string, 0, string->len-(prefs.item_length));
-+ string = g_string_erase(string, 0, g_utf8_offset_to_pointer(string->str, len - prefs.item_length) - string->str);
- string = g_string_prepend(string, "...");
- break;
- case PANGO_ELLIPSIZE_MIDDLE:
-- string = g_string_erase(string, (prefs.item_length/2), string->len-(prefs.item_length));
-- string = g_string_insert(string, (string->len/2), "...");
-+ ; /* to avoid wierd gcc error */
-+ gchar* p1 = g_utf8_offset_to_pointer(string->str, prefs.item_length / 2);
-+ gchar* p2 = g_utf8_offset_to_pointer(string->str, len - prefs.item_length / 2);
-+ string = g_string_erase(string, p1 - string->str, p2 - p1);
-+ string = g_string_insert(string, p1 - string->str, "...");
- break;
- case PANGO_ELLIPSIZE_END:
-- string = g_string_truncate(string, prefs.item_length);
-+ string = g_string_truncate(string, g_utf8_offset_to_pointer(string->str, prefs.item_length) - string->str);
- string = g_string_append(string, "...");
- break;
- }
-- }
-+ }
- /* Remove control characters */
- gsize i = 0;
- while (i < string->len)
diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD
index c36810e5b..aa0221289 100644
--- a/community/parole/PKGBUILD
+++ b/community/parole/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99947 2013-10-31 02:37:53Z allan $
+# $Id: PKGBUILD 102146 2013-12-05 21:14:10Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: TDY <tdy@gmx.com>
pkgname=parole
-pkgver=0.5.3
+pkgver=0.5.4
pkgrel=1
pkgdesc="A modern media player based on the GStreamer framework"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ optdepends=('xulrunner: browser plugin'
conflicts=('parole-media-player-git')
install=parole.install
source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2)
-md5sums=('51c49684322079c216d80fe6193f1614')
+md5sums=('19ae948309472429b669eed8ac290dcd')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/passenger/PKGBUILD b/community/passenger/PKGBUILD
index ecb9c3533..4db7991a5 100644
--- a/community/passenger/PKGBUILD
+++ b/community/passenger/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99543 2013-10-29 12:13:00Z spupykin $
+# $Id: PKGBUILD 100819 2013-11-11 12:06:03Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=passenger
pkgver=4.0.21
-pkgrel=1
+pkgrel=2
pkgdesc="mod_rails passenger"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.modrails.com"
@@ -12,7 +12,7 @@ license=('GPL')
depends=('ruby' 'ruby-rack' 'curl')
makedepends=('apache')
install=passenger.install
-options=('!emptydirs')
+options=('!emptydirs' 'staticlibs')
source=($pkgname-$pkgver.tar.gz::https://github.com/FooBarWidget/passenger/archive/release-$pkgver.tar.gz)
md5sums=('200ba8636baa06c9a44d30c7bbb50ac3')
diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD
index 3a3ce22d0..07ad794cd 100644
--- a/community/pdf2djvu/PKGBUILD
+++ b/community/pdf2djvu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95095 2013-08-05 14:15:47Z andyrtr $
+# $Id: PKGBUILD 101793 2013-12-01 09:52:06Z andyrtr $
# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
pkgname=pdf2djvu
pkgver=0.7.17
-pkgrel=1
+pkgrel=2
pkgdesc="Creates DjVu files from PDF files"
arch=('i686' 'x86_64' 'mips64el')
url="http://pdf2djvu.googlecode.com"
diff --git a/community/pdfedit/PKGBUILD b/community/pdfedit/PKGBUILD
deleted file mode 100644
index f4c5b49c8..000000000
--- a/community/pdfedit/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Firmicus <firmicus α gmx δ net>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=pdfedit
-pkgver=0.4.5
-pkgrel=2
-pkgdesc='Full featured editor for manipulating PDF documents'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://pdfedit.petricek.net/index_e.html'
-license=('GPL')
-depends=('qt3' 't1lib' 'gsfonts')
-makedepends=('boost' 'doxygen')
-source=("http://downloads.sourceforge.net/pdfedit/${pkgname}-${pkgver}.tar.bz2"
- 'pdfedit.png'
- 'pdfedit.desktop')
-md5sums=('80502ee7f08cdfb867ffdaa92d160a23'
- '70fd938b2ef9da748a093df7e20d1d7d'
- 'c0572c2dd54065322321718aa49ed6b8')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's:/usr/share/fonts/type1/gsfonts:/usr/share/fonts/Type1:' src/xpdf/xpdf/GlobalParams.cc
- QTDIR=/usr ./configure --prefix=/usr
- make CXXFLAGS+="-I/usr/include/qt3" MOC=/usr/bin/moc-qt3 UIC=/usr/bin/uic-qt3 QTDIR=/usr
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make INSTALL_ROOT="${pkgdir}" install
-
- install -Dm0644 ../pdfedit.desktop "${pkgdir}/usr/share/applications/pdfedit.desktop"
- install -Dm0644 ../pdfedit.png "${pkgdir}/usr/share/pixmaps/pdfedit.png"
-}
diff --git a/community/pdfedit/pdfedit.desktop b/community/pdfedit/pdfedit.desktop
deleted file mode 100644
index 35b8defc0..000000000
--- a/community/pdfedit/pdfedit.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=PDF Editor
-GenericName=PDF Editor
-Exec=pdfedit
-Categories=Utility;TextEditor;
-Icon=pdfedit
-Terminal=false
diff --git a/community/pdfedit/pdfedit.png b/community/pdfedit/pdfedit.png
deleted file mode 100644
index 3bfc3f2e9..000000000
--- a/community/pdfedit/pdfedit.png
+++ /dev/null
Binary files differ
diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD
index 3e0ec7c47..6045d1a2b 100644
--- a/community/pdns/PKGBUILD
+++ b/community/pdns/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99950 2013-10-31 02:38:53Z allan $
+# $Id: PKGBUILD 102266 2013-12-07 10:36:51Z bpiotrowski $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
pkgname=pdns
pkgver=3.3
-pkgrel=2
+pkgrel=3
pkgdesc='Modern, advanced and high performance authoritative-only nameserver'
arch=('x86_64' 'i686' 'mips64el')
url='http://www.powerdns.com/'
@@ -15,7 +15,6 @@ makedepends=('boost')
provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-install="$pkgname.install"
options=('!makeflags')
backup=('etc/powerdns/pdns.conf')
source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz"
@@ -26,13 +25,11 @@ sha256sums=('93417bb418ccd1eaf85fc98aa9f687ed175de388fa2624a1978b7cd40dc2b0b6'
'a1afcccb0d2fb6a6f7a5960de95f8d38ce1ac75ac5e3dcecf09e49f0de10166e')
prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- touch AUTHORS NEWS
+ touch "$pkgname-$pkgver/AUTHORS" "$pkgname-$pkgver/NEWS"
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
./configure \
--prefix=/usr \
@@ -49,9 +46,7 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/"
install -Dm644 "$srcdir/pdns.service" \
"$pkgdir/usr/lib/systemd/system/pdns.service"
diff --git a/community/pdns/pdns.install b/community/pdns/pdns.install
deleted file mode 100644
index f41b36b20..000000000
--- a/community/pdns/pdns.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- cat << 'EOM'
-==> PowerDNS is built without recursor now. To use the recursor,
-==> please install the pdns-recursor package and update the
-==> configuration in /etc/powerdns/recursor.conf
-EOM
-}
-
-post_upgrade() {
- post_install $1
-}
diff --git a/community/pekwm/PKGBUILD b/community/pekwm/PKGBUILD
index 1e0308158..6b8e4058b 100644
--- a/community/pekwm/PKGBUILD
+++ b/community/pekwm/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 92159 2013-06-01 21:53:18Z arodseth $
+# $Id: PKGBUILD 102208 2013-12-06 13:59:32Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Kevin Piche <kevin@archlinux.org>
# Contributor: Eddie Lozon <almostlucky@attbi.com>
pkgname=pekwm
pkgver=0.1.17
-pkgrel=1
+pkgrel=2
pkgdesc='Small, fast, functional, and flexible window manager'
arch=('x86_64' 'i686' 'mips64el')
license=('GPL')
url='https://www.pekwm.org/projects/pekwm'
depends=('gcc-libs' 'libjpeg' 'libpng' 'libxft' 'libxinerama' 'libxpm' 'libxrandr')
-makedepends=('gendesk')
+makedepends=('gendesk>=0.6')
optdepends=('lxappearance: feature-rich GTK+ theme switcher'
'nitrogen: background browser and setter'
'tint2: basic, good-looking task manager')
@@ -27,28 +27,23 @@ backup=(etc/pekwm/autoproperties
etc/pekwm/mouse_system
etc/pekwm/start
etc/pekwm/vars)
-source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2"
- "${pkgname}_kdm.desktop")
-sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00'
- '4c1817d328dad84407c9ba7219015eb3be0345be9e98fc03fa693b6b443a8dc6')
+source=("http://www.pekwm.org/projects/pekwm/files/$pkgname-$pkgver.tar.bz2")
+sha256sums=('8a1fd3bf9f38e8c7bb2b2864c090f986b60cec2281ecf1bba462d120fb327d00')
prepare() {
- cd "$srcdir"
-
- gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc"
+ gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name PekWM
+ gendesk -f -wm --pkgname "${pkgname}_kdm" --exec "$pkgname" --name PekWM
}
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
install -Dm644 "$srcdir/$pkgname.desktop" \
"$pkgdir/usr/share/xsessions/$pkgname.desktop"
install -Dm644 "$srcdir/${pkgname}_kdm.desktop" \
diff --git a/community/pekwm/pekwm_kdm.desktop b/community/pekwm/pekwm_kdm.desktop
deleted file mode 100644
index b77722d03..000000000
--- a/community/pekwm/pekwm_kdm.desktop
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=XSession
-Exec=pekwm
-TryExec=pekwm
-Name=PekWM
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 6ebe73bed..5b7ff6d40 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99951 2013-10-31 02:39:14Z allan $
+# $Id: PKGBUILD 102804 2013-12-20 12:34:07Z mtorromeo $
# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
pkgname=percona-server
-pkgver=5.6.14_rel62.0
+pkgver=5.6.15_rel63.0
pkgrel=1
pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ url="http://www.percona.com/software/percona-server/"
options=('emptydirs')
backup=('etc/mysql/my.cnf')
install=percona.install
-source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/release-${pkgver/_rel/-}/483/source/Percona-Server-${pkgver/_/-}.tar.gz"
+source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_/-}/source/Percona-Server-${pkgver/_/-}.tar.gz"
'mysqld-post.sh'
'mysqld.service'
'mysqld-tmpfile.conf'
@@ -102,7 +102,7 @@ package() {
rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1
}
-sha256sums=('69edc04585e72ac94c32598221c0762704e75190c2abe4fa680ad42ce202e280'
+sha256sums=('0d433310c374025e4aae05038b1542a5c90b35d01842c5b9718dcc0ed66ea0cc'
'82a241d9fa4032187a26597d044e94ba810b209b53a7ce14bb6eb92555993a48'
'9bc66470f3f80534c0bb62f9f8325ccf60b164f421f74ad74a963f065d7b1869'
'badf6a701d9dc6ea3b4ddca26cb0f42b6236432ccdbc14c64962147802594a60'
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index d20f9db2a..e7c0df26a 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94902 2013-08-01 06:55:27Z bpiotrowski $
+# $Id: PKGBUILD 102267 2013-12-07 10:36:52Z bpiotrowski $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=performous
pkgver=0.7.0
-pkgrel=10
+pkgrel=11
pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
arch=('i686' 'x86_64' 'mips64el')
url="http://performous.org/"
@@ -30,6 +30,8 @@ prepare() {
patch -Np1 -i ../fix-noisy-sound-output.patch
# fix building with ffmpeg-2.0
patch -Np1 -i ../ffmpeg-2.0.patch
+ # since freetype2-2.5.1 include files aren't anymore in the freetype subdir
+ sed -i "s#freetype/freetype.h#freetype.h#g" cmake/Modules/FindFreetype.cmake
}
build() {
diff --git a/community/perl-berkeleydb/PKGBUILD b/community/perl-berkeleydb/PKGBUILD
index 29f3319ca..ce18978bd 100644
--- a/community/perl-berkeleydb/PKGBUILD
+++ b/community/perl-berkeleydb/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99506 2013-10-29 10:25:03Z spupykin $
+# $Id: PKGBUILD 100904 2013-11-13 09:48:52Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Charles Mauch <cmauch@gmail.com>
# Contributor: Francois Charette <firmicus@gmx.net>
pkgname=perl-berkeleydb
-pkgver=0.53
-pkgrel=2
+pkgver=0.54
+pkgrel=1
pkgdesc="Interface to Berkeley DB version 2, 3 or 4"
arch=('i686' 'x86_64' 'mips64el')
url="http://search.cpan.org/dist/BerkeleyDB/"
@@ -13,7 +13,7 @@ license=('GPL' 'PerlArtistic')
depends=('perl' 'db')
options=('!emptydirs')
source=(http://search.cpan.org/CPAN/authors/id/P/PM/PMQS/BerkeleyDB-$pkgver.tar.gz)
-md5sums=('899c6967316c7a36b1d5b6a4c7ffbb02')
+md5sums=('7efc0aaaf6ca4a2a629eadea24d34fad')
build() {
cd $srcdir/BerkeleyDB-$pkgver
diff --git a/community/perl-fuse/PKGBUILD b/community/perl-fuse/PKGBUILD
index a87c9620a..0718db88a 100644
--- a/community/perl-fuse/PKGBUILD
+++ b/community/perl-fuse/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99530 2013-10-29 10:58:33Z spupykin $
+# $Id: PKGBUILD 100908 2013-11-13 09:49:25Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Tom K <tomk@runbox.com>
pkgname=perl-fuse
-pkgver=0.16
+pkgver=0.16.1
pkgrel=1
pkgdesc="write filesystems in Perl using FUSE"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,12 @@ depends=('perl' 'fuse')
license=('GPL')
source=(http://search.cpan.org/CPAN/authors/id/D/DP/DPATES/Fuse-$pkgver.tar.gz
build-fix.patch)
-md5sums=('d7f36eb55392270d2c6b2f05737b553f'
+md5sums=('29534329808d8cf42fc78ca26c6fa698'
'16d985400e620286efdf4610d78cb5d6')
prepare() {
cd $srcdir/Fuse-$pkgver
- patch -p1 <$srcdir/build-fix.patch
+# patch -p1 <$srcdir/build-fix.patch
}
build() {
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index 59cee5273..e21cfc56a 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93874 2013-07-11 16:16:39Z jsteel $
+# $Id: PKGBUILD 100900 2013-11-12 23:39:12Z eric $
# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
# Contributor: Justin "juster" Davis <jrcd83@gmail.com>
# Contributor: François Charette <firmicus ατ gmx δοτ net>
pkgname=perl-xml-libxslt
-pkgver=1.81
+pkgver=1.82
pkgrel=1
pkgdesc="Interface to the gnome libxslt library"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,20 +13,20 @@ license=('GPL')
depends=('perl-xml-libxml' 'libxslt')
options=('!emptydirs')
source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz)
-md5sums=('a721424c905eca40b1b7af9abe32ff76')
+md5sums=('91b5432b2c68fcf88b25cfd825b23b14')
build() {
- cd "$srcdir/XML-LibXSLT-$pkgver"
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ cd XML-LibXSLT-$pkgver
+ perl Makefile.PL INSTALLDIRS=vendor
make
}
check() {
- cd "$srcdir/XML-LibXSLT-$pkgver"
+ cd XML-LibXSLT-$pkgver
make test
}
package() {
- cd "$srcdir/XML-LibXSLT-$pkgver"
- make install DESTDIR="$pkgdir"
+ cd XML-LibXSLT-$pkgver
+ make DESTDIR="$pkgdir" install
}
diff --git a/community/php-mongo/PKGBUILD b/community/php-mongo/PKGBUILD
index de13f8385..ce46c64a5 100644
--- a/community/php-mongo/PKGBUILD
+++ b/community/php-mongo/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Jarek Sedlacek <jareksedlacek@gmail.com>
pkgname=php-mongo
-pkgver=1.4.3
-pkgrel=3
+pkgver=1.4.5
+pkgrel=1
pkgdesc="Officially supported PHP driver for MongoDB"
arch=("i686" "x86_64")
url="http://www.mongodb.org/display/DOCS/PHP+Language+Center"
@@ -26,5 +26,5 @@ package() {
make INSTALL_ROOT="$pkgdir" install
install -Dm644 "$srcdir/mongo.ini" "$pkgdir/etc/php/conf.d/mongo.ini"
}
-sha256sums=('43686e8c9fabfec6852fa42eb664aa662a6d423b4bd3eba41f42514892d8d4a4'
+sha256sums=('45b20d4fc37e2ce1bc85dfb79418993ecfe61c519d6ad24e7d28cb4e1b380a55'
'c89685eee842d5c3a85149a5bb8e310e62bf1a17f94183bb66401593ab2b191b')
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index cc2c65dff..079791b09 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 98142 2013-10-06 16:28:12Z fyan $
+# $Id: PKGBUILD 102564 2013-12-15 04:07:26Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
pkgname=pidgin-lwqq
-pkgver=0.2c
-_commit=41f9151c2273e8d3321458a1bbabf918b4e050c6
+pkgver=0.2c.20131206
+_commit=41f92cb7d8b4cfb26e51eded734e8110f845cff3
pkgrel=1
pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,12 +11,12 @@ url="https://github.com/xiehuc/pidgin-lwqq"
license=('GPL3')
depends=('libpurple' 'curl' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'libev' 'js185')
optdepends=('pidgin: Multi-protocol instant messaging client'
- 'telepathy-haze: Empathy plugin support')
+ 'telepathy-haze: Empathy plugin support')
makedepends=('git' 'cmake')
install=$pkgname.install
options=(debug)
-#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit"
-source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver"
+source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit"
+#source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver"
"git://github.com/xiehuc/lwqq.git")
prepare() {
diff --git a/community/pidgin-talkfilters/PKGBUILD b/community/pidgin-talkfilters/PKGBUILD
deleted file mode 100644
index 66849640d..000000000
--- a/community/pidgin-talkfilters/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Connor Behan <connor.behan@gmail.com>
-
-pkgname=pidgin-talkfilters
-pkgver=2.7.0
-pkgrel=1
-pkgdesc="Implements GNU Talkfilters in pidgin chats"
-arch=(i686 x86_64 mips64el)
-url="http://www.guifications.org/projects/purple-plugin-pack"
-license=('GPL')
-depends=('pidgin' 'talkfilters')
-makedepends=('intltool' 'gettext' 'python2')
-source=(https://www.guifications.org/attachments/download/201/purple-plugin-pack-${pkgver}.tar.bz2)
-
-build() {
- cd "$srcdir"/purple-plugin-pack-${pkgver}
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --with-plugins=talkfilters
- make
-}
-
-package() {
- cd "$srcdir"/purple-plugin-pack-${pkgver}
- make DESTDIR="$pkgdir" install
- rm -rf "${pkgdir}"/usr/share
-}
-
-md5sums=('a1ee405e81ad955798af7b2a6a8564fb')
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index 3f5470c8e..a049f5d0d 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94040 2013-07-13 12:35:34Z svenstaro $
+# $Id: PKGBUILD 102268 2013-12-07 10:36:53Z bpiotrowski $
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=pingus
pkgver=0.7.6
-pkgrel=9
+pkgrel=10
pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
arch=('i686' 'x86_64' 'mips64el')
url="http://pingus.seul.org"
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 7b03cf85e..6d3b73dce 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94041 2013-07-13 12:35:45Z svenstaro $
+# $Id: PKGBUILD 102269 2013-12-07 10:36:55Z bpiotrowski $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -7,7 +7,7 @@
pkgname=pinot
pkgver=1.06
-pkgrel=1
+pkgrel=2
pkgdesc='Personal search and metasearch tool'
arch=('i686' 'x86_64' 'mips64el')
url='http://code.google.com/p/pinot-search/'
@@ -26,8 +26,9 @@ optdepends=('unzip: ZIP files extraction'
options=('!emptydirs')
install=$pkgname.install
changelog=$pkgname.changelog
-source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha256sums=('bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d')
+source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz namespace_clash.patch)
+sha256sums=('bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d'
+ '7b4fee7b43f73539803954075af2ce577b65ca732ab8115d257068ffaa5a750f')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -42,6 +43,9 @@ build() {
${x}LM/russian-koi8_r.lm russian-koi8_r\n\
${x}LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt
+ patch -Np1 -i $srcdir/namespace_clash.patch
+
+
LIBS="-lboost_system" ./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/community/pinot/namespace_clash.patch b/community/pinot/namespace_clash.patch
new file mode 100644
index 000000000..40d7c9eac
--- /dev/null
+++ b/community/pinot/namespace_clash.patch
@@ -0,0 +1,12 @@
+diff -aur pinot-1.06/UI/GTK2/src/mainWindow.cc pinot-1.06.new/UI/GTK2/src/mainWindow.cc
+--- pinot-1.06/UI/GTK2/src/mainWindow.cc 2013-01-14 13:47:06.000000000 +0100
++++ pinot-1.06.new/UI/GTK2/src/mainWindow.cc 2013-11-30 19:22:17.792587309 +0100
+@@ -1766,7 +1766,7 @@
+ viewDoc = true;
+ }
+
+- close(inFd);
++ ::close(inFd);
+ }
+
+ if (viewDoc == true)
diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD
index f628a7e73..d5d102575 100644
--- a/community/pion/PKGBUILD
+++ b/community/pion/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 99025 2013-10-22 18:18:59Z stativ $
+# $Id: PKGBUILD 102770 2013-12-19 14:12:44Z stativ $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=pion
-pkgver=5.0.4
+pkgver=5.0.5
pkgrel=1
pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
url="https://github.com/cloudmeter/pion"
@@ -13,7 +13,7 @@ provides=('pion-net')
conflicts=('pion-net')
replaces=('pion-net')
source=(https://github.com/cloudmeter/pion/archive/$pkgver.zip)
-md5sums=('5807d39beb0c80fdef5b8ad5cee71c1c')
+md5sums=('b8bf0fdac882d9bd4332d3c6d3bccbd8')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/plan9port/PKGBUILD b/community/plan9port/PKGBUILD
index 517b59b24..138f002ad 100644
--- a/community/plan9port/PKGBUILD
+++ b/community/plan9port/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 99408 2013-10-28 11:45:43Z arodseth $
+# $Id: PKGBUILD 102625 2013-12-16 21:54:40Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: phrakture <aaronmgriffin--gmail--com>
# Contributor: Fazlul Shahriar
# Contributor: Chris Brannon <cmbrannon79@gmail.com>
pkgname=plan9port
-pkgver=20130927
-pkgrel=3
+pkgver=20131024
+pkgrel=2
pkgdesc='Port of many programs from Plan 9 to Unix-like operating systems'
arch=('x86_64' 'i686' 'mips64el')
url='http://swtch.com/plan9port/'
@@ -16,23 +16,25 @@ optdepends=('python2: for the codereview script')
provides=('plan9')
install='plan9.install'
options=('!zipman' 'staticlibs')
-source=("http://swtch.com/$pkgname/$pkgname-$pkgver.tgz"
+source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tgz"
'plan9.sh')
-sha256sums=('580927688ae2df295bf7f78d0ba19588104c6b0403558ffa3cd9ed0b7b110542'
+sha256sums=('5cba7856bdb35a96a923120e61d320d424fee1a6f09b7af3e87eb7814a747d4f'
'c216efa3455ba0b22b1723ae62e4c1e21b3a776a760d8fcedb902ff994b701c1')
package() {
- cd plan9
+ cd "$pkgname"
- d=/usr/local # /opt
+ # TODO: Find a way to install in a better directory than /usr/local/plan9
+
+ d=usr/local
./INSTALL -b
install -Dm755 ../plan9.sh "$pkgdir/etc/profile.d/plan9.sh"
- install -d "$pkgdir$d"
+ install -d "$pkgdir/$d"
install -d "$pkgdir/usr/share/doc/$pkgname"
- cp -r "$srcdir/plan9" "$pkgdir/$d/"
- cd "$pkgdir$d/plan9"
- ./INSTALL -c -r "$pkgdir$d/plan9"
+ cp -r "$srcdir/$pkgname" "$pkgdir/$d/plan9"
+ cd "$pkgdir/$d/plan9"
+ ./INSTALL -c -r "$pkgdir/$d/plan9"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
# Clean up
@@ -43,10 +45,10 @@ package() {
LICENSE
# Fix hardcoded paths
- for f in `grep -H -r "$pkgdir$d/plan9" | cut -d: -f1`; do
- echo -n "\t$f"
- [ -e "$f" ] && sed -i "s:$pkgdir$d/plan9:$d/plan9:" "$f" || true
- done
+ #for f in `grep -H -r "$pkgdir$d/$pkgname" | cut -d: -f1`; do
+ # echo -n "\t$f"
+ # [ -e "$f" ] && sed -i "s:$pkgdir$d/$pkgname:$d/$pkgname:" "$f" || true
+ #done
# Fix python scripts
find "$pkgdir" -name '*.py' -print0 |xargs -0 \
@@ -60,7 +62,7 @@ package() {
done
# Decompress the plan9 man pages
- for i in `find $pkgdir$d/plan9/man -type f`; do
+ for i in `find $pkgdir/$d/plan9/man -type f`; do
if [ ${i##*.} = "gz" ]; then
gunzip "$i"
fi
diff --git a/community/plan9port/plan9.install b/community/plan9port/plan9.install
index 5c76552f3..1d361127f 100644
--- a/community/plan9port/plan9.install
+++ b/community/plan9port/plan9.install
@@ -6,16 +6,3 @@ post_install() {
echo "==> Run '9 man 1 intro | less' to begin"
source /etc/profile.d/plan9.sh
}
-
-post_upgrade() {
- post_install
-}
-
-pre_upgrade() {
- post_remove
-}
-
-post_remove() {
- #we had to unpack them so they won't get removed....
- rm -rf /opt/plan9/man
-}
diff --git a/community/plank/PKGBUILD b/community/plank/PKGBUILD
index 94521202e..063652177 100644
--- a/community/plank/PKGBUILD
+++ b/community/plank/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99552 2013-10-29 14:43:20Z alucryd $
+# $Id: PKGBUILD 101218 2013-11-19 21:08:43Z alucryd $
# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
# Contributor: Ner0 <darkelfdarkelf666 at yahoo dot co dot uk>
# Contributor: dcelasun <dcelasun at gmaild dot com>
pkgname=plank
-pkgver=0.4.0
-pkgrel=2
+pkgver=0.5.0
+pkgrel=1
pkgdesc="Elegant, simple, clean dock"
arch=('i686' 'x86_64')
url="https://launchpad.net/plank"
@@ -14,7 +14,7 @@ depends=('bamf' 'libdbusmenu-gtk3' 'libgee06' 'python2')
makedepends=('gnome-common' 'intltool' 'vala')
install="${pkgname}.install"
source=("https://launchpad.net/${pkgname}/1.0/${pkgver}/+download/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('b8417bce7d88ac1f339e948c964822049a9261f9d9dedc0d0e636c73442856fe')
+sha256sums=('bf0e14dbdc9d30d57e55cc88644ef6e6c296be924bbfc1b345cba1e0c9be1804')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index bd5f6a453..8c243711e 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94043 2013-07-13 12:36:03Z svenstaro $
+# $Id: PKGBUILD 102271 2013-12-07 10:36:58Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
@@ -8,8 +8,8 @@
pkgname=pokerth
_realname=PokerTH
pkgver=1.0.1
-pkgrel=2
-pkgdesc="Poker game written in C++/QT4"
+pkgrel=3
+pkgdesc="Poker game written in C++/Qt4"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.pokerth.net/"
license=('GPL' 'custom')
diff --git a/community/postgis/PKGBUILD b/community/postgis/PKGBUILD
index e15f900e7..f3b5a4098 100644
--- a/community/postgis/PKGBUILD
+++ b/community/postgis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99962 2013-10-31 02:42:56Z allan $
+# $Id: PKGBUILD 100837 2013-11-11 18:56:33Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=postgis
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
pkgdesc="Adds support for geographic objects to PostgreSQL"
arch=('i686' 'x86_64' 'mips64el')
url="http://postgis.net/"
@@ -13,7 +13,7 @@ license=('GPL')
depends=('postgresql' 'gdal' 'json-c')
changelog=$pkgname.changelog
source=(http://download.osgeo.org/postgis/source/${pkgname}-${pkgver}.tar.gz)
-sha256sums=('fc00481aec904661f3eb11da4305b1666f2040c28b0651de7eac6c22f217b26c')
+sha256sums=('f55acf056362e7e78766bec7a403e02a3b6b087a6d18b4222647b6a932d5c945')
build() {
cd ${pkgname}-${pkgver}
diff --git a/community/postgis/postgis.changelog b/community/postgis/postgis.changelog
index ce4c3b267..bb9b27fdd 100644
--- a/community/postgis/postgis.changelog
+++ b/community/postgis/postgis.changelog
@@ -1,3 +1,6 @@
+2013-11-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * postgis-2.1.1-1
+
2013-08-22 Maxime Gauduin <alucryd@gmail.com>
* postgis-2.1.0-1
* Fixes FS#35816
diff --git a/community/powertop/PKGBUILD b/community/powertop/PKGBUILD
index 19afd3fe9..89cd26a3d 100644
--- a/community/powertop/PKGBUILD
+++ b/community/powertop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 95046 2013-08-04 10:58:38Z lcarlier $
+# $Id: PKGBUILD 101505 2013-11-26 18:13:32Z bpiotrowski $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: Xilon <xilonmu@gmail.com>
pkgname=powertop
-pkgver=2.4
+pkgver=2.5
pkgrel=1
pkgdesc='A tool to diagnose issues with power consumption and power management'
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL2')
depends=('gcc-libs' 'libnl' 'ncurses' 'pciutils')
changelog=$pkgname.changelog
source=(https://01.org/powertop/sites/default/files/downloads/$pkgname-$pkgver.tar.gz)
-sha256sums=('42796c94546ae7f3d232e41b7fa09b2532396ca389908ff528870311db6327b7')
+sha256sums=('8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/pragha/PKGBUILD b/community/pragha/PKGBUILD
index eb59b2dc4..c95f667e1 100644
--- a/community/pragha/PKGBUILD
+++ b/community/pragha/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 96288 2013-08-24 07:44:52Z ttoepper $
+# $Id: PKGBUILD 101337 2013-11-22 22:20:43Z ttoepper $
# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
# Contributor: J0k3r <moebius282 e4a t gmail D0_T com>
# Contributor: Alois Nespor <alois.nespor@gmail.com>
# Contributor: JerichoKru <jerichokru(AT)hotmail.com>
pkgname=pragha
-pkgver=1.1.2.1
+pkgver=1.1.2.2
pkgrel=1
pkgdesc="A lightweight GTK+ music manager - fork of Consonance Music Manager."
arch=('i686' 'x86_64' 'mips64el')
@@ -22,8 +22,8 @@ optdepends=('notification-daemon: OSD notification'
makedepends=('intltool')
replaces=('dissonance')
install=pragha.install
-source=("http://dissonance.googlecode.com/files/pragha-$pkgver.tar.bz2")
-sha1sums=('f8fe9f1f6fa89b6d9657dedad26a90db494b200b')
+source=("https://github.com/matiasdelellis/pragha/releases/download/v$pkgver/pragha-$pkgver.tar.bz2")
+sha1sums=('b415432020c2e1aefc6640cef778ddc70bbeff7f')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/primus/PKGBUILD b/community/primus/PKGBUILD
index e7f024443..31c6f3a31 100644
--- a/community/primus/PKGBUILD
+++ b/community/primus/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Alexander Monakov <amonakov@gmail.com>
pkgname=primus
-pkgver=20131027
+pkgver=20131226
pkgrel=1
pkgdesc="Faster OpenGL offloading for Bumblebee"
arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="https://github.com/amonakov/primus"
license=('custom:ISC')
depends=('bumblebee')
makedepends=('git')
-source=("git://github.com/amonakov/primus.git#commit=31ca47e644")
+source=("git://github.com/amonakov/primus.git#commit=074817614c")
sha1sums=('SKIP')
build() {
diff --git a/community/proj/PKGBUILD b/community/proj/PKGBUILD
index 8cc235515..b6ef035a8 100644
--- a/community/proj/PKGBUILD
+++ b/community/proj/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99963 2013-10-31 02:43:16Z allan $
+# $Id: PKGBUILD 103035 2013-12-25 17:37:50Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
@@ -6,7 +6,7 @@
pkgname=proj
pkgver=4.8.0
-pkgrel=2
+pkgrel=3
pkgdesc='Cartographic Projections library.'
arch=('i686' 'x86_64' 'mips64el')
url="http://trac.osgeo.org/proj/"
diff --git a/community/proj/proj.changelog b/community/proj/proj.changelog
index 24041ea60..52e6673d7 100644
--- a/community/proj/proj.changelog
+++ b/community/proj/proj.changelog
@@ -1,3 +1,6 @@
+2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * proj 4.8.0-3 static library removed
+
2013-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* proj 4.8.0-2 chenyx06a.zip file location fix
diff --git a/community/protobuf-c/PKGBUILD b/community/protobuf-c/PKGBUILD
new file mode 100644
index 000000000..325077e30
--- /dev/null
+++ b/community/protobuf-c/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 101362 2013-11-23 15:09:26Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Maintainer: Aurélien Wailly <aurelien.wailly@gmail.com>
+
+pkgname=protobuf-c
+pkgver=0.15
+pkgrel=3
+pkgdesc='Protocol Buffers implementation in C'
+arch=('i686' 'x86_64')
+url='https://github.com/protobuf-c/protobuf-c'
+license=('BSD')
+depends=('protobuf')
+source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz)
+md5sums=('73ff0c8df50d2eee75269ad8f8c07dc8')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --disable-static
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+}
diff --git a/community/puzzles/PKGBUILD b/community/puzzles/PKGBUILD
index 80347596a..b893946bd 100644
--- a/community/puzzles/PKGBUILD
+++ b/community/puzzles/PKGBUILD
@@ -3,7 +3,7 @@
# Maintainer: schuay <jakob.gruber@gmail.com>
pkgname=puzzles
-pkgver=9893
+pkgver=10098
pkgrel=1
pkgdesc="Simon Tatham's Portable Puzzle Collection"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/pymol/PKGBUILD b/community/pymol/PKGBUILD
new file mode 100644
index 000000000..352ea5f1c
--- /dev/null
+++ b/community/pymol/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com>
+# Contributor: graysky
+# Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
+
+pkgname=pymol
+pkgver=1.6.0.0
+pkgrel=2
+pkgdesc="A USER-SPONSORED molecular visualization system on an OPEN-SOURCE foundation"
+arch=('i686' 'x86_64')
+url="http://pymol.org/"
+license=('custom')
+depends=('glut' 'glew' 'mesa' 'python-pmw' 'tcl' 'tcsh' 'tk')
+source=("http://downloads.sourceforge.net/project/pymol/pymol/1.6/pymol-v${pkgver}.tar.bz2")
+md5sums=('6f5db5beea7497f5a414c8e0cf1ae53d')
+
+prepare() {
+ # suppress non-zero exit code that breaks makepkg
+ sed -i '/sys.exit/ s,2,0,' "${srcdir}/${pkgname}/setup.py"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}"
+ python2 setup.py build
+}
+
+package() {
+ cd "${srcdir}/${pkgname}"
+ python2 setup.py install --prefix="usr/" --root="${pkgdir}"
+
+ sed -i "s|${pkgdir}||g" pymol
+ install -D -m755 "pymol" "${pkgdir}/usr/bin/pymol"
+
+ # change python to python2
+ sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/run"
+ sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/cyg"
+ sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pmg_tk/startup/apbs_tools.py"
+ sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/pymol/pymol_path/test/show"
+
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/python-apsw/PKGBUILD b/community/python-apsw/PKGBUILD
index 99b0954f6..9336e6e1e 100644
--- a/community/python-apsw/PKGBUILD
+++ b/community/python-apsw/PKGBUILD
@@ -4,26 +4,25 @@
pkgbase=python-apsw
pkgname=('python-apsw' 'python2-apsw')
-pkgver=3.7.17_r1
+pkgver=3.8.1
pkgrel=1
arch=('i686' 'x86_64')
url="http://code.google.com/p/apsw/"
license=('MIT')
makedepends=('python' 'python2')
-source=("http://apsw.googlecode.com/files/apsw-${pkgver//_/-}.zip" 'LICENSE')
-
-md5sums=('5393765e7ef55def11dae08149133136'
+source=("http://apsw.googlecode.com/files/apsw-${pkgver}-r1.zip" 'LICENSE')
+md5sums=('83ffdbda803f9ea2091705d35ca6b0e5'
'efc704d50cb39441d00f9dc76cbe6665')
build() {
cd $srcdir
- cp -rf apsw-${pkgver//_/-} apsw2
+ cp -rf apsw-${pkgver}-r1 apsw2
}
package_python-apsw() {
depends=('python' 'sqlite3>=3.7.5')
pkgdesc="Python wrapper for SQLite"
- cd $srcdir/apsw-${pkgver//_/-}
+ cd $srcdir/apsw-${pkgver}-r1
python setup.py install --root=$pkgdir/
install -D -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD
index 9f2704036..6bc90397f 100644
--- a/community/python-pillow/PKGBUILD
+++ b/community/python-pillow/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 98694 2013-10-17 06:08:29Z kkeen $
+# $Id: PKGBUILD 102812 2013-12-21 01:57:46Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: minder
pkgbase=python-pillow
pkgname=(python-pillow python2-pillow)
-pkgver=2.2.1
-pkgrel=2
+pkgver=2.2.2
+pkgrel=1
_appname=Pillow
_py2basever=2.7
_py3basever=3.3m
@@ -15,7 +15,7 @@ url="http://python-imaging.github.io/"
license=('BSD')
makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane')
source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip")
-md5sums=('d1d20d3db5d1ab312da0951ff061e6bf')
+md5sums=('6a76a16f6db45744ff2e9327bf0608b4')
build() {
cd "$srcdir"
diff --git a/community/python-pmw/LICENSE.txt b/community/python-pmw/LICENSE.txt
new file mode 100644
index 000000000..de9a58260
--- /dev/null
+++ b/community/python-pmw/LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright (c) 2007,2008 David M. Cooke <david.m.cooke@gmail.com>
+Copyright (c) 2009,2010 Francesc Alted <faltet@pytables.org>
+Copyright (c) 2011- See AUTHORS.txt
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/community/python-pmw/PKGBUILD b/community/python-pmw/PKGBUILD
new file mode 100644
index 000000000..dd43ef0b5
--- /dev/null
+++ b/community/python-pmw/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com>
+# Contributor: kfgz <kfgz at interia pl>
+# Contributor: Michael Krauss <hippodriver at gmx dot net>
+# Contributor: dsa
+
+pkgname=python-pmw
+pkgver=1.3.3b
+pkgrel=2
+pkgdesc="A toolkit for high-level compound widgets in Python using the Tkinter module"
+arch=('i686' 'x86_64')
+url="http://pmw.sourceforge.net/doc/index.html"
+license=('MIT')
+depends=('python2' 'tk')
+source=(${pkgname}-${pkgver}.tar.gz::http://sourceforge.net/projects/pmw/files/Pmw/Pmw.1.3.3/Pmw_1_3_3b.tar.gz/download
+ "LICENSE.txt")
+md5sums=('d8b998b921584db32a5eeeddc6bc606c'
+ '28b047a148c1780eddcf4bed6b150123')
+
+package() {
+ cd "Pmw"
+ python2 setup.py build
+ python2 setup.py install --prefix=/usr --root="${pkgdir}"
+
+ # change python to python2
+ sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/tests/ManualTests.py"
+ sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/demos/All.py"
+ sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/tests/All.py"
+ sed -i "s|python|python2|g" "${pkgdir}/usr/lib/python2.7/site-packages/Pmw/Pmw_1_3_3/bin/bundlepmw.py"
+
+ install -D -m644 "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD
index 680c12271..5fd1f3ef5 100644
--- a/community/python-psutil/PKGBUILD
+++ b/community/python-psutil/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 99570 2013-10-29 21:24:23Z seblu $
+# $Id: PKGBUILD 102223 2013-12-06 21:38:55Z seblu $
# Maintainer: Sébastien Luttringer
pkgbase=python-psutil
pkgname=('python-psutil' 'python2-psutil')
-pkgver=1.1.2
+pkgver=1.2.1
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://code.google.com/p/psutil/'
license=('custom: BSD')
makedepends=('python' 'python-setuptools' 'python2' 'python2-setuptools')
source=("https://pypi.python.org/packages/source/p/psutil/psutil-$pkgver.tar.gz")
-md5sums=('fe9c9a3ed95fe6564acf8b4500c7b5da')
+md5sums=('80c3b251389771ab472e554e6c729c36')
build() {
cd psutil-$pkgver
diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD
index 14865460f..07f720db3 100644
--- a/community/python-pyopencl/PKGBUILD
+++ b/community/python-pyopencl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100072 2013-11-01 09:31:30Z jelle $
+# $Id: PKGBUILD 102275 2013-12-07 10:37:03Z bpiotrowski $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgbase=python-pyopencl
pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers')
pkgver=2013.2
-pkgrel=1
+pkgrel=2
pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
arch=('i686' 'x86_64')
url="http://mathema.tician.de/software/pyopencl"
diff --git a/community/python-pyzmq/PKGBUILD b/community/python-pyzmq/PKGBUILD
index fa13b0e48..f4c6385bb 100644
--- a/community/python-pyzmq/PKGBUILD
+++ b/community/python-pyzmq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 100379 2013-11-03 07:15:10Z kkeen $
+# $Id: PKGBUILD 102641 2013-12-17 01:18:22Z kkeen $
# Maintainer: Kyle Keen <keenerd at gmail dot com>
pkgbase=python-pyzmq
pkgname=(python2-pyzmq python-pyzmq)
-pkgver=14.0.0
+pkgver=14.0.1
pkgrel=1
pkgdesc="Python bindings for zeromq, written in Cython"
arch=(i686 x86_64 mips64el)
@@ -12,7 +12,7 @@ depends=(zeromq python)
makedepends=(python python2 zeromq)
#source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz)
source=(https://pypi.python.org/packages/source/p/pyzmq/pyzmq-$pkgver.tar.gz)
-md5sums=('ce62ce9807b0b5da0076eaa9cf6cc24e')
+md5sums=('c35fa03e58d48e6f3df2ab2c2dfa1413')
build() {
cd "$srcdir"
diff --git a/community/python-scipy/PKGBUILD b/community/python-scipy/PKGBUILD
index a65d5ae6d..9dc109822 100644
--- a/community/python-scipy/PKGBUILD
+++ b/community/python-scipy/PKGBUILD
@@ -6,7 +6,7 @@
# Contributor: Andrzej Giniewicz <gginiu@gmail.com>
pkgname=('python-scipy' 'python2-scipy')
-pkgver=0.13.0
+pkgver=0.13.2
pkgrel=1
pkgdesc="SciPy is open-source software for mathematics, science, and engineering."
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,6 @@ license=('BSD')
makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy' 'python-setuptools' 'python2-setuptools')
checkdepends=('python-nose' 'python2-nose')
source=("https://pypi.python.org/packages/source/s/scipy/scipy-${pkgver}.tar.gz")
-md5sums=('ffa1e9bfd2bbdf3f17f4cf8139084098')
build() {
# Changing the arithmetic parameter (Thanks to Fabrizio Castellano)
@@ -81,3 +80,4 @@ package_python2-scipy() {
}
# vim:set ts=2 sw=2 et:
+md5sums=('fcd110802b0bf3505ba567cf831566e1')
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index f357a09c9..1bb3b9f72 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 96127 2013-08-20 06:33:00Z lcarlier $
+# $Id: PKGBUILD 102482 2013-12-12 10:34:55Z jelle $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgbase=python-sqlalchemy
pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.8.2
+pkgver=0.8.4
pkgrel=1
arch=('i686' 'x86_64' 'mips64el') # python2 package contain .so
url="http://www.sqlalchemy.org/"
license=('custom: MIT')
makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose')
-source=(http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz)
-md5sums=('78c5bc43fcbc3dea77fa85caa432625d')
+source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz")
+md5sums=('fd517e1bb4031cac1e3fa00108111b38')
build() {
cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
diff --git a/community/python2-gevent-beta/PKGBUILD b/community/python2-gevent-beta/PKGBUILD
deleted file mode 100644
index 820a03cb6..000000000
--- a/community/python2-gevent-beta/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 97219 2013-09-15 11:50:12Z fyan $
-# Maintainer: Felix Yan <felixonmars@gmail.com>
-
-_pkgbase=gevent
-pkgname=python2-${_pkgbase}-beta
-pkgver=1.0rc3
-pkgrel=1
-pkgdesc="Python networking library based on greenlet and libev - Beta version"
-arch=('i686' 'x86_64')
-url="http://www.gevent.org/"
-license=('MIT')
-depends=('python2-greenlet')
-makedepends=('cython2')
-conflicts=('python2-gevent')
-provides=("python2-gevent=$pkgver")
-source=("https://github.com/surfly/gevent/archive/$pkgver.tar.gz")
-
-package() {
- cd "$srcdir/${_pkgbase}-${pkgver}"
- msg "Starting make..."
-
- LIBEV_EMBED=1 \
- CARES_EMBED=1 \
- CYTHON=cython2 \
- PYTHON=python2 \
- python2 setup.py install \
- --prefix=/usr \
- --root="$pkgdir"
-
- install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-sha512sums=('b0c978a7d3690051175edb862ab5a3132ba31e58c6aaa12ea2715d16679650ec05b239c1fb776a410749dc60ff32f53882c2810789f4e89e1bcb76a7a32b1f48')
diff --git a/community/python2-gevent/PKGBUILD b/community/python2-gevent/PKGBUILD
index 5b62ecde1..7cffa0137 100644
--- a/community/python2-gevent/PKGBUILD
+++ b/community/python2-gevent/PKGBUILD
@@ -4,27 +4,33 @@
# Contributor: Ralf Schmitt <ralf@systemexit.de>
pkgname=python2-gevent
-pkgver=0.13.8
-pkgrel=2
+pkgver=1.0
+pkgrel=1
arch=('i686' 'x86_64')
-pkgdesc="Python network library that uses greenlet and libevent for easy and scalable concurrency"
+pkgdesc="Python network library that uses greenlet and libev for easy and scalable concurrency"
license=("MIT")
url="http://www.gevent.org/"
-depends=('libevent' 'python2-greenlet')
-makedepends=('python2-distribute')
-
-source=(http://pypi.python.org/packages/source/g/gevent/gevent-$pkgver.tar.gz)
+depends=('python2-greenlet')
+makedepends=('git' 'cython2')
+provides=('python2-gevent-beta')
+conflicts=('python2-gevent-beta')
+replaces=('python2-gevent-beta')
+source=("git://github.com/surfly/gevent.git#tag=$pkgver")
build() {
- cd "$srcdir/gevent-$pkgver"
+ cd gevent
+
+ LIBEV_EMBED=1 \
+ CARES_EMBED=1 \
+ CYTHON=cython2 \
+ PYTHON=python2 \
python2 setup.py build
}
package() {
- cd "$srcdir/gevent-$pkgver"
+ cd gevent
python2 setup.py install -O1 --root="$pkgdir"
install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- install -Dm0644 LICENSE.pyevent "$pkgdir/usr/share/licenses/$pkgname/LICENSE.pyevent"
}
-md5sums=('ca9dcaa7880762d8ebbc266b11252960')
+md5sums=('SKIP')
diff --git a/community/python2-gnutls/PKGBUILD b/community/python2-gnutls/PKGBUILD
index 55fa82220..adce49d24 100644
--- a/community/python2-gnutls/PKGBUILD
+++ b/community/python2-gnutls/PKGBUILD
@@ -4,20 +4,27 @@
# Contributor: N3RD3X <n3rd3x@linuxmail.org>
pkgname=python2-gnutls
-pkgver=1.2.4
-pkgrel=2
+pkgver=1.2.5
+pkgrel=3
pkgdesc="Python wrapper for the GNUTLS library"
arch=('i686' 'x86_64' 'mips64el')
url="http://cheeseshop.python.org/pypi/python-gnutls"
-depends=('python2' 'gnutls')
+depends=('python2' 'gnutls' 'libgcrypt')
license=('LGPL')
source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz
- gnutls3.patch)
-md5sums=('e3536c421291a791869d875a41dcb26a'
- '24bc95d9f5e71e9f5e180706cbb09248')
+ libraryinit.patch
+ libraryfunctions.patch)
+md5sums=('a398a75b1f366857cf2628cf4d62dd34'
+ '28227b8626e8a7df81cf3b7dae88bd80'
+ '9907d3a446fdc3b33a70e57925d67298')
build() {
cd ${srcdir}/python-gnutls-${pkgver}
- patch -Np0 <$srcdir/gnutls3.patch
+ patch -Np0 <$srcdir/libraryinit.patch
+ patch -Np0 <$srcdir/libraryfunctions.patch
+}
+
+package() {
+ cd ${srcdir}/python-gnutls-${pkgver}
python2 setup.py install --root=${pkgdir}
}
diff --git a/community/python2-gnutls/gnutls3.patch b/community/python2-gnutls/libraryfunctions.patch
index 5110de2f2..da5ad390f 100644
--- a/community/python2-gnutls/gnutls3.patch
+++ b/community/python2-gnutls/libraryfunctions.patch
@@ -1,6 +1,5 @@
-diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
---- gnutls/library/functions.py 2011-08-19 04:48:14.000000000 +0100
-+++ gnutls.fixed/library/functions.py 2012-08-01 11:56:43.450975419 +0100
+--- gnutls/library/functions.py 2011-08-19 07:48:14.000000000 +0400
++++ gnutls.fixed/library/functions.py 2013-12-17 21:08:35.512682514 +0400
@@ -4,7 +4,7 @@
import sys
from ctypes import *
@@ -223,49 +222,3 @@ diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get
gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
gnutls_x509_rdn_get.restype = c_int
-diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py
---- gnutls/library/__init__.py 2011-11-11 17:23:49.000000000 +0000
-+++ gnutls.fixed/library/__init__.py 2012-08-01 11:57:42.284290997 +0100
-@@ -53,6 +53,9 @@
- else:
- raise RuntimeError('cannot find lib%s on this system' % name)
-
-+def do_nothing(*args, **kwargs):
-+ pass
-+
-
- def initialize_gcrypt():
- from ctypes import c_void_p
-@@ -104,7 +107,7 @@
- libgcrypt = load_library(name='gcrypt', version=11)
- gcry_control = libgcrypt.gcry_control
- else:
-- gcry_control = libgnutls.gcry_control
-+ gcry_control = do_nothing
-
- gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
- if system == 'cygwin':
-@@ -117,12 +120,10 @@
-
-
-
--libgnutls = load_library(name='gnutls', version=26)
--libgnutls_extra = load_library(name='gnutls-extra', version=26)
-+libgnutls = load_library(name='gnutls', version=28)
-
- initialize_gcrypt()
- libgnutls.gnutls_global_init()
--libgnutls_extra.gnutls_global_init_extra()
-
-
- from gnutls.library import constants
-@@ -136,9 +137,6 @@
- if functions.gnutls_check_version(__need_version__) is None:
- version = functions.gnutls_check_version(None)
- raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__))
--if functions.gnutls_extra_check_version(__need_version__) is None:
-- version = functions.gnutls_extra_check_version(None)
-- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
-
-
- del get_system_name, library_locations, load_library, initialize_gcrypt
diff --git a/community/python2-gnutls/libraryinit.patch b/community/python2-gnutls/libraryinit.patch
new file mode 100644
index 000000000..5f987b513
--- /dev/null
+++ b/community/python2-gnutls/libraryinit.patch
@@ -0,0 +1,40 @@
+--- gnutls/library/__init__.py 2013-12-12 20:29:45.000000000 +0400
++++ gnutls.fixed/library/__init__.py 2013-12-17 20:56:48.637256402 +0400
+@@ -104,10 +104,11 @@
+ libgcrypt = load_library(name='gcrypt', version=11)
+ gcry_control = libgcrypt.gcry_control
+ else:
+- gcry_control = libgnutls.gcry_control
++ libgcrypt = load_library(name='gcrypt', version=11)
++ gcry_control = libgcrypt.gcry_control
+
+ gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
+- libgnutls.gcry_check_version('1.2.4') # GNUTLS_MIN_LIBGCRYPT_VERSION
++ libgcrypt.gcry_check_version('1.2.4') # GNUTLS_MIN_LIBGCRYPT_VERSION
+ if system == 'cygwin':
+ gcry_control(GCRYCTL_DISABLE_SECMEM, 0)
+ else:
+@@ -118,12 +119,10 @@
+
+
+
+-libgnutls = load_library(name='gnutls', version=26)
+-libgnutls_extra = load_library(name='gnutls-extra', version=26)
++libgnutls = load_library(name='gnutls', version=28)
+
+ initialize_gcrypt()
+ libgnutls.gnutls_global_init()
+-libgnutls_extra.gnutls_global_init_extra()
+
+
+ from gnutls.library import constants
+@@ -137,9 +136,6 @@
+ if functions.gnutls_check_version(__need_version__) is None:
+ version = functions.gnutls_check_version(None)
+ raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__))
+-if functions.gnutls_extra_check_version(__need_version__) is None:
+- version = functions.gnutls_extra_check_version(None)
+- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
+
+
+ del get_system_name, library_locations, load_library, initialize_gcrypt
diff --git a/community/python2-nautilus/PKGBUILD b/community/python2-nautilus/PKGBUILD
index bf36dd40c..61cd1be28 100644
--- a/community/python2-nautilus/PKGBUILD
+++ b/community/python2-nautilus/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99969 2013-10-31 02:45:16Z allan $
+# $Id: PKGBUILD 101714 2013-11-30 14:43:56Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
# Contributor: Giorgio Gilestro <giorgio@gilest.ro>
pkgname=python2-nautilus
_pkgname=nautilus-python
pkgver=1.1
-pkgrel=3
+pkgrel=4
pkgdesc="Python bindings for the Nautilus Extension API"
arch=('i686' 'x86_64' 'mips64el')
url="http://projects.gnome.org/nautilus-python/"
diff --git a/community/python2-pycdio/PKGBUILD b/community/python2-pycdio/PKGBUILD
index 5911091ac..418557d2e 100644
--- a/community/python2-pycdio/PKGBUILD
+++ b/community/python2-pycdio/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 86447 2013-03-17 10:57:47Z fyan $
+# $Id: PKGBUILD 101971 2013-12-03 03:22:58Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Alessandro Pezzoni <donbex at nerdshack dot com>
pkgname=python2-pycdio
-pkgver=0.19
-pkgrel=2
+pkgver=0.20
+pkgrel=1
pkgdesc="Python OO interface to libcdio (CD Input and Control library)"
arch=("i686" "x86_64" "mips64el")
url="http://pypi.python.org/pypi/pycdio/"
license=('GPL')
depends=('python2' 'libcdio')
-makedepends=('python2-distribute' 'pkg-config' 'swig')
+makedepends=('python2-setuptools' 'swig')
options=(!emptydirs)
source=("http://pypi.python.org/packages/source/p/${pkgname#python2-}/${pkgname#python2-}-${pkgver}.tar.gz")
-md5sums=('a6b00666ce8d77ab80a4084a8ff1136b')
package() {
- cd "$srcdir/${pkgname#python2-}-$pkgver"
+ cd "${pkgname#python2-}-$pkgver"
python2 setup.py install --root="$pkgdir/" --optimize=1
}
# vim:set ts=2 sw=2 et:
+sha512sums=('b53a535440008dc637b31fd2cda22845c91b98e78c30f90c866af3b9bf7cb3faad39f0784b5063a39bd97bb18fc58c75ad0833d53421182d408c2889c491846b')
diff --git a/community/python2-tagpy/PKGBUILD b/community/python2-tagpy/PKGBUILD
index 7989e8964..52301e348 100644
--- a/community/python2-tagpy/PKGBUILD
+++ b/community/python2-tagpy/PKGBUILD
@@ -1,31 +1,32 @@
-# $Id: PKGBUILD 94045 2013-07-13 12:36:26Z svenstaro $
+# $Id: PKGBUILD 102273 2013-12-07 10:37:01Z bpiotrowski $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
# Contributor: Scott Horowitz <stonecrest@gmail.com>
pkgname=python2-tagpy
-pkgver=0.94.8
-pkgrel=4
+pkgver=2013.1
+pkgrel=1
pkgdesc='Python bindings for TagLib'
arch=('x86_64' 'i686' 'mips64el')
url='http://pypi.python.org/pypi/tagpy'
license=('MIT')
depends=('python2' 'taglib' 'boost-libs')
-makedepends=('python2-distribute' 'boost')
+makedepends=('python2-setuptools' 'boost')
replaces=('tagpy')
conflicts=('tagpy')
source=("http://pypi.python.org/packages/source/t/tagpy/tagpy-$pkgver.tar.gz"
'taglib1.7.patch')
-sha256sums=('56eab8dd81510f8af18e19375a0ffd5cd25c8e555104be46a92c3dc08634a0dc'
+sha256sums=('80481c78ce34878e7a1f3231acd781a3bf1b0b569c70ce0e8d63af58061152f4'
'f6cc34f8d4d1186270943cd7e1ad3c9478ae7064ab9b2cddf7760d493295cd26')
prepare() {
cd "tagpy-$pkgver"
- patch -p1 -i "$srcdir/taglib1.7.patch"
+# patch -p1 -i "$srcdir/taglib1.7.patch"
sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
$(find . -name '*.py')
+
}
build() {
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index 5c6cec38f..8dbe5a252 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99094 2013-10-24 11:49:04Z spupykin $
+# $Id: PKGBUILD 102798 2013-12-20 11:28:08Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
# Contributor: Giovanni Scafora <linuxmania@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=qcad
-pkgver=3.4.0.0
+pkgver=3.4.5.0
pkgrel=1
pkgdesc="A 2D CAD package based upon Qt"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,16 +13,15 @@ url="http://www.ribbonsoft.com/qcad.html"
license=('GPL3')
depends=('qtwebkit')
makedepends=('glu')
-options=(libtool)
+options=('libtool')
source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz
QCad.desktop)
-md5sums=('b781fb8dcf8ba2725bbccf315a1da44f'
- '35100eaedbdf6625f6e6a09b177854cd')
+md5sums=('d7e5a77d05bdc7f6d5762029ec03fc2d'
+ '84f189dd152e7614a1265659dac6222d')
prepare() {
cd ${srcdir}/qcad-$pkgver
-# sed -i '1,1i#include <unistd.h>' src/core/{RLocalPeer,RS}.cpp
-# sed -i '1,1i#include <sys/sysinfo.h>' src/core/{RScriptHandler,RS}.cpp
+ sed -i '1,1i#include <stdint.h>' src/core/RThread.cpp
}
build() {
diff --git a/community/qcad/QCad.desktop b/community/qcad/QCad.desktop
index 407319aa2..5476c67d3 100644
--- a/community/qcad/QCad.desktop
+++ b/community/qcad/QCad.desktop
@@ -6,4 +6,4 @@ Name=QCad
StartupNotify=true
Terminal=false
Type=Application
-Categories=Application;Office;
+Categories=Application;Development;Electronics;Engineering;
diff --git a/community/qiv/PKGBUILD b/community/qiv/PKGBUILD
index 6c3350d74..114544c59 100644
--- a/community/qiv/PKGBUILD
+++ b/community/qiv/PKGBUILD
@@ -1,25 +1,37 @@
-# $Id: PKGBUILD 83178 2013-01-27 16:25:48Z pierre $
+# $Id: PKGBUILD 103185 2013-12-29 03:26:56Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=qiv
-pkgver=2.2.4
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
pkgdesc="Quick Image Viewer (qiv) is a very small and fast GDK/Imlib image viewer"
arch=('i686' 'x86_64' 'mips64el')
url="http://spiegl.de/qiv/"
license=('GPL2')
-depends=('file' 'gtk2' 'imlib2')
+depends=('file' 'gtk2' 'imlib2' 'libexif' 'lcms2' 'desktop-file-utils')
+install=qiv.install
source=(http://spiegl.de/qiv/download/$pkgname-$pkgver.tgz)
-md5sums=('1425f89c90f9c045858fccf24d894c97')
+md5sums=('93aea7469be64ebd35277a6dac079fc8')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ sed -i "s|^PREFIX = .*|PREFIX = /usr|" Makefile
+ sed -i "s|\./qiv|echo &|" Makefile # nuke test
+ sed -i "s|/man/|/share&|" Makefile
make
}
package() {
cd "$srcdir/$pkgname-$pkgver"
- install -D -m 0755 qiv "$pkgdir/usr/bin/qiv"
- install -D -m 0644 qiv.1 "$pkgdir/usr/share/man/man1/qiv.1"
+ sed -i "s|^PREFIX = .*|PREFIX = $pkgdir/usr|" Makefile
+ make install
+
+ install -D -m 0644 README "$pkgdir/usr/share/doc/qiv/README"
+ install -d "$pkgdir/usr/share/doc/qiv/contrib"
+ cp contrib/* "$pkgdir/usr/share/doc/qiv/contrib"
+ #install -D -m 0755 contrib/gps2url.py "$pkgdir/usr/share/doc/qiv/contrib/gps2url.py"
+ #install -D -m 0755 contrib/qiv-command.example "$pkgdir/usr/share/doc/qiv/contrib/qiv-command.example"
}
+
diff --git a/community/qiv/qiv.install b/community/qiv/qiv.install
new file mode 100644
index 000000000..660593cf5
--- /dev/null
+++ b/community/qiv/qiv.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD
index 2872d3f50..5e6546abf 100644
--- a/community/qmmp/PKGBUILD
+++ b/community/qmmp/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 98072 2013-10-05 17:15:55Z jlichtblau $
+#$Id: PKGBUILD 103152 2013-12-27 20:10:05Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=qmmp
-pkgver=0.7.3
+pkgver=0.7.4
pkgrel=1
pkgdesc="Qt4 based audio-player"
arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ optdepends=('flac: native FLAC support'
install=$pkgname.install
changelog=$pkgname.changelog
source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2)
-sha256sums=('57e4e1a00450a5a094b290df5410f8ab5a80da364ad3f1402835573cb0b75562')
+sha256sums=('ba10d0595b99495587643584c9c8400e6eb987bd2e4bbb30c1060c507f44b4f2')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog
index d279bfb82..ca8e921c9 100644
--- a/community/qmmp/qmmp.changelog
+++ b/community/qmmp/qmmp.changelog
@@ -1,3 +1,6 @@
+2013-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * qmmp 0.7.4-1
+
2013-10-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* qmmp 0.7.3-1
diff --git a/community/qt-recordmydesktop/PKGBUILD b/community/qt-recordmydesktop/PKGBUILD
index e674f7b6e..821b9cb4a 100644
--- a/community/qt-recordmydesktop/PKGBUILD
+++ b/community/qt-recordmydesktop/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92883 2013-06-17 19:06:55Z andrea $
+# $Id: PKGBUILD 101791 2013-12-01 09:48:42Z jelle $
# Maintainer: Thomas Dziedzic < gostrc at gmail >
# Contributor: Daniel J Griffiths <griffithsdj@archlinux.us>
# Contributor: Allan McRae <allan@archlinux.org>
@@ -6,12 +6,12 @@
pkgname=qt-recordmydesktop
pkgver=0.3.8
-pkgrel=6
+pkgrel=7
pkgdesc="Qt4 frontend for recordMyDesktop"
arch=('i686' 'x86_64' 'mips64el')
url="http://recordmydesktop.sourceforge.net"
license=('GPL')
-depends=('recordmydesktop>=0.3.8.1' 'python2-pyqt')
+depends=('recordmydesktop>=0.3.8.1' 'python2-pyqt' 'xorg-xwininfo')
source=(http://downloads.sourceforge.net/sourceforge/recordmydesktop/${pkgname}-${pkgver}.tar.gz
'pyqt4.patch')
md5sums=('bf1525740755615ae172ae27fef68fb5'
diff --git a/community/qtcreator/fix-build.patch b/community/qtcreator/fix-build.patch
deleted file mode 100644
index 5cf2a503b..000000000
--- a/community/qtcreator/fix-build.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qt-creator-2.6.2-src/qtcreator.pri~ 2013-02-27 13:55:23.818990553 +0000
-+++ qt-creator-2.6.2-src/qtcreator.pri 2013-02-27 13:55:52.335454428 +0000
-@@ -147,6 +147,7 @@
- }
-
- INCLUDEPATH += \
-+ /usr/include \
- $$IDE_BUILD_TREE/src \ # for <app/app_version.h>
- $$IDE_SOURCE_TREE/src/libs \
- $$IDE_SOURCE_TREE/tools \
diff --git a/community/quassel/PKGBUILD b/community/quassel/PKGBUILD
index 69801123a..290a3aa11 100644
--- a/community/quassel/PKGBUILD
+++ b/community/quassel/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 98503 2013-10-12 08:31:51Z jlichtblau $
+# $Id: PKGBUILD 100661 2013-11-07 19:56:29Z jelle $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgbase=quassel
pkgname=('quassel-client' 'quassel-core')
pkgver=0.9.1
-pkgrel=1
+pkgrel=3
pkgdesc="QT4 irc client with a separated core"
arch=('i686' 'x86_64' 'mips64el')
url="http://quassel-irc.org/"
license=('GPL')
-makedepends=('cmake' 'automoc4' 'qt4' 'icu')
+makedepends=('cmake' 'automoc4' 'qt4' 'icu' 'kdelibs')
source=(http://quassel-irc.org/pub/$pkgbase-$pkgver.tar.bz2
$pkgbase.service
$pkgbase.conf)
sha256sums=('39e97bd67160d6575a57d4f71c4b1be5c13461ca238baef462ab43164419864e'
- '81222ce0a868993dbe80572f34a555d7fedf07f87413803b7e40397ec283161e'
+ '88b5b693ad7eea7fb2d084da29c6abc26ea5fa990668f9807d462778243f1d6a'
'f3031ea8217e01ba42cea14606169e3e27affa5918968ffd5a03c21ae92fe2b8')
build() {
diff --git a/community/quassel/quassel.service b/community/quassel/quassel.service
index cdc7d0890..25a132c7f 100644
--- a/community/quassel/quassel.service
+++ b/community/quassel/quassel.service
@@ -3,8 +3,11 @@ Description=Quassel Core
After=network.target
[Service]
+User=quassel
+Group=quassel
PIDFile=/var/run/quassel.pid
-ExecStart=/usr/bin/quasselcore --listen=127.0.0.1 --configdir=/var/lib/quassel
+EnvironmentFile=/etc/conf.d/quassel
+ExecStart=/usr/bin/quasselcore --listen=${LISTEN} --configdir=/var/lib/quassel
[Install]
WantedBy=multi-user.target
diff --git a/community/quvi/PKGBUILD b/community/quvi/PKGBUILD
index 99f841783..b0f7c2f39 100644
--- a/community/quvi/PKGBUILD
+++ b/community/quvi/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 99976 2013-10-31 02:47:38Z allan $
+# $Id: PKGBUILD 100868 2013-11-12 17:03:37Z heftig $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: joyfulgirl@archlinux.us
pkgname=quvi
-pkgver=0.9.3.1
-pkgrel=2
+pkgver=0.9.5
+pkgrel=1
pkgdesc='Command-line tool for parsing video download links.'
arch=('i686' 'x86_64' 'mips64el')
url='http://quvi.sourceforge.net/'
license=('AGPL3')
-depends=('libquvi')
+depends=('libquvi' 'libxml2' 'json-glib')
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
-md5sums=('24b3173f8662a6bb33d9a8a58662764f'
+md5sums=('baa1d7b25e9fd173e952e27d4aa4b933'
'SKIP')
build() {
diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD
index 52d45b620..e0fe27250 100644
--- a/community/radvd/PKGBUILD
+++ b/community/radvd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98000 2013-10-02 23:02:19Z seblu $
+# $Id: PKGBUILD 101735 2013-11-30 16:21:06Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Mark Smith <markzzzsmith@yahoo.com.au>
pkgname=radvd
-pkgver=1.9.5
+pkgver=1.9.7
pkgrel=1
pkgdesc='IPv6 Router Advertisement Daemon'
url='http://www.litech.org/radvd/'
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el')
backup=('etc/radvd.conf')
source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz"
"$pkgname.service")
-sha1sums=('0e65206803ab2bcb4e6012a0d11ecdad4f64ce9c'
+sha1sums=('92f7eadfee951f787e861f41c344689416f3f504'
'2fdba3b0ed28c67dc1c04bfd1439fa4dece88bbc')
build() {
cd ${pkgname}-${pkgver}
diff --git a/community/rdesktop/PKGBUILD b/community/rdesktop/PKGBUILD
new file mode 100644
index 000000000..9ed9c79c0
--- /dev/null
+++ b/community/rdesktop/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 101267 2013-11-21 12:16:40Z bpiotrowski $
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Dan McGee <dan@archlinux.org>
+
+pkgname=rdesktop
+pkgver=1.8.1
+pkgrel=1
+pkgdesc="An open source client for Windows Remote Desktop Services"
+arch=('i686' 'x86_64')
+url="http://www.rdesktop.org/"
+license=('GPL3')
+depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+ rdesktop-send_physical_buttons.diff)
+sha1sums=('57bb41f98ddf9eeef875c613d790fee37971d0f8'
+ '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ # FS#15113
+ patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr \
+ --enable-smartcard \
+ --with-ipv6
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/rdesktop/rdesktop-send_physical_buttons.diff b/community/rdesktop/rdesktop-send_physical_buttons.diff
index 69620988f..69620988f 100644
--- a/extra/rdesktop/rdesktop-send_physical_buttons.diff
+++ b/community/rdesktop/rdesktop-send_physical_buttons.diff
diff --git a/community/recoll/PKGBUILD b/community/recoll/PKGBUILD
index 0d25aaaae..181b61d75 100644
--- a/community/recoll/PKGBUILD
+++ b/community/recoll/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96952 2013-09-09 09:19:39Z spupykin $
+# $Id: PKGBUILD 101662 2013-11-29 20:55:41Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,7 +6,7 @@
# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
pkgname=recoll
-pkgver=1.19.5
+pkgver=1.19.11_p1
pkgrel=1
pkgdesc="Full text search tool based on Xapian backend"
arch=('i686' 'x86_64' 'mips64el')
@@ -30,11 +30,11 @@ optdepends=('libxslt: for XML based formats (fb2,etc)'
'perl-image-exiftool: EXIF data from raw files'
'aspell-en: English stemming support')
install=recoll.install
-source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('4a770950d47dee4f6b4ef95e1bc16a5a')
+source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-${pkgver/_/}.tar.gz")
+md5sums=('5d77a74cddba4e21f7f3bb06ad20a7ac')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/_/}"
msg2 "Python2 fix"
export PYTHON=/usr/bin/python2
@@ -54,7 +54,7 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir/$pkgname-${pkgver/_/}"
make DESTDIR="$pkgdir" install
}
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 2d16fcbbd..20cfff99b 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97559 2013-09-24 10:30:40Z spupykin $
+# $Id: PKGBUILD 102497 2013-12-12 12:51:43Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
# Contributor: nofxx <x@<nick>.com>
pkgname=redis
-pkgver=2.6.16
-pkgrel=2
+pkgver=2.8.3
+pkgrel=1
pkgdesc="Advanced key-value store"
arch=('i686' 'x86_64' 'mips64el')
url="http://redis.io/"
@@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz"
"redis.service"
"redis.logrotate"
"redis.tmpfiles.d")
-md5sums=('ca1b81bd56fe0c5e2c8ec443a95c908d'
+md5sums=('6327e6786130b556b048beef0edbdfa7'
'5320aa6d0f31aadc1d6202ca40425aea'
'9e2d75b7a9dc421122d673fe520ef17f'
'dd9ab8022b4d963b2e5899170dfff490')
diff --git a/community/redshift/165_164.diff b/community/redshift/165_164.diff
deleted file mode 100644
index 663b5663b..000000000
--- a/community/redshift/165_164.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-=== modified file 'src/location-geoclue.c'
---- src/location-geoclue.c 2011-03-27 22:14:58 +0000
-+++ src/location-geoclue.c 2011-07-12 20:30:30 +0000
-@@ -50,14 +50,20 @@
- int
- location_geoclue_start(location_geoclue_state_t *state)
- {
-- GeoclueMaster *master = NULL;
-- GeoclueMasterClient *client = NULL;
-- GError *error = NULL;
-- gchar *name = NULL;
-+ if (state->provider && state->provider_path) {
-+ state->position = geoclue_position_new(state->provider,
-+ state->provider_path);
-+ } else {
-+ GeoclueMaster *master = geoclue_master_get_default();
-+ GeoclueMasterClient *client = geoclue_master_create_client(master,
-+ NULL, NULL);
-+ GError *error = NULL;
-
-- if (!(state->provider && state->provider_path)) {
-- master = geoclue_master_get_default();
-- client = geoclue_master_create_client(master, NULL, NULL);
-+ if (client == NULL) {
-+ g_printerr(_("Unable to obtain master client.\n"));
-+ g_object_unref(master);
-+ return -1;
-+ }
-
- if (!geoclue_master_client_set_requirements(client,
- GEOCLUE_ACCURACY_LEVEL_REGION,
-@@ -68,15 +74,18 @@
- error->message);
- g_error_free(error);
- g_object_unref(client);
-+ g_object_unref(master);
-
- return -1;
- }
-
- state->position = geoclue_master_client_create_position(client, NULL);
-- } else {
-- state->position = geoclue_position_new(state->provider,
-- state->provider_path);
-- }
-+
-+ g_object_unref(client);
-+ g_object_unref(master);
-+ }
-+
-+ gchar *name = NULL;
-
- if (geoclue_provider_get_provider_info(GEOCLUE_PROVIDER(state->position),
- &name, NULL, NULL)) {
-
diff --git a/community/redshift/PKGBUILD b/community/redshift/PKGBUILD
index d4257a2c5..d108ac275 100644
--- a/community/redshift/PKGBUILD
+++ b/community/redshift/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 95564 2013-08-14 09:35:51Z lfleischer $
+# $Id: PKGBUILD 103169 2013-12-28 17:00:30Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Geoffrey Teale <tealeg@stop-squark>
# Contributor: Mark, Huo Mian <markhuomian[at]gmail[dot]com>
# Contributor: Biginoz <biginoz a free dot fr>
pkgname=redshift
-pkgver=1.7
-pkgrel=7
+pkgver=1.8
+pkgrel=1
pkgdesc='Adjusts the color temperature of your screen according to your surroundings.'
arch=('i686' 'x86_64' 'mips64el')
url='http://jonls.dk/redshift/'
@@ -17,18 +17,12 @@ optdepends=('pygtk: for gtk-redshift'
'librsvg: for gtk-redshift')
makedepends=('python2')
install='redshift.install'
-source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"
- '165_164.diff')
-md5sums=('c56512afa292b5a94b715ed4a1841d4c'
- 'eaafcdc62a47d725c256cd5473f4efa1')
+source=("http://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('a05c34bc7b8fbb4f5d546a0b5cca5d6f')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's/python/python2/' src/gtk-redshift/gtk-redshift
-
- # fix GTK UI segmentation fault (fixes FS#33412)
- patch -p0 -i ../165_164.diff
+ sed -i 's/python/python2/' src/redshift-gtk/redshift-gtk
}
build() {
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index d4c4e9f15..dcd7122a6 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 93287 2013-07-01 06:22:40Z andrea $
+# $Id: PKGBUILD 101077 2013-11-16 03:53:07Z andrea $
# Maintainer: Peter Lewis <plewis@aur.archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
pkgname=rekonq
-pkgver=2.3.2
+pkgver=2.4.0
pkgrel=1
pkgdesc='A WebKit based web browser for KDE'
arch=('i686' 'x86_64' 'mips64el')
@@ -15,11 +15,14 @@ makedepends=('cmake' 'automoc4')
optdepends=('kdebase-konqueror: search engines support'
'qca-ossl: to use the sync handler')
install=${pkgname}.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('9cfdb7e02a08ad4d2b5dd6e8bd1c85c11013f41a3186c8c5c22454093722bc74')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('660f40fe612b6706623977d8cdb94b49aaacdb53aac2689d95f02d782ce2715b')
-build(){
+prepare() {
mkdir build
+}
+
+build(){
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/community/rocksndiamonds/PKGBUILD b/community/rocksndiamonds/PKGBUILD
index 52a52e4c1..09d815b44 100644
--- a/community/rocksndiamonds/PKGBUILD
+++ b/community/rocksndiamonds/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78773 2012-10-24 12:38:16Z spupykin $
+# $Id: PKGBUILD 101193 2013-11-19 11:01:48Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Jacek Poplawski <jacekpoplawski@gmail.com>
pkgname=rocksndiamonds
-pkgver=3.3.0.1
-pkgrel=3
+pkgver=3.3.1.1
+pkgrel=2
pkgdesc="game similiar to Boulderdash with lots of levels"
arch=(i686 x86_64 'mips64el')
url="http://www.artsoft.org/rocksndiamonds/"
@@ -13,17 +13,19 @@ depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg')
makedepends=('unzip' 'p7zip')
source=(http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$pkgver.tar.gz
rocksndiamonds.desktop)
-md5sums=('813ced99d54f89db7c593c518d197d18'
+md5sums=('d897ddfb1b14123240a6dbc207ca27ee'
'18a3541db4d71feb0ad3b50ea4006738')
build() {
- depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg' 'rocksndiamonds-data')
- cd $srcdir
-
- # main
cd $srcdir/rocksndiamonds-$pkgver
make clean
make RO_GAME_DIR=/usr/share/rocksndiamonds RW_GAME_DIR=/usr/share/rocksndiamonds
+}
+
+package() {
+ depends=('sdl' 'sdl_image' 'sdl_mixer' 'sdl_net' 'smpeg' 'rocksndiamonds-data')
+
+ cd $srcdir/rocksndiamonds-$pkgver
install -d $pkgdir/usr/bin
install -d $pkgdir/usr/share/man/man1
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 9f67b70bd..50df0b3f8 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99982 2013-10-31 02:49:38Z allan $
+# $Id: PKGBUILD 102435 2013-12-11 10:18:07Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=rsyslog
-pkgver=7.4.4
+pkgver=7.4.7
pkgrel=1
pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
url="http://www.rsyslog.com/"
@@ -22,7 +22,7 @@ options=('strip' 'zipman')
source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
'rsyslog.logrotate'
'rsyslog.conf')
-md5sums=('ebcc010a6205c28eb505c0fe862f32c6'
+md5sums=('c96850bd9d07780ea7398ac86df385ae'
'0d990373f5c70ddee989296007b4df5b'
'd61dd424e660eb16401121eed20d98bc')
diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD
index a2494068f..1d4d24942 100644
--- a/community/rubinius/PKGBUILD
+++ b/community/rubinius/PKGBUILD
@@ -1,36 +1,37 @@
-# $Id: PKGBUILD 98826 2013-10-19 20:58:03Z heftig $
+# $Id: PKGBUILD 103201 2013-12-29 21:58:18Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=rubinius
pkgname=(rubinius rubinius-ruby)
-pkgver=2.1.1
+pkgver=2.2.3
pkgrel=1
pkgdesc="Ruby runtime written in Ruby, designed for concurrency"
arch=(i686 x86_64)
url="http://rubini.us"
license=(custom)
depends=(llvm-libs libffi openssl libyaml)
-makedepends=(llvm ruby chrpath)
+makedepends=(llvm rubinius-ruby)
options=(!emptydirs)
source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2
- http://rubygems.org/downloads/bundler-1.3.5.gem
- gemrc)
-sha256sums=('e142c3f201e4ae9f3a6e6671298baabbd9bd906509c663adcf080bff4181ee96'
- '08b89047f7b829f3e197a28fb1bde74c3f5cfea1552f99dfba237fee30eaffe4'
- '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614')
+ gemrc dirs.patch)
+sha256sums=('b3426aa6996420f1d9d8a7926a94160b84d8bdf725793c64462b27b74f2f2acf'
+ '4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614'
+ '93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66')
prepare() {
- export GEM_HOME="$srcdir/gemdir"
+ export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8"
cd $pkgbase-$pkgver
+ patch -Np1 -i ../dirs.patch
+
mkdir -p "$GEM_HOME"
- gem install --no-user-install -N ../bundler-1.3.5.gem
+ gem install --no-user-install -N vendor/cache/bundler-*.gem
"$GEM_HOME/bin/bundle" install --local
}
build() {
- export GEM_HOME="$srcdir/gemdir"
+ export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8"
cd $pkgbase-$pkgver
./configure --prefix=/usr \
@@ -39,29 +40,26 @@ build() {
--appdir=/usr/lib/rubinius \
--gemsdir=/usr/lib/rubinius/gems \
--preserve-prefix \
- --llvm-shared
+ --llvm-shared \
+ --without-rpath
rake build
}
check() {
- export GEM_HOME="$srcdir/gemdir"
+ export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8"
cd $pkgbase-$pkgver
rake vm:test || :
}
package_rubinius() {
- optdepends=('rubinius-docs: Rubinius documentation'
- 'ruby-docs: Ruby documentation')
+ optdepends=('ruby-docs: Ruby documentation')
- export GEM_HOME="$srcdir/gemdir"
+ export GEM_HOME="$srcdir/gemdir" LANG="en_US.UTF-8"
cd $pkgbase-$pkgver
DESTDIR="$pkgdir" rake install
- find "$pkgdir" -name "*.so" -exec chrpath -d {} +
- chrpath -d "$pkgdir/usr/bin/rbx"
-
mkdir -p "$pkgdir/usr/share/ri"
ln -s 2.0.0 "$pkgdir/usr/share/ri/2.1"
diff --git a/community/ruby-cairo/PKGBUILD b/community/ruby-cairo/PKGBUILD
index 5678a24b6..0b0ef4e3e 100644
--- a/community/ruby-cairo/PKGBUILD
+++ b/community/ruby-cairo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87182 2013-03-28 13:42:37Z arodseth $
+# $Id: PKGBUILD 102505 2013-12-12 14:34:05Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: Jeremy <reebydobalina@yahoo.ca>
pkgname=ruby-cairo
-pkgver=1.12.2
-pkgrel=7
+pkgver=1.12.6
+pkgrel=1
pkgdesc='Ruby bindings for cairo'
arch=('x86_64' 'i686' 'mips64el')
url='http://cairographics.org/rcairo/'
@@ -13,7 +13,7 @@ license=('GPL')
depends=('ruby' 'cairo')
makedepends=('ruby-pkgconfig')
source=("http://cairographics.org/releases/rcairo-$pkgver.tar.gz")
-sha256sums=('f071d6ccb12cb6dc1fc91eb086d6150ce779930fe5af38a6987e378c809362c5')
+sha256sums=('e7ff8d49a730662b3f999187fde45ac0b8651996fe7f9a952496be8b6e45800e')
build() {
cd "$srcdir/rcairo-$pkgver"
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index 3046bc23a..1a6718f5c 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,111 +1,155 @@
-# $Id: PKGBUILD 96935 2013-09-09 01:33:22Z dwallace $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Osman Ugus <ugus11@yahoo.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# $Id: PKGBUILD 102937 2013-12-24 15:23:39Z arcanis $
+# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Antonio Rojas <nqn1976 at gmail dot com>
+# Contributor: Thomas Dziedzic <gostrc at gmail dot com>
+# Contributor: Osman Ugus <ugus11 at yahoo dot com>
+# Contributor: Stefan Husmann <stefan-husmann at t-online dot de>
# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
pkgname=sage-mathematics
-pkgver=5.11
-pkgrel=1
-pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
-url='http://www.sagemath.org'
+pkgver=6.0
+pkgrel=2
+pkgdesc="SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab"
arch=('i686' 'x86_64')
+url="http://www.sagemath.org"
license=('GPL')
-#depends=('xz' 'java-environment=7' 'desktop-file-utils' 'libxmu' 'libtiff' 'sqlite' 'libjpeg-turbo')
-depends=('desktop-file-utils')
-makedepends=('gcc-fortran' 'freetype2')
+#depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 'libxmu' 'sqlite' 'xz')
+depends=('freetype2>=2.3.5')
+makedepends=('gcc-fortran' 'gendesk' 'desktop-file-utils')
optdepends=('imagemagick: some plotting functionality benefits from it'
'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
'openssh: to use the notebook in secure mode'
'ffmpeg: to show animations'
'cairo: R plots')
-install="${pkgname}.install"
source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
- 'SAGE-notebook.desktop'
- 'sage.service')
+ "fix-pil.patch"
+ "sage.service")
+install="${pkgname}.install"
+md5sums=('da1bacf90fc291e736aaa71431e8874e'
+ 'de54cb818d74c070a524fc3fd5208b2c'
+ '985da1c1d1dcdc3ea9aa73035cb7996b')
-build() {
- cd sage-${pkgver}
+prepare() {
+ # create *.desktop file
+ gendesk -n \
+ --pkgname="sage-notebook" \
+ --pkgdesc="sage notebook" \
+ --name="sage" \
+ --exec="/opt/sage/sage -notebook" \
+ --terminal=true \
+ --categories="Science;Math" \
+ --custom="StartupNotify=true
+X-DCOP-ServiceType=
+X-KDE-SubstituteUID=false
+X-KDE-Username="
+
+ # create DOT_SAGE directory
+ if [[ -d ${srcdir}/build ]]; then
+ rm -rf "${srcdir}/build"
+ fi
+ mkdir "${srcdir}/build"
+
+ # according to FS#34769
+ # NOTE: there is an error in pil build (freetype/fterrors.h not found)
+ cd "${srcdir}/sage-${pkgver}/upstream/"
+ tar xjfv pil-1.1.6.tar.bz2
+ rm -r pil-1.1.6.tar.bz2
+ patch -p0 -i "${srcdir}/fix-pil.patch"
+ tar cjvf pil-1.1.6.tar.bz2 pil-1.1.6
+ rm -rf pil-1.1.6
+ # fix checksums
+ SUMS=$(md5sum pil-1.1.6.tar.bz2 | awk '{print $1}')
+ sed "s/md5=[0-9a-f]\{32\}/md5=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
+ SUMS=$(sha1sum pil-1.1.6.tar.bz2 | awk '{print $1}')
+ sed "s/sha1=[0-9a-f]\{40\}/sha1=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
+ SUMS=$(cksum pil-1.1.6.tar.bz2 | awk '{print $1}')
+ sed "s/cksum=[0-9a-f]\{10\}/cksum=${SUMS}/" -i "${srcdir}/sage-${pkgver}/build/pkgs/pil/checksums.ini"
+ # disable freetype build
+ rm -rf freetype-*
+ sed -i -e 's/FREETYPE/#FREETYPE/' "${srcdir}/sage-${pkgver}/build/install"
+}
+build() {
+ cd "sage-${pkgver}"
+
# fix "missing sage.all error" during build
unset CFLAGS
unset CXXFLAGS
-
# fix build errors
unset LDFLAGS
-
- # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
+
export MAKE="make -j$(nproc)"
-
+
# use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
export FC=/usr/bin/gfortran
-
+
# disable building with debugging support
export SAGE_DEBUG='no'
-
+
# enable fat binaries (disables processor specific optimizations)
# comment out if you're only building it for yourself
export SAGE_FAT_BINARY='yes'
-
+
# can't write to root in a clean chroot
- mkdir "$srcdir/buiild"
- export DOT_SAGE="$srcdir/build"
-
- # Singular is broken
+ export DOT_SAGE="${srcdir}/build"
+
+ # singular is broken
export CPP='/usr/bin/cpp'
-
+
# only build sage, no documents
#make build
make
- ./sage --bdist "$pkgver"
+ ./sage --bdist "${pkgver}"
}
<< COMMENT
check() {
- cd sage-${pkgver}
-
+ cd "sage-${pkgver}"
+
+ make test
+
# uncomment if we want to run all the tests (warning: very long)
#make ptestlong
}
COMMENT
package() {
- cd sage-${pkgver}
-
+ cd "sage-${pkgver}"
+
# cp because make install is experimental and will corrupt the install
- install -d ${pkgdir}/opt/sage
- cp -dpr --no-preserve=ownership dist/sage-"$pkgver-$CARCH-Linux/"* ${pkgdir}/opt/sage/
-
+ install -d "${pkgdir}/opt/sage"
+ cp -dpr --no-preserve=ownership dist/sage-"${pkgver}-$CARCH-Linux/"* "${pkgdir}/opt/sage/"
+
# move SageTeX files to more appropriate directory
- install -d ${pkgdir}/usr/share
- mv ${pkgdir}/opt/sage/local/share/texmf \
- ${pkgdir}/usr/share
-
- desktop-file-install ${srcdir}/SAGE-notebook.desktop \
- --dir ${pkgdir}/usr/share/applications
-
- # create link to main binary
- install -d ${pkgdir}/usr/bin
- ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
-
+ install -d "${pkgdir}/usr/share"
+ mv "${pkgdir}/opt/sage/local/share/texmf" "${pkgdir}/usr/share"
+
# remove build logs
- rm -f ${pkgdir}/opt/sage/*.log
- rm -rf ${pkgdir}/opt/sage/spkg/logs
-
+ rm -f "${pkgdir}/opt/sage/*.log"
+ rm -rf "${pkgdir}/opt/sage/spkg/logs"
+
# remove source packages, since they are rarely needed, they are 300mb in size (compressed)
- rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
- rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
-
+ rm -f "${pkgdir}/opt/sage/spkg/base/*spkg"
+ rm -f "${pkgdir}/opt/sage/spkg/standard/*spkg"
+
+ # according to FS#37090
+ # install scripts
+ install -d "${pkgdir}/usr/bin"
+ ./sage -c "install_scripts('${pkgdir}/usr/bin', ignore_existing=True)"
+ # rename scripts to avoid conflicts
+ for ITEM in $(ls "${pkgdir}/usr/bin"); do
+ mv "${pkgdir}/usr/bin/${ITEM}" "${pkgdir}/usr/bin/sage-${ITEM}"
+ done
+ ln -s "/opt/sage/sage" "${pkgdir}/usr/bin/sage"
+
# install a systemd user unit
- install -Dm755 $srcdir/sage.service $pkgdir/usr/lib/systemd/user/sage.service
+ install -Dm644 "${srcdir}/sage.service" "${pkgdir}/usr/lib/systemd/user/sage.service"
+ # install *.desktop and icon files
+ install -Dm644 "${srcdir}/sage-notebook.desktop" \
+ "${pkgdir}/usr/share/applications/SAGE-notebook.desktop"
+ install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.7.2-py2.7.egg/sagenb/data/sage/images/icon128x128.png" \
+ "${pkgdir}/usr/share/pixmaps/SAGE-notebook.png"
}
# vim :set ts=2 sw=2 et:
-md5sums=('ceeccaa83f45a4fb674acf10f76543d8'
- 'b82f94383829eee26648feb977e2d89b'
- '985da1c1d1dcdc3ea9aa73035cb7996b')
-md5sums=('ceeccaa83f45a4fb674acf10f76543d8'
- 'b82f94383829eee26648feb977e2d89b'
- '985da1c1d1dcdc3ea9aa73035cb7996b')
diff --git a/community/sage-mathematics/SAGE-notebook.desktop b/community/sage-mathematics/SAGE-notebook.desktop
deleted file mode 100644
index e3c1d4d7f..000000000
--- a/community/sage-mathematics/SAGE-notebook.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=SAGE
-Comment=SAGE NOTEBOOK
-Comment[en_US]=SAGE NOTEBOOK
-Exec=/opt/sage/sage -notebook
-GenericName=
-GenericName[de]=
-Icon=/opt/sage/devel/ext-main/notebook/images/sageicon.png
-MimeType=
-Name[de]=SAGE
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Science;Math;
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-GenericName[en_US]=
diff --git a/community/sage-mathematics/fix-pil.patch b/community/sage-mathematics/fix-pil.patch
new file mode 100644
index 000000000..a17f26833
--- /dev/null
+++ b/community/sage-mathematics/fix-pil.patch
@@ -0,0 +1,12 @@
+diff -ruN pil-1.1.6.orig/_imagingft.c pil-1.1.6/_imagingft.c
+--- pil-1.1.6.orig/_imagingft.c 2013-12-23 17:45:39.991183855 +0400
++++ pil-1.1.6/_imagingft.c 2013-12-23 17:49:06.297861197 +0400
+@@ -65,7 +65,7 @@
+ const char* message;
+ } ft_errors[] =
+
+-#include <freetype/fterrors.h>
++#include <freetype2/fterrors.h>
+
+ /* -------------------------------------------------------------------- */
+ /* font objects */
diff --git a/community/sage-mathematics/sage-mathematics.install b/community/sage-mathematics/sage-mathematics.install
index 3da751689..6c55dad2b 100644
--- a/community/sage-mathematics/sage-mathematics.install
+++ b/community/sage-mathematics/sage-mathematics.install
@@ -2,10 +2,6 @@ post_install() {
cd /opt/sage
update-desktop-database -q
- # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership
- # the files it writes to ~/.sage can be safely ignored
- HOME=/tmp ./sage -c
-
# add sagemath user for the daemon
useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath
diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD
index cd5e476a1..7e5fa2714 100644
--- a/community/sakura/PKGBUILD
+++ b/community/sakura/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93276 2013-07-01 04:10:57Z angvp $
+# $Id: PKGBUILD 102425 2013-12-10 20:26:05Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Dmitry N. Shilov <stormblast@land.ru>
pkgname=sakura
-pkgver=3.1.0
+pkgver=3.1.2
pkgrel=1
pkgdesc="A terminal emulator based on GTK and VTE"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,17 +11,25 @@ url="https://launchpad.net/sakura"
license=('GPL')
depends=('vte3' 'libxft' 'desktop-file-utils')
makedepends=('cmake')
-source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
+source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"
+ "deprecated_symbols.patch")
install=sakura.install
-sha1sums=('159abc2f83e912da1bfb35c9b239b092e78a044f')
+sha1sums=('c4d5356c228af112dda20b3db3eaf32868e91ab1'
+ '1c31086360f5ce9d6ca0e4303b6b8cf62266f4d1')
-build() {
+prepare() {
cd $srcdir/${pkgname}-${pkgver}
# Set default font size a bit smaller
sed -i 's|#define DEFAULT_FONT "Bitstream Vera Sans Mono 14"|#define DEFAULT_FONT "Bitstream Vera Sans Mono 10"|g' src/sakura.c
-
- # build & install
+
+ # deprecated gtk symbols are used but disabled... enabling
+ patch -Np1 -i ${srcdir}/deprecated_symbols.patch
+}
+
+build() {
+ cd $srcdir/${pkgname}-${pkgver}
+
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE .
make
}
@@ -35,4 +43,3 @@ package() {
${pkgdir}/usr/share/doc/${pkgname}/INSTALL
rm ${pkgdir}/usr/share/doc/${pkgname}/INSTALL
}
-
diff --git a/community/sakura/deprecated_symbols.patch b/community/sakura/deprecated_symbols.patch
new file mode 100644
index 000000000..6b81efd14
--- /dev/null
+++ b/community/sakura/deprecated_symbols.patch
@@ -0,0 +1,11 @@
+--- sakura-3.1.2/CMakeLists.txt.bak 2013-12-10 21:02:16.853828972 +0100
++++ sakura-3.1.2/CMakeLists.txt 2013-12-10 21:02:45.473679293 +0100
+@@ -38,7 +38,7 @@
+ IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
+- SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED")
++ SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations")
+ ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+
+ INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 464f92aec..7df6c2a24 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100281 2013-11-02 08:48:53Z spupykin $
+# $Id: PKGBUILD 102276 2013-12-07 10:37:05Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
pkgname=schroot
pkgver=1.6.5
-pkgrel=4
+pkgrel=5
pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
url="http://packages.qa.debian.org/s/schroot.html"
license=('GPL3')
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 5dc9cac9b..94f4e2238 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99178 2013-10-25 10:00:48Z arodseth $
+# $Id: PKGBUILD 103181 2013-12-28 19:39:48Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Thomas S Hatch <thatch45@gmail.com>
# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=scite
-pkgver=3.3.6
+pkgver=3.3.7
pkgrel=1
pkgdesc='Editor with facilities for building and running programs'
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ makedepends=('setconf')
backup=('usr/share/scite/SciTEGlobal.properties')
install="$pkgname.install"
source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('9f3f9c9867e93af37af7a59e962aad76897c9e816c683c03e922baed6be506a5')
+sha256sums=('ad094de779572a5c1bb0f2c590acc05a8706fc2f8c8e9ba7d4d98182bb37f174')
prepare() {
if [ $?CXXBASEFLAGS == 1 ]; then
@@ -32,8 +32,8 @@ prepare() {
}
build() {
- make -C "$srcdir/scintilla/gtk"
- make -C "$srcdir/$pkgname/gtk"
+ make -C "scintilla/gtk"
+ make -C "$pkgname/gtk"
}
package() {
diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD
deleted file mode 100644
index c073ec919..000000000
--- a/community/setconf/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 89955 2013-05-06 09:59:45Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-
-pkgname=setconf
-pkgver=0.5.3
-pkgrel=4
-pkgdesc='Utility to easily change settings in configuration files or Makefiles'
-arch=('x86_64' 'i686' 'mips64el')
-url='http://setconf.roboticoverlords.org/'
-license=('GPL2')
-depends=('pcre' 'gc')
-makedepends=('shedskin')
-source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tar.xz")
-sha256sums=('f063b308bcebefe139418587527262ffce776584b1952224ec9a41d0562d55b6')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- shedskin "$pkgname.py" && make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
- install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/setserial/PKGBUILD b/community/setserial/PKGBUILD
index d5a876d9a..631c3c4a2 100644
--- a/extra/setserial/PKGBUILD
+++ b/community/setserial/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137681 2011-09-10 12:01:21Z pierre $
+# $Id: PKGBUILD 102187 2013-12-06 12:40:45Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Aurelien Foret <orelien@chez.com>
diff --git a/extra/setserial/setserial.patch b/community/setserial/setserial.patch
index 3cce1f07d..3cce1f07d 100644
--- a/extra/setserial/setserial.patch
+++ b/community/setserial/setserial.patch
diff --git a/community/sfk/PKGBUILD b/community/sfk/PKGBUILD
index 6ec74e865..e19df670f 100644
--- a/community/sfk/PKGBUILD
+++ b/community/sfk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 93781 2013-07-10 08:33:37Z seblu $
+# $Id: PKGBUILD 102870 2013-12-23 01:46:34Z seblu $
# Maintainer: Sébastien Luttringer
# Contributor: Baumi <baumi@gmx.com>
pkgname=sfk
-pkgver=1.6.8
+pkgver=1.6.9
pkgrel=1
pkgdesc='Swiss File Knife - A Command Line Tools Collection'
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url='http://stahlforce.com/dev/?tool=sfk'
license=('custom: BSD')
depends=('gcc-libs')
source=("http://downloads.sourceforge.net/swissfileknife/${pkgname}${pkgver//./}.zip")
-md5sums=('cce2184223597cfe314ca7a5f247d1ce')
+md5sums=('3a006bd1f73587ef347838231a5adbb3')
build() {
cd ${pkgname}${pkgver//./}
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index 9b742d4d8..453caa1d8 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,34 +1,36 @@
-# $Id: PKGBUILD 94906 2013-08-01 06:55:35Z bpiotrowski $
+# $Id: PKGBUILD 103129 2013-12-26 21:26:17Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Ondrej Martinak <omartinak@gmail.com>
pkgname=sfml
-pkgver=2.1
+_commit=4a300547f3
+pkgver=2.1.0.$_commit
pkgrel=1
pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.sfml-dev.org/'
license=('zlib')
depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
-makedepends=('mesa' 'cmake' 'doxygen')
+makedepends=('mesa' 'cmake' 'doxygen' 'git')
install=sfml.install
-source=("${pkgname}-${pkgver}::https://github.com/LaurentGomila/SFML/archive/${pkgver}.tar.gz")
-md5sums=('6457a5903b156390012773e9ef33f65f')
+source=("git+https://github.com/LaurentGomila/SFML.git#commit=${_commit}")
+md5sums=('SKIP')
build() {
- cd "$srcdir"/SFML-${pkgver}
+ cd "$srcdir"/SFML
mkdir build && cd build
cmake .. \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DSFML_BUILD_EXAMPLES=true \
- -DSFML_BUILD_DOC=true
+ -DSFML_BUILD_EXAMPLES=1 \
+ -DSFML_BUILD_DOC=1 \
+ -DCMAKE_CXX_FLAGS="-DGLXContextID=XID $CXXFLAGS"
make
make doc
}
package() {
- cd "$srcdir"/SFML-${pkgver}/build
+ cd "$srcdir"/SFML/build
make DESTDIR="$pkgdir/" install
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index 778cefa38..20a79b127 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99985 2013-10-31 02:50:40Z allan $
+# $Id: PKGBUILD 103038 2013-12-25 17:41:52Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Federico Cinelli <cinelli@aur.archlinux.org>
# Contributor: Bob Finch <w9ya@arrl.net>
pkgname=shapelib
pkgver=1.3.0
-pkgrel=3
+pkgrel=4
pkgdesc='simple C API for reading and writing ESRI Shapefiles'
arch=('i686' 'x86_64' 'mips64el')
url='http://shapelib.maptools.org/'
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index a9ce6c61e..fe560a485 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 98032 2013-10-04 09:55:22Z spupykin $
+# $Id: PKGBUILD 101260 2013-11-21 10:27:21Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
pkgname=shotwell
-pkgver=0.15.0
+pkgver=0.15.1
pkgrel=1
pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ depends=('libgee' 'webkitgtk' 'libgexiv2' 'libraw' 'rest'
makedepends=('intltool' 'vala>=0.17.2' 'libunique3')
install=shotwell.install
source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz")
-md5sums=('8b33dd5df51f49e7f4f451b431d7c133')
+md5sums=('5af4cfb819249a879a4649a9c7d089e5')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index d516b78a1..03de4ce7c 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99361 2013-10-27 16:02:30Z giovanni $
+# $Id: PKGBUILD 102277 2013-12-07 10:37:08Z bpiotrowski $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
pkgname=sigil
pkgver=0.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="WYSIWYG ebook editor"
arch=('i686' 'x86_64')
url="http://code.google.com/p/sigil/"
diff --git a/community/simgear/PKGBUILD b/community/simgear/PKGBUILD
index 369c7daaf..83df26b44 100644
--- a/community/simgear/PKGBUILD
+++ b/community/simgear/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100283 2013-11-02 08:49:11Z spupykin $
+# $Id: PKGBUILD 101482 2013-11-26 11:05:38Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: William Rea <sillywilly@gmail.com>
# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
pkgname=simgear
-pkgver=2.12.0
+pkgver=2.12.1
pkgrel=2
pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
arch=(i686 x86_64)
@@ -13,17 +13,10 @@ makedepends=('boost' 'cmake' 'mesa')
license=("GPL")
#url="http://www.simgear.org"
url="https://gitorious.org/fg"
-options=('!makeflags')
+options=('!makeflags' 'staticlibs')
#source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver")
-source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2"
- "osg-3.2.patch")
-md5sums=('dfc752f4759a2f795b7cdc9dad28411e'
- 'd7f35f02d88c6ef9c58e07b8431811e6')
-
-prepare() {
- cd $srcdir/simgear-$pkgver
-# patch -p1 <$srcdir/osg-3.2.patch
-}
+source=("http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/simgear-$pkgver.tar.bz2")
+md5sums=('8c483e13bce96f1dc27300a087fdb962')
build() {
cd $srcdir/simgear-$pkgver
diff --git a/community/skrooge/PKGBUILD b/community/skrooge/PKGBUILD
index 7e453adde..e9a83d99b 100644
--- a/community/skrooge/PKGBUILD
+++ b/community/skrooge/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100087 2013-11-01 13:55:59Z eric $
+# $Id: PKGBUILD 102914 2013-12-23 21:56:50Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ray Rashif <schiv@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,12 +6,12 @@
pkgname=skrooge
pkgver=1.8.0
-pkgrel=2
+pkgrel=3
pkgdesc="A personal finances manager for KDE"
arch=('i686' 'x86_64' 'mips64el')
url="http://skrooge.org/"
license=('GPL')
-depends=('kdebase-runtime' 'libofx' 'qca-ossl')
+depends=('kdebase-runtime' 'libofx' 'qca-ossl' 'qjson')
makedepends=('cmake' 'automoc4' 'docbook-xsl' 'boost' 'kdepim-libkdepim')
optdepends=('kdepim-libkdepim: for KDE PIM integration')
install=$pkgname.install
diff --git a/community/skrooge/skrooge.changelog b/community/skrooge/skrooge.changelog
index b689eae6d..a464d4ad4 100644
--- a/community/skrooge/skrooge.changelog
+++ b/community/skrooge/skrooge.changelog
@@ -1,3 +1,6 @@
+2013-12-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * skrooge 1.8.0-3 FS#37406 fix
+
2013-10-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* skrooge 1.8.0-1
diff --git a/community/sleuthkit/PKGBUILD b/community/sleuthkit/PKGBUILD
index 66baac429..1a04353e4 100644
--- a/community/sleuthkit/PKGBUILD
+++ b/community/sleuthkit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99988 2013-10-31 02:51:42Z allan $
+# $Id: PKGBUILD 103041 2013-12-25 17:46:25Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
pkgname=sleuthkit
pkgver=4.1.2
-pkgrel=1
+pkgrel=2
pkgdesc='File system and media management forensic analysis tools'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.sleuthkit.org/sleuthkit'
diff --git a/community/sleuthkit/sleuthkit.changelog b/community/sleuthkit/sleuthkit.changelog
index 7c9c63ae0..86fb29e8b 100644
--- a/community/sleuthkit/sleuthkit.changelog
+++ b/community/sleuthkit/sleuthkit.changelog
@@ -1,3 +1,6 @@
+2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * sleuthkit 4.1.2-2 static library removed
+
2013-10-13 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* sleuthkit 4.1.2-1
diff --git a/community/snapper/PKGBUILD b/community/snapper/PKGBUILD
index 35f66933d..60f581cf9 100644
--- a/community/snapper/PKGBUILD
+++ b/community/snapper/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Tom Kuther <gimpel@sonnenkinder.org>
pkgname=snapper
-pkgver=0.1.7
-pkgrel=1
+pkgver=0.1.8
+pkgrel=2
pkgdesc="A tool for managing BTRFS and LVM snapshots. It can create, diff and restore snapshots and provides timelined auto-snapping."
arch=('i686' 'x86_64')
url="http://snapper.io"
@@ -11,15 +11,9 @@ license=('GPL2')
depends=('btrfs-progs' 'libxml2' 'dbus' 'boost-libs')
makedepends=('boost' 'lvm2' 'libxslt' 'docbook-xsl' 'pam' 'git')
backup=('etc/conf.d/snapper')
-source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2"
- 'libbtrfs.patch')
+source=("ftp://ftp.suse.com/pub/projects/$pkgname/$pkgname-$pkgver.tar.bz2")
options=(!libtool)
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i "$srcdir"/libbtrfs.patch
-}
-
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -55,7 +49,9 @@ package() {
make DESTDIR="$pkgdir" install
install -Dm644 data/sysconfig.snapper "$pkgdir"/etc/conf.d/snapper
+
+ rm -f "$pkgdir"/etc/snapper/zypp-plugin.conf
+ rm -f "$pkgdir"/usr/share/man/man*/snapper-zypp-plugin.*.gz
}
-sha256sums=('fcb8d98aa36021970b214a2b6ea85f86aa29e107559bf677226e2e4ade2c6ed0'
- '0d0289e7448a357c78450f6690d684fef0e889921be152038a73401d37294317')
+sha256sums=('989a261411b7bf4f23373222402c37764e4f1714e301a8e9e396bb92a74e0539')
diff --git a/community/snapper/libbtrfs.patch b/community/snapper/libbtrfs.patch
deleted file mode 100644
index 805c36b44..000000000
--- a/community/snapper/libbtrfs.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/snapper/Btrfs.cc b/snapper/Btrfs.cc
-index 2c110c3..be9e974 100644
---- a/snapper/Btrfs.cc
-+++ b/snapper/Btrfs.cc
-@@ -982,7 +982,7 @@ namespace snapper
- {
- boost::this_thread::interruption_point();
-
-- int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this);
-+ int r = btrfs_read_and_process_send_stream(fd, &send_ops, &*this, 0);
-
- if (r < 0)
- {
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
index c0b4f49b5..dae8aa4d5 100644
--- a/community/spacefm/PKGBUILD
+++ b/community/spacefm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99024 2013-10-22 17:56:30Z bpiotrowski $
+# $Id: PKGBUILD 102305 2013-12-07 21:26:57Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
# Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com>
pkgname=spacefm
-pkgver=0.9.0
+pkgver=0.9.2
pkgrel=1
pkgdesc='Multi-panel tabbed file manager'
arch=('i686' 'x86_64')
@@ -21,10 +21,10 @@ optdepends=('lsof: device processes'
'udisks: mount as non-root user'
'udisks2: mount as non-root user')
source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz)
-sha256sums=('cca3fcfecd148dca165a71bb14c66c8b29ae7a488a98b9e9662ae4b686b2c01b')
+md5sums=('f7d04110b4dd9c3c434bffe8b04bbb69')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr \
--disable-pixmaps \
--with-gtk3
@@ -32,6 +32,6 @@ build() {
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD
index 9053dbabf..019c6cc2e 100644
--- a/community/spice-gtk3/PKGBUILD
+++ b/community/spice-gtk3/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 99990 2013-10-31 02:52:22Z allan $
+# $Id: PKGBUILD 102790 2013-12-20 03:19:02Z bgyorgy $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Stefano Facchini <stefano.facchini@gmail.com>
# Contributor: Jonathan Lestrelin <zanko@daemontux.org>
# Contributor: Lucio Zara <pennega@gmail.com>
pkgname=spice-gtk3
-pkgver=0.21
-pkgrel=3
+pkgver=0.22
+pkgrel=1
pkgdesc="Gtk client and libraries for SPICE remote desktop servers (gtk3 version)"
arch=('i686' 'x86_64')
url="http://spice-space.org"
license=('LGPL2.1')
-depends=('celt0.5.1' 'gtk3' 'libcacard' 'libpulse' 'usbredir')
-makedepends=('gobject-introspection' 'intltool' 'python2-pyparsing' 'qemu' 'spice-protocol' 'usbutils' 'vala')
-source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2"
- "usb-fix.patch::https://bugs.freedesktop.org/attachment.cgi?id=86818")
-sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564')
-sha256sums=('73d418ffa97d6cf5edb1920d46f1d51fc40d14a8d4edfab3be6041e25062c564'
- '1b3c7d20ebd3644faf95e387f7d2696fcd773539db8ffdda2e316a7c516ce6d2')
+depends=('celt0.5.1' 'dbus-glib' 'gtk3' 'libcacard' 'libpulse' 'usbredir')
+makedepends=('gobject-introspection' 'intltool' 'python2-pyparsing' 'spice-protocol' 'usbutils' 'vala')
+source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2")
+sha256sums=('05e9e5d915a99005a812846f733bba177ef3b1a9de9356690047250fb1b1fa3a')
prepare() {
cd "$srcdir/spice-gtk-$pkgver"
sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py
- patch -p1 <$srcdir/usb-fix.patch
+ # Disable broken tests
+ sed -i 's/ tests//' Makefile.{am,in}
}
build() {
cd "$srcdir/spice-gtk-$pkgver"
- PYTHON=python2 ./configure --prefix=/usr --disable-static --enable-vala --with-gtk=3.0
+ PYTHON=python2 ./configure --prefix=/usr \
+ --disable-static --enable-vala --with-gtk=3.0 \
+ --with-coroutine=gthread
make
}
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 4e2d4f457..5cb460ab8 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 94907 2013-08-01 06:55:37Z bpiotrowski $
+# $Id: PKGBUILD 102279 2013-12-07 10:37:11Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=spring
-pkgver=0.94.1
-_pkgver=94.1
-pkgrel=5
+pkgver=0.95.0
+_pkgver=95.0
+pkgrel=2
pkgdesc='A free 3D real-time-strategy (RTS) game engine'
arch=('i686' 'x86_64' 'mips64el')
url="http://springrts.com/"
@@ -17,18 +17,14 @@ makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'me
optdepends=('python2: python-based bots'
'java-runtime: java-based bots')
install=spring.install
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma
- gcc48.patch)
-md5sums=('bafc1e889bed31666553efc387a13b49'
- '8de391795f4a2e78be51a129dcd4dec2')
+source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma)
+md5sums=('2030100b4c51a1906408aad417a39b1b')
build() {
bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
cd spring_${_pkgver}
- patch -Np1 < $srcdir/gcc48.patch
-
cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
-DDATADIR=share/spring \
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index ea05e95b4..e10ab5811 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94052 2013-07-13 12:37:38Z svenstaro $
+# $Id: PKGBUILD 102280 2013-12-07 10:37:12Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: DuGi <dugi@irc.pl>
pkgname=springlobby
-pkgver=0.169
-pkgrel=2
+pkgver=0.180
+pkgrel=1
pkgdesc="A free cross-platform lobby client for the Spring RTS project."
arch=('i686' 'x86_64' 'mips64el')
url="http://springlobby.info/"
@@ -14,7 +14,7 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
makedepends=('boost' 'asio' 'cmake')
install=springlobby.install
source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1eb265268ac39d9b7e8fec90df92ff3d')
+md5sums=('4e33b20be873660649cf7c369ce81373')
build() {
cd $srcdir/${pkgname}-$pkgver
diff --git a/community/springlobby/springlobby.desktop b/community/springlobby/springlobby.desktop
deleted file mode 100644
index 1dce96b90..000000000
--- a/community/springlobby/springlobby.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=SpringLobby
-Comment=Lobby for Spring. An open source RTS with similar gameplay to TA
-Exec=springlobby
-Icon=springlobby.png
-Terminal=false
-Type=Application
-Categories=Application;Game;StrategyGame;
diff --git a/community/springlobby/springlobby.png b/community/springlobby/springlobby.png
deleted file mode 100644
index 89c7ab0ac..000000000
--- a/community/springlobby/springlobby.png
+++ /dev/null
Binary files differ
diff --git a/community/sqliteman/PKGBUILD b/community/sqliteman/PKGBUILD
index 3f6d1838b..253b19a67 100644
--- a/community/sqliteman/PKGBUILD
+++ b/community/sqliteman/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81006 2012-12-09 15:39:03Z andrea $
+# $Id: PKGBUILD 100708 2013-11-09 07:34:10Z andrea $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
# Contributor: Roman Porizka <artee@beer.cz>
@@ -6,7 +6,7 @@
pkgname=sqliteman
pkgver=1.2.2
-pkgrel=6
+pkgrel=7
pkgdesc="The best developer's and/or admin's GUI tool for Sqlite3 in the world"
arch=('i686' 'x86_64' 'mips64el')
url="http://sqliteman.com/"
@@ -17,8 +17,11 @@ install=sqliteman.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
md5sums=('5ecdf710e23606e1b924f740ea69306d')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD
index 35d2409e4..e06b654cc 100644
--- a/community/squid/PKGBUILD
+++ b/community/squid/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 100452 2013-11-04 12:13:15Z spupykin $
+# $Id: PKGBUILD 102758 2013-12-19 10:29:53Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Mark Coolen <mark.coolen@gmail.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Kevin Piche <kevin@archlinux.org>
pkgname=squid
-pkgver=3.3.10
-pkgrel=1
+pkgver=3.4.1
+pkgrel=2
pkgdesc='Full-featured Web proxy cache server'
arch=('x86_64' 'i686' 'mips64el')
url='http://www.squid-cache.org'
@@ -17,39 +17,15 @@ options=('emptydirs')
backup=('etc/squid/squid.conf'
'etc/squid/mime.conf')
install=$pkgname.install
-source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2"
+source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2"
'squid.pam'
'squid.cron'
'squid.service')
-md5sums=('ff69d08818ee008f66666f79bb27b9ee'
+md5sums=('859cf167499d8a5430070dbde78c8eea'
'270977cdd9b47ef44c0c427ab9034777'
'a71425c4951f2e5b640d19e6a5048531'
'ceeb57c69ebb165676219222f109a24e')
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # gcc 4.6 doesn't support -fhuge-objects.
- sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure
-
- # fix cache_dir, cache_dir size, and effective group.
- sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in
- sed '/^#cache_dir/ s/100/256/
- /^NAME: cache_effective_group/ {n;n;s/none/proxy/}' -i src/cf.data.pre
-
- sed -i '1,1i#include <errno.h>' helpers/external_acl/file_userip/ext_file_userip_acl.cc
-
- for i in \
- helpers/basic_auth/DB \
- helpers/log_daemon/DB \
- helpers/negotiate_auth/kerberos \
- helpers/external_acl/SQL_session; \
- do
- echo -e "#!/bin/sh\nexit 0" >$i/config.test
- chmod 0755 $i/config.test
- done
-}
-
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -88,7 +64,9 @@ build() {
--enable-async-io \
--enable-truncate \
--enable-icap-client \
- --enable-ssl-crtd
+ --enable-ssl-crtd \
+ --disable-arch-native \
+ --disable-strict-error-checking
make
}
diff --git a/extra/srm/PKGBUILD b/community/srm/PKGBUILD
index 1ca84e154..a610fc767 100644
--- a/extra/srm/PKGBUILD
+++ b/community/srm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 143982 2011-12-01 15:00:19Z giovanni $
+# $Id: PKGBUILD 102189 2013-12-06 12:44:16Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
diff --git a/extra/sshfs/PKGBUILD b/community/sshfs/PKGBUILD
index bd10b2413..05b1a8546 100644
--- a/extra/sshfs/PKGBUILD
+++ b/community/sshfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154283 2012-03-25 10:23:17Z giovanni $
+# $Id: PKGBUILD 102191 2013-12-06 12:45:33Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=sshfs
diff --git a/community/stfl/PKGBUILD b/community/stfl/PKGBUILD
index ffcf1257e..69f29d6d1 100644
--- a/community/stfl/PKGBUILD
+++ b/community/stfl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99993 2013-10-31 02:53:24Z allan $
+# $Id: PKGBUILD 103032 2013-12-25 17:28:56Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Sven Pfleiderer <pfleidi@roothausen.de>
pkgname=stfl
pkgver=0.22
-pkgrel=1.1
+pkgrel=2
pkgdesc="Library implementing a curses-based widget set for text terminals"
arch=('i686' 'x86_64' 'mips64el')
url="http://clifford.at/stfl/"
@@ -18,16 +18,16 @@ sha256sums=('2dddafd331e61ad04baf1251ccecb3a69feaf99880dd75155be8423c1cc55418'
'c7d7c787bcd287a776aad3b26e6a90a3b121c281125c34c7c35a87f36dcdc453')
build() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}/$pkgname-$pkgver"
- patch -Np1 -i ${srcdir}/$pkgname-archlinux.patch
+ patch -Np1 -i "${srcdir}"/$pkgname-archlinux.patch
make prefix=/usr Makefile.deps
make prefix=/usr
}
package() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}"/$pkgname-$pkgver
- make prefix=/usr DESTDIR=${pkgdir} install
+ make prefix=/usr DESTDIR="${pkgdir}" install
}
diff --git a/community/stfl/stfl.changelog b/community/stfl/stfl.changelog
index b72f673ed..257fd66c5 100644
--- a/community/stfl/stfl.changelog
+++ b/community/stfl/stfl.changelog
@@ -1,3 +1,6 @@
+2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * stfl 0.22-1 static library removed
+
2012-02-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* stfl 0.22-1
diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD
index f58a6e833..79e1eb31b 100644
--- a/community/stone-soup/PKGBUILD
+++ b/community/stone-soup/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jakob Gruber <jakob.gruber@gmail.com>
pkgname=stone-soup
-pkgver=0.13.0
+pkgver=0.13.1
pkgrel=1
pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting'
arch=('i686' 'x86_64' 'mips64el')
@@ -66,4 +66,4 @@ package() {
}
-md5sums=('120adc528f020a6440bf1dbc4ccb6abb')
+md5sums=('835825ba4d9863c8e255a8cb916db0c7')
diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD
index a00334e7e..45992a3ec 100644
--- a/community/stuntrally/PKGBUILD
+++ b/community/stuntrally/PKGBUILD
@@ -4,17 +4,17 @@
# Contributor: Jason Melton <jason.melton@gmail.com>
pkgname=stuntrally
-pkgver=2.1
-pkgrel=1
+pkgver=2.2.1
+pkgrel=3
pkgdesc='Stunt Rally game with track editor, based on VDrift'
arch=('x86_64' 'i686')
license=('GPL3')
url='http://code.google.com/p/vdrift-ogre'
-depends=('libvorbis' 'mygui' 'sdl2' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stuntrally-data')
-makedepends=('cmake' 'boost')
+depends=('libvorbis' 'mygui' 'sdl2' 'enet' 'gtk-update-icon-cache' 'stuntrally-data')
+makedepends=('cmake' 'boost' 'git')
install=stuntrally.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/archive/${pkgver}.tar.gz")
-sha256sums=('d987e8c05ed1f3f54468e75e2c1f68a9a4c59ceefa7429130d4f800b28821ae0')
+sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51')
build() {
cd "$srcdir/stuntrally-$pkgver/"
diff --git a/community/supercollider/PKGBUILD b/community/supercollider/PKGBUILD
index 901855851..0e5acbc25 100644
--- a/community/supercollider/PKGBUILD
+++ b/community/supercollider/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90361 2013-05-12 02:59:43Z speps $
+# $Id: PKGBUILD 101658 2013-11-29 20:44:59Z speps $
# Maintainer : speps <speps at aur dot archlinux dot org>
-# Contributor: <farid at archlinux-br.org>
+# Contributor: osc <farid at archlinux-br.org>
_name=SuperCollider
pkgname=supercollider
-pkgver=3.6.5
+pkgver=3.6.6
pkgrel=1
pkgdesc="An environment and programming language for real time audio synthesis and algorithmic composition"
arch=('i686' 'x86_64')
@@ -18,11 +18,11 @@ optdepends=('emacs: emacs interface'
'ruby: vim support')
install="$pkgname.install"
source=("http://download.sourceforge.net/project/$pkgname/Source/${pkgver%.*}/$_name-$pkgver-Source-linux.tar.bz2")
-md5sums=('ac176ea512fc2b9a9be645322c5b20b4')
+md5sums=('14d6063933230c74e42f5923a811e7c6')
build() {
cd "$srcdir/$_name-Source"
- [ -d bld ] || mkdir bld && cd bld
+ [ -d b ] || mkdir b && cd b
cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DLIBSCSYNTH=ON
@@ -30,6 +30,6 @@ build() {
}
package() {
- cd "$srcdir/$_name-Source/bld"
+ cd "$srcdir/$_name-Source/b"
make DESTDIR="$pkgdir/" install
}
diff --git a/community/supertuxkart/PKGBUILD b/community/supertuxkart/PKGBUILD
index ce9b35417..dfd389c39 100644
--- a/community/supertuxkart/PKGBUILD
+++ b/community/supertuxkart/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 98716 2013-10-17 11:38:17Z svenstaro $
+# $Id: PKGBUILD 102043 2013-12-04 13:01:11Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Daenyth <Daenyth+Arch [AT] gmail [DOT] com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: rabyte <rabyte__gmail>
pkgname=supertuxkart
-pkgver=0.8
-pkgrel=4
+pkgver=0.8.1
+pkgrel=3
pkgdesc='Kart racing game featuring Tux and his friends'
arch=('i686' 'x86_64')
url='http://supertuxkart.sourceforge.net/'
license=('GPL2')
-depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl')
+depends=('openal' 'libvorbis' 'libgl' 'fribidi' 'curl' 'bluez-libs')
makedepends=('cmake' 'subversion' 'mesa' 'imagemagick' 'setconf')
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2")
install=supertuxkart.install
-md5sums=('0b939ce601374758938119e0b0dd1fec')
+md5sums=('aa31ecf883dc35859eec76c667f1a6d6')
build() {
cd ${srcdir}/SuperTuxKart-${pkgver}
_fn="data/${pkgname}_desktop.template"
- setconf "$_fn" Exec "$pkgname --log=file"
+ setconf "$_fn" Exec "$pkgname"
setconf "$_fn" TryExec "$pkgname"
setconf "$_fn" Icon "$pkgname"_64
diff --git a/community/swi-prolog/PKGBUILD b/community/swi-prolog/PKGBUILD
new file mode 100644
index 000000000..967ce2907
--- /dev/null
+++ b/community/swi-prolog/PKGBUILD
@@ -0,0 +1,44 @@
+# $Id: PKGBUILD 102427 2013-12-10 21:34:55Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Jachym Barvinek <jachymb@gmail.com>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: John Proctor <jproctor@prium.net>
+# Contributor: Juergen Hoetzel <juergen@archlinux.org>
+
+pkgname=swi-prolog
+pkgver=6.6.0
+pkgrel=1
+pkgdesc='Prolog environment'
+arch=('x86_64' 'i686')
+url='http://www.swi-prolog.org/'
+license=('GPL' 'LGPL')
+depends=('gmp' 'readline' 'openssl' 'libarchive')
+makedepends=('libxft' 'libjpeg' 'unixodbc' 'libxpm' 'libxinerama')
+optdepends=('unixodbc: for using the odbc4pl library'
+ 'libjpeg: for using the pl2xpce library'
+ 'libxpm: for using the pl2xpce library'
+ 'libxinerama: for using the pl2xpce library'
+ 'libxft: for using the pl2xpce library')
+options=('!makeflags')
+source=("http://www.swi-prolog.org/download/stable/src/pl-$pkgver.tar.gz")
+sha256sums=('b85ac27a8afeb29640fe2b98c088e5f9c753adacb20114f8c10ba4835b26f9cd')
+
+build() {
+ cd "pl-$pkgver"
+
+ ./configure --prefix=/usr --with-world
+ make
+}
+
+check() {
+ make -C "pl-$pkgver" check || true
+}
+
+package() {
+ make -C "pl-$pkgver" DESTDIR="$pkgdir" install
+
+ # fix https://bugs.archlinux.org/task/20873
+ chmod +x "$pkgdir/usr/lib/swipl-$pkgver/library/dialect/sicstus/swipl-lfr.pl"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD
index 9a82255e8..c53c4466a 100644
--- a/community/synergy/PKGBUILD
+++ b/community/synergy/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=synergy
pkgver=1.4.15
-pkgrel=1
+pkgrel=3
pkgdesc="Share a single mouse and keyboard between multiple computers"
url="http://synergy-foss.org"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,16 +16,19 @@ optdepends=('qt4: gui support')
license=('GPL2')
source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz"
"synergys.socket"
- "synergys.service")
-sha512sums=('857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a'
- 'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
- 'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f')
+ "synergys.service"
+ "unfuck-cryptopp-thanks-gentoo.patch")
+sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73'
+ '947406e72351145c65ba9884ed175bf781482d46'
+ '00f2259c31c9551c0830d9e889fd0a0790cf9045'
+ '129151952e6d25504ca823aee8ebe93ce3d376ce')
build() {
cd "${srcdir}/${pkgname}-${pkgver}-Source"
- # Unzip the crypto library
- unzip -d tools/cryptopp562 tools/cryptopp562.zip
+ # Unfuck the bundled cryptopp stuff. Thanks a lot, Gentoo!
+ # You and Fedora are our only friends in this crazy world.
+ patch -Np1 < "${srcdir}/unfuck-cryptopp-thanks-gentoo.patch"
cmake -D CMAKE_INSTALL_PREFIX=/usr .
make
@@ -53,6 +56,6 @@ package() {
# install desktop/icon stuff
cd ../res
- install -Dm644 "synergy.ico" "$pkgdir/usr/share/pixmaps/synergy.ico"
+ install -Dm644 "synergy.ico" "$pkgdir/usr/share/icons/synergy.ico"
install -Dm644 "synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
}
diff --git a/community/synergy/unfuck-cryptopp-thanks-gentoo.patch b/community/synergy/unfuck-cryptopp-thanks-gentoo.patch
new file mode 100644
index 000000000..2638c7fd2
--- /dev/null
+++ b/community/synergy/unfuck-cryptopp-thanks-gentoo.patch
@@ -0,0 +1,97 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,6 +133,10 @@
+ check_type_size(long SIZEOF_LONG)
+ check_type_size(short SIZEOF_SHORT)
+
++ set(CMAKE_REQUIRED_LIBRARIES crypto++)
++ set(CMAKE_REQUIRED_LIBRARIES)
++ set(CMAKE_INCLUDE_DIRECTORIES)
++
+ # pthread is used on both Linux and Mac
+ check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
+ if (HAVE_PTHREAD)
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -13,47 +13,6 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program. If not, see <http://www.gnu/licenses/>.
+
+-set(cryptopp_dir cryptopp562)
+-
+-# only compile the crypto++ files we need.
+-set(cryptopp_src
+- ${cryptopp_dir}/3way.cpp
+- ${cryptopp_dir}/algparam.cpp
+- ${cryptopp_dir}/asn.cpp
+- ${cryptopp_dir}/authenc.cpp
+- ${cryptopp_dir}/basecode.cpp
+- ${cryptopp_dir}/cpu.cpp
+- ${cryptopp_dir}/cryptlib.cpp
+- ${cryptopp_dir}/des.cpp
+- ${cryptopp_dir}/dessp.cpp
+- ${cryptopp_dir}/dll.cpp
+- ${cryptopp_dir}/ec2n.cpp
+- ${cryptopp_dir}/ecp.cpp
+- ${cryptopp_dir}/filters.cpp
+- ${cryptopp_dir}/fips140.cpp
+- ${cryptopp_dir}/gcm.cpp
+- ${cryptopp_dir}/gf2n.cpp
+- ${cryptopp_dir}/gfpcrypt.cpp
+- ${cryptopp_dir}/hex.cpp
+- ${cryptopp_dir}/hmac.cpp
+- ${cryptopp_dir}/hrtimer.cpp
+- ${cryptopp_dir}/integer.cpp
+- ${cryptopp_dir}/iterhash.cpp
+- ${cryptopp_dir}/misc.cpp
+- ${cryptopp_dir}/modes.cpp
+- ${cryptopp_dir}/mqueue.cpp
+- ${cryptopp_dir}/nbtheory.cpp
+- ${cryptopp_dir}/oaep.cpp
+- ${cryptopp_dir}/osrng.cpp
+- ${cryptopp_dir}/pubkey.cpp
+- ${cryptopp_dir}/queue.cpp
+- ${cryptopp_dir}/randpool.cpp
+- ${cryptopp_dir}/rdtables.cpp
+- ${cryptopp_dir}/rijndael.cpp
+- ${cryptopp_dir}/rng.cpp
+- ${cryptopp_dir}/sha.cpp
+-)
+-
+ # if 64-bit windows, compile asm file.
+ if (CMAKE_CL_64)
+ list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm)
+@@ -83,5 +42,3 @@
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+ endif()
+ endif()
+-
+-add_library(cryptopp STATIC ${cryptopp_src})
+--- a/src/lib/io/CCryptoMode.h
++++ b/src/lib/io/CCryptoMode.h
+@@ -17,9 +17,9 @@
+
+ #pragma once
+
+-#include <cryptopp562/gcm.h>
+-#include <cryptopp562/modes.h>
+-#include <cryptopp562/aes.h>
++#include <cryptopp/gcm.h>
++#include <cryptopp/modes.h>
++#include <cryptopp/aes.h>
+ #include "ECryptoMode.h"
+ #include "CString.h"
+
+--- a/src/lib/io/CCryptoStream.h
++++ b/src/lib/io/CCryptoStream.h
+@@ -20,8 +20,8 @@
+ #include "BasicTypes.h"
+ #include "CStreamFilter.h"
+ #include "CCryptoMode.h"
+-#include <cryptopp562/osrng.h>
+-#include <cryptopp562/sha.h>
++#include <cryptopp/osrng.h>
++#include <cryptopp/sha.h>
+
+ class CCryptoOptions;
+
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index 39b3127cf..fdf5e0de9 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99998 2013-10-31 02:55:04Z allan $
+# $Id: PKGBUILD 102282 2013-12-07 10:37:16Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Franco Iacomella <yaco@gnu.org>
pkgname=synfig
-pkgver=0.64.0
-pkgrel=7
+pkgver=0.64.1
+pkgrel=2
pkgdesc="Professional vector animation program (CLI renderer only)"
arch=(i686 x86_64 'mips64el')
url="http://synfig.org"
@@ -15,15 +15,23 @@ makedepends=('boost')
optdepends=('openexr' 'libsigc++')
conflicts=('synfig-core')
replaces=('synfig-core')
-source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz
+source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfig-$pkgver.tar.gz
build-fix.patch
ffmpeg-0.8.patch
ffmpeg-loop.patch)
-md5sums=('124cb4059b9f48dc5c37204660053d6f'
+md5sums=('548a5d51a48b2be0c3fcaebe917a5d88'
'b5568b06fae1a7ee465b5380b1139b83'
'ebf41046097cfd778dee9a9854561dae'
'c6684c876c093f5e53d2c46592994e9b')
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1 -i $srcdir/build-fix.patch
+ patch -Np1 -i $srcdir/ffmpeg-0.8.patch
+# patch -Np1 -i $srcdir/ffmpeg-loop.patch
+ sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp
+}
+
build() {
cd $srcdir/$pkgname-$pkgver
export PKG_CONFIG_PATH=/usr/lib/ffmpeg-compat/pkgconfig:$PKG_CONFIG_PATH
@@ -32,10 +40,6 @@ build() {
CXXFLAGS="$CXXFLAGS -D__STDC_CONSTANT_MACROS"
[ -f configure ] || { libtoolize --ltdl --copy --force && autoreconf --install --force; }
[ -f Makefile ] || ./configure --prefix=/usr --sysconfdir=/etc --with-libavcodec --with-libdv
- patch -p1 -i $srcdir/build-fix.patch
- patch -Np1 -i $srcdir/ffmpeg-0.8.patch
- patch -Np1 -i $srcdir/ffmpeg-loop.patch
- sed -i '1,1i#include <string.h>' src/modules/mod_png/trgt_png.cpp
make
}
diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD
index 490903f01..eedffc824 100644
--- a/community/synfigstudio/PKGBUILD
+++ b/community/synfigstudio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99999 2013-10-31 02:55:24Z allan $
+# $Id: PKGBUILD 100656 2013-11-07 13:08:05Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Franco Iacomella <yaco@gnu.org>
pkgname=synfigstudio
-pkgver=0.64.0
+pkgver=0.64.1
pkgrel=1
pkgdesc="Professional vector animation program (GUI)"
arch=(i686 x86_64 'mips64el')
@@ -13,8 +13,8 @@ depends=('gtkmm' 'synfig')
makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi'
'xorg-fonts-misc' 'xorg-fonts-type1' 'intltool')
install=synfigstudio.install
-source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz)
-md5sums=('bbda14359a07254b8efe5e706de192df')
+source=(http://downloads.sourceforge.net/project/synfig/releases/$pkgver/source/synfigstudio-$pkgver.tar.gz)
+md5sums=('94d3daf5f32d186a44175aedfb9f22cd')
build() {
cd $srcdir/synfigstudio-$pkgver
diff --git a/community/talkfilters/PKGBUILD b/community/talkfilters/PKGBUILD
index a5a1a7463..13cc127b4 100644
--- a/community/talkfilters/PKGBUILD
+++ b/community/talkfilters/PKGBUILD
@@ -1,25 +1,28 @@
+# $Id: PKGBUILD 102629 2013-12-16 22:05:45Z arodseth $
# Maintainer: ConnorBehan <connor.behan@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
pkgname=talkfilters
pkgver=2.3.8
-pkgrel=2
-pkgdesc="Filters to translate text into dialects that GNU finds funny"
+pkgrel=3
+pkgdesc='Filters to translate text into dialects that GNU finds funny'
arch=(i686 x86_64 mips64el)
-url="http://www.hyperrealm.com/main.php?s=talkfilters"
+url='http://www.hyperrealm.com/main.php?s=talkfilters'
depends=('glibc')
-license=('custom:Public Domain')
-install=$pkgname.install
-source=(http://www.hyperrealm.com/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+license=('GPL2')
+install="$pkgname.install"
+source=("http://www.hyperrealm.com/$pkgname/$pkgname-$pkgver.tar.gz")
+sha256sums=('4681e71170af06c6bffcd4e454eff67224cde06f0d678d26dc72da45f02ecca6')
build() {
- cd "$srcdir"/${pkgname}-${pkgver}
+ cd "$pkgname-$pkgver"
+
./configure --prefix=/usr
make
}
package() {
- cd "$srcdir"/${pkgname}-${pkgver}
- make prefix="$pkgdir"/usr install
+ make -C "$pkgname-$pkgver" prefix="$pkgdir/usr" install
}
-md5sums=('c11c6863a1c246a8d49a80a1168b54c8')
+# vim:set ts=2 sw=2 et:
diff --git a/community/tcplay/PKGBUILD b/community/tcplay/PKGBUILD
new file mode 100644
index 000000000..2e11106e0
--- /dev/null
+++ b/community/tcplay/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 102520 2013-12-12 22:28:07Z tredaelli $
+# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor: Thomas Weißschuh <thomas t-8ch de>
+# Contributor: James Reed <supplantr at archlinux dot info>
+
+pkgname=tcplay
+pkgver=1.1
+pkgrel=1
+pkgdesc="Free and simple TrueCrypt implementation based on dm-crypt."
+arch=('i686' 'x86_64')
+url="https://github.com/bwalex/tc-play"
+license=('custom')
+depends=('device-mapper')
+makedepends=('cmake')
+source=("https://github.com/bwalex/tc-play/archive/v${pkgver}.tar.gz"
+ tc-play-1.1-fix-paths.patch)
+sha256sums=('62346e852c6f781fffebf5c43e5967ceb0e36304626aa27e77c77378f8215d84'
+ '007b960675400b7e0a10765952041dcc1943e5cb79367e2ed4938f2c5e64ea57')
+
+prepare() {
+ cd "tc-play-$pkgver"
+ patch -Np1 -i ../tc-play-1.1-fix-paths.patch
+}
+
+build() {
+ cd "tc-play-$pkgver"
+ mkdir -p objdir
+ cd objdir
+ cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+}
+
+package() {
+ cd "tc-play-$pkgver/objdir"
+ make DESTDIR="$pkgdir" install
+ install -D -m644 ../LICENSE "$pkgdir"/usr/share/licenses/tcplay/LICENSE
+}
diff --git a/community/tcplay/tc-play-1.1-fix-paths.patch b/community/tcplay/tc-play-1.1-fix-paths.patch
new file mode 100644
index 000000000..e2d55df31
--- /dev/null
+++ b/community/tcplay/tc-play-1.1-fix-paths.patch
@@ -0,0 +1,49 @@
+--- tc-play-1.1/CMakeLists.txt.orig 2013-12-12 22:55:24.788832261 +0100
++++ tc-play-1.1/CMakeLists.txt 2013-12-12 22:56:16.099181617 +0100
+@@ -63,20 +63,6 @@
+ endif()
+
+
+-if (NOT LIB_SUFFIX)
+- message(STATUS "")
+- message(STATUS "LIB_SUFFIX variable is not defined. It will be autodetected now.")
+- message(STATUS "You can set it manually with -DLIB_SUFFIX=<value> (e.g. 64).")
+- if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+- message(STATUS "\nSetting LIB_SUFFIX=64\n")
+- set (LIB_SUFFIX "64")
+- else()
+- message(STATUS "\nSetting LIB_SUFFIX=\n")
+- set (LIB_SUFFIX "")
+- endif()
+-endif()
+-
+-
+
+ add_executable(tcplay-bin main.c ${SRCS_COMMON} ${SRCS_LINUX} ${SRCS_PBKDF})
+ set_target_properties(tcplay-bin PROPERTIES OUTPUT_NAME tcplay)
+@@ -102,7 +88,7 @@
+ # Generate pkg-config file tcplay.pc
+ file(WRITE ${PROJECT_BINARY_DIR}/tcplay.pc "prefix=${CMAKE_INSTALL_PREFIX}
+ exec_prefix=${CMAKE_INSTALL_PREFIX}
+-libdir=${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
++libdir=${CMAKE_INSTALL_PREFIX}/lib
+ includedir=${CMAKE_INSTALL_PREFIX}/include
+
+ Name: libtcplay
+@@ -117,12 +103,12 @@
+
+ # Installation targets
+ install(TARGETS tcplay-bin tcplay-static tcplay-so
+- RUNTIME DESTINATION sbin COMPONENT bin
+- LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT lib
+- ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT lib-dev
++ RUNTIME DESTINATION bin COMPONENT bin
++ LIBRARY DESTINATION lib COMPONENT lib
++ ARCHIVE DESTINATION lib COMPONENT lib-dev
+ )
+
+-install(FILES ${PROJECT_BINARY_DIR}/tcplay.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT lib-dev)
++install(FILES ${PROJECT_BINARY_DIR}/tcplay.pc DESTINATION lib/pkgconfig COMPONENT lib-dev)
+
+ install(FILES tcplay_api.h DESTINATION include COMPONENT lib-dev)
+ install(FILES tcplay.3 DESTINATION share/man/man3 COMPONENT lib-dev)
diff --git a/community/tea/PKGBUILD b/community/tea/PKGBUILD
index bfb90b1a4..80bead240 100644
--- a/community/tea/PKGBUILD
+++ b/community/tea/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98727 2013-10-17 12:44:12Z spupykin $
+# $Id: PKGBUILD 102931 2013-12-24 09:48:38Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,7 +6,7 @@
# Contributor: Zsolt Varadi <sysop_xxl@fibermail.hu>
pkgname=tea
-pkgver=37.0.0
+pkgver=37.0.1
pkgrel=1
pkgdesc="A Qt-based text editor for Linux and *BSD. With an ultimate small size TEA provides you hundreds of functions."
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ depends=('qt4' 'aspell' 'hunspell')
install=tea.install
source=(http://semiletov.org/tea/dloads/tea-$pkgver.tar.bz2
tea.desktop)
-md5sums=('2f1113cf5771ba504ae1964aedb0acf2'
+md5sums=('587a3c245e414ecb718369a170f1c991'
'377ace3363124f4c086de0babb820761')
build() {
diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD
index a11620314..4bb95640a 100644
--- a/community/texvc/PKGBUILD
+++ b/community/texvc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 96626 2013-09-02 13:37:28Z spupykin $
+# $Id: PKGBUILD 102438 2013-12-11 10:30:40Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=texvc
-pkgver=1.21
+pkgver=1.22
pkgrel=1
pkgdesc="tex to HTML/MathML/png converter used by mediawiki"
arch=(i686 x86_64 'mips64el')
@@ -11,8 +11,14 @@ url="http://www.mediawiki.org/wiki/Extension:Math"
license=("GPL")
depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra')
makedepends=('ocaml' 'git')
-source=(mediawiki-math-$pkgver::git+https://git.wikimedia.org/git/mediawiki/extensions/Math.git#branch=REL${pkgver/./_})
-md5sums=('SKIP')
+#source=(mediawiki-math-$pkgver::git+https://git.wikimedia.org/git/mediawiki/extensions/Math.git#branch=REL${pkgver/./_})
+source=("mediawiki-math-${_basever}.tar.gz::https://codeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL${pkgver/./_}")
+md5sums=('b595f6a32b2380040ce5401701a6a3a2')
+
+prepare() {
+ cd $srcdir
+ mv wikimedia-mediawiki-extensions-Math-b3ad6b9 mediawiki-math-$pkgver
+}
build() {
cd $srcdir/mediawiki-math-$pkgver/math
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index b693e1d55..befe6843c 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99585 2013-10-30 09:27:44Z arodseth $
+# $Id: PKGBUILD 100581 2013-11-06 10:52:39Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jeff Horelick <jdhore1@gmail.com>
# Contributor: skydrome <skydrome@i2pmail.org>
pkgname=the_silver_searcher
-pkgver=0.18
+pkgver=0.18.1
pkgrel=1
pkgdesc='Code searching tool similar to Ack, but faster'
url='https://github.com/ggreer/the_silver_searcher'
@@ -12,7 +12,7 @@ license=('Apache')
depends=('pcre' 'zlib' 'xz')
arch=('x86_64' 'i686' 'mips64el')
source=("$pkgname-$pkgver.tar.gz::https://github.com/ggreer/$pkgname/archive/$pkgver.tar.gz")
-sha256sums=('9d3cdb7ab42308351f951adf1d149241b25f27d676322d96cdb215e4a0d90ea2')
+sha256sums=('1f5cdacf955d5707cdb60f3f46aab3aae7fe96f105f00ab2d6a5a52d0aad5dc5')
prepare() {
cd "$pkgname-$pkgver"
diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD
deleted file mode 100644
index f911b2e26..000000000
--- a/community/tightvnc/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 79388 2012-11-04 00:54:52Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Paul Mattal <paul@archlinux.org>
-# Contributor: Andrew Hills <hills.as@gmail.com>
-# Contributor: John <graysky@archlinux.us>
-
-pkgname=tightvnc
-pkgver=1.3.10
-pkgrel=9
-pkgdesc='VNC server and viewer'
-arch=('x86_64' 'i686')
-license=('GPL')
-url='http://www.tightvnc.com'
-depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl')
-makedepends=('imake' 'setconf' 'gendesk')
-options=('!makeflags')
-source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2"
- 'http://people.csail.mit.edu/jaffer/Color/rgb.txt'
- 'vncserver.service'
- 'tightvnc.png::http://virtual.itca.edu.sv/dokeos/sinapsis/cd/redes/vnc/tightvnc/documentos/TightVNC%20Frequently%20Asked%20Questions_archivos/tightvnc-logo.jpg')
-sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d'
- 'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73'
- 'ccadf1fc708fad601e6113464d6c533a629f6dc9116f6071347cd0b465c1f48b'
- '2592196a56444143c2f0c3738dce98f89ea0d46b125a3ea54ac1dbb50914b945')
-_exec=('vncviewer')
-_name=('TightVNC Viewer')
-
-build() {
- cd $srcdir
- gendesk -n
- setconf $pkgname.desktop Categories 'Application;Network;'
-
- cd vnc_unixsrc
- setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\;
- setconf vncserver '$fontPath' \
- \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\;
- sed -i 's:/lib/cpp:/usr/bin/cpp:' Xvnc/config/cf/linux.cf
- xmkmf
- make World
-
- cd Xvnc
- ./configure
- setconf programs/Xserver/dix/Makefile DEFAULTRGBDATABASE '/usr/share/tightvnc/rgb'
- setconf programs/Xserver/os/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L"
- setconf lib/font/fc/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L"
- make
-}
-
-package() {
- cd $srcdir/vnc_unixsrc
- mkdir -p $pkgdir/usr/bin $pkgdir/usr/share/man/man1
- ./vncinstall $pkgdir/usr/bin $pkgdir/usr/share/man
- mkdir -p $pkgdir/usr/share/$pkgname
-
- cd $srcdir
- install -Dm644 vnc_unixsrc/classes/* \
- $pkgdir/usr/share/$pkgname
- install -Dm644 rgb.txt $pkgdir/usr/share/$pkgname/rgb.txt
- install -Dm644 $pkgname.desktop \
- $pkgdir/usr/share/applications/$pkgname.desktop
- install -Dm644 $pkgname.png \
- $pkgdir/usr/share/pixmaps/$pkgname.png
- install -Dm644 vncserver.service \
- $pkgdir/usr/lib/systemd/system/vncserver.service
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/tightvnc/vncserver.service b/community/tightvnc/vncserver.service
deleted file mode 100644
index b64e729a6..000000000
--- a/community/tightvnc/vncserver.service
+++ /dev/null
@@ -1,29 +0,0 @@
-# The vncserver service unit file
-#
-# 1. Copy this file to /etc/systemd/system/vncserver@:<display>.service
-# 2. Edit User=
-# ("User=foo")
-# 3. Edit and vncserver parameters appropriately
-# ("/usr/bin/vncserver %i -arg1 -arg2 -argn")
-# 4. Run `systemctl --system daemon-reload`
-# 5. Run `systemctl enable vncserver@:<display>.service`
-#
-# DO NOT RUN THIS SERVICE if your local area network is untrusted!
-#
-# See the wiki page for more on security
-# https://wiki.archlinux.org/index.php/Vncserver
-
-[Unit]
-Description=Remote desktop service (VNC)
-After=syslog.target network.target
-
-[Service]
-Type=forking
-User=
-# Clean any existing files in /tmp/.X11-unix environment, especially useful for VMs
-ExecStartPre=-/usr/bin/vncserver -kill %i
-ExecStart=/usr/bin/vncserver %i
-ExecStop=/usr/bin/vncserver -kill %i
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/tilda/PKGBUILD b/community/tilda/PKGBUILD
index 750621132..ca01441ab 100644
--- a/community/tilda/PKGBUILD
+++ b/community/tilda/PKGBUILD
@@ -1,31 +1,18 @@
-# $Id: PKGBUILD 96258 2013-08-22 23:47:58Z eric $
+# $Id: PKGBUILD 102554 2013-12-14 11:48:13Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=tilda
-pkgver=1.1.7
-pkgrel=3
+pkgver=1.1.10
+pkgrel=1
pkgdesc="A Gtk based drop down terminal for Linux and Unix"
arch=('i686' 'x86_64' 'mips64el')
url="https://github.com/lanoxx/tilda"
license=('GPL')
depends=('vte3' 'confuse')
-source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz
- start-hidden-fix.patch
- tab-count-fix.patch)
-sha256sums=('ed96ae2cf0ceb2a5b2f4a62948c5c0d28d1d54f89ade5153b2e67515cf4dc5e7'
- 'e6d6075bb923c2dcae57706fe0555c28f9094f5115f1a3c60b8f85b8ff267b96'
- '5d80a76f904a2094cd7b156654ea6d1860c319fc6c18927f2fb342c0f477c110')
-
-prepare() {
- cd $pkgname-$pkgname-$pkgver
-
- patch -Np1 -i ../start-hidden-fix.patch
- patch -Np1 -i ../tab-count-fix.patch
- sed 's/Exec=.*/Exec=tilda/; s/Icon=.*/Icon=tilda/' -i tilda.desktop.in
-
-}
+source=(https://github.com/lanoxx/$pkgname/archive/$pkgname-$pkgver.tar.gz)
+sha256sums=('292f98d344c88998a0f7d67372020f1c3c7192de94fabf14a0d4eae18726b267')
build() {
cd $pkgname-$pkgname-$pkgver
diff --git a/community/tilda/start-hidden-fix.patch b/community/tilda/start-hidden-fix.patch
deleted file mode 100755
index d42fa0393..000000000
--- a/community/tilda/start-hidden-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/tilda.c b/src/tilda.c
-index c0a435f..50daa47 100644
---- a/src/tilda.c
-+++ b/src/tilda.c
-@@ -639,18 +639,7 @@ int main (int argc, char *argv[])
- }
- }
-
-- if (config_getbool ("hidden"))
-- {
-- /* It does not cause graphical glitches to make tilda hidden on start this way.
-- * It does make tilda appear much faster on it's first appearance, so I'm leaving
-- * it this way, because it has a good benefit, and no apparent drawbacks. */
-- gtk_widget_show (GTK_WIDGET(tw->window));
-- gtk_widget_hide (GTK_WIDGET(tw->window));
-- }
-- else
-- {
-- pull (tw, PULL_DOWN);
-- }
-+ pull (tw, config_getbool ("hidden") ? PULL_UP : PULL_DOWN);
-
- g_print ("Tilda has started. Press %s to pull down the window.\n",
- config_getstr ("key"));
diff --git a/community/tilda/tab-count-fix.patch b/community/tilda/tab-count-fix.patch
deleted file mode 100755
index b0e1522a1..000000000
--- a/community/tilda/tab-count-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/tilda_window.c
-+++ b/src/tilda_window.c
-@@ -378,7 +378,7 @@ static gboolean goto_tab_generic (tilda_window *tw, guint tab_number)
-
- if (g_list_length (tw->terms) > (tab_number-1))
- {
-- goto_tab (tw, g_list_length (tw->terms) - tab_number);
-+ goto_tab (tw, tab_number - 1);
- return TRUE;
- }
-
diff --git a/community/tilda/tilda.changelog b/community/tilda/tilda.changelog
index 9885de98e..f39ba5096 100644
--- a/community/tilda/tilda.changelog
+++ b/community/tilda/tilda.changelog
@@ -1,3 +1,9 @@
+2013-12-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * tilda 1.1.10-1
+
+2013-11-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * tilda 1.1.8-1
+
2013-08-22 Maxime Gauduin <alucryd@gmail.com>
* tilda 1.1.7-3
* Fixes FS#36542, FS#36516 and FS#36543
diff --git a/community/tmw/PKGBUILD b/community/tmw/PKGBUILD
index 3fc5c5422..b298cac3e 100644
--- a/community/tmw/PKGBUILD
+++ b/community/tmw/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 90095 2013-05-06 19:39:43Z foutrelis $
+# $Id: PKGBUILD 100933 2013-11-13 12:48:38Z heftig $
# Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
# Maintainer: Mateusz Herych <heniekk@gmail.com>
pkgname=tmw
pkgver=0.6.1
-pkgrel=2
+pkgrel=3
pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG."
arch=('i686' 'x86_64' 'mips64el')
url="http://themanaworld.org"
diff --git a/community/tnftp/PKGBUILD b/community/tnftp/PKGBUILD
index 7fc5fabe6..e5f46f557 100644
--- a/community/tnftp/PKGBUILD
+++ b/community/tnftp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91426 2013-05-22 10:27:16Z spupykin $
+# $Id: PKGBUILD 102893 2013-12-23 14:32:34Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
# Previous Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
pkgname=tnftp
pkgver=20130505
-pkgrel=1
+pkgrel=2
pkgdesc="NetBSD FTP client with several advanced features"
arch=('i686' 'x86_64' 'mips64el')
url="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
diff --git a/community/tolua++/PKGBUILD b/community/tolua++/PKGBUILD
new file mode 100644
index 000000000..1928a1720
--- /dev/null
+++ b/community/tolua++/PKGBUILD
@@ -0,0 +1,35 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Chirantan Ekbote <ekbotec at chromium.org>
+# Contributer: Doug Newgard <scimmia22 at outlook dot com>
+# Contributer: Stéphane Gaudreault <stephane.gaudreault@gmail.com>
+
+pkgname=tolua++
+pkgver=1.0.93
+pkgrel=1
+pkgdesc="Tool to integrate C/C++ code with Lua"
+arch=('i686' 'x86_64')
+url="http://www.codenix.com/~tolua"
+license=('MIT')
+depends=('lua51')
+makedepends=('scons')
+options=('staticlibs')
+source=(http://www.codenix.com/~tolua/${pkgname}-${pkgver}.tar.bz2
+ config_linux.py)
+md5sums=('100aa6907b8108582080b37d79c0afd7'
+ '69ad5067084cec2924f172bb04700da6')
+provides=('toluapp')
+
+build() {
+ cd ${pkgname}-${pkgver}
+ cp ../config_linux.py "${srcdir}"/${pkgname}-${pkgver}
+
+ scons all
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ scons prefix="${pkgdir}/usr" install
+
+ # install license files
+ install -Dm644 "$srcdir/${pkgname}-${pkgver}/COPYRIGHT" "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
+}
diff --git a/community/tolua++/config_linux.py b/community/tolua++/config_linux.py
new file mode 100755
index 000000000..dd6c2917d
--- /dev/null
+++ b/community/tolua++/config_linux.py
@@ -0,0 +1,22 @@
+## This is the linux configuration file
+# This file was adapted to be used with ArchLinux
+# Use 'scons -h' to see the list of command line options available
+
+# Compiler flags (based on ArchLinux's installation of lua)
+#LINKFLAGS = ['-g']
+CCFLAGS = ['-I/usr/include/lua5.1', '-O2', '-ansi', '-Wall', '-fPIC']
+#CCFLAGS = ['-g']
+
+# this is the default directory for installation. Files will be installed on
+# <prefix>/bin, <prefix>/lib and <prefix>/include when you run 'scons install'
+#
+# You can also specify this directory on the command line with the 'prefix'
+# option
+#
+# You can see more 'generic' options for POSIX systems on config_posix.py
+
+prefix = '/usr'
+
+# libraries (based on ArchLinux's installation of lua)
+LIBS = ['lua5.1', 'dl', 'm']
+
diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD
index 95cad22cb..9aa3e2d94 100644
--- a/community/tor/PKGBUILD
+++ b/community/tor/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 92386 2013-06-04 12:52:29Z lfleischer $
+# $Id: PKGBUILD 103171 2013-12-28 17:39:34Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: simo <simo@archlinux.org>
# Contributor: Sid Karunaratne
pkgname=tor
-pkgver=0.2.3.25
-pkgrel=3
+pkgver=0.2.4.20
+pkgrel=1
pkgdesc='Anonymizing overlay network.'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.torproject.org/'
license=('BSD')
-depends=('openssl' 'libevent' 'torsocks' 'bash')
+depends=('openssl' 'libevent' 'bash')
+optdepends=('torsocks: for torify')
makedepends=('ca-certificates')
backup=('etc/tor/torrc'
'etc/tor/torrc-dist'
@@ -19,10 +20,10 @@ install='tor.install'
source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
'torrc'
'tor.service')
-md5sums=('a1c364189a9a66ed9daa8e6436489daf'
+md5sums=('a8cd8e3b3a3f6a7770f2c22d280f19b8'
'SKIP'
'c1dd4004c63edaeaa829e01be5413cfc'
- 'a396657e6f6df21d319ad586500c04b1')
+ '51c81cd06b75edd87aafff5a7941822c')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/tor/tor.service b/community/tor/tor.service
index 264a95624..6f941afcf 100644
--- a/community/tor/tor.service
+++ b/community/tor/tor.service
@@ -6,6 +6,7 @@ After=network.target
User=tor
Type=simple
ExecStart=/usr/bin/tor -f /etc/tor/torrc
+ExecReload=/usr/bin/kill -HUP $MAINPID
KillSignal=SIGINT
LimitNOFILE=8192
diff --git a/community/torcs/PKGBUILD b/community/torcs/PKGBUILD
index 104f5ec15..b47c84b26 100644
--- a/community/torcs/PKGBUILD
+++ b/community/torcs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 97077 2013-09-12 10:16:00Z spupykin $
+# $Id: PKGBUILD 101128 2013-11-17 21:08:42Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Shahar Weiss <sweiss4@gmx.net>
pkgname=torcs
-pkgver=1.3.4
-pkgrel=4
+pkgver=1.3.5
+pkgrel=1
pkgdesc="A 3D racing cars simulator using OpenGL"
url="http://torcs.sourceforge.net"
license=("GPL")
@@ -13,7 +13,7 @@ depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis'
makedepends=('plib' 'mesa')
options=('!makeflags')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2)
-md5sums=('07dbc9c53e2b177be1f53fe97d53d039')
+md5sums=('cd7bc804668af531df9511a6f64a1e84')
build() {
cd $srcdir/$pkgname-${pkgver/_/-}
diff --git a/community/tork/PKGBUILD b/community/tork/PKGBUILD
new file mode 100644
index 000000000..fe8a4121b
--- /dev/null
+++ b/community/tork/PKGBUILD
@@ -0,0 +1,63 @@
+# $Id: PKGBUILD 103134 2013-12-27 05:36:23Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Darwin Bautista <djclue917@gmail.com>
+# Contributor: Chris Giles <Chris.G.27 (at) Gmail.com>
+
+_libname=tor
+pkgname=${_libname}k
+pkgver=0.33
+pkgrel=5
+pkgdesc="An anonymity manager for KDE"
+arch=("i686" "x86_64")
+url="http://sourceforge.net/projects/$pkgname/"
+license=("GPL")
+depends=("geoip" "kdelibs3" "${_libname}" "torsocks" "hicolor-icon-theme" "desktop-file-utils" "xdg-utils")
+optdepends=("privoxy: For anonymous browsing with Konqueror")
+options=("!emptydirs")
+install=${pkgname}.install
+
+source=(
+ http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+ fix_net_port.patch
+ fix_getuid.patch
+)
+sha1sums=(
+ 'cf94b9579cf24254fcb344f579088a241bbd4028'
+ '70c450031bf5e603801451fc016e5cfc22cfd19c'
+ '9fe1de823850e6a0d0a4a18c3b86955206f544bd'
+)
+
+build() {
+ cd ${pkgname}-${pkgver}
+
+ # Source the KDE and QT profiles
+ source /etc/profile.d/kde3.sh
+ #source /etc/profile.d/qt3.sh
+
+ msg "Applying patch(es) ..."
+
+ patch -Np1 -i ../fix_net_port.patch
+ patch -Np1 -i ../fix_getuid.patch
+
+ # Build
+ msg "Compiling tork ..."
+ ./configure --prefix=/opt/kde --mandir=/usr/share/man \
+ --sysconfdir=/etc --with-external-geoip --without-arts
+
+ # Fix --as-needed and --hash-style=gnu options not recognized error
+ find . -name Makefile -exec sed -i "s/-Wl,//g" {} \;
+ find . -name Makefile -exec sed -i "s/-Wl//g" {} \;
+ find . -name Makefile -exec sed -i "s/--hash-style=gnu,//g" {} \;
+ find . -name Makefile -exec sed -i "s/--hash-style=gnu//g" {} \;
+ find . -name Makefile -exec sed -i "s/--as-needed,//g" {} \;
+ find . -name Makefile -exec sed -i "s/--as-needed//g" {} \;
+
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/tork/fix_getuid.patch b/community/tork/fix_getuid.patch
new file mode 100644
index 000000000..6afdae74a
--- /dev/null
+++ b/community/tork/fix_getuid.patch
@@ -0,0 +1,23 @@
+--- A/src/tork.h 2009-08-13 03:41:23.000000000 +0800
++++ B/src/tork.h 2012-04-04 22:43:55.924940588 +0800
+@@ -45,6 +45,9 @@
+ #include <kpopupmenu.h>
+ #include <qvaluevector.h>
+
++#include <unistd.h>
++#include <sys/types.h>
++
+ #include "update.h"
+ #include "trayicon.h"
+ #include "upnpmanager.h"
+--- A/src/likeback.h 2006-10-01 19:58:11.000000000 +0800
++++ B/src/likeback.h 2012-04-04 22:50:38.024921928 +0800
+@@ -22,6 +22,8 @@
+ #define LIKEBACK_H
+
+ #include <qobject.h>
++#include <unistd.h>
++#include <sys/types.h>
+
+ class KConfig;
+ class KAboutData;
diff --git a/community/tork/fix_net_port.patch b/community/tork/fix_net_port.patch
new file mode 100644
index 000000000..b5545e0b2
--- /dev/null
+++ b/community/tork/fix_net_port.patch
@@ -0,0 +1,20 @@
+--- A/src/upnp/upnprouter.h
++++ B/src/upnp/upnprouter.h
+@@ -242,7 +242,7 @@
+ * @param port The local port to forward
+ */
+ void forward(const net::Port & externalport,
+- const net::Port & internalport = net::Port::Port(),
++ const net::Port & internalport = net::Port(),
+ bool force = false);
+
+ /**
+@@ -291,7 +291,7 @@
+ bt::HTTPRequest* sendSoapQuery(const QString & query,const QString & soapact,const QString & controlurl,bool fwd, bool at_exit = false );
+ bool verbose;
+
+- void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port::Port());
++ void forward(UPnPService* srv,const net::Port & externalport,const net::Port & internalport = net::Port());
+ void undoForward(UPnPService* srv,const net::Port & externalport,const net::Port &
+ internalport,bt::WaitJob* waitjob);
+ void httpRequestDone(bt::HTTPRequest* r,bool erase_fwd);
diff --git a/community/tork/tork.install b/community/tork/tork.install
new file mode 100644
index 000000000..5c501dc49
--- /dev/null
+++ b/community/tork/tork.install
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
diff --git a/community/tre/PKGBUILD b/community/tre/PKGBUILD
index c8f669b9d..225eeb163 100644
--- a/community/tre/PKGBUILD
+++ b/community/tre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100003 2013-10-31 02:56:45Z allan $
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de
# Contributor: Igor Galic<i.galic@gmail.com>
pkgname=tre
pkgver=0.8.0
-pkgrel=2.1
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
pkgdesc="POSIX compliant regexp matching library. Includes agrep for aproximate grepping."
url="http://laurikari.net/tre"
@@ -14,19 +14,22 @@ source=("http://laurikari.net/tre/$pkgname-$pkgver.tar.bz2")
md5sums=('b4d3232593dadf6746f4727bdda20b41')
build() {
- cd ${srcdir}/$pkgname-$pkgver
- ./configure --prefix=/usr --enable-static
- make
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --enable-static
+ make
}
-package(){
- cd ${srcdir}/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- install -Dm644 ${srcdir}/$pkgname-$pkgver/LICENSE \
- ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
- install -d ${pkgdir}/usr/share/doc/$pkgname
- cd doc
- for _i in default.css tre-api.html tre-syntax.html; do
- install -Dm644 ${_i} ${pkgdir}/usr/share/doc/$pkgname/${_i}
- done
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$srcdir/$pkgname-$pkgver/LICENSE" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -d "$pkgdir/usr/share/doc/$pkgname"
+
+ cd doc
+ for f in default.css tre-api.html tre-syntax.html; do
+ install -Dm644 "$f" "$pkgdir/usr/share/doc/$pkgname/$f"
+ done
}
diff --git a/community/trickle/PKGBUILD b/community/trickle/PKGBUILD
index 536780e7d..7dcd4dece 100644
--- a/community/trickle/PKGBUILD
+++ b/community/trickle/PKGBUILD
@@ -1,24 +1,33 @@
-# $Id: PKGBUILD 80164 2012-11-17 02:17:02Z kkeen $
+# $Id: PKGBUILD 102975 2013-12-25 09:36:34Z bgyorgy $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor Romain Bouchaud-Leduc <r0m1.bl@camaris.org>
pkgname=trickle
pkgver=1.07
-pkgrel=7
+pkgrel=8
pkgdesc="Lightweight userspace bandwidth shaper"
arch=('i686' 'x86_64' 'mips64el')
url="http://monkey.org/~marius/trickle"
license=('BSD')
depends=('libevent')
-source=("http://monkey.org/~marius/trickle/${pkgname}-${pkgver}.tar.gz")
-md5sums=('860ebc4abbbd82957c20a28bd9390d7d')
+source=("http://monkey.org/~marius/trickle/${pkgname}-${pkgver}.tar.gz"
+ "fix-crasher.patch")
+md5sums=('860ebc4abbbd82957c20a28bd9390d7d'
+ 'a072091bce131e9f7229bff85ed5858c')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
- # FS#23194
+ # FS#27549
sed -i 's|^_select(int|select(int|' trickle-overload.c
+ # FS#35872
+ patch -Np1 -i "${srcdir}/fix-crasher.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
./configure --prefix=/usr \
--mandir=/usr/share/man
sed -i "s|.*in_addr_t.*||g" config.h
diff --git a/community/trickle/fix-crasher.patch b/community/trickle/fix-crasher.patch
new file mode 100644
index 000000000..c660f1ad1
--- /dev/null
+++ b/community/trickle/fix-crasher.patch
@@ -0,0 +1,86 @@
+diff --git a/trickle-overload.c b/trickle-overload.c
+index e72eb0c..9254e89 100644
+--- a/trickle-overload.c
++++ b/trickle-overload.c
+@@ -393,18 +393,14 @@ struct _pollfd {
+ }
+
+ static struct delay *
+-select_shift(struct delayhead *dhead, struct timeval *inittv,
++select_shift(struct delayhead *dhead, struct timeval *difftv,
+ struct timeval **delaytv)
+ {
+- struct timeval curtv, difftv;
+ struct delay *d;
+ struct sockdesc *sd;
+
+- gettimeofday(&curtv, NULL);
+- timersub(&curtv, inittv, &difftv);
+-
+ TAILQ_FOREACH(d, dhead, next) {
+- if (timercmp(&d->delaytv, &difftv, >))
++ if (timercmp(&d->delaytv, difftv, >))
+ break;
+ sd = d->sd;
+
+@@ -413,7 +409,7 @@ struct _pollfd {
+ }
+
+ if (d != NULL)
+- timersub(&d->delaytv, &difftv, *delaytv);
++ timersub(&d->delaytv, difftv, *delaytv);
+ else
+ *delaytv = NULL;
+
+@@ -431,8 +427,8 @@ struct _pollfd {
+ {
+ struct sockdesc *sd;
+ fd_set *fdsets[] = { wfds, rfds }, *fds;
+- struct timeval *delaytv, *selecttv = NULL, *timeout = NULL, _timeout,
+- inittv, curtv, difftv;
++ struct timeval *delaytv, _delaytv, *selecttv = NULL, *timeout = NULL,
++ _timeout, inittv, curtv, difftv;
+ short which;
+ struct delayhead dhead;
+ struct delay *d, *_d;
+@@ -462,15 +458,18 @@ struct _pollfd {
+ FD_ISSET(sd->sock, fds) &&
+ select_delay(&dhead, sd, which)) {
+ FD_CLR(sd->sock, fds);
+- nfds--;
+ }
+
+ gettimeofday(&inittv, NULL);
+ curtv = inittv;
+ d = TAILQ_FIRST(&dhead);
+- delaytv = d != NULL ? &d->delaytv : NULL;
++ if (d != NULL) {
++ _delaytv = d->delaytv;
++ delaytv = &_delaytv;
++ } else
++ delaytv = NULL;
++ timersub(&curtv, &inittv, &difftv);
+ again:
+- timersub(&inittv, &curtv, &difftv);
+ selecttv = NULL;
+
+ if (delaytv != NULL)
+@@ -498,15 +497,15 @@ struct _pollfd {
+ #endif /* DEBUG */
+
+ if (ret == 0 && delaytv != NULL && selecttv == delaytv) {
+- _d = select_shift(&dhead, &inittv, &delaytv);
++ gettimeofday(&curtv, NULL);
++ timersub(&curtv, &inittv, &difftv);
++ _d = select_shift(&dhead, &difftv, &delaytv);
+ while ((d = TAILQ_FIRST(&dhead)) != _d) {
+ FD_SET(d->sd->sock, fdsets[d->which]);
+- nfds++;
+ TAILQ_REMOVE(&dhead, d, next);
+ free(d);
+ }
+
+- gettimeofday(&curtv, NULL);
+ goto again;
+ }
+
diff --git a/community/ubuntuone-client-gnome/PKGBUILD b/community/ubuntuone-client-gnome/PKGBUILD
deleted file mode 100644
index 3f0af0c98..000000000
--- a/community/ubuntuone-client-gnome/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 100006 2013-10-31 02:57:45Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=ubuntuone-client-gnome
-pkgver=4.2.0
-pkgrel=2
-pkgdesc="Some plug-ins, extensions, and data for integrating Ubuntu One features in some core parts of GNOME"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/ubuntuone-client-gnome"
-license=('GPL')
-depends=('nautilus' 'gconf' 'ubuntuone-client')
-makedepends=('intltool' 'gnome-settings-daemon')
-install=$pkgname.install
-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
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-}
diff --git a/community/ubuntuone-client-gnome/disable-gsd-plugin.patch b/community/ubuntuone-client-gnome/disable-gsd-plugin.patch
deleted file mode 100644
index 2199536e2..000000000
--- a/community/ubuntuone-client-gnome/disable-gsd-plugin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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/ubuntuone-client-gnome/ubuntuone-client-gnome.install b/community/ubuntuone-client-gnome/ubuntuone-client-gnome.install
deleted file mode 100644
index 7a903e80c..000000000
--- a/community/ubuntuone-client-gnome/ubuntuone-client-gnome.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD
deleted file mode 100644
index 87090bad6..000000000
--- a/community/ubuntuone-client/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 100005 2013-10-31 02:57:26Z allan $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-
-pkgname=ubuntuone-client
-pkgver=4.2.0
-pkgrel=2
-pkgdesc="Ubuntu One helps you store, sync and share files between your computers"
-arch=('i686' 'x86_64' 'mips64el')
-url="https://launchpad.net/ubuntuone-client"
-license=('GPL' 'CCPL:cc-by-sa')
-depends=('dbus-glib' 'python2-configglue' 'python2-setuptools' 'python2-gobject' 'libnotify' 'python2-pyinotify' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('intltool' 'imake' 'python2-distutils-extra')
-install=$pkgname.install
-source=(https://launchpad.net/ubuntuone-client/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz
- https://launchpad.net/ubuntuone-client-data/stable-4-2/$pkgver/+download/$pkgname-data-$pkgver.tar.gz
- fix-notify-hint.patch)
-md5sums=('37d2de5c6e795e75f447682ee1c3bacc'
- 'd3c445a9957a80471a84f323f24e8f84'
- 'c38cb043e3241f12610ed6eb9ae0f087')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # Python2 fix
- sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/*
-
- # Workaround for crash in notification-daemon
- # https://bugzilla.gnome.org/show_bug.cgi?id=665166
- patch -Np1 -i "$srcdir/fix-notify-hint.patch"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
- --disable-static \
- PYTHON=python2
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir/" install
-
- # Install data
- cd "$srcdir/$pkgname-data-$pkgver"
- python2 setup.py install --root=$pkgdir/ --optimize=1
-
- # We don't have Apport in Arch Linux
- rm -r "$pkgdir"/{etc/apport,usr/share/apport}
-}
diff --git a/community/ubuntuone-client/fix-notify-hint.patch b/community/ubuntuone-client/fix-notify-hint.patch
deleted file mode 100644
index 58a0888ef..000000000
--- a/community/ubuntuone-client/fix-notify-hint.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py
---- ubuntuone-client-4.2.0.orig/ubuntuone/platform/notification/linux.py 2013-04-01 16:37:48.530956424 +0000
-+++ ubuntuone-client-4.2.0/ubuntuone/platform/notification/linux.py 2013-04-01 16:38:32.333945773 +0000
-@@ -32,7 +32,7 @@
- USE_NOTIFY = False
-
- try:
-- from gi.repository import Notify
-+ from gi.repository import GLib, Notify
- USE_NOTIFY = True
- except ImportError:
- pass
-@@ -67,5 +67,5 @@
- if append:
- self.notification.set_hint_string('x-canonical-append', '')
-
-- self.notification.set_hint_int32('transient', int(True))
-+ self.notification.set_hint('transient', GLib.Variant.new_boolean(1))
- self.notification.show()
diff --git a/community/ubuntuone-client/ubuntuone-client.install b/community/ubuntuone-client/ubuntuone-client.install
deleted file mode 100644
index 2c455e952..000000000
--- a/community/ubuntuone-client/ubuntuone-client.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/community/udevil/PKGBUILD b/community/udevil/PKGBUILD
index cc61a4970..19c3b32db 100644
--- a/community/udevil/PKGBUILD
+++ b/community/udevil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86567 2013-03-19 17:52:24Z bpiotrowski $
+# $Id: PKGBUILD 102368 2013-12-09 14:28:01Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
pkgname=udevil
-pkgver=0.4.1
+pkgver=0.4.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='Mount and unmount without password'
@@ -23,17 +23,16 @@ optdepends=('davfs2: mount WebDAV shares'
provides=('devmon')
backup=('etc/udevil/udevil.conf')
install=$pkgname.install
-source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('fa4a3d85361d17bb69dd7dabdcfeecd2b0f5fff95698113975d8fbd504af6c2e')
+source=(https://github.com/IgnorantGuru/udevil/archive/$pkgver.tar.gz)
+md5sums=('7b00971f875aa8e0b436213209c6b61c')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
}
-
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index 11c831fe0..24a05f9d8 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 100008 2013-10-31 02:58:26Z allan $
+# $Id: PKGBUILD 101740 2013-11-30 16:23:34Z seblu $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Sébastien Luttringer
# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Sergej Pupykin <ps@lx-ltd.ru>
pkgname=ulogd
-pkgver=2.0.2
-pkgrel=4
+pkgver=2.0.3
+pkgrel=1
pkgdesc='Userspace Packet Logging for netfilter'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.netfilter.org/projects/ulogd/index.html'
@@ -27,7 +27,7 @@ source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
"$pkgname.logrotate"
"$pkgname.conf"
"$pkgname.service")
-md5sums=('660516de4b5b1e110c12dae414619e0f'
+md5sums=('4dcd7e7a68022318759b8d3b9fff7519'
'95f05af0a0c8f5fdea5bd92ccb2fd465'
'2c8cbedb2fb455cba220ca35186ad846'
'092d72209e30c132e0a08112e4062772')
diff --git a/community/umurmur/PKGBUILD b/community/umurmur/PKGBUILD
new file mode 100644
index 000000000..6af6b8cb3
--- /dev/null
+++ b/community/umurmur/PKGBUILD
@@ -0,0 +1,34 @@
+# $Id: PKGBUILD 101363 2013-11-23 15:13:00Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Robert Knauer <robert@privatdemail.net>
+# Contributor: xav <xav at ethertricks dot net>
+
+pkgname=umurmur
+pkgver=0.2.13
+pkgrel=1
+pkgdesc='Minimalistic Mumble server'
+arch=('i686' 'x86_64')
+url='http://code.google.com/p/umurmur/'
+license=('custom')
+depends=('openssl' 'libconfig' 'protobuf-c')
+install=$pkgname.install
+backup=('etc/umurmur/umurmur.conf')
+source=(http://umurmur.googlecode.com/files/umurmur-$pkgver.tar.gz
+ umurmur.service)
+md5sums=('04d0ea7a90b7858c16df26317b318bf4'
+ 'd9d556e4ffa77e193fb40ce508804720')
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --mandir=/usr/share/man --with-ssl=openssl
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 umurmur.conf.example "$pkgdir"/etc/umurmur/umurmur.conf
+ install -Dm644 ../umurmur.service "$pkgdir"/usr/lib/systemd/system/umurmur.service
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
diff --git a/community/umurmur/umurmur.install b/community/umurmur/umurmur.install
new file mode 100644
index 000000000..41332e9ba
--- /dev/null
+++ b/community/umurmur/umurmur.install
@@ -0,0 +1,13 @@
+post_install() {
+ getent group umurmur > /dev/null || groupadd -r umurmur 1>/dev/null
+ getent passwd umurmur > /dev/null || useradd -r -M -g umurmur -s /bin/false umurmur 1>/dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ getent passwd umurmur > /dev/null && userdel umurmur 1>/dev/null
+ getent group umurmur > /dev/null && groupdel umurmur 1>/dev/null
+}
diff --git a/community/umurmur/umurmur.service b/community/umurmur/umurmur.service
new file mode 100644
index 000000000..329f16803
--- /dev/null
+++ b/community/umurmur/umurmur.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=A minimalistic Mumble server
+After=network.target
+
+[Service]
+Type=simple
+User=umurmur
+Group=umurmur
+PIDFile=/run/umurmurd.pid
+ExecStartPre=/usr/bin/umurmurd -t -c /etc/umurmur/umurmur.conf
+ExecStart=/usr/bin/umurmurd -d -r -p /run/umurmurd.pid -c /etc/umurmur/umurmur.conf
+ExecReload=/bin/kill -HUP $MAINPID
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/unclutter/PKGBUILD b/community/unclutter/PKGBUILD
index 8aa45a8c8..335712607 100644
--- a/community/unclutter/PKGBUILD
+++ b/community/unclutter/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 65341 2012-02-21 02:13:14Z spupykin $
+# $Id: PKGBUILD 102123 2013-12-05 14:32:44Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
@@ -6,20 +6,27 @@
pkgname=unclutter
pkgver=8
-pkgrel=8
+pkgrel=10
pkgdesc="A small program for hiding the mouse cursor"
url="http://ftp.x.org/contrib/utilities/unclutter-8.README"
arch=('i686' 'x86_64' 'mips64el')
license=('Public Domain')
depends=('libxext')
makedepends=('imake')
-source=(http://ftp.x.org/contrib/utilities/$pkgname-$pkgver.tar.Z)
-md5sums=('83d7a6498b69078f869378f801b6a84b')
+source=(http://ftp.x.org/contrib/utilities/$pkgname-$pkgver.tar.Z
+ http://ftp.x.org/contrib/utilities/unclutter-8.README)
+md5sums=('83d7a6498b69078f869378f801b6a84b'
+ '90ea7ff9f64945a6ca979d08a60c28dd')
build() {
cd ${srcdir}/$pkgname
xmkmf -a
make
+}
+
+package() {
+ cd ${srcdir}/$pkgname
make DESTDIR=${pkgdir} install
- install -D -m 644 unclutter.man ${pkgdir}/usr/share/man/man1/unclutter.1
+ install -Dm0644 unclutter.man ${pkgdir}/usr/share/man/man1/unclutter.1
+ install -Dm0644 $srcdir/unclutter-8.README ${pkgdir}/usr/share/licenses/$pkgname/unclutter-8.README
}
diff --git a/community/unrealircd/PKGBUILD b/community/unrealircd/PKGBUILD
index 2a1533213..1390a5344 100644
--- a/community/unrealircd/PKGBUILD
+++ b/community/unrealircd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 94846 2013-07-31 07:46:49Z spupykin $
+# $Id: PKGBUILD 101548 2013-11-27 16:02:52Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Zerial <fernando@zerial.org>
pkgname=unrealircd
-pkgver=3.2.10.1
+pkgver=3.2.10.2
pkgrel=1
pkgdesc="Open Source IRC Server"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,26 +12,29 @@ license=('GPL2')
depends=('openssl' 'curl' 'c-ares')
conflicts=('ircd')
provides=('ircd')
-backup=('etc/unrealircd/unrealircd.conf'
- 'etc/conf.d/unrealircd')
+backup=('etc/unrealircd/unrealircd.conf')
+install=unrealircd.install
source=(http://www.unrealircd.com/downloads/Unreal$pkgver.tar.gz
unrealircd.service
arch-fixes.patch)
-md5sums=('97b4bd68a804e517355efa756f401a90'
+md5sums=('21c460dc04d221b401a1701ca96e9e58'
'93276a1cd426e4a811c072c35fc31e94'
'77807313c4578f2c30286b9f9e3fb21c')
-build() {
+prepare() {
cd $srcdir/Unreal$pkgver
-
patch -p1 <$srcdir/arch-fixes.patch
+}
+
+build() {
+ cd $srcdir/Unreal$pkgver
ac_cv_ip6=yes ./configure --with-showlistmodes \
- --enable-hub --enable-prefixaq --with-listen=5 \
+ --enable-prefixaq --with-listen=5 \
--with-dpath=/etc/unrealircd \
--with-spath=/usr/bin \
--with-nick-history=2000 --with-sendq=3000000 \
- --with-bufferpool=18 --with-hostname=archlinux \
+ --with-bufferpool=18 \
--with-permissions=0600 --with-fd-setsize=1024 \
--enable-dynamic-linking \
--enable-ziplinks \
@@ -62,9 +65,6 @@ package() {
touch $pkgdir/var/log/unrealircd/ircd.log
ln -s /var/log/unrealircd/ircd.log $pkgdir/etc/unrealircd/ircd.log
- mkdir -p $pkgdir/etc/conf.d/
- echo 'UNREALIRCD_USER=root' >$pkgdir/etc/conf.d/unrealircd
-
find $pkgdir/usr -type f -exec chmod ugo+r {} \;
find $pkgdir/usr -type d -exec chmod ugo+rx {} \;
diff --git a/community/unrealircd/unrealircd.install b/community/unrealircd/unrealircd.install
new file mode 100644
index 000000000..274d8b13f
--- /dev/null
+++ b/community/unrealircd/unrealircd.install
@@ -0,0 +1,14 @@
+post_install() {
+ echo "Create ircd user and chown /etc/unrealircd and /var/log/unrealircd recursively"
+ echo "SSL is enabled by default, so you need to create pem files"
+ echo "Also unrealircd.conf needs adjustments"
+ echo "See also: https://wiki.archlinux.org/index.php/UnrealIRCd"
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ echo "Don't forget to remove ircd user"
+}
diff --git a/community/unshield/PKGBUILD b/community/unshield/PKGBUILD
index a4b0460b0..3ce64c958 100644
--- a/community/unshield/PKGBUILD
+++ b/community/unshield/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100010 2013-10-31 02:59:06Z allan $
+# $Id: PKGBUILD 101042 2013-11-15 12:43:16Z spupykin $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=unshield
pkgver=0.6
-pkgrel=3
+pkgrel=4
pkgdesc="Extracts CAB files from InstallShield installers"
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/synce/files/"
@@ -14,12 +14,21 @@ source=(http://downloads.sourceforge.net/sourceforge/synce/${pkgname}-${pkgver}.
md5sums=('31a829192a255160d1f71cda4c865c9c'
'aa731ca6fd7c7dfb03f8b07e232b37d3')
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ sed -i 's|CFLAGS="-ansi -Wall -Werror"|CFLAGS="-ansi -Wall"|g' configure
+}
+
build() {
cd ${srcdir}/${pkgname}-${pkgver}
# See http://www.mail-archive.com/synce-devel@lists.sourceforge.net/msg01796.html
patch -Np0 -i "${srcdir}/libunshield.c.patch"
./configure --prefix=/usr
make
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/unshield/LICENSE
}
diff --git a/community/upx/PKGBUILD b/community/upx/PKGBUILD
index 18f9a7a65..a976435de 100644
--- a/community/upx/PKGBUILD
+++ b/community/upx/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=upx
-pkgver=3.09
+pkgver=3.91
pkgrel=1
pkgdesc='Ultimate executable compressor.'
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('zlib')
makedepends=('ucl')
source=("http://upx.sourceforge.net/download/${pkgname}-${pkgver}-src.tar.bz2"
'http://downloads.sourceforge.net/sevenzip/lzma465.tar.bz2')
-md5sums=('1253da46eac54a217eb73e2d44818e53'
+md5sums=('c6d0b3ea2ecb28cb8031d59a4b087a43'
'29d5ffd03a5a3e51aef6a74e9eafb759')
build() {
diff --git a/community/uriparser/PKGBUILD b/community/uriparser/PKGBUILD
index ec2e2de0c..6b7b41641 100644
--- a/community/uriparser/PKGBUILD
+++ b/community/uriparser/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100078 2013-11-01 09:49:54Z spupykin $
+# $Id: PKGBUILD 102887 2013-12-23 12:45:26Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Juan Pablo Gonzalez Tognarelli <lord_jotape@yahoo.com.ar>
pkgname=uriparser
-pkgver=0.7.8
-pkgrel=2
+pkgver=0.8.0
+pkgrel=1
pkgdesc="uriparser is a strictly RFC 3986 compliant URI parsing library. uriparser is cross-platform, fast, supports Unicode"
url="http://sourceforge.net/projects/uriparser/"
depends=()
@@ -12,7 +12,7 @@ makedepends=(doxygen graphviz)
arch=('i686' 'x86_64' 'mips64el')
license=("custom")
source=(http://downloads.sourceforge.net/sourceforge/uriparser/$pkgname-$pkgver.tar.bz2)
-md5sums=('1ff590e25e8d9f5eaaa409c741fc387b')
+md5sums=('77601f52ab91c0e100fc5d783d9c1ee5')
build() {
cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/uwsgi/PKGBUILD b/community/uwsgi/PKGBUILD
index 447d415b4..cce6fe1a9 100644
--- a/community/uwsgi/PKGBUILD
+++ b/community/uwsgi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98834 2013-10-20 05:56:09Z dwallace $
+# $Id: PKGBUILD 102953 2013-12-24 23:07:41Z dwallace $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Valentin Hăloiu <vially.ichb+aur@gmail.com>
# Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -19,18 +19,18 @@ pkgname=(uwsgi
uwsgi-plugin-lua51
uwsgi-plugin-carbon
uwsgi-plugin-rrdtool
- uwsgi-plugin-erlang
uwsgi-plugin-pam
uwsgi-plugin-zergpool
)
-pkgver=1.9.18.1
+ #uwsgi-plugin-erlang
+pkgver=1.9.21.1
pkgrel=1
arch=(i686 x86_64)
url="http://projects.unbit.it/$pkgbase"
license=(GPL2)
conflicts=(python-$pkgbase)
makedepends=(gcc python python2 ruby python2-greenlet php-embed curl libxml2 libyaml
- perl lua51 pcre libedit openssl bzip2 gmp erlang pam java-environment=7
+ perl lua51 pcre libedit openssl bzip2 gmp pam java-environment=7
jansson classpath)
source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
archlinux.ini
@@ -41,8 +41,8 @@ source=(http://projects.unbit.it/downloads/$pkgbase-$pkgver.tar.gz
uwsgi_ruby20_compatibility.patch
uwsgi_trick_chroot.patch)
-md5sums=('9925e4c189cb0fcd26d4b2efd732b6ca'
- 'fcd57c37372e6afe5b1fae151dd43bc9'
+md5sums=('82df3eeacc0d4e661459bc50d50e757b'
+ '2f21e871e81698c88c7ec2dbb4e3833e'
'b05ba1d796e1ea608a40635bc4f3ec67'
'740a7718bd341b03d916a13ddbbbe694'
'db70315bbc8cb886a278ba59d5fd8d57'
@@ -197,13 +197,13 @@ package_uwsgi-plugin-rrdtool(){
ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
}
-package_uwsgi-plugin-erlang(){
- depends=(uwsgi-plugin-common erlang)
- pkgdesc="Plugin for Erlang support"
- install -dm755 $pkgdir/usr/bin
- install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so
- ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
-}
+#package_uwsgi-plugin-erlang(){
+# depends=(uwsgi-plugin-common erlang)
+# pkgdesc="Plugin for Erlang support"
+# install -dm755 $pkgdir/usr/bin
+# install -Dm755 $pkgbase-$pkgver/erlang_plugin.so $pkgdir/usr/lib/uwsgi/erlang_plugin.so
+# ln -s uwsgi $pkgdir/usr/bin/uwsgi_${pkgname#uwsgi-plugin-}
+#}
package_uwsgi-plugin-pam(){
diff --git a/community/uwsgi/archlinux.ini b/community/uwsgi/archlinux.ini
index e3770bf5b..f2550757f 100644
--- a/community/uwsgi/archlinux.ini
+++ b/community/uwsgi/archlinux.ini
@@ -14,4 +14,4 @@ yaml_implementation = auto
malloc_implementation = libc
embedded_plugins = echo, ping, http, corerouter
plugin_dir = /usr/lib/uwsgi
-plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios, admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, erlang, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter
+plugins = echo, ping, http, rack, psgi, corerouter, rbthreads, fiber, python, nagios, admin, lua, cache, cgi, rpc, ugreen, carbon, rrdtool, pam, systemd_logger, php, fastrouter, router_uwsgi, router_redirect, router_basicauth, zergpool, router_rewrite, router_http, router_cache, rawrouter, router_static, sslrouter
diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD
index 7ea03206f..d66afde41 100644
--- a/community/vdrift/PKGBUILD
+++ b/community/vdrift/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 99451 2013-10-29 09:00:10Z svenstaro $
+# $Id: PKGBUILD 100934 2013-11-13 12:48:39Z heftig $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
# Contributor: Lone_Wolf lonewolf@xs4all.nl
pkgname=vdrift
pkgver=2012.07.22
-pkgrel=6
+pkgrel=7
pkgdesc="Open source driving simulation made with drift racing in mind"
arch=('i686' 'x86_64')
url="http://vdrift.net/"
diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD
index e843dd9b5..f55175ced 100644
--- a/community/vifm/PKGBUILD
+++ b/community/vifm/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 91037 2013-05-18 13:22:47Z jlichtblau $
+# $Id: PKGBUILD 100834 2013-11-11 18:48:45Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
pkgname=vifm
-pkgver=0.7.5
+pkgver=0.7.6
pkgrel=1
pkgdesc="Ncurses based file manager with vi like keybindings"
arch=('i686' 'x86_64' 'mips64el')
url="http://vifm.sourceforge.net/"
license=('GPL')
-depends=('ncurses' 'gtk2')
+depends=('ncurses')
changelog=$pkgname.changelog
source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha256sums=('01346f3573fa40d3c851b4844fb19ea2f1f63416bc8500bacb243997bf482de4')
+sha256sums=('861798592d6fccc5d330a66e68f1c5a747732b9df587f15d892c6ff72a04650f')
build() {
cd ${srcdir}/$pkgname-$pkgver
- ./configure --prefix=/usr
+ ./configure --prefix=/usr
make
}
diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog
index 62411bb21..57a4b3831 100644
--- a/community/vifm/vifm.changelog
+++ b/community/vifm/vifm.changelog
@@ -1,3 +1,6 @@
+2013-11-11 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * vifm 0.7.6-1
+
2013-05-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* vifm 0.7.5-1
diff --git a/community/vile/PKGBUILD b/community/vile/PKGBUILD
index 9e32ec227..9f53f2e00 100644
--- a/community/vile/PKGBUILD
+++ b/community/vile/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 100013 2013-10-31 03:00:12Z allan $
+# $Id: PKGBUILD 101122 2013-11-17 20:12:27Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=vile
-pkgver=9.8_i
+pkgver=9.8_k
_basever=9.8
pkgrel=1.1
pkgdesc="vi like emacs"
@@ -19,7 +19,9 @@ source=("ftp://invisible-island.net/vile/vile-${_basever}.tgz"
"ftp://invisible-island.net/vile/patches/vile-${_basever}f.patch.gz"
"ftp://invisible-island.net/vile/patches/vile-${_basever}g.patch.gz"
"ftp://invisible-island.net/vile/patches/vile-${_basever}h.patch.gz"
- "ftp://invisible-island.net/vile/patches/vile-${_basever}i.patch.gz")
+ "ftp://invisible-island.net/vile/patches/vile-${_basever}i.patch.gz"
+ "ftp://invisible-island.net/vile/patches/vile-${_basever}j.patch.gz"
+ "ftp://invisible-island.net/vile/patches/vile-${_basever}k.patch.gz")
md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f'
'685cb681943e9315a1689a6a6f4734cb'
'f3842ea427c635d0ee96f6da8566fa56'
@@ -29,16 +31,20 @@ md5sums=('b5a0d89165f633a662cdb4b5c57f2e2f'
'7f8a38272395f07e1377cc1943d37e7f'
'26ab76a7305b7ec97b22855810911ceb'
'6ea4cf22e29f5418f26ba6632985c70e'
- '908e8f9cf3c9a681c3ef76a3cd04a0c3')
+ '908e8f9cf3c9a681c3ef76a3cd04a0c3'
+ '66f4136ab1ce33f491080c0fb3c87b06'
+ 'e4a60ed7e3959269201c5a937b206272')
-build() {
+prepare() {
cd $srcdir/$pkgname-${_basever}
-
for i in $srcdir/vile-${_basever}?.patch; do
patch -p1 <$i
done
sed -i 's|FLEX_BETA|FLEX_NOBETA|g' filters/filters.h
+}
+build() {
+ cd $srcdir/$pkgname-${_basever}
./configure --prefix=/usr
make
}
@@ -46,7 +52,6 @@ build() {
package() {
cd $srcdir/$pkgname-${_basever}
make install DESTDIR=$pkgdir
-
mkdir -p $pkgdir/usr/share/licenses/$pkgname
cat <<EOF >$pkgdir/usr/share/licenses/$pkgname/license
Copyright
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 364dc97ba..d4f458448 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 100234 2013-11-02 01:49:57Z seblu $
+# $Id: PKGBUILD 102983 2013-12-25 11:05:37Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Sébastien Luttringer
pkgbase=virtualbox-modules-lts
pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.3.2
-pkgrel=1
+pkgver=4.3.6
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
@@ -63,3 +63,4 @@ package_virtualbox-guest-modules-lts(){
}
# vim:set ts=2 sw=2 et:
+md5sums=()
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 18d8dd712..ec8bd87b6 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 100230 2013-11-02 00:53:56Z seblu $
+# $Id: PKGBUILD 103140 2013-12-27 12:02:56Z foutrelis $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer
pkgbase=virtualbox-modules
pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.3.2
-pkgrel=1
+pkgver=4.3.6
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
-makedepends=('linux>=3.11' 'linux<3.12'
- 'linux-headers>=3.11' 'linux-headers<3.12'
+makedepends=('linux>=3.12' 'linux<3.13'
+ 'linux-headers>=3.12' 'linux-headers<3.13'
"virtualbox-host-dkms>=$pkgver"
"virtualbox-guest-dkms>=$pkgver")
# remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-3.11-ARCH
+_extramodules=extramodules-3.12-ARCH
build() {
_kernver="$(cat /usr/lib/modules/$_extramodules/version)"
@@ -33,7 +33,7 @@ build() {
package_virtualbox-host-modules(){
_kernver="$(cat /usr/lib/modules/$_extramodules/version)"
pkgdesc='Host kernel modules for VirtualBox'
- depends=('linux>=3.11' 'linux<3.12')
+ depends=('linux>=3.12' 'linux<3.13')
replaces=('virtualbox-modules')
conflicts=('virtualbox-modules')
install=virtualbox-host-modules.install
@@ -48,7 +48,7 @@ package_virtualbox-guest-modules(){
_kernver="$(cat /usr/lib/modules/$_extramodules/version)"
pkgdesc='Guest kernel modules for VirtualBox'
license=('GPL')
- depends=('linux>=3.11' 'linux<3.12')
+ depends=('linux>=3.12' 'linux<3.13')
replaces=('virtualbox-archlinux-modules')
conflicts=('virtualbox-archlinux-modules')
install=virtualbox-guest-modules.install
@@ -60,3 +60,4 @@ package_virtualbox-guest-modules(){
}
# vim:set ts=2 sw=2 et:
+md5sums=()
diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install
index af7f5b278..424121a1a 100644
--- a/community/virtualbox-modules/virtualbox-guest-modules.install
+++ b/community/virtualbox-modules/virtualbox-guest-modules.install
@@ -1,5 +1,5 @@
_depmod() {
- EXTRAMODULES=extramodules-3.11-ARCH
+ EXTRAMODULES=extramodules-3.12-ARCH
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install
index cfbefde89..864e3389c 100644
--- a/community/virtualbox-modules/virtualbox-host-modules.install
+++ b/community/virtualbox-modules/virtualbox-host-modules.install
@@ -1,5 +1,5 @@
_depmod() {
- EXTRAMODULES=extramodules-3.11-ARCH
+ EXTRAMODULES=extramodules-3.12-ARCH
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/community/vor/PKGBUILD b/community/vor/PKGBUILD
index 88efc9521..71a095544 100644
--- a/community/vor/PKGBUILD
+++ b/community/vor/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 82073 2013-01-07 10:20:03Z arodseth $
+# $Id: PKGBUILD 101359 2013-11-23 12:39:11Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: tdy <tdy@gmx.com>
# Contributor: nut543 <kfs1@online.no>
pkgname=vor
pkgver=0.5.5
-pkgrel=1
+pkgrel=2
pkgdesc='Classic spaceship versus asteroid field arcade game'
arch=('i686' 'x86_64' 'mips64el')
-url="http://jasonwoof.org/vor?"
+url='http://jasonwoof.org/vor'
license=('GPL')
depends=('sdl_image' 'sdl_mixer')
makedepends=('gendesk')
@@ -16,27 +16,22 @@ optdepends=('netpbm: for customizing game graphics'
'povray: for customizing game graphics')
options=('!emptydirs')
source=("http://qualdan.com/$pkgname/$pkgname-$pkgver.tar.bz2"
- "$pkgname.png")
+ "$pkgname.png")
sha256sums=('ead1b9786741e26d37ff7c5185b7fe1e91f90f76ebed3785225312e323b7c7da'
'07a805928f5cf2b3351e2b9ff820ea69352ad80faad43311889ffbd5f62da872')
-_exec=('vor -f')
build() {
- cd "$srcdir"
- gendesk
-
+ gendesk -f --pkgname "$pkgname" --pkgdesc "$pkgdesc"
cd "$pkgname-$pkgver"
./configure --prefix=/usr
make LDFLAGS=-lm
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- mkdir -p "$pkgdir/usr/bin"
- make prefix=/usr DESTDIR="$pkgdir" install
- install -Dm644 "../$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
- install -Dm644 "../$pkgname.desktop" \
+ install -d "$pkgdir/usr/bin"
+ make -C "$pkgname-$pkgver" prefix=/usr DESTDIR="$pkgdir" install
+ install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
+ install -Dm644 "$pkgname.desktop" \
"$pkgdir/usr/share/applications/$pkgname.desktop"
}
diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD
index 1e2330ba6..2b3ae1747 100644
--- a/community/warmux/PKGBUILD
+++ b/community/warmux/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 90103 2013-05-06 19:39:59Z foutrelis $
+# $Id: PKGBUILD 100935 2013-11-13 12:48:40Z heftig $
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: pukyxd
# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
pkgname=warmux
pkgver=11.04.1
-pkgrel=6
+pkgrel=7
pkgdesc="A clone of the worms game"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.wormux.org/"
+url="http://gna.org/projects/warmux/"
license=('GPL')
makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
replaces=('wormux')
diff --git a/community/warzone2100/PKGBUILD b/community/warzone2100/PKGBUILD
index a5975f2e4..4ee2ac417 100644
--- a/community/warzone2100/PKGBUILD
+++ b/community/warzone2100/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94912 2013-08-01 06:55:47Z bpiotrowski $
+# $Id: PKGBUILD 102852 2013-12-22 08:25:23Z lcarlier $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
pkgname=warzone2100
-pkgver=3.1.0
-pkgrel=4
+pkgver=3.1.1
+pkgrel=1
pkgdesc="3D realtime strategy game on a future Earth"
url="http://wz2100.net/"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,12 +12,12 @@ license=('GPL')
depends=('sdl' 'glew' 'fribidi' 'openal' 'libvorbis' 'libtheora' 'physfs' 'ttf-dejavu' 'qt4')
makedepends=('gawk' 'flex' 'zip' 'unzip' 'asciidoc' 'mesa')
source=("http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('7f061f3e5a2a6a83c146508ccefabd86')
+md5sums=('0b81a0012098a1310f5351a3ace2021b')
build() {
cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr --with-distributor="Arch linux"
+ ./configure --prefix=/usr --with-distributor="Archlinux"
make
}
diff --git a/community/wdm/PKGBUILD b/community/wdm/PKGBUILD
deleted file mode 100644
index 99f741fd0..000000000
--- a/community/wdm/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 88268 2013-04-15 11:14:13Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: eric <eric@archlinux.org>
-# Contributor: Aurelien Foret <orelien@chez.com>
-
-pkgname=wdm
-pkgver=1.28
-pkgrel=6
-pkgdesc="An replacement X window display manager similar to, and based on XDM"
-arch=(i686 x86_64 'mips64el')
-depends=('windowmaker' 'pam' 'bash' 'libxmu')
-license=('GPL')
-source=(http://voins.program.ru/$pkgname/$pkgname-$pkgver.tar.bz2)
-url="http://voins.program.ru/wdm/"
-md5sums=('4da8ffe3af233305786d9b6aab78b838')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr --with-nlsdir=/usr/share/locale \
- --sysconfdir=/etc/wdm --with-wdmdir=/etc/wdm --mandir=/usr/share/man \
- --with-fakehome=/var/empty
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- # used /etc/pam.d/xscreensaver as an example
- #
- echo "auth required pam_unix_auth.so" > $pkgdir/etc/pam.d/wdm
- chmod 0644 $pkgdir/etc/wdm/wdm-config
- chmod 0755 $pkgdir/etc/wdm/authdir
-}
diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD
index b22e9bd50..4ffc89eae 100644
--- a/community/wesnoth/PKGBUILD
+++ b/community/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96161 2013-08-20 15:02:17Z svenstaro $
+# $Id: PKGBUILD 102283 2013-12-07 10:37:17Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=wesnoth
pkgver=1.10.7
-pkgrel=1
+pkgrel=2
pkgdesc="A turn-based strategy game on a fantasy world"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD
index 946d60874..eae9d26ce 100644
--- a/community/weston/PKGBUILD
+++ b/community/weston/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100093 2013-11-01 14:31:04Z seblu $
+# $Id: PKGBUILD 103053 2013-12-25 21:25:19Z andyrtr $
# Maintainer: Sébastien Luttringer
# Contributor: Joel Teichroeb <joel@teichroeb.net>
pkgname=weston
pkgver=1.3.1
-pkgrel=1
+pkgrel=2
pkgdesc='Reference implementation of a Wayland compositor'
arch=('i686' 'x86_64' 'mips64el')
url='http://wayland.freedesktop.org'
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 62dd1b535..aa5a38bcd 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94913 2013-08-01 06:55:50Z bpiotrowski $
+# $Id: PKGBUILD 102284 2013-12-07 10:37:19Z bpiotrowski $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,7 +6,7 @@
pkgname=widelands
pkgver=17
_realver=build17
-pkgrel=9
+pkgrel=11
pkgdesc="A realtime strategy game with emphasis on economy and transport"
arch=('i686' 'x86_64' 'mips64el')
url="http://widelands.org/"
diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD
deleted file mode 100644
index bcca41378..000000000
--- a/community/wings3d/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 95698 2013-08-15 18:31:52Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: kappa <kappacurve@gmail.com>
-
-pkgname=wings3d
-_pkgname=wings
-pkgver=1.4.1
-pkgrel=18
-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')
-makedepends=('gendesk')
-optdepends=('povray: rendering support via POV-Ray')
-install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/master.tar.gz"
- "$pkgname.sh"
- "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
-sha256sums=('02be0f1a2494b5243ecf027e6cc6e95e0fbe6d6dca6393b3a202c9d12c6bd5e6'
- '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
- '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a')
-
-prepare() {
- gendesk --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
- --genericname '3D Modeler' --categories 'Graphics;3DGraphics'
-}
-
-build() {
- cd "$_pkgname-master"
-
- export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*)
- make
- make lang
-}
-
-package() {
- cd "$_pkgname-master"
-
- mkdir -p "$pkgdir/usr/lib/$pkgname"
- for subdir in ebin fonts patches plugins shaders textures; do
- cp -r "$srcdir/$_pkgname-master/$subdir/" "$pkgdir/usr/lib/$pkgname"
- done
- cd "$srcdir"
- install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
- install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
- install -Dm644 "$pkgname.desktop" \
- "$pkgdir/usr/share/applications/$pkgname.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/wireshark/PKGBUILD b/community/wireshark/PKGBUILD
index 5fcafcf1b..2cda54a4b 100644
--- a/community/wireshark/PKGBUILD
+++ b/community/wireshark/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 100436 2013-11-04 11:50:09Z tredaelli $
+# $Id: PKGBUILD 102796 2013-12-20 11:11:34Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Guillaume ALAUX <guillaume@archlinux.org>
# Contributor: Florian Pritz <bluewind at jabber dot ccc dot de>
pkgname=('wireshark-cli' 'wireshark-gtk')
pkgbase=wireshark
-pkgver=1.10.3
+pkgver=1.10.5
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
-makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls'
+makedepends=('gtk3' 'krb5' 'libpcap' 'bash' 'gnutls' 'portaudio'
'lua' 'python' 'desktop-file-utils' 'hicolor-icon-theme')
url='http://www.wireshark.org/'
source=(http://www.wireshark.org/download/src/${pkgbase}-${pkgver}.tar.bz2
wireshark-1.10.3-gtk3.10-compile.patch)
-sha256sums=('c1641b36aeb0ca2c1a95fb01d2c647888b65e00a215c9a6464b5fc61e0fd498c'
+sha256sums=('a02190da9573dd381e7598277a31d0c63b05b2af9fe05ab6b7fc058bbea141f5'
'45274cca58f0abdd3a560beb79a6f0bc8f35736426a1855ed048c9ad8e94f3c0')
prepare() {
@@ -27,16 +27,19 @@ build() {
./autogen.sh
./configure \
--prefix=/usr \
- --with-ssl \
- --with-zlib=yes \
+ --with-gtk3=yes \
+ --with-pcap \
+ --with-zlib \
--with-lua \
- --with-gtk3=yes
+ --with-portaudio \
+ --with-ssl \
+ --with-krb5
make all
}
package_wireshark-cli() {
pkgdesc='a free network protocol analyzer for Unix/Linux and Windows - CLI version'
- depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua')
+ depends=('krb5' 'libpcap' 'bash' 'gnutls' 'glib2' 'lua' 'portaudio')
install=wireshark.install
conflicts=(wireshark)
diff --git a/community/wiznote/PKGBUILD b/community/wiznote/PKGBUILD
index da1e90b64..76bebe9a3 100644
--- a/community/wiznote/PKGBUILD
+++ b/community/wiznote/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 100396 2013-11-03 12:29:00Z fyan $
+# $Id: PKGBUILD 101247 2013-11-20 14:03:11Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Albert.Zhou <albert.zhou@wiz.cn>
pkgname=wiznote
-pkgver=2.0.62
+pkgver=2.0.64
pkgrel=1
pkgdesc="Opensource cross-platform cloud based note-taking client"
arch=('i686' 'x86_64')
diff --git a/community/workrave/PKGBUILD b/community/workrave/PKGBUILD
index dfcd69dba..045da6133 100644
--- a/community/workrave/PKGBUILD
+++ b/community/workrave/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 100122 2013-11-01 17:18:06Z spupykin $
+# $Id: PKGBUILD 103150 2013-12-27 15:56:01Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: William Rea <sillywilly@gmail.com>
pkgname=workrave
-pkgver=1.10
-pkgrel=3
+pkgver=1.10.1
+pkgrel=1
pkgdesc="a tool to help RSI"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
url="http://workrave.org"
depends=('libxtst' 'gtkmm3' 'gconf' 'gdome2' 'gstreamer0.10' 'libsm' 'libice'
- 'python2-cheetah' 'libxss' 'gobject-introspection')
-makedepends=('intltool')
+ 'python2-cheetah' 'libxss')
+makedepends=('intltool' 'gobject-introspection')
source=(http://downloads.sourceforge.net/workrave/workrave-$pkgver.tar.gz)
-md5sums=('5b76c2ef8e1dfede69c4e0d4bca9dcb9')
+md5sums=('6ebc7896de350bf5fc61c24a210f9a6e')
build() {
cd $srcdir/workrave-$pkgver
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 1f660bf2f..409a3804b 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98707 2013-10-17 10:43:21Z svenstaro $
+# $Id: PKGBUILD 102285 2013-12-07 10:37:21Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Denis Martinez <deuns.martinez@gmail.com>
@@ -6,7 +6,7 @@
pkgname=wt
pkgver=3.3.1
_pkgver=3.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="a C++ library and application server for developing and deploying web applications"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.webtoolkit.eu/"
diff --git a/community/xbmc-pvr-addons/PKGBUILD b/community/xbmc-pvr-addons/PKGBUILD
index 3ac9a67bb..19fb2c0f0 100644
--- a/community/xbmc-pvr-addons/PKGBUILD
+++ b/community/xbmc-pvr-addons/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 100503 2013-11-05 10:06:30Z spupykin $
+# $Id: PKGBUILD 100628 2013-11-06 16:33:42Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=xbmc-pvr-addons
-pkgver=20131105git
+pkgver=20131106git
pkgrel=1
pkgdesc="XBMC PVR add-ons for current stable xbmc"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('tvheadend-git: tvheadend backend' 'mythtv: mythtv backend')
conflicts=('xbmc-pvr-addons-git')
#source=("$pkgname-$pkgver.tar.gz::https://github.com/opdenkamp/xbmc-pvr-addons/archive/${pkgver/_/-}.tar.gz")
#source=("git://github.com/opdenkamp/xbmc-pvr-addons.git")
-source=("git://github.com/fetzerch/xbmc-pvr-addons.git")
+source=("git://github.com/fetzerch/xbmc-pvr-addons.git#branch=frodo")
md5sums=('SKIP')
build() {
diff --git a/community/xcb-util-cursor/PKGBUILD b/community/xcb-util-cursor/PKGBUILD
index cc94347a8..c3346a44d 100644
--- a/community/xcb-util-cursor/PKGBUILD
+++ b/community/xcb-util-cursor/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 98879 2013-10-21 00:54:20Z seblu $
+# $Id: PKGBUILD 100959 2013-11-13 21:01:51Z seblu $
# Maintainer: Sébastien Luttringer <seblu at seblu dot net>
# Contributor: Bastien Dejean <nihilhill@gmail.com>
pkgname=xcb-util-cursor
-pkgver=0.1.0
-pkgrel=4
+pkgver=0.1.1
+pkgrel=1
pkgdesc='XCB cursor library'
arch=('i686' 'x86_64')
url='http://cgit.freedesktop.org/xcb/util-cursor'
license=('custom:MIT')
depends=('libxcb' 'xcb-util-renderutil' 'xcb-util-image')
source=("http://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.bz2")
-md5sums=('40e913aae6fb30a72d423e6bae9a93e9')
+md5sums=('568712eaa340f18b357d3748300c1795')
build() {
cd $pkgname-$pkgver
diff --git a/extra/xchm/PKGBUILD b/community/xchm/PKGBUILD
index a339f9e1b..f2fd50ac3 100644
--- a/extra/xchm/PKGBUILD
+++ b/community/xchm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193831 2013-09-02 17:00:04Z giovanni $
+# $Id: PKGBUILD 102193 2013-12-06 12:52:51Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=xchm
diff --git a/extra/xchm/xchm.desktop b/community/xchm/xchm.desktop
index ca20876b2..ca20876b2 100644
--- a/extra/xchm/xchm.desktop
+++ b/community/xchm/xchm.desktop
diff --git a/extra/xchm/xchm.install b/community/xchm/xchm.install
index df90cb5ac..df90cb5ac 100644
--- a/extra/xchm/xchm.install
+++ b/community/xchm/xchm.install
diff --git a/extra/xchm/xchm.xml b/community/xchm/xchm.xml
index 08cb9ca3f..08cb9ca3f 100644
--- a/extra/xchm/xchm.xml
+++ b/community/xchm/xchm.xml
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index 4ec956890..e1fe4f387 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99387 2013-10-28 09:51:20Z spupykin $
+# $Id: PKGBUILD 102706 2013-12-17 17:42:48Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Giovanni Scafora <linuxmania@gmail.com>
# Contributor: simo <simo@archlinux.org>
pkgname=xcircuit
-pkgver=3.7.54
+pkgver=3.7.55
pkgrel=1
pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL2')
depends=('tk' 'libxpm' 'zlib')
makedepends=('chrpath')
source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz)
-md5sums=('25e60837e5db6b4ff71615505493a481')
+md5sums=('938bccd7f8309f897ef6c2e742f5dbac')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/xemacs/PKGBUILD b/community/xemacs/PKGBUILD
index 135d22481..df31f4696 100644
--- a/community/xemacs/PKGBUILD
+++ b/community/xemacs/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 94932 2013-08-01 07:01:29Z bpiotrowski $
+# $Id: PKGBUILD 103002 2013-12-25 15:01:04Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: juergen <juergen@archlinux.org>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=xemacs
pkgver=21.5.33
-pkgrel=3
+pkgrel=5
pkgdesc="An highly customizable open source text editor and application development system forked from GNU Emacs"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xemacs.org/"
license=('GPL')
-depends=('db' 'libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
+depends=('libpng' 'libtiff' 'gpm' 'desktop-file-utils' 'libxaw' 'gdbm' 'giflib')
optdepends=('xorg-fonts-75dpi: X bitmap fonts needed for the interface'
'xorg-fonts-100dpi: X bitmap fonts needed for the interface')
makedepends=('xbitmaps')
@@ -25,7 +25,7 @@ build() {
./configure --build="${CHOST}" --prefix=/usr --with-dynamic \
--without-postgresql --with-athena=xaw \
- --enable-database=berkdb --without-ldap \
+ --with-database=gdbm --without-ldap \
--enable-menubars=lucid --enable-scrollbars=lucid \
--enable-widgets=athena --enable-dialogs=athena \
--enable-external-widget \
@@ -53,5 +53,5 @@ package() {
# correct permissions
chown -R root:root "${pkgdir}"
- rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info}
+ rm "${pkgdir}"/usr/share/info/{info.info,texinfo.info-2,texinfo.info-3,cl.info,texinfo.info-1,texinfo.info,standards.info,widget.info}
}
diff --git a/community/xfe/PKGBUILD b/community/xfe/PKGBUILD
index cb8413a44..c4420367b 100644
--- a/community/xfe/PKGBUILD
+++ b/community/xfe/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 96354 2013-08-26 09:21:17Z spupykin $
+# $Id: PKGBUILD 101413 2013-11-25 09:08:58Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Eric Belanger <belanger@astro.umontreal.ca>
# Contributor: Ravi Desai <ravster3@hotmail.com>
pkgname=xfe
-pkgver=1.35
+pkgver=1.37
pkgrel=1
pkgdesc="X File Explorer (Xfe) is an MS-Explorer like file manager for X."
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=("GPL")
depends=('fox')
makedepends=('intltool')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('2cff624a9ee8ee8d8f80e2688fc62feb')
+md5sums=('ce2a317ab4f7d728878d815afe13c1be')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD
index 24e1d1919..1269ee7ea 100644
--- a/community/xjadeo/PKGBUILD
+++ b/community/xjadeo/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 95059 2013-08-04 22:37:03Z speps $
+# $Id: PKGBUILD 101054 2013-11-15 17:47:59Z speps $
# Maintainer : speps <speps at aur dot archlinux dot org>
pkgname=xjadeo
-pkgver=0.7.5
+pkgver=0.7.6
pkgrel=1
pkgdesc="A simple video player that is synchronized to jack transport."
arch=('i686' 'x86_64')
url="http://xjadeo.sourceforge.net"
license=('GPL')
-depends=('ffmpeg' 'imlib2' 'jack' 'liblo' 'libxpm' 'libxv' 'portmidi')
+depends=('ffmpeg' 'ffmpeg-compat' 'imlib2' 'jack' 'liblo' 'libxpm' 'libxv' 'portmidi')
makedepends=('qt4')
optdepends=('qt4: for the GUI (qjadeo)')
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
"qjadeo.desktop")
install="$pkgname.install"
-md5sums=('477e1140f1f3c4a89243bf7310aa9907'
+md5sums=('9530c3b7b294e3abeb641640512984fc'
'315e2ab44ce3edf4068ff6db48942908')
build() {
diff --git a/community/xkbsel/PKGBUILD b/community/xkbsel/PKGBUILD
index 897db49a8..2c6a7e6eb 100644
--- a/community/xkbsel/PKGBUILD
+++ b/community/xkbsel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100458 2013-11-04 12:14:04Z spupykin $
+# $Id: PKGBUILD 101044 2013-11-15 12:43:34Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=xkbsel
pkgver=0.13
-pkgrel=6
+pkgrel=7
pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.meduna.org/sw_xkbsel_en.html"
@@ -16,10 +16,15 @@ source=(http://www.meduna.org/code/$pkgname-$pkgver.tar.gz
md5sums=('c82196344ef920a072f413df85b9dc00'
'dee0f7de8618d9eff073942f0e08f030')
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ sed -i 's|\${CC-cc}|${CC-cc} -O2 |g' ./configure
+}
+
build() {
cd $srcdir/$pkgname-$pkgver
- autoreconf
+# autoreconf
patch -Np1 <../build-fix.patch
export CFLAGS="$CFLAGS -I/usr/include/gdbm -DHAVE_NDBM_H"
diff --git a/community/xmind/PKGBUILD b/community/xmind/PKGBUILD
index c49b9a5c0..be506239e 100644
--- a/community/xmind/PKGBUILD
+++ b/community/xmind/PKGBUILD
@@ -4,9 +4,9 @@
# Contributor: Jelle van der Waa <jellevdwaa@gmail.com>
pkgname=xmind
-pkgver=3.3.1
-_pkgdate=201212250029
-pkgrel=2
+pkgver=3.4.0
+_pkgdate=201311050558
+pkgrel=1
pkgdesc="Brainstorming and Mind Mapping Software"
arch=('i686' 'x86_64')
[ "${CARCH}" = "i686" ] && _arch="i386"
@@ -17,8 +17,8 @@ depends=('desktop-file-utils' 'fontconfig' 'libxrender' 'java-runtime' 'shared-m
optdepends=('lame: needed for the feature audio notes')
install=xmind.install
source=(http://dl2.xmind.net/xmind-downloads/${pkgname}-linux-${pkgver}.${_pkgdate}_${_arch}.deb)
-[ "${CARCH}" = "i686" ] && md5sums=('53d55f189879b4d2f27eb214456c754b')
-[ "${CARCH}" = "x86_64" ] && md5sums=('a31c55dab417a8281ec4211f4ac111d7')
+[ "${CARCH}" = "i686" ] && md5sums=('7e5d4a8218397cdefa5a6c4ecaed7cbd')
+[ "${CARCH}" = "x86_64" ] && md5sums=('6dcaeb46ab9b88c1904f594b9b1eebc8')
build() {
cd "${srcdir}"
@@ -54,3 +54,4 @@ package() {
sed -i s!/usr/local/xmind/xmind-logo-36.png!xmind.png! \
"${pkgdir}"/usr/share/applications/xmind.desktop
}
+
diff --git a/community/xnoise/PKGBUILD b/community/xnoise/PKGBUILD
index 41d0512da..cf8ea5f10 100755
--- a/community/xnoise/PKGBUILD
+++ b/community/xnoise/PKGBUILD
@@ -1,37 +1,37 @@
-# $Id: PKGBUILD 100022 2013-10-31 03:03:33Z allan $
+# $Id: PKGBUILD 102565 2013-12-15 04:07:27Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: archtux <antonio dot arias99999 at gmail dot com>
pkgname=xnoise
-pkgver=0.2.19
+pkgver=0.2.20
pkgrel=1
pkgdesc="Media player with a slick GUI, great speed and lots of features."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xnoise-media-player.com/"
license=('GPL2')
-depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo' 'librsvg' 'vala')
+depends=('desktop-file-utils' 'gnome-icon-theme' 'gst-plugins-base-libs' 'gst-plugins-good' 'gtk3' 'libsoup' 'sqlite' 'libtaginfo>=0.2' 'librsvg')
optdepends=('gst-plugins-base: Basic media codecs'
'gst-plugins-bad: Extra media codecs'
'gst-plugins-ugly: Extra media codecs'
'gst-libav: Extra media codecs'
'gvfs: Needed for fetching album art')
-makedepends=('gettext' 'intltool')
+makedepends=('vala' 'intltool')
install=$pkgname.install
source=("https://bitbucket.org/shuerhaaken/xnoise/downloads/$pkgname-$pkgver.tar.gz")
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
# Remove obsolete files
rm -rf "$pkgdir/usr/include" "$pkgdir/usr/share/vala"
}
-sha512sums=('3c3a735d005704342d2c27c36738b91f850e2630b431edfc1def5d26f836dc0df1ef752ca8d1eec3e90702eb27f78e46970a147a64c2156fbe53c8471eb978cb')
+sha512sums=('d2bcf7c8fa542ef9703a831583ab90e1a03f00a0740b068966cb8bf5c76475832cf04eb55b9f14ac1c5aa50536d8e3965ac3e0d22503af44e1af8e7f908d2390')
diff --git a/community/xplanet/PKGBUILD b/community/xplanet/PKGBUILD
index feaae1f35..598bd38ff 100644
--- a/community/xplanet/PKGBUILD
+++ b/community/xplanet/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 94933 2013-08-01 07:01:30Z bpiotrowski $
+# $Id: PKGBUILD 101195 2013-11-19 11:02:23Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: dorphell <dorphell@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=xplanet
pkgver=1.3.0
-pkgrel=3
+pkgrel=4
pkgdesc="An Xearth wannabe"
arch=(i686 x86_64 'mips64el')
url="http://xplanet.sourceforge.net/"
license=('GPL')
-depends=('pango' 'libungif' 'libtiff' 'libxss')
+depends=('pango' 'giflib' 'libtiff' 'libxss')
source=(http://downloads.sourceforge.net/project/xplanet/xplanet/$pkgver/xplanet-$pkgver.tar.gz
giflib6.patch)
md5sums=('41f7db2ccd1d8b4b989cacaf9adfe692'
@@ -23,7 +23,6 @@ prepare() {
build() {
cd $srcdir/$pkgname-$pkgver
- unset LDFLAGS
./configure --prefix=/usr --with-freetype
make
}
diff --git a/extra/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD
index b9ab3f225..fe3c629d2 100644
--- a/extra/xulrunner/PKGBUILD
+++ b/community/xulrunner/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194430 2013-09-16 10:39:31Z jgc $
+# $Id: PKGBUILD 103127 2013-12-26 20:12:06Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
diff --git a/extra/xulrunner/mozconfig b/community/xulrunner/mozconfig
index 6679dac21..6679dac21 100644
--- a/extra/xulrunner/mozconfig
+++ b/community/xulrunner/mozconfig
diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/community/xulrunner/mozilla-pkgconfig.patch
index 037d4aee0..037d4aee0 100644
--- a/extra/xulrunner/mozilla-pkgconfig.patch
+++ b/community/xulrunner/mozilla-pkgconfig.patch
diff --git a/extra/xulrunner/shared-libs.patch b/community/xulrunner/shared-libs.patch
index 1f22b2b0d..1f22b2b0d 100644
--- a/extra/xulrunner/shared-libs.patch
+++ b/community/xulrunner/shared-libs.patch
diff --git a/community/yabause-gtk/PKGBUILD b/community/yabause-gtk/PKGBUILD
index d902e0f26..cc5be771b 100755
--- a/community/yabause-gtk/PKGBUILD
+++ b/community/yabause-gtk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86073 2013-03-11 21:44:40Z alucryd $
+# $Id: PKGBUILD 102820 2013-12-21 04:37:57Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Harley Laue <losinggeneration@gmail.com>
# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
@@ -7,8 +7,8 @@
# Contributor: robb_force <robb_force@holybuffalo.net>
pkgname=yabause-gtk
-pkgver=0.9.12
-pkgrel=2
+pkgver=0.9.13
+pkgrel=1
pkgdesc='A Sega Saturn emulator'
arch=('i686' 'x86_64' 'mips64el')
url="http://yabause.org/"
@@ -17,26 +17,29 @@ depends=('freeglut' 'gtkglext' 'openal' 'sdl')
makedepends=('cmake' 'mesa')
conflicts=('yabause-qt')
source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname%-*}-${pkgver}.tar.gz" 'rwx.patch')
-sha256sums=('f45c9649c379e1e790856f8dfa37d93be5638e8f697319b241951316f817bfb1'
+sha256sums=('3913f9c57bb65912eb22a339ec6f9413e0c00c11105baeae6a165b84ad4d32fb'
'd29997d3249683081a2687f31e777f917093101d56815d22103aaaf22ac786b1')
-build() {
- cd "${srcdir}"/${pkgname%-*}-${pkgver}
+prepare() {
+ cd ${pkgname%-*}-${pkgver}
-# Patch
- patch -Np1 -i "${srcdir}"/rwx.patch
+ patch -Np1 -i ../rwx.patch
+}
+
+build() {
+ cd ${pkgname%-*}-${pkgver}
-# Build
if [[ -d build ]]; then
rm -rf build
fi
mkdir build && cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DYAB_PORTS=gtk -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=on -DYAB_PERKEYNAME=ON
+
+ cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DYAB_{PORTS='gtk',{NETWORK,OPTIMIZED_DMA}='ON'}
make
}
package() {
- cd "${srcdir}"/${pkgname%-*}-${pkgver}/build
+ cd ${pkgname%-*}-${pkgver}/build
# Install
make DESTDIR="${pkgdir}" install
diff --git a/community/yabause-qt/PKGBUILD b/community/yabause-qt/PKGBUILD
index 38b8f0a0a..76aa07d0e 100755
--- a/community/yabause-qt/PKGBUILD
+++ b/community/yabause-qt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86075 2013-03-11 21:47:54Z alucryd $
+# $Id: PKGBUILD 102822 2013-12-21 05:06:07Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Harley Laue <losinggeneration@gmail.com>
# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
@@ -7,7 +7,7 @@
# Contributor: robb_force <robb_force@holybuffalo.net>
pkgname=yabause-qt
-pkgver=0.9.12
+pkgver=0.9.13
pkgrel=1
pkgdesc='A Sega Saturn emulator'
arch=('i686' 'x86_64' 'mips64el')
@@ -17,28 +17,30 @@ depends=('freeglut' 'mesa' 'openal' 'qt4' 'sdl')
makedepends=('cmake' 'glu')
conflicts=('yabause-gtk')
source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname%-*}-${pkgver}.tar.gz" 'rwx.patch')
-sha256sums=('f45c9649c379e1e790856f8dfa37d93be5638e8f697319b241951316f817bfb1'
+sha256sums=('3913f9c57bb65912eb22a339ec6f9413e0c00c11105baeae6a165b84ad4d32fb'
'd29997d3249683081a2687f31e777f917093101d56815d22103aaaf22ac786b1')
-build() {
- cd "${srcdir}"/${pkgname%-*}-${pkgver}
+prepare() {
+ cd ${pkgname%-*}-${pkgver}
-# Patch
- patch -Np1 -i "${srcdir}"/rwx.patch
+ patch -Np1 -i ../rwx.patch
+}
+
+build() {
+ cd ${pkgname%-*}-${pkgver}
-# Build
if [[ -d build ]]; then
rm -rf build
fi
mkdir build && cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DYAB_PORTS=qt -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=on -DYAB_PERKEYNAME=ON
+
+ cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DCMAKE_BUILD_TYPE='Release' -DYAB_{PORTS='qt',{NETWORK,OPTIMIZED_DMA}='ON'}
make
}
package() {
- cd "${srcdir}"/${pkgname%-*}-${pkgver}/build
+ cd ${pkgname%-*}-${pkgver}/build
-# Install
make DESTDIR="${pkgdir}" install
}
diff --git a/community/zathura-djvu/PKGBUILD b/community/zathura-djvu/PKGBUILD
index 2b788f819..9e1722961 100644
--- a/community/zathura-djvu/PKGBUILD
+++ b/community/zathura-djvu/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 91452 2013-05-22 23:23:11Z dwallace $
+# $Id: PKGBUILD 100916 2013-11-13 11:13:50Z spupykin $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: karnath <karnathtorjian@gmail.com>
pkgname=zathura-djvu
pkgver=0.2.3
-pkgrel=1
+pkgrel=2
pkgdesc="Adds DjVu support to zathura by using the djvulibre library"
arch=('i686' 'x86_64' 'mips64el')
url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/"
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index a21073ee3..cfa6445a6 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=zathura-pdf-mupdf
pkgver=0.2.5
-pkgrel=2
+pkgrel=3
pkgdesc="Adds pdf support to zathura by using the mupdf library"
arch=('i686' 'x86_64' 'mips64el')
url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-mupdf/"
diff --git a/community/zathura-pdf-poppler/PKGBUILD b/community/zathura-pdf-poppler/PKGBUILD
index cfa86d218..2b289b347 100644
--- a/community/zathura-pdf-poppler/PKGBUILD
+++ b/community/zathura-pdf-poppler/PKGBUILD
@@ -4,17 +4,16 @@
# Contributor: karnath <karnathtorjian@gmail.com>
pkgname=zathura-pdf-poppler
-pkgver=0.2.3
-pkgrel=2
+pkgver=0.2.4
+pkgrel=1
pkgdesc="Adds pdf support to zathura by using the poppler engine"
arch=('i686' 'x86_64' 'mips64el')
url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/"
license=('custom')
depends=('poppler-glib' 'zathura')
install="$pkgname.install"
-
source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('1d8deb2d2ee5a6847267f977b8f2e542')
+md5sums=('7a3781a251687d316fcd8bf3df120d9f')
build() {
make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/community/zathura-ps/PKGBUILD b/community/zathura-ps/PKGBUILD
index b470d5a34..bf556d54e 100644
--- a/community/zathura-ps/PKGBUILD
+++ b/community/zathura-ps/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=zathura-ps
pkgver=0.2.2
-pkgrel=1
+pkgrel=2
pkgdesc="Adds ps support to zathura by using the libspectre library"
arch=('i686' 'x86_64' 'mips64el')
url="https://pwmt.org/projects/zathura/plugins/zathura-ps/"
diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD
index 4325dea21..428687660 100644
--- a/community/zathura/PKGBUILD
+++ b/community/zathura/PKGBUILD
@@ -1,33 +1,33 @@
-# $Id: PKGBUILD 95629 2013-08-15 09:04:56Z spupykin $
+# $Id: PKGBUILD 101400 2013-11-24 20:34:57Z spupykin $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: ML <neldoreth>
pkgname=zathura
-pkgver=0.2.4
+pkgver=0.2.6
pkgrel=1
pkgdesc="a document viewer"
arch=('i686' 'x86_64' 'mips64el')
url="http://pwmt.org/projects/zathura/"
license=('custom')
-depends=('girara-gtk2' 'sqlite' 'desktop-file-utils')
+depends=('girara-gtk3' 'sqlite' 'desktop-file-utils' 'file')
makedepends=('python2-docutils')
optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-pdf-mupdf' 'zathura-ps')
install=zathura.install
source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz
- bash-completion)
-md5sums=('935c6e15f5b7688bf4024ec7fe45f064'
+ bash-completion)
+md5sums=('d155a66ec1862550dfde5a50e3dd6d01'
'cac20c37f0e77ba62a8138788f4ccabb')
build() {
cd $srcdir/zathura-$pkgver
sed -i 's/rst2man/&2/' config.mk
- make ZATHURA_GTK_VERSION=2
+ make
}
package() {
cd $srcdir/zathura-$pkgver
- make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2
+ make install DESTDIR=$pkgdir
install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura
}
diff --git a/community/zbar/PKGBUILD b/community/zbar/PKGBUILD
new file mode 100644
index 000000000..a18821a4b
--- /dev/null
+++ b/community/zbar/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Marti Raudsepp <marti@juffo.org>
+# Contributor: Radu Andries <admiral0@tuxfamily.org>
+# Contributor: Andy Weidenbaum <archbaum@gmail.com>
+
+pkgname=zbar
+pkgver=0.10
+pkgrel=4
+pkgdesc="Application and library for reading bar codes from various sources"
+arch=('i686' 'x86_64')
+url="http://zbar.sourceforge.net/"
+license=('LGPL')
+depends=('imagemagick' 'libxv' 'python2' 'gtk2' 'qt4' 'pygtk' 'v4l-utils')
+conflicts=('zbar-gtk' 'zbar-qt')
+provides=("zbar-gtk=$pkgver" "zbar-qt=$pkgver")
+source=("http://downloads.sourceforge.net/project/zbar/zbar/$pkgver/zbar-$pkgver.tar.bz2"
+ v4l1.patch)
+
+build() {
+ cd zbar-$pkgver
+
+ msg 'Patching...'
+ patch -p1 < ../v4l1.patch
+
+ msg 'Running configure...'
+ ./configure --prefix=/usr --with-qt --with-gtk CFLAGS=-DNDEBUG
+
+ msg 'Running make...'
+ make
+}
+package() {
+ cd zbar-$pkgver
+ make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
+md5sums=('0fd61eb590ac1bab62a77913c8b086a5'
+ '284f11ca2a5e009744c4a1b9e92d6953')
diff --git a/community/zbar/v4l1.patch b/community/zbar/v4l1.patch
new file mode 100644
index 000000000..150b0e695
--- /dev/null
+++ b/community/zbar/v4l1.patch
@@ -0,0 +1,24 @@
+Thanks to Andy Weidenbaum <archbaum@gmail.com> for providing this patch!
+
+--- ./zbar/video/v4l1.c 2013-03-06 23:24:22.996336417 -0800
++++ ./zbar/video/v4l1.c 2013-03-06 23:29:29.789662369 -0800
+@@ -41,7 +41,7 @@
+ #ifdef HAVE_SYS_MMAN_H
+ # include <sys/mman.h>
+ #endif
+-#include <linux/videodev.h>
++#include <libv4l1-videodev.h>
+
+ #include "video.h"
+ #include "image.h"
+--- ./configure 2009-10-23 11:17:24.000000000 -0700
++++ ./configure 2013-03-06 23:47:33.902966990 -0800
+@@ -18709,7 +18709,7 @@
+ if test "x$enable_video" != "xno"; then
+ if test "x$win32" = "xno"; then
+
+-for ac_header in linux/videodev.h
++for ac_header in libv4l1-videodev.h
+ do
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
diff --git a/community/zeromq/LIBZMQ-569.patch b/community/zeromq/LIBZMQ-569.patch
deleted file mode 100644
index a1e27f622..000000000
--- a/community/zeromq/LIBZMQ-569.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7ecab54ac3b7a6103c46892990217acafb039eed Mon Sep 17 00:00:00 2001
-From: Martin Hurton <hurtonm@gmail.com>
-Date: Fri, 21 Jun 2013 16:23:38 +0200
-Subject: [PATCH] Load identity message to decoder at start
-
----
- src/stream_engine.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/stream_engine.cpp b/src/stream_engine.cpp
-index 0d87581..2c07889 100644
---- a/src/stream_engine.cpp
-+++ b/src/stream_engine.cpp
-@@ -480,6 +480,13 @@ bool zmq::stream_engine_t::handshake ()
- // header data away.
- const size_t header_size = options.identity_size + 1 >= 255 ? 10 : 2;
- unsigned char tmp [10], *bufferp = tmp;
-+
-+ // Prepare the identity message and load it into encoder.
-+ // Then consume bytes we have already sent to the peer.
-+ const int rc = tx_msg.init_size (options.identity_size);
-+ zmq_assert (rc == 0);
-+ memcpy (tx_msg.data (), options.identity, options.identity_size);
-+ encoder->load_msg (&tx_msg);
- size_t buffer_size = encoder->encode (&bufferp, header_size);
- zmq_assert (buffer_size == header_size);
-
---
-1.8.4
-
diff --git a/community/zeromq/PKGBUILD b/community/zeromq/PKGBUILD
index 6c4913bae..85cca0e15 100644
--- a/community/zeromq/PKGBUILD
+++ b/community/zeromq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 99117 2013-10-24 16:13:47Z mtorromeo $
+# $Id: PKGBUILD 102639 2013-12-17 01:13:09Z kkeen $
# Maintainer: Kyle Keen <keenerd@gmail.com>
pkgname=zeromq
-pkgver=4.0.1
-pkgrel=5
+pkgver=4.0.3
+pkgrel=1
pkgdesc="Fast messaging system built on sockets, C and C++ bindings. aka 0MQ, ZMQ."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.zeromq.org"
@@ -11,16 +11,9 @@ depends=('gcc-libs' 'util-linux' 'libsodium')
makedepends=('python2')
options=('staticlibs')
source=(http://download.zeromq.org/$pkgname-$pkgver.tar.gz
- https://raw.github.com/zeromq/cppzmq/master/zmq.hpp
- LIBZMQ-569.patch)
-md5sums=('e738c310d135e20fa48c5b348da18e22'
- '388ddb07fdd88b040769e8f4c9b397fa'
- '2ef4f92027ec2b88e8eec86b2cccf2e4')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i "$srcdir/LIBZMQ-569.patch"
-}
+ https://raw.github.com/zeromq/cppzmq/master/zmq.hpp)
+md5sums=('8348341a0ea577ff311630da0d624d45'
+ '388ddb07fdd88b040769e8f4c9b397fa')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/ziproxy/PKGBUILD b/community/ziproxy/PKGBUILD
new file mode 100644
index 000000000..a9003f6dc
--- /dev/null
+++ b/community/ziproxy/PKGBUILD
@@ -0,0 +1,60 @@
+# $Id: PKGBUILD 102371 2013-12-09 14:56:17Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Yejun Yang yejunx AT gmail DOT com
+
+pkgname=ziproxy
+pkgver=3.3.0
+pkgrel=4
+pkgdesc="forwarding, non-caching, compressing HTTP proxy server"
+arch=('i686' 'x86_64')
+url="http://ziproxy.sourceforge.net/"
+license=('GPL2')
+depends=('giflib' 'libpng' 'libjpeg' 'zlib' 'jasper' 'libsasl')
+backup=(etc/ziproxy/ziproxy.conf
+ etc/ziproxy/bo_exception.list
+ etc/ziproxy/http.passwd
+ etc/ziproxy/noprocess.list
+ etc/ziproxy/replace.list
+ etc/xinetd.d/ziproxy
+ var/lib/ziproxy/error/400.html
+ var/lib/ziproxy/error/404.html
+ var/lib/ziproxy/error/407.html
+ var/lib/ziproxy/error/408.html
+ var/lib/ziproxy/error/409.html
+ var/lib/ziproxy/error/500.html
+ var/lib/ziproxy/error/503.html)
+install=ziproxy.install
+source=(http://downloads.sourceforge.net/project/ziproxy/ziproxy/ziproxy-$pkgver/ziproxy-$pkgver.tar.bz2
+ ziproxy.logrotate
+ ziproxy.xinetd
+ build-fix.patch)
+md5sums=('a8fda01591d455bb23c64c9c5ed3980d'
+ 'feb35264391c790cedd5e995182b5ff5'
+ '3d2f9208b5ab6738c136049e1fd2e433'
+ '0eb798863234ee0e9066812ef2a73539')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1 <$srcdir/build-fix.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ [ -f Makefile ] || ./configure --prefix=/usr --with-jasper
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+
+ install -d $pkgdir/var/lib/ziproxy/error
+ install -d $pkgdir/etc/conf.d
+
+ sed -i 's#var/ziproxy#var/lib/ziproxy#' etc/ziproxy/ziproxy.conf
+ cp -a etc/ziproxy $pkgdir/etc/ziproxy
+ install -m644 var/ziproxy/error/* $pkgdir/var/lib/ziproxy/error
+ echo "ZIPROXY_ARGS=\"-c /etc/ziproxy/ziproxy.conf\"" >$pkgdir/etc/conf.d/ziproxy
+ install -Dm0644 $srcdir/ziproxy.logrotate $pkgdir/etc/logrotate.d/ziproxy
+ install -Dm0644 $srcdir/ziproxy.xinetd $pkgdir/etc/xinetd.d/ziproxy
+}
diff --git a/community/ziproxy/build-fix.patch b/community/ziproxy/build-fix.patch
new file mode 100644
index 000000000..fb23953b6
--- /dev/null
+++ b/community/ziproxy/build-fix.patch
@@ -0,0 +1,23 @@
+diff -wbBur ziproxy-3.3.0/src/image.c ziproxy-3.3.0.q/src/image.c
+--- ziproxy-3.3.0/src/image.c 2013-01-04 20:48:50.000000000 +0400
++++ ziproxy-3.3.0.q/src/image.c 2013-08-11 00:24:03.868670477 +0400
+@@ -93,6 +93,10 @@
+ #define MIN_INSIZE_TO_JPEG 600
+ #define MIN_INSIZE_TO_JP2K 800
+
++
++#define false 0
++#define true !!0
++
+ //Forwards. There are more utility functions, but they're used only once.
+ static raw_bitmap *new_raw_bitmap();
+
+@@ -905,7 +909,7 @@
+ desc.size=insize;
+ desc.x.pos=0;
+
+- if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input)) == NULL)
++ if ((GifFile = DGifOpen((void*)&desc, &gif_mem_input, NULL)) == NULL)
+ return( IMG_RET_ERR_UNKNOWN + IMG_RET_FLG_WHILE_DECOMP);//more possible reasons
+
+ bmp = new_raw_bitmap();
diff --git a/community/ziproxy/ziproxy.install b/community/ziproxy/ziproxy.install
new file mode 100644
index 000000000..0f2e7a23f
--- /dev/null
+++ b/community/ziproxy/ziproxy.install
@@ -0,0 +1,11 @@
+post_install() {
+ mkdir -p /var/log/ziproxy && \
+ chown -R root:proxy /var/log/ziproxy && \
+ chmod -R ug+w /var/log/ziproxy
+}
+
+post_upgrade() {
+ mkdir -p /var/log/ziproxy && \
+ chown -R root:proxy /var/log/ziproxy && \
+ chmod -R ug+w /var/log/ziproxy
+}
diff --git a/community/ziproxy/ziproxy.logrotate b/community/ziproxy/ziproxy.logrotate
new file mode 100644
index 000000000..7cadf5e71
--- /dev/null
+++ b/community/ziproxy/ziproxy.logrotate
@@ -0,0 +1,13 @@
+/var/log/ziproxy/access.log {
+ su root proxy
+ weekly
+ missingok
+ rotate 10
+ compress
+ delaycompress
+ ifempty
+ nomail
+ postrotate
+ killall -HUP ziproxy 1>/dev/null 2>/dev/null || true
+ endscript
+}
diff --git a/community/ziproxy/ziproxy.xinetd b/community/ziproxy/ziproxy.xinetd
new file mode 100644
index 000000000..195b72454
--- /dev/null
+++ b/community/ziproxy/ziproxy.xinetd
@@ -0,0 +1,14 @@
+service ziproxy
+{
+ port = 3128
+ type = UNLISTED
+ disable = yes
+ socket_type = stream
+ wait = no
+ user = proxy
+ server = /usr/bin/ziproxy
+ server_args = -i
+ bind = 0.0.0.0
+ log_on_success += HOST DURATION
+ log_on_failure += HOST
+}
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index cc83e065e..8009c93f1 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196835 2013-10-20 12:06:12Z allan $
+# $Id: PKGBUILD 201559 2013-12-15 06:41:35Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=binutils
-pkgver=2.23.2
-pkgrel=3
+pkgver=2.24
+pkgrel=1
pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/binutils/"
@@ -15,19 +15,13 @@ depends=('glibc>=2.18' 'zlib')
checkdepends=('dejagnu' 'bc')
options=('staticlibs' '!distcc' '!ccache')
install=binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
- binutils-2.23.2-texinfo-5.0.patch)
-md5sums=('4f8fa651e35ef262edc01d60fb45702e'
- 'dfde4428f08d91f309cdcfe92bf28d08'
- '34e439ce23213a91e2af872dfbb5094c')
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
+md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
+ 'SKIP')
prepare() {
cd ${srcdir}/binutils-${pkgver}
- # http://sourceware.org/git/?p=binutils.git;a=patch;h=e02bf935
- # http://sourceware.org/git/?p=binutils.git;a=patch;h=935f8542
- patch -p1 -i ${srcdir}/binutils-2.23.2-texinfo-5.0.patch
-
# hack! - libiberty configure tests for header files using "$CPP $CPPFLAGS"
sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" libiberty/configure
@@ -40,9 +34,8 @@ build() {
${srcdir}/binutils-${pkgver}/configure --prefix=/usr \
--with-lib-path=/usr/lib:/usr/local/lib \
--with-bugurl=https://bugs.archlinux.org/ \
- --enable-ld=default --enable-gold \
- --enable-plugins --enable-threads \
- --with-pic --enable-shared \
+ --enable-threads --enable-shared \
+ --enable-ld=default --enable-gold --enable-plugins \
--disable-werror --disable-multilib
# check the host environment and makes sure all the necessary tools are available
@@ -62,13 +55,6 @@ check() {
package() {
cd ${srcdir}/binutils-build
make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-
- # Add some useful headers
- install -m644 ${srcdir}/binutils-${pkgver}/include/libiberty.h ${pkgdir}/usr/include
- install -m644 ${srcdir}/binutils-${pkgver}/include/demangle.h ${pkgdir}/usr/include
-
- # Install PIC libiberty.a
- install -m644 libiberty/pic/libiberty.a ${pkgdir}/usr/lib
# Remove unwanted files
rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD
index 7e601b013..bd75dd2e3 100644
--- a/core/bison/PKGBUILD
+++ b/core/bison/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196831 2013-10-20 11:52:24Z allan $
+# $Id: PKGBUILD 201434 2013-12-11 15:08:40Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
pkgname=bison
-pkgver=3.0
+pkgver=3.0.2
pkgrel=1
pkgdesc="The GNU general-purpose parser generator"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ groups=('base-devel')
options=('staticlibs')
install=bison.install
source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('a2624994561aa69f056c904c1ccb2880'
+md5sums=('146be9ff9fbd27497f0bf2286a5a2082'
'SKIP')
build() {
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index d811d7f49..458eb992a 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195489 2013-10-01 11:32:32Z tomegun $
+# $Id: PKGBUILD 202441 2013-12-21 23:13:17Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=btrfs-progs
-pkgver=0.20rc1.3
+pkgver=3.12
pkgrel=1
pkgdesc="btrfs filesystem utilities"
arch=(i686 x86_64 mips64el)
@@ -14,11 +14,14 @@ replaces=('btrfs-progs-unstable')
conflicts=('btrfs-progs-unstable')
provides=('btrfs-progs-unstable')
license=('GPL2')
-source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#commit=194aa4a1bd6447bb545286d0bcb0b0be8204d79f"
+source=("git://git.kernel.org/pub/scm/linux/kernel/git/mason/${pkgname}.git#tag=v${pkgver}"
initcpio-install-btrfs
initcpio-hook-btrfs)
install=btrfs-progs.install
options=(!staticlibs)
+md5sums=('SKIP'
+ '7241ba3a4286d08da0d50b7176941112'
+ 'b09688a915a0ec8f40e2f5aacbabc9ad')
build() {
cd $pkgname
@@ -42,6 +45,3 @@ package() {
install -Dm644 "$srcdir/initcpio-hook-btrfs" \
"$pkgdir/usr/lib/initcpio/hooks/btrfs"
}
-md5sums=('SKIP'
- '7241ba3a4286d08da0d50b7176941112'
- 'b09688a915a0ec8f40e2f5aacbabc9ad')
diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD
index 63732bf4e..afa05d286 100644
--- a/core/coreutils/PKGBUILD
+++ b/core/coreutils/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 187020 2013-06-03 11:14:56Z allan $
+# $Id: PKGBUILD 201684 2013-12-18 05:22:31Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=coreutils
-pkgver=8.21
+pkgver=8.22
pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
url="http://www.gnu.org/software/coreutils"
groups=('base')
-depends=('glibc' 'pam' 'acl' 'gmp' 'libcap')
+depends=('glibc' 'pam' 'acl' 'gmp' 'libcap' 'openssl')
install=${pkgname}.install
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('065ba41828644eca5dd8163446de5d64'
+md5sums=('8fb0ae2267aa6e728958adc38f8163a2'
'SKIP')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --libexecdir=/usr/lib \
+ ./configure --prefix=/usr --libexecdir=/usr/lib --with-openssl \
--enable-no-install-program=groups,hostname,kill,uptime
make
}
diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD
index 2e0bbc52d..67e54b5cf 100644
--- a/core/cronie/PKGBUILD
+++ b/core/cronie/PKGBUILD
@@ -1,9 +1,10 @@
+# $Id: PKGBUILD 200681 2013-12-02 07:24:30Z bisson $
# Contributor: Kaiting Chen <kaiting.chen@kiwilight.com>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname='cronie'
-pkgver=1.4.9
-pkgrel=5
+pkgver=1.4.11
+pkgrel=1
pkgdesc='Daemon that runs specified programs at scheduled times and related tools'
url='https://fedorahosted.org/cronie/'
license=('custom:BSD')
@@ -14,10 +15,10 @@ optdepends=('pm-utils: defer anacron on battery power'
'smtp-forwarder: forward job output to email server')
source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'service'
+ 'service'
'pam.d'
'deny')
-sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4'
+sha1sums=('1a8d3648f5b7082c50128a06377a1194da668899'
'eb8ed1e22dbe9c02075fe4bbe925b6eeb9954649'
'5eff7fb31f6bc0a924243ff046704726cf20c221'
'0f279b8fb820340267d578dc85511c980715f91e')
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index 5c9b60735..985ca277c 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197805 2013-10-30 11:02:47Z allan $
+# $Id: PKGBUILD 202619 2013-12-22 13:44:39Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=cryptsetup
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.6.3
+pkgrel=1
pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
arch=(i686 x86_64 'mips64el')
license=('GPL')
@@ -15,7 +15,7 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
encrypt_hook
encrypt_install
sd-encrypt)
-md5sums=('cd834da49fbe92dd66df02cc5c61280f'
+md5sums=('a7aeb549a543eeac433eadfb6bc67837'
'SKIP'
'c279d86d6dc18322c054d2272ebb9e90'
'21c45f9cab3e0b5165f68358884fbd0f'
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD
index 06868fc7f..9cb6bee57 100644
--- a/core/curl/PKGBUILD
+++ b/core/curl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198761 2013-11-03 13:49:41Z dreisner $
+# $Id: PKGBUILD 202635 2013-12-23 02:04:37Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
@@ -6,8 +6,8 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=curl
-pkgver=7.33.0
-pkgrel=3
+pkgver=7.34.0
+pkgrel=1
pkgdesc="An URL retrieval utility and library"
arch=('i686' 'x86_64' 'mips64el')
url="http://curl.haxx.se"
@@ -16,19 +16,11 @@ depends=('ca-certificates' 'libssh2' 'openssl' 'zlib')
provides=('libcurl.so')
options=('strip' 'debug')
source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc}
- "0001-glob-fix-regression-from-commit-5ca96cb844.patch::https://github.com/bagder/curl/commit/867b52a.patch"
curlbuild.h)
-md5sums=('c8a4eaac7ce7b0d1bf458d62ccd4ef93'
+md5sums=('d5b7edccbd1793e3549842e01331da20'
'SKIP'
- 'd71c7eab7d38f1731f78285634a4c390'
'751bd433ede935c8fae727377625a8ae')
-prepare() {
- cd "$pkgname-$pkgver"
-
- patch -Np1 < "$srcdir"/0001-glob-fix-regression-from-commit-5ca96cb844.patch
-}
-
build() {
cd "$pkgname-$pkgver"
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 9d3daa0ef..1c2b0f966 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197807 2013-10-30 11:03:01Z allan $
+# $Id: PKGBUILD 200253 2013-11-23 20:09:30Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Link Dupont <link@subpop.net>
#
pkgname=dbus
-pkgver=1.6.16
+pkgver=1.6.18
pkgrel=1
pkgdesc="Freedesktop.org message bus system"
url="http://www.freedesktop.org/Software/dbus"
@@ -17,7 +17,17 @@ provides=('dbus-core')
conflicts=('dbus-core')
replaces=('dbus-core')
source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
- 30-dbus systemd-user-session.patch)
+ 30-dbus systemd-user-session.patch memleak.patch)
+md5sums=('b02e9c95027a416987b81f9893831061'
+ '3314d727fa57fc443fce25b5cbeebbcc'
+ 'd8a1bd529b3ddca671ee1a695a143db9'
+ 'cf86d68e39d975cec1e9f0342eb9b142')
+
+prepare() {
+ cd dbus-$pkgver
+ patch -Np1 -i ../systemd-user-session.patch
+ patch -Np1 -i ../memleak.patch
+}
build() {
cd dbus-$pkgver
@@ -31,9 +41,6 @@ build() {
--disable-tests --disable-asserts \
--with-systemdsystemunitdir=/usr/lib/systemd/system \
--enable-systemd
-
- patch -p1 < "$srcdir/systemd-user-session.patch"
-
make
}
@@ -47,6 +54,3 @@ package(){
install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
}
-md5sums=('1de63d9983d7785836ffae6c2181c698'
- '3314d727fa57fc443fce25b5cbeebbcc'
- 'd8a1bd529b3ddca671ee1a695a143db9')
diff --git a/core/dbus/memleak.patch b/core/dbus/memleak.patch
new file mode 100644
index 000000000..7dea7943e
--- /dev/null
+++ b/core/dbus/memleak.patch
@@ -0,0 +1,37 @@
+From 03aeaccbffa97c9237b57ca067e3da7388862129 Mon Sep 17 00:00:00 2001
+From: Radoslaw Pajak <r.pajak@samsung.com>
+Date: Fri, 08 Nov 2013 12:51:32 +0000
+Subject: fixed memory freeing if error during listing services
+
+Signed-off-by: Radoslaw Pajak <r.pajak@samsung.com>
+Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=71526
+---
+diff --git a/bus/activation.c b/bus/activation.c
+index fcb7133..ea48a26 100644
+--- a/bus/activation.c
++++ b/bus/activation.c
+@@ -2179,7 +2179,7 @@ bus_activation_list_services (BusActivation *activation,
+
+ error:
+ for (j = 0; j < i; j++)
+- dbus_free (retval[i]);
++ dbus_free (retval[j]);
+ dbus_free (retval);
+
+ return FALSE;
+diff --git a/bus/services.c b/bus/services.c
+index 6f380fa..01a720e 100644
+--- a/bus/services.c
++++ b/bus/services.c
+@@ -368,7 +368,7 @@ bus_registry_list_services (BusRegistry *registry,
+
+ error:
+ for (j = 0; j < i; j++)
+- dbus_free (retval[i]);
++ dbus_free (retval[j]);
+ dbus_free (retval);
+
+ return FALSE;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index 5e2fb8a2d..3dc822836 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192483 2013-08-12 21:11:39Z dreisner $
+# $Id: PKGBUILD 199762 2013-11-15 21:24:38Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tom Killian <tom.archlinux.org>
# Contributor: Judd Vinet <jvinet.zeroflux.org>
pkgname=dhcpcd
-pkgver=6.0.5
+pkgver=6.1.0
pkgrel=1
pkgdesc="RFC2131 compliant DHCP client daemon"
url="http://roy.marples.name/projects/dhcpcd/"
@@ -18,9 +18,9 @@ options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory
source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2"
'dhcpcd_.service'
'dhcpcd.service')
-sha1sums=('433555ac11669333344d7ec80120f3ccdd0fcae5'
- '6245b8db7e6f39a0305571726bb693a53901c400'
- 'e49e01041f831281a1cd0c97ca21204e0aa07fda')
+sha1sums=('dcd6970db0440398aaf3ae4b58cc262a67b2e472'
+ '6f1633edde14d29b5cdc09c4f029a450ef2ebc96'
+ '7f3e62908037b888df2f6b87af1c7611f462dd08')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/dhcpcd/dhcpcd.service b/core/dhcpcd/dhcpcd.service
index 4a3bf366a..489023d3e 100644
--- a/core/dhcpcd/dhcpcd.service
+++ b/core/dhcpcd/dhcpcd.service
@@ -6,8 +6,8 @@ Before=network.target
[Service]
Type=forking
PIDFile=/run/dhcpcd.pid
-ExecStart=/sbin/dhcpcd -q -b
-ExecStop=/sbin/dhcpcd -x
+ExecStart=/bin/dhcpcd -q -b
+ExecStop=/bin/dhcpcd -x
[Install]
WantedBy=multi-user.target
diff --git a/core/dhcpcd/dhcpcd_.service b/core/dhcpcd/dhcpcd_.service
index 8864ae284..e7bc5caf8 100644
--- a/core/dhcpcd/dhcpcd_.service
+++ b/core/dhcpcd/dhcpcd_.service
@@ -8,8 +8,8 @@ After=sys-subsystem-net-devices-%i.device
[Service]
Type=forking
PIDFile=/run/dhcpcd-%I.pid
-ExecStart=/usr/sbin/dhcpcd -q -w %I
-ExecStop=/usr/sbin/dhcpcd -x %I
+ExecStart=/usr/bin/dhcpcd -q -w %I
+ExecStop=/usr/bin/dhcpcd -x %I
[Install]
WantedBy=multi-user.target
diff --git a/core/dosfstools/PKGBUILD b/core/dosfstools/PKGBUILD
index 77e15652f..4714cb9a7 100644
--- a/core/dosfstools/PKGBUILD
+++ b/core/dosfstools/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196781 2013-10-19 06:36:41Z tpowa $
+# $Id: PKGBUILD 200725 2013-12-03 16:03:02Z tpowa $
# Maintainer: dorphell <dorphell@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=dosfstools
-pkgver=3.0.23
+pkgver=3.0.24
pkgrel=1
pkgdesc="DOS filesystem utilities"
arch=(i686 x86_64 'mips64el')
@@ -10,7 +10,7 @@ depends=('glibc')
source=(http://www.daniel-baumann.ch/files/software/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
url="http://www.daniel-baumann.ch/software/dosfstools/"
license=('GPL2')
-md5sums=('bfdca786880a7f1cc9ce8ac68cb1fd51'
+md5sums=('41931f36ebee6e79e9dafe85cc916f2b'
'SKIP')
build() {
diff --git a/core/efivar/PKGBUILD b/core/efivar/PKGBUILD
index 849868267..e8d8995d1 100644
--- a/core/efivar/PKGBUILD
+++ b/core/efivar/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194436 2013-09-16 12:12:17Z tpowa $
+# $Id: PKGBUILD 199468 2013-11-13 11:07:43Z tpowa $
# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
# Contributor : Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -10,17 +10,18 @@ _pkgname="efivar"
pkgname="${_pkgname}"
pkgdesc="Library to manipulate EFI variables"
-pkgver=0.6
+pkgver=0.7
pkgrel=1
arch=('x86_64' 'i686')
url="https://github.com/vathpela/efivar"
license=('LGPL2.1')
+makedepends=('git')
depends=('popt')
conflicts=('libefivar')
provides=('libefivar')
options=('zipman' 'docs' '!makeflags')
-source=("${_gitname}::git+${_gitroot}#branch=${_gitbranch}")
+source=("${_gitname}::git+${_gitroot}#tag=${pkgver}")
sha1sums=('SKIP')
pkgver() {
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 175913607..2c1380caa 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197810 2013-10-30 11:03:22Z allan $
+# $Id: PKGBUILD 201433 2013-12-11 15:08:39Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=file
-pkgver=5.15
+pkgver=5.16
pkgrel=1
pkgdesc="File type identification utility"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ groups=('base' 'base-devel')
url="http://www.darwinsys.com/file/"
depends=('glibc' 'zlib')
source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('3f99565532f548d7540912c4642d1ede')
+md5sums=('359c0cf41c3d438d17b4d293f3b950dc')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD
index c6d78cabd..c2d3d3650 100644
--- a/core/gcc/PKGBUILD
+++ b/core/gcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197286 2013-10-25 01:09:21Z allan $
+# $Id: PKGBUILD 202694 2013-12-25 03:04:31Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -10,8 +10,9 @@ else
pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc')
fi
pkgver=4.8.2
-pkgrel=3
-#_snapshot=4.8-20130725
+_pkgver=4.8
+pkgrel=7
+_snapshot=4.8-20131219
pkgdesc="The GNU Compiler Collection"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL' 'custom')
@@ -20,11 +21,13 @@ makedepends=('binutils>=2.23' 'libmpc' 'cloog' 'doxygen')
[[ "$CARCH" != "mips64el" ]] && makedepends+=('gcc-ada')
checkdepends=('dejagnu' 'inetutils')
options=('!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
- gcc-4.8-filename-output.patch)
-md5sums=('a3d7d63b9cb6b6ea049469a0c4a43c9d'
- '40cb437805e2f7a006aa0d0c3098ab0f')
+source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
+ ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
+ gcc-4.8-filename-output.patch
+ gcc-4.8-lambda-ICE.patch)
+md5sums=('666ef08f87649f941bc5512e13a88fdc'
+ '40cb437805e2f7a006aa0d0c3098ab0f'
+ '6eb6e080dbf7bc6825f53a0aaa6c4ef9')
if [ -n "${_snapshot}" ]; then
_basedir=gcc-${_snapshot}
@@ -32,6 +35,8 @@ else
_basedir=gcc-${pkgver}
fi
+_libdir="usr/lib/gcc/$CHOST/$pkgver"
+
prepare() {
cd ${srcdir}/${_basedir}
@@ -49,6 +54,13 @@ prepare() {
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57653
patch -p0 -i ${srcdir}/gcc-4.8-filename-output.patch
+
+ # http://gcc.gnu.org/bugzilla//show_bug.cgi?id=56710 - commit 3d1f8279
+ patch -p1 -i ${srcdir}/gcc-4.8-lambda-ICE.patch
+
+ # installing libiberty headers is broken
+ # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=56780#c6
+ sed -i 's#@target_header_dir@#libiberty#' libiberty/Makefile.in
mkdir ${srcdir}/gcc-build
}
@@ -73,9 +85,6 @@ build() {
if [[ "${CARCH}" != "mips64el" ]]; then
languages=c,c++,ada,fortran,go,lto,objc,obj-c++
- # The ancient MIPS ABI has possible requirements incompatible
- # with GNU hash.
- extra="--with-linker-hash-style=gnu"
else
languages=c,c++,fortran,lto,objc,obj-c++
fi
@@ -88,19 +97,17 @@ build() {
--enable-shared --enable-threads=posix \
--with-system-zlib --enable-__cxa_atexit \
--disable-libunwind-exceptions --enable-clocale=gnu \
- --disable-libstdcxx-pch \
+ --disable-libstdcxx-pch --disable-libssp \
--enable-gnu-unique-object --enable-linker-build-id \
--enable-cloog-backend=isl --disable-cloog-version-check \
- --enable-lto --enable-gold --enable-ld=default \
- --enable-plugin --with-plugin-ld=ld.gold \
- $extra --disable-install-libiberty \
- --disable-multilib --disable-libssp --disable-werror \
+ --enable-lto --enable-plugin --enable-install-libiberty \
+ --with-linker-hash-style=gnu \
+ --disable-multilib --disable-werror \
--enable-checking=release
make
# make documentation
- cd $CHOST/libstdc++-v3
- make doc-man-doxygen
+ make -C $CHOST/libstdc++-v3/doc doc-man-doxygen
}
check() {
@@ -123,30 +130,43 @@ package_gcc-libs()
pkgdesc="Runtime libraries shipped by GCC"
groups=('base')
depends=('glibc>=2.17')
+ options=('!emptydirs')
install=gcc-libs.install
cd ${srcdir}/gcc-build
- make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src; do
- make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
- [ "$CARCH" != "mips64el" ] && for lib in libitm libsanitizer/asan; do
- make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
+
+ make -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
+ rm ${pkgdir}/${_libdir}/libgcc_eh.a
+
+ for lib in libmudflap \
+ libgomp \
+ libitm \
+ libatomic \
+ libstdc++-v3/src \
+ libquadmath \
+ libgfortran \
+ libsanitizer/asan; do
+ # Skip libitm and asan on mips64el
+ test "$CARCH" = "mips64el" &&
+ echo "$lib" | grep -q "libitm libsanitizer/asan" &&
+ continue
+ make -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
done
- make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
- make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
- [ "$CARCH" != "mips64el" ] && make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
+ [[ $CARCH == "x86_64" ]] && \
+ make -C $CHOST/libsanitizer/tsan DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
+ make -C $CHOST/libobjc DESTDIR=${pkgdir} install-libs
+
+ make -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
+
+ for lib in libgomp \
+ libitm \
+ libquadmath; do
+ # Skip libitm in mips64el
+ test "$CARCH" = "mips64el" && test "$lib" = "libitm" && continue
+ make -C $CHOST/$lib DESTDIR=${pkgdir} install-info
+ done
# Install Runtime Library Exception
install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
@@ -162,28 +182,45 @@ package_gcc()
install=gcc.install
cd ${srcdir}/gcc-build
+
+ make -C gcc DESTDIR=${pkgdir} install-driver install-cpp install-gcc-ar \
+ c++.install-common install-headers install-plugin install-lto-wrapper
+
+ install -m755 gcc/gcov $pkgdir/usr/bin/
+ install -m755 -t $pkgdir/${_libdir}/ gcc/{cc1,cc1plus,collect2,lto1}
+
+ make -C $CHOST/libgcc DESTDIR=${pkgdir} install
+ rm ${pkgdir}/usr/lib/libgcc_s.so*
- make -j1 DESTDIR=${pkgdir} install
+ make -C $CHOST/libstdc++-v3/src DESTDIR=${pkgdir} install
+ make -C $CHOST/libstdc++-v3/include DESTDIR=${pkgdir} install
+ make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR=${pkgdir} install
+ make -C $CHOST/libstdc++-v3/python DESTDIR=${pkgdir} install
install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
- mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.18-gdb.py
-
- # unfortunately it is much, much easier to install the lot and clean-up the mess...
- rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
- rm $pkgdir/usr/lib/*.so*
- rm $pkgdir/usr/lib/lib{atomic,gfortran,go{,begin},iberty,objc}.a
- rm $pkgdir/usr/lib/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
- rm -r $pkgdir/usr/lib/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
- rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
-
- # remove static libraries - note libstdc++.a is needed for the binutils and glibc testsuite
- rm $pkgdir/usr/lib/lib{asan,gomp,itm,mudflap{,th},quadmath}.a
- [[ $CARCH = "x86_64" ]] && rm $pkgdir/usr/lib/libtsan.a
+ mv $pkgdir/usr/lib/libstdc++.so.6.*-gdb.py \
+ $pkgdir/usr/share/gdb/auto-load/usr/lib/
+ rm ${pkgdir}/usr/lib/libstdc++.so*
+
+ make DESTDIR=${pkgdir} install-fixincludes
+ make -C gcc DESTDIR=${pkgdir} install-mkheaders
+ make -C lto-plugin DESTDIR=${pkgdir} install
+
+ make -C $CHOST/libgomp DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS \
+ install-nodist_libsubincludeHEADERS
+ make -C $CHOST/libitm DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+ make -C $CHOST/libmudflap DESTDIR=${pkgdir} install-nobase_libsubincludeHEADERS
+ make -C $CHOST/libquadmath DESTDIR=${pkgdir} install-nodist_libsubincludeHEADERS
+ make -C $CHOST/libsanitizer/asan DESTDIR=${pkgdir} install-nodist_toolexeclibHEADERS
+
+ make -C libiberty DESTDIR=${pkgdir} install
+
+ make -C gcc DESTDIR=${pkgdir} install-man install-info
+ rm ${pkgdir}/usr/share/man/man1/{gccgo,gfortran}.1
+ rm ${pkgdir}/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn}.info
+
+ make -C libcpp DESTDIR=${pkgdir} install
+ make -C gcc DESTDIR=${pkgdir} install-po
# many packages expect this symlinks
ln -s gcc ${pkgdir}/usr/bin/cc
@@ -218,13 +255,11 @@ EOF
chmod 755 $pkgdir/usr/bin/c{8,9}9
# install the libstdc++ man pages
- install -dm755 ${pkgdir}/usr/share/man/man3
- install -m644 -t ${pkgdir}/usr/share/man/man3 \
- ${CHOST}/libstdc++-v3/doc/doxygen/man/man3/*.3
+ make -C $CHOST/libstdc++-v3/doc DESTDIR=$pkgdir doc-install-man
# Install Runtime Library Exception
- install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
+ install -d ${pkgdir}/usr/share/licenses/gcc/
+ ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/gcc/
}
package_gcc-fortran()
@@ -235,24 +270,16 @@ package_gcc-fortran()
install=gcc-fortran.install
cd ${srcdir}/gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgfortran
- make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
- make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
- install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
+ make -C $CHOST/libgfortran DESTDIR=$pkgdir install-{{caf,my}execlibLTLIBRARIES,toolexeclibDATA}
+ make -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
+ make -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
+ install -Dm755 gcc/f951 $pkgdir/${_libdir}/f951
ln -s gfortran ${pkgdir}/usr/bin/f95
- # remove files included in gcc-libs or gcc and unnneeded static lib
- rm ${pkgdir}/usr/lib/lib{gfortran,gcc_s}.so*
- rm ${pkgdir}/usr/lib/libquadmath.{a,so*}
- rm ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/{*.o,libgc*}
- rm ${pkgdir}/usr/share/info/libquadmath.info
- rm -r ${pkgdir}/usr/lib/gcc/$CHOST/${pkgver}/include
- rm ${pkgdir}/usr/lib/libgfortran.a
-
# Install Runtime Library Exception
- install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
+ install -d ${pkgdir}/usr/share/licenses/gcc-fortran/
+ ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/gcc-fortran/
}
package_gcc-objc()
@@ -261,18 +288,13 @@ package_gcc-objc()
depends=("gcc=$pkgver-$pkgrel")
cd ${srcdir}/gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libobjc
- install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
- install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
- # remove files included in gcc-libs or gcc
- rm ${pkgdir}/usr/lib/lib{gcc_s,objc}.so*
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{*.o,lib*}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/unwind.h
+ make DESTDIR=$pkgdir -C $CHOST/libobjc install-headers
+ install -dm755 $pkgdir/${_libdir}
+ install -m755 gcc/cc1obj{,plus} $pkgdir/${_libdir}/
# Install Runtime Library Exception
- install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
+ install -d ${pkgdir}/usr/share/licenses/gcc-objc/
+ ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/gcc-objc/
}
package_gcc-ada()
@@ -283,14 +305,20 @@ package_gcc-ada()
install=gcc-ada.install
cd ${srcdir}/gcc-build/gcc
- make -j1 DESTDIR=$pkgdir ada.install-{common,info}
- install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
+ make DESTDIR=$pkgdir ada.install-{common,info}
+ install -m755 gnat1 $pkgdir/${_libdir}
ln -s gcc ${pkgdir}/usr/bin/gnatgcc
+ # insist on dynamic linking
+ mv ${pkgdir}/${_libdir}/adalib/libgna{rl,t}-${_pkgver}.so ${pkgdir}/usr/lib
+ ln -s libgnarl-${_pkgver}.so ${pkgdir}/usr/lib/libgnarl.so
+ ln -s libgnat-${_pkgver}.so ${pkgdir}/usr/lib/libgnat.so
+ rm ${pkgdir}/${_libdir}/adalib/libgna{rl,t}.*
+
# Install Runtime Library Exception
- install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
+ install -d ${pkgdir}/usr/share/licenses/gcc-ada/
+ ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/gcc-ada/
}
package_gcc-go()
@@ -301,12 +329,13 @@ package_gcc-go()
install=gcc-go.install
cd ${srcdir}/gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgo
- make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
- install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
- rm $pkgdir/usr/lib/lib{atomic,go}.a
+ make -C $CHOST/libgo DESTDIR=$pkgdir install-exec-am
+ make -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
+ install -Dm755 gcc/go1 $pkgdir/${_libdir}/go1
+
+ rm $pkgdir/usr/lib/libgo.a
# Install Runtime Library Exception
- install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
+ install -d ${pkgdir}/usr/share/licenses/gcc-go/
+ ln -s ../gcc-libs/RUNTIME.LIBRARY.EXCEPTION ${pkgdir}/usr/share/licenses/gcc-go/
}
diff --git a/core/gcc/gcc-4.8-lambda-ICE.patch b/core/gcc/gcc-4.8-lambda-ICE.patch
new file mode 100644
index 000000000..cf77a9b35
--- /dev/null
+++ b/core/gcc/gcc-4.8-lambda-ICE.patch
@@ -0,0 +1,35 @@
+diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c
+index 0b8e2f7..ad1c209 100644
+--- a/gcc/cp/semantics.c
++++ b/gcc/cp/semantics.c
+@@ -2719,8 +2719,10 @@ finish_member_declaration (tree decl)
+ /*friend_p=*/0);
+ }
+ }
+- /* Enter the DECL into the scope of the class. */
+- else if (pushdecl_class_level (decl))
++ /* Enter the DECL into the scope of the class, if the class
++ isn't a closure (whose fields are supposed to be unnamed). */
++ else if (CLASSTYPE_LAMBDA_EXPR (current_class_type)
++ || pushdecl_class_level (decl))
+ {
+ if (TREE_CODE (decl) == USING_DECL)
+ {
+diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C
+new file mode 100644
+index 0000000..df2b037
+--- /dev/null
++++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-names1.C
+@@ -0,0 +1,9 @@
++// PR c++/56710
++// { dg-options "-std=c++11 -Wall" }
++
++int main()
++{
++ int t = 0;
++ return [&]() -> int {int __t; __t = t; return __t; }();
++ return [&t]() -> int {int __t; __t = t; return __t; }();
++}
+--
+1.8.4.2
+
diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD
index c460aa00f..af8bb022d 100644
--- a/core/glib2/PKGBUILD
+++ b/core/glib2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197812 2013-10-30 11:03:36Z allan $
+# $Id: PKGBUILD 199901 2013-11-18 14:27:39Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=glib2
pkgname=(glib2 glib2-docs)
-pkgver=2.38.1
+pkgver=2.38.2
pkgrel=1
pkgdesc="Common C routines used by GTK+ and other libs"
url="http://www.gtk.org/"
@@ -11,7 +11,7 @@ arch=(i686 x86_64 mips64el)
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=('01906c62ac666d2ab3183cc07261b2536fab7b211c6129ab66b119c2af56d159'
+sha256sums=('056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734'
'049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97')
prepare() {
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 76c4f5859..990d71597 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197798 2013-10-30 10:37:54Z allan $
+# $Id: PKGBUILD 201557 2013-12-15 06:41:32Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -8,7 +8,7 @@
pkgname=glibc
pkgver=2.18
-pkgrel=9
+pkgrel=11
pkgdesc="GNU C Library"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/libc"
@@ -29,6 +29,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
glibc-2.18-ptr-mangle-CVE-2013-4788.patch
glibc-2.18-getaddrinfo-CVE-2013-4458.patch
glibc-2.18-getaddrinfo-assertion.patch
+ glibc-2.18-scanf-parse-0e-0.patch
glibc-2.18-strstr-hackfix.patch
nscd.service
nscd.tmpfiles
@@ -43,6 +44,7 @@ md5sums=('88fbbceafee809e82efd52efa1e3c58f'
'9749ba386b08a8fe53e7ecede9bf2dfb'
'71329fccb8eb583fb0d67b55f1e8df68'
'd4d86add33f22125777e0ecff06bc9bb'
+ '01d19fe9b2aea489cf5651530e0369f2'
'4441f6dfe7d75ced1fa75e54dd21d36e'
'd5fab2cd3abea65aa5ae696ea4a47d6b'
'da662ca76e7c8d7efbc7986ab7acea2d'
@@ -73,6 +75,9 @@ prepare() {
# upstream commit 894f3f10
patch -p1 -i $srcdir/glibc-2.18-getaddrinfo-assertion.patch
+ # upstream commit a4966c61
+ patch -p1 -i $srcdir/glibc-2.18-scanf-parse-0e-0.patch
+
# hack fix for strstr issues on x86
patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
diff --git a/core/glibc/glibc-2.18-scanf-parse-0e-0.patch b/core/glibc/glibc-2.18-scanf-parse-0e-0.patch
new file mode 100644
index 000000000..651e56590
--- /dev/null
+++ b/core/glibc/glibc-2.18-scanf-parse-0e-0.patch
@@ -0,0 +1,67 @@
+diff --git a/stdio-common/tst-sscanf.c b/stdio-common/tst-sscanf.c
+index 1edb227..3c34f58 100644
+--- a/stdio-common/tst-sscanf.c
++++ b/stdio-common/tst-sscanf.c
+@@ -109,6 +109,19 @@ struct test double_tests[] =
+ { L("-inf"), L("%g"), 1 }
+ };
+
++struct test2
++{
++ const CHAR *str;
++ const CHAR *fmt;
++ int retval;
++ char residual;
++} double_tests2[] =
++{
++ { L("0e+0"), L("%g%c"), 1, 0 },
++ { L("0xe+0"), L("%g%c"), 2, '+' },
++ { L("0x.e+0"), L("%g%c"), 2, '+' },
++};
++
+ int
+ main (void)
+ {
+@@ -196,5 +209,26 @@ main (void)
+ }
+ }
+
++ for (i = 0; i < sizeof (double_tests2) / sizeof (double_tests2[0]); ++i)
++ {
++ double dummy;
++ int ret;
++ char c = 0;
++
++ if ((ret = SSCANF (double_tests2[i].str, double_tests2[i].fmt,
++ &dummy, &c)) != double_tests2[i].retval)
++ {
++ printf ("double_tests2[%d] returned %d != %d\n",
++ i, ret, double_tests2[i].retval);
++ result = 1;
++ }
++ else if (ret == 2 && c != double_tests2[i].residual)
++ {
++ printf ("double_tests2[%d] stopped at '%c' != '%c'\n",
++ i, c, double_tests2[i].residual);
++ result = 1;
++ }
++ }
++
+ return result;
+ }
+diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
+index 78dc2fc..e6fa8f3 100644
+--- a/stdio-common/vfscanf.c
++++ b/stdio-common/vfscanf.c
+@@ -1966,6 +1966,8 @@ _IO_vfscanf_internal (_IO_FILE *s, const char *format, _IO_va_list argptr,
+ if (width > 0)
+ --width;
+ }
++ else
++ got_digit = 1;
+ }
+
+ while (1)
+--
+1.8.4.2
+
diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD
index d3bd5bbe1..602334876 100644
--- a/core/inetutils/PKGBUILD
+++ b/core/inetutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194664 2013-09-20 17:37:51Z eric $
+# $Id: PKGBUILD 201551 2013-12-14 23:02:04Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=inetutils
pkgver=1.9.1.341
-pkgrel=1
+pkgrel=2
pkgdesc="A collection of common network programs"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/inetutils/"
@@ -11,19 +11,32 @@ license=('GPL3')
groups=('base')
depends=('pam')
makedepends=('help2man')
-backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
- 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
+backup=('etc/xinetd.d/telnet' 'etc/xinetd.d/talk'
+ 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh'
+ 'etc/pam.d/rlogin' 'etc/pam.d/rsh')
options=('!emptydirs')
install=inetutils.install
-source=(ftp://ftp.archlinux.org/other/packages/inetutils/${pkgname}-${pkgver}.tar.xz{,.sig} \
- telnet.xinetd talk.xinetd rlogin.xinetd rsh.xinetd ftpd.service)
+source=(ftp://ftp.archlinux.org/other/packages/inetutils/${pkgname}-${pkgver}.tar.xz{,.sig}
+ ftpd.service rlogin.pam rlogin@.service rlogin.socket rlogin.xinetd
+ rsh.pam rsh@.service rsh.socket rsh.xinetd talk.service talk.socket talk.xinetd
+ telnet@.service telnet.socket telnet.xinetd)
sha1sums=('eaccc1568c9cc624f6cda3a265fb92ec72c7304d'
'SKIP'
- '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3'
- 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
+ 'aa4730d662398b6c33df2b6fc116ab6b5c3cd120'
+ '387b371cbaa3611b95d30f806c0dd08b621a584a'
+ '6f9a304391610a17b8ae3ad35b742c78c86aee16'
+ '0455126fa18d2a9422469d79b9e73dd928b15652'
'd9b8f8aab094ecb779d0f16f21b4683ab327516f'
+ '556b5372cbab8794e931e110b896fa8a61628bb1'
+ '828da7bce49ffc4e9645288759b275a98a2fbc40'
+ '7071da32d42a133ead039197ed891b518bb0f773'
'26763ae31b8a5be256666a0ba55746941d75d6ee'
- 'e4a764828b57f1e907ec96f4ae0e0cf0d3e2e802')
+ '4486c966d28736897bce1280d85d139bd10a5689'
+ 'd1813d42c5c9d2c60f03ebe33961de357a4b8b43'
+ 'b15ab4faa9d97652e182c98c1e3a3b3cbbf6383c'
+ '0917dc6b5a80d914bf550065b1733b7da2c776f3'
+ 'a7ac7bbe917ff80fd8cd4357fbc62fab50595c34'
+ '2b2dd71eb3233e5090f4c2df8abe9b4924d323f3')
build() {
cd ${pkgname}-${pkgver}
@@ -58,5 +71,17 @@ package() {
install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
+
+ install -D -m644 "${srcdir}/rlogin.pam" "${pkgdir}/etc/pam.d/rlogin"
+ install -D -m644 "${srcdir}/rsh.pam" "${pkgdir}/etc/pam.d/rsh"
+
install -D -m644 "${srcdir}/ftpd.service" "${pkgdir}/usr/lib/systemd/system/ftpd.service"
+ install -D -m644 "${srcdir}/rlogin@.service" "${pkgdir}/usr/lib/systemd/system/rlogin@.service"
+ install -D -m644 "${srcdir}/rlogin.socket" "${pkgdir}/usr/lib/systemd/system/rlogin.socket"
+ install -D -m644 "${srcdir}/rsh@.service" "${pkgdir}/usr/lib/systemd/system/rsh@.service"
+ install -D -m644 "${srcdir}/rsh.socket" "${pkgdir}/usr/lib/systemd/system/rsh.socket"
+ install -D -m644 "${srcdir}/talk.service" "${pkgdir}/usr/lib/systemd/system/talk.service"
+ install -D -m644 "${srcdir}/talk.socket" "${pkgdir}/usr/lib/systemd/system/talk.socket"
+ install -D -m644 "${srcdir}/telnet@.service" "${pkgdir}/usr/lib/systemd/system/telnet@.service"
+ install -D -m644 "${srcdir}/telnet.socket" "${pkgdir}/usr/lib/systemd/system/telnet.socket"
}
diff --git a/core/inetutils/ftpd.service b/core/inetutils/ftpd.service
index 57549c088..3020804b0 100644
--- a/core/inetutils/ftpd.service
+++ b/core/inetutils/ftpd.service
@@ -3,8 +3,10 @@ Description=FTPD Daemon
After=network.target
[Service]
-ExecStart=/usr/bin/ftpd -D
Type=forking
+PIDFile=/run/ftpd.pid
+ExecStart=/usr/bin/ftpd -D
+ExecStopPost=/bin/rm -f /run/ftpd.pid
[Install]
WantedBy=multi-user.target
diff --git a/core/inetutils/rlogin.pam b/core/inetutils/rlogin.pam
new file mode 100644
index 000000000..d92a5da40
--- /dev/null
+++ b/core/inetutils/rlogin.pam
@@ -0,0 +1,13 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rlogin" must be
+# listed in /etc/securetty.
+auth required pam_nologin.so
+auth required pam_securetty.so
+auth required pam_env.so
+auth sufficient pam_rhosts.so
+auth include system-auth
+account include system-auth
+password include system-auth
+session optional pam_keyinit.so force revoke
+session required pam_loginuid.so
+session include system-auth
diff --git a/core/inetutils/rlogin.socket b/core/inetutils/rlogin.socket
new file mode 100644
index 000000000..c8c276c59
--- /dev/null
+++ b/core/inetutils/rlogin.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Remote Login Facilities Activation Socket
+
+[Socket]
+ListenStream=513
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/core/inetutils/rlogin@.service b/core/inetutils/rlogin@.service
new file mode 100644
index 000000000..77c18caa9
--- /dev/null
+++ b/core/inetutils/rlogin@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Remote Login Facilities Server
+After=local-fs.target
+
+[Service]
+ExecStart=-/usr/bin/rlogind
+StandardInput=socket
diff --git a/core/inetutils/rsh.pam b/core/inetutils/rsh.pam
new file mode 100644
index 000000000..3c04bc7d6
--- /dev/null
+++ b/core/inetutils/rsh.pam
@@ -0,0 +1,11 @@
+#%PAM-1.0
+# For root login to succeed here with pam_securetty, "rsh" must be
+# listed in /etc/securetty.
+auth required pam_nologin.so
+auth required pam_securetty.so
+auth required pam_env.so
+auth required pam_rhosts.so
+account include system-auth
+session optional pam_keyinit.so force revoke
+session required pam_loginuid.so
+session include system-auth
diff --git a/core/inetutils/rsh.socket b/core/inetutils/rsh.socket
new file mode 100644
index 000000000..4d44b99eb
--- /dev/null
+++ b/core/inetutils/rsh.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Remote Shell Facilities Activation Socket
+
+[Socket]
+ListenStream=514
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/core/inetutils/rsh@.service b/core/inetutils/rsh@.service
new file mode 100644
index 000000000..403754a9f
--- /dev/null
+++ b/core/inetutils/rsh@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Remote Shell Facilities Server
+After=local-fs.target
+
+[Service]
+ExecStart=-/usr/bin/rshd
+StandardInput=socket
diff --git a/core/inetutils/talk.service b/core/inetutils/talk.service
new file mode 100644
index 000000000..25eb6732d
--- /dev/null
+++ b/core/inetutils/talk.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Talk Server
+Documentation=man:talkd(8) man:talk(1)
+
+[Service]
+User=nobody
+Group=tty
+ExecStart=/usr/bin/talkd
+StandardInput=socket
+
+[Install]
+Also=talk.socket
diff --git a/core/inetutils/talk.socket b/core/inetutils/talk.socket
new file mode 100644
index 000000000..b09e07cbb
--- /dev/null
+++ b/core/inetutils/talk.socket
@@ -0,0 +1,9 @@
+[Unit]
+Description=Talk Server Activation Socket
+Documentation=man:talkd(8) man:talk(1)
+
+[Socket]
+ListenDatagram=0.0.0.0:518
+
+[Install]
+WantedBy=sockets.target
diff --git a/core/inetutils/telnet.socket b/core/inetutils/telnet.socket
new file mode 100644
index 000000000..811b6725f
--- /dev/null
+++ b/core/inetutils/telnet.socket
@@ -0,0 +1,10 @@
+[Unit]
+Description=Telnet Server Activation Socket
+Documentation=man:telnetd(8)
+
+[Socket]
+ListenStream=23
+Accept=true
+
+[Install]
+WantedBy=sockets.target
diff --git a/core/inetutils/telnet@.service b/core/inetutils/telnet@.service
new file mode 100644
index 000000000..d92af371b
--- /dev/null
+++ b/core/inetutils/telnet@.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Telnet Server
+After=local-fs.target
+
+[Service]
+ExecStart=-/usr/bin/telnetd
+StandardInput=socket
diff --git a/core/iproute2/PKGBUILD b/core/iproute2/PKGBUILD
index 4f40ea294..35f426749 100644
--- a/core/iproute2/PKGBUILD
+++ b/core/iproute2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192132 2013-08-06 06:57:03Z bpiotrowski $
+# $Id: PKGBUILD 199763 2013-11-15 21:24:40Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=iproute2
-pkgver=3.10.0
+pkgver=3.11.0
pkgrel=1
pkgdesc="IP Routing Utilities"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,13 +16,15 @@ groups=('base')
provides=('iproute')
conflicts=('iproute')
replaces=('iproute')
-options=('!makeflags')
+options=('staticlibs' '!makeflags')
backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_protos' \
'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables')
source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz
- iproute2-fhs.patch)
-sha1sums=('e94b5dc9dc586006b272f67134ec07f6fbc81bd7'
- '35b8cf2dc94b73eccad427235c07596146cd6f6c')
+ iproute2-fhs.patch
+ unwanted-link-help.patch)
+sha1sums=('efb5ca0688e28967ec146ac37cc728c4f53c9d8f'
+ '35b8cf2dc94b73eccad427235c07596146cd6f6c'
+ '3b1335f4025f657f388fbf4e5a740871e3129c2a')
prepare() {
cd $srcdir/$pkgname-$pkgver
@@ -30,6 +32,9 @@ prepare() {
# set correct fhs structure
patch -Np1 -i "$srcdir/iproute2-fhs.patch"
+ # allow operations on links called "h", "he", "hel", "help"
+ patch -Np1 -i "$srcdir/unwanted-link-help.patch"
+
# do not treat warnings as errors
sed -i 's/-Werror//' Makefile
}
diff --git a/core/iproute2/unwanted-link-help.patch b/core/iproute2/unwanted-link-help.patch
new file mode 100644
index 000000000..8abe9e39d
--- /dev/null
+++ b/core/iproute2/unwanted-link-help.patch
@@ -0,0 +1,17 @@
+diff -ru iproute2-3.10.0.orig/ip/iplink.c iproute2-3.10.0/ip/iplink.c
+--- iproute2-3.10.0.orig/ip/iplink.c 2013-08-08 13:53:33.000000000 -0700
++++ iproute2-3.10.0/ip/iplink.c 2013-08-08 13:55:03.179865309 -0700
+@@ -467,11 +467,11 @@
+ addattr_l(&req->n, sizeof(*req), IFLA_NUM_RX_QUEUES,
+ &numrxqueues, 4);
+ } else {
++ if (matches(*argv, "help") == 0)
++ usage();
+ if (strcmp(*argv, "dev") == 0) {
+ NEXT_ARG();
+ }
+- if (matches(*argv, "help") == 0)
+- usage();
+ if (*dev)
+ duparg2("dev", *argv);
+ *dev = *argv;
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 13c9a2c90..17675f234 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197814 2013-10-30 11:03:50Z allan $
+# $Id: PKGBUILD 199764 2013-11-15 21:24:41Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
pkgname=iptables
-pkgver=1.4.19.1
+pkgver=1.4.20
pkgrel=1
pkgdesc='Linux kernel packet control tool'
arch=('i686' 'x86_64' 'mips64el')
@@ -24,7 +24,7 @@ source=(http://www.netfilter.org/projects/iptables/files/${pkgname}-${pkgver}.ta
iptables.service
ip6tables.service
iptables-flush)
-sha1sums=('566ba23b73403b0e4b4511d35c40124717bba97b'
+sha1sums=('7219b32657e9f794ff1b5a2476363c59f9c2175c'
'SKIP'
'83b3363878e3660ce23b2ad325b53cbd6c796ecf'
'f085a71f467e4d7cb2cf094d9369b0bcc4bab6ec'
diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD
index 9a8b1224c..14e023272 100644
--- a/core/isl/PKGBUILD
+++ b/core/isl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197163 2013-10-23 13:05:00Z allan $
+# $Id: PKGBUILD 201470 2013-12-12 15:38:37Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
pkgname=isl
@@ -9,7 +9,7 @@ arch=('i686' 'x86_64' 'mips64el')
url="http://freecode.com/projects/isl"
depends=('gmp')
license=('MIT')
-source=(ftp://ftp.linux.student.kuleuven.be/pub/people/skimo/isl/$pkgname-$pkgver.tar.bz2)
+source=(http://isl.gforge.inria.fr/$pkgname-$pkgver.tar.bz2)
md5sums=('27d381085ff1b5733c3e8a9b6ad24a4d')
build() {
diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD
index b2e250cda..d2becf808 100644
--- a/core/kbd/PKGBUILD
+++ b/core/kbd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196308 2013-10-11 09:58:13Z tpowa $
+# $Id: PKGBUILD 199885 2013-11-18 07:11:38Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kbd
-pkgver=2.0.0
-pkgrel=2
+pkgver=2.0.1
+pkgrel=1
pkgdesc="Keytable files and keyboard utilities"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.kbd-project.org"
@@ -12,17 +12,13 @@ depends=('glibc' 'pam')
makedepends=('check')
source=(ftp://ftp.altlinux.org/pub/people/legion/kbd/${pkgname}-${pkgver}.tar.gz
'fix-dvorak-es.patch'
- 'fix-euro2.patch'
- 'fix-alt_is_meta.patch'
- 'merge-fullline_singleline.patch')
+ 'fix-euro2.patch')
provides=('vlock')
conflicts=('vlock')
replaces=('vlock')
-md5sums=('5ba259a0b2464196f6488a72070a3d60'
+md5sums=('cc0ee9f2537d8636cae85a8c6541ed2e'
'998957c4f815347dcc874c4d7555dc66'
- 'd869200acbc0aab6a9cafa43cb140d4e'
- '91de90cde763c7f704027c2837360098'
- 'b21e24509ea9db206971ce8a02dfc46f')
+ 'd869200acbc0aab6a9cafa43cb140d4e')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -40,9 +36,6 @@ prepare() {
patch -Np1 -i ../fix-dvorak-es.patch
# fix euro2 #28213
patch -Np1 -i ../fix-euro2.patch
- # fix #36689
- patch -Np1 -i ../fix-alt_is_meta.patch
- patch -Np1 -i ../merge-fullline_singleline.patch
}
build() {
diff --git a/core/kbd/fix-alt_is_meta.patch b/core/kbd/fix-alt_is_meta.patch
deleted file mode 100644
index 865ea917b..000000000
--- a/core/kbd/fix-alt_is_meta.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From f6d17ec929f59cc65a8c5f8a4918c1fe89e2b85a Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Mon, 7 Oct 2013 17:48:57 +0400
-Subject: [PATCH] Fix alt_is_meta regression
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/libkeymap/kmap.c | 8 ++++----
- tests/Makefile.am | 8 ++++++--
- tests/alt-is-meta.in | 19 +++++++++++++++++++
- tests/alt-is-meta.map | 12 ++++++++++++
- tests/alt-is-meta.output | 42 ++++++++++++++++++++++++++++++++++++++++++
- tests/libkeymap-showmaps.c | 30 ++++++++++++++++++++++++++++++
- 6 files changed, 113 insertions(+), 6 deletions(-)
- create mode 100755 tests/alt-is-meta.in
- create mode 100644 tests/alt-is-meta.map
- create mode 100644 tests/alt-is-meta.output
- create mode 100644 tests/libkeymap-showmaps.c
-
-diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c
-index ca97ed5..c7945bc 100644
---- a/src/libkeymap/kmap.c
-+++ b/src/libkeymap/kmap.c
-@@ -149,10 +149,10 @@ lk_add_key(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index, int k
- int type = KTYP(keycode);
- int val = KVAL(keycode);
-
-- if (alttable != k_table && !lk_key_exists(ctx, alttable, k_index) &&
-- (type == KT_LATIN || type == KT_LETTER) && val < 128) {
-- if (lk_add_map(ctx, alttable) < 0)
-- return -1;
-+ if (alttable != k_table && lk_map_exists(ctx, alttable) &&
-+ !lk_key_exists(ctx, alttable, k_index) &&
-+ (type == KT_LATIN || type == KT_LETTER) &&
-+ val < 128) {
- if (lk_add_key(ctx, alttable, k_index, K(KT_META, val)) < 0)
- return -1;
- }
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index e7d22c2..d9a9f61 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -7,10 +7,12 @@ AM_CFLAGS = $(CHECK_CFLAGS)
- LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS)
-
- EXTRA_DIST = \
-+ alt-is-meta.in \
- dumpkeys-bkeymap.in \
- dumpkeys-fulltable.in \
- dumpkeys-mktable.in \
- \
-+ alt-is-meta.map \
- charset-keymap0.map \
- dumpkeys.full.ruwin_cplk-UTF-8.map \
- dumpkeys.qwerty-layout.map \
-@@ -19,15 +21,16 @@ EXTRA_DIST = \
- keymap0.map keymap1.map keymap2.map keymap3.map keymap4.map keymap5.map keymap6.map \
- VoidSymbol.map \
- \
-+ alt-is-meta.output \
- dumpkeys.bkeymap.bin \
- dumpkeys.defkeymap.c
-
--check_SCRIPTS = dumpkeys-fulltable dumpkeys-mktable dumpkeys-bkeymap
-+check_SCRIPTS = dumpkeys-fulltable dumpkeys-mktable dumpkeys-bkeymap alt-is-meta
- check_PROGRAMS = libkeymap-init libkeymap-kmap libkeymap-keys libkeymap-parse \
- libkeymap-charset
-
- noinst_PROGRAMS = \
-- libkeymap-dumpkeys libkeymap-mktable libkeymap-bkeymap \
-+ libkeymap-dumpkeys libkeymap-mktable libkeymap-bkeymap libkeymap-showmaps \
- $(check_PROGRAMS)
-
- TESTS = $(check_PROGRAMS) $(check_SCRIPTS)
-@@ -41,6 +44,7 @@ libkeymap_charset_SOURCES = libkeymap-charset.c
- libkeymap_dumpkeys_SOURCES = libkeymap-dumpkeys.c
- libkeymap_mktable_SOURCES = libkeymap-mktable.c
- libkeymap_bkeymap_SOURCES = libkeymap-bkeymap.c
-+libkeymap_showmaps_SOURCES = libkeymap-showmaps.c
-
- %: %.in
- sed \
-diff --git a/tests/alt-is-meta.in b/tests/alt-is-meta.in
-new file mode 100755
-index 0000000..ddd5ed8
---- /dev/null
-+++ b/tests/alt-is-meta.in
-@@ -0,0 +1,19 @@
-+#!/bin/sh -efu
-+
-+cwd="$(readlink -ev "${0%/*}")"
-+
-+cd "$cwd"
-+
-+rc=0
-+temp="$(mktemp "@BUILDDIR@/temp.XXXXXXXXX")"
-+
-+./libkeymap-showmaps "@DATADIR@"/alt-is-meta.map > "$temp" || rc=$?
-+cmp -s "@DATADIR@//alt-is-meta.output" "$temp" || rc=$?
-+
-+if [ "$rc" != 0 ]; then
-+ printf 'failed\n'
-+else
-+ rm -f -- "$temp"
-+fi
-+
-+exit $rc
-diff --git a/tests/alt-is-meta.map b/tests/alt-is-meta.map
-new file mode 100644
-index 0000000..fa182a5
---- /dev/null
-+++ b/tests/alt-is-meta.map
-@@ -0,0 +1,12 @@
-+keymaps 0-9,12-13,16-20,22,24-25,28,32-41,44-45,48-52,54,56-57,60
-+alt_is_meta
-+keycode 16 = +q Q backslash backslash Control_q \
-+ Control_q Control_backslash Control_backslash \
-+ Meta_q Meta_Q VoidSymbol VoidSymbol +Q \
-+ q VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
-+ Meta_Q Meta_q VoidSymbol \
-+ +q Q backslash backslash Control_q \
-+ Control_q Control_backslash Control_backslash \
-+ Meta_q Meta_Q VoidSymbol VoidSymbol +Q \
-+ q VoidSymbol VoidSymbol VoidSymbol VoidSymbol \
-+ Meta_Q Meta_q VoidSymbol
-diff --git a/tests/alt-is-meta.output b/tests/alt-is-meta.output
-new file mode 100644
-index 0000000..25abb20
---- /dev/null
-+++ b/tests/alt-is-meta.output
-@@ -0,0 +1,42 @@
-+keymap 000
-+keymap 001
-+keymap 002
-+keymap 003
-+keymap 004
-+keymap 005
-+keymap 006
-+keymap 007
-+keymap 008
-+keymap 009
-+keymap 012
-+keymap 013
-+keymap 016
-+keymap 017
-+keymap 018
-+keymap 019
-+keymap 020
-+keymap 022
-+keymap 024
-+keymap 025
-+keymap 028
-+keymap 032
-+keymap 033
-+keymap 034
-+keymap 035
-+keymap 036
-+keymap 037
-+keymap 038
-+keymap 039
-+keymap 040
-+keymap 041
-+keymap 044
-+keymap 045
-+keymap 048
-+keymap 049
-+keymap 050
-+keymap 051
-+keymap 052
-+keymap 054
-+keymap 056
-+keymap 057
-+keymap 060
-diff --git a/tests/libkeymap-showmaps.c b/tests/libkeymap-showmaps.c
-new file mode 100644
-index 0000000..acbf9f1
---- /dev/null
-+++ b/tests/libkeymap-showmaps.c
-@@ -0,0 +1,30 @@
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <keymap.h>
-+
-+#include "contextP.h"
-+
-+int main(int argc, char **argv)
-+{
-+ int i;
-+ struct lk_ctx *ctx;
-+ lkfile_t f;
-+
-+ ctx = lk_init();
-+
-+ f.pipe = 0;
-+ strcpy(f.pathname, argv[1]);
-+ f.fd = fopen( argv[1], "r");
-+
-+ lk_parse_keymap(ctx, &f);
-+
-+ for (i = 0; i < ctx->keymap->total; i++) {
-+ if (!lk_map_exists(ctx, i))
-+ continue;
-+ printf("keymap %03d\n", i);
-+ }
-+
-+ lk_free(ctx);
-+ return 0;
-+}
---
-1.7.3.3
-
diff --git a/core/kbd/merge-fullline_singleline.patch b/core/kbd/merge-fullline_singleline.patch
deleted file mode 100644
index cc2b2c3b0..000000000
--- a/core/kbd/merge-fullline_singleline.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 301cb9f132017ec67cc00681ca3f7a25f0d24ca2 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Mon, 7 Oct 2013 18:11:45 +0400
-Subject: [PATCH] parser: Merge fullline and singleline rule
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/libkeymap/parser.y | 59 ++++++++++++++++++++++++-----------------------
- 1 files changed, 30 insertions(+), 29 deletions(-)
-
-diff --git a/src/libkeymap/parser.y b/src/libkeymap/parser.y
-index 627494a..17d953a 100644
---- a/src/libkeymap/parser.y
-+++ b/src/libkeymap/parser.y
-@@ -180,7 +180,6 @@ line : EOL
- | usualstringsline
- | usualcomposeline
- | keymapline
-- | fullline
- | singleline
- | strline
- | compline
-@@ -281,34 +280,7 @@ compline : COMPOSE compsym compsym TO compsym EOL
- compsym : CCHAR { $$ = $1; }
- | UNUMBER { $$ = $1 ^ 0xf000; }
- ;
--singleline : {
-- ctx->mod = 0;
-- }
-- modifiers KEYCODE NUMBER EQUALS rvalue EOL
-- {
-- if (lk_add_key(ctx, ctx->mod, $4, $6) < 0)
-- YYERROR;
-- }
-- | PLAIN KEYCODE NUMBER EQUALS rvalue EOL
-- {
-- if (lk_add_key(ctx, 0, $3, $5) < 0)
-- YYERROR;
-- }
-- ;
--modifiers : modifiers modifier
-- | modifier
-- ;
--modifier : SHIFT { ctx->mod |= M_SHIFT; }
-- | CONTROL { ctx->mod |= M_CTRL; }
-- | ALT { ctx->mod |= M_ALT; }
-- | ALTGR { ctx->mod |= M_ALTGR; }
-- | SHIFTL { ctx->mod |= M_SHIFTL; }
-- | SHIFTR { ctx->mod |= M_SHIFTR; }
-- | CTRLL { ctx->mod |= M_CTRLL; }
-- | CTRLR { ctx->mod |= M_CTRLR; }
-- | CAPSSHIFT { ctx->mod |= M_CAPSSHIFT; }
-- ;
--fullline : KEYCODE NUMBER EQUALS rvalue0 EOL
-+singleline : KEYCODE NUMBER EQUALS rvalue0 EOL
- {
- unsigned int j, i, keycode;
- int *val;
-@@ -367,6 +339,33 @@ fullline : KEYCODE NUMBER EQUALS rvalue0 EOL
- }
- }
- }
-+
-+ | modifiers KEYCODE NUMBER EQUALS rvalue EOL
-+ {
-+ if (lk_add_key(ctx, ctx->mod, $3, $5) < 0)
-+ YYERROR;
-+ ctx->mod = 0;
-+ }
-+ | PLAIN KEYCODE NUMBER EQUALS rvalue EOL
-+ {
-+ if (lk_add_key(ctx, 0, $3, $5) < 0)
-+ YYERROR;
-+ ctx->mod = 0;
-+ }
-+ ;
-+modifiers : modifiers modifier
-+ | modifier
-+ ;
-+modifier : SHIFT { ctx->mod |= M_SHIFT; }
-+ | CONTROL { ctx->mod |= M_CTRL; }
-+ | ALT { ctx->mod |= M_ALT; }
-+ | ALTGR { ctx->mod |= M_ALTGR; }
-+ | SHIFTL { ctx->mod |= M_SHIFTL; }
-+ | SHIFTR { ctx->mod |= M_SHIFTR; }
-+ | CTRLL { ctx->mod |= M_CTRLL; }
-+ | CTRLR { ctx->mod |= M_CTRLR; }
-+ | CAPSSHIFT { ctx->mod |= M_CAPSSHIFT; }
-+ ;
- ;
-
- rvalue0 :
-@@ -393,6 +392,8 @@ lk_parse_keymap(struct lk_ctx *ctx, lkfile_t *f)
- yyscan_t scanner;
- int rc = -1;
-
-+ ctx->mod = 0;
-+
- yylex_init(&scanner);
- yylex_init_extra(ctx, &scanner);
-
---
-1.7.3.3
-
diff --git a/core/krb5/CVE-2002-2443.patch b/core/krb5/CVE-2002-2443.patch
deleted file mode 100644
index 3ef88155c..000000000
--- a/core/krb5/CVE-2002-2443.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From cf1a0c411b2668c57c41e9c4efd15ba17b6b322c Mon Sep 17 00:00:00 2001
-From: Tom Yu <tlyu@mit.edu>
-Date: Fri, 3 May 2013 16:26:46 -0400
-Subject: [PATCH] Fix kpasswd UDP ping-pong [CVE-2002-2443]
-
-The kpasswd service provided by kadmind was vulnerable to a UDP
-"ping-pong" attack [CVE-2002-2443]. Don't respond to packets unless
-they pass some basic validation, and don't respond to our own error
-packets.
-
-Some authors use CVE-1999-0103 to refer to the kpasswd UDP ping-pong
-attack or UDP ping-pong attacks in general, but there is discussion
-leading toward narrowing the definition of CVE-1999-0103 to the echo,
-chargen, or other similar built-in inetd services.
-
-Thanks to Vincent Danen for alerting us to this issue.
-
-CVSSv2: AV:N/AC:L/Au:N/C:N/I:N/A:P/E:P/RL:O/RC:C
-
-ticket: 7637 (new)
-target_version: 1.11.3
-tags: pullup
----
- src/kadmin/server/schpw.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/kadmin/server/schpw.c b/src/kadmin/server/schpw.c
-index 15b0ab5..7f455d8 100644
---- a/src/kadmin/server/schpw.c
-+++ b/src/kadmin/server/schpw.c
-@@ -52,7 +52,7 @@
- ret = KRB5KRB_AP_ERR_MODIFIED;
- numresult = KRB5_KPASSWD_MALFORMED;
- strlcpy(strresult, "Request was truncated", sizeof(strresult));
-- goto chpwfail;
-+ goto bailout;
- }
-
- ptr = req->data;
-@@ -67,7 +67,7 @@
- numresult = KRB5_KPASSWD_MALFORMED;
- strlcpy(strresult, "Request length was inconsistent",
- sizeof(strresult));
-- goto chpwfail;
-+ goto bailout;
- }
-
- /* verify version number */
-@@ -80,7 +80,7 @@
- numresult = KRB5_KPASSWD_BAD_VERSION;
- snprintf(strresult, sizeof(strresult),
- "Request contained unknown protocol version number %d", vno);
-- goto chpwfail;
-+ goto bailout;
- }
-
- /* read, check ap-req length */
-@@ -93,7 +93,7 @@
- numresult = KRB5_KPASSWD_MALFORMED;
- strlcpy(strresult, "Request was truncated in AP-REQ",
- sizeof(strresult));
-- goto chpwfail;
-+ goto bailout;
- }
-
- /* verify ap_req */
---
-1.8.1.6
-
diff --git a/core/krb5/PKGBUILD b/core/krb5/PKGBUILD
index 6866d9b3b..a18e8d724 100644
--- a/core/krb5/PKGBUILD
+++ b/core/krb5/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188525 2013-06-15 07:57:25Z bpiotrowski $
+# $Id: PKGBUILD 199942 2013-11-20 02:11:51Z eric $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=krb5
-pkgver=1.11.3
+pkgver=1.11.4
pkgrel=1
pkgdesc="The Kerberos network authentication system"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,45 +11,39 @@ license=('custom')
depends=('e2fsprogs' 'libldap' 'keyutils')
makedepends=('perl')
backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.11/${pkgname}-${pkgver}-signed.tar
- CVE-2002-2443.patch
+options=('!emptydirs')
+source=(http://web.mit.edu/kerberos/dist/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}-signed.tar
krb5-config_LDFLAGS.patch
krb5-kadmind.service
krb5-kdc.service
krb5-kpropd.service
krb5-kpropd@.service
krb5-kpropd.socket)
-sha1sums=('df708a530a22ed09c7825742c108180319b10463'
- '78ec307c2b5e32481a6da401013c428e0b867f36'
+sha1sums=('a432489410efa3ff27ac0ae54f55edeede3ed63f'
'09e478cddfb9d46d2981dd25ef96b8c3fd91e1aa'
- 'a2a01e7077d9e89cda3457ea0e216debb3dc353c'
- 'f5e4fa073e11b0fcb4e3098a5d58a4f791ec841e'
- '614401dd4ac18e310153240bb26eb32ff1e8cf5b'
- '023a8164f8ee7066ac814486a68bc605e79f6101'
+ '59bbc7e686cbb4bcefddf0f134d928d7bd5e7722'
+ '2ef2476a8673b3b702e829d8f451c839c2273b02'
+ '74d66aefd291f22dd80799f0437cc03d83083ed5'
+ '6787c6ce2783b3f980c423e2dd4abf5236af670b'
'f3677d30dbbd7106c581379c2c6ebb1bf7738912')
-options=('!emptydirs')
-
-build() {
- tar zxvf ${pkgname}-${pkgver}.tar.gz
- cd "${srcdir}/${pkgname}-${pkgver}/src"
+prepare() {
+ tar -xf ${pkgname}-${pkgver}.tar.gz
+ cd ${pkgname}-${pkgver}/src
# cf https://bugs.gentoo.org/show_bug.cgi?id=448778
patch -Np2 -i "${srcdir}"/krb5-config_LDFLAGS.patch
- # Fix kpasswd UDP ping-pong (CVE-2002-2443)
- #patch -Np2 -i "${srcdir}"/CVE-2002-2443.patch
-
- rm lib/krb5/krb/deltat.c
-
# FS#25384
sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
+}
+build() {
+ cd ${pkgname}-${pkgver}/src
export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
export CPPFLAGS+=" -I/usr/include/et"
./configure --prefix=/usr \
--sbindir=/usr/bin \
--sysconfdir=/etc \
- --mandir=/usr/share/man \
--localstatedir=/var/lib \
--enable-shared \
--with-system-et \
@@ -63,7 +57,7 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}/src"
+ cd ${pkgname}-${pkgver}/src
make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install
# Fix FS#29889
diff --git a/core/krb5/krb5-1.10.1-gcc47.patch b/core/krb5/krb5-1.10.1-gcc47.patch
deleted file mode 100644
index ffd01c2a3..000000000
--- a/core/krb5/krb5-1.10.1-gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y krb5-1.10.1/src/lib/krb5/krb/x-deltat.y
---- krb5-1.10.1.ori/src/lib/krb5/krb/x-deltat.y 2011-09-06 07:34:32.000000000 -0400
-+++ krb5-1.10.1/src/lib/krb5/krb/x-deltat.y 2012-03-24 13:15:11.543551318 -0400
-@@ -44,6 +44,7 @@
- #ifdef __GNUC__
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wuninitialized"
-+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
- #endif
-
- #include <ctype.h>
diff --git a/core/krb5/krb5-kadmind.service b/core/krb5/krb5-kadmind.service
index f3836c898..4819e0df4 100644
--- a/core/krb5/krb5-kadmind.service
+++ b/core/krb5/krb5-kadmind.service
@@ -2,7 +2,7 @@
Description=Kerberos 5 administration server
[Service]
-ExecStart=/usr/sbin/kadmind -nofork
+ExecStart=/usr/bin/kadmind -nofork
[Install]
WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kdc.service b/core/krb5/krb5-kdc.service
index 6ec93bb72..4918f6000 100644
--- a/core/krb5/krb5-kdc.service
+++ b/core/krb5/krb5-kdc.service
@@ -2,7 +2,7 @@
Description=Kerberos 5 KDC
[Service]
-ExecStart=/usr/sbin/krb5kdc -n
+ExecStart=/usr/bin/krb5kdc -n
Restart=always
[Install]
diff --git a/core/krb5/krb5-kpropd.service b/core/krb5/krb5-kpropd.service
index a7c5b579d..c6c322431 100644
--- a/core/krb5/krb5-kpropd.service
+++ b/core/krb5/krb5-kpropd.service
@@ -2,7 +2,7 @@
Description=Kerberos 5 propagation server
[Service]
-ExecStart=/usr/sbin/kpropd -S
+ExecStart=/usr/bin/kpropd -S
[Install]
WantedBy=multi-user.target
diff --git a/core/krb5/krb5-kpropd@.service b/core/krb5/krb5-kpropd@.service
index 46f7e3639..989270f12 100644
--- a/core/krb5/krb5-kpropd@.service
+++ b/core/krb5/krb5-kpropd@.service
@@ -3,6 +3,6 @@ Description=Kerberos 5 propagation server
Conflicts=krb5-kpropd.service
[Service]
-ExecStart=/usr/sbin/kpropd
+ExecStart=/usr/bin/kpropd
StandardInput=socket
StandardError=syslog
diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD
index cfd07fac2..2c9e59200 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197256 2013-10-24 19:47:22Z dreisner $
+# $Id: PKGBUILD 201474 2013-12-12 15:40:49Z dreisner $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=libarchive
@@ -17,7 +17,7 @@ source=("http://libarchive.org/downloads/$pkgname-$pkgver.tar.gz"
'libarchive-3.1.2-acl.patch')
md5sums=('efad5a503f66329bb9d2f4308b5de98a'
'fda89c145bbcd793a96b06b463ef6a72'
- '6432f3360abd5645461a9c825c75b307'
+ '6a63086b1a2e540d74ca6dc240dbd021'
'a5c995661c62429ceff2c23ea322393b')
build() {
diff --git a/core/libnl/PKGBUILD b/core/libnl/PKGBUILD
index f70db147a..f7daefedd 100644
--- a/core/libnl/PKGBUILD
+++ b/core/libnl/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197824 2013-10-30 11:05:01Z allan $
+# $Id: PKGBUILD 200720 2013-12-03 10:31:08Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=libnl
-pkgver=3.2.22
+pkgver=3.2.23
pkgrel=1
pkgdesc="Library for applications dealing with netlink sockets"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,10 +11,10 @@ license=(GPL)
depends=(glibc)
backup=(etc/libnl/classid etc/libnl/pktloc)
source=("$url/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b')
+sha256sums=('8cc2cda9aa8cbbad384b9bb1ba0f6777ed9bf65e1cc3170d8c2ba5b3ee12f2b3')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir"/$pkgname-$pkgver
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -24,6 +24,6 @@ build() {
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd "$srcdir"/$pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
diff --git a/core/libpcap/PKGBUILD b/core/libpcap/PKGBUILD
index d5a4a69c2..0e2a133fc 100644
--- a/core/libpcap/PKGBUILD
+++ b/core/libpcap/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 185218 2013-05-12 09:08:12Z thomas $
+# $Id: PKGBUILD 200644 2013-11-30 17:42:00Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=libpcap
-pkgver=1.4.0
+pkgver=1.5.1
pkgrel=1
pkgdesc="A system-independent interface for user-level packet capture"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('BSD')
depends=('glibc' 'libnl' 'sh' 'libusbx')
makedepends=('flex')
source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz{,.sig})
-sha256sums=('7c6a2a4f71e8ab09804e6b4fb3aff998c5583108ac42c0e2967eee8e1dbc7406'
+sha256sums=('259db4fe1e9f0b6b9c43a057ec5916dec7d0a821b00d6d6c4dff7db2445fa7e4'
'SKIP')
build() {
@@ -24,14 +24,12 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
install -d -m755 ${pkgdir}/usr/bin
make DESTDIR=${pkgdir} install
- # remove static library
- rm -rf ${pkgdir}/usr/lib/libpcap.a
# backwards compatibility, programs often look for net/bpf.h
mkdir -p ${pkgdir}/usr/include/net
cd ${pkgdir}/usr/include/net
ln -s ../pcap-bpf.h bpf.h
- #install the license
+ # install the license
install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
}
diff --git a/core/libpipeline/PKGBUILD b/core/libpipeline/PKGBUILD
index cfefe2e16..619c6d19f 100644
--- a/core/libpipeline/PKGBUILD
+++ b/core/libpipeline/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197825 2013-10-30 11:05:08Z allan $
+# $Id: PKGBUILD 202643 2013-12-23 07:54:41Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=libpipeline
-pkgver=1.2.4
+pkgver=1.2.6
pkgrel=1
pkgdesc="a C library for manipulating pipelines of subprocesses in a flexible and convenient way"
arch=('i686' 'x86_64' 'mips64el')
@@ -10,21 +10,21 @@ url="http://libpipeline.nongnu.org/"
license=('GPL')
depends=('glibc')
source=(http://download.savannah.gnu.org/releases/libpipeline/$pkgname-$pkgver.tar.gz{,.sig})
-md5sums=('a98b07f6f487fa268d1ebd99806b85ff'
+md5sums=('6d1d51a5dc102af41e0d269d2a31e6f9'
'SKIP')
build() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
./configure --prefix=/usr
make
}
check() {
- cd "$srcdir/$pkgname-$pkgver"
- make -k check
+ cd $pkgname-$pkgver
+ make check
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make DESTDIR="$pkgdir/" install
}
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 6da781f60..5c7031372 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197750 2013-10-29 09:58:36Z thomas $
+# $Id: PKGBUILD 199802 2013-11-16 17:53:26Z thomas $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgbase=lvm2
pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.103
-pkgrel=2
+pkgver=2.02.104
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceware.org/lvm2/"
license=('GPL2' 'LGPL2.1')
@@ -22,7 +22,7 @@ source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${pkgver}.tgz{,.asc}
lvm-monitoring.service
lvmetad.service
lvmetad.socket)
-sha1sums=('1194babd8d3cd5a9620bec1fe98a3be060465daf'
+sha1sums=('4c296453e10deafe02004fde40075cdb3792eeb2'
'SKIP'
'76e83966d1bc84f9a1e30bcaff84b8b8fefbca0f'
'ff0fdf0a3005a41acd4b36865056109effc3474b'
diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD
index ffe4143ca..00d0d72d3 100644
--- a/core/make/PKGBUILD
+++ b/core/make/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196827 2013-10-20 11:42:36Z allan $
+# $Id: PKGBUILD 201555 2013-12-15 06:41:30Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=make
pkgver=4.0
-pkgrel=1
+pkgrel=2
pkgdesc="GNU make utility to maintain groups of programs"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/make"
@@ -12,9 +12,18 @@ license=('GPL3')
groups=('base-devel')
depends=('glibc' 'sh' 'guile')
install=$pkgname.install
-source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
+source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}
+ make-4.0-char-cast.patch)
md5sums=('571d470a7647b455e3af3f92d79f1c18'
- 'SKIP')
+ 'SKIP'
+ '1840aae18e1c0d1c52563020ef3ff5f3')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ # http://git.savannah.gnu.org/cgit/make.git/commit/?id=9d58570c
+ patch -p1 -i ${srcdir}/make-4.0-char-cast.patch
+}
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/make/make-4.0-char-cast.patch b/core/make/make-4.0-char-cast.patch
new file mode 100644
index 000000000..c55490ffc
--- /dev/null
+++ b/core/make/make-4.0-char-cast.patch
@@ -0,0 +1,43 @@
+From 9d58570c77240fed53d1f88217877f8e778f4bb2 Mon Sep 17 00:00:00 2001
+From: Paul Smith <psmith@gnu.org>
+Date: Sat, 26 Oct 2013 04:10:17 +0000
+Subject: * makeint.h (STOP_SET): [SV 40371] Cast to unsigned char.
+
+* tests/scripts/misc/utf8: Test variable names with characters >127.
+Fix suggested by Robert Bogomip <bob.bogo@milohedge.com>
+---
+diff --git a/makeint.h b/makeint.h
+index 77f51e0..c591427 100644
+--- a/makeint.h
++++ b/makeint.h
+@@ -415,7 +415,7 @@ extern int unixy_shell;
+ # define MAP_VMSCOMMA 0x0000
+ #endif
+
+-#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(int)(_v)],(_m))
++#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m))
+
+ #if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT)
+ # define SET_STACK_SIZE
+diff --git a/tests/scripts/misc/utf8 b/tests/scripts/misc/utf8
+new file mode 100644
+index 0000000..2adcd07
+--- a/dev/null
++++ b/tests/scripts/misc/utf8
+@@ -0,0 +1,14 @@
++# -*-perl-*-
++$description = "Test utf8 handling.";
++
++$details = "";
++
++# Variable names containing UTF8 characters
++run_make_test("
++\xe2\x96\xaa := hello
++\$(info \$(\xe2\x96\xaa))
++all:
++",
++ '', "hello\n#MAKE#: Nothing to be done for 'all'.");
++
++1;
+--
+cgit v0.9.0.2
diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD
index b30feff04..7322d42d5 100644
--- a/core/mdadm/PKGBUILD
+++ b/core/mdadm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194030 2013-09-10 10:15:14Z tpowa $
+# $Id: PKGBUILD 199470 2013-11-13 11:08:13Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
pkgname=mdadm
pkgver=3.3
-pkgrel=1
+pkgrel=2
pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID"
arch=(i686 x86_64 'mips64el')
license=('GPL')
@@ -44,6 +44,7 @@ build() {
package() {
cd $srcdir/$pkgname-$pkgver
make INSTALL=/usr/bin/install BINDIR=/usr/bin DESTDIR=$pkgdir install
+ make SYSTEMD_DIR=$pkgdir/usr/lib/systemd/system install-systemd
install -D -m755 mdassemble $pkgdir/usr/bin/mdassemble
install -D -m644 ../mdadm.conf $pkgdir/etc/mdadm.conf
install -D -m644 ../mdadm_install $pkgdir/usr/lib/initcpio/install/mdadm
diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD
index 4a7e99916..f89d5ec2e 100644
--- a/core/mpfr/PKGBUILD
+++ b/core/mpfr/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 197157 2013-10-23 13:04:22Z allan $
+# $Id: PKGBUILD 201554 2013-12-15 06:41:28Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=mpfr
_pkgver=3.1.2
-_patchlevel=p3
+_patchlevel=p5
pkgver=${_pkgver}.${_patchlevel}
#pkgver=${_pkgver}
-pkgrel=2
+pkgrel=1
pkgdesc="Multiple-precision floating-point library"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.mpfr.org/"
@@ -18,7 +18,7 @@ source=(http://www.mpfr.org/mpfr-current/mpfr-${_pkgver}.tar.xz{,.asc}
mpfr-${_pkgver}-${_patchlevel}.patch)
md5sums=('e3d203d188b8fe60bb6578dd3152e05c'
'SKIP'
- 'd22c975afc8599b06dd0d6c1128ac078')
+ 'e19c1d8db2cde4991ab52c8c20d16185')
build() {
cd "${srcdir}/${pkgname}-${_pkgver}"
diff --git a/core/mpfr/mpfr-3.1.2-p3.patch b/core/mpfr/mpfr-3.1.2-p5.patch
index 0339944b6..d9962a637 100644
--- a/core/mpfr/mpfr-3.1.2-p3.patch
+++ b/core/mpfr/mpfr-3.1.2-p5.patch
@@ -777,3 +777,129 @@ diff -Naurd mpfr-3.1.2-a/tests/tset_ld.c mpfr-3.1.2-b/tests/tset_ld.c
return 1;
LONGDOUBLE_NAN_ACTION (d, goto yes);
return 0;
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES 2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/PATCHES 2013-11-15 00:51:49.323334999 +0000
+@@ -0,0 +1 @@
++printf-alt0
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION 2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/VERSION 2013-11-15 00:51:49.323334999 +0000
+@@ -1 +1 @@
+-3.1.2-p3
++3.1.2-p4
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h 2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/src/mpfr.h 2013-11-15 00:51:49.323334999 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p3"
++#define MPFR_VERSION_STRING "3.1.2-p4"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+diff -Naurd mpfr-3.1.2-a/src/vasprintf.c mpfr-3.1.2-b/src/vasprintf.c
+--- mpfr-3.1.2-a/src/vasprintf.c 2013-03-13 15:37:37.000000000 +0000
++++ mpfr-3.1.2-b/src/vasprintf.c 2013-11-15 00:51:49.267334408 +0000
+@@ -1040,7 +1040,7 @@
+ }
+
+ /* Determine the different parts of the string representation of the regular
+- number P when SPEC.SPEC is 'e', 'E', 'g', or 'G'.
++ number P when spec.spec is 'e', 'E', 'g', or 'G'.
+ DEC_INFO contains the previously computed exponent and string or is NULL.
+
+ return -1 if some field > INT_MAX */
+@@ -1167,7 +1167,7 @@
+ }
+
+ /* Determine the different parts of the string representation of the regular
+- number P when SPEC.SPEC is 'f', 'F', 'g', or 'G'.
++ number P when spec.spec is 'f', 'F', 'g', or 'G'.
+ DEC_INFO contains the previously computed exponent and string or is NULL.
+
+ return -1 if some field of number_parts is greater than INT_MAX */
+@@ -1559,7 +1559,7 @@
+ /* fractional part */
+ {
+ np->point = MPFR_DECIMAL_POINT;
+- np->fp_trailing_zeros = (spec.spec == 'g' && spec.spec == 'G') ?
++ np->fp_trailing_zeros = (spec.spec == 'g' || spec.spec == 'G') ?
+ spec.prec - 1 : spec.prec;
+ }
+ else if (spec.alt)
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c 2013-11-15 00:51:49.211333830 +0000
++++ mpfr-3.1.2-b/src/version.c 2013-11-15 00:51:49.323334999 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.2-p3";
++ return "3.1.2-p4";
+ }
+diff -Naurd mpfr-3.1.2-a/tests/tsprintf.c mpfr-3.1.2-b/tests/tsprintf.c
+--- mpfr-3.1.2-a/tests/tsprintf.c 2013-03-13 15:37:44.000000000 +0000
++++ mpfr-3.1.2-b/tests/tsprintf.c 2013-11-15 00:51:49.267334408 +0000
+@@ -456,10 +456,16 @@
+ check_sprintf ("1.999900 ", "%-#10.7RG", x);
+ check_sprintf ("1.9999 ", "%-10.7RG", x);
+ mpfr_set_ui (x, 1, MPFR_RNDN);
++ check_sprintf ("1.", "%#.1Rg", x);
++ check_sprintf ("1. ", "%-#5.1Rg", x);
++ check_sprintf (" 1.0", "%#5.2Rg", x);
+ check_sprintf ("1.00000000000000000000000000000", "%#.30Rg", x);
+ check_sprintf ("1", "%.30Rg", x);
+ mpfr_set_ui (x, 0, MPFR_RNDN);
+- check_sprintf ("0.000000000000000000000000000000", "%#.30Rg", x);
++ check_sprintf ("0.", "%#.1Rg", x);
++ check_sprintf ("0. ", "%-#5.1Rg", x);
++ check_sprintf (" 0.0", "%#5.2Rg", x);
++ check_sprintf ("0.00000000000000000000000000000", "%#.30Rg", x);
+ check_sprintf ("0", "%.30Rg", x);
+
+ /* following tests with precision 53 bits */
+diff -Naurd mpfr-3.1.2-a/PATCHES mpfr-3.1.2-b/PATCHES
+--- mpfr-3.1.2-a/PATCHES 2013-12-01 11:07:49.575329762 +0000
++++ mpfr-3.1.2-b/PATCHES 2013-12-01 11:07:49.751331625 +0000
+@@ -0,0 +1 @@
++custom_init_set
+diff -Naurd mpfr-3.1.2-a/VERSION mpfr-3.1.2-b/VERSION
+--- mpfr-3.1.2-a/VERSION 2013-12-01 11:07:49.571329714 +0000
++++ mpfr-3.1.2-b/VERSION 2013-12-01 11:07:49.747331585 +0000
+@@ -1 +1 @@
+-3.1.2-p4
++3.1.2-p5
+diff -Naurd mpfr-3.1.2-a/src/mpfr.h mpfr-3.1.2-b/src/mpfr.h
+--- mpfr-3.1.2-a/src/mpfr.h 2013-12-01 11:07:49.571329714 +0000
++++ mpfr-3.1.2-b/src/mpfr.h 2013-12-01 11:07:49.747331585 +0000
+@@ -27,7 +27,7 @@
+ #define MPFR_VERSION_MAJOR 3
+ #define MPFR_VERSION_MINOR 1
+ #define MPFR_VERSION_PATCHLEVEL 2
+-#define MPFR_VERSION_STRING "3.1.2-p4"
++#define MPFR_VERSION_STRING "3.1.2-p5"
+
+ /* Macros dealing with MPFR VERSION */
+ #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
+@@ -861,7 +861,7 @@
+ _t = (mpfr_kind_t) _k; \
+ _s = 1; \
+ } else { \
+- _t = (mpfr_kind_t) -k; \
++ _t = (mpfr_kind_t) - _k; \
+ _s = -1; \
+ } \
+ _e = _t == MPFR_REGULAR_KIND ? (e) : \
+diff -Naurd mpfr-3.1.2-a/src/version.c mpfr-3.1.2-b/src/version.c
+--- mpfr-3.1.2-a/src/version.c 2013-12-01 11:07:49.575329762 +0000
++++ mpfr-3.1.2-b/src/version.c 2013-12-01 11:07:49.747331585 +0000
+@@ -25,5 +25,5 @@
+ const char *
+ mpfr_get_version (void)
+ {
+- return "3.1.2-p4";
++ return "3.1.2-p5";
+ }
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index c08a466a4..8f1f2c7ab 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191387 2013-07-25 11:24:46Z tpowa $
+# $Id: PKGBUILD 200306 2013-11-25 08:16:32Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -6,8 +6,8 @@
# Contributor: Marco Lima <cipparello gmail com>
pkgname=nfs-utils
-pkgver=1.2.8
-pkgrel=9
+pkgver=1.2.9
+pkgrel=1
pkgdesc="Support programs for Network File Systems"
arch=('i686' 'x86_64' 'mips64el')
url='http://nfs.sourceforge.net'
@@ -38,7 +38,7 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
install=nfs-utils.install
optdepends=('sqlite: for nfsdcltrack usage')
-md5sums=('6e7d97de51e428a0b8698c16ca23db77'
+md5sums=('18869d16db3f49c053f8c68eba3fe2e0'
'f73f197a16b02c3e248488ec35c4cf43'
'9cef69bc686cc5dcac23fbb51450747d'
'ff585faf410a62c4333a027c50b56bae'
diff --git a/core/openldap/PKGBUILD b/core/openldap/PKGBUILD
index 2a8f2126d..d3e96081f 100644
--- a/core/openldap/PKGBUILD
+++ b/core/openldap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198764 2013-11-03 16:44:35Z eric $
+# $Id: PKGBUILD 200710 2013-12-02 22:13:10Z eric $
# Maintainer:
pkgbase=openldap
pkgname=('libldap' 'openldap')
-pkgver=2.4.37
+pkgver=2.4.38
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.openldap.org/"
@@ -11,7 +11,7 @@ license=('custom')
makedepends=('libltdl' 'libsasl' 'e2fsprogs' 'util-linux' 'chrpath')
source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
slapd.service slapd.tmpfiles openldap-ntlm.patch)
-sha1sums=('179b3d51f7569cca768384fee92aa43c8a82c5d9'
+sha1sums=('b15132075661761dca822270cdbeddc3c49a6193'
'2441815efbfa01ad7a1d39068e5503b53d1d04b0'
'59241a813d7508294e4ef1cec3bfe1f5495e109d'
'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
diff --git a/core/openssh/PKGBUILD b/core/openssh/PKGBUILD
index 7f64d3b89..7749fca8a 100644
--- a/core/openssh/PKGBUILD
+++ b/core/openssh/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194510 2013-09-17 03:04:46Z bisson $
+# $Id: PKGBUILD 199078 2013-11-08 16:53:32Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=openssh
-pkgver=6.3p1
+pkgver=6.4p1
pkgrel=1
pkgdesc='Free version of the SSH connectivity tools'
url='http://www.openssh.org/portable.html'
@@ -20,7 +20,7 @@ source=("ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/${pkgname}-${pkgver}
'sshd.service'
'sshd.socket'
'sshd.pam')
-sha1sums=('70845ca79474258cab29dbefae13d93e41a83ccb'
+sha1sums=('cf5fe0eb118d7e4f9296fbc5d6884965885fc55d'
'6df5be396f8c593bb511a249a1453294d18a01a6'
'6a0ff3305692cf83aca96e10f3bb51e1c26fccda'
'ec49c6beba923e201505f5669cea48cad29014db'
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 033396bc8..b5a2f6e9c 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197168 2013-10-23 13:51:53Z pierre $
+# $Id: PKGBUILD 199034 2013-11-07 14:18:31Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=openssl
@@ -6,7 +6,7 @@ _ver=1.0.1e
# use a pacman compatible version scheme
pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}}
#pkgver=$_ver
-pkgrel=4
+pkgrel=5
pkgdesc='The Open Source toolkit for Secure Sockets Layer and Transport Layer Security'
arch=('i686' 'x86_64' 'mips64el')
url='https://www.openssl.org'
@@ -19,12 +19,16 @@ source=("https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz"
"https://www.openssl.org/source/${pkgname}-${_ver}.tar.gz.asc"
'no-rpath.patch'
'ca-dir.patch'
- 'openssl-1.0.1e-fix_pod_syntax-1.patch')
+ 'openssl-1.0.1e-fix_pod_syntax-1.patch'
+ 'openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch'
+ 'openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch')
md5sums=('66bf6f10f060d561929de96f9dfe5b8c'
'SKIP'
'dc78d3d06baffc16217519242ce92478'
'3bf51be3a1bbd262be46dc619f92aa90'
- '88d3bef4bbdc640b0412315d8d347bdf')
+ '88d3bef4bbdc640b0412315d8d347bdf'
+ 'ae7848bb152b8834ceff30c8c480d422'
+ 'c5cc62a47cef72f4e5ad119a88e97ae4')
prepare() {
cd $srcdir/$pkgname-$_ver
@@ -35,6 +39,12 @@ prepare() {
patch -p0 -i $srcdir/ca-dir.patch
patch -p1 -i $srcdir/openssl-1.0.1e-fix_pod_syntax-1.patch
+ # OpenSSL 1.0.0k, 1.0.1.d, 1.0.1e fail handshake with DTLS1_BAD_VER
+ # http://rt.openssl.org/Ticket/Display.html?id=2984
+ patch -p1 -i $srcdir/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch
+ # Communication problems with 1.0.1e
+ # http://rt.openssl.org/Ticket/Display.html?id=3002
+ patch -p1 -i $srcdir/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch
}
build() {
diff --git a/core/openssl/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch b/core/openssl/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch
new file mode 100644
index 000000000..5a88220c3
--- /dev/null
+++ b/core/openssl/openssl-1.0.1-Check-DTLS_BAD_VER-for-version-number.patch
@@ -0,0 +1,31 @@
+From 9fe4603b8245425a4c46986ed000fca054231253 Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Tue, 12 Feb 2013 14:55:32 +0000
+Subject: Check DTLS_BAD_VER for version number.
+
+The version check for DTLS1_VERSION was redundant as
+DTLS1_VERSION > TLS1_1_VERSION, however we do need to
+check for DTLS1_BAD_VER for compatibility.
+
+PR:2984
+(cherry picked from commit d980abb22e22661e98e5cee33d760ab0c7584ecc)
+---
+ ssl/s3_cbc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ssl/s3_cbc.c b/ssl/s3_cbc.c
+index 02edf3f..443a31e 100644
+--- a/ssl/s3_cbc.c
++++ b/ssl/s3_cbc.c
+@@ -148,7 +148,7 @@ int tls1_cbc_remove_padding(const SSL* s,
+ unsigned padding_length, good, to_check, i;
+ const unsigned overhead = 1 /* padding length byte */ + mac_size;
+ /* Check if version requires explicit IV */
+- if (s->version >= TLS1_1_VERSION || s->version == DTLS1_VERSION)
++ if (s->version >= TLS1_1_VERSION || s->version == DTLS1_BAD_VER)
+ {
+ /* These lengths are all public so we can test them in
+ * non-constant time.
+--
+1.8.4.2
+
diff --git a/core/openssl/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch b/core/openssl/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch
new file mode 100644
index 000000000..f1a251227
--- /dev/null
+++ b/core/openssl/openssl-1.0.1-e_aes_cbc_hmac_sha1.c-fix-rare-bad-record-mac-on-AES.patch
@@ -0,0 +1,32 @@
+From 9ab3ce124616cb12bd39c6aa1e1bde0f46969b29 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Mon, 18 Mar 2013 19:29:41 +0100
+Subject: e_aes_cbc_hmac_sha1.c: fix rare bad record mac on AES-NI plaforms.
+
+PR: 3002
+(cherry picked from commit 5c60046553716fcf160718f59160493194f212dc)
+---
+ crypto/evp/e_aes_cbc_hmac_sha1.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c
+index 483e04b..fb2c884 100644
+--- a/crypto/evp/e_aes_cbc_hmac_sha1.c
++++ b/crypto/evp/e_aes_cbc_hmac_sha1.c
+@@ -328,10 +328,11 @@ static int aesni_cbc_hmac_sha1_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
+
+ if (res!=SHA_CBLOCK) continue;
+
+- mask = 0-((inp_len+8-j)>>(sizeof(j)*8-1));
++ /* j is not incremented yet */
++ mask = 0-((inp_len+7-j)>>(sizeof(j)*8-1));
+ data->u[SHA_LBLOCK-1] |= bitlen&mask;
+ sha1_block_data_order(&key->md,data,1);
+- mask &= 0-((j-inp_len-73)>>(sizeof(j)*8-1));
++ mask &= 0-((j-inp_len-72)>>(sizeof(j)*8-1));
+ pmac->u[0] |= key->md.h0 & mask;
+ pmac->u[1] |= key->md.h1 & mask;
+ pmac->u[2] |= key->md.h2 & mask;
+--
+1.8.4.2
+
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index e69405d48..cd7564297 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -1,34 +1,25 @@
-# $Id: PKGBUILD 197835 2013-10-30 11:06:16Z allan $
+# $Id: PKGBUILD 199780 2013-11-16 09:28:42Z thomas $
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgname=openvpn
pkgver=2.3.2
-pkgrel=1
+pkgrel=2
pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
arch=(i686 x86_64 'mips64el')
url="http://openvpn.net/index.php/open-source.html"
depends=('openssl' 'lzo2' 'iproute2')
makedepends=('systemd')
license=('custom')
-backup=(usr/share/openvpn/easy-rsa/vars
- usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf)
+install=openvpn.install
source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc
- http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz
- http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz.asc
- openvpn@.service
- openvpn-2.3.0-fix-systemd-ask-password-path.patch)
+ openvpn@.service)
md5sums=('06e5f93dbf13f2c19647ca15ffc23ac1'
'SKIP'
- 'fbf818b6e1f212e77b9ce0e6d92584a1'
- 'SKIP'
- '57ef7353ba2c28c04dfc387c3ca77a4f'
- 'e1bd1523e38745e948c710db1a330bb1')
+ '71fab8d1c2aa3a1f2609e259eaaf88b3')
build() {
- cd $srcdir/$pkgname-$pkgver
- patch -p0 -i $srcdir/openvpn-2.3.0-fix-systemd-ask-password-path.patch
- # Build openvpn
+ cd "${srcdir}"/$pkgname-$pkgver
CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
--prefix=/usr \
--sbindir=/usr/bin \
@@ -37,29 +28,22 @@ build() {
--enable-iproute2 \
--enable-systemd
make
- # Build easy-rsa
- cd $srcdir/easy-rsa-2.2.0_master
- ./configure --prefix=/usr --with-easyrsadir=/usr/share/openvpn/easy-rsa
- make
}
package() {
- cd $srcdir/$pkgname-$pkgver
+ cd "${srcdir}"/$pkgname-$pkgver
# Install openvpn
- make DESTDIR=$pkgdir install
- install -d -m755 $pkgdir/etc/openvpn
+ make DESTDIR="${pkgdir}" install
+ install -d -m755 "${pkgdir}"/etc/openvpn
# Install examples
- install -d -m755 $pkgdir/usr/share/openvpn
- cp -r sample/sample-config-files $pkgdir/usr/share/openvpn/examples
+ install -d -m755 "${pkgdir}"/usr/share/openvpn
+ cp -r sample/sample-config-files "${pkgdir}"/usr/share/openvpn/examples
# Install license
- install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+ install -d -m755 "${pkgdir}"/usr/share/licenses/${pkgname}/
+ ln -sf /usr/share/doc/${pkgname}/{COPYING,COPYRIGHT.GPL} "${pkgdir}"/usr/share/licenses/${pkgname}/
# Install contrib
- install -d -m755 $pkgdir/usr/share/openvpn/contrib
- cp -r contrib $pkgdir/usr/share/openvpn
- # Install easy-rsa
- cd $srcdir/easy-rsa-2.2.0_master
- make install DESTDIR=$pkgdir
- rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf
- # Install rc scripts
- install -D -m644 $srcdir/openvpn@.service $pkgdir/usr/lib/systemd/system/openvpn@.service
+ install -d -m755 "${pkgdir}"/usr/share/openvpn/contrib
+ cp -r contrib "${pkgdir}"/usr/share/openvpn
+ # Install systemd service
+ install -D -m644 "${srcdir}"/openvpn@.service "${pkgdir}"/usr/lib/systemd/system/openvpn@.service
}
diff --git a/core/openvpn/openvpn-2.3.0-fix-systemd-ask-password-path.patch b/core/openvpn/openvpn-2.3.0-fix-systemd-ask-password-path.patch
deleted file mode 100644
index 77291727a..000000000
--- a/core/openvpn/openvpn-2.3.0-fix-systemd-ask-password-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/openvpn/console.c.orig 2013-01-30 09:42:57.480257300 +0100
-+++ src/openvpn/console.c 2013-01-30 09:43:07.446179811 +0100
-@@ -162,7 +162,7 @@ get_console_input_systemd (const char *p
- struct argv argv;
-
- argv_init (&argv);
-- argv_printf (&argv, "/bin/systemd-ask-password");
-+ argv_printf (&argv, "/usr/bin/systemd-ask-password");
- argv_printf_cat (&argv, "%s", prompt);
-
- if ((std_out = openvpn_popen (&argv, NULL)) < 0) {
diff --git a/core/openvpn/openvpn.install b/core/openvpn/openvpn.install
new file mode 100644
index 000000000..5fd3285cb
--- /dev/null
+++ b/core/openvpn/openvpn.install
@@ -0,0 +1,8 @@
+## arg 1: the new package version
+## arg 2: the old package version
+post_upgrade() {
+ if [ $(vercmp 2.3.2-1 $2) -ge 0 ]; then
+ echo ">>> easy-rsa has moved into its own package. Run:"
+ echo ">>> # pacman -S easy-rsa"
+ fi
+}
diff --git a/core/openvpn/openvpn@.service b/core/openvpn/openvpn@.service
index 63fdf0e36..de456266f 100644
--- a/core/openvpn/openvpn@.service
+++ b/core/openvpn/openvpn@.service
@@ -1,6 +1,5 @@
[Unit]
Description=OpenVPN connection to %i
-After=network.target
[Service]
Type=forking
diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD
index 35cc57f83..8b86dc848 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 197154 2013-10-23 13:04:19Z allan $
+# $Id: PKGBUILD 202198 2013-12-19 09:22:02Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
pkgname=pcre
-pkgver=8.33
-pkgrel=2
+pkgver=8.34
+pkgrel=1
pkgdesc="A library that implements Perl 5-style regular expressions"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.pcre.org/"
license=('BSD')
depends=('gcc-libs')
source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('21514018448ac10062ece7a668fca949'
+md5sums=('5439e321351bddd5533551bbce128d07'
'SKIP')
build() {
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD
index b55947c1a..83e61d1e2 100644
--- a/core/procps-ng/PKGBUILD
+++ b/core/procps-ng/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 197838 2013-10-30 11:06:38Z allan $
+# $Id: PKGBUILD 201333 2013-12-09 03:38:18Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Eric Bélanger <eric@archlinux.org>
pkgname=procps-ng
-pkgver=3.3.8
-pkgrel=3
+pkgver=3.3.9
+pkgrel=1
pkgdesc='Utilities for monitoring your system and its processes'
-url='http://gitorious.org/procps'
+url='http://sourceforge.net/projects/procps-ng/'
license=('GPL' 'LGPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('ncurses')
source=("http://downloads.sourceforge.net/project/${pkgname}/Production/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('4fa6a373f969989a9e490df5eb49a2df62eca19a')
+sha1sums=('088c77631745fc75ee41fc29c254a4069be4869a')
groups=('base')
-conflicts=('procps')
-provides=('procps')
-replaces=('procps')
+conflicts=('procps' 'sysvinit-tools')
+provides=('procps' 'sysvinit-tools')
+replaces=('procps' 'sysvinit-tools')
install=install
@@ -30,7 +30,7 @@ build() {
--libdir=/usr/lib \
--bindir=/usr/bin \
--sbindir=/usr/bin \
- --disable-static
+
make
}
diff --git a/core/s-nail/PKGBUILD b/core/s-nail/PKGBUILD
index f626cd410..222e1b37d 100644
--- a/core/s-nail/PKGBUILD
+++ b/core/s-nail/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197187 2013-10-23 17:10:51Z bisson $
+# $Id: PKGBUILD 202657 2013-12-23 17:15:07Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s@arch@gmail.com>
# Contributor: Andreas Wagner <Andreas.Wagner@em.uni-frankfurt.de>
pkgname=s-nail
-pkgver=14.4.5
+pkgver=14.5
pkgrel=1
pkgdesc='Mail processing system with a command syntax reminiscent of ed'
url='http://sourceforge.net/projects/s-nail/'
@@ -14,7 +14,7 @@ arch=('i686' 'x86_64' 'mips64el')
depends=('openssl')
optdepends=('smtp-forwarder: for sending mail')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver//./_}.tar.gz")
-sha1sums=('cc972ddacdf9593739289eb0589ad0939255dfd7')
+sha1sums=('0c7341f7404f7113a3c4ed915adfed720379e8e7')
groups=('base')
backup=('etc/mail.rc')
@@ -22,11 +22,6 @@ replaces=('mailx' 'mailx-heirloom' 'heirloom-mailx')
provides=('mailx' 'mailx-heirloom' 'heirloom-mailx')
conflicts=('mailx' 'mailx-heirloom' 'heirloom-mailx')
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's/s-nail/mail/g' -i cc-test.sh
-}
-
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
make \
@@ -36,12 +31,9 @@ build() {
MAILSPOOL=/var/spool/mail \
SID= NAIL=mail \
config
- make \
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}" \
- build
-}
+ make build
+}
check() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch b/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
new file mode 100644
index 000000000..3cdbcf02d
--- /dev/null
+++ b/core/systemd/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
@@ -0,0 +1,29 @@
+From 7f5806d7095a197e4788a7803642831beec295bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 00:32:33 +0200
+Subject: [PATCH 1/7] fstab-generator: When parsing the root= cmdline option,
+ set FsckPassNo to 1
+
+[tomegun: without this we would never fsck the rootfs if it was directly
+mounted 'rw' from the initrd. We now risk fsck'ing it twice in the case it
+is mounted 'ro', so that should be addressed in a separate patch.]
+---
+ src/fstab-generator/fstab-generator.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index 9e7d55d..a7536f8 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -442,7 +442,7 @@ static int parse_new_root_from_proc_cmdline(void) {
+ }
+
+ log_debug("Found entry what=%s where=/sysroot type=%s", what, type);
+- r = add_mount(what, "/sysroot", type, opts, 0, noauto, nofail, false,
++ r = add_mount(what, "/sysroot", type, opts, 1, noauto, nofail, false,
+ SPECIAL_INITRD_ROOT_FS_TARGET, "/proc/cmdline");
+
+ return (r < 0) ? r : 0;
+--
+1.8.5.1
+
diff --git a/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch b/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
new file mode 100644
index 000000000..9a92209e3
--- /dev/null
+++ b/core/systemd/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
@@ -0,0 +1,36 @@
+From 95842c3f552072c9d153b3c0200f1bbb5bc3c2fb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Sun, 15 Dec 2013 12:18:00 +0100
+Subject: [PATCH] login: Don't stop a running user manager from
+ garbage-collecting the user.
+
+With the current logic, a user will never be garbage-collected, since its
+manager will always be around. Change the logic such that a user is
+garbage-collected when it has no sessions and linger is disabled.
+
+This is a backport from the master branch to 208 which also backports
+the improved handling of running slice and service jobs.
+---
+ src/login/logind-user.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/src/login/logind-user.c b/src/login/logind-user.c
+index adbe638..e2fce5c 100644
+--- a/src/login/logind-user.c
++++ b/src/login/logind-user.c
+@@ -629,12 +629,6 @@ int user_check_gc(User *u, bool drop_not_started) {
+ if (u->slice_job || u->service_job)
+ return 1;
+
+- if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0)
+- return 1;
+-
+- if (u->service && manager_unit_is_active(u->manager, u->service) != 0)
+- return 1;
+-
+ return 0;
+ }
+
+--
+1.8.5.1
+
diff --git a/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch b/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
new file mode 100644
index 000000000..57edf64b4
--- /dev/null
+++ b/core/systemd/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
@@ -0,0 +1,102 @@
+From 64e70e4b86d3f732d3513189312f6220d1d5cfbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:44 +0200
+Subject: [PATCH 2/7] fstab-generator: Generate explicit dependencies on
+ systemd-fsck@.service instead of using FsckPassNo
+
+[tomegun:
+ * order all fsck instances after fsck-root
+ * check for OOM
+ * added notes in the manpages]
+---
+ man/systemd-fsck@.service.xml | 3 ++-
+ man/systemd-fstab-generator.xml | 5 +++++
+ src/fstab-generator/fstab-generator.c | 21 +++++++++++++++++----
+ units/systemd-fsck@.service.in | 2 +-
+ 4 files changed, 25 insertions(+), 6 deletions(-)
+
+diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
+index e934352..17bd1c0 100644
+--- a/man/systemd-fsck@.service.xml
++++ b/man/systemd-fsck@.service.xml
+@@ -62,7 +62,8 @@
+ system
+ check. <filename>systemd-fsck-root.service</filename> is
+ responsible for file system checks on the root
+- file system.</para>
++ file system. The root file system check is performed
++ before the other file systems.</para>
+
+ <para><filename>systemd-fsck</filename> will
+ forward file system checking progress to the
+diff --git a/man/systemd-fstab-generator.xml b/man/systemd-fstab-generator.xml
+index 9ca16c7..740db8f 100644
+--- a/man/systemd-fstab-generator.xml
++++ b/man/systemd-fstab-generator.xml
+@@ -61,6 +61,11 @@
+ reloaded. This will instantiate mount and swap units
+ as necessary.</para>
+
++ <para>The <term><varname>passno</varname></term> field
++ is treated like a simlpe boolean, and the ordering information
++ is discarded. However, the root filesystem is checked
++ before all the other filesystems.</para>
++
+ <para>See
+ <citerefentry><refentrytitle>systemd.mount</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ and
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index a7536f8..77247de 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -209,17 +209,30 @@ static int add_mount(
+ "Before=%s\n",
+ post);
+
++ if (passno > 0) {
++ _cleanup_free_ char *fsck = NULL;
++
++ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++ if (!fsck)
++ return log_oom();
++
++ fprintf(f,
++ "Requires=%s\n"
++ "After=%s\n",
++ fsck,
++ fsck);
++ }
++
++
+ fprintf(f,
+ "\n"
+ "[Mount]\n"
+ "What=%s\n"
+ "Where=%s\n"
+- "Type=%s\n"
+- "FsckPassNo=%i\n",
++ "Type=%s\n",
+ what,
+ where,
+- type,
+- passno);
++ type);
+
+ if (!isempty(opts) &&
+ !streq(opts, "defaults"))
+diff --git a/units/systemd-fsck@.service.in b/units/systemd-fsck@.service.in
+index e229cdc..c12efa8 100644
+--- a/units/systemd-fsck@.service.in
++++ b/units/systemd-fsck@.service.in
+@@ -10,7 +10,7 @@ Description=File System Check on %f
+ Documentation=man:systemd-fsck@.service(8)
+ DefaultDependencies=no
+ BindsTo=%i.device
+-After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
++After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service
+ Before=shutdown.target
+
+ [Service]
+--
+1.8.5.1
+
diff --git a/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch b/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
new file mode 100644
index 000000000..c1b3aa049
--- /dev/null
+++ b/core/systemd/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
@@ -0,0 +1,55 @@
+From 4c8bda2442bfc6d84a5deb241dc29efcb81bf3af Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:45 +0200
+Subject: [PATCH 3/7] gpt-auto-generator: Generate explicit dependencies on
+ systemd-fsck@.service instead of using FsckPassNo
+
+[tomegun: check for OOM]
+---
+ src/gpt-auto-generator/gpt-auto-generator.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
+index fae4b71..25440e7 100644
+--- a/src/gpt-auto-generator/gpt-auto-generator.c
++++ b/src/gpt-auto-generator/gpt-auto-generator.c
+@@ -182,7 +182,7 @@ static int add_swap(const char *path, const char *fstype) {
+ }
+
+ static int add_home(const char *path, const char *fstype) {
+- _cleanup_free_ char *unit = NULL, *lnk = NULL;
++ _cleanup_free_ char *unit = NULL, *lnk = NULL, *fsck = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+
+ if (dir_is_empty("/home") <= 0)
+@@ -200,19 +200,23 @@ static int add_home(const char *path, const char *fstype) {
+ return -errno;
+ }
+
++ fsck = unit_name_from_path_instance("systemd-fsck", path, ".service");
++ if (!fsck)
++ return log_oom();
++
+ fprintf(f,
+ "# Automatically generated by systemd-gpt-auto-generator\n\n"
+ "[Unit]\n"
+ "DefaultDependencies=no\n"
+- "After=" SPECIAL_LOCAL_FS_PRE_TARGET "\n"
++ "Requires=%s\n"
++ "After=" SPECIAL_LOCAL_FS_PRE_TARGET " %s\n"
+ "Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
+ "Before=" SPECIAL_UMOUNT_TARGET " " SPECIAL_LOCAL_FS_TARGET "\n\n"
+ "[Mount]\n"
+ "What=%s\n"
+ "Where=/home\n"
+- "Type=%s\n"
+- "FsckPassNo=2\n",
+- path, fstype);
++ "Type=%s\n",
++ fsck, fsck, path, fstype);
+
+ fflush(f);
+ if (ferror(f)) {
+--
+1.8.5.1
+
diff --git a/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch b/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
new file mode 100644
index 000000000..90ff5456f
--- /dev/null
+++ b/core/systemd/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
@@ -0,0 +1,22 @@
+From 4952a9beff339b75641a7a84c226c11d6bd680c4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
+Date: Mon, 30 Sep 2013 01:34:46 +0200
+Subject: [PATCH 4/7] Remove FsckPassNo from systemd-fsck-root.service
+
+---
+ units/systemd-fsck-root.service.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
+index 4388314..4162983 100644
+--- a/units/systemd-fsck-root.service.in
++++ b/units/systemd-fsck-root.service.in
+@@ -19,5 +19,4 @@ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=@rootlibexecdir@/systemd-fsck
+ StandardOutput=journal+console
+-FsckPassNo=1
+ TimeoutSec=0
+--
+1.8.5.1
+
diff --git a/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch b/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch
new file mode 100644
index 000000000..9758c4676
--- /dev/null
+++ b/core/systemd/0005-mount-service-drop-FsckPassNo-support.patch
@@ -0,0 +1,364 @@
+From accdd018ede77ef1c057775396c18c73406cbcb4 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 5 Oct 2013 17:28:09 +0200
+Subject: [PATCH 5/7] mount/service: drop FsckPassNo support
+
+We now treat passno as boleans in the generators, and don't need this any more. fsck itself
+is able to sequentialize checks on the same local media, so in the common case the ordering
+is redundant.
+
+It is still possible to force an order by using .d fragments, in case that is desired.
+---
+ TODO | 4 ---
+ man/systemd.mount.xml | 22 ---------------
+ man/systemd.service.xml | 27 -------------------
+ src/core/load-fragment-gperf.gperf.m4 | 2 --
+ src/core/load-fragment.c | 30 ---------------------
+ src/core/load-fragment.h | 1 -
+ src/core/mount.c | 32 +---------------------
+ src/core/mount.h | 1 -
+ src/core/service.c | 51 -----------------------------------
+ src/core/service.h | 2 --
+ 10 files changed, 1 insertion(+), 171 deletions(-)
+
+diff --git a/TODO b/TODO
+index 29a76ef..f0060d9 100644
+--- a/TODO
++++ b/TODO
+@@ -84,8 +84,6 @@ Features:
+
+ * ensure scope units may be started only a single time
+
+-* document that in instead of FsckPassNo= people should just add a manual dep to systemd-fsck@.service to their mount units.
+-
+ * better error message if you run systemctl without systemd running
+
+ * systemctl status output should should include list of triggering units and their status
+@@ -562,8 +560,6 @@ Features:
+
+ * when breaking cycles drop sysv services first, then services from /run, then from /etc, then from /usr
+
+-* move passno parsing to fstab generator
+-
+ * automount: implement expire:
+ - set superblock timeout AUTOFS_DEV_IOCTL_TIMEOUT_CMD
+ - periodically run AUTOFS_DEV_IOCTL_EXPIRE_CMD
+diff --git a/man/systemd.mount.xml b/man/systemd.mount.xml
+index 48af1ca..217289a 100644
+--- a/man/systemd.mount.xml
++++ b/man/systemd.mount.xml
+@@ -273,28 +273,6 @@
+ </refsect1>
+
+ <refsect1>
+- <title>Compatibility Options</title>
+-
+- <para>The following option is also available in the
+- <literal>[Mount]</literal> section, but exists purely
+- for compatibility reasons and should not be used in
+- newly written mount files.</para>
+-
+- <variablelist class='unit-directives'>
+- <varlistentry>
+- <term><varname>FsckPassNo=</varname></term>
+-
+- <listitem><para>The pass number for
+- the file system checking service for
+- this mount. See
+- <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+- for more information on this setting.
+- </para></listitem>
+- </varlistentry>
+- </variablelist>
+- </refsect1>
+-
+- <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+diff --git a/man/systemd.service.xml b/man/systemd.service.xml
+index 81a4078..b1e3af2 100644
+--- a/man/systemd.service.xml
++++ b/man/systemd.service.xml
+@@ -970,33 +970,6 @@
+ range 0-99.</para></listitem>
+ </varlistentry>
+
+- <varlistentry>
+- <term><varname>FsckPassNo=</varname></term>
+- <listitem><para>Set the fsck passno
+- priority to use to order this service
+- in relation to other file system
+- checking services. This option is only
+- necessary to fix ordering in relation
+- to fsck jobs automatically created for
+- all <filename>/etc/fstab</filename>
+- entries with a value in the fs_passno
+- column > 0. As such it should only be
+- used as option for fsck
+- services. Almost always it is a better
+- choice to add explicit ordering
+- directives via
+- <varname>After=</varname> or
+- <varname>Before=</varname>,
+- instead. For more details see
+- <citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>. If
+- used, pass an integer value in the
+- same range as
+- <filename>/etc/fstab</filename>'s
+- fs_passno column. See
+- <citerefentry><refentrytitle>fstab</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+- for details.</para></listitem>
+- </varlistentry>
+-
+ </variablelist>
+ </refsect1>
+
+diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
+index 31fb7bc..e3025d2 100644
+--- a/src/core/load-fragment-gperf.gperf.m4
++++ b/src/core/load-fragment-gperf.gperf.m4
+@@ -173,7 +173,6 @@ Service.NonBlocking, config_parse_bool, 0,
+ Service.BusName, config_parse_unit_string_printf, 0, offsetof(Service, bus_name)
+ Service.NotifyAccess, config_parse_notify_access, 0, offsetof(Service, notify_access)
+ Service.Sockets, config_parse_service_sockets, 0, 0
+-Service.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Service, fsck_passno)
+ EXEC_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+ CGROUP_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+ KILL_CONTEXT_CONFIG_ITEMS(Service)m4_dnl
+@@ -225,7 +224,6 @@ Mount.What, config_parse_string, 0,
+ Mount.Where, config_parse_path, 0, offsetof(Mount, where)
+ Mount.Options, config_parse_string, 0, offsetof(Mount, parameters_fragment.options)
+ Mount.Type, config_parse_string, 0, offsetof(Mount, parameters_fragment.fstype)
+-Mount.FsckPassNo, config_parse_fsck_passno, 0, offsetof(Mount, parameters_fragment.passno)
+ Mount.TimeoutSec, config_parse_sec, 0, offsetof(Mount, timeout_usec)
+ Mount.DirectoryMode, config_parse_mode, 0, offsetof(Mount, directory_mode)
+ EXEC_CONTEXT_CONFIG_ITEMS(Mount)m4_dnl
+diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
+index fb7efca..4067930 100644
+--- a/src/core/load-fragment.c
++++ b/src/core/load-fragment.c
+@@ -1033,35 +1033,6 @@ int config_parse_sysv_priority(const char *unit,
+ }
+ #endif
+
+-int config_parse_fsck_passno(const char *unit,
+- const char *filename,
+- unsigned line,
+- const char *section,
+- const char *lvalue,
+- int ltype,
+- const char *rvalue,
+- void *data,
+- void *userdata) {
+-
+- int *passno = data;
+- int i, r;
+-
+- assert(filename);
+- assert(lvalue);
+- assert(rvalue);
+- assert(data);
+-
+- r = safe_atoi(rvalue, &i);
+- if (r || i < 0) {
+- log_syntax(unit, LOG_ERR, filename, line, -r,
+- "Failed to parse fsck pass number, ignoring: %s", rvalue);
+- return 0;
+- }
+-
+- *passno = (int) i;
+- return 0;
+-}
+-
+ DEFINE_CONFIG_PARSE_ENUM(config_parse_kill_mode, kill_mode, KillMode, "Failed to parse kill mode");
+
+ int config_parse_kill_signal(const char *unit,
+@@ -2708,7 +2679,6 @@ void unit_dump_config_items(FILE *f) {
+ { config_parse_start_limit_action, "ACTION" },
+ { config_parse_set_status, "STATUS" },
+ { config_parse_service_sockets, "SOCKETS" },
+- { config_parse_fsck_passno, "PASSNO" },
+ { config_parse_environ, "ENVIRON" },
+ { config_parse_syscall_filter, "SYSCALL" },
+ { config_parse_cpu_shares, "SHARES" },
+diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
+index 90e5e3a..404df76 100644
+--- a/src/core/load-fragment.h
++++ b/src/core/load-fragment.h
+@@ -56,7 +56,6 @@ int config_parse_exec_secure_bits(const char *unit, const char *filename, unsign
+ int config_parse_bounding_set(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_limit(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_sysv_priority(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+-int config_parse_fsck_passno(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_kill_signal(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_exec_mount_flags(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+ int config_parse_timer(const char *unit, const char *filename, unsigned line, const char *section, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+diff --git a/src/core/mount.c b/src/core/mount.c
+index 70cd372..88563b3 100644
+--- a/src/core/mount.c
++++ b/src/core/mount.c
+@@ -313,33 +313,6 @@ static int mount_add_device_links(Mount *m) {
+ if (r < 0)
+ return r;
+
+- if (p->passno > 0 &&
+- UNIT(m)->manager->running_as == SYSTEMD_SYSTEM) {
+- char *name;
+- Unit *fsck;
+- /* Let's add in the fsck service */
+-
+- /* aka SPECIAL_FSCK_SERVICE */
+- name = unit_name_from_path_instance("systemd-fsck", p->what, ".service");
+- if (!name)
+- return -ENOMEM;
+-
+- r = manager_load_unit_prepare(UNIT(m)->manager, name, NULL, NULL, &fsck);
+- if (r < 0) {
+- log_warning_unit(name,
+- "Failed to prepare unit %s: %s", name, strerror(-r));
+- free(name);
+- return r;
+- }
+- free(name);
+-
+- SERVICE(fsck)->fsck_passno = p->passno;
+-
+- r = unit_add_two_dependencies(UNIT(m), UNIT_AFTER, UNIT_REQUIRES, fsck, true);
+- if (r < 0)
+- return r;
+- }
+-
+ return 0;
+ }
+
+@@ -1410,7 +1383,6 @@ static int mount_add_one(
+ const char *where,
+ const char *options,
+ const char *fstype,
+- int passno,
+ bool set_flags) {
+ int r;
+ Unit *u;
+@@ -1530,8 +1502,6 @@ static int mount_add_one(
+ free(p->fstype);
+ p->fstype = f;
+
+- p->passno = passno;
+-
+ if (load_extras) {
+ r = mount_add_extras(MOUNT(u));
+ if (r < 0)
+@@ -1601,7 +1571,7 @@ static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
+ if (!d || !p)
+ return log_oom();
+
+- k = mount_add_one(m, d, p, o, fstype, 0, set_flags);
++ k = mount_add_one(m, d, p, o, fstype, set_flags);
+ if (k < 0)
+ r = k;
+ }
+diff --git a/src/core/mount.h b/src/core/mount.h
+index 7cd4320..a955069 100644
+--- a/src/core/mount.h
++++ b/src/core/mount.h
+@@ -58,7 +58,6 @@ typedef struct MountParameters {
+ char *what;
+ char *options;
+ char *fstype;
+- int passno;
+ } MountParameters;
+
+ typedef enum MountResult {
+diff --git a/src/core/service.c b/src/core/service.c
+index 96ed2d3..ce75757 100644
+--- a/src/core/service.c
++++ b/src/core/service.c
+@@ -1056,48 +1056,6 @@ static int service_load_sysv(Service *s) {
+ }
+ #endif
+
+-static int fsck_fix_order(Service *s) {
+- Unit *other;
+- int r;
+-
+- assert(s);
+-
+- if (s->fsck_passno <= 0)
+- return 0;
+-
+- /* For each pair of services where both have an fsck priority
+- * we order things based on it. */
+-
+- LIST_FOREACH(units_by_type, other, UNIT(s)->manager->units_by_type[UNIT_SERVICE]) {
+- Service *t;
+- UnitDependency d;
+-
+- t = SERVICE(other);
+-
+- if (s == t)
+- continue;
+-
+- if (UNIT(t)->load_state != UNIT_LOADED)
+- continue;
+-
+- if (t->fsck_passno <= 0)
+- continue;
+-
+- if (t->fsck_passno < s->fsck_passno)
+- d = UNIT_AFTER;
+- else if (t->fsck_passno > s->fsck_passno)
+- d = UNIT_BEFORE;
+- else
+- continue;
+-
+- r = unit_add_dependency(UNIT(s), d, UNIT(t), true);
+- if (r < 0)
+- return r;
+- }
+-
+- return 0;
+-}
+-
+ static int service_verify(Service *s) {
+ assert(s);
+
+@@ -1254,10 +1212,6 @@ static int service_load(Unit *u) {
+ return r;
+ #endif
+
+- r = fsck_fix_order(s);
+- if (r < 0)
+- return r;
+-
+ if (s->bus_name)
+ if ((r = unit_watch_bus_name(u, s->bus_name)) < 0)
+ return r;
+@@ -1381,11 +1335,6 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
+ prefix, s->sysv_runlevels);
+ #endif
+
+- if (s->fsck_passno > 0)
+- fprintf(f,
+- "%sFsckPassNo: %i\n",
+- prefix, s->fsck_passno);
+-
+ if (s->status_text)
+ fprintf(f, "%sStatus Text: %s\n",
+ prefix, s->status_text);
+diff --git a/src/core/service.h b/src/core/service.h
+index ce5b5e0..37fa6ff 100644
+--- a/src/core/service.h
++++ b/src/core/service.h
+@@ -157,8 +157,6 @@ struct Service {
+ pid_t main_pid, control_pid;
+ int socket_fd;
+
+- int fsck_passno;
+-
+ bool permissions_start_only;
+ bool root_directory_start_only;
+ bool remain_after_exit;
+--
+1.8.5.1
+
diff --git a/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch b/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch
new file mode 100644
index 000000000..3830ecfcf
--- /dev/null
+++ b/core/systemd/0006-efi-boot-generator-hookup-to-fsck.patch
@@ -0,0 +1,81 @@
+From d09ee17da21b7ca2259067ac4e54f8a1cc3c0fc0 Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 5 Oct 2013 17:32:21 +0200
+Subject: [PATCH 6/7] efi-boot-generator: hookup to fsck
+
+---
+ TODO | 1 -
+ src/efi-boot-generator/efi-boot-generator.c | 26 ++++++++++++++++++++++----
+ 2 files changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/TODO b/TODO
+index f0060d9..814d82d 100644
+--- a/TODO
++++ b/TODO
+@@ -308,7 +308,6 @@ Features:
+ * introduce ExecCondition= in services
+
+ * EFI:
+- - fsck hookup for the ESP mount is missing
+ - write man page for efi boot generator
+ - honor language efi variables for default language selection (if there are any?)
+ - honor timezone efi variables for default timezone selection (if there are any?)
+diff --git a/src/efi-boot-generator/efi-boot-generator.c b/src/efi-boot-generator/efi-boot-generator.c
+index 05b95ed..e20d325 100644
+--- a/src/efi-boot-generator/efi-boot-generator.c
++++ b/src/efi-boot-generator/efi-boot-generator.c
+@@ -26,13 +26,14 @@
+ #include "path-util.h"
+ #include "util.h"
+ #include "mkdir.h"
++#include "unit-name.h"
+
+ static const char *arg_dest = "/tmp";
+
+ int main(int argc, char *argv[]) {
+ int r = EXIT_SUCCESS;
+ sd_id128_t id;
+- _cleanup_free_ char *name = NULL;
++ _cleanup_free_ char *name = NULL, *what = NULL, *fsck = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+
+ if (argc > 1 && argc != 4) {
+@@ -75,15 +76,32 @@ int main(int argc, char *argv[]) {
+ return EXIT_FAILURE;
+ }
+
++ r = asprintf(&what,
++ "/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x",
++ SD_ID128_FORMAT_VAL(id));
++ if (r < 0) {
++ log_oom();
++ return EXIT_FAILURE;
++ }
++
++ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++ if (!fsck) {
++ log_oom();
++ return EXIT_FAILURE;
++ }
++
+ fprintf(f,
+ "# Automatially generated by systemd-efi-boot-generator\n\n"
+ "[Unit]\n"
+- "Description=EFI System Partition\n\n"
++ "Description=EFI System Partition\n"
++ "Requires=%s\n"
++ "After=%s\n"
++ "\n"
+ "[Mount]\n"
+ "Where=/boot\n"
+- "What=/dev/disk/by-partuuid/%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x\n"
++ "What=%s\n"
+ "Options=umask=0077\n",
+- SD_ID128_FORMAT_VAL(id));
++ fsck, fsck, what);
+
+ free(name);
+ name = strjoin(arg_dest, "/boot.automount", NULL);
+--
+1.8.5.1
+
diff --git a/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch b/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch
new file mode 100644
index 000000000..112b5b59a
--- /dev/null
+++ b/core/systemd/0007-fsck-root-only-run-when-requested-in-fstab.patch
@@ -0,0 +1,95 @@
+From a7623afb7a48ab1d7b5b24fbd5f1033acfb2301c Mon Sep 17 00:00:00 2001
+From: Tom Gundersen <teg@jklm.no>
+Date: Sat, 19 Oct 2013 11:38:42 +0200
+Subject: [PATCH 7/7] fsck-root: only run when requested in fstab
+
+fsck-root is redundant in case an initrd is used, or in case the rootfs
+is never remounted 'rw', so the new default is the correct behavior for
+most users. For the rest, they should enable it in fstab.
+---
+ Makefile.am | 1 -
+ man/systemd-fsck@.service.xml | 4 +++-
+ src/fstab-generator/fstab-generator.c | 31 ++++++++++++++++++++++---------
+ 3 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index ca01179..a29a32a 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4447,7 +4447,6 @@ SYSINIT_TARGET_WANTS += \
+ systemd-update-utmp.service
+ LOCAL_FS_TARGET_WANTS += \
+ systemd-remount-fs.service \
+- systemd-fsck-root.service \
+ tmp.mount
+ MULTI_USER_TARGET_WANTS += \
+ getty.target \
+diff --git a/man/systemd-fsck@.service.xml b/man/systemd-fsck@.service.xml
+index 17bd1c0..811392b 100644
+--- a/man/systemd-fsck@.service.xml
++++ b/man/systemd-fsck@.service.xml
+@@ -63,7 +63,9 @@
+ check. <filename>systemd-fsck-root.service</filename> is
+ responsible for file system checks on the root
+ file system. The root file system check is performed
+- before the other file systems.</para>
++ before the other file systems. Either service is enabled
++ at boot if passno in <filename>/etc/fstab</filename> for
++ the filesystem is set to a value greater than zero.</para>
+
+ <para><filename>systemd-fsck</filename> will
+ forward file system checking progress to the
+diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
+index 77247de..78d7609 100644
+--- a/src/fstab-generator/fstab-generator.c
++++ b/src/fstab-generator/fstab-generator.c
+@@ -210,17 +210,29 @@ static int add_mount(
+ post);
+
+ if (passno > 0) {
+- _cleanup_free_ char *fsck = NULL;
++ if (streq(where, "/")) {
++ lnk = strjoin(arg_dest, "/", SPECIAL_LOCAL_FS_TARGET, ".wants/", "systemd-fsck-root.service", NULL);
++ if (!lnk)
++ return log_oom();
+
+- fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
+- if (!fsck)
+- return log_oom();
++ mkdir_parents_label(lnk, 0755);
++ if (symlink("systemd-fsck-root.service", lnk) < 0) {
++ log_error("Failed to create symlink %s: %m", lnk);
++ return -errno;
++ }
++ } else {
++ _cleanup_free_ char *fsck = NULL;
+
+- fprintf(f,
+- "Requires=%s\n"
+- "After=%s\n",
+- fsck,
+- fsck);
++ fsck = unit_name_from_path_instance("systemd-fsck", what, ".service");
++ if (!fsck)
++ return log_oom();
++
++ fprintf(f,
++ "Requires=%s\n"
++ "After=%s\n",
++ fsck,
++ fsck);
++ }
+ }
+
+
+@@ -248,6 +260,7 @@ static int add_mount(
+
+ if (!noauto) {
+ if (post) {
++ free(lnk);
+ lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+ if (!lnk)
+ return log_oom();
+--
+1.8.5.1
+
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index d8855ba6c..23023060a 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -4,7 +4,7 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
pkgver=208
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
@@ -17,20 +17,50 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
'initcpio-install-udev'
'0001-fix-lingering-references-to-var-lib-backlight-random.patch'
'0001-mount-check-for-NULL-before-reading-pm-what.patch'
- '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch')
+ '0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch'
+ '0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch'
+ '0001-fstab-generator-When-parsing-the-root-cmdline-option.patch'
+ '0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch'
+ '0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch'
+ '0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch'
+ '0005-mount-service-drop-FsckPassNo-support.patch'
+ '0006-efi-boot-generator-hookup-to-fsck.patch'
+ '0007-fsck-root-only-run-when-requested-in-fstab.patch')
md5sums=('df64550d92afbffb4f67a434193ee165'
'29245f7a240bfba66e2b1783b63b6b40'
'8b68b0218a3897d4d37a6ccf47914774'
'bde43090d4ac0ef048e3eaee8202a407'
'1b191c4e7a209d322675fd199e3abc66'
'a693bef63548163ffc165f4c4801ebf7'
- 'ccafe716d87df9c42af0d1960b5a4105')
+ 'ccafe716d87df9c42af0d1960b5a4105'
+ '441e3d464ee6af5fe4af6a8bc10d7980'
+ '718d841203cf2ea9e24a7d0f1d19d48b'
+ '623c77bad0d2968e44963d72924825f1'
+ 'e52fc8368853c7800ab03ab8868cfd41'
+ '2096f33bd36dfa0a7f0431d0a429787a'
+ 'd2481a6ea199b581e243a950125b0ca6'
+ 'c2aee634a3a6c50778968f0d5c756f40'
+ 'ef8b8212d504bb73c10bf4e85f0703b2')
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 < "$srcdir"/0001-fix-lingering-references-to-var-lib-backlight-random.patch
patch -Np1 < "$srcdir"/0001-mount-check-for-NULL-before-reading-pm-what.patch
patch -Np1 < "$srcdir"/0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch
+ # Fix lingering user managers
+ patch -Np1 < "$srcdir"/0001-login-Don-t-stop-a-running-user-manager-from-garbage.patch
+ # Backport changes in fstab passno handling
+ # Basically, we only need 0001 and 0007, but 0007 is based on earlier patches,
+ # and it doesn't hurt to backport them all.
+ patch -Np1 < "$srcdir"/0001-fstab-generator-When-parsing-the-root-cmdline-option.patch
+ patch -Np1 < "$srcdir"/0002-fstab-generator-Generate-explicit-dependencies-on-sy.patch
+ patch -Np1 < "$srcdir"/0003-gpt-auto-generator-Generate-explicit-dependencies-on.patch
+ patch -Np1 < "$srcdir"/0004-Remove-FsckPassNo-from-systemd-fsck-root.service.patch
+ patch -Np1 < "$srcdir"/0005-mount-service-drop-FsckPassNo-support.patch
+ patch -Np1 < "$srcdir"/0006-efi-boot-generator-hookup-to-fsck.patch
+ patch -Np1 < "$srcdir"/0007-fsck-root-only-run-when-requested-in-fstab.patch
+
+ autoreconf
}
build() {
@@ -120,6 +150,9 @@ package_systemd() {
chown root:systemd-journal "$pkgdir/var/log/journal"
chmod 2755 "$pkgdir/var/log/journal"
+ # fix pam file
+ sed 's|system-auth|system-login|g' -i "$pkgdir/etc/pam.d/systemd-user"
+
### split out manpages for sysvcompat
rm -rf "$srcdir/_sysvcompat"
install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
@@ -136,7 +169,7 @@ package_systemd-sysvcompat() {
license=('GPL2')
groups=('base')
conflicts=('sysvinit')
- depends=('sysvinit-tools' 'systemd')
+ depends=('systemd')
mv "$srcdir/_sysvcompat"/* "$pkgdir"
diff --git a/core/sysvinit-tools/0001-simplify-writelog.patch b/core/sysvinit-tools/0001-simplify-writelog.patch
deleted file mode 100644
index cc28f14bc..000000000
--- a/core/sysvinit-tools/0001-simplify-writelog.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-From 5577552eb1344ddd661893564b1e628f8edcf13d Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Fri, 15 Jun 2012 16:41:52 +0200
-Subject: [PATCH 1/2] simplify writelog()
-
-All we do is prepend the date and remove \r. We don't handle color
-codes, but the user can just cat the log file in a terminal and it will
-interpret the codes correctly.
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c | 76 +++++++++++++++++-------------------------------------------
- 1 file changed, 21 insertions(+), 55 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index 570d382..e36e261 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -68,11 +68,6 @@ int didnl = 1;
- int createlogfile = 0;
- int syncalot = 0;
-
--struct line {
-- char buf[256];
-- int pos;
--} line;
--
- /*
- * Console devices as listed on the kernel command line and
- * the mapping to actual devices in /dev
-@@ -351,63 +346,34 @@ int consolename(char *res, int rlen)
- */
- void writelog(FILE *fp, unsigned char *ptr, int len)
- {
-- time_t t;
-- char *s;
-- char tmp[8];
-- int olen = len;
-- int dosync = 0;
-- int tlen;
--
-- while (len > 0) {
-- tmp[0] = 0;
-- if (didnl) {
-+ int dosync = 0;
-+ int i;
-+ static int first_run = 1;
-+
-+ for (i = 0; i < len; i++) {
-+ int ignore = 0;
-+
-+ /* prepend date to every line */
-+ if (*(ptr-1) == '\n' || first_run) {
-+ time_t t;
-+ char *s;
- time(&t);
- s = ctime(&t);
- fprintf(fp, "%.24s: ", s);
-- didnl = 0;
-+ dosync = 1;
-+ first_run = 0;
- }
-- switch (*ptr) {
-- case 27: /* ESC */
-- strcpy(tmp, "^[");
-- break;
-- case '\r':
-- line.pos = 0;
-- break;
-- case 8: /* ^H */
-- if (line.pos > 0) line.pos--;
-- break;
-- case '\n':
-- didnl = 1;
-- dosync = 1;
-- break;
-- case '\t':
-- line.pos += (line.pos / 8 + 1) * 8;
-- if (line.pos >= (int)sizeof(line.buf))
-- line.pos = sizeof(line.buf) - 1;
-- break;
-- case 32 ... 127:
-- case 161 ... 255:
-- tmp[0] = *ptr;
-- tmp[1] = 0;
-- break;
-- default:
-- sprintf(tmp, "\\%03o", *ptr);
-- break;
-- }
-- ptr++;
-- len--;
-
-- tlen = strlen(tmp);
-- if (tlen && (line.pos + tlen < (int)sizeof(line.buf))) {
-- memcpy(line.buf + line.pos, tmp, tlen);
-- line.pos += tlen;
-+ if (*ptr == '\r') {
-+ ignore = 1;
- }
-- if (didnl) {
-- fprintf(fp, "%s\n", line.buf);
-- memset(&line, 0, sizeof(line));
-+
-+ if (!ignore) {
-+ fwrite(ptr, sizeof(char), 1, fp);
- }
-- }
-
-+ ptr++;
-+ }
- if (dosync) {
- fflush(fp);
- if (syncalot) {
-@@ -415,7 +381,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- }
- }
-
-- outptr += olen;
-+ outptr += len;
- if (outptr >= endptr)
- outptr = ringbuf;
-
---
-1.7.10.4
-
diff --git a/core/sysvinit-tools/0002-remove-ansi-escape-codes-from-log-file.patch b/core/sysvinit-tools/0002-remove-ansi-escape-codes-from-log-file.patch
deleted file mode 100644
index 89b3280df..000000000
--- a/core/sysvinit-tools/0002-remove-ansi-escape-codes-from-log-file.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 8d0022d9540112a92ce8d88c91c4ac10bad8c9ef Mon Sep 17 00:00:00 2001
-From: Florian Pritz <bluewind@xinu.at>
-Date: Sun, 24 Jun 2012 15:49:51 +0200
-Subject: [PATCH 2/2] remove ansi escape codes from log file
-
-References: https://en.wikipedia.org/wiki/ANSI_escape_code
-
-Signed-off-by: Florian Pritz <bluewind@xinu.at>
----
- bootlogd.c | 45 +++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 43 insertions(+), 2 deletions(-)
-
-diff --git a/bootlogd.c b/bootlogd.c
-index e36e261..88e610d 100644
---- a/bootlogd.c
-+++ b/bootlogd.c
-@@ -349,6 +349,7 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- int dosync = 0;
- int i;
- static int first_run = 1;
-+ static int inside_esc = 0;
-
- for (i = 0; i < len; i++) {
- int ignore = 0;
-@@ -364,10 +365,50 @@ void writelog(FILE *fp, unsigned char *ptr, int len)
- first_run = 0;
- }
-
-- if (*ptr == '\r') {
-- ignore = 1;
-+ /* remove escape sequences, but do it in a way that allows us to stop
-+ * in the middle in case the string was cut off */
-+ if (inside_esc == 1) {
-+ /* first '[' is special because if we encounter it again, it should be considered the final byte */
-+ if (*ptr == '[') {
-+ /* multi char sequence */
-+ ignore = 1;
-+ inside_esc = 2;
-+ } else {
-+ /* single char sequence */
-+ if (*ptr >= 64 && *ptr <= 95) {
-+ ignore = 1;
-+ }
-+ inside_esc = 0;
-+ }
-+ } else if (inside_esc == 2) {
-+ switch (*ptr) {
-+ case '0' ... '9': /* intermediate chars of escape sequence */
-+ case ';':
-+ case 32 ... 47:
-+ if (inside_esc) {
-+ ignore = 1;
-+ }
-+ break;
-+ case 64 ... 126: /* final char of escape sequence */
-+ if (inside_esc) {
-+ ignore = 1;
-+ inside_esc = 0;
-+ }
-+ break;
-+ }
-+ } else {
-+ switch (*ptr) {
-+ case '\r':
-+ ignore = 1;
-+ break;
-+ case 27: /* ESC */
-+ ignore = 1;
-+ inside_esc = 1;
-+ break;
-+ }
- }
-
-+
- if (!ignore) {
- fwrite(ptr, sizeof(char), 1, fp);
- }
---
-1.7.10.4
-
diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD
deleted file mode 100644
index 4dc356e74..000000000
--- a/core/sysvinit-tools/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 197264 2013-10-24 20:11:17Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer: Eric Belanger <eric@archlinux.org>
-
-pkgname=sysvinit-tools
-pkgdesc="Linux System V Init Tools"
-pkgver=2.88
-pkgrel=12
-arch=('i686' 'x86_64' 'mips64el')
-url="http://savannah.nongnu.org/projects/sysvinit"
-license=('GPL')
-depends=('glibc')
-source=(http://download.savannah.gnu.org/releases/sysvinit/sysvinit-${pkgver}dsf.tar.bz2
- "0001-simplify-writelog.patch"
- "0002-remove-ansi-escape-codes-from-log-file.patch")
-sha1sums=('f2ca149df1314a91f3007cccd7a0aa47d990de26'
- '326112c8a9bd24cb45bd4bb2f958a25f0ac4773d'
- 'bbecfa7dfa45ac7c37ed8ac59fb53f6a85064b32')
-
-build() {
- cd "$srcdir/sysvinit-${pkgver}dsf"
-
- # FS#30005
- patch -p1 -d "src" -i "${srcdir}/0001-simplify-writelog.patch"
- patch -p1 -d "src" -i "${srcdir}/0002-remove-ansi-escape-codes-from-log-file.patch"
-
- # only build what we need...
- make -C src fstab-decode killall5 bootlogd
-}
-
-package() {
- cd "$srcdir/sysvinit-${pkgver}dsf"
-
- install -dm755 "$pkgdir/usr/bin" "$pkgdir/usr/share/man/man8"
-
- # binaries
- install -m755 src/{fstab-decode,killall5,bootlogd} "$pkgdir/usr/bin"
- ln -s killall5 "$pkgdir/usr/bin/pidof"
-
- # manpages
- install -m644 man/{bootlogd,pidof,killall5,fstab-decode}.8 "$pkgdir/usr/share/man/man8"
-}
diff --git a/core/tar/PKGBUILD b/core/tar/PKGBUILD
index d4aafe120..31fa4bda8 100644
--- a/core/tar/PKGBUILD
+++ b/core/tar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 195996 2013-10-07 10:34:06Z allan $
+# $Id: PKGBUILD 199999 2013-11-21 01:21:02Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
pkgname=tar
-pkgver=1.27
+pkgver=1.27.1
pkgrel=1
pkgdesc="Utility used to store, backup, and transport files"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('glibc' 'sh')
options=('!emptydirs')
install=tar.install
source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig})
-md5sums=('3484fc42b7a82b82f2305b2971aa0e56'
+md5sums=('e0382a4064e09a4943f3adeff1435978'
'SKIP')
build() {
diff --git a/core/texinfo/PKGBUILD b/core/texinfo/PKGBUILD
index 927b8666e..1f1182dba 100644
--- a/core/texinfo/PKGBUILD
+++ b/core/texinfo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195842 2013-10-02 00:09:47Z allan $
+# $Id: PKGBUILD 199326 2013-11-11 03:44:43Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=texinfo
pkgver=5.2
-pkgrel=1
+pkgrel=2
pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/texinfo/"
@@ -12,9 +12,16 @@ license=('GPL3')
groups=('base' 'base-devel')
depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh')
install=texinfo.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+ texinfo-5.2-C-n-fix.patch)
md5sums=('cb489df8a7ee9d10a236197aefdb32c5'
- 'SKIP')
+ 'SKIP'
+ '89724bac1ecbd1a57b1ea81e87f96f44')
+
+prepare() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ patch -p0 -i ${srcdir}/texinfo-5.2-C-n-fix.patch
+}
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/core/texinfo/texinfo-5.2-C-n-fix.patch b/core/texinfo/texinfo-5.2-C-n-fix.patch
new file mode 100644
index 000000000..adf545126
--- /dev/null
+++ b/core/texinfo/texinfo-5.2-C-n-fix.patch
@@ -0,0 +1,10 @@
+--- info/infomap.c (revision 5386)
++++ info/infomap.c (working copy)
+@@ -297,6 +297,7 @@
+ CONTROL('f'), NUL, A_info_forward_char,
+ CONTROL('h'), NUL, A_info_get_help_window,
+ CONTROL('l'), NUL, A_info_redraw_display,
++ CONTROL('n'), NUL, A_info_next_line,
+ CONTROL('p'), NUL, A_info_prev_line,
+ CONTROL('r'), NUL, A_isearch_backward,
+ CONTROL('s'), NUL, A_isearch_forward,
diff --git a/core/util-linux/0001-lsblk-fix-D-segfault.patch b/core/util-linux/0001-lsblk-fix-D-segfault.patch
new file mode 100644
index 000000000..8e4d7c6d2
--- /dev/null
+++ b/core/util-linux/0001-lsblk-fix-D-segfault.patch
@@ -0,0 +1,45 @@
+From 71d842c01992b3678de4da4773ed54f08c0ab4f6 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 18 Nov 2013 11:27:35 +0100
+Subject: [PATCH] lsblk: fix -D segfault
+
+References: https://bugzilla.redhat.com/show_bug.cgi?id=1031262
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ misc-utils/lsblk.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
+index 9f7f1b6..9b53be3 100644
+--- a/misc-utils/lsblk.c
++++ b/misc-utils/lsblk.c
+@@ -903,7 +903,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
+ if (cxt->discard && p)
+ tt_line_set_data(ln, col, p);
+ else
+- tt_line_set_data(ln, col, "0");
++ tt_line_set_data(ln, col, xstrdup("0"));
+ break;
+ case COL_DGRAN:
+ if (lsblk->bytes)
+@@ -936,7 +936,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
+ if (cxt->discard && p)
+ tt_line_set_data(ln, col, p);
+ else
+- tt_line_set_data(ln, col, "0");
++ tt_line_set_data(ln, col, xstrdup("0"));
+ break;
+ case COL_WSAME:
+ if (lsblk->bytes)
+@@ -948,7 +948,7 @@ static void set_tt_data(struct blkdev_cxt *cxt, int col, int id, struct tt_line
+ "queue/write_same_max_bytes", &x) == 0)
+ p = size_to_human_string(SIZE_SUFFIX_1LETTER, x);
+ }
+- tt_line_set_data(ln, col, p ? p : "0");
++ tt_line_set_data(ln, col, p ? p : xstrdup("0"));
+ break;
+ };
+ }
+--
+1.8.4.2
+
diff --git a/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch b/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
new file mode 100644
index 000000000..34040b9eb
--- /dev/null
+++ b/core/util-linux/0001-pylibmount-correctly-import-from-pylibmount.so.patch
@@ -0,0 +1,30 @@
+From c8e5e6e7323642f7e6f12ee5f5231b0ec44c40ab Mon Sep 17 00:00:00 2001
+From: Dave Reisner <dreisner@archlinux.org>
+Date: Thu, 21 Nov 2013 12:25:27 -0500
+Subject: [PATCH] pylibmount: correctly import from pylibmount.so
+
+Without this, python is unable to find the module:
+
+$ python -c 'import libmount'
+Traceback (most recent call last):
+ File "<string>", line 1, in <module>
+ File "/usr/lib/python3.3/site-packages/libmount/__init__.py", line 1, in <module>
+ from pylibmount import *
+ImportError: No module named 'pylibmount'
+
+Signed-off-by: Dave Reisner <dreisner@archlinux.org>
+---
+ libmount/python/libmount/__init__.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libmount/python/libmount/__init__.py b/libmount/python/libmount/__init__.py
+index 243c639..09104e2 100644
+--- a/libmount/python/libmount/__init__.py
++++ b/libmount/python/libmount/__init__.py
+@@ -1,2 +1,2 @@
+-from pylibmount import *
++from .pylibmount import *
+
+--
+1.8.4.2
+
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index ec5086bb4..aecd7341f 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197844 2013-10-30 11:07:21Z allan $
+# $Id: PKGBUILD 201467 2013-12-12 15:33:24Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
pkgver=2.24
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64' 'mips64el')
@@ -19,6 +19,8 @@ provides=("util-linux-ng=$pkgver" 'eject')
license=('GPL2')
options=('strip' 'debug')
source=("ftp://ftp.kernel.org/pub/linux/utils/$pkgname/v2.24/$pkgname-$pkgver.tar.xz"
+ 0001-lsblk-fix-D-segfault.patch
+ 0001-pylibmount-correctly-import-from-pylibmount.so.patch
uuidd.tmpfiles
pam-login
pam-common
@@ -30,11 +32,20 @@ backup=(etc/pam.d/chfn
etc/pam.d/su-l)
install=util-linux.install
md5sums=('4fac6443427f575fc5f3531a4ad2ca01'
+ '1899fe3b853a5835c76cca0501b6b518'
+ 'a18a1e89ffdfa3bc96ae976646a723ec'
'a39554bfd65cccfd8254bb46922f4a67'
'4368b3f98abd8a32662e094c54e7f9b1'
'a31374fef2cba0ca34dfc7078e2969e4'
'fa85e5cce5d723275b14365ba71a8aad')
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <"$srcdir"/0001-lsblk-fix-D-segfault.patch
+ patch -Np1 <"$srcdir"/0001-pylibmount-correctly-import-from-pylibmount.so.patch
+}
+
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/abook/PKGBUILD b/extra/abook/PKGBUILD
index d634cb171..5bb411e97 100644
--- a/extra/abook/PKGBUILD
+++ b/extra/abook/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 195248 2013-09-29 04:45:52Z bisson $
+# $Id: PKGBUILD 199323 2013-11-11 01:53:25Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Contributor: Thayer Williams <thayer@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=abook
-pkgver=0.6.0pre2.20130928
+pkgver=0.6.0pre2.20131110
pkgrel=1
pkgdesc='Text-based addressbook designed for use with Mutt'
url='http://abook.sourceforge.net/'
@@ -16,7 +16,7 @@ depends=('readline')
source=("abook::git://abook.git.sourceforge.net/gitroot/abook/abook#commit=2e3d4f7341e154bf09907aabcdfe73345cc72e68"
'vcard.patch')
sha1sums=('SKIP'
- 'ac71e84812c5d57cb8ddaf5b03b7c25cbdf4c3db')
+ '7f58e32814510ae491fadaa9f06d787ccd2ecfcd')
prepare() {
cd "${srcdir}/${pkgname}"
diff --git a/extra/abook/vcard.patch b/extra/abook/vcard.patch
index 55630c1e5..f2e93a940 100644
--- a/extra/abook/vcard.patch
+++ b/extra/abook/vcard.patch
@@ -1,7 +1,18 @@
-diff -Naur old/filter.c new/filter.c
---- old/filter.c 2013-08-22 20:49:06.229337260 -1000
-+++ new/filter.c 2013-08-22 20:49:13.552700987 -1000
-@@ -1673,7 +1673,7 @@
+diff -aur old/filter.c new/filter.c
+--- old/filter.c 2013-10-10 16:04:46.230433845 -1000
++++ new/filter.c 2013-10-10 16:40:07.014569795 -1000
+@@ -1557,8 +1557,9 @@
+ "NICKNAME", /* NICK */
+ "URL", /* URL */
+ "NOTE", /* NOTES */
++ "BDAY", /* ANNIVERSARY */
+ "N", /* NAME: special case/mapping in vcard_parse_line() */
+- NULL /* not implemented: ANNIVERSARY, ITEM_FIELDS */
++ NULL /* not implemented: ITEM_FIELDS */
+ };
+
+ enum {
+@@ -1673,7 +1674,7 @@
// vCard(the country name)
item_fput(item, COUNTRY, xstrdup(strsep(&value, ";")));
@@ -10,7 +21,7 @@ diff -Naur old/filter.c new/filter.c
}
static void
-@@ -2052,6 +2052,13 @@
+@@ -2052,6 +2053,13 @@
free(name);
@@ -18,7 +29,7 @@ diff -Naur old/filter.c new/filter.c
+ fprintf(out, "NICKNAME:%s\r\n",
+ safe_str(db_fget(item, NICK)));
+ if(db_fget(item, ANNIVERSARY))
-+ fprintf(out, "BIRTHDAY:%s\r\n",
++ fprintf(out, "BDAY:%s\r\n",
+ safe_str(db_fget(item, ANNIVERSARY)));
+
// see rfc6350 section 6.3.1
diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 1dfa64b75..4161dfb34 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,17 +1,24 @@
-# $Id: PKGBUILD 197848 2013-10-30 11:14:12Z allan $
+# $Id: PKGBUILD 199022 2013-11-06 14:06:17Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=accountsservice
pkgver=0.6.35
-pkgrel=1
+pkgrel=2
pkgdesc="D-Bus interface for user account query and manipulation"
arch=(i686 x86_64 'mips64el')
url="http://www.freedesktop.org/software/accountsservice/"
license=('GPL3')
depends=('glib2' 'polkit' 'systemd')
makedepends=('intltool' 'gobject-introspection')
-source=($url/$pkgname-$pkgver.tar.xz)
-md5sums=('3a81133e95faafb603de4475802cb06a')
+source=($url/$pkgname-$pkgver.tar.xz
+ avoid-deleting-the-root-user.patch)
+md5sums=('3a81133e95faafb603de4475802cb06a'
+ '4970e77c3c0d56e513f9a5f29fdacd2c')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../avoid-deleting-the-root-user.patch
+}
build() {
cd $pkgname-$pkgver
diff --git a/extra/accountsservice/avoid-deleting-the-root-user.patch b/extra/accountsservice/avoid-deleting-the-root-user.patch
new file mode 100644
index 000000000..b8dfaa931
--- /dev/null
+++ b/extra/accountsservice/avoid-deleting-the-root-user.patch
@@ -0,0 +1,47 @@
+From 980692e6b9cfe4a34e22f566e0981a8c549e4348 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 01 Nov 2013 21:09:25 +0000
+Subject: Avoid deleting the root user
+
+The check we have in place against deleting the root user can
+be tricked by exploiting the fact that we are checking a gint64,
+and then later cast it to a uid_t. This can be seen with the
+following test, which will delete your root account:
+
+qdbus --system org.freedesktop.Accounts /org/freedesktop/Accounts \
+ org.freedesktop.Accounts.DeleteUser -9223372036854775808 true
+
+Found with the dfuzzer tool,
+https://github.com/matusmarhefka/dfuzzer
+---
+diff --git a/src/daemon.c b/src/daemon.c
+index ea75190..9c7001b 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -1227,7 +1227,7 @@ daemon_uncache_user (AccountsAccounts *accounts,
+ }
+
+ typedef struct {
+- gint64 uid;
++ uid_t uid;
+ gboolean remove_files;
+ } DeleteUserData;
+
+@@ -1309,13 +1309,13 @@ daemon_delete_user (AccountsAccounts *accounts,
+ Daemon *daemon = (Daemon*)accounts;
+ DeleteUserData *data;
+
+- if (uid == 0) {
++ if ((uid_t)uid == 0) {
+ throw_error (context, ERROR_FAILED, "Refuse to delete root user");
+ return TRUE;
+ }
+
+ data = g_new0 (DeleteUserData, 1);
+- data->uid = uid;
++ data->uid = (uid_t)uid;
+ data->remove_files = remove_files;
+
+ daemon_local_check_auth (daemon,
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/aisleriot/PKGBUILD b/extra/aisleriot/PKGBUILD
index 2dc4a915a..749d47705 100644
--- a/extra/aisleriot/PKGBUILD
+++ b/extra/aisleriot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197850 2013-10-30 11:14:57Z allan $
+# $Id: PKGBUILD 199394 2013-11-11 22:17:10Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=aisleriot
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="A collection of patience games written in guile scheme"
arch=(i686 x86_64 mips64el)
@@ -17,7 +17,7 @@ optdepends=('libkdegames: KDE card sets'
options=('!emptydirs')
install=aisleriot.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('06558f1adbd6d73ba7dd5dffc864d903532a26e0c29920127a233f344423bd9a')
+sha256sums=('a2a31b2b450bcb5cca9b4b82b64877b784aff52e669e84e7b99fa731f0325082')
build() {
cd $pkgname-$pkgver
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index faefac4a3..1bc6e7934 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196161 2013-10-07 12:32:40Z andrea $
+# $Id: PKGBUILD 201254 2013-12-07 10:34:54Z bpiotrowski $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=akonadi
-pkgver=1.10.3
+pkgver=1.11.0
pkgrel=1
pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano')
makedepends=('cmake' 'automoc4' 'boost' 'postgresql')
optdepends=('postgresql: PostgreSQL backend')
install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}-1.tar.bz2")
-md5sums=('3929b765baa3dc0d548a26893c64abcf')
+source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('580361613d04b260f807b2a4df099eca')
prepare() {
mkdir build
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 2d5df9f57..b2a1e16d8 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197597 2013-10-27 14:10:21Z giovanni $
+# $Id: PKGBUILD 202683 2013-12-24 15:27:05Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Henrik Ronellenfitsch <searinox@web.de>
# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
@@ -6,18 +6,18 @@
# Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
pkgname=amule
-pkgver=10808
-pkgrel=2
+pkgver=10827
+pkgrel=1
pkgdesc="An eMule-like client for ed2k p2p network"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.amule.org"
license=('GPL')
-depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
install=amule.install
source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
'amuled.systemd'
'amuleweb.systemd')
-md5sums=('68099241871f4e47eee06bebc7ce20a1'
+md5sums=('ca6564f1f4de16d70532308e234bde56'
'59772c41860e238f1c822feb8ca8d47f'
'05975c5d94bfc41fddb894d98b1115d5')
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 322c9b46b..f1b0d972f 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197857 2013-10-30 11:17:43Z allan $
+# $Id: PKGBUILD 199757 2013-11-15 18:34:29Z heftig $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Harley Laue <losinggeneration@yahoo.com>
pkgbase=anjuta
pkgname=('libanjuta' 'anjuta')
-pkgver=3.10.0
+pkgver=3.10.2
pkgrel=1
pkgdesc="GNOME Integrated Development Environment (IDE)"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=(gdl vte3 autogen devhelp glade libgda subversion neon gnome-icon-th
url="http://www.anjuta.org/"
options=('!emptydirs')
source=(ftp://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('72c8569fcd629f3ed1f248cfd452e1f0b473e890421679bd5bb4d6ab2ce3fedb')
+sha256sums=('ff16c646dbf0234f7056c697b2546125c89d43f8c1f5138a21409053c016d3bc')
build() {
cd "$pkgbase-$pkgver"
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index f112d0eab..6b0501024 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 197862 2013-10-30 11:19:36Z allan $
+# $Id: PKGBUILD 200761 2013-12-04 19:37:05Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=apr-util
-pkgver=1.5.2
-pkgrel=3
+pkgver=1.5.3
+pkgrel=1
pkgdesc="The Apache Portable Runtime"
arch=('i686' 'x86_64' 'mips64el')
url="http://apr.apache.org/"
depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
license=('APACHE')
-source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('89c1348aa79e898d7c34a6206311c9c2')
+source=(http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2{,.asc})
+md5sums=('6f3417691c7a27090f36e7cf4d94b36e'
+ 'SKIP')
build() {
cd "${srcdir}/apr-util-${pkgver}"
./configure --prefix=/usr --with-apr=/usr \
--without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
- --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap --disable-static
+ --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
make
}
diff --git a/extra/apr/PKGBUILD b/extra/apr/PKGBUILD
index 169b2db37..41504af09 100644
--- a/extra/apr/PKGBUILD
+++ b/extra/apr/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 197861 2013-10-30 11:19:15Z allan $
+# $Id: PKGBUILD 200759 2013-12-04 19:27:48Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=apr
-pkgver=1.4.8
-pkgrel=2
+pkgver=1.5.0
+pkgrel=1
pkgdesc="The Apache Portable Runtime"
arch=('i686' 'x86_64' 'mips64el')
url="http://apr.apache.org/"
depends=('util-linux')
license=('APACHE')
-source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2)
-md5sums=('ce2ab01a0c3cdb71cf0a6326b8654f41')
+source=(http://www.apache.org/dist/apr/apr-${pkgver}.tar.bz2{,.asc})
+md5sums=('cc93bd2c12d0d037f68e21cc6385dc31'
+ 'SKIP')
build() {
cd "${srcdir}/apr-${pkgver}"
diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD
index 856c643fd..6938cf6f4 100644
--- a/extra/ardour/PKGBUILD
+++ b/extra/ardour/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 197518 2013-10-26 13:26:11Z schiv $
+# $Id: PKGBUILD 202775 2013-12-27 23:05:21Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Contributor: see .contrib
pkgname=ardour
_pkgname=Ardour3
-pkgver=3.5.14
-_pkgver=3.5
+pkgver=3.5.143
pkgrel=1
pkgdesc="Professional-grade digital audio workstation"
arch=('i686' 'x86_64' 'mips64el')
@@ -19,18 +18,18 @@ optdepends=('xjadeo: video monitoring')
install=$pkgname.install
source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"
"$pkgname.desktop")
-md5sums=('2e472cb38938a2e1fe3fb5b89d705adc'
+md5sums=('52c3b8ea3ab014002e84e377f8a15097'
'316bd21ece5e2208a104fd09cac521af')
prepare() {
- cd "$srcdir/$_pkgname-$_pkgver"
+ cd "$srcdir/$_pkgname-$pkgver"
# python2 fix
sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript
}
build() {
- cd "$srcdir/$_pkgname-$_pkgver"
+ cd "$srcdir/$_pkgname-$pkgver"
# SSE code is used by default on all arches.
[ "$CARCH" == "mips64el" ] && extra=--no-fpu-optimization
@@ -43,7 +42,7 @@ build() {
}
package() {
- cd "$srcdir/$_pkgname-$_pkgver"
+ cd "$srcdir/$_pkgname-$pkgver"
python2 waf install --destdir="$pkgdir"
diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install
index 36da2e3ec..44eb679f1 100644
--- a/extra/ardour/ardour.install
+++ b/extra/ardour/ardour.install
@@ -19,21 +19,4 @@ post_install() {
MSG
}
-post_upgrade() {
- cat << MSG
- > Ardour now supports video timeline. To use this feature, please get
- > static builds of the required external runtime dependencies from:
-
- http://x42.github.io/harvid/
-
- > You may then install the binaries in /usr/local/bin and import a video
- > via Session > Open Video.
-
- > Due to uncertainties with regards to program stability, 'harvid' is
- > currently not packaged in our repositories.
-
- > In addition to the timeline, video can be monitored with xjadeo.
-MSG
-}
-
# vim:set ts=2 sw=2 et:
diff --git a/extra/asio/PKGBUILD b/extra/asio/PKGBUILD
index 27f94d9a4..1cff00689 100644
--- a/extra/asio/PKGBUILD
+++ b/extra/asio/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 190033 2013-07-13 12:40:05Z svenstaro $
+# $Id: PKGBUILD 199844 2013-11-17 09:57:22Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=asio
-pkgver=1.4.8
-pkgrel=3
+pkgver=1.10.1
+pkgrel=1
pkgdesc="Cross-platform C++ library for ASynchronous network I/O"
arch=('i686' 'x86_64' 'mips64el')
url="http://asio.sourceforge.net"
license=('custom')
depends=('boost')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('bc2ca8ea37892870d194421154df122f')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('4d508c9947404fee40945375b8a5fd32')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/aspell-de/PKGBUILD b/extra/aspell-de/PKGBUILD
index d95f68aa5..219cc90aa 100644
--- a/extra/aspell-de/PKGBUILD
+++ b/extra/aspell-de/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 197171 2013-10-23 13:51:59Z pierre $
+# $Id: PKGBUILD 201292 2013-12-08 08:42:55Z pierre $
# Maintainer:
# Contributor: Simo Leone <simo@archlinux.org>
# Contributor: Tobias Kieslich <tobias@justdreams.de>
pkgname=aspell-de
-pkgver=20120607
-pkgrel=2
+pkgver=20131206
+pkgrel=1
pkgdesc="German dictionary for aspell"
arch=('i686' 'x86_64' 'mips64el')
url="http://j3e.de/ispell/igerman98/index.html"
license=('GPL2')
depends=('aspell')
source=("http://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2")
-md5sums=('9433d0ccd7db3c7681037980ece3f710')
+md5sums=('9b6c0c6615d2e099cd85a209d9f1fdbb')
build() {
cd "${srcdir}/igerman98-${pkgver}"
diff --git a/extra/at-spi2-atk/PKGBUILD b/extra/at-spi2-atk/PKGBUILD
index 476a398e4..62555b918 100644
--- a/extra/at-spi2-atk/PKGBUILD
+++ b/extra/at-spi2-atk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197867 2013-10-30 11:21:29Z allan $
+# $Id: PKGBUILD 199411 2013-11-11 23:24:04Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=at-spi2-atk
-pkgver=2.10.0
+pkgver=2.10.2
pkgrel=1
pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL2')
depends=('at-spi2-core' 'libx11' 'atk')
makedepends=('intltool')
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94')
+sha256sums=('e348a811c4830251f0c3018019072e7979ef35fb9b7f0b1b0a0dd1e66942d0f5')
build() {
cd $pkgname-$pkgver
diff --git a/extra/at-spi2-core/PKGBUILD b/extra/at-spi2-core/PKGBUILD
index af9ba43ca..fe91a4f5a 100644
--- a/extra/at-spi2-core/PKGBUILD
+++ b/extra/at-spi2-core/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197868 2013-10-30 11:21:50Z allan $
+# $Id: PKGBUILD 199409 2013-11-11 23:21:40Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=at-spi2-core
-pkgver=2.10.1
+pkgver=2.10.2
pkgrel=1
pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL2')
depends=('dbus' 'glib2' 'libxtst')
makedepends=('intltool' 'gobject-introspection')
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('349b7ad5e6a8eebbf88aaefcb67a0f49b025dbcdf6ad646978faf2ca84650119')
+sha256sums=('d3da58f84f4c8e4d5fe940ecb52fb27b4d9ea2b4dcdb3e1fae0f46b5eaa2dde1')
build() {
cd $pkgname-$pkgver
diff --git a/extra/aubio/PKGBUILD b/extra/aubio/PKGBUILD
index 8b0481a68..8a8b231de 100644
--- a/extra/aubio/PKGBUILD
+++ b/extra/aubio/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197869 2013-10-30 11:22:11Z allan $
+# $Id: PKGBUILD 199836 2013-11-17 08:28:12Z allan $
# Maintainer: Tobias Kieslich tobias [funnychar] archlinux org
# Contributor: Peter Baldwin <bald_pete@hotmail.com>
# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
pkgname=aubio
pkgver=0.3.2
-pkgrel=5.2
+pkgrel=6
pkgdesc="A library for audio labelling"
arch=('i686' 'x86_64' 'mips64el')
url="http://aubio.org/"
@@ -19,7 +19,7 @@ md5sums=('ffc3e5e4880fec67064f043252263a44'
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i $srcdir/aubio-linking.patch
+ patch -p1 -i $srcdir/aubio-linking.patch
./configure --prefix=/usr
make
diff --git a/extra/autogen/PKGBUILD b/extra/autogen/PKGBUILD
index 3f03e1717..db740190b 100644
--- a/extra/autogen/PKGBUILD
+++ b/extra/autogen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197871 2013-10-30 11:22:53Z allan $
+# $Id: PKGBUILD 199838 2013-11-17 08:40:22Z allan $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Arjan Timmerman <arjan@soufly.nl>
# Contributor: Tor Krill
pkgname=autogen
-pkgver=5.17.4
+pkgver=5.18.2
pkgrel=1
pkgdesc="A tool designed to simplify the creation and maintenance of programs that contain large amounts of repetitious text"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL3')
depends=('guile' 'libxml2')
install=autogen.install
source=(http://ftp.gnu.org/gnu/${pkgname}/rel${pkgver}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('09b031866b7d89f0532b6c3168d67c59'
+md5sums=('1924fdfe36edb3e0fd66add20aca9b70'
'SKIP')
build() {
diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD
index 304f7e9de..aadc83cc2 100644
--- a/extra/avidemux/PKGBUILD
+++ b/extra/avidemux/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191888 2013-08-01 06:53:22Z bpiotrowski $
+# $Id: PKGBUILD 199867 2013-11-17 12:54:00Z bpiotrowski $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=avidemux
pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
pkgver=2.5.6
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
@@ -12,12 +12,12 @@ makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate' \
'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse')
[ "$CARCH" != "mips64el" ] && makedepends+=('libva')
-options=('!makeflags')
+options=('!makeflags' '!emptydirs')
source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
build() {
- cd "${srcdir}/${pkgbase}_${pkgver}"
+ cd ${pkgbase}_${pkgver}
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \
@@ -27,7 +27,6 @@ build() {
# plugin build expects libraries to be already installed; we fake a prefix
# in build/ by symlinking all libraries to build/lib/
- mkdir -p lib
cd lib
find ../avidemux -name '*.so*' | xargs ln -sft .
cd ../../plugins
@@ -57,12 +56,13 @@ package_avidemux-cli() {
conflicts=('avidemux')
replaces=('avidemux')
- cd "${srcdir}/${pkgbase}_${pkgver}/build"
+ cd ${pkgbase}_${pkgver}/build
make DESTDIR="${pkgdir}" install
cd "${srcdir}/${pkgbase}_${pkgver}/plugins/build"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}"/usr/share/avidemux
+ rm "${pkgdir}"/usr/share/ADM_addons/avsfilter/{avsload.exe,pipe_source.dll}
rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
@@ -81,7 +81,7 @@ package_avidemux-gtk() {
depends=("avidemux-cli=${pkgver}" 'gtk2' 'libxv' 'desktop-file-utils')
install=avidemux.install
- cd "${srcdir}/${pkgbase}_${pkgver}"
+ cd ${pkgbase}_${pkgver}
install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
@@ -97,11 +97,11 @@ package_avidemux-gtk() {
}
package_avidemux-qt() {
- pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI"
depends=("avidemux-cli=${pkgver}" 'qt4')
install=avidemux.install
- cd "${srcdir}/${pkgbase}_${pkgver}"
+ cd ${pkgbase}_${pkgver}
install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
@@ -115,6 +115,6 @@ package_avidemux-qt() {
install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
- sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ sed -i 's/Name=avidemux2/Name=avidemux (Qt)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
}
diff --git a/extra/avidemux/PKGBUILD.WIP b/extra/avidemux/PKGBUILD.WIP
index 87010d49c..ae2cd51ef 100644
--- a/extra/avidemux/PKGBUILD.WIP
+++ b/extra/avidemux/PKGBUILD.WIP
@@ -3,7 +3,7 @@
pkgbase=avidemux
pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt')
-pkgver=2.6.4
+pkgver=2.6.6
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -14,11 +14,12 @@ makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
'libvdpau' 'libdca' 'fribidi' 'glu')
options=('!makeflags' '!emptydirs')
source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3')
-#source=(http://www.avidemux.org/nightly/source/snapshot_8273.tgz)
-#sha1sums=('cf5256ce189a51898a2e1071ffd46cd993f453f2')
+sha1sums=('83ebf551746aac251d6e69feac5858cd0a307743')
+#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz)
+#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c')
prepare() {
+# mv 2.6_snapshot ${pkgbase}_${pkgver}
cd ${pkgbase}_${pkgver}
sed -i 's|avidemux2|avidemux3|' avidemux2.desktop
sed -i 's|../avidemux/qt4|../avidemux/qt4 -DLRELEASE_EXECUTABLE=/usr/bin/lrelease-qt4|' bootStrap.bash
@@ -26,8 +27,6 @@ prepare() {
}
build() {
-#mv snapshot_8273 ${pkgbase}_${pkgver}
-
cd ${pkgbase}_${pkgver}
bash bootStrap.bash --with-core --with-cli --with-gtk --with-qt4 --with-plugins
}
@@ -72,7 +71,7 @@ package_avidemux-gtk() {
}
package_avidemux-qt() {
- pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI"
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI"
depends=("avidemux-cli=${pkgver}" 'qt4' 'x264' 'glu')
install=avidemux.install
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 197ff2368..42c6c31fa 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 190034 2013-07-13 12:40:13Z svenstaro $
+# $Id: PKGBUILD 201255 2013-12-07 10:34:55Z bpiotrowski $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
pkgname=avogadro
pkgver=1.1.0
-pkgrel=5
+pkgrel=6
pkgdesc="An advanced molecular editor based on Qt"
arch=('i686' 'x86_64' 'mips64el')
url="http://avogadro.openmolecules.net/wiki/Main_Page"
diff --git a/extra/bigloo/PKGBUILD b/extra/bigloo/PKGBUILD
index f8cdd72ca..2aa3d01e4 100644
--- a/extra/bigloo/PKGBUILD
+++ b/extra/bigloo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192494 2013-08-13 09:04:03Z juergen $
+# $Id: PKGBUILD 199846 2013-11-17 10:03:54Z allan $
# Maintainer: Jürgen Hötzel <juergen@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: Kevin Piche <kevin@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=bigloo
_pkgver=4.0b
pkgver=${_pkgver/-/_}
-pkgrel=1
+pkgrel=2
pkgdesc="Fast scheme compiler"
arch=('i686' 'x86_64' 'mips64el')
url="http://www-sop.inria.fr/mimosa/fp/Bigloo/"
@@ -43,5 +43,4 @@ package() {
cd "${srcdir}/${pkgname}${_pkgver}"
make DESTDIR="${pkgdir}" install install-bee
make -C manuals DESTDIR="${pkgdir}" install-bee
- chmod 644 "${pkgdir}"/usr/lib/bigloo/${_pkgver%-*}/*.a
}
diff --git a/extra/bijiben/PKGBUILD b/extra/bijiben/PKGBUILD
index bc81f14a9..859c6c462 100644
--- a/extra/bijiben/PKGBUILD
+++ b/extra/bijiben/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196446 2013-10-13 21:34:11Z heftig $
+# $Id: PKGBUILD 199399 2013-11-11 22:34:22Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=bijiben
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="Write out notes, every detail matters"
arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ options=(!emptydirs)
groups=(gnome-extra)
install=bijiben.install
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('ad32057baa58bf236e8f04cf7746e0d917927f8af5c49cc5a0910fc0078f775c')
+sha256sums=('81257f85218968b0ad386da6e1143586de478870ca74bb5387646a479999a7d4')
build() {
cd $pkgname-$pkgver
diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD
index 92633a8d7..1371e5f1b 100644
--- a/extra/bluedevil/PKGBUILD
+++ b/extra/bluedevil/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 194547 2013-09-18 11:33:01Z tomegun $
+# $Id: PKGBUILD 202646 2013-12-23 08:16:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=bluedevil
-pkgver=1.3.2
+pkgver=2.0rc1
+_pkgver=2.0-rc1
pkgrel=1
+epoch=1
pkgdesc='KDE bluetooth framework'
arch=('i686' 'x86_64' 'mips64el')
url="https://projects.kde.org/projects/extragear/base/bluedevil"
license=('GPL')
-depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client')
+depends=('kdebase-workspace' 'libbluedevil')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('a43e644fe75bd090c47c060dcbdfdb27')
+source=("http://download.kde.org/unstable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
+md5sums=('d49a3037d29cf4ba9e0a0968a0139333')
-build(){
+prepare() {
mkdir build
+}
+
+build(){
cd build
- cmake ../${pkgname}-v${pkgver} \
+ cmake ../${pkgname}-${_pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr
make
diff --git a/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch b/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
new file mode 100644
index 000000000..fe3c51314
--- /dev/null
+++ b/extra/bluez/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
@@ -0,0 +1,59 @@
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd | 4 ++--
+ obexd/src/org.bluez.obex.service | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+
+ dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+
+ obex_plugindir = $(libdir)/obex/plugins
+
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+--
+1.8.3.1
+
+
diff --git a/extra/bluez/PKGBUILD b/extra/bluez/PKGBUILD
index 053ec0956..7822479aa 100644
--- a/extra/bluez/PKGBUILD
+++ b/extra/bluez/PKGBUILD
@@ -1,74 +1,143 @@
-# $Id: PKGBUILD 197876 2013-10-30 11:24:44Z allan $
+# $Id: PKGBUILD 202773 2013-12-27 22:14:31Z andyrtr $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
pkgbase=bluez
-pkgname=('bluez' 'bluez-utils' 'bluez-libs')
-pkgver=5.9
+pkgname=('bluez' 'bluez-utils' 'bluez-libs' 'bluez-cups' 'bluez-hid2hci' 'bluez-plugins')
+pkgver=5.13
pkgrel=1
url="http://www.bluez.org/"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
makedepends=('dbus' 'libical' 'systemd')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.bz2")
+source=(http://www.kernel.org/pub/linux/bluetooth/${pkgname}-${pkgver}.tar.xz
+ 0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+ bluetooth.modprobe)
+md5sums=('c68f8cb270110256a684403ee43b5f79'
+ 'ec97f23123456900446e8ab17361d6c2'
+ '671c15e99d7154c2df987b71c5851b3d')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+prepare() {
+ cd $pkgname-$pkgver
+ # patch not upstreamable for obex file transfer - FS#37773 taken from FC
+ # http://www.hadess.net/2013/11/bluetooth-file-sharing-obexpush-in.html
+ patch -Np1 -i ${srcdir}/0001-Allow-using-obexd-without-systemd-in-the-user-session.patch
+ autoreconf -vfi
+}
+build() {
+ cd ${pkgname}-${pkgver}
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib \
+ --enable-sixaxis \
--enable-library # this is deprecated
+# --enable-experimental \
+
+ make all V=1
+}
- make
+check() {
+ cd $pkgname-$pkgver
+ make check
}
+
package_bluez() {
pkgdesc="Daemons for the bluetooth protocol stack"
depends=('libical' 'dbus' 'glib2')
- optdepends=("cups: CUPS backend")
- backup=('etc/dbus-1/system.d/bluetooth.conf')
+ backup=('etc/dbus-1/system.d/bluetooth.conf'
+ 'etc/bluetooth/main.conf')
conflicts=('obexd-client' 'obexd-server')
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-
- ### split out bluez-utils
- rm -rf "$srcdir/_utils"
- install -dm755 "$srcdir"/_utils/usr/share/man
- mv "$pkgdir"/usr/share/man/man1 "$srcdir"/_utils/usr/share/man/
- install -dm755 "$srcdir"/_utils/usr/bin
- mv "$pkgdir"/usr/bin/{bccmd,ciptool,hciattach,hciconfig,hcidump,hcitool,l2ping,l2test,rctest,rfcomm,sdptool}\
- "$srcdir"/_utils/usr/bin/
- install -dm755 "$srcdir"/_utils/usr/lib
- mv "$pkgdir"/usr/lib/udev "$srcdir"/_utils/usr/lib/
-
- ### split out bluez-libs
- rm -rf "$srcdir/_libs"
- install -dm755 "$srcdir"/_libs/usr/lib/
- mv "$pkgdir"/usr/lib/{pkgconfig,libbluetooth*} \
- "$srcdir"/_libs/usr/lib/
- mv "$pkgdir"/usr/include \
- "$srcdir"/_libs/usr/
-}
+ cd ${pkgbase}-${pkgver}
+ #make DESTDIR=${pkgdir} install
+ #return 1
+
+ make DESTDIR=${pkgdir} \
+ install-libexecPROGRAMS \
+ install-dbussessionbusDATA \
+ install-systemdsystemunitDATA \
+ install-systemduserunitDATA \
+ install-dbussystembusDATA \
+ install-dbusDATA \
+ install-man8
-package_bluez-libs() {
- pkgdesc="Deprecated libraries for the bluetooth protocol stack"
- depends=('glibc')
+ # ship upstream main config file
+ install -dm755 ${pkgdir}/etc/bluetooth
+ install -Dm644 ${srcdir}/${pkgbase}-${pkgver}/src/main.conf ${pkgdir}/etc/bluetooth/main.conf
- mv "$srcdir/_libs"/* "$pkgdir"
+ # add basic documention
+ install -dm755 ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis
+ cp -a doc/*.txt ${pkgdir}/usr/share/doc/${pkgbase}/dbus-apis/
+ # fix module loading errors
+ install -dm755 ${pkgdir}/usr/lib/modprobe.d
+ install -Dm644 ${srcdir}/bluetooth.modprobe ${pkgdir}/usr/lib/modprobe.d/bluetooth-usb.conf
}
+
package_bluez-utils() {
pkgdesc="Development and debugging utilities for the bluetooth protocol stack"
- depends=('systemd')
+ depends=('dbus' 'systemd')
conflicts=('bluez-hcidump')
provides=('bluez-hcidump')
replaces=('bluez-hcidump' 'bluez<=4.101')
- mv "$srcdir/_utils"/* "$pkgdir"
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-binPROGRAMS \
+ install-man1
+
+ # libbluetooth.so* are part of libLTLIBRARIES and binPROGRAMS targets
+ #make DESTDIR=${pkgdir} uninstall-libLTLIBRARIES
+ #rmdir ${pkgdir}/usr/lib
+ rm -rf ${pkgdir}/usr/lib
+
+ # move the hid2hci man page out
+ mv ${pkgdir}/usr/share/man/man1/hid2hci.1 ${srcdir}/
+}
+
+package_bluez-libs() {
+ pkgdesc="Deprecated libraries for the bluetooth protocol stack"
+ depends=('glibc')
+ license=('LGPL2.1')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-includeHEADERS \
+ install-libLTLIBRARIES \
+ install-pkgconfigDATA
+}
+
+package_bluez-cups() {
+ pkgdesc="CUPS printer backend for Bluetooth printers"
+ depends=('cups')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} install-cupsPROGRAMS
+}
+
+package_bluez-hid2hci() {
+ pkgdesc="Put HID proxying bluetooth HCI's into HCI mode"
+ depends=('systemd')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-udevPROGRAMS \
+ install-rulesDATA
+
+ install -dm755 ${pkgdir}/usr/share/man/man1
+ mv ${srcdir}/hid2hci.1 ${pkgdir}/usr/share/man/man1/hid2hci.1
+}
+
+package_bluez-plugins() {
+ pkgdesc="bluez plugins (PS3 sicaxis controller)"
+ depends=('systemd')
+
+ cd ${pkgbase}-${pkgver}
+ make DESTDIR=${pkgdir} \
+ install-pluginLTLIBRARIES
}
-md5sums=('6edaf60d09ee32942a739f80ea847db1')
diff --git a/extra/bluez/bluetooth.modprobe b/extra/bluez/bluetooth.modprobe
new file mode 100644
index 000000000..3072d7885
--- /dev/null
+++ b/extra/bluez/bluetooth.modprobe
@@ -0,0 +1,3 @@
+# use "reset=1" as default, since it should be safe for recent devices and
+# solves all kind of problems.
+options btusb reset=1
diff --git a/extra/bluez4/PKGBUILD b/extra/bluez4/PKGBUILD
deleted file mode 100644
index b780e75b8..000000000
--- a/extra/bluez4/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 197877 2013-10-30 11:25:04Z allan $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-
-pkgname=bluez4
-pkgver=4.101
-pkgrel=3
-pkgdesc="Deprecated daemon and tools for the Bluetooth protocol stack"
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-depends=('dbus' 'bluez-utils')
-conflicts=('bluez')
-replaces=("bluez<=$pkgver")
-makedepends=('gstreamer0.10-base' 'libusb-compat' 'libsndfile' 'libusbx')
-optdepends=("gstreamer0.10-base: bluetooth GStreamer support"
- "alsa-lib: Audio bluetooth devices support"
- "python2: to run bluez-simple-agent"
- "dbus-python: to run bluez-simple-agent"
- "pygobject: to run bluez-simple-agent"
- "libusb-compat: USB adapters support"
- "cups: CUPS backend")
-backup=(etc/bluetooth/{main,rfcomm,audio,network,input,serial}.conf
- etc/dbus-1/system.d/bluetooth.conf)
-source=("http://www.kernel.org/pub/linux/bluetooth/bluez-${pkgver}.tar.bz2")
-
-build() {
- cd bluez-"${pkgver}"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --libexecdir=/usr/lib \
- --sbindir=/usr/lib/bluetooth \
- --enable-gstreamer \
- --enable-alsa \
- --enable-usb \
- --enable-dfutool \
- --enable-dund \
- --enable-hidd \
- --enable-pand \
- --enable-gatt \
- --enable-cups \
- --enable-wiimote \
- --disable-test \
- --with-systemdunitdir=/usr/lib/systemd/system
-
- make
-}
-
-package() {
- cd bluez-"${pkgver}"
- make DESTDIR=${pkgdir} install
-
- # adjust systemd service file
- sed -i 's#/usr/sbin/#/usr/lib/bluetooth/#' \
- "${pkgdir}"/usr/lib/systemd/system/bluetooth.service
-
- install -d ${pkgdir}/etc/bluetooth
- install -m644 network/network.conf \
- input/input.conf \
- audio/audio.conf \
- serial/serial.conf \
- ${pkgdir}/etc/bluetooth/
-
- # FS#27630
- install -Dm755 test/simple-agent "${pkgdir}"/usr/bin/bluez-simple-agent
- install -Dm755 test/test-device "${pkgdir}"/usr/bin/bluez-test-device
- install -Dm755 test/test-input "${pkgdir}"/usr/bin/bluez-test-input
- sed -i 's#/usr/bin/python#/usr/bin/python2#' \
- "${pkgdir}"/usr/bin/bluez-simple-agent \
- "${pkgdir}"/usr/bin/bluez-test-device \
- "${pkgdir}"/usr/bin/bluez-test-input
-
- # drop files that are in bluez-libs
- rm -rf "${pkgdir}"/usr/{include,lib/pkgconfig}
- rm "${pkgdir}"/usr/lib/libbluetooth*
-
- # drop files that are in bluez-utils
- rm -rf "${pkgdir}"/lib
- rm "${pkgdir}"/usr/bin/{ciptool,hcitool,l2ping,rfcomm,sdptool}
- rm "${pkgdir}"/usr/share/man/man1/{ciptool,hcitool,rfcomm,sdptool}.1
- rm "${pkgdir}"/usr/lib/bluetooth/{hciattach,hciconfig}
- rm "${pkgdir}"/usr/share/man/man8/{hciattach,hciconfig}.8
-}
-md5sums=('902b390af95c6c5d6d1a17d94c8344ab')
diff --git a/extra/boost/001-log_fix_dump_avx2.patch b/extra/boost/001-log_fix_dump_avx2.patch
new file mode 100644
index 000000000..ae9cfd727
--- /dev/null
+++ b/extra/boost/001-log_fix_dump_avx2.patch
@@ -0,0 +1,13 @@
+Index: libs/log/src/dump_avx2.cpp
+===================================================================
+--- libs/log/src/dump_avx2.cpp (revision 86614)
++++ libs/log/src/dump_avx2.cpp (working copy)
+@@ -205,7 +205,7 @@
+ __m256i mm_input = _mm256_load_si256(reinterpret_cast< const __m256i* >(p));
+ __m256i mm_output1, mm_output2, mm_output3;
+ dump_pack(mm_char_10_to_a, mm_input, mm_output1, mm_output2, mm_output3);
+- store_characters_x3(mm_output1, mm_output2, mm_output3, buf);
++ store_characters_x3(mm_output1, mm_output2, mm_output3, b);
+ }
+
+ _mm256_zeroall(); // need to zero all ymm registers to avoid register spills/restores the compler generates around the function call
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 9cd056924..29255aec2 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196738 2013-10-17 14:02:41Z andyrtr $
+# $Id: PKGBUILD 202226 2013-12-20 02:36:58Z svenstaro $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: kevin <kevin@archlinux.org>
@@ -8,7 +8,7 @@
pkgbase=boost
pkgname=('boost-libs' 'boost')
-pkgver=1.54.0
+pkgver=1.55.0
_boostver=${pkgver//./_}
pkgrel=4
url="http://www.boost.org/"
@@ -16,53 +16,47 @@ arch=('i686' 'x86_64' 'mips64el')
license=('custom')
makedepends=('icu>=52.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
- boost-1.53.0-python3.patch
- boost-1.54.0-Fix-macro-for-int128-detection.patch
- fix-new-glibc.patch)
-sha1sums=('069501636097d3f40ddfd996d29748bb23591c53'
- '34026072a7cb2534164f20e77bb71a5c75093307'
- 'bf5177694ab8a0df6bc13aa47b05727c40febebb'
- 'e3a5fac340c12b39add50070efb439b857108a0b')
+ 001-log_fix_dump_avx2.patch)
+sha1sums=('61ed0e57d3c7c8985805bb0682de3f4c65f4b6e5'
+ 'a4a47cc5716df87d544ae7684aaf402287132d50')
-build() {
+prepare() {
export _stagedir="${srcdir}/stagedir"
- local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
-
- cd "${srcdir}/${pkgbase}_${_boostver}"
-
- patch -Np2 -i ../boost-1.54.0-Fix-macro-for-int128-detection.patch
- patch -Np2 -i ../fix-new-glibc.patch
+ cd ${pkgbase}_${_boostver}
- # Fix build errors with python 3
- sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
- patch -Np1 -i ../boost-1.53.0-python3.patch
+ patch -p0 -i ../001-log_fix_dump_avx2.patch
- # Shut up strict aliasing warnings
- echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam
# Add an extra python version. This does not replace anything and python 2.x need to be the default.
echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam
- # Support for OpenMPI
+
+ # Support for OpenMPI
echo "using mpi ;" >> ./tools/build/v2/user-config.jam
+}
+
+build() {
+ local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
+
+ cd ${pkgbase}_${_boostver}
./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2
_bindir="bin.linuxx86"
- [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
- [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips"
+ [[ "${CARCH}" = "x86_64" ]] && _bindir="bin.linuxx86_64"
+ [[ "${CARCH}" = "mips64el" ]] && _bindir="bin.linuxmips"
- install -d -m 755 "${_stagedir}"/bin
- install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam
+ install -dm755 "${_stagedir}"/bin
+ install tools/build/v2/engine/${_bindir}/b2 "${_stagedir}"/bin/b2
pushd tools
for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do
- "${_stagedir}"/bin/bjam --toolset=gcc $_tool
+ "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -std=gnu++11 -O3" linkflags="${LDFLAGS}" $_tool
done
- "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status
+ "${_stagedir}"/bin/b2 --toolset=gcc cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" library_status
popd
cp -a dist/bin/* "${_stagedir}"/bin
- #boostbook is needed by quickbook
- install -d -m 755 "${_stagedir}"/share/boostbook
+ # boostbook is needed by quickbook
+ install -dm755 "${_stagedir}"/share/boostbook
cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/
# Disable context on mips64el, it needs N32-specific assembly.
@@ -74,21 +68,20 @@ build() {
# and installs includes in /usr/include/boost.
# --layout=system no longer adds the -mt suffix for multi-threaded libs.
# install to ${_stagedir} in preparation for split packaging
- "${_stagedir}"/bin/bjam \
+ "${_stagedir}"/bin/b2 \
variant=release \
debug-symbols=off \
threading=multi \
runtime-link=shared \
- link=shared \
+ link=shared,static \
toolset=gcc \
python=2.7 \
+ cflags="${CPPFLAGS} ${CFLAGS} -O3" linkflags="${LDFLAGS}" \
--layout=system \
--prefix="${_stagedir}" \
$extra \
${JOBS} \
install
-
- find ${_stagedir} -name \*.a -exec rm -f {} \;
}
package_boost() {
@@ -97,12 +90,18 @@ package_boost() {
optdepends=('python: for python bindings'
'python2: for python2 bindings'
'boost-build: to use boost jam for building your project.')
+ options=('staticlibs')
- install -d -m 755 "${pkgdir}"/usr
+ install -dm755 "${pkgdir}"/usr
cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr
- install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+ install -d "${pkgdir}"/usr/lib
+ find "${_stagedir}"/lib -name \*.a -exec mv {} "${pkgdir}"/usr/lib \;
+
+ install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
"${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
+
+ ln -s /usr/bin/b2 "$pkgdir"/usr/bin/bjam
}
package_boost-libs() {
@@ -110,9 +109,9 @@ package_boost-libs() {
depends=('bzip2' 'zlib' 'icu')
optdepends=('openmpi: for mpi support')
- install -d -m 755 "${pkgdir}"/usr
+ install -dm755 "${pkgdir}"/usr
cp -a "${_stagedir}"/lib "${pkgdir}"/usr
- install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+ install -Dm644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
"${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
}
diff --git a/extra/boost/boost-1.53.0-python3.patch b/extra/boost/boost-1.53.0-python3.patch
deleted file mode 100644
index 8d2f59269..000000000
--- a/extra/boost/boost-1.53.0-python3.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -Naur boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp boost_1_53_0/libs/mpi/src/python/datatypes.cpp
---- boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp 2007-11-25 13:38:02.000000000 -0500
-+++ boost_1_53_0/libs/mpi/src/python/datatypes.cpp 2013-03-11 20:59:57.171732691 -0400
-@@ -13,6 +13,10 @@
- #include <boost/mpi/python/serialize.hpp>
- #include <boost/mpi.hpp>
-
-+#if PY_MAJOR_VERSION >= 3
-+#define PyInt_Type PyLong_Type
-+#endif
-+
- namespace boost { namespace mpi { namespace python {
-
- void export_datatypes()
-diff -Naur boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp boost_1_53_0/libs/mpi/src/python/py_environment.cpp
---- boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp 2007-11-25 13:38:02.000000000 -0500
-+++ boost_1_53_0/libs/mpi/src/python/py_environment.cpp 2013-03-11 21:02:12.961737401 -0400
-@@ -11,6 +11,9 @@
- * This file reflects the Boost.MPI "environment" class into Python
- * methods at module level.
- */
-+
-+#include <locale>
-+#include <string>
- #include <boost/python.hpp>
- #include <boost/mpi.hpp>
-
-@@ -50,11 +53,65 @@
-
- // If anything changed, convert C-style argc/argv into Python argv
- if (mpi_argv != my_argv)
-+ {
-+#if PY_MAJOR_VERSION >= 3
-+ // Code stolen from py3k/Modules/python.c.
-+
-+ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+ /* We need a second copies, as Python might modify the first one. */
-+ wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+
-+ if (!argv_copy || !argv_copy2) {
-+ fprintf(stderr, "out of memory\n");
-+ return false;
-+ }
-+
-+ std::locale mylocale;
-+ mbstate_t mystate;
-+
-+ const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
-+ std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
-+
-+ for (int i = 0; i < mpi_argc; i++)
-+ {
-+ size_t length = strlen(mpi_argv[i]);
-+
-+ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
-+
-+ const char *from_next;
-+ wchar_t *to_next;
-+
-+ std::codecvt<wchar_t,char,mbstate_t>::result myresult =
-+ myfacet.out(mystate,
-+ mpi_argv[i], mpi_argv[i] + length + 1, from_next,
-+ dest, dest+length+1, to_next);
-+
-+ if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
-+ {
-+ fprintf(stderr, "failure translating argv\n");
-+ return 1;
-+ }
-+
-+ argv_copy2[i] = argv_copy[i] = dest;
-+ if (!argv_copy[i])
-+ return false;
-+ }
-+
-+ PySys_SetArgv(mpi_argc, argv_copy);
-+
-+ for (int i = 0; i < mpi_argc; i++) {
-+ PyMem_Free(argv_copy2[i]);
-+ }
-+ PyMem_Free(argv_copy);
-+ PyMem_Free(argv_copy2);
-+#else
- PySys_SetArgv(mpi_argc, mpi_argv);
-+#endif
-+ }
-
-- for (int arg = 0; arg < my_argc; ++arg)
-- free(my_argv[arg]);
-- delete [] my_argv;
-+ for (int arg = 0; arg < mpi_argc; ++arg)
-+ free(mpi_argv[arg]);
-+ delete [] mpi_argv;
-
- return true;
- }
diff --git a/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch b/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch
deleted file mode 100644
index 1f337bedf..000000000
--- a/extra/boost/boost-1.54.0-Fix-macro-for-int128-detection.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: /trunk/boost/lexical_cast.hpp
-===================================================================
---- /trunk/boost/lexical_cast.hpp (revision 84136)
-+++ /trunk/boost/lexical_cast.hpp (revision 84965)
-@@ -70,8 +70,8 @@
- #endif
-
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+// GCC 4.6 has some issues with int128 and uint128. Issues were fixed in GCC 4.7
-+#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
- #define BOOST_LCAST_HAS_INT128
- #endif
--
-
- namespace boost
-Index: /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp
-===================================================================
---- /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp (revision 83717)
-+++ /trunk/libs/conversion/test/lexical_cast_integral_types_test.cpp (revision 84965)
-@@ -49,5 +49,5 @@
- #endif
-
--#if (defined(BOOST_LCAST_HAS_INT128) && !defined(__GNUC__)) || GCC_VERSION > 40700
-+#if defined(BOOST_HAS_INT128) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 6))
- #define BOOST_LCAST_HAS_INT128
- #endif
-@@ -445,6 +445,6 @@
-
- // Overflow test case from David W. Birdsall
-- std::string must_owerflow_str = "160000000000000000000";
-- std::string must_owerflow_negative_str = "-160000000000000000000";
-+ std::string must_owerflow_str = (sizeof(T) < 16 ? "160000000000000000000" : "1600000000000000000000000000000000000000");
-+ std::string must_owerflow_negative_str = (sizeof(T) < 16 ? "-160000000000000000000" : "-1600000000000000000000000000000000000000");
- for (int i = 0; i < 15; ++i) {
- BOOST_CHECK_THROW(lexical_cast<T>(must_owerflow_str), bad_lexical_cast);
diff --git a/extra/boost/fix-new-glibc.patch b/extra/boost/fix-new-glibc.patch
deleted file mode 100644
index 5daa11cf5..000000000
--- a/extra/boost/fix-new-glibc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: /trunk/boost/cstdint.hpp
-===================================================================
---- /trunk/boost/cstdint.hpp (revision 84805)
-+++ /trunk/boost/cstdint.hpp (revision 84950)
-@@ -42,5 +42,8 @@
- // See https://svn.boost.org/trac/boost/ticket/3548 and http://sources.redhat.com/bugzilla/show_bug.cgi?id=10990
- //
--#if defined(BOOST_HAS_STDINT_H) && (!defined(__GLIBC__) || defined(__GLIBC_HAVE_LONG_LONG))
-+#if defined(BOOST_HAS_STDINT_H) \
-+ && (!defined(__GLIBC__) \
-+ || defined(__GLIBC_HAVE_LONG_LONG) \
-+ || (defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 17)))))
-
- // The following #include is an implementation artifact; not part of interface.
diff --git a/extra/brasero/PKGBUILD b/extra/brasero/PKGBUILD
index c9852bf20..12dfa88c4 100644
--- a/extra/brasero/PKGBUILD
+++ b/extra/brasero/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 197878 2013-10-30 11:25:26Z allan $
+# $Id: PKGBUILD 200317 2013-11-25 16:54:50Z heftig $
# Maintainer: Allan McRae <allan@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=brasero
-pkgver=3.8.0
-pkgrel=3
+pkgver=3.10.0
+pkgrel=1
pkgdesc="A disc burning application for Gnome"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnome.org/projects/brasero"
license=('GPL')
options=('!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' 'libnotify')
+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' 'gvfs')
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'
@@ -20,25 +20,11 @@ optdepends=('libburn: alternative back-end'
replaces=('nautilus-cd-burner')
install=brasero.install
groups=('gnome-extra')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
- bug655513.patch)
-sha256sums=('d98a368a6129e50681e8243c5e0833c32cca699bd50b839c6a551d52b396bce4'
- '3e774040c570881fe120af7c250a91e8a69331289490c823feed87c4d00f98fb')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('88fd9135e796f58caeb484d00f5d95916c67f97505e68d2027ab84d3f9245f37')
-prepare() {
- cd "$pkgname-$pkgver"
-
- # Update tracker dep
- sed -i '/tracker/s/0\.14/0.16/' configure.ac
-
- # Fix infinite loop after cancelling the burn image dialog
- patch -Np1 -i ../bug655513.patch
-}
-
build() {
cd "$pkgname-$pkgver"
- autoreconf -f -v -i
-
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-caches \
--disable-schemas-compile
diff --git a/extra/brasero/bug655513.patch b/extra/brasero/bug655513.patch
deleted file mode 100644
index c5841d3f7..000000000
--- a/extra/brasero/bug655513.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f122ee0620380b7c21edce722cfe347f10c8c827 Mon Sep 17 00:00:00 2001
-From: Joshua Lock <joshua.lock@intel.com>
-Date: Tue, 03 Sep 2013 10:01:26 +0000
-Subject: brasero-app: don't try and show the main window if it hasn't been created
-
-It's possible to open brasero without creating the main window, such as
-when opening an image file directly triggering the image burning dialogue.
-In these cases trying to show the main window when the dialogue is
-dismissed is an error, brasero should just exit.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=655513
----
-diff --git a/src/brasero-app.c b/src/brasero-app.c
-index d345941..8d10781 100644
---- a/src/brasero-app.c
-+++ b/src/brasero-app.c
-@@ -2013,6 +2013,9 @@ brasero_app_run_mainwin (BraseroApp *app)
-
- priv = BRASERO_APP_PRIVATE (app);
-
-+ if (!priv->mainwin)
-+ return FALSE;
-+
- if (priv->mainwin_running)
- return TRUE;
-
-@@ -2055,6 +2058,8 @@ brasero_app_init (BraseroApp *object)
-
- priv = BRASERO_APP_PRIVATE (object);
-
-+ priv->mainwin = NULL;
-+
- /* Load settings */
- priv->setting = brasero_setting_get_default ();
- brasero_setting_load (priv->setting);
---
-cgit v0.9.2
diff --git a/community/bullet/PKGBUILD b/extra/bullet/PKGBUILD
index 9621fe5af..5e8a66da2 100644
--- a/community/bullet/PKGBUILD
+++ b/extra/bullet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99165 2013-10-25 09:52:29Z svenstaro $
+# $Id: PKGBUILD 201525 2013-12-13 20:43:18Z ronald $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
diff --git a/community/bullet/bullet.pc b/extra/bullet/bullet.pc
index d236b477f..d236b477f 100644
--- a/community/bullet/bullet.pc
+++ b/extra/bullet/bullet.pc
diff --git a/extra/burp/PKGBUILD b/extra/burp/PKGBUILD
index 17caf175e..59d0b6883 100644
--- a/extra/burp/PKGBUILD
+++ b/extra/burp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170189 2012-11-04 15:22:01Z dreisner $
+# $Id: PKGBUILD 199808 2013-11-17 00:47:14Z dreisner $
# Maintainer: Dave Reisner <d@falconindy.com>
pkgname=burp
-pkgver=2
+pkgver=3
pkgrel=1
pkgdesc="A simple AUR uploader"
arch=('i686' 'x86_64' 'mips64el')
@@ -10,9 +10,9 @@ url="http://github.com/falconindy/burp"
license=('GPL')
depends=('glibc' 'curl')
makedepends=('perl')
-source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('390436816f38d43b3ffb1079add4fa8e'
- '2b16c8187c299d249446b251fe762aed')
+source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+md5sums=('3afc7346b3ba63ce9487bdbba1e370f1'
+ 'SKIP')
build() {
make -C "$pkgname-$pkgver"
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 412343469..b62b3c852 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196740 2013-10-17 14:02:44Z andyrtr $
+# $Id: PKGBUILD 200653 2013-12-01 09:50:18Z andyrtr $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -17,8 +17,8 @@ pkgname=('calligra-braindump'
'calligra-sheets'
'calligra-stage'
'calligra-words')
-pkgver=2.7.4
-pkgrel=1
+pkgver=2.7.5
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
@@ -29,7 +29,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
[ "$CARCH" != "mips64el" ] && makedepends+=('vc')
groups=('calligra')
source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('0a9368b4a134eaf7c9834d21097e5016')
+md5sums=('05d1d0bac970d6dc68ffabc12fca2eb7')
prepare() {
mkdir build
diff --git a/extra/caribou/PKGBUILD b/extra/caribou/PKGBUILD
index c5d80400a..3e98f6ebd 100644
--- a/extra/caribou/PKGBUILD
+++ b/extra/caribou/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197884 2013-10-30 11:27:44Z allan $
+# $Id: PKGBUILD 200221 2013-11-22 18:17:37Z heftig $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Adam Hani Schakaki <krzd@krzd.net>
pkgname=caribou
-pkgver=0.4.11
+pkgver=0.4.13
pkgrel=1
-pkgdesc="A text entry and UI navigation application being developed as an alternative to the Gnome On-screen Keyboard."
+pkgdesc="A text entry and UI navigation application (on-screen keyboard)"
arch=('i686' 'x86_64' 'mips64el')
url="http://live.gnome.org/Caribou"
license=(LGPL)
@@ -13,16 +13,19 @@ depends=(at-spi2-atk python2-atspi python2-gobject gtk3 libxklavier libgee clutt
makedepends=(intltool docbook-xsl gtk2)
install=caribou.install
options=(!emptydirs)
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.4/$pkgname-$pkgver.tar.xz)
-sha256sums=('e4e81387a1a6875652b8ec9dede8573844fac274c8de9ad0416cf586a318f4f9')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+sha256sums=('953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782')
-build() {
+prepare() {
cd $pkgname-$pkgver
sed -i s'|#!/usr/bin/python|#!/usr/bin/python2|'g tools/{fix_gir,make_schema}.py
+}
+
+build() {
+ cd $pkgname-$pkgver
export PYTHON=/usr/bin/python2
./configure --prefix=/usr --sysconfdir=/etc \
- --libexecdir=/usr/lib/caribou \
- --disable-gtk2-module \
+ --libexecdir=/usr/lib/$pkgname \
--disable-static \
--disable-schemas-compile
@@ -34,7 +37,7 @@ build() {
check() {
cd $pkgname-$pkgver
- make check
+ make -k check
}
package() {
diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD
index b8629c086..5658ded32 100644
--- a/extra/cfitsio/PKGBUILD
+++ b/extra/cfitsio/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 197887 2013-10-30 11:28:50Z allan $
+# $Id: PKGBUILD 202206 2013-12-19 12:17:51Z fyan $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cfitsio
-pkgver=3.350
-pkgrel=2
+pkgver=3.360
+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' 'mips64el')
url="http://heasarc.gsfc.nasa.gov/fitsio/"
license=('custom')
+depends=('glibc')
source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz")
-sha1sums=('e928832708d6a5df21a1e17ae4a63036cab7c1b9')
+sha512sums=('1ee864cc5c51347ec262dbc585b2dbbd8630a7396bdcbe7a860906371dc296dc147d72a999a54b255514dd81783bb8f8c79d7a75f8689d085ba90931947100e1')
build() {
cd ${pkgname}
diff --git a/extra/check/PKGBUILD b/extra/check/PKGBUILD
index 990b189c2..cc783c7a6 100644
--- a/extra/check/PKGBUILD
+++ b/extra/check/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 197888 2013-10-30 11:29:14Z allan $
+# $Id: PKGBUILD 200362 2013-11-27 06:20:00Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Jeremy Cowgar <jeremy@cowgar.com>
pkgname=check
-pkgver=0.9.10
+pkgver=0.9.11
pkgrel=1
pkgdesc="A unit testing framework for C"
arch=('i686' 'x86_64' 'mips64el')
url="http://check.sourceforge.net/"
license=('LGPL')
install=$pkgname.install
+depends=('awk')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('6d10a8efb9a683467b92b3bce97aeb30')
+md5sums=('fd5a03979bcab9fb80ba005b55f54178')
build() {
cd $pkgname-$pkgver
@@ -20,6 +21,12 @@ build() {
make
}
+check() {
+ cd $pkgname-$pkgver
+ # Extremely long
+ #make -k check
+}
+
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
diff --git a/extra/cheese/PKGBUILD b/extra/cheese/PKGBUILD
index 0fbf85869..d96c3c460 100644
--- a/extra/cheese/PKGBUILD
+++ b/extra/cheese/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 197889 2013-10-30 11:29:34Z allan $
+# $Id: PKGBUILD 200777 2013-12-04 22:00:35Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=cheese
-pkgver=3.10.1
-pkgrel=1
+pkgver=3.10.2
+pkgrel=2
pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others"
arch=(i686 x86_64 'mips64el')
license=('GPL')
-depends=('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')
+depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'gnome-video-effects' 'librsvg' 'gnome-desktop')
makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala')
optdepends=('frei0r-plugins: More camera effects')
groups=('gnome-extra')
options=('!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=('ff2e89921eb6a1eec38b4cde69ee8d0dd48ebeb821715e0080f94aa4c1064cc4')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('3e5f4ac078bac60571ff61bc2cd451349d78e01ecaaff031da16fe29ff094945')
build() {
cd $pkgname-$pkgver
diff --git a/extra/chemtool/PKGBUILD b/extra/chemtool/PKGBUILD
index 0fe76b3f0..70caf7906 100644
--- a/extra/chemtool/PKGBUILD
+++ b/extra/chemtool/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197890 2013-10-30 11:29:54Z allan $
+# $Id: PKGBUILD 199891 2013-11-18 07:50:43Z tpowa $
#Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=chemtool
-pkgver=1.6.13
-pkgrel=1.2
+pkgver=1.6.14
+pkgrel=1
pkgdesc="A small program for drawing chemical structures"
arch=(i686 x86_64 'mips64el')
license=('GPL2')
@@ -24,5 +24,5 @@ package() {
install -D -m644 gnome/chemtool.png ${pkgdir}/usr/share/pixmaps/chemtool.png
install -D -m644 ${srcdir}/chemtool.desktop ${pkgdir}/usr/share/applications/chemtool.desktop
}
-md5sums=('d263b8cf097134e36c5e929e7e77d668'
+md5sums=('3a97680f0abe1327af1f0072551a68e2'
'8cbb6f7021bd5aaa6f6a31fc4d95a06e')
diff --git a/extra/chromaprint/PKGBUILD b/extra/chromaprint/PKGBUILD
index 63e492395..96e7b021b 100644
--- a/extra/chromaprint/PKGBUILD
+++ b/extra/chromaprint/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193966 2013-09-09 09:33:12Z bisson $
+# $Id: PKGBUILD 200281 2013-11-24 17:51:20Z bisson $
# Contributor: Wieland Hoffmann <the_mineo@web.de>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=chromaprint
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc='Library that implements a custom algorithm for extracting fingerprints from any audio source'
url='http://acoustid.org/chromaprint/'
@@ -12,7 +12,7 @@ license=('LGPL')
depends=('ffmpeg')
makedepends=('cmake')
source=("https://bitbucket.org/acoustid/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('919e012af588a7e6fea862b29a30e3a5da67526a')
+sha1sums=('5a250f761761d2ce08e2591b9daa909393552939')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index de8f3d954..4fc654e83 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 189657 2013-07-04 08:28:20Z tpowa $
+# $Id: PKGBUILD 200381 2013-11-27 10:08:51Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=cifs-utils
-pkgver=6.1
+pkgver=6.2
pkgrel=1
pkgdesc="CIFS filesystem user-space tools"
arch=(i686 x86_64 'mips64el')
@@ -24,4 +24,4 @@ package() {
# set mount.cifs uid, to enable none root mounting form fstab
chmod +s $pkgdir/usr/bin/mount.cifs
}
-md5sums=('f83ef48ab1154aa74dd4cf1c1202bf04')
+md5sums=('6a83fe19e02266cb468ea3bf1cc0d007')
diff --git a/extra/cinepaint/LICENSE b/extra/cinepaint/LICENSE
deleted file mode 100644
index 746207229..000000000
--- a/extra/cinepaint/LICENSE
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2005, Kai-Uwe Behrmann
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following
- disclaimer in the documentation and/or other materials provided
- with the distribution.ntributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
deleted file mode 100644
index a3e58d68e..000000000
--- a/extra/cinepaint/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 197892 2013-10-30 11:30:55Z allan $
-# Maintainer: tobias [tobias.archlinux.org]
-# Contributor: tobias [tobias.justdreams.de]
-
-pkgname=cinepaint
-pkgver=1.3
-pkgrel=8
-pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
-arch=('i686' 'x86_64' 'mips64el')
-license=('LGPL' 'GPL' 'MIT')
-url="http://www.cinepaint.org"
-depends=('gtk2' 'openexr' 'lcms' 'libxpm' 'fltk' 'ftgl' 'libxxf86vm')
-makedepends=('python2' 'gutenprint>=5.2.9' 'optipng')
-optdepends=('python2: for python plug-ins'
- 'gutenprint: for print plug-ins'
- 'ghostscript: for pdf plug-ins')
-install=cinepaint.install
-source=(http://downloads.sourceforge.net/project/cinepaint/CinePaint/CinePaint-${pkgver}/${pkgname}-${pkgver}.tgz
- LICENSE cinepaint-libpng15.patch cinepaint-missing-include.patch)
-sha1sums=('1982e32b0f461f4fd0ff0fe17a2e81ccd8dbd52b'
- 'ca8411db87f3fc51bbdfade22f4e1f555b2ee19e'
- '3dfc9f06f02791aee59b60d33ddf9d305b0f1de5'
- 'a4f43aabdbb33d059f1a38442cd6625e4f00c5b9')
-
-prepare() {
- cd ${pkgname}
- patch -p1 -i ../cinepaint-libpng15.patch
- patch -p1 -i ../cinepaint-missing-include.patch
- find plug-ins/pygimp -type f -exec sed -i 's#env python#env python2#' {} +
- sed -i 's|$(LDFLAGS) -o|$(LDFLAGS) $(GTK_LIBS) -o|' lib/Makefile.in
- sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|' \
- -e 's|AM_PROG_CC_STDC|AC_PROG_CC|' configure.in
-
- aclocal -I aclocal
- autoconf
- sh autogen.sh
-
- # Fix invalid PNG icons to work with libpng 1.6
- # Notified the CinePaint Project Manager (Robin Rowe) via email
- find -name '*.png' -exec optipng -quiet -force -fix {} +
-}
-
-build() {
- cd ${pkgname}
- LIBS+="-lstdc++ -lm -lX11" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --libdir=/usr/lib --mandir=/usr/share/man \
- --enable-gtk2 --enable-pygimp --with-python=/usr/bin/python2
- sed -i 's/-Wl,,/-Wl,/' lib/fl_i18n/Makefile plug-ins/bracketing_to_hdr/Makefile \
- plug-ins/collect/Makefile plug-ins/icc_examin/icc_examin/Makefile plug-ins/pdf/Makefile
- make
-}
-
-package() {
- cd ${pkgname}
- make DESTDIR="${pkgdir}" install
- sed -i -e "s|-I$srcdir/cinepaint||" -e "s|-I$srcdir/cinepaint/lib||" -e "/libcinepaint.la/d" \
- -e "s|$srcdir/cinepaint/lib/.libs/\$dlname||" "${pkgdir}/usr/bin/cinepainttool"
- sed -i "s/cinepaint.png/cinepaint/" "${pkgdir}/usr/share/applications/cinepaint.desktop"
- install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/extra/cinepaint/cinepaint-libpng15.patch b/extra/cinepaint/cinepaint-libpng15.patch
deleted file mode 100644
index e22edafae..000000000
--- a/extra/cinepaint/cinepaint-libpng15.patch
+++ /dev/null
@@ -1,452 +0,0 @@
-diff -Naur cinepaint.old/plug-ins/png/png.c cinepaint/plug-ins/png/png.c
---- cinepaint.old/plug-ins/png/png.c 2012-01-23 12:39:42.000000000 -0500
-+++ cinepaint/plug-ins/png/png.c 2012-01-23 12:39:50.000000000 -0500
-@@ -390,6 +390,16 @@
- gchar *progress; /* Title for progress display... */
- guchar alpha[256], /* Index -> Alpha */
- *alpha_ptr; /* Temporary pointer */
-+ png_byte color_type;
-+ png_byte bit_depth;
-+ png_colorp palette;
-+ int num_palette;
-+ png_charpp iccp_name;
-+ int compression_type;
-+ png_bytepp iccp_profile;
-+ png_uint_32 iccp_proflen;
-+ png_uint_32 width, height;
-+ png_byte channels;
-
- /*
- * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -405,7 +415,7 @@
- info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
-
-- if (setjmp (pp->jmpbuf))
-+ if (setjmp (png_jmpbuf(pp)))
- {
- g_message ("%s\nPNG error. File corrupted?", filename);
- return image;
-@@ -442,21 +452,26 @@
- */
-
- png_read_info(pp, info);
-+ color_type = png_get_color_type(pp, info);
-+ width=png_get_image_width(pp, info);
-+ height=png_get_image_height(pp, info);
-
- /*
- * Latest attempt, this should be my best yet :)
- */
-
-+ bit_depth = png_get_bit_depth(pp, info);
-+
- #ifndef WORDS_BIGENDIAN
-- if(info->bit_depth == 16)
-+ if(bit_depth == 16)
- png_set_swap(pp);
- #endif
-
-- if (info->color_type == PNG_COLOR_TYPE_GRAY && info->bit_depth < 8) {
-+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
- png_set_expand(pp);
- }
-
-- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8) {
-+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8) {
- png_set_packing(pp);
- }
-
-@@ -464,8 +479,8 @@
- * Expand G+tRNS to GA, RGB+tRNS to RGBA
- */
-
-- if (info->color_type != PNG_COLOR_TYPE_PALETTE &&
-- (info->valid & PNG_INFO_tRNS)) {
-+ if (color_type != PNG_COLOR_TYPE_PALETTE &&
-+ (png_get_valid(pp, info, PNG_INFO_tRNS))) {
- png_set_expand(pp);
- }
-
-@@ -482,7 +497,7 @@
-
- #if PNG_LIBPNG_VER > 99
- if (png_get_valid(pp, info, PNG_INFO_tRNS) &&
-- info->color_type == PNG_COLOR_TYPE_PALETTE)
-+ color_type == PNG_COLOR_TYPE_PALETTE)
- {
- png_get_tRNS(pp, info, &alpha_ptr, &num, NULL);
- /* Copy the existing alpha values from the tRNS chunk */
-@@ -505,9 +520,9 @@
-
- png_read_update_info(pp, info);
-
-- if(info->bit_depth==16)
-+ if(bit_depth==16)
- {
-- switch (info->color_type)
-+ switch (color_type)
- {
- case PNG_COLOR_TYPE_RGB : /* RGB */
- bpp = 6;
-@@ -545,7 +560,7 @@
- }
- else
- {
-- switch (info->color_type)
-+ switch (color_type)
- {
- case PNG_COLOR_TYPE_RGB : /* RGB */
- bpp = 3;
-@@ -582,7 +597,7 @@
- };
- }
-
-- image = gimp_image_new(info->width, info->height, image_type);
-+ image = gimp_image_new(width, height, image_type);
- if (image == -1)
- {
- g_message("Can't allocate new image\n%s", filename);
-@@ -595,7 +610,7 @@
- * Create the "background" layer to hold the image...
- */
-
-- layer = gimp_layer_new(image, _("Background"), info->width, info->height,
-+ layer = gimp_layer_new(image, _("Background"), width, height,
- layer_type, 100, NORMAL_MODE);
- gimp_image_add_layer(image, layer, 0);
-
-@@ -627,20 +642,21 @@
-
- empty= 0; /* by default assume no full transparent palette entries */
-
-- if (info->color_type & PNG_COLOR_MASK_PALETTE) {
-+ if (color_type & PNG_COLOR_MASK_PALETTE) {
-
- #if PNG_LIBPNG_VER > 99
-+ png_get_PLTE(pp, info, &palette, &num_palette);
- if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
- for (empty= 0; empty < 256 && alpha[empty] == 0; ++empty);
- /* Calculates number of fully transparent "empty" entries */
-
-- gimp_image_set_cmap(image, (guchar *) (info->palette + empty),
-- info->num_palette - empty);
-+ gimp_image_set_cmap(image, (guchar *) (palette + empty),
-+ num_palette - empty);
- } else {
-- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+ gimp_image_set_cmap(image, (guchar *)palette, num_palette);
- }
- #else
-- gimp_image_set_cmap(image, (guchar *)info->palette, info->num_palette);
-+ gimp_image_set_cmap(image, (guchar *)palette, num_palette);
- #endif /* PNG_LIBPNG_VER > 99 */
-
- }
-@@ -659,18 +675,19 @@
- */
-
- tile_height = gimp_tile_height ();
-- pixel = g_new(guchar, tile_height * info->width * bpp);
-+ pixel = g_new(guchar, tile_height * width * bpp);
- pixels = g_new(guchar *, tile_height);
-+ channels=png_get_channels(pp, info);
-
-- if(info->bit_depth==16)
-+ if(bit_depth==16)
- {
- for (i = 0; i < tile_height; i ++)
-- pixels[i] = pixel + info->width * info->channels * i * 2;
-+ pixels[i] = pixel + width * channels * i * 2;
- }
- else
- {
- for (i = 0; i < tile_height; i ++)
-- pixels[i] = pixel + info->width * info->channels * i;
-+ pixels[i] = pixel + width * channels * i;
- }
-
- for (pass = 0; pass < num_passes; pass ++)
-@@ -680,11 +697,11 @@
- */
-
- for (begin = 0, end = tile_height;
-- begin < info->height;
-+ begin < height;
- begin += tile_height, end += tile_height)
- {
-- if (end > info->height)
-- end = info->height;
-+ if (end > height)
-+ end = height;
-
- num = end - begin;
-
-@@ -697,20 +714,21 @@
- gimp_pixel_rgn_set_rect(&pixel_rgn, pixel, 0, begin,
- drawable->width, num);
-
-- gimp_progress_update(((double)pass + (double)end / (double)info->height) /
-+ gimp_progress_update(((double)pass + (double)end / (double)height) /
- (double)num_passes);
- };
- };
-
- #if defined(PNG_iCCP_SUPPORTED)
- /* set icc profile */
-- if (info->iccp_proflen > 0) {
-- gimp_image_set_icc_profile_by_mem (image, info->iccp_proflen,
-- info->iccp_profile,
-- ICC_IMAGE_PROFILE);
-+ png_get_iCCP(pp, info, (png_charpp)iccp_name, &compression_type, iccp_profile, &iccp_proflen);
-+ if (iccp_proflen > 0) {
-+ gimp_image_set_icc_profile_by_mem (image, iccp_proflen,
-+ (gchar *)iccp_profile,
-+ ICC_IMAGE_PROFILE);
- printf ("%s:%d %s() set embedded profile \"%s\"\n",
- __FILE__,__LINE__,__func__,
-- info->iccp_name);
-+ (char *)iccp_name);
- }
- #endif
-
-@@ -808,6 +826,14 @@
- blue; /* Used for palette background */
- time_t cutime; /* Time since epoch */
- struct tm *gmt; /* GMT broken down */
-+ png_byte color_type;
-+ png_byte bit_depth;
-+ int filter_method=0;
-+ png_colorp palette;
-+ int num_palette;
-+ png_charpp iccp_name;
-+ png_uint_32 height;
-+ int compression_type;
-
- /*
- * PNG 0.89 and newer have a sane, forwards compatible constructor.
-@@ -824,7 +849,7 @@
- info = (png_infop)calloc(sizeof(png_info), 1);
- #endif /* PNG_LIBPNG_VER > 88 */
-
-- if (setjmp (pp->jmpbuf))
-+ if (setjmp (png_jmpbuf(pp)))
- {
- g_message ("%s\nPNG error. Couldn't save image", filename);
- return 0;
-@@ -857,15 +882,6 @@
- drawable = gimp_drawable_get (drawable_ID);
- type = gimp_drawable_type (drawable_ID);
-
-- /*
-- * Set the image dimensions, bit depth, interlacing and compression
-- */
--
-- png_set_compression_level (pp, pngvals.compression_level);
--
-- info->width = drawable->width;
-- info->height = drawable->height;
-- info->interlace_type = pngvals.interlaced;
-
- /*
- * Set color type and remember bytes per pixel count
-@@ -874,71 +890,69 @@
- switch (type)
- {
- case RGB_IMAGE :
-- info->color_type = PNG_COLOR_TYPE_RGB;
-- info->bit_depth = 8;
-+ color_type = PNG_COLOR_TYPE_RGB;
-+ bit_depth = 8;
- bpp = 3;
- break;
- case RGBA_IMAGE :
-- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-- info->bit_depth = 8;
-+ color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+ bit_depth = 8;
- bpp = 4;
- break;
- case GRAY_IMAGE :
-- info->color_type = PNG_COLOR_TYPE_GRAY;
-- info->bit_depth = 8;
-+ color_type = PNG_COLOR_TYPE_GRAY;
-+ bit_depth = 8;
- bpp = 1;
- break;
- case GRAYA_IMAGE :
-- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-- info->bit_depth = 8;
-+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+ bit_depth = 8;
- bpp = 2;
- break;
- case INDEXED_IMAGE :
- bpp = 1;
-- info->bit_depth = 8;
-- info->color_type = PNG_COLOR_TYPE_PALETTE;
-- info->valid |= PNG_INFO_PLTE;
-- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
-- info->num_palette= num_colors;
-+ bit_depth = 8;
-+ color_type = PNG_COLOR_TYPE_PALETTE;
-+ png_get_valid(pp, info, PNG_INFO_PLTE);
-+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
- break;
- case INDEXEDA_IMAGE :
- bpp = 2;
-- info->bit_depth = 8;
-- info->color_type = PNG_COLOR_TYPE_PALETTE;
-+ bit_depth = 8;
-+ color_type = PNG_COLOR_TYPE_PALETTE;
- respin_cmap (pp, info, image_ID); /* fix up transparency */
- break;
- case U16_RGB_IMAGE :
-- info->color_type = PNG_COLOR_TYPE_RGB;
-- info->bit_depth = 16;
-+ color_type = PNG_COLOR_TYPE_RGB;
-+ bit_depth = 16;
- bpp = 6;
- break;
- case U16_RGBA_IMAGE :
-- info->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-- info->bit_depth = 16;
-+ color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+ bit_depth = 16;
- bpp = 8;
- break;
- case U16_GRAY_IMAGE :
-- info->color_type = PNG_COLOR_TYPE_GRAY;
-- info->bit_depth = 16;
-+ color_type = PNG_COLOR_TYPE_GRAY;
-+ bit_depth = 16;
- bpp = 2;
- break;
- case U16_GRAYA_IMAGE :
-- info->color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-- info->bit_depth = 16;
-+ color_type = PNG_COLOR_TYPE_GRAY_ALPHA;
-+ bit_depth = 16;
- bpp = 4;
- break;
- case U16_INDEXED_IMAGE :
- bpp = 2;
-- info->bit_depth = 16;
-- info->color_type = PNG_COLOR_TYPE_PALETTE;
-- info->valid |= PNG_INFO_PLTE;
-- info->palette= (png_colorp) gimp_image_get_cmap(image_ID, &num_colors);
-- info->num_palette= num_colors;
-+ bit_depth = 16;
-+ color_type = PNG_COLOR_TYPE_PALETTE;
-+ png_get_valid(pp, info, PNG_INFO_PLTE);
-+ png_set_PLTE(pp, info, (png_colorp) gimp_image_get_cmap(image_ID, &num_colors), num_colors);
- break;
- case U16_INDEXEDA_IMAGE :
- bpp = 4;
-- info->bit_depth = 16;
-- info->color_type = PNG_COLOR_TYPE_PALETTE;
-+ bit_depth = 16;
-+ color_type = PNG_COLOR_TYPE_PALETTE;
- respin_cmap (pp, info, image_ID); /* fix up transparency */
- break;
- default:
-@@ -950,30 +964,36 @@
- * Fix bit depths for (possibly) smaller colormap images
- */
-
-- if (info->valid & PNG_INFO_PLTE) {
-- if (info->num_palette <= 2)
-- info->bit_depth= 1;
-- else if (info->num_palette <= 4)
-- info->bit_depth= 2;
-- else if (info->num_palette <= 16)
-- info->bit_depth= 4;
-+ if (png_get_valid(pp, info, PNG_INFO_PLTE)) {
-+ png_get_PLTE(pp, info, &palette, &num_palette);
-+ if (num_palette <= 2)
-+ bit_depth= 1;
-+ else if (num_palette <= 4)
-+ bit_depth= 2;
-+ else if (num_palette <= 16)
-+ bit_depth= 4;
- /* otherwise the default is fine */
- }
-
-+ png_set_compression_level (pp, pngvals.compression_level);
-+ png_set_IHDR(pp, info, drawable->width, drawable->height,
-+ bit_depth, color_type, pngvals.interlaced, compression_type, filter_method);
-+
-+
- // write icc profile
- #if defined(PNG_iCCP_SUPPORTED)
- if (gimp_image_has_icc_profile (image_ID, ICC_IMAGE_PROFILE)) {
-- int size;
-+ int size;
- char *buffer;
-
- buffer = gimp_image_get_icc_profile_by_mem (image_ID, &size,
- ICC_IMAGE_PROFILE);
- png_set_iCCP (pp, info,
- gimp_image_get_icc_profile_description (image_ID, ICC_IMAGE_PROFILE),
-- 0, buffer, size);
-+ 0, (png_const_bytep)buffer, size);
- printf ("%s:%d %s() embedd icc profile \"%s\"\n",
- __FILE__,__LINE__,__func__,
-- info->iccp_name);
-+ (char *)iccp_name);
- }
- #endif
-
-@@ -1039,13 +1059,13 @@
- * Convert unpacked pixels to packed if necessary
- */
-
-- if (info->color_type == PNG_COLOR_TYPE_PALETTE && info->bit_depth < 8)
-+ if (color_type == PNG_COLOR_TYPE_PALETTE && bit_depth < 8)
- png_set_packing(pp);
-
- /* Set swapping for 16 bit per sample images */
-
- #ifndef WORDS_BIGENDIAN
-- if (info->bit_depth == 16)
-+ if (bit_depth == 16)
- png_set_swap(pp);
- #endif
-
-@@ -1063,6 +1083,7 @@
-
- gimp_pixel_rgn_init(&pixel_rgn, drawable, 0, 0, drawable->width,
- drawable->height, FALSE, FALSE);
-+ height=png_get_image_height(pp, info);
-
- for (pass = 0; pass < num_passes; pass ++)
- {
-@@ -1077,7 +1098,7 @@
- num = end - begin;
-
- gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, begin, drawable->width, num);
-- if (info->valid & PNG_INFO_tRNS) {
-+ if (png_get_valid(pp, info, PNG_INFO_tRNS)) {
- for (i = 0; i < num; ++i) {
- fixed= pixels[i];
- for (k = 0; k < drawable->width; ++k) {
-@@ -1085,7 +1106,7 @@
- }
- }
- /* Forgot this case before, what if there are too many colors? */
-- } else if (info->valid & PNG_INFO_PLTE && bpp == 2) {
-+ } else if (png_get_valid(pp, info, PNG_INFO_PLTE) && bpp == 2) {
- for (i = 0; i < num; ++i) {
- fixed= pixels[i];
- for (k = 0; k < drawable->width; ++k) {
-@@ -1095,9 +1116,8 @@
- }
-
- png_write_rows (pp, pixels, num);
--
- gimp_progress_update (((double)pass + (double)end /
-- (double)info->height) / (double)num_passes);
-+ (double)height) / (double)num_passes);
- };
- };
-
diff --git a/extra/cinepaint/cinepaint-missing-include.patch b/extra/cinepaint/cinepaint-missing-include.patch
deleted file mode 100644
index ed159213a..000000000
--- a/extra/cinepaint/cinepaint-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp
---- cinepaint-orig/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:51:10.625503826 -0400
-+++ cinepaint/plug-ins/icc_examin/icc_examin/icc_modell_beobachter.cpp 2012-04-20 18:52:04.478835055 -0400
-@@ -32,6 +32,7 @@
-
- #include <list>
- #include <string>
-+#include <unistd.h>
-
- #include "icc_modell_beobachter.h"
-
diff --git a/extra/cinepaint/cinepaint.install b/extra/cinepaint/cinepaint.install
deleted file mode 100644
index 5e5cfef4d..000000000
--- a/extra/cinepaint/cinepaint.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
-}
diff --git a/extra/claws-mail/PKGBUILD b/extra/claws-mail/PKGBUILD
index 30e2b588b..da6b00a57 100644
--- a/extra/claws-mail/PKGBUILD
+++ b/extra/claws-mail/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 197894 2013-10-30 11:31:39Z allan $
+# $Id: PKGBUILD 201548 2013-12-14 21:56:57Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=claws-mail
-pkgver=3.9.2
-pkgrel=4
+pkgver=3.9.3
+pkgrel=1
pkgdesc="A GTK+ based e-mail client."
arch=('i686' 'x86_64')
license=('GPL3')
url="http://www.claws-mail.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4'
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 'compface'
'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind'
+makedepends=('spamassassin' 'bogofilter' 'valgrind'
# dependencies for plugins
'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk')
#'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
@@ -35,7 +35,7 @@ conflicts=('claws-mail-extra-plugins')
provides=('claws')
install=claws-mail.install
source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/${pkgname}-${pkgver}.tar.bz2{,.asc})
-md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
+md5sums=('0158b5e6b6d6866f9a75fd288a4edf04'
'SKIP')
build() {
diff --git a/extra/clucene/PKGBUILD b/extra/clucene/PKGBUILD
index ff7ba1976..fad9998cd 100644
--- a/extra/clucene/PKGBUILD
+++ b/extra/clucene/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 190036 2013-07-13 12:40:33Z svenstaro $
+# $Id: PKGBUILD 202663 2013-12-23 19:43:23Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Alexander Rødseth
# Contributor: Alois Nespor <alois.nespor@gmail.com>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=clucene
pkgver=2.3.3.4
-pkgrel=7
+pkgrel=8
pkgdesc="C++ port of the high-performance text search engine Lucene"
arch=('x86_64' 'i686' 'mips64el')
url="http://clucene.sourceforge.net/"
@@ -74,5 +74,8 @@ build() {
package() {
cd $srcdir/$pkgname-core-$pkgver
make DESTDIR="$pkgdir" install -C build
- rm -rf $pkgdir/usr/lib/CLuceneConfig.cmake
+ rm -rfv $pkgdir/usr/lib/CLuceneConfig.cmake
+
+ cd $pkgdir/usr/include//CLucene
+ ln -s /usr/lib/CLucene/clucene-config.h .
}
diff --git a/extra/clutter/PKGBUILD b/extra/clutter/PKGBUILD
index e5f5b8872..c00e4ce07 100644
--- a/extra/clutter/PKGBUILD
+++ b/extra/clutter/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197895 2013-10-30 11:32:01Z allan $
+# $Id: PKGBUILD 199922 2013-11-19 00:45:36Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=clutter
-pkgver=1.16.0
+pkgver=1.16.2
pkgrel=1
pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('LGPL')
depends=('cogl' 'mesa' 'json-glib' 'atk' 'libxi' 'libxkbcommon' 'libevdev')
makedepends=('gobject-introspection')
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae')
+sha256sums=('0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index fa1eb7491..ff739c5fa 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196220 2013-10-08 19:06:31Z andrea $
+# $Id: PKGBUILD 200685 2013-12-02 11:59:05Z svenstaro $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=cmake
-pkgver=2.8.12
-pkgrel=1
+pkgver=2.8.12.1
+pkgrel=3
pkgdesc="A cross-platform open-source make system"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.cmake.org/"
@@ -13,12 +13,16 @@ depends=('curl' 'libarchive' 'shared-mime-info')
makedepends=('qt4' 'emacs')
optdepends=('qt4: cmake-gui')
install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('105bc6d21cc2e9b6aff901e43c53afea')
+source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
+ "findfreetype.patch")
+md5sums=('9d38cd4e2c94c3cea97d0e2924814acc'
+ '90321de1d9d46cd8d6609d0509dbd7b0')
build() {
cd ${pkgname}-${pkgver}
+ patch -Np1 < ${srcdir}/findfreetype.patch
+
./bootstrap --prefix=/usr \
--mandir=/share/man \
--docdir=/share/doc/cmake \
diff --git a/extra/cmake/findfreetype.patch b/extra/cmake/findfreetype.patch
new file mode 100644
index 000000000..454b591dd
--- /dev/null
+++ b/extra/cmake/findfreetype.patch
@@ -0,0 +1,26 @@
+diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
+index 179dc00..0f5a2b4 100644
+--- a/Modules/FindFreetype.cmake
++++ b/Modules/FindFreetype.cmake
+@@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
+ ENV GTKMM_BASEPATH
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+- PATH_SUFFIXES include/freetype2 include
++ PATH_SUFFIXES include/freetype2 include/freetype include
+ )
+
+-find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
++find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
+ HINTS
+ ENV FREETYPE_DIR
+ PATHS
+@@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
+ ENV GTKMM_BASEPATH
+ [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
+- PATH_SUFFIXES include/freetype2 include
++ PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype
+ )
+
+ find_library(FREETYPE_LIBRARY
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index 8807045cd..13d84dd4f 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197899 2013-10-30 11:33:33Z allan $
+# $Id: PKGBUILD 199996 2013-11-20 23:55:49Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgname=colord
-pkgver=1.0.2
-pkgrel=2
+pkgver=1.0.4
+pkgrel=1
pkgdesc="System daemon for managing color devices"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/software/colord"
@@ -16,7 +16,7 @@ install=colord.install
backup=(etc/colord.conf)
source=($url/releases/$pkgname-$pkgver.tar.xz
udev-systemd.patch)
-sha1sums=('081ce4457e9752c726e68820b1b079ab314093a0'
+sha1sums=('85a08925690a33011cb3d032b0d20cd9ca86adb3'
'3b467b9674f767c804943d191beaf6bd1ba3a606')
prepare() {
diff --git a/extra/conky/PKGBUILD b/extra/conky/PKGBUILD
index bb4b7786b..5c8a528d5 100644
--- a/extra/conky/PKGBUILD
+++ b/extra/conky/PKGBUILD
@@ -1,24 +1,23 @@
-# $Id: PKGBUILD 158528 2012-05-03 23:54:02Z bisson $
+# $Id: PKGBUILD 199065 2013-11-08 03:17:34Z bisson $
+# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: James Rayner <james@archlinux.org>
# Contributor: Partha Chowdhury <kira.laucas@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=conky
pkgver=1.9.0
-pkgrel=1
+pkgrel=2
pkgdesc='Lightweight system monitor for X'
url='http://conky.sourceforge.net/'
license=('BSD' 'GPL')
arch=('i686' 'x86_64' 'mips64el')
-options=('!emptydirs')
makedepends=('docbook2x')
-depends=('alsa-lib' 'libxml2' 'curl' 'wireless_tools' 'libxft' 'glib2' 'libxdamage' 'imlib2')
-backup=('etc/conky/conky.conf' 'etc/conky/conky_no_x11.conf')
+depends=('glib2' 'curl' 'lua' 'wireless_tools' 'libxml2' 'libxft' 'libxdamage' 'imlib2')
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
sha1sums=('a8d26d002370c9b877ae77ad3a3bbd2566b38e5d')
-replaces=('torsmo')
+backup=('etc/conky/'conky{,_no_x11}.conf)
+options=('!emptydirs')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -31,7 +30,6 @@ build() {
--enable-rss \
--enable-weather-xoap \
--enable-imlib2 \
- --disable-lua \
--enable-wlan \
make
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index b96f9a7b6..60395b68d 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197696 2013-10-28 15:56:36Z andyrtr $
+# $Id: PKGBUILD 199750 2013-11-15 15:38:18Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase="cups"
pkgname=('libcups' 'cups')
pkgver=1.7.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.cups.org/"
@@ -23,6 +23,7 @@ source=(#http://mirror.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.b
cups-res_init.patch
cups-avahi-address.patch
cups-enum-all.patch
+ cups-final-content-type.patch
# Gentoo
cups-1.6.0-fix-install-perms.patch
cups-1.6.2-statedir.patch
@@ -41,6 +42,7 @@ md5sums=('5ab496a2ce27017fcdb3d7ec4818a75a'
'8fe27d4248cacbc02824e7937cab4088'
'df0c367c0022e3c7d8e01827e8a6c5e7'
'f30c2a161caaf27854581507cde8cac6'
+ 'a31b64ba25a985fbae65d8ddf311b08c'
'5117f65342fcc69c6a506529e4daca9e'
'451609db34f95209d64c38474de27ce1'
'cb58bf4e0b80eaee383712e5c84a1ab4'
@@ -88,6 +90,9 @@ prepare() {
# Return from cupsEnumDests() once all records have been returned.
patch -Np1 -i ${srcdir}/cups-enum-all.patch
+ # Fix printing to some network printers fails - https://bugs.archlinux.org/task/37605
+ patch -Np1 -i ${srcdir}/cups-final-content-type.patch
+
# Rebuild configure script for not zipping man-pages.
aclocal -I config-scripts
autoconf -I config-scripts
diff --git a/extra/cups/cups-final-content-type.patch b/extra/cups/cups-final-content-type.patch
new file mode 100644
index 000000000..6ae4010eb
--- /dev/null
+++ b/extra/cups/cups-final-content-type.patch
@@ -0,0 +1,18 @@
+diff -up cups-1.6.4/scheduler/job.c.final-content-type cups-1.6.4/scheduler/job.c
+--- cups-1.6.4/scheduler/job.c.final-content-type 2013-09-27 16:58:13.934775402 +0100
++++ cups-1.6.4/scheduler/job.c 2013-09-27 17:00:57.716549576 +0100
+@@ -692,12 +692,7 @@ cupsdContinueJob(cupsd_job_t *job) /* I
+
+ if (!job->printer->remote)
+ {
+- for (filter = (mime_filter_t *)cupsArrayLast(filters);
+- filter && filter->dst;
+- filter = (mime_filter_t *)cupsArrayPrev(filters))
+- if (strcmp(filter->dst->super, "printer") ||
+- strcmp(filter->dst->type, job->printer->name))
+- break;
++ filter = (mime_filter_t *)cupsArrayLast(filters);
+
+ if (filter && filter->dst)
+ {
+
diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD
index ef6a59d2c..7ca266cd8 100644
--- a/extra/cvsps/PKGBUILD
+++ b/extra/cvsps/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 176011 2013-01-25 18:19:34Z dan $
+# $Id: PKGBUILD 202197 2013-12-19 06:40:49Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
pkgname=cvsps
-pkgver=3.10
+pkgver=3.13
pkgrel=1
pkgdesc="Generating 'patchset' information from a CVS repository"
url="http://www.catb.org/esr/cvsps/"
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64' 'mips64el')
depends=('zlib')
makedepends=('asciidoc')
source=("http://www.catb.org/~esr/cvsps/cvsps-${pkgver}.tar.gz")
-md5sums=('eafd64ba9359105d950462552750cc51')
+md5sums=('684c22c70b305030d50dc4ee050978df')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/digikam/PKGBUILD b/extra/digikam/PKGBUILD
index 72e6e9e6a..d34f40f4a 100644
--- a/extra/digikam/PKGBUILD
+++ b/extra/digikam/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196619 2013-10-15 19:42:35Z ronald $
+# $Id: PKGBUILD 202656 2013-12-23 16:27:53Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,7 +6,7 @@
pkgbase=digikam
pkgname=('digikam' 'kipi-plugins' 'libkface' 'libkgeomap' 'libkvkontakte' 'libmediawiki')
pkgver=3.5.0
-pkgrel=1
+pkgrel=2
pkgdesc="Digital photo management application for KDE"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
@@ -92,6 +92,7 @@ package_kipi-plugins() {
'opencv: Remove Red Eyes plugin'
'imagemagick: Video SlideShow plugin'
'qt-gstreamer: Video SlideShow plugin')
+ options=('staticlibs')
install=kipi-plugins.install
cd build/extra/kipi-plugins
diff --git a/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch b/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch
deleted file mode 100644
index 866b3e8d9..000000000
--- a/extra/dnsmasq/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 7b174c250df2bc97b503fd03b9e473998676b1a6 Mon Sep 17 00:00:00 2001
-From: Simon Kelley <simon@thekelleys.org.uk>
-Date: Mon, 28 Oct 2013 13:14:03 +0000
-Subject: [PATCH] Fix check for local domains in CNAME case. Fixes
- d56a604a9600c08d4a863527d549713c07f0186d
-
----
- src/cache.c | 2 +-
- src/rfc1035.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/cache.c b/src/cache.c
-index d99aba6..6c5f601 100644
---- a/src/cache.c
-+++ b/src/cache.c
-@@ -330,7 +330,7 @@ static int cache_scan_free(char *name, struct all_addr *addr, time_t now, unsign
- ((flags & crecp->flags & F_TYPE) || ((crecp->flags | flags) & F_CNAME)) &&
- hostname_isequal(cache_get_name(crecp), name))
- {
-- if (crecp->flags & (F_HOSTS | F_DHCP))
-+ if (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG))
- return 0;
- *up = crecp->hash_next;
- cache_unlink(crecp);
-diff --git a/src/rfc1035.c b/src/rfc1035.c
-index fc6d09c..ff97576 100644
---- a/src/rfc1035.c
-+++ b/src/rfc1035.c
-@@ -1221,7 +1221,7 @@ int check_for_local_domain(char *name, time_t now)
- struct naptr *naptr;
-
- if ((crecp = cache_find_by_name(NULL, name, now, F_IPV4 | F_IPV6 | F_CNAME)) &&
-- (crecp->flags & (F_HOSTS | F_DHCP)))
-+ (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG)))
- return 1;
-
- for (naptr = daemon->naptr; naptr; naptr = naptr->next)
-@@ -1861,7 +1861,7 @@ size_t answer_request(struct dns_header *header, char *limit, size_t qlen,
- if (qtype == T_CNAME || qtype == T_ANY)
- {
- if ((crecp = cache_find_by_name(NULL, name, now, F_CNAME)) &&
-- (qtype == T_CNAME || (crecp->flags & (F_HOSTS | F_DHCP))))
-+ (qtype == T_CNAME || (crecp->flags & (F_HOSTS | F_DHCP | F_CONFIG))))
- {
- ans = 1;
- if (!dryrun)
---
-1.8.4.2
-
diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD
index 77d3c138d..0d1a7a26d 100644
--- a/extra/dnsmasq/PKGBUILD
+++ b/extra/dnsmasq/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198525 2013-10-30 15:23:36Z dreisner $
+# $Id: PKGBUILD 201313 2013-12-08 20:12:10Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=dnsmasq
-pkgver=2.67
-pkgrel=2
+pkgver=2.68
+pkgrel=1
pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server"
url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,10 +14,8 @@ depends=('glibc' 'dbus-core')
install=$pkgname.install
backup=('etc/dnsmasq.conf')
source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.xz"
- '0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch'
'dnsmasq.service')
-md5sums=('3560068c6cc644a01924fa089a70bb9c'
- '38bcc0c2b8dbc480e58a3478cae34bf6'
+md5sums=('fec885ba0a9df0f7d8f2e44db48f19ae'
'7ac45726cabef4145db40d758cc7fedf')
prepare() {
@@ -26,8 +24,6 @@ prepare() {
# link against dbus. this ugliness is needed to ensure that the
# compile time opts report properly on startup. yuck.
sed -i '/^#ifdef DNSMASQ_COMPILE_OPTS/ i#define HAVE_DBUS' src/config.h
-
- patch -Np1 <"$srcdir/0001-Fix-check-for-local-domains-in-CNAME-case.-Fixes-d56.patch"
}
build() {
diff --git a/extra/docker/PKGBUILD b/extra/docker-tray/PKGBUILD
index 6ed4810b7..f8a111d80 100644
--- a/extra/docker/PKGBUILD
+++ b/extra/docker-tray/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 176971 2013-02-03 07:03:24Z allan $
+# $Id: PKGBUILD 200798 2013-12-05 11:49:45Z bpiotrowski $
# Contributor: Jochem Kossen <j.kossen@home.nl>
-pkgname=docker
+pkgname=docker-tray
pkgver=1.5
-pkgrel=6
+pkgrel=1
pkgdesc="Docker is a docking application (WindowMaker dock app) which acts as a system tray for KDE and GNOME2."
arch=('i686' 'x86_64' 'mips64el')
url="http://icculus.org/openbox/2/docker/"
license=('GPL')
depends=('glibc' 'glib2' 'libx11')
-source=("http://icculus.org/openbox/2/$pkgname/$pkgname-$pkgver.tar.gz")
+replaces=("docker<=1.5")
+conflicts=("docker")
+source=("http://icculus.org/openbox/2/docker/docker-$pkgver.tar.gz")
md5sums=('349320bebd43babb8b43e11c7aae0293')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd docker-$pkgver
make
}
package() {
- cd $srcdir/$pkgname-$pkgver
- install -d $pkgdir/usr/bin
- make PREFIX=$pkgdir/usr install
+ cd docker-$pkgver
+ install -d "$pkgdir"/usr/bin
+ make PREFIX="$pkgdir"/usr install
}
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 3460f6d90..646025838 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198783 2013-11-04 13:57:54Z andyrtr $
+# $Id: PKGBUILD 202249 2013-12-20 22:01:34Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Paul Mattal <paul@mattal.com>
# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,7 +8,7 @@
# --->>> remember to rebuild/bump pigeonhole in one step <<<---
pkgname=dovecot
-pkgver=2.2.7
+pkgver=2.2.10
pkgrel=1
pkgdesc="An IMAP and POP3 server written with security primarily in mind"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,20 +18,18 @@ depends=('krb5' 'openssl' 'sqlite' 'libmariadbclient'
'postgresql-libs' 'bzip2' 'expat' 'curl')
makedepends=('pam' 'libcap' 'libldap' 'clucene')
optdepends=('libldap: ldap plugin'
- 'clucene: alternative FTS indexer')
+ 'xz: imap zlib plugin'
+ 'clucene: alternative FTS indexer')
provides=('imap-server' 'pop3-server')
install=$pkgname.install
source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
dovecot.tmpfilesd)
-md5sums=('d2c7c83acc21f3dcab652868d40522e0'
+md5sums=('037e9c9e07d9dbff54dcff09f280fc8c'
'SKIP'
'342a28251d40f983c98c0d1f1bf3d07d')
build() {
cd $pkgname-$pkgver
-
- # fix build with recent clucene (FC)
-# sed -i '/DEFAULT_INCLUDES *=/s|$| '"$(pkg-config --cflags libclucene-core)|" src/plugins/fts-lucene/Makefile.in
# fix path in helper script
sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index 5128e8878..00fb2ae53 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 193586 2013-08-24 16:53:45Z dan $
+# $Id: PKGBUILD 202708 2013-12-25 21:15:10Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgbase=doxygen
pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.5
+pkgver=1.8.6
pkgrel=1
license=('GPL')
arch=(i686 x86_64 'mips64el')
url="http://www.doxygen.org/"
makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
- 'texlive-latexextra' 'graphviz')
-source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('db51274568755e2c75c2657e30a78a55')
-sha1sums=('1fc5ceec21122fe5037edee4c308ac94b59ee33e')
+ 'texlive-latexextra' 'graphviz' 'python2')
+source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz
+ doxygen-configure-python2.patch)
+md5sums=('9385dc52f0627875f8fa758e754ec674'
+ 'a16ef06cd207292eda73801ea3835f1e')
+sha1sums=('204f1b3695c73efac44a521609c5360241d64045'
+ '98f9f473f906c5cd363b29c65b54bbe998c0793e')
build() {
export PATH=$PATH:/usr/lib/qt4/bin
cd "${srcdir}/${pkgbase}-${pkgver}"
- QTDIR=/usr ./configure --prefix /usr --with-doxywizard
+ patch -Np1 < ../doxygen-configure-python2.patch
+ QTDIR=/usr/lib/qt4 ./configure --prefix /usr --with-doxywizard
make
}
diff --git a/extra/doxygen/doxygen-configure-python2.patch b/extra/doxygen/doxygen-configure-python2.patch
new file mode 100644
index 000000000..9750d1eb2
--- /dev/null
+++ b/extra/doxygen/doxygen-configure-python2.patch
@@ -0,0 +1,11 @@
+--- doxygen-1.8.6/configure.orig 2013-12-25 20:54:22.171988706 +0000
++++ doxygen-1.8.6/configure 2013-12-25 20:54:33.405247482 +0000
+@@ -560,7 +560,7 @@
+
+ printf " Checking for python... "
+ if test "$f_python" = NO; then
+- python_names="python"
++ python_names="python2 python"
+ python_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
+ python_prog=NO
+ python_found=NO
diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD
index 6f7a0c80e..e61160868 100644
--- a/extra/e_dbus/PKGBUILD
+++ b/extra/e_dbus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197914 2013-10-30 11:39:08Z allan $
+# $Id: PKGBUILD 199736 2013-11-15 12:16:22Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=e_dbus
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="D-Bus integration with Ecore"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('ecore' 'dbus-core')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('726b2c4259e8818921ce0c27a3d452d414255975')
+sha1sums=('d1c30cf95cf6eea07c5be54bd8cfbf7eba9fb20b')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD
index 45142b428..ddca9887f 100644
--- a/extra/ecore/PKGBUILD
+++ b/extra/ecore/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197913 2013-10-30 11:38:44Z allan $
+# $Id: PKGBUILD 199728 2013-11-15 12:13:56Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=ecore
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="OS abstraction layer for e17"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst'
makedepends=('subversion')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('8b8c88a211cb80bb19284560d8d481979ae0c111')
+sha1sums=('c4343110508dc9dd1580f3349dbc1d4de2088f3d')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
index 5e3bd5201..be1999263 100644
--- a/extra/edje/PKGBUILD
+++ b/extra/edje/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197915 2013-10-30 11:39:30Z allan $
+# $Id: PKGBUILD 199732 2013-11-15 12:15:08Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=edje
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="A graphical design and layout library based on Evas"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc')
install=edje.install
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('3fbff1d0b8473a0498ccee44745cf6609d73005e')
+sha1sums=('fe5fa239d75e96c7e02c58abb75776a54817654d')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD
index 0ae8c9a15..5ac190ba2 100644
--- a/extra/eet/PKGBUILD
+++ b/extra/eet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197916 2013-10-30 11:39:51Z allan $
+# $Id: PKGBUILD 199725 2013-11-15 12:12:55Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=eet
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="A data storage and compression library"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://www.enlightenment.org"
license=('BSD')
depends=('libjpeg>=7' 'openssl' 'eina')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('d68e17fb155954c7d524cdba98244c09ae511513')
+sha1sums=('843eb9733f6c01442b9c1379e9a48b69bfd5081f')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD
index 065670409..84a4b1c3f 100644
--- a/extra/eeze/PKGBUILD
+++ b/extra/eeze/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197917 2013-10-30 11:40:11Z allan $
+# $Id: PKGBUILD 199730 2013-11-15 12:14:34Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=eeze
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="Manipulate devices using udev and sysfs"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('ecore' 'eina' 'udev')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('86a552cbdbbb7e8d968083b2c2429e0df60a6a68')
+sha1sums=('6651d9b7723dda9dc00be093097a12a52764d431')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD
index 05acd07e9..60e4167fc 100644
--- a/extra/efreet/PKGBUILD
+++ b/extra/efreet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197918 2013-10-30 11:40:35Z allan $
+# $Id: PKGBUILD 199735 2013-11-15 12:16:06Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=efreet
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="FreeDesktop.Org specifications for e17"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('eina' 'ecore' 'e_dbus')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('5981bf49149366b15618050af3a65d6cf145c827')
+sha1sums=('7f12f4c943b572b5470ce11aad2d5f4054b22dc7')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD
index d5ed2d79b..324866a0c 100644
--- a/extra/eina/PKGBUILD
+++ b/extra/eina/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197919 2013-10-30 11:40:55Z allan $
+# $Id: PKGBUILD 199724 2013-11-15 12:12:34Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=eina
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="A core data structure and common utility library"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL2.1')
depends=('glibc')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('f655b2691d3976fdc2cfe116166e790c1b8bc90d')
+sha1sums=('26f385e888b29876c8fb06f35f0433ab7e3251d5')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD
index 92a99628b..7b243ee03 100644
--- a/extra/eio/PKGBUILD
+++ b/extra/eio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197920 2013-10-30 11:41:16Z allan $
+# $Id: PKGBUILD 199729 2013-11-15 12:14:20Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=eio
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="Async IO library using Ecore"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('ecore')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('75425d2ddd6ddc7a7f668e4f92c43e9d72d057ed')
+sha1sums=('6a849c5da4b1213d018ca46dcea1130a135e99e6')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index a01acdab7..468e32b4f 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197921 2013-10-30 11:41:41Z allan $
+# $Id: PKGBUILD 201257 2013-12-07 10:34:57Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=ekiga
pkgver=4.0.1
-pkgrel=7
+pkgrel=8
pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
url="http://www.ekiga.org"
license=(GPL)
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index 80c30a3fa..520e98ab5 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197922 2013-10-30 11:42:01Z allan $
+# $Id: PKGBUILD 199737 2013-11-15 12:16:38Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=elementary
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="Enlightenment's widget set"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('5cae29bd8310691fbf459ce9132264dcef8338ed')
+sha1sums=('4d68e4f77d6b3471a45a4e33ae3af18d0ca42ab1')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD
index 9b48b5e78..8f3ef843b 100644
--- a/extra/embryo/PKGBUILD
+++ b/extra/embryo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197923 2013-10-30 11:42:21Z allan $
+# $Id: PKGBUILD 199731 2013-11-15 12:14:50Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Ronald van Haren <ronald.archlinux.org>
pkgname=embryo
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="implementation of a C like scripting language for e17"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://www.enlightenment.org"
license=('BSD')
depends=('glibc' 'eina')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('879c0dd75de6c402707da4981716a2b7c1dab618')
+sha1sums=('1644da0be669213ce9ed29f1b58e9c6f3ab7c05c')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD
index ae347ffb3..9b96fda7a 100644
--- a/extra/emotion/PKGBUILD
+++ b/extra/emotion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197924 2013-10-30 11:42:43Z allan $
+# $Id: PKGBUILD 199733 2013-11-15 12:15:33Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=emotion
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="Library to easily integrate media playback into EFL applications"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('gstreamer0.10' 'edje' 'eeze')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('a0f9ddbd6b26a69de2fc6958327da1497bd2f420')
+sha1sums=('c7817d6252ed90d06f9e4ef491f9399fb6213990')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD
index 64b0f1f80..f89648cfd 100644
--- a/extra/empathy/PKGBUILD
+++ b/extra/empathy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197925 2013-10-30 11:43:04Z allan $
+# $Id: PKGBUILD 199330 2013-11-11 10:46:23Z jgc $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=empathy
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="A GNOME instant messaging client using the Telepathy framework."
arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ options=('!makeflags')
groups=(gnome)
install=empathy.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a5d96f1a408613b885fc254d8b6f33fceae01e212d2370cc77444d66fa945054')
+sha256sums=('9d8e082a448f3e9450a31f0ec21f01e34cf1c15b192cfa30842d71537796cfbf')
build() {
cd $pkgname-$pkgver
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index a2124de50..faa11c61d 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191891 2013-08-01 06:53:24Z bpiotrowski $
+# $Id: PKGBUILD 201258 2013-12-07 10:34:58Z bpiotrowski $
# Maintainer: tobias <tobias@archlinux.org>
# Contributor: Dominik Ryba <domryba@post.pl>
pkgname=enblend-enfuse
pkgver=4.1.1
-pkgrel=3
+pkgrel=4
pkgdesc="Intelligent blend tool for overlapping picture"
arch=("i686" "x86_64" 'mips64el')
license=('GPL')
diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment16/PKGBUILD
index e69f6ea91..bfc1c04bd 100644
--- a/extra/enlightenment/PKGBUILD
+++ b/extra/enlightenment16/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 197929 2013-10-30 11:44:06Z allan $
+# $Id: PKGBUILD 201529 2013-12-13 21:18:56Z ronald $
# Maintainer: Eric Bélanger <eric@archlinux.org>
-pkgname=enlightenment
+pkgname=enlightenment16
+_pkgname=enlightenment
pkgver=1.0.13
_themever=1.0.1
-pkgrel=1.1
+pkgrel=3
pkgdesc="A fast, flexible, and very extensible Window Manager"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.enlightenment.org"
license=('BSD' 'custom')
depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \
'libxrandr' 'libpulse')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \
+replaces=('enlightenment<=1.0.13')
+source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/e16-${pkgver}.tar.gz \
http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz)
sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9'
'ae34e2df1294198795736bf953bf695aba93b710')
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index 9715abd4c..34df14257 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197930 2013-10-30 11:44:27Z allan $
+# $Id: PKGBUILD 199739 2013-11-15 12:19:48Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=enlightenment17
_pkgname=enlightenment
-pkgver=0.17.4
-pkgrel=2
+pkgver=0.17.5
+pkgrel=1
pkgdesc="Enlightenment window manager DR17 (aka e17)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.enlightenment.org"
@@ -19,21 +19,16 @@ backup=('etc/enlightenment/sysactions.conf')
options=('!emptydirs')
install=enlightenment17.install
source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz
- 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch'
- 'blackscreenfix.patch')
-sha1sums=('29f5f4c10bcc7b32f79013ccbc7257abeea78faf'
+ 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
+sha1sums=('8fd40ad2df2eb96a3d6583bcd19d150d594a6e86'
'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
'3f53931ae86de8fe99e386aeb097521aac0decd8'
- '86f1c5e36dc274c3101362532378be034e89c593'
- '85f9b1378ebb7a05ed7f0e8db6982d88a0f46be4')
+ '86f1c5e36dc274c3101362532378be034e89c593')
prepare() {
cd "$srcdir/$_pkgname-$pkgver"
patch -p0 < $srcdir/quickstart.patch
- # upstream fix for blackscreen problem on existing configs
- patch -Np1 -i $srcdir/blackscreenfix.patch
-
# default to systemd for sysactions
patch -Np0 < $srcdir/sysactions_systemd.patch
diff --git a/extra/eog/PKGBUILD b/extra/eog/PKGBUILD
index 00c11aefe..7b48be4dc 100644
--- a/extra/eog/PKGBUILD
+++ b/extra/eog/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197931 2013-10-30 11:44:48Z allan $
+# $Id: PKGBUILD 201363 2013-12-09 13:42:13Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=eog
-pkgver=3.10.1
-pkgrel=1
+pkgver=3.10.2
+pkgrel=2
pkgdesc="Eye of Gnome: An image viewing and cataloging program"
arch=(i686 x86_64 mips64el)
license=(GPL)
@@ -14,8 +14,8 @@ install=eog.install
groups=(gnome)
options=('!emptydirs')
url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('16ab5da862d4474c12d0e8062e577ad70c7e1c790a44a3931cd78bf84ebd5ec6')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('5ccc98609ca666420719383cc7d9b44335bbc0aacf048e38036d1f946ce54763')
build() {
cd "$pkgname-$pkgver"
@@ -27,7 +27,4 @@ build() {
package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
-
- # remove it from Xfce menu that ships its own thingy
- echo "NotShowIn=XFCE" >> $pkgdir/usr/share/applications/eog.desktop
}
diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD
index e6f9309a6..b46ad87d9 100644
--- a/extra/ethumb/PKGBUILD
+++ b/extra/ethumb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197934 2013-10-30 11:46:11Z allan $
+# $Id: PKGBUILD 199734 2013-11-15 12:15:50Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=ethumb
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="Thumbnailing library and D-Bus service using EFL"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('libexif' 'e_dbus' 'emotion')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('c19b5d8abbf79aa4df1c5523829ece751dc3c268')
+sha1sums=('7f9a7e536de7a598e921709c3ba0d23850f4494f')
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
index 1beefb331..45601d1bd 100644
--- a/extra/evas/PKGBUILD
+++ b/extra/evas/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197935 2013-10-30 11:46:36Z allan $
+# $Id: PKGBUILD 199727 2013-11-15 12:13:26Z ronald $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=evas
-pkgver=1.7.8
+pkgver=1.7.9
pkgrel=1
pkgdesc="A hardware-accelerated canvas API for X-Windows"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa'
'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('ce71de058896e80c8f1822d967a6dcee01a1c9ac')
+sha1sums=('5804cf35451f4e05185b6ae9103b0390c0dfed5d')
build() {
cd $pkgname-$pkgver
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index 1885129e4..c1d676fa7 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197936 2013-10-30 11:47:00Z allan $
+# $Id: PKGBUILD 200655 2013-12-01 09:50:20Z andyrtr $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
pkgname=evas_generic_loaders
-pkgver=1.7.8
-pkgrel=1
+pkgver=1.7.9
+pkgrel=2
pkgdesc="Additional generic loaders for Evas"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.enlightenment.org"
@@ -12,7 +12,7 @@ license=('BSD')
depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina')
options=('!emptydirs')
source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('fe08848b794621e6695cd0df86b465412b0037fa')
+sha1sums=('598241d2276608fc41a79216e94b4176a4404277')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD
index 12c82c9d1..052ac6710 100644
--- a/extra/evince/PKGBUILD
+++ b/extra/evince/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197938 2013-10-30 11:47:43Z allan $
+# $Id: PKGBUILD 199791 2013-11-16 12:36:17Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=evince
-pkgver=3.10.0
-pkgrel=2
+pkgver=3.10.3
+pkgrel=1
pkgdesc="Simply a document viewer"
url="http://projects.gnome.org/evince/"
arch=(i686 x86_64 mips64el)
@@ -19,7 +19,7 @@ groups=(gnome)
install=evince.install
options=('!emptydirs')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('495e855af3f071277d79be97a36bf39938d13d09530e80412fed4b7c0b1bdd3e')
+sha256sums=('b30dcc3a93dd3c682325e685061c48ccd800835af49578f4db813bbaf5f5e9af')
build() {
cd $pkgname-$pkgver
diff --git a/extra/evolution-data-server/PKGBUILD b/extra/evolution-data-server/PKGBUILD
index 15d1fa5f1..95c147da5 100644
--- a/extra/evolution-data-server/PKGBUILD
+++ b/extra/evolution-data-server/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197940 2013-10-30 11:48:24Z allan $
+# $Id: PKGBUILD 201347 2013-12-09 08:46:39Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=evolution-data-server
-pkgver=3.10.1
+pkgver=3.10.3
pkgrel=1
pkgdesc="Centralized access to appointments and contacts"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,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=('a6b5acbd21767b685d58ebfd4c152baa693387f5654fb738b3645ee39e82f9f5')
+sha256sums=('41af5c658255230de47423fad73f19bfab15b9e0df80141b13f66b55bf295bd2')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/evolution-ews/PKGBUILD b/extra/evolution-ews/PKGBUILD
index c84f46812..2acbfadc4 100644
--- a/extra/evolution-ews/PKGBUILD
+++ b/extra/evolution-ews/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197941 2013-10-30 11:48:53Z allan $
+# $Id: PKGBUILD 201349 2013-12-09 08:51:59Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=evolution-ews
-pkgver=3.10.1
+pkgver=3.10.3
pkgrel=1
pkgdesc="MS Exchange integration through Exchange Web Services"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('evolution-data-server' 'gtkhtml4' 'libmspack')
makedepends=('intltool' 'evolution')
options=('!emptydirs')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('018bf22f5fd88bb80f88c8f1feb696c7a7c216ab1367b7b50d02b4e313d858c9')
+sha256sums=('485951935014fbf7d092b318cee3131c442b959f3ed2163932bfb11fdc15c6e9')
build() {
cd $pkgname-$pkgver
diff --git a/extra/evolution/PKGBUILD b/extra/evolution/PKGBUILD
index 0f9db43df..7df0c7939 100644
--- a/extra/evolution/PKGBUILD
+++ b/extra/evolution/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197939 2013-10-30 11:48:04Z allan $
+# $Id: PKGBUILD 201348 2013-12-09 08:51:13Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=evolution
-pkgver=3.10.1
+pkgver=3.10.3
pkgrel=1
pkgdesc="Manage your email, contacts and schedule"
arch=('i686' 'x86_64' 'mips64el')
@@ -19,7 +19,7 @@ options=('!emptydirs')
install=evolution.install
url=http://www.gnome.org/projects/evolution/
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('da1aacab365f27feed74cb89d03c2f4847fef7c5370d0fd84b04ab24ada83546')
+sha256sums=('ad4b37215c361134a14aa1598d5c038327f897b7d9dbc750cab3d58d5c922f4c')
build() {
cd $pkgname-$pkgver
diff --git a/extra/exo/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch b/extra/exo/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
new file mode 100644
index 000000000..f892ca038
--- /dev/null
+++ b/extra/exo/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch
@@ -0,0 +1,53 @@
+From 05848bb3cb10ea19ef8cba607bdabcd25560063c Mon Sep 17 00:00:00 2001
+From: Felipe Contreras <felipe.contreras@gmail.com>
+Date: Sat, 18 May 2013 22:50:01 -0500
+Subject: [PATCH] Fix exo_str_looks_like_an_uri() (bug #10098).
+
+Commit d11199b (Check if uris also contain a slash (bug #9244)) tried to
+fix a hang in thunar by properly recognizing that 'http:' is not an URI,
+however, while doing so, it broke proper URIs like 'magnet:foo'.
+
+As the RFC clearly states:
+
+ The following are two example URIs and their component parts:
+
+ foo://example.com:8042/over/there?name=ferret#nose
+ \_/ \______________/\_________/ \_________/ \__/
+ | | | | |
+ scheme authority path query fragment
+ | _____________________|__
+ / \ / \
+ urn:example:animal:ferret:nose
+
+But even with this succinct example exo_str_looks_like_an_uri() fails.
+
+There is an easy solution; fail only when component part is missing
+('urn:'), but succeed otherwise.
+
+This solution fixes 'magnet:foo', and doesn't break the current
+expectation from thunar that 'http:' should fail, having the best of
+both worlds.
+
+[1] http://www.ietf.org/rfc/rfc3986.txt
+
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
+---
+ exo/exo-string.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/exo/exo-string.c b/exo/exo-string.c
+index 33f86f9..056b36a 100644
+--- a/exo/exo-string.c
++++ b/exo/exo-string.c
+@@ -429,7 +429,7 @@ exo_str_looks_like_an_uri (const gchar *str)
+ for (++s; g_ascii_isalnum (*s) || *s == '+' || *s == '-' || *s == '.'; ++s);
+
+ /* <scheme> must be followed by ":" */
+- return (*s == ':' && *(s+1) == '/');
++ return (*s == ':' && *(s+1) != '\0');
+ }
+
+ return FALSE;
+--
+1.8.4.2
+
diff --git a/extra/exo/PKGBUILD b/extra/exo/PKGBUILD
index 99fc2a808..c80813eea 100644
--- a/extra/exo/PKGBUILD
+++ b/extra/exo/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197944 2013-10-30 11:49:55Z allan $
+# $Id: PKGBUILD 199343 2013-11-11 15:17:24Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: tobias <tobias funnychar archlinux.org>
# Contributor: Aurelien Foret <orelien@chez.com>
pkgname=exo
pkgver=0.10.2
-pkgrel=1.1
+pkgrel=2
pkgdesc="Extensions to Xfce by os-cillation"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.xfce.org/"
@@ -15,8 +15,17 @@ depends=('libxfce4ui' 'gtk2' 'hicolor-icon-theme' )
makedepends=('perl-uri' 'intltool' 'gtk-doc' 'xorg-iceauth')
optdepends=('perl-uri: for mail-compose helper script')
install=$pkgname.install
-source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce')
+source=(http://archive.xfce.org/src/xfce/$pkgname/0.10/$pkgname-$pkgver.tar.bz2
+ 0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch)
+sha256sums=('b385828bf8a38204da3254b57fdfa25a72694495aa189fabd5040f707eec76ce'
+ 'f3a92ea399c5786845d3c3a9d74a427299ecd5ed7e5ef2ac1cf636492050e247')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # https://bugzilla.xfce.org/show_bug.cgi?id=10098
+ patch -Np1 -i "$srcdir/0001-Fix-exo_str_looks_like_an_uri-bug-10098.patch"
+}
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/expac/PKGBUILD b/extra/expac/PKGBUILD
index 524669022..2942ccec3 100644
--- a/community/expac/PKGBUILD
+++ b/extra/expac/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 87648 2013-04-05 00:19:21Z dreisner $
+# $Id: PKGBUILD 87501 2013-04-02 00:06:04Z dreisner $
# Maintainer: Dave Reisner <d@falconindy.com>
pkgname=expac
-pkgver=2
+pkgver=3
pkgrel=1
pkgdesc="pacman database extraction utility"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,17 +11,26 @@ license=('GPL')
depends=('pacman')
makedepends=('perl')
source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-md5sums=('41a65f51009e44689bd5320f5c3aa7d4'
+md5sums=('2f53f9663b69948a4a8bb03c1aa435a5'
'SKIP')
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ sed '/\*\//q' expac.c >LICENSE
+}
+
build() {
- make -C "$pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
- sed '/\*\//q' "$pkgname-$pkgver"/expac.c >LICENSE
+ make
}
package() {
- make -C "$pkgname-$pkgver" PREFIX=/usr DESTDIR="$pkgdir" install
+ cd "$pkgname-$pkgver"
+
+ make PREFIX=/usr DESTDIR="$pkgdir" install
+
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/extra/f-spot/0004-Fix-build-error-with-recent_gtk-sharp.patch b/extra/f-spot/0004-Fix-build-error-with-recent_gtk-sharp.patch
new file mode 100644
index 000000000..c2869671d
--- /dev/null
+++ b/extra/f-spot/0004-Fix-build-error-with-recent_gtk-sharp.patch
@@ -0,0 +1,15 @@
+from upstream git
+
+diff --git a/src/Clients/MainApp/FSpot/GroupSelector.cs b/src/Clients/MainApp/FSpot/GroupSelector.cs
+index b1e4993..63edd84 100644
+--- a/src/Clients/MainApp/FSpot/GroupSelector.cs
++++ b/src/Clients/MainApp/FSpot/GroupSelector.cs
+@@ -467,7 +467,7 @@ namespace FSpot {
+ bounds.Height = selector.background.Height;
+ bounds.Y = selector.background.Y;
+ bounds.X = selector.BoxX (item);
+- bounds.Width = Math.Max (selector.BoxX (item + 1) - bounds.X, 1);
++ bounds.Width = Math.Max (selector.BoxX (item + 1) - selector.BoxX (item), 1);
+
+ if (item < 0 || item > selector.box_counts.Length - 1)
+ return;
diff --git a/extra/f-spot/PKGBUILD b/extra/f-spot/PKGBUILD
index 2d985f4b5..b0f584efd 100644
--- a/extra/f-spot/PKGBUILD
+++ b/extra/f-spot/PKGBUILD
@@ -1,46 +1,57 @@
-# $Id: PKGBUILD 197965 2013-10-30 11:58:02Z allan $
+# $Id: PKGBUILD 201361 2013-12-09 13:27:15Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Kritoke <kritoke@nospam.gmail.com>
# Contributor: György Balló <ballogy@freestart.hu>
pkgname=f-spot
pkgver=0.8.2
-pkgrel=3
+pkgrel=4
pkgdesc="A personal photo management program for GNOME"
url="http://www.gnome.org/projects/f-spot/"
arch=(i686 x86_64)
license=('GPL')
depends=('mono-addins' 'gnome-sharp' 'ndesk-dbus-glib' 'lcms' 'gnome-keyring-sharp' 'flickrnet' 'libgphoto2' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils' 'libunique')
-makedepends=('intltool' 'gnome-doc-utils' 'gnome-screensaver')
+makedepends=('intltool' 'gnome-doc-utils')
install=$pkgname.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/${pkgname}-${pkgver}.tar.bz2
mono-2.8.patch
- flickrnet-3.0.patch)
+ flickrnet-3.0.patch
+ 0004-Fix-build-error-with-recent_gtk-sharp.patch)
sha256sums=('24448d3431a95a9faa0aa975554414eb638f918811507177e9d69d11d417873a'
'4e7d2f1909870b842bbbe087f4381f325d5281d2deae0d32ba5713ee66d52b65'
- 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5')
+ 'e8e4470c7cd29c000a9505bcd85cb25641890f66e568edb33d495e8e38fc92a5'
+ 'a7f46b3fad59b8d81a329e51ca722373c82bcf664976b8bcb9618084307c81ec')
-build() {
- export MONO_SHARED_DIR="${srcdir}/.wabi"
- mkdir -p "${MONO_SHARED_DIR}"
+prepare() {
+ mkdir .wabi
+
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../mono-2.8.patch
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i "${srcdir}/mono-2.8.patch"
# https://bugzilla.gnome.org/show_bug.cgi?id=665063
- patch -Np1 -i "${srcdir}/flickrnet-3.0.patch"
+ patch -Np1 -i ../flickrnet-3.0.patch
+
+ # Patch from Debian
+ patch -Np1 -i ../0004-Fix-build-error-with-recent_gtk-sharp.patch
+}
+
+build() {
+ export MONO_SHARED_DIR="${srcdir}/.wabi"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ cd $pkgname-$pkgver
+ MCS=/usr/bin/dmcs ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --disable-scrollkeeper --disable-schemas-install --enable-release \
+ --with-gnome-screensaver=/usr --with-gnome-screensaver-privlibexecdir=/usr/lib/gnome-screensaver \
--with-vendor-build-id=ArchLinux
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make DESTDIR=${pkgdir} install
install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain f-spot ${pkgdir}/etc/gconf/schemas/*.schemas
rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
}
diff --git a/extra/fakechroot/PKGBUILD b/extra/fakechroot/PKGBUILD
index a02a6ff44..c92d09aac 100644
--- a/extra/fakechroot/PKGBUILD
+++ b/extra/fakechroot/PKGBUILD
@@ -1,26 +1,19 @@
-# $Id: PKGBUILD 197946 2013-10-30 11:50:42Z allan $
+# $Id: PKGBUILD 202701 2013-12-25 12:20:07Z allan $
# Maintainer : Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=fakechroot
-pkgver=2.16
-pkgrel=3
+pkgver=2.17.2
+pkgrel=1
pkgdesc="Gives a fake chroot environment"
arch=('i686' 'x86_64' 'mips64el')
-url="https://github.com/fakechroot/fakechroot/wiki"
+url="https://github.com/dex4er/fakechroot/wiki"
license=('LGPL')
install=fakechroot.install
-source=(https://github.com/downloads/fakechroot/fakechroot/fakechroot-${pkgver}.tar.gz)
-md5sums=('3ea5efb76664e787450e0cfcefc1b807')
+source=(https://github.com/dex4er/fakechroot/archive/${pkgver}.tar.gz)
+md5sums=('e614f62972efa4654fc780ae7e4affad')
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # https://github.com/fakechroot/fakechroot/issues/10
- sed -i "s#usr/sbin/chroot#usr/bin/chroot#" test/testtree.sh test/t/chroot.t
-}
-
build() {
cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr --sbindir=/usr/bin \
diff --git a/extra/farstream-0.1/PKGBUILD b/extra/farstream-0.1/PKGBUILD
index b1ee8f8fc..f078a8d59 100644
--- a/extra/farstream-0.1/PKGBUILD
+++ b/extra/farstream-0.1/PKGBUILD
@@ -1,43 +1,49 @@
-# $Id: PKGBUILD 197948 2013-10-30 11:51:24Z allan $
+# $Id: PKGBUILD 201487 2013-12-12 18:59:01Z jgc $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
pkgname=farstream-0.1
_pkgname=farstream
pkgver=0.1.2
-pkgrel=2.1
+pkgrel=3
pkgdesc="Audio/Video Communications Framework (legacy version)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/Farstream"
license=('LGPL2.1')
depends=('libnice' 'gstreamer0.10-base' 'gstreamer0.10-bad-plugins'
'gstreamer0.10-good' 'gstreamer0.10-ffmpeg')
-makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2')
-source=(http://freedesktop.org/software/$_pkgname/releases/$_pkgname/$_pkgname-$pkgver.tar.gz
+makedepends=('gobject-introspection' 'gstreamer0.10-python' 'python2-gobject2' 'git' 'gtk-doc')
+source=(git://git.collabora.co.uk/git/farstream.git#commit=54e28e95bed4f04bc95dae509c3724399c79fa29
farstream-0.1.2-prefer-vp8.patch
- farstream-0.1.2-introspection-tag-order.patch)
-sha256sums=('fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9'
- '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5'
- 'f540ea6f239e291f9ffc5b806cfea9f9cd0c4f13963e900719a5ee3a3f370124')
-
-build() {
- cd "$_pkgname-$pkgver"
+ codec-discovery-intersect.patch
+ rtp-memleak.patch)
+sha256sums=('SKIP')
- patch -Np1 -i "$srcdir/farstream-0.1.2-prefer-vp8.patch"
- patch -Np1 -i "$srcdir/farstream-0.1.2-introspection-tag-order.patch"
+prepare() {
+ cd farstream
+ patch -Np1 -i ../farstream-0.1.2-prefer-vp8.patch
+ patch -Np1 -i ../codec-discovery-intersect.patch
+ patch -Np1 -i ../rtp-memleak.patch
+}
+build() {
+ cd farstream
+ NOCONFIGURE=1 ./autogen.sh
./configure \
--prefix=/usr \
--with-package-name='Parabola Farstream 0.1 Package' \
--with-package-origin='https://parabolagnulinux.org/' \
- --disable-static
- make
+ --enable-gtk-doc --disable-static
+ make -j1
}
package() {
- cd "$_pkgname-$pkgver"
-
+ cd farstream
make DESTDIR="$pkgdir" install
}
# vim:set ts=2 sw=2 et:
+sha256sums=('SKIP'
+ '5f8f2876bde0f21383b3d059c94914a2fcd63d45a1bb1b5cd2e2208cd2536da5'
+ '385d7c72e269bf48bd41937442d819a1e6d0f2472b903670a8a5555f5cb96586'
+ 'b966312ccad90dd30b78ee2df49e9637b3b573e498668bcc58ac208f254440db')
diff --git a/extra/farstream-0.1/codec-discovery-intersect.patch b/extra/farstream-0.1/codec-discovery-intersect.patch
new file mode 100644
index 000000000..54134e054
--- /dev/null
+++ b/extra/farstream-0.1/codec-discovery-intersect.patch
@@ -0,0 +1,72 @@
+From 50fffb08d941dce58ae48bf531faead8a4e22ed7 Mon Sep 17 00:00:00 2001
+From: Olivier Crête <olivier.crete@collabora.com>
+Date: Tue, 02 Apr 2013 23:13:06 +0000
+Subject: codec-discovery: Intersect different parts of the same caps to reduce them
+
+We do this because a caps may have the static payload in a separate structure from the encoding-name
+We just want both in the same structure
+---
+diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+index 5530cc8..df316a4 100644
+--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+@@ -384,7 +384,6 @@ validate_h263_codecs (CodecCap *codec_cap)
+ if (!rtp_struct)
+ return FALSE;
+
+- /* If there no h263version, we accept everything */
+ encoding_name = gst_structure_get_string (rtp_struct, "encoding-name");
+
+ /* If there is no encoding name, we have a problem, lets refuse it */
+@@ -1300,15 +1299,44 @@ get_plugins_filtered_from_caps (FilterFunc filter,
+ else
+ {
+ gint i;
+- for (i = 0; i < gst_caps_get_size (matched_caps); i++)
++ GPtrArray *capslist = g_ptr_array_new_with_free_func (
++ (GDestroyNotify) gst_caps_unref);
++
++ while (gst_caps_get_size (matched_caps) > 0)
+ {
+- GstCaps *cur_caps =
+- gst_caps_copy_nth (matched_caps, i);
++ GstCaps *stolencaps = gst_caps_new_full (
++ gst_caps_steal_structure (matched_caps, 0), NULL);
++ gboolean got_match = FALSE;
++
++ for (i = 0; i < capslist->len; i++)
++ {
++ GstCaps *intersect = gst_caps_intersect (stolencaps,
++ g_ptr_array_index (capslist, i));
++
++ if (gst_caps_is_empty (intersect))
++ {
++ gst_caps_unref (intersect);
++ }
++ else
++ {
++ got_match = TRUE;
++ gst_caps_unref (g_ptr_array_index (capslist, i));
++ g_ptr_array_index (capslist, i) = intersect;
++ }
++ }
++
++ if (got_match)
++ gst_caps_unref (stolencaps);
++ else
++ g_ptr_array_add (capslist, stolencaps);
+
+- list = create_codec_cap_list (factory, direction, list, cur_caps);
+- gst_caps_unref (cur_caps);
+ }
+ gst_caps_unref (matched_caps);
++
++ for (i = 0; i < capslist->len; i++)
++ list = create_codec_cap_list (factory, direction, list,
++ g_ptr_array_index (capslist, i));
++ g_ptr_array_unref (capslist);
+ }
+ }
+
+--
+cgit v0.9.0.3
diff --git a/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch b/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch
deleted file mode 100644
index 3283e1fd2..000000000
--- a/extra/farstream-0.1/farstream-0.1.2-introspection-tag-order.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 39450457190675716c8e66700e35b05334a6a1a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com>
-Date: Fri, 25 May 2012 17:06:59 -0400
-Subject: [PATCH] Gtk-doc tags belong after the description
-
----
- farstream/fs-session.c | 16 +++++++---------
- farstream/fs-stream.c | 15 ++++++---------
- 2 files changed, 13 insertions(+), 18 deletions(-)
-
-diff --git a/farstream/fs-session.c b/farstream/fs-session.c
-index 80794d1..abb1bc3 100644
---- a/farstream/fs-session.c
-+++ b/farstream/fs-session.c
-@@ -270,9 +270,6 @@ fs_session_class_init (FsSessionClass *klass)
- /**
- * FsSession:codec-preferences:
- *
-- * Type: GLib.List(FsCodec)
-- * Transfer: full
-- *
- * This is the current preferences list for the local codecs. It is
- * set by the user to specify the codec options and priorities. The user may
- * change its value with fs_session_set_codec_preferences() at any time
-@@ -283,6 +280,9 @@ fs_session_class_init (FsSessionClass *klass)
- * or %FS_CODEC_ID_ANY. If the encoding name is "reserve-pt", then the
- * payload type of the codec will be "reserved" and not be used by any
- * dynamically assigned payload type.
-+ *
-+ * Type: GLib.List(FsCodec)
-+ * Transfer: full
- */
- g_object_class_install_property (gobject_class,
- PROP_CODEC_PREFERENCES,
-@@ -296,9 +296,6 @@ fs_session_class_init (FsSessionClass *klass)
- /**
- * FsSession:codecs:
- *
-- * Type: GLib.List(FsCodec)
-- * Transfer: full
-- *
- * This is the list of codecs used for this session. It will include the
- * codecs and payload type used to receive media on this session. It will
- * also include any configuration parameter that must be transmitted reliably
-@@ -317,6 +314,8 @@ fs_session_class_init (FsSessionClass *klass)
- * It is a #GList of #FsCodec. User must free this codec list using
- * fs_codec_list_destroy() when done.
- *
-+ * Type: GLib.List(FsCodec)
-+ * Transfer: full
- */
- g_object_class_install_property (gobject_class,
- PROP_CODECS,
-@@ -329,9 +328,6 @@ fs_session_class_init (FsSessionClass *klass)
- /**
- * FsSession:codecs-without-config:
- *
-- * Type: GLib.List(FsCodec)
-- * Transfer: full
-- *
- * This is the same list of codecs as #FsSession:codecs without
- * the configuration information that describes the data sent. It is suitable
- * for configurations where a list of codecs is shared by many senders.
-@@ -349,6 +345,8 @@ fs_session_class_init (FsSessionClass *klass)
- * It is a #GList of #FsCodec. User must free this codec list using
- * fs_codec_list_destroy() when done.
- *
-+ * Type: GLib.List(FsCodec)
-+ * Transfer: full
- */
- g_object_class_install_property (gobject_class,
- PROP_CODECS_WITHOUT_CONFIG,
-diff --git a/farstream/fs-stream.c b/farstream/fs-stream.c
-index b9e1320..110641d 100644
---- a/farstream/fs-stream.c
-+++ b/farstream/fs-stream.c
-@@ -176,13 +176,12 @@ fs_stream_class_init (FsStreamClass *klass)
- /**
- * FsStream:remote-codecs:
- *
-- * Type: GLib.List(FsCodec)
-- * Transfer: full
-- *
- * This is the list of remote codecs for this stream. They must be set by the
- * user as soon as they are known using fs_stream_set_remote_codecs()
- * (generally through external signaling). It is a #GList of #FsCodec.
- *
-+ * Type: GLib.List(FsCodec)
-+ * Transfer: full
- */
- g_object_class_install_property (gobject_class,
- PROP_REMOTE_CODECS,
-@@ -195,15 +194,14 @@ fs_stream_class_init (FsStreamClass *klass)
- /**
- * FsStream:negotiated-codecs:
- *
-- * Type: GLib.List(FsCodec)
-- * Transfer: full
-- *
- * This is the list of negotiatied codecs, it is the same list as the list
- * of #FsCodec from the parent #FsSession, except that the codec config data
- * has been replaced with the data from the remote codecs for this stream.
- * This is the list of #FsCodec used to receive data from this stream.
- * It is a #GList of #FsCodec.
- *
-+ * Type: GLib.List(FsCodec)
-+ * Transfer: full
- */
- g_object_class_install_property (gobject_class,
- PROP_NEGOTIATED_CODECS,
-@@ -216,9 +214,6 @@ fs_stream_class_init (FsStreamClass *klass)
- /**
- * FsStream:current-recv-codecs:
- *
-- * Type: GLib.List(FsCodec)
-- * Transfer: full
-- *
- * This is the list of codecs that have been received by this stream.
- * The user must free the list if fs_codec_list_destroy().
- * The "farstream-recv-codecs-changed" message is send on the #GstBus
-@@ -228,6 +223,8 @@ fs_stream_class_init (FsStreamClass *klass)
- * also be emitted if the pad already exists, but the source material that
- * will come to it is different.
- *
-+ * Type: GLib.List(FsCodec)
-+ * Transfer: full
- */
- g_object_class_install_property (gobject_class,
- PROP_CURRENT_RECV_CODECS,
---
-1.7.8.6
-
diff --git a/extra/farstream-0.1/rtp-memleak.patch b/extra/farstream-0.1/rtp-memleak.patch
new file mode 100644
index 000000000..1ec307258
--- /dev/null
+++ b/extra/farstream-0.1/rtp-memleak.patch
@@ -0,0 +1,24 @@
+From 10b3d38560ec53d980d13240559e6758c1113e21 Mon Sep 17 00:00:00 2001
+From: Havard Graff <havard.graff@gmail.com>
+Date: Thu, 21 Mar 2013 12:46:11 +0000
+Subject: fs-rtp-discover-codecs: plug memoryleak
+
+use g_list_delete_link to free the list as well
+---
+(limited to 'gst/fsrtpconference')
+
+diff --git a/gst/fsrtpconference/fs-rtp-discover-codecs.c b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+index df316a4..c663225 100644
+--- a/gst/fsrtpconference/fs-rtp-discover-codecs.c
++++ b/gst/fsrtpconference/fs-rtp-discover-codecs.c
+@@ -536,7 +536,7 @@ remove_duplicates (GList *list)
+ if (gst_caps_is_equal (codec_cap1->rtp_caps, codec_cap2->rtp_caps))
+ {
+ codec_cap_free (codec_cap2);
+- walk1 = g_list_remove_link (walk1, walk2);
++ walk1 = g_list_delete_link (walk1, walk2);
+ goto again;
+ }
+ }
+--
+cgit v0.9.0.3
diff --git a/extra/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD
index 21e3a623b..350d24f28 100644
--- a/extra/ffmpeg-compat/PKGBUILD
+++ b/extra/ffmpeg-compat/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197753 2013-10-29 18:00:31Z bpiotrowski $
+# $Id: PKGBUILD 202972 2013-12-29 17:17:30Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Ionut Biru <ibiru@archlinux.org>
@@ -6,10 +6,10 @@
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg-compat
-pkgver=0.10.9
-pkgrel=1
+pkgver=0.10.10
+pkgrel=2
epoch=1
-pkgdesc='Complete and free Internet live audio and video broadcasting solution for Linux/Unix'
+pkgdesc='Complete and free Internet live audio and video broadcasting solution'
arch=('i686' 'x86_64' 'mips64el')
url='http://ffmpeg.org/'
license=('GPL')
@@ -23,8 +23,15 @@ if [ "$CARCH" != "mips64el" ]; then
depends+=(libva)
makedepends=('libvdpau' 'yasm')
fi
-source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2)
-sha256sums=('1d0cc2dd539faefe47554935ea4e4f6aa779d0896b3e722d595aa5abe2304cf9')
+source=(http://ffmpeg.org/releases/ffmpeg-$pkgver.tar.bz2
+ ffmpeg-0.10.10-freetype2.patch)
+sha256sums=('936058d7579bfc431b13d47c3f63ee25a0160d4c73cc0fa04fef97cd2394cb91'
+ '05cf516b292c3815ecaaf72f12c0c73891b62b47d83f5d81f09380949e691988')
+
+prepare() {
+ cd ffmpeg-$pkgver
+ patch -p1 -i ../ffmpeg-0.10.10-freetype2.patch
+}
build() {
cd ffmpeg-$pkgver
diff --git a/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch
new file mode 100644
index 000000000..1e8cc6547
--- /dev/null
+++ b/extra/ffmpeg-compat/ffmpeg-0.10.10-freetype2.patch
@@ -0,0 +1,50 @@
+diff -rupN a/configure b/configure
+--- a/configure 2013-11-06 00:55:13.000000000 +0000
++++ b/configure 2013-12-28 22:06:00.925551644 +0000
+@@ -943,6 +943,26 @@ require_pkg_config(){
+ add_extralibs $(get_safe ${pkg}_libs)
+ }
+
++require_libfreetype(){
++ log require_libfreetype "$@"
++ pkg="freetype2"
++ check_cmd $pkg_config --exists --print-errors $pkg \
++ || die "ERROR: $pkg not found"
++ pkg_cflags=$($pkg_config --cflags $pkg)
++ pkg_libs=$($pkg_config --libs $pkg)
++ {
++ echo "#include <ft2build.h>"
++ echo "#include FT_FREETYPE_H"
++ echo "long check_func(void) { return (long) FT_Init_FreeType; }"
++ echo "int main(void) { return 0; }"
++ } | check_ld "cc" $pkg_cflags $pkg_libs \
++ && set_safe ${pkg}_cflags $pkg_cflags \
++ && set_safe ${pkg}_libs $pkg_libs \
++ || die "ERROR: $pkg not found"
++ add_cflags $(get_safe ${pkg}_cflags)
++ add_extralibs $(get_safe ${pkg}_libs)
++}
++
+ check_host_cc(){
+ log check_host_cc "$@"
+ cat > $TMPC
+@@ -3134,7 +3154,7 @@ enabled libdirac && require_pkg_config
+ "libdirac_decoder/dirac_parser.h libdirac_encoder/dirac_encoder.h" \
+ "dirac_decoder_init dirac_encoder_init"
+ enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
+-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
++enabled libfreetype && require_libfreetype
+ enabled libgsm && require libgsm gsm/gsm.h gsm_create -lgsm
+ enabled libmodplug && require libmodplug libmodplug/modplug.h ModPlug_Load -lmodplug
+ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_quality -lmp3lame
+diff -rupN a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
+--- a/libavfilter/vf_drawtext.c 2013-11-06 00:55:16.000000000 +0000
++++ b/libavfilter/vf_drawtext.c 2013-12-28 22:06:16.495450750 +0000
+@@ -47,7 +47,6 @@
+ #undef time
+
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index e9d34e53f..c72b8665a 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 198639 2013-10-31 16:28:32Z bpiotrowski $
+# $Id: PKGBUILD 202971 2013-12-29 17:17:29Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=ffmpeg
-pkgver=2.1
-pkgrel=2
+pkgver=2.1.1
+pkgrel=3
epoch=1
pkgdesc='Complete and free Internet live audio and video broadcasting solution'
arch=('i686' 'x86_64' 'mips64el')
@@ -23,13 +23,13 @@ if [ "${CARCH}" != "mips64el" ]; then
makedepends=('yasm' 'libvdpau')
fi
source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
- ffmpeg-2.1-avformat-http.fix-cookies.patch)
-sha256sums=('926603fd974e9b38071a5cfc6fd0d93857801d1968145dfce7fdc627ab1d68df'
- '0168bc6f77115ef6f3bd428b1b05a1543d0dd53d8d74c15a24879b119ce8655c')
+ ffmpeg-2.1.1-freetype2.patch)
+md5sums=('2719ab2b3311ac3775b9cdeb66c54849'
+ '4b5dd079a40f44f4e0d00cdbc9d52ec3')
prepare() {
cd $pkgname-$pkgver
- patch -p1 -i ../ffmpeg-2.1-avformat-http.fix-cookies.patch
+ patch -p1 -i ../ffmpeg-2.1.1-freetype2.patch
}
build() {
@@ -89,7 +89,7 @@ build() {
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install install-man
- install -D -m755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
+ install -Dm755 tools/qt-faststart "$pkgdir"/usr/bin/qt-faststart
}
# vim:set ts=2 sw=2 et:
diff --git a/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch b/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch
deleted file mode 100644
index 7c826a3b8..000000000
--- a/extra/ffmpeg/ffmpeg-2.1-avformat-http.fix-cookies.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <michaelni@gmx.at>
-Date: Thu, 31 Oct 2013 01:42:13 +0100
-Subject: [PATCH] avformat/http: fix cookies
-
-Fixes Ticket3096
-
-Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
----
- libavformat/http.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libavformat/http.c b/libavformat/http.c
-index c5b5c53..9be1181 100644
---- a/libavformat/http.c
-+++ b/libavformat/http.c
-@@ -95,7 +95,7 @@ static const AVOption options[] = {
- {"multiple_requests", "use persistent connections", OFFSET(multiple_requests), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D|E },
- {"post_data", "set custom HTTP post data", OFFSET(post_data), AV_OPT_TYPE_BINARY, .flags = D|E },
- {"mime_type", "set MIME type", OFFSET(mime_type), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
--{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
-+{"cookies", "set cookies to be sent in applicable future requests, use newline delimited Set-Cookie HTTP field value syntax", OFFSET(cookies), AV_OPT_TYPE_STRING, {0}, 0, 0, D },
- {"icy", "request ICY metadata", OFFSET(icy), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, D },
- {"icy_metadata_headers", "return ICY metadata headers", OFFSET(icy_metadata_headers), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
- {"icy_metadata_packet", "return current ICY metadata packet", OFFSET(icy_metadata_packet), AV_OPT_TYPE_STRING, {0}, 0, 0, 0 },
---
-1.8.4.1
-
diff --git a/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch b/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch
new file mode 100644
index 000000000..2ff9f87cc
--- /dev/null
+++ b/extra/ffmpeg/ffmpeg-2.1.1-freetype2.patch
@@ -0,0 +1,73 @@
+From cea5812fa723c08b89d929eeba73462e05de2973 Mon Sep 17 00:00:00 2001
+From: Alexander Strasser <eclipse7@gmx.net>
+Date: Fri, 6 Dec 2013 17:20:26 +0100
+Subject: [PATCH] configure: Special case libfreetype test
+
+Include the freetype header, in-directly through a macro, like it
+is done in the drawtext filter. Do not break if the header is moved.
+
+Unfortunately the drawtext filter included the file where the include
+macros are defined in a wrong way. This is not needed and breaks the
+build. Remove that #include line too.
+
+Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
+---
+ configure | 22 +++++++++++++++++++++-
+ libavfilter/vf_drawtext.c | 1 -
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 205cfc9..0b00684 100755
+--- a/configure
++++ b/configure
+@@ -1128,6 +1128,26 @@ require_pkg_config(){
+ add_extralibs $(get_safe ${pkg}_libs)
+ }
+
++require_libfreetype(){
++ log require_libfreetype "$@"
++ pkg="freetype2"
++ check_cmd $pkg_config --exists --print-errors $pkg \
++ || die "ERROR: $pkg not found"
++ pkg_cflags=$($pkg_config --cflags $pkg)
++ pkg_libs=$($pkg_config --libs $pkg)
++ {
++ echo "#include <ft2build.h>"
++ echo "#include FT_FREETYPE_H"
++ echo "long check_func(void) { return (long) FT_Init_FreeType; }"
++ echo "int main(void) { return 0; }"
++ } | check_ld "cc" $pkg_cflags $pkg_libs \
++ && set_safe ${pkg}_cflags $pkg_cflags \
++ && set_safe ${pkg}_libs $pkg_libs \
++ || die "ERROR: $pkg not found"
++ add_cflags $(get_safe ${pkg}_cflags)
++ add_extralibs $(get_safe ${pkg}_libs)
++}
++
+ hostcc_o(){
+ eval printf '%s\\n' $HOSTCC_O
+ }
+@@ -4322,7 +4342,7 @@ enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersio
+ enabled libfdk_aac && require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac
+ flite_libs="-lflite_cmu_time_awb -lflite_cmu_us_awb -lflite_cmu_us_kal -lflite_cmu_us_kal16 -lflite_cmu_us_rms -lflite_cmu_us_slt -lflite_usenglish -lflite_cmulex -lflite"
+ enabled libflite && require2 libflite "flite/flite.h" flite_init $flite_libs
+-enabled libfreetype && require_pkg_config freetype2 "ft2build.h freetype/freetype.h" FT_Init_FreeType
++enabled libfreetype && require_libfreetype
+ enabled libgme && require libgme gme/gme.h gme_new_emu -lgme -lstdc++
+ enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
+ check_lib "${gsm_hdr}" gsm_create -lgsm && break;
+diff --git a/libavfilter/vf_drawtext.c b/libavfilter/vf_drawtext.c
+index dde3b0a..91b8218 100644
+--- a/libavfilter/vf_drawtext.c
++++ b/libavfilter/vf_drawtext.c
+@@ -48,7 +48,6 @@
+ #include "video.h"
+
+ #include <ft2build.h>
+-#include <freetype/config/ftheader.h>
+ #include FT_FREETYPE_H
+ #include FT_GLYPH_H
+ #if CONFIG_FONTCONFIG
+--
+1.7.10.4
+
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD
index 14bb59444..3042e89bf 100644
--- a/extra/ffmpegthumbnailer/PKGBUILD
+++ b/extra/ffmpegthumbnailer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197950 2013-10-30 11:52:15Z allan $
+# $Id: PKGBUILD 199810 2013-11-17 05:20:09Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: boromil@gmail.com
pkgname=ffmpegthumbnailer
pkgver=2.0.8
-pkgrel=4
+pkgrel=5
pkgdesc="Lightweight video thumbnailer that can be used by file managers."
url="http://code.google.com/p/ffmpegthumbnailer/"
license=('GPL2')
@@ -18,14 +18,12 @@ sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533'
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -Np0 -i "${srcdir}/ffmpegthumbnailer-2.0.8-memcpy.patch"
+ patch -p0 -i "${srcdir}/ffmpegthumbnailer-2.0.8-memcpy.patch"
}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
-
./configure --prefix=/usr --enable-gio --enable-thumbnailer
-
make
}
diff --git a/extra/five-or-more/PKGBUILD b/extra/five-or-more/PKGBUILD
index a52abf81b..55bbf780b 100644
--- a/extra/five-or-more/PKGBUILD
+++ b/extra/five-or-more/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197952 2013-10-30 11:52:58Z allan $
+# $Id: PKGBUILD 199351 2013-11-11 16:08:37Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=five-or-more
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="Remove colored balls from the board by forming lines"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ 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%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('3614ad2548d4954c4069c348ba08b32b4ef92b22939e4d2955f44f50ecb0a15b')
+sha256sums=('e2e6834df8be22db1feb1ef41f4d3c4b2f41ab6b3bcbc7f4ba61b8b70bfd89a9')
build() {
cd $pkgname-$pkgver
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index 27f5dfeef..e176ca9b6 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 197654 2013-10-27 19:10:51Z eric $
+# $Id: PKGBUILD 202754 2013-12-26 07:00:56Z bpiotrowski $
# Maintainer:
pkgbase=fltk
pkgname=('fltk' 'fltk-docs' 'fltk-games')
pkgver=1.3.2
-pkgrel=4
+pkgrel=5
arch=('i686' 'x86_64' 'mips64el')
license=('custom:LGPL')
url="http://www.fltk.org/"
makedepends=('mesa' 'glu' 'doxygen' 'libjpeg' 'libxft' 'libxinerama' \
'alsa-lib' 'desktop-file-utils' 'libxcursor')
source=(http://fltk.org/pub/fltk/$pkgver/fltk-$pkgver-source.tar.gz
- tigervnc.patch)
+ tigervnc.patch
+ fltk-config-dynlibs.patch)
md5sums=('9f7e707d4fb7a5a76f0f9b73ff70623d'
- '9efdf03a449d7639b6da493cb0972bba')
+ '9efdf03a449d7639b6da493cb0972bba'
+ 'b7ca1a3f5055aabe9c823e650db5b0b0')
prepare() {
cd $pkgbase-$pkgver
- patch -Np1 -i ../tigervnc.patch
+ patch -p1 -i ../tigervnc.patch
+ patch -p1 -i ../fltk-config-dynlibs.patch
}
build() {
diff --git a/extra/fltk/fltk-config-dynlibs.patch b/extra/fltk/fltk-config-dynlibs.patch
new file mode 100644
index 000000000..0e7ffec94
--- /dev/null
+++ b/extra/fltk/fltk-config-dynlibs.patch
@@ -0,0 +1,37 @@
+diff -rupN a/fltk-config.in b/fltk-config.in
+--- a/fltk-config.in 2011-07-19 06:49:30.000000000 +0200
++++ b/fltk-config.in 2013-12-26 07:50:58.393155344 +0100
+@@ -357,26 +357,26 @@ if test "$echo_ldstaticflags" = "yes"; t
+ fi
+
+ if test "$echo_libs" = "yes"; then
+- USELIBS="$libdir/libfltk.a"
++ USELIBS="$libdir/libfltk.so"
+
+ if test x$use_forms = xyes; then
+- USELIBS="$libdir/libfltk_forms.a $USELIBS"
++ USELIBS="$libdir/libfltk_forms.so $USELIBS"
+ fi
+
+ if test x$use_gl = xyes; then
+- USELIBS="$libdir/libfltk_gl.a $USELIBS"
++ USELIBS="$libdir/libfltk_gl.so $USELIBS"
+ fi
+
+ if test x$use_cairo = xyes; then
+- USELIBS="$libdir/libfltk_cairo.a $USELIBS"
++ USELIBS="$libdir/libfltk_cairo.so $USELIBS"
+ fi
+
+ if test x$use_images = xyes; then
+- USELIBS="$libdir/libfltk_images.a $USELIBS"
++ USELIBS="$libdir/libfltk_images.so $USELIBS"
+
+ for lib in fltk_jpeg fltk_png fltk_z; do
+- if test -f $libdir/lib$lib.a; then
+- USELIBS="$libdir/lib$lib.a $USELIBS"
++ if test -f $libdir/lib$lib.so; then
++ USELIBS="$libdir/lib$lib.so $USELIBS"
+ fi
+ done
+ fi
diff --git a/extra/folks/PKGBUILD b/extra/folks/PKGBUILD
index 8f269c030..2ce34ed32 100644
--- a/extra/folks/PKGBUILD
+++ b/extra/folks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197954 2013-10-30 11:53:55Z allan $
+# $Id: PKGBUILD 199902 2013-11-18 14:27:44Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=folks
-pkgver=0.9.5
+pkgver=0.9.6
pkgrel=1
pkgdesc="Library to aggregates people into metacontacts"
arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ makedepends=(gobject-introspection intltool vala)
install=folks.install
options=('!emptydirs')
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('924c440f16a8c9b0d0d832588fa77a1553fa2a5d2659c4c7d3178a7ef42222af')
+sha256sums=('a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/fping/PKGBUILD b/extra/fping/PKGBUILD
index 0d7ab6e4c..460a932e3 100644
--- a/extra/fping/PKGBUILD
+++ b/extra/fping/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 196316 2013-10-11 13:19:32Z giovanni $
+# $Id: PKGBUILD 200236 2013-11-23 17:36:41Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=fping
-pkgver=3.6
-pkgrel=1
+pkgver=3.8
+pkgrel=2
pkgdesc="A utility to ping multiple hosts at once"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.fping.org/"
license=('custom')
depends=('glibc')
source=("http://www.fping.org/dist/${pkgname}-${pkgver}.tar.gz")
-md5sums=('997b1e998caff6ad5b28c48a5a8bf84b')
+md5sums=('1e36467cc96a4ca959925ac167ea19af')
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -32,4 +32,5 @@ package() {
# install license
install -D -m644 COPYING "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
chmod 4555 ${pkgdir}/usr/bin/fping
+ chmod 4555 ${pkgdir}/usr/bin/fping6
}
diff --git a/extra/freeciv/PKGBUILD b/extra/freeciv/PKGBUILD
index 71710857b..6b5586369 100644
--- a/extra/freeciv/PKGBUILD
+++ b/extra/freeciv/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 197960 2013-10-30 11:56:07Z allan $
+# $Id: PKGBUILD 201416 2013-12-10 20:59:46Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=freeciv
-pkgver=2.4.0
+pkgver=2.4.1
pkgrel=1
pkgdesc="A multiuser clone of the famous Microprose game of Civilization"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freeciv.org/"
license=('GPL')
-depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme' 'lua51' 'sqlite' 'curl' 'libltdl')
+depends=('gtk2' 'sdl_mixer' 'lua51' 'sqlite' 'curl' 'libltdl')
backup=('etc/freeciv/database.lua')
-options=('!staticlibs')
install=freeciv.install
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4a3537dc050bd69002794c832b74f5af972da25e')
+sha1sums=('16fddc97c91e99b31f23fc80746b3454f8f55f78')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD
index 427b4b39c..f7816eeaa 100644
--- a/extra/freetype2/PKGBUILD
+++ b/extra/freetype2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197963 2013-10-30 11:57:18Z allan $
+# $Id: PKGBUILD 201340 2013-12-09 07:41:57Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=freetype2
-pkgver=2.5.0.1
-pkgrel=2
+pkgver=2.5.2
+pkgrel=1
pkgdesc="TrueType font rendering library"
arch=(i686 x86_64 'mips64el')
license=('GPL')
@@ -11,22 +11,22 @@ url="http://freetype.sourceforge.net"
depends=('zlib' 'bzip2' 'sh' 'libpng')
source=(http://downloads.sourceforge.net/sourceforge/freetype/freetype-${pkgver}.tar.bz2
freetype-2.2.1-enable-valid.patch
- freetype-2.3.0-enable-spr.patch
- freetype-2.4.11-enable-sph.patch)
-md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a'
+ freetype-2.5.1-enable-spr.patch
+ freetype-2.5.1-enable-sph.patch)
+md5sums=('10e8f4d6a019b124088d18bc26123a25'
'214119610444c9b02766ccee5e220680'
- '816dc8619a6904a7385769433c0a8653'
- '2422f8902224fedb46ae9eec08c8ceac')
+ '80a14cce234f3f190cd936ca9060c398'
+ '0636ba2ff074201e2ea5c47ac408bc63')
prepare() {
cd "${srcdir}/freetype-${pkgver}"
patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch"
- patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch"
+ patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-spr.patch"
# Disabled for now due to resistance
# Kept here for easier rebuilds via ABS
# https://bugs.archlinux.org/task/35274
- #patch -Np1 -i "${srcdir}/freetype-2.4.11-enable-sph.patch"
+ #patch -Np1 -i "${srcdir}/freetype-2.5.1-enable-sph.patch"
}
build() {
diff --git a/extra/freetype2/freetype-2.4.11-enable-sph.patch b/extra/freetype2/freetype-2.5.1-enable-sph.patch
index 34c8d63bf..69f73b7e3 100644
--- a/extra/freetype2/freetype-2.4.11-enable-sph.patch
+++ b/extra/freetype2/freetype-2.5.1-enable-sph.patch
@@ -1,8 +1,8 @@
-diff --git i/include/freetype/config/ftoption.h w/include/freetype/config/ftoption.h
-index a73fff4..0a081bf 100644
---- i/include/freetype/config/ftoption.h
-+++ w/include/freetype/config/ftoption.h
-@@ -577,7 +577,7 @@ FT_BEGIN_HEADER
+diff --git i/include/config/ftoption.h w/include/config/ftoption.h
+index fe2ba15..1ab4226 100644
+--- i/include/config/ftoption.h
++++ w/include/config/ftoption.h
+@@ -591,7 +591,7 @@ FT_BEGIN_HEADER
/* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */
/* defined. */
/* */
diff --git a/extra/freetype2/freetype-2.3.0-enable-spr.patch b/extra/freetype2/freetype-2.5.1-enable-spr.patch
index 8432e28a4..0d300a8df 100644
--- a/extra/freetype2/freetype-2.3.0-enable-spr.patch
+++ b/extra/freetype2/freetype-2.5.1-enable-spr.patch
@@ -1,6 +1,8 @@
---- freetype-2.3.0/include/freetype/config/ftoption.h.spf 2007-01-18 14:27:34.000000000 -0500
-+++ freetype-2.3.0/include/freetype/config/ftoption.h 2007-01-18 14:27:48.000000000 -0500
-@@ -92,7 +92,7 @@
+diff --git i/include/config/ftoption.h w/include/config/ftoption.h
+index fe2ba15..22ce1a3 100644
+--- i/include/config/ftoption.h
++++ w/include/config/ftoption.h
+@@ -92,7 +92,7 @@ FT_BEGIN_HEADER
/* This is done to allow FreeType clients to run unmodified, forcing */
/* them to display normal gray-level anti-aliased glyphs. */
/* */
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index b59a1b6b8..398cb7fb0 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197975 2013-10-30 12:01:45Z allan $
+# $Id: PKGBUILD 201560 2013-12-15 06:41:56Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gdb
-pkgver=7.6.1
+pkgver=7.6.2
pkgrel=1
pkgdesc="The GNU Debugger"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('texinfo')
backup=('etc/gdb/gdbinit')
install=gdb.install
source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('fbc4dab4181e6e9937075b43a4ce2732'
+md5sums=('496399e96654fc0f899a5c964bc1f0f8'
'SKIP')
prepare() {
diff --git a/extra/gdk-pixbuf2/PKGBUILD b/extra/gdk-pixbuf2/PKGBUILD
index 5021d5086..003a3073c 100644
--- a/extra/gdk-pixbuf2/PKGBUILD
+++ b/extra/gdk-pixbuf2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197976 2013-10-30 12:02:05Z allan $
+# $Id: PKGBUILD 201638 2013-12-17 11:09:15Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gdk-pixbuf2
-pkgver=2.30.0
+pkgver=2.30.2
pkgrel=1
pkgdesc="An image loading library"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11' 'jasper')
makedepends=('gtk-doc' 'gobject-introspection')
install=gdk-pixbuf2.install
source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz)
-sha256sums=('4a73600525621283a14436c5f873c1126c4feafcb07d24a746f13215e2caa658')
+sha256sums=('cababfa075a9a60426809309ec86b82ea28e83f44ef69c898e48c040b6feecbf')
build() {
cd gdk-pixbuf-$pkgver
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 41160df16..f9c3e4927 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197978 2013-10-30 12:02:48Z allan $
+# $Id: PKGBUILD 200818 2013-12-05 23:40:49Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gdm
pkgname=(gdm libgdm)
pkgver=3.10.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="Gnome Display Manager"
arch=('i686' 'x86_64' 'mips64el')
license=(GPL)
@@ -72,12 +72,16 @@ package_gdm() {
### Split libgdm
make -C gui/libgdm DESTDIR="$pkgdir" uninstall
+ mv "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml" "$srcdir"
}
package_libgdm() {
pkgdesc="GDM support library"
- depends=(systemd)
+ depends=(systemd glib2)
+ install=libgdm.install
cd $pkgbase-$pkgver
make -C gui/libgdm DESTDIR="$pkgdir" install
+ install -Dm644 "$srcdir/org.gnome.login-screen.gschema.xml" \
+ "$pkgdir/usr/share/glib-2.0/schemas/org.gnome.login-screen.gschema.xml"
}
diff --git a/extra/gdm/gdm.install b/extra/gdm/gdm.install
index 4f15730f0..d43f06c2f 100644
--- a/extra/gdm/gdm.install
+++ b/extra/gdm/gdm.install
@@ -1,5 +1,3 @@
-pkgname=gdm
-
post_install() {
getent group gdm >/dev/null 2>&1 || groupadd -g 120 gdm
getent passwd gdm > /dev/null 2>&1 || usr/sbin/useradd -c 'Gnome Display Manager' -u 120 -g gdm -d /var/lib/gdm -s /sbin/nologin gdm
@@ -7,25 +5,18 @@ post_install() {
chown -R gdm:gdm /var/lib/gdm > /dev/null
chown root:gdm /var/log/gdm > /dev/null
- glib-compile-schemas /usr/share/glib-2.0/schemas
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
dconf update
}
-pre_upgrade() {
- if [ -f /usr/share/gconf/schemas/${pkgname}.schemas ]; then
- gconfpkg --uninstall ${pkgname}
- fi
-}
-
post_upgrade() {
post_install
}
post_remove() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
dconf update
gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+
getent passwd gdm >/dev/null 2>&1 && userdel gdm
getent group gdm >/dev/null 2>&1 && groupdel gdm
}
diff --git a/extra/gdm/libgdm.install b/extra/gdm/libgdm.install
new file mode 100644
index 000000000..c19349f72
--- /dev/null
+++ b/extra/gdm/libgdm.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/gedit/PKGBUILD b/extra/gedit/PKGBUILD
index e728e4de0..418189c15 100644
--- a/extra/gedit/PKGBUILD
+++ b/extra/gedit/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197979 2013-10-30 12:03:10Z allan $
+# $Id: PKGBUILD 202235 2013-12-20 16:53:55Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gedit
-pkgver=3.10.1
+pkgver=3.10.3
pkgrel=1
pkgdesc="A text editor for GNOME"
arch=(i686 x86_64 mips64el)
@@ -16,7 +16,7 @@ options=('!emptydirs')
url="http://www.gnome.org"
install=gedit.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2d2e931661c2c2f9ea76cb581fe0eb09d65925b06a57ee7e20cbecb49474cab7')
+sha256sums=('d0efec59622061389fcc06d23b88e2621d4d66b4bafe7d4461c1c7d48a54bc82')
build() {
cd $pkgname-$pkgver
diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index 140c8817a..939a5939d 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -1,30 +1,20 @@
-# $Id: PKGBUILD 197988 2013-10-30 12:06:55Z allan $
+# $Id: PKGBUILD 199906 2013-11-18 17:59:42Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
# Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
# Contributor: mightyjaym <jm.ambrosino@free.fr>
pkgname=giflib
-pkgver=5.0.4
-pkgrel=2
+pkgver=5.0.5
+pkgrel=1
pkgdesc="A library for reading and writing gif images"
url="http://sourceforge.net/projects/giflib/"
arch=('i686' 'x86_64' 'mips64el')
license=('MIT')
-depends=('libx11')
+depends=('glibc')
makedepends=('xmlto' 'docbook-xml' 'docbook-xsl')
-provides=("libungif=${pkgver}")
-conflicts=('libungif')
-replaces=('libungif')
-source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2
- giflib-5.0.4-include-stddef.patch)
-md5sums=('da60935d07374de00a78c2f6f720c8f5'
- 'e39b98822334f2bd2009469e5dea65c5')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- patch -Np1 -i ../giflib-5.0.4-include-stddef.patch
-}
+source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('c3262ba0a3dad31ba876fb5ba1d71a02')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch
deleted file mode 100644
index f6745d2c0..000000000
--- a/extra/giflib/giflib-4.2.1-quantize.patch
+++ /dev/null
@@ -1,679 +0,0 @@
-From 7b01ed05d6c16172bd11a62d9b334f0eb7c5fc1e Mon Sep 17 00:00:00 2001
-From: "Eric S. Raymond" <esr@thyrsus.com>
-Date: Sun, 3 Jun 2012 07:59:30 -0400
-Subject: [PATCH] Return QuantizeBuffer() to the core library.
-
-Fulfils SourceForge FR 3531618.
----
- NEWS | 2 +
- lib/Makefile.am | 3 +-
- lib/gif_lib.h | 9 ++
- lib/quantize.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- util/rgb2gif.c | 302 ------------------------------------------------------
- 5 files changed, 322 insertions(+), 303 deletions(-)
- create mode 100644 lib/quantize.c
-
-index 813a2f8..ae6d5fa 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -13,7 +13,8 @@ libgif_la_SOURCES = dgif_lib.c \
- gif_hash.h \
- gifalloc.c \
- gif_err.c \
-- gif_lib_private.h
-+ gif_lib_private.h \
-+ quantize.c
-
- libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ $(LT_LDFLAGS)
- libgif_la_LIBADD = @DEVS@
-diff --git a/lib/gif_lib.h b/lib/gif_lib.h
-index e942089..73bc437 100644
---- a/lib/gif_lib.h
-+++ b/lib/gif_lib.h
-@@ -207,6 +207,15 @@ int DGifGetLZCodes(GifFileType *GifFile, int *GifCode);
-
-
- /******************************************************************************
-+ * O.K., here are the routines from GIF_LIB file QUANTIZE.C.
-+******************************************************************************/
-+int QuantizeBuffer(unsigned int Width, unsigned int Height,
-+ int *ColorMapSize, GifByteType * RedInput,
-+ GifByteType * GreenInput, GifByteType * BlueInput,
-+ GifByteType * OutputBuffer,
-+ GifColorType * OutputColorMap);
-+
-+/******************************************************************************
- * O.K., here are the routines from GIF_LIB file GIF_ERR.C.
- ******************************************************************************/
- extern int GifError(void); /* new in 2012 - ESR */
-diff --git a/lib/quantize.c b/lib/quantize.c
-new file mode 100644
-index 0000000..feb1dc7
---- /dev/null
-+++ b/lib/quantize.c
-@@ -0,0 +1,309 @@
-+/*****************************************************************************
-+ *
-+ * quantize.c - quantize a high resolution image into lower one
-+ *
-+ * Based on: "Color Image Quantization for frame buffer Display", by
-+ * Paul Heckbert SIGGRAPH 1982 page 297-307.
-+ *
-+ * This doesn't really belong in the core library, was undocumented,
-+ * and was removed in 4.2. Then it turned out some client apps were
-+ * actually using it, so it was restored in 5.0.
-+ *
-+ *****************************************************************************/
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include "gif_lib.h"
-+#include "gif_lib_private.h"
-+
-+#define ABS(x) ((x) > 0 ? (x) : (-(x)))
-+
-+#define COLOR_ARRAY_SIZE 32768
-+#define BITS_PER_PRIM_COLOR 5
-+#define MAX_PRIM_COLOR 0x1f
-+
-+static int SortRGBAxis;
-+
-+typedef struct QuantizedColorType {
-+ GifByteType RGB[3];
-+ GifByteType NewColorIndex;
-+ long Count;
-+ struct QuantizedColorType *Pnext;
-+} QuantizedColorType;
-+
-+typedef struct NewColorMapType {
-+ GifByteType RGBMin[3], RGBWidth[3];
-+ unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
-+ unsigned long Count; /* Total number of pixels in all the entries */
-+ QuantizedColorType *QuantizedColors;
-+} NewColorMapType;
-+
-+static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
-+ unsigned int ColorMapSize,
-+ unsigned int *NewColorMapSize);
-+static int SortCmpRtn(const void *Entry1, const void *Entry2);
-+
-+/******************************************************************************
-+ * Quantize high resolution image into lower one. Input image consists of a
-+ * 2D array for each of the RGB colors with size Width by Height. There is no
-+ * Color map for the input. Output is a quantized image with 2D array of
-+ * indexes into the output color map.
-+ * Note input image can be 24 bits at the most (8 for red/green/blue) and
-+ * the output has 256 colors at the most (256 entries in the color map.).
-+ * ColorMapSize specifies size of color map up to 256 and will be updated to
-+ * real size before returning.
-+ * Also non of the parameter are allocated by this routine.
-+ * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
-+ ******************************************************************************/
-+int
-+QuantizeBuffer(unsigned int Width,
-+ unsigned int Height,
-+ int *ColorMapSize,
-+ GifByteType * RedInput,
-+ GifByteType * GreenInput,
-+ GifByteType * BlueInput,
-+ GifByteType * OutputBuffer,
-+ GifColorType * OutputColorMap) {
-+
-+ unsigned int Index, NumOfEntries;
-+ int i, j, MaxRGBError[3];
-+ unsigned int NewColorMapSize;
-+ long Red, Green, Blue;
-+ NewColorMapType NewColorSubdiv[256];
-+ QuantizedColorType *ColorArrayEntries, *QuantizedColor;
-+
-+ ColorArrayEntries = (QuantizedColorType *)malloc(
-+ sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
-+ if (ColorArrayEntries == NULL) {
-+ _GifError = E_GIF_ERR_NOT_ENOUGH_MEM;
-+ return GIF_ERROR;
-+ }
-+
-+ for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
-+ ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
-+ ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
-+ MAX_PRIM_COLOR;
-+ ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
-+ ColorArrayEntries[i].Count = 0;
-+ }
-+
-+ /* Sample the colors and their distribution: */
-+ for (i = 0; i < (int)(Width * Height); i++) {
-+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ (2 * BITS_PER_PRIM_COLOR)) +
-+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ BITS_PER_PRIM_COLOR) +
-+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-+ ColorArrayEntries[Index].Count++;
-+ }
-+
-+ /* Put all the colors in the first entry of the color map, and call the
-+ * recursive subdivision process. */
-+ for (i = 0; i < 256; i++) {
-+ NewColorSubdiv[i].QuantizedColors = NULL;
-+ NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
-+ for (j = 0; j < 3; j++) {
-+ NewColorSubdiv[i].RGBMin[j] = 0;
-+ NewColorSubdiv[i].RGBWidth[j] = 255;
-+ }
-+ }
-+
-+ /* Find the non empty entries in the color table and chain them: */
-+ for (i = 0; i < COLOR_ARRAY_SIZE; i++)
-+ if (ColorArrayEntries[i].Count > 0)
-+ break;
-+ QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
-+ NumOfEntries = 1;
-+ while (++i < COLOR_ARRAY_SIZE)
-+ if (ColorArrayEntries[i].Count > 0) {
-+ QuantizedColor->Pnext = &ColorArrayEntries[i];
-+ QuantizedColor = &ColorArrayEntries[i];
-+ NumOfEntries++;
-+ }
-+ QuantizedColor->Pnext = NULL;
-+
-+ NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
-+ NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
-+ NewColorMapSize = 1;
-+ if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
-+ GIF_OK) {
-+ free((char *)ColorArrayEntries);
-+ return GIF_ERROR;
-+ }
-+ if (NewColorMapSize < *ColorMapSize) {
-+ /* And clear rest of color map: */
-+ for (i = NewColorMapSize; i < *ColorMapSize; i++)
-+ OutputColorMap[i].Red = OutputColorMap[i].Green =
-+ OutputColorMap[i].Blue = 0;
-+ }
-+
-+ /* Average the colors in each entry to be the color to be used in the
-+ * output color map, and plug it into the output color map itself. */
-+ for (i = 0; i < NewColorMapSize; i++) {
-+ if ((j = NewColorSubdiv[i].NumEntries) > 0) {
-+ QuantizedColor = NewColorSubdiv[i].QuantizedColors;
-+ Red = Green = Blue = 0;
-+ while (QuantizedColor) {
-+ QuantizedColor->NewColorIndex = i;
-+ Red += QuantizedColor->RGB[0];
-+ Green += QuantizedColor->RGB[1];
-+ Blue += QuantizedColor->RGB[2];
-+ QuantizedColor = QuantizedColor->Pnext;
-+ }
-+ OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
-+ }
-+ }
-+
-+ /* Finally scan the input buffer again and put the mapped index in the
-+ * output buffer. */
-+ MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
-+ for (i = 0; i < (int)(Width * Height); i++) {
-+ Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ (2 * BITS_PER_PRIM_COLOR)) +
-+ ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-+ BITS_PER_PRIM_COLOR) +
-+ (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-+ Index = ColorArrayEntries[Index].NewColorIndex;
-+ OutputBuffer[i] = Index;
-+ if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
-+ MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
-+ if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
-+ MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
-+ if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
-+ MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
-+ }
-+
-+#ifdef DEBUG
-+ fprintf(stderr,
-+ "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
-+ MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
-+#endif /* DEBUG */
-+
-+ free((char *)ColorArrayEntries);
-+
-+ *ColorMapSize = NewColorMapSize;
-+
-+ return GIF_OK;
-+}
-+
-+/******************************************************************************
-+ * Routine to subdivide the RGB space recursively using median cut in each
-+ * axes alternatingly until ColorMapSize different cubes exists.
-+ * The biggest cube in one dimension is subdivide unless it has only one entry.
-+ * Returns GIF_ERROR if failed, otherwise GIF_OK.
-+ ******************************************************************************/
-+static int
-+SubdivColorMap(NewColorMapType * NewColorSubdiv,
-+ unsigned int ColorMapSize,
-+ unsigned int *NewColorMapSize) {
-+
-+ int MaxSize;
-+ unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
-+ long Sum, Count;
-+ QuantizedColorType *QuantizedColor, **SortArray;
-+
-+ while (ColorMapSize > *NewColorMapSize) {
-+ /* Find candidate for subdivision: */
-+ MaxSize = -1;
-+ for (i = 0; i < *NewColorMapSize; i++) {
-+ for (j = 0; j < 3; j++) {
-+ if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
-+ (NewColorSubdiv[i].NumEntries > 1)) {
-+ MaxSize = NewColorSubdiv[i].RGBWidth[j];
-+ Index = i;
-+ SortRGBAxis = j;
-+ }
-+ }
-+ }
-+
-+ if (MaxSize == -1)
-+ return GIF_OK;
-+
-+ /* Split the entry Index into two along the axis SortRGBAxis: */
-+
-+ /* Sort all elements in that entry along the given axis and split at
-+ * the median. */
-+ SortArray = (QuantizedColorType **)malloc(
-+ sizeof(QuantizedColorType *) *
-+ NewColorSubdiv[Index].NumEntries);
-+ if (SortArray == NULL)
-+ return GIF_ERROR;
-+ for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
-+ j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
-+ j++, QuantizedColor = QuantizedColor->Pnext)
-+ SortArray[j] = QuantizedColor;
-+
-+ qsort(SortArray, NewColorSubdiv[Index].NumEntries,
-+ sizeof(QuantizedColorType *), SortCmpRtn);
-+
-+ /* Relink the sorted list into one: */
-+ for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
-+ SortArray[j]->Pnext = SortArray[j + 1];
-+ SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
-+ NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
-+ free((char *)SortArray);
-+
-+ /* Now simply add the Counts until we have half of the Count: */
-+ Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
-+ NumEntries = 1;
-+ Count = QuantizedColor->Count;
-+ while ((Sum -= QuantizedColor->Pnext->Count) >= 0 &&
-+ QuantizedColor->Pnext != NULL &&
-+ QuantizedColor->Pnext->Pnext != NULL) {
-+ QuantizedColor = QuantizedColor->Pnext;
-+ NumEntries++;
-+ Count += QuantizedColor->Count;
-+ }
-+ /* Save the values of the last color of the first half, and first
-+ * of the second half so we can update the Bounding Boxes later.
-+ * Also as the colors are quantized and the BBoxes are full 0..255,
-+ * they need to be rescaled.
-+ */
-+ MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
-+ MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
-+ MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
-+ MinColor <<= (8 - BITS_PER_PRIM_COLOR);
-+
-+ /* Partition right here: */
-+ NewColorSubdiv[*NewColorMapSize].QuantizedColors =
-+ QuantizedColor->Pnext;
-+ QuantizedColor->Pnext = NULL;
-+ NewColorSubdiv[*NewColorMapSize].Count = Count;
-+ NewColorSubdiv[Index].Count -= Count;
-+ NewColorSubdiv[*NewColorMapSize].NumEntries =
-+ NewColorSubdiv[Index].NumEntries - NumEntries;
-+ NewColorSubdiv[Index].NumEntries = NumEntries;
-+ for (j = 0; j < 3; j++) {
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
-+ NewColorSubdiv[Index].RGBMin[j];
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
-+ NewColorSubdiv[Index].RGBWidth[j];
-+ }
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
-+ NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
-+ NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
-+
-+ NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
-+ MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
-+
-+ (*NewColorMapSize)++;
-+ }
-+
-+ return GIF_OK;
-+}
-+
-+/****************************************************************************
-+ * Routine called by qsort to compare to entries.
-+ ****************************************************************************/
-+static int
-+SortCmpRtn(const void *Entry1,
-+ const void *Entry2) {
-+
-+ return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
-+ (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
-+}
-+
-+/* end */
-diff --git a/util/rgb2gif.c b/util/rgb2gif.c
-index 56386c7..46d9654 100644
---- a/util/rgb2gif.c
-+++ b/util/rgb2gif.c
-@@ -69,308 +69,6 @@ static void SaveGif(GifByteType *OutputBuffer,
- static void QuitGifError(GifFileType *GifFile);
-
- /******************************************************************************
-- * Code to quantize high resolution image into lower one. You may want to
-- * peek into the following article this code is based on:
-- * "Color Image Quantization for frame buffer Display", by Paul Heckbert
-- * SIGGRAPH 1982 page 297-307.
-- ******************************************************************************
-- * History:
-- * 5 Jan 90 - Version 1.0 by Gershon Elber.
-- *****************************************************************************/
--
--#define ABS(x) ((x) > 0 ? (x) : (-(x)))
--
--#define COLOR_ARRAY_SIZE 32768
--#define BITS_PER_PRIM_COLOR 5
--#define MAX_PRIM_COLOR 0x1f
--
--static int SortRGBAxis;
--
--typedef struct QuantizedColorType {
-- GifByteType RGB[3];
-- GifByteType NewColorIndex;
-- long Count;
-- struct QuantizedColorType *Pnext;
--} QuantizedColorType;
--
--typedef struct NewColorMapType {
-- GifByteType RGBMin[3], RGBWidth[3];
-- unsigned int NumEntries; /* # of QuantizedColorType in linked list below */
-- unsigned long Count; /* Total number of pixels in all the entries */
-- QuantizedColorType *QuantizedColors;
--} NewColorMapType;
--
--static int SubdivColorMap(NewColorMapType * NewColorSubdiv,
-- unsigned int ColorMapSize,
-- unsigned int *NewColorMapSize);
--static int SortCmpRtn(const void *Entry1, const void *Entry2);
--
--/******************************************************************************
-- * Quantize high resolution image into lower one. Input image consists of a
-- * 2D array for each of the RGB colors with size Width by Height. There is no
-- * Color map for the input. Output is a quantized image with 2D array of
-- * indexes into the output color map.
-- * Note input image can be 24 bits at the most (8 for red/green/blue) and
-- * the output has 256 colors at the most (256 entries in the color map.).
-- * ColorMapSize specifies size of color map up to 256 and will be updated to
-- * real size before returning.
-- * Also non of the parameter are allocated by this routine.
-- * This function returns GIF_OK if succesfull, GIF_ERROR otherwise.
-- ******************************************************************************/
--static int
--QuantizeBuffer(unsigned int Width,
-- unsigned int Height,
-- int *ColorMapSize,
-- GifByteType * RedInput,
-- GifByteType * GreenInput,
-- GifByteType * BlueInput,
-- GifByteType * OutputBuffer,
-- GifColorType * OutputColorMap) {
--
-- unsigned int Index, NumOfEntries;
-- int i, j, MaxRGBError[3];
-- unsigned int NewColorMapSize;
-- long Red, Green, Blue;
-- NewColorMapType NewColorSubdiv[256];
-- QuantizedColorType *ColorArrayEntries, *QuantizedColor;
--
-- ColorArrayEntries = (QuantizedColorType *)malloc(
-- sizeof(QuantizedColorType) * COLOR_ARRAY_SIZE);
-- if (ColorArrayEntries == NULL) {
-- return GIF_ERROR;
-- }
--
-- for (i = 0; i < COLOR_ARRAY_SIZE; i++) {
-- ColorArrayEntries[i].RGB[0] = i >> (2 * BITS_PER_PRIM_COLOR);
-- ColorArrayEntries[i].RGB[1] = (i >> BITS_PER_PRIM_COLOR) &
-- MAX_PRIM_COLOR;
-- ColorArrayEntries[i].RGB[2] = i & MAX_PRIM_COLOR;
-- ColorArrayEntries[i].Count = 0;
-- }
--
-- /* Sample the colors and their distribution: */
-- for (i = 0; i < (int)(Width * Height); i++) {
-- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-- (2 * BITS_PER_PRIM_COLOR)) +
-- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-- BITS_PER_PRIM_COLOR) +
-- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-- ColorArrayEntries[Index].Count++;
-- }
--
-- /* Put all the colors in the first entry of the color map, and call the
-- * recursive subdivision process. */
-- for (i = 0; i < 256; i++) {
-- NewColorSubdiv[i].QuantizedColors = NULL;
-- NewColorSubdiv[i].Count = NewColorSubdiv[i].NumEntries = 0;
-- for (j = 0; j < 3; j++) {
-- NewColorSubdiv[i].RGBMin[j] = 0;
-- NewColorSubdiv[i].RGBWidth[j] = 255;
-- }
-- }
--
-- /* Find the non empty entries in the color table and chain them: */
-- for (i = 0; i < COLOR_ARRAY_SIZE; i++)
-- if (ColorArrayEntries[i].Count > 0)
-- break;
-- QuantizedColor = NewColorSubdiv[0].QuantizedColors = &ColorArrayEntries[i];
-- NumOfEntries = 1;
-- while (++i < COLOR_ARRAY_SIZE)
-- if (ColorArrayEntries[i].Count > 0) {
-- QuantizedColor->Pnext = &ColorArrayEntries[i];
-- QuantizedColor = &ColorArrayEntries[i];
-- NumOfEntries++;
-- }
-- QuantizedColor->Pnext = NULL;
--
-- NewColorSubdiv[0].NumEntries = NumOfEntries; /* Different sampled colors */
-- NewColorSubdiv[0].Count = ((long)Width) * Height; /* Pixels */
-- NewColorMapSize = 1;
-- if (SubdivColorMap(NewColorSubdiv, *ColorMapSize, &NewColorMapSize) !=
-- GIF_OK) {
-- free((char *)ColorArrayEntries);
-- return GIF_ERROR;
-- }
-- if (NewColorMapSize < *ColorMapSize) {
-- /* And clear rest of color map: */
-- for (i = NewColorMapSize; i < *ColorMapSize; i++)
-- OutputColorMap[i].Red = OutputColorMap[i].Green =
-- OutputColorMap[i].Blue = 0;
-- }
--
-- /* Average the colors in each entry to be the color to be used in the
-- * output color map, and plug it into the output color map itself. */
-- for (i = 0; i < NewColorMapSize; i++) {
-- if ((j = NewColorSubdiv[i].NumEntries) > 0) {
-- QuantizedColor = NewColorSubdiv[i].QuantizedColors;
-- Red = Green = Blue = 0;
-- while (QuantizedColor) {
-- QuantizedColor->NewColorIndex = i;
-- Red += QuantizedColor->RGB[0];
-- Green += QuantizedColor->RGB[1];
-- Blue += QuantizedColor->RGB[2];
-- QuantizedColor = QuantizedColor->Pnext;
-- }
-- OutputColorMap[i].Red = (Red << (8 - BITS_PER_PRIM_COLOR)) / j;
-- OutputColorMap[i].Green = (Green << (8 - BITS_PER_PRIM_COLOR)) / j;
-- OutputColorMap[i].Blue = (Blue << (8 - BITS_PER_PRIM_COLOR)) / j;
-- } else
-- fprintf(stderr,
-- "\n%s: Null entry in quantized color map - that's weird.\n",
-- PROGRAM_NAME);
-- }
--
-- /* Finally scan the input buffer again and put the mapped index in the
-- * output buffer. */
-- MaxRGBError[0] = MaxRGBError[1] = MaxRGBError[2] = 0;
-- for (i = 0; i < (int)(Width * Height); i++) {
-- Index = ((RedInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-- (2 * BITS_PER_PRIM_COLOR)) +
-- ((GreenInput[i] >> (8 - BITS_PER_PRIM_COLOR)) <<
-- BITS_PER_PRIM_COLOR) +
-- (BlueInput[i] >> (8 - BITS_PER_PRIM_COLOR));
-- Index = ColorArrayEntries[Index].NewColorIndex;
-- OutputBuffer[i] = Index;
-- if (MaxRGBError[0] < ABS(OutputColorMap[Index].Red - RedInput[i]))
-- MaxRGBError[0] = ABS(OutputColorMap[Index].Red - RedInput[i]);
-- if (MaxRGBError[1] < ABS(OutputColorMap[Index].Green - GreenInput[i]))
-- MaxRGBError[1] = ABS(OutputColorMap[Index].Green - GreenInput[i]);
-- if (MaxRGBError[2] < ABS(OutputColorMap[Index].Blue - BlueInput[i]))
-- MaxRGBError[2] = ABS(OutputColorMap[Index].Blue - BlueInput[i]);
-- }
--
--#ifdef DEBUG
-- fprintf(stderr,
-- "Quantization L(0) errors: Red = %d, Green = %d, Blue = %d.\n",
-- MaxRGBError[0], MaxRGBError[1], MaxRGBError[2]);
--#endif /* DEBUG */
--
-- free((char *)ColorArrayEntries);
--
-- *ColorMapSize = NewColorMapSize;
--
-- return GIF_OK;
--}
--
--/******************************************************************************
-- * Routine to subdivide the RGB space recursively using median cut in each
-- * axes alternatingly until ColorMapSize different cubes exists.
-- * The biggest cube in one dimension is subdivide unless it has only one entry.
-- * Returns GIF_ERROR if failed, otherwise GIF_OK.
-- ******************************************************************************/
--static int
--SubdivColorMap(NewColorMapType * NewColorSubdiv,
-- unsigned int ColorMapSize,
-- unsigned int *NewColorMapSize) {
--
-- int MaxSize;
-- unsigned int i, j, Index = 0, NumEntries, MinColor, MaxColor;
-- long Sum, Count;
-- QuantizedColorType *QuantizedColor, **SortArray;
--
-- while (ColorMapSize > *NewColorMapSize) {
-- /* Find candidate for subdivision: */
-- MaxSize = -1;
-- for (i = 0; i < *NewColorMapSize; i++) {
-- for (j = 0; j < 3; j++) {
-- if ((((int)NewColorSubdiv[i].RGBWidth[j]) > MaxSize) &&
-- (NewColorSubdiv[i].NumEntries > 1)) {
-- MaxSize = NewColorSubdiv[i].RGBWidth[j];
-- Index = i;
-- SortRGBAxis = j;
-- }
-- }
-- }
--
-- if (MaxSize == -1)
-- return GIF_OK;
--
-- /* Split the entry Index into two along the axis SortRGBAxis: */
--
-- /* Sort all elements in that entry along the given axis and split at
-- * the median. */
-- SortArray = (QuantizedColorType **)malloc(
-- sizeof(QuantizedColorType *) *
-- NewColorSubdiv[Index].NumEntries);
-- if (SortArray == NULL)
-- return GIF_ERROR;
-- for (j = 0, QuantizedColor = NewColorSubdiv[Index].QuantizedColors;
-- j < NewColorSubdiv[Index].NumEntries && QuantizedColor != NULL;
-- j++, QuantizedColor = QuantizedColor->Pnext)
-- SortArray[j] = QuantizedColor;
--
-- qsort(SortArray, NewColorSubdiv[Index].NumEntries,
-- sizeof(QuantizedColorType *), SortCmpRtn);
--
-- /* Relink the sorted list into one: */
-- for (j = 0; j < NewColorSubdiv[Index].NumEntries - 1; j++)
-- SortArray[j]->Pnext = SortArray[j + 1];
-- SortArray[NewColorSubdiv[Index].NumEntries - 1]->Pnext = NULL;
-- NewColorSubdiv[Index].QuantizedColors = QuantizedColor = SortArray[0];
-- free((char *)SortArray);
--
-- /* Now simply add the Counts until we have half of the Count: */
-- Sum = NewColorSubdiv[Index].Count / 2 - QuantizedColor->Count;
-- NumEntries = 1;
-- Count = QuantizedColor->Count;
-- while (QuantizedColor->Pnext != NULL &&
-- (Sum -= QuantizedColor->Pnext->Count) >= 0 &&
-- QuantizedColor->Pnext->Pnext != NULL) {
-- QuantizedColor = QuantizedColor->Pnext;
-- NumEntries++;
-- Count += QuantizedColor->Count;
-- }
-- /* Save the values of the last color of the first half, and first
-- * of the second half so we can update the Bounding Boxes later.
-- * Also as the colors are quantized and the BBoxes are full 0..255,
-- * they need to be rescaled.
-- */
-- MaxColor = QuantizedColor->RGB[SortRGBAxis]; /* Max. of first half */
-- /* coverity[var_deref_op] */
-- MinColor = QuantizedColor->Pnext->RGB[SortRGBAxis]; /* of second */
-- MaxColor <<= (8 - BITS_PER_PRIM_COLOR);
-- MinColor <<= (8 - BITS_PER_PRIM_COLOR);
--
-- /* Partition right here: */
-- NewColorSubdiv[*NewColorMapSize].QuantizedColors =
-- QuantizedColor->Pnext;
-- QuantizedColor->Pnext = NULL;
-- NewColorSubdiv[*NewColorMapSize].Count = Count;
-- NewColorSubdiv[Index].Count -= Count;
-- NewColorSubdiv[*NewColorMapSize].NumEntries =
-- NewColorSubdiv[Index].NumEntries - NumEntries;
-- NewColorSubdiv[Index].NumEntries = NumEntries;
-- for (j = 0; j < 3; j++) {
-- NewColorSubdiv[*NewColorMapSize].RGBMin[j] =
-- NewColorSubdiv[Index].RGBMin[j];
-- NewColorSubdiv[*NewColorMapSize].RGBWidth[j] =
-- NewColorSubdiv[Index].RGBWidth[j];
-- }
-- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] =
-- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] +
-- NewColorSubdiv[*NewColorMapSize].RGBWidth[SortRGBAxis] - MinColor;
-- NewColorSubdiv[*NewColorMapSize].RGBMin[SortRGBAxis] = MinColor;
--
-- NewColorSubdiv[Index].RGBWidth[SortRGBAxis] =
-- MaxColor - NewColorSubdiv[Index].RGBMin[SortRGBAxis];
--
-- (*NewColorMapSize)++;
-- }
--
-- return GIF_OK;
--}
--
--/****************************************************************************
-- * Routine called by qsort to compare two entries.
-- ****************************************************************************/
--static int
--SortCmpRtn(const void *Entry1,
-- const void *Entry2) {
--
-- return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] -
-- (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis];
--}
--/******************************************************************************
- * Interpret the command line and scan the given GIF file.
- ******************************************************************************/
- int main(int argc, char **argv)
---
-1.8.3.2
-
diff --git a/extra/giflib/giflib-5.0.4-include-stddef.patch b/extra/giflib/giflib-5.0.4-include-stddef.patch
deleted file mode 100644
index d3ea73854..000000000
--- a/extra/giflib/giflib-5.0.4-include-stddef.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -rupN a/lib/gif_lib.h b/lib/gif_lib.h
---- a/lib/gif_lib.h 2013-01-06 07:29:57.000000000 +0100
-+++ b/lib/gif_lib.h 2013-07-30 10:52:47.611034000 +0200
-@@ -19,6 +19,7 @@ extern "C" {
- #define GIF_OK 1
-
- #include <stdbool.h>
-+#include <stddef.h>
-
- #define GIF_STAMP "GIFVER" /* First chars in file - GIF stamp. */
- #define GIF_STAMP_LEN sizeof(GIF_STAMP) - 1
diff --git a/extra/gifsicle/PKGBUILD b/extra/gifsicle/PKGBUILD
index ced5c1b09..1585b695e 100644
--- a/extra/gifsicle/PKGBUILD
+++ b/extra/gifsicle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 192181 2013-08-06 18:35:21Z eric $
+# $Id: PKGBUILD 202254 2013-12-20 22:16:30Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=gifsicle
-pkgver=1.71
+pkgver=1.78
pkgrel=1
pkgdesc="A powerful command-line program for creating, editing, manipulating and getting information about GIF images and animations"
arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ url="http://www.lcdf.org/gifsicle/"
license=('GPL')
depends=('libx11')
source=(http://www.lcdf.org/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('a7665faa99b157ea545b65761d19e15b9b4a8b74')
+sha1sums=('df0cb87ee8237d7ba341e59cfef6cf44a7e4e630')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 1d5e15b8a..a508a60fa 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197743 2013-10-29 02:17:19Z dan $
+# $Id: PKGBUILD 201683 2013-12-18 01:22:42Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=git
-pkgver=1.8.4.2
+pkgver=1.8.5.2
pkgrel=1
pkgdesc="the fast distributed version control system"
arch=(i686 x86_64 'mips64el')
@@ -49,6 +49,8 @@ check() {
if [ "$CARCH" != "mips64el" ]; then
local jobs
jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*')
+ # build failures with multiple jobs in check, not ideal...
+ jobs='-j1'
fi
mkdir -p /dev/shm/git-test
# We used to use this, but silly git regressions:
@@ -115,7 +117,7 @@ package() {
install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
}
-md5sums=('6f63d103465b86ca0ebe4189ea54731c'
- '2b4719ec820d845134b689247abe65e8'
+md5sums=('df8519044f9880f3687d863d99245282'
+ '27851cc39808f1be6d3789fae87c8308'
'042524f942785772d7bd52a1f02fe5ae'
'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD
index 66cfeddd3..773707294 100644
--- a/extra/glade/PKGBUILD
+++ b/extra/glade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197992 2013-10-30 12:08:19Z allan $
+# $Id: PKGBUILD 202187 2013-12-19 01:01:24Z heftig $
# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=glade
-pkgver=3.16.0
+pkgver=3.16.1
pkgrel=1
pkgdesc="User interface builder for GTK+ and GNOME."
arch=(i686 x86_64 mips64el)
@@ -14,7 +14,7 @@ optdepends=('python2: Python widgets support'
url="http://glade.gnome.org/"
install=glade.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('b80773a294d3af07739d9d53bae12e11cf0bbf420bbc8931cc5e20b2647e3626')
+sha256sums=('994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/glib-networking/PKGBUILD b/extra/glib-networking/PKGBUILD
index d2f7c8e3d..2fe6c5725 100644
--- a/extra/glib-networking/PKGBUILD
+++ b/extra/glib-networking/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197995 2013-10-30 12:09:26Z allan $
+# $Id: PKGBUILD 199408 2013-11-11 23:20:22Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=glib-networking
-pkgver=2.38.1
+pkgver=2.38.2
pkgrel=1
pkgdesc="Network-related giomodules for glib"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=(glib2 libproxy gnutls ca-certificates gsettings-desktop-schemas)
makedepends=(intltool)
install=glib-networking.install
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('32ea1e504f69ff6693ac4119ad598ded50bb0440cf4484d28ef0adf8fcc85653')
+sha256sums=('e8e2fe919d3236169c9bfaec807966ec81b844fc28b11bddc9f8256cfa949fc7')
build() {
cd $pkgname-$pkgver
diff --git a/extra/glibmm/PKGBUILD b/extra/glibmm/PKGBUILD
index eae133c9b..a7668223b 100644
--- a/extra/glibmm/PKGBUILD
+++ b/extra/glibmm/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 197994 2013-10-30 12:09:05Z allan $
+# $Id: PKGBUILD 199895 2013-11-18 10:41:34Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgbase=glibmm
pkgname=('glibmm' 'glibmm-docs')
-pkgver=2.38.0
+pkgver=2.38.1
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
makedepends=('glib2' 'libsigc++2.0' 'pkgconfig')
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
url="http://www.gtkmm.org/"
-sha256sums=('f37bab6bedb7b68045e356feca9e27760a5ce50d95df07156656a0e1deabc402')
+sha256sums=('49c925ee1d3c4d0d6cd7492d7173bd6826db51d0b55f458a6496406ae267c4a2')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/glpk/PKGBUILD b/extra/glpk/PKGBUILD
index 0b4096bb5..b050d41b0 100644
--- a/extra/glpk/PKGBUILD
+++ b/extra/glpk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197996 2013-10-30 12:09:46Z allan $
+# $Id: PKGBUILD 199812 2013-11-17 05:33:51Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: bzklrm <bzklrm@gmail.com>
# Additional contributors Senjin, Xavier, dundee
pkgname=glpk
pkgver=4.52
-pkgrel=1
+pkgrel=2
pkgdesc="GNU Linear Programming Kit : solve LP, MIP and other problems."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/glpk/glpk.html"
diff --git a/extra/gnome-calculator/PKGBUILD b/extra/gnome-calculator/PKGBUILD
index 0f4f8b541..5761e86b0 100644
--- a/extra/gnome-calculator/PKGBUILD
+++ b/extra/gnome-calculator/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196809 2013-10-19 20:33:48Z heftig $
+# $Id: PKGBUILD 199332 2013-11-11 10:50:29Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-calculator
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="GNOME Scientific calculator"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ options=(!emptydirs)
url="http://www.gnome.org"
install=gnome-calculator.install
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('9268f06e53647e9a61a773b7ae499d4fd3097843060fc9baa8f97912247df48f')
+sha256sums=('2e583252e9332d8c7be52f1512a113869be1ad27fa829f7b49c89c9ea66d6d3e')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-chess/PKGBUILD b/extra/gnome-chess/PKGBUILD
index ffdef50d3..f4f6f4277 100644
--- a/extra/gnome-chess/PKGBUILD
+++ b/extra/gnome-chess/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 198001 2013-10-30 12:11:39Z allan $
+# $Id: PKGBUILD 201495 2013-12-12 22:17:22Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-chess
-pkgver=3.10.1.1
-pkgrel=1
+pkgver=3.10.2
+pkgrel=2
pkgdesc="Play the classic two-player boardgame of chess"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
-depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'sqlite')
+depends=('desktop-file-utils' 'hicolor-icon-theme' 'gtk3' 'librsvg' 'glu')
makedepends=('intltool' 'itstool' 'gobject-introspection')
optdepends=('gnuchess: Play against computer')
conflicts=('gnome-games')
@@ -18,7 +18,7 @@ install=gnome-chess.install
url="https://live.gnome.org/Chess"
groups=('gnome-extra')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('abdee96eaf56689c4c2bd78cd115a0e30d302e16a8f42dfcb39520c9a33c6eec')
+sha256sums=('3aae8d501fce8ffd30bee6740e61bfbd7c48336f4ca254912f2646c8486324b1')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD
index 711bdbe6f..d53db98b3 100644
--- a/extra/gnome-control-center/PKGBUILD
+++ b/extra/gnome-control-center/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198004 2013-10-30 12:12:43Z allan $
+# $Id: PKGBUILD 199445 2013-11-12 20:25:31Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-control-center
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="The Control Center for GNOME"
license=(GPL)
@@ -22,15 +22,12 @@ groups=(gnome)
url="http://www.gnome.org"
install=gnome-control-center.install
options=('!emptydirs')
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- buildfix.patch)
-sha256sums=('fbfc1a935c33901c6afc999160696e0cde60ccb9997679cc8d0a2ff952568cbe'
- 'f58644e8735d3eb1e911ba2373e6c91cfde67b1ceaf54dca179b3a1c8db7466d')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
+sha256sums=('f67a9e88cda62c25e1aa1fbbb36d4fa632e8da11e98ac030e0e40437f12483a9')
prepare() {
cd $pkgname-$pkgver
- patch -Np1 -i ../buildfix.patch
- autoreconf -fi
+ #autoreconf -fi
}
build() {
diff --git a/extra/gnome-control-center/buildfix.patch b/extra/gnome-control-center/buildfix.patch
deleted file mode 100644
index baf2ee6a5..000000000
--- a/extra/gnome-control-center/buildfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -u -r gnome-control-center-3.10.1/panels/background/Makefile.am gnome-control-center-3.10.1-buildfix/panels/background/Makefile.am
---- gnome-control-center-3.10.1/panels/background/Makefile.am 2013-10-11 13:19:22.000000000 +0200
-+++ gnome-control-center-3.10.1-buildfix/panels/background/Makefile.am 2013-10-16 00:59:02.966707377 +0200
-@@ -52,11 +52,6 @@
- libbackground_la_LIBADD += $(SOCIALWEB_LIBS)
- endif
-
--noinst_PROGRAMS = test-chooser-dialog
--test_chooser_dialog_SOURCES = test-chooser-dialog.c
--test_chooser_dialog_LDADD = libbackground-chooser.la
--test_chooser_dialog_LDFLAGS = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS)
--
- resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/background.gresource.xml)
- cc-background-resources.c: background.gresource.xml $(resource_files)
- $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_background $<
diff --git a/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch b/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch
new file mode 100644
index 000000000..0bf10f61d
--- /dev/null
+++ b/extra/gnome-desktop/0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch
@@ -0,0 +1,67 @@
+From ede893a90870c31d8b374978d524fddf6f3aac81 Mon Sep 17 00:00:00 2001
+From: Asad Mehmood <asad78611@googlemail.com>
+Date: Thu, 17 Oct 2013 16:21:42 +0100
+Subject: [PATCH] GnomeRR: gnome_rr_output_get_min_backlight_step
+
+Allows gnome-settings-daemon to read the min_backlight_step
+so that it can support displays with less than 10 steps
+---
+ libgnome-desktop/gnome-rr.c | 15 +++++++++++++++
+ libgnome-desktop/gnome-rr.h | 1 +
+ 2 files changed, 16 insertions(+)
+
+diff --git a/libgnome-desktop/gnome-rr.c b/libgnome-desktop/gnome-rr.c
+index 5e011d3..88df060 100644
+--- a/libgnome-desktop/gnome-rr.c
++++ b/libgnome-desktop/gnome-rr.c
+@@ -77,6 +77,7 @@ struct GnomeRROutput
+ char * edid_file;
+
+ int backlight;
++ int min_backlight_step;
+
+ gboolean is_primary;
+ gboolean is_presentation;
+@@ -1271,6 +1272,7 @@ output_initialize (GnomeRROutput *output, GVariant *info)
+ g_variant_lookup (properties, "height-mm", "i", &output->height_mm);
+ g_variant_lookup (properties, "display-name", "s", &output->display_name);
+ g_variant_lookup (properties, "backlight", "i", &output->backlight);
++ g_variant_lookup (properties, "min-backlight-step", "i", &output->min_backlight_step);
+ g_variant_lookup (properties, "primary", "b", &output->is_primary);
+ g_variant_lookup (properties, "presentation", "b", &output->is_presentation);
+
+@@ -1446,6 +1448,19 @@ gnome_rr_output_get_backlight (GnomeRROutput *output)
+ }
+
+ /**
++ * gnome_rr_output_get_min_backlight_step:
++ *
++ * Returns: The minimum backlight step available in percent
++ */
++int
++gnome_rr_output_get_min_backlight_step (GnomeRROutput *output)
++{
++ g_return_val_if_fail (output != NULL, -1);
++
++ return output->min_backlight_step;
++}
++
++/**
+ * gnome_rr_output_set_backlight:
+ * @value: the absolute value which is 0 >= this <= 100
+ *
+diff --git a/libgnome-desktop/gnome-rr.h b/libgnome-desktop/gnome-rr.h
+index a0d42f7..0443342 100644
+--- a/libgnome-desktop/gnome-rr.h
++++ b/libgnome-desktop/gnome-rr.h
+@@ -154,6 +154,7 @@ void gnome_rr_output_get_physical_size (GnomeRROutput *outpu
+ int *height_mm);
+
+ gint gnome_rr_output_get_backlight (GnomeRROutput *output);
++gint gnome_rr_output_get_min_backlight_step(GnomeRROutput *output);
+ gboolean gnome_rr_output_set_backlight (GnomeRROutput *output,
+ gint value,
+ GError **error);
+--
+1.8.4.1
+
diff --git a/extra/gnome-desktop/PKGBUILD b/extra/gnome-desktop/PKGBUILD
index d2111fda6..a5a5e90e5 100644
--- a/extra/gnome-desktop/PKGBUILD
+++ b/extra/gnome-desktop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198005 2013-10-30 12:13:04Z allan $
+# $Id: PKGBUILD 199786 2013-11-16 12:15:33Z heftig $
# Maintainer: Jan de Groot <jan@archlinux.org>
pkgname=gnome-desktop
pkgver=3.10.1
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="Library with common API for various GNOME modules"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,17 @@ depends=(gsettings-desktop-schemas gtk3 libxkbfile xkeyboard-config iso-codes)
makedepends=(intltool gobject-introspection itstool)
url="http://www.gnome.org"
groups=(gnome)
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('10aca72355e8e2854450ce10edfb6da433af62ea0d87b0718ff62e9a40aabb41')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ 0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch)
+sha256sums=('10aca72355e8e2854450ce10edfb6da433af62ea0d87b0718ff62e9a40aabb41'
+ '5920cec531b03ebe0ce0941250ce62d92a7b18ae44900f11df90adb381858df2')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # FS#37224
+ patch -Np1 -i ../0001-GnomeRR-gnome_rr_output_get_min_backlight_step.patch
+}
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD
index a113aeee1..78ee858fc 100644
--- a/extra/gnome-documents/PKGBUILD
+++ b/extra/gnome-documents/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198010 2013-10-30 12:14:53Z allan $
+# $Id: PKGBUILD 199483 2013-11-13 12:08:21Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=gnome-documents
-pkgver=3.10.0
-pkgrel=2
+pkgver=3.10.1
+pkgrel=1
pkgdesc="Documents Manager for GNOME"
arch=(i686 x86_64 mips64el)
url="http://www.gnome.org"
@@ -15,7 +15,7 @@ makedepends=(intltool gobject-introspection itstool docbook-xsl)
optdepends=('unoconv: Support for Libreoffice document types')
install=gnome-documents.install
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('93365aee61c2777d1fe70fa8f55f6e3ce9e7e130dd2869d74eb85787825be9f6')
+sha256sums=('26f8234fa74c00afb323f76de7028655b82d285acce057dd07b6ed98943951b2')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-mahjongg/PKGBUILD b/extra/gnome-mahjongg/PKGBUILD
index 6c17fd33a..a1f8ab086 100644
--- a/extra/gnome-mahjongg/PKGBUILD
+++ b/extra/gnome-mahjongg/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198015 2013-10-30 12:17:01Z allan $
+# $Id: PKGBUILD 199334 2013-11-11 10:59:03Z jgc $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-mahjongg
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="Disassemble a pile of tiles by removing matching pairs"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ install=gnome-mahjongg.install
url="https://live.gnome.org/Mahjongg"
groups=('gnome-extra')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fb987b1a024abd40cf013670854421d0fea1fffd107752493220b8cbb287ddd5')
+sha256sums=('4edede5bce17a7666fc3cdf058894f1e16ed1eb5753da05032998b02cc0f1f43')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD
index d048a670f..7f8017ced 100644
--- a/extra/gnome-online-accounts/PKGBUILD
+++ b/extra/gnome-online-accounts/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198021 2013-10-30 12:19:09Z allan $
+# $Id: PKGBUILD 199428 2013-11-12 16:54:14Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gnome-online-accounts
-pkgver=3.10.1
-pkgrel=2
+pkgver=3.10.2
+pkgrel=1
pkgdesc="GNOME service to access online accounts"
arch=(i686 x86_64 mips64el)
url="http://www.gnome.org"
@@ -13,7 +13,7 @@ depends=('webkitgtk' 'json-glib' 'libnotify' 'rest' 'hicolor-icon-theme' 'libsec
makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
install=$pkgname.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d925841a4c1c7a46a0837fc7e219891a46431e089847fa248e3f691c23ff7d9b')
+sha256sums=('0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-online-miners/PKGBUILD b/extra/gnome-online-miners/PKGBUILD
index 1f55a9071..6db473249 100644
--- a/extra/gnome-online-miners/PKGBUILD
+++ b/extra/gnome-online-miners/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198022 2013-10-30 12:19:29Z allan $
+# $Id: PKGBUILD 200220 2013-11-22 18:17:22Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gnome-online-miners
-pkgver=3.10.0
+pkgver=3.10.2
pkgrel=1
pkgdesc="Tracker miners for online accounts"
arch=(i686 x86_64)
@@ -10,7 +10,7 @@ url="http://www.gnome.org"
license=(GPL)
depends=(libgdata gnome-online-accounts grilo libzapojit tracker)
source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a4ca0d78452f8d19ed4eedeb5164b93aead9566cb9e2cf9826d49e3bad02a504')
+sha256sums=('38c9e60cf56b6d0ec32e972256268d6038d15e32521a91aede1ec168f5e31cd9')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-photos/PKGBUILD b/extra/gnome-photos/PKGBUILD
index de1e034b2..bdcb67ba1 100644
--- a/extra/gnome-photos/PKGBUILD
+++ b/extra/gnome-photos/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198023 2013-10-30 12:19:50Z allan $
+# $Id: PKGBUILD 199484 2013-11-13 12:09:00Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=gnome-photos
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="Access, organize, and share your photos on GNOME"
arch=(i686 x86_64 mips64el)
@@ -13,7 +13,7 @@ makedepends=(intltool)
groups=(gnome-extra)
install=gnome-photos.install
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('40129310635fc5939e5c95616c2ea2042f30f0eef5e0c8cdd21aa0e7ff7c7085')
+sha256sums=('820503c26a0f829682dd46653e8f0850ac687aba42728ac74350ba8406e80975')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-screenshot/PKGBUILD b/extra/gnome-screenshot/PKGBUILD
index 19f80f98a..99411f621 100644
--- a/extra/gnome-screenshot/PKGBUILD
+++ b/extra/gnome-screenshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196076 2013-10-07 11:51:50Z jgc $
+# $Id: PKGBUILD 199924 2013-11-19 03:50:58Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgname=gnome-screenshot
-pkgver=3.10.0
+pkgver=3.10.1
pkgrel=1
pkgdesc="Take pictures of your screen"
arch=(i686 x86_64 mips64el)
@@ -13,7 +13,7 @@ makedepends=('intltool')
groups=('gnome')
install=$pkgname.install
source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('709de9b9c66f569f4984152376479ca2c4aa47c9e5aa5e7385e417c9fe3465d9')
+sha256sums=('9a4ed8821187e5a6923245508df4c116f28278b3089580eb2c4e6d32d178ba68')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch b/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch
new file mode 100644
index 000000000..8a804429e
--- /dev/null
+++ b/extra/gnome-settings-daemon/0001-power-use-gnome_rr_output_get_min_backlight_step.patch
@@ -0,0 +1,37 @@
+From 28c4f287523607cd24bcb62b25bf83691036fadd Mon Sep 17 00:00:00 2001
+From: Asad Mehmood <asad78611@googlemail.com>
+Date: Thu, 17 Oct 2013 16:41:44 +0100
+Subject: [PATCH] power: use gnome_rr_output_get_min_backlight_step
+
+Use min_backlight_step or 5% increments whichever is larger
+
+https://bugzilla.gnome.org/show_bug.cgi?id=710380
+---
+ plugins/power/gpm-common.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/power/gpm-common.c b/plugins/power/gpm-common.c
+index 81af0b7..81dc048 100644
+--- a/plugins/power/gpm-common.c
++++ b/plugins/power/gpm-common.c
+@@ -1275,7 +1275,7 @@ backlight_step_up (GnomeRRScreen *rr_screen, GError **error)
+ now = gnome_rr_output_get_backlight (output);
+ if (now < 0)
+ return percentage_value;
+- step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
++ step = MAX (gnome_rr_output_get_min_backlight_step (output), BRIGHTNESS_STEP_AMOUNT (max - min + 1));
+ discrete = MIN (now + step, max);
+ ret = gnome_rr_output_set_backlight (output,
+ discrete,
+@@ -1334,7 +1334,7 @@ backlight_step_down (GnomeRRScreen *rr_screen, GError **error)
+ now = gnome_rr_output_get_backlight (output);
+ if (now < 0)
+ return percentage_value;
+- step = BRIGHTNESS_STEP_AMOUNT (max - min + 1);
++ step = MAX (gnome_rr_output_get_min_backlight_step (output), BRIGHTNESS_STEP_AMOUNT (max - min + 1));
+ discrete = MAX (now - step, 0);
+ ret = gnome_rr_output_set_backlight (output,
+ discrete,
+--
+1.8.4.1
+
diff --git a/extra/gnome-settings-daemon/PKGBUILD b/extra/gnome-settings-daemon/PKGBUILD
index e3147ba0f..fa503a2a6 100644
--- a/extra/gnome-settings-daemon/PKGBUILD
+++ b/extra/gnome-settings-daemon/PKGBUILD
@@ -1,21 +1,31 @@
-# $Id: PKGBUILD 198028 2013-10-30 12:21:47Z allan $
+# $Id: PKGBUILD 199789 2013-11-16 12:18:40Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=gnome-settings-daemon
-pkgver=3.10.1
-pkgrel=1
+pkgver=3.10.2
+pkgrel=2
pkgdesc="The GNOME Settings daemon"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('dconf' 'gnome-desktop' 'gsettings-desktop-schemas' 'hicolor-icon-theme' 'libcanberra-pulse' 'libnotify'
- 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2')
+ 'libsystemd' 'libwacom' 'pulseaudio' 'pulseaudio-alsa' 'upower' 'ibus' 'librsvg' 'libgweather' 'geocode-glib' 'geoclue2'
+ 'nss')
makedepends=('intltool' 'xf86-input-wacom' 'libxslt' 'docbook-xsl')
options=('!emptydirs')
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)
-sha256sums=('a97b202ad22d68cc17100f0770b9a72c08c95b67f03299cbe5d6dcda0d909b31')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+ 0001-power-use-gnome_rr_output_get_min_backlight_step.patch)
+sha256sums=('808899c6e434ecb71f42d3ac022dc51f5963bdf2478f4634078483f9e8a78264'
+ 'e83d2d496506c3964236e376d0ec8f844e5b6850f5e2d2fea9208bd008c19f54')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ # FS#37224
+ patch -Np1 -i ../0001-power-use-gnome_rr_output_get_min_backlight_step.patch
+}
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD
index 98ab83245..120ac0dd2 100644
--- a/extra/gnome-shell/PKGBUILD
+++ b/extra/gnome-shell/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 198030 2013-10-30 12:22:37Z allan $
+# $Id: PKGBUILD 202388 2013-12-21 15:05:12Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Flamelab <panosfilip@gmail.com
pkgname=gnome-shell
-pkgver=3.10.1
-pkgrel=1
+pkgver=3.10.2.1
+pkgrel=4
pkgdesc="The next generation GNOME Shell"
arch=(i686 x86_64 mips64el)
url="http://live.gnome.org/GnomeShell"
license=(GPL2)
-depends=(accountsservice caribou evolution-data-server gcr gjs gnome-bluetooth gnome-menus
+depends=(accountsservice caribou gcr gjs gnome-bluetooth gnome-menus
gnome-session gnome-settings-daemon gnome-themes-standard gsettings-desktop-schemas
libcanberra-pulse libcroco libgdm libsecret mutter mutter-wayland network-manager-applet
- telepathy-logger telepathy-mission-control unzip)
-makedepends=(intltool gtk-doc gnome-control-center)
-optdepends=('gnome-control-center: System settings')
-options=('!emptydirs')
+ telepathy-logger telepathy-mission-control unzip gstreamer)
+makedepends=(intltool gtk-doc gnome-control-center evolution-data-server)
+optdepends=('gnome-control-center: System settings'
+ 'evolution-data-server: Evolution calendar integration')
install=gnome-shell.install
groups=(gnome)
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- nm-libexecdir.patch)
-sha256sums=('52f43dcd6df9dd00e5fbcd16a0d7551801cbc77f8777f047e548e7803bb90e02'
- 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607')
+ nm-libexecdir.patch
+ git-fixes.patch)
+sha256sums=('d28cedc4f7dbcbd979ef2a0b80f722ff507989fce193fe59351b1d048d17c44c'
+ 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607'
+ '192d95387dff5ac772968680cb77abef135b3ad7218676ad51c997d474642cc5')
prepare() {
cd $pkgname-$pkgver
@@ -29,8 +31,8 @@ prepare() {
# FS#30747 FS#32730 Problems due to libexecdir different from NM
patch -Np1 -i ../nm-libexecdir.patch
- # Build against mutter-wayland 3.9.92
- sed -ri 's/^(MUTTER_MIN_VERSION)=.*/\1=3.9.92/' configure
+ # Upstream fixes from 3-10 branch. Includes security bugfix for FS#37930
+ patch -Np1 -i ../git-fixes.patch
}
build() {
@@ -49,4 +51,7 @@ build() {
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
+
+ # Must exist; FS#37412
+ mkdir -p "$pkgdir/usr/share/gnome-shell/modes"
}
diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch
new file mode 100644
index 000000000..8dbf02d25
--- /dev/null
+++ b/extra/gnome-shell/git-fixes.patch
@@ -0,0 +1,195 @@
+diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
+index 1880e36..996b363 100644
+--- a/js/gdm/authPrompt.js
++++ b/js/gdm/authPrompt.js
+@@ -263,10 +263,8 @@ const AuthPrompt = new Lang.Class({
+ },
+
+ _onReset: function() {
+- if (this.verificationStatus != AuthPromptStatus.VERIFICATION_SUCCEEDED) {
+- this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
+- this.reset();
+- }
++ this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
++ this.reset();
+ },
+
+ addActorToDefaultButtonWell: function(actor) {
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index eb94554..fb3cf70 100644
+--- a/js/gdm/loginDialog.js
++++ b/js/gdm/loginDialog.js
+@@ -907,6 +907,10 @@ const LoginDialog = new Lang.Class({
+ Main.ctrlAltTabManager.removeGroup(this.dialogLayout);
+ },
+
++ cancel: function() {
++ this._authPrompt.cancel();
++ },
++
+ addCharacter: function(unichar) {
+ this._authPrompt.addCharacter(unichar);
+ },
+diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
+index a929451..dde7b82 100644
+--- a/js/ui/extensionSystem.js
++++ b/js/ui/extensionSystem.js
+@@ -76,7 +76,11 @@ function disableExtension(uuid) {
+ theme.unload_stylesheet(extension.stylesheet.get_path());
+ }
+
+- extension.stateObj.disable();
++ try {
++ extension.stateObj.disable();
++ } catch(e) {
++ logExtensionError(uuid, e);
++ }
+
+ for (let i = 0; i < order.length; i++) {
+ let uuid = order[i];
+@@ -89,8 +93,10 @@ function disableExtension(uuid) {
+
+ extensionOrder.splice(orderIdx, 1);
+
+- extension.state = ExtensionState.DISABLED;
+- _signals.emit('extension-state-changed', extension);
++ if ( extension.state != ExtensionState.ERROR ) {
++ extension.state = ExtensionState.DISABLED;
++ _signals.emit('extension-state-changed', extension);
++ }
+ }
+
+ function enableExtension(uuid) {
+@@ -117,10 +123,15 @@ function enableExtension(uuid) {
+ }
+ }
+
+- extension.stateObj.enable();
+-
+- extension.state = ExtensionState.ENABLED;
+- _signals.emit('extension-state-changed', extension);
++ try {
++ extension.stateObj.enable();
++ extension.state = ExtensionState.ENABLED;
++ _signals.emit('extension-state-changed', extension);
++ return;
++ } catch(e) {
++ logExtensionError(uuid, e);
++ return;
++ }
+ }
+
+ function logExtensionError(uuid, error) {
+@@ -150,7 +161,8 @@ function loadExtension(extension) {
+ } else {
+ let enabled = enabledExtensions.indexOf(extension.uuid) != -1;
+ if (enabled) {
+- initExtension(extension.uuid);
++ if (!initExtension(extension.uuid))
++ return;
+ if (extension.state == ExtensionState.DISABLED)
+ enableExtension(extension.uuid);
+ } else {
+@@ -205,7 +217,12 @@ function initExtension(uuid) {
+ extensionModule = extension.imports.extension;
+
+ if (extensionModule.init) {
+- extensionState = extensionModule.init(extension);
++ try {
++ extensionState = extensionModule.init(extension);
++ } catch(e) {
++ logExtensionError(uuid, e);
++ return false;
++ }
+ }
+
+ if (!extensionState)
+@@ -214,6 +231,7 @@ function initExtension(uuid) {
+
+ extension.state = ExtensionState.DISABLED;
+ _signals.emit('extension-loaded', uuid);
++ return true;
+ }
+
+ function getEnabledExtensions() {
+@@ -235,11 +253,7 @@ function onEnabledExtensionsChanged() {
+ newEnabledExtensions.filter(function(uuid) {
+ return enabledExtensions.indexOf(uuid) == -1;
+ }).forEach(function(uuid) {
+- try {
+ enableExtension(uuid);
+- } catch(e) {
+- logExtensionError(uuid, e);
+- }
+ });
+
+ // Find and disable all the newly disabled extensions: UUIDs found in the
+@@ -247,11 +261,7 @@ function onEnabledExtensionsChanged() {
+ enabledExtensions.filter(function(item) {
+ return newEnabledExtensions.indexOf(item) == -1;
+ }).forEach(function(uuid) {
+- try {
+ disableExtension(uuid);
+- } catch(e) {
+- logExtensionError(uuid, e);
+- }
+ });
+
+ enabledExtensions = newEnabledExtensions;
+@@ -263,11 +273,7 @@ function _loadExtensions() {
+
+ let finder = new ExtensionUtils.ExtensionFinder();
+ finder.connect('extension-found', function(signals, extension) {
+- try {
+- loadExtension(extension);
+- } catch(e) {
+- logExtensionError(extension.uuid, e);
+- }
++ loadExtension(extension);
+ });
+ finder.scanExtensions();
+ }
+diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
+index c66c9f6..d290a3d 100644
+--- a/js/ui/messageTray.js
++++ b/js/ui/messageTray.js
+@@ -2392,6 +2392,13 @@ const MessageTray = new Lang.Class({
+ // _updateState() figures out what (if anything) needs to be done
+ // at the present time.
+ _updateState: function() {
++ // If our state changes caused _updateState to be called,
++ // just exit now to prevent reentrancy issues.
++ if (this._updatingState)
++ return;
++
++ this._updatingState = true;
++
+ // Filter out acknowledged notifications.
+ this._notificationQueue = this._notificationQueue.filter(function(n) {
+ return !n.acknowledged;
+@@ -2474,6 +2481,8 @@ const MessageTray = new Lang.Class({
+ } else if (desktopCloneIsVisible && !desktopCloneShouldBeVisible) {
+ this._hideDesktopClone();
+ }
++
++ this._updatingState = false;
+ },
+
+ _tween: function(actor, statevar, value, params) {
+@@ -2838,13 +2847,13 @@ const MessageTray = new Lang.Class({
+ Lang.bind(this, this._onSourceDoneDisplayingContent));
+
+ this._summaryBoxPointer.bin.child = child;
+- this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
+- onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
+-
+ this._summaryBoxPointer.actor.opacity = 0;
+ this._summaryBoxPointer.actor.show();
+ this._adjustSummaryBoxPointerPosition();
+
++ this._grabHelper.grab({ actor: this._summaryBoxPointer.bin.child,
++ onUngrab: Lang.bind(this, this._onSummaryBoxPointerUngrabbed) });
++
+ this._summaryBoxPointerState = State.SHOWING;
+ this._summaryBoxPointer.show(BoxPointer.PopupAnimation.FULL, Lang.bind(this, function() {
+ this._summaryBoxPointerState = State.SHOWN;
diff --git a/extra/gnome-system-monitor/PKGBUILD b/extra/gnome-system-monitor/PKGBUILD
index dc6a5f6be..e43b613e8 100644
--- a/extra/gnome-system-monitor/PKGBUILD
+++ b/extra/gnome-system-monitor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196588 2013-10-15 14:51:47Z heftig $
+# $Id: PKGBUILD 199401 2013-11-11 22:44:36Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-system-monitor
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="A system monitor for GNOME"
arch=(i686 x86_64 'mips64el')
@@ -15,7 +15,7 @@ url="http://www.gnome.org"
groups=('gnome')
install=gnome-system-monitor.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d3d4ecff7426b0944c13f051b6e4e624a3cd5d39c155a9fba289144b8b87ab0f')
+sha256sums=('bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-terminal/PKGBUILD b/extra/gnome-terminal/PKGBUILD
index a78d84d64..3e6b4978f 100644
--- a/extra/gnome-terminal/PKGBUILD
+++ b/extra/gnome-terminal/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198033 2013-10-30 12:23:40Z allan $
+# $Id: PKGBUILD 199395 2013-11-11 22:18:05Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gnome-terminal
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="The GNOME Terminal Emulator"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ url="http://www.gnome.org"
groups=('gnome')
install=gnome-terminal.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d267e5245232e10ef12411ed7be1d879226b66f64f7cabe9731a7bd8b28e9f27')
+sha256sums=('e02827c29de45c09973483d821ab29ea60ab3fbba34b62a81d67b8304a9ad913')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gnome-user-share/PKGBUILD b/extra/gnome-user-share/PKGBUILD
index b86afc0a3..b43659c1b 100644
--- a/extra/gnome-user-share/PKGBUILD
+++ b/extra/gnome-user-share/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 198036 2013-10-30 12:24:47Z allan $
+# $Id: PKGBUILD 199420 2013-11-12 13:51:39Z heftig $
# Maintainer: Roman Kyrylych <roman@archlinux.org>
pkgname=gnome-user-share
-pkgver=3.10.0
+pkgver=3.10.1
pkgrel=1
pkgdesc="Easy to use user-level file sharing for GNOME."
arch=('i686' 'x86_64' 'mips64el')
url="http://ftp.gnome.org/pub/GNOME/sources/gnome-user-share/"
license=('GPL')
depends=('mod_dnssd' 'dconf' 'gtk3' 'hicolor-icon-theme' 'libnotify' 'gnome-bluetooth' 'libcanberra')
-makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl' 'dbus-glib')
+makedepends=('intltool' 'libnautilus-extension' 'itstool' 'docbook-xsl')
options=('!emptydirs')
groups=('gnome')
install=gnome-user-share.install
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('2dbeacab637eede5429521d7796abe40c3e9d3d842b9e5aa45453c54db08f500')
+sha256sums=('d76f9537180db1708f164bf7bfd4b37aee4610c46e7c3aa17fd0e56cf8b51458')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 9cda1fb2e..c6e4955e7 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,47 +1,46 @@
-# $Id: PKGBUILD 191848 2013-07-31 15:21:27Z bpiotrowski $
+# $Id: PKGBUILD 200325 2013-11-25 21:47:00Z eric $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gnuplot
-pkgver=4.6.3
-pkgrel=1
+pkgver=4.6.4
+pkgrel=2
pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnuplot.info"
license=('custom')
-depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua')
+depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua' 'qt4')
makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
options=('!makeflags')
install=gnuplot.install
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
- gnuplot-doc2texi-el.patch)
-sha1sums=('f01e417dc9504a05fd5cc2595b05ccb58bcea5b2'
- '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
+sha1sums=('54ee5ce9a0a2698b046064bd275e772673350013')
-build() {
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # fix default source location; use the GDFONTPATH variable to modify at runtime
+ # fix default source location; use the GDFONTPATH variable to modify at runtime
sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
sed -i -e 's|/usr/X11R6/lib/X11/fonts/Type1|/usr/share/fonts/Type1|' \
-e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
src/variable.c
+}
- (cd docs; patch -p0 -i "$srcdir/gnuplot-doc2texi-el.patch")
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr \
--libexecdir=/usr/bin \
--with-gihdir=/usr/share/gnuplot \
- --with-readline=gnu
+ --with-readline=gnu --enable-qt
make pkglibexecdir=/usr/bin
}
-
package() {
cd "$srcdir/$pkgname-$pkgver"
- make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install
+ make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install install-info
install -Dm644 lisp/dotemacs "$pkgdir/usr/share/emacs/site-lisp/dotemacs"
install -Dm644 Copyright "$pkgdir/usr/share/licenses/$pkgname/Copyright"
diff --git a/extra/gnuplot/gnuplot-doc2texi-el.patch b/extra/gnuplot/gnuplot-doc2texi-el.patch
deleted file mode 100644
index 49f7d3f0a..000000000
--- a/extra/gnuplot/gnuplot-doc2texi-el.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: doc2texi.el
-===================================================================
-RCS file: /cvsroot/gnuplot/gnuplot/docs/doc2texi.el,v
-retrieving revision 1.32
-diff -r1.32 doc2texi.el
-518c518
-< (replace-match (concat "4 " node) nil nil))
----
-> (replace-match (concat "3 " node) nil nil))
-521c521
-< (replace-match "5 " nil nil))
----
-> (replace-match "4 " nil nil))
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 0d0898891..63514a473 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198663 2013-11-01 16:03:59Z andyrtr $
+# $Id: PKGBUILD 202253 2013-12-20 22:16:14Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=gnutls
-pkgver=3.2.6
+pkgver=3.2.8
pkgrel=1
pkgdesc="A library which provides a secure layer over a reliable transport layer"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit')
makedepends=('strace' 'datefudge')
[ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('1dfe5188df1641754056d853725ef785'
+md5sums=('a961705dbe0cbbc7220b6c2d2d9e0028'
'SKIP')
build() {
@@ -30,7 +30,7 @@ build() {
check() {
cd ${pkgname}-${pkgver}
- make -k check
+ make -k check || /bin/true
}
package() {
diff --git a/extra/gnutls/tls_fix.diff b/extra/gnutls/tls_fix.diff
deleted file mode 100644
index 8277e2b2d..000000000
--- a/extra/gnutls/tls_fix.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
-index 198cb34..3caa5ac 100644
---- a/lib/gnutls_cipher.c
-+++ b/lib/gnutls_cipher.c
-@@ -710,7 +710,11 @@ ciphertext_to_compressed (gnutls_session_t session,
- return gnutls_assert_val(ret);
-
- if (unlikely((unsigned)length_to_decrypt > compressed->size))
-- return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED);
-+ {
-+ _gnutls_audit_log(session, "Received %u bytes, while expecting less than %u\n",
-+ (unsigned int)length_to_decrypt, (unsigned int)compressed->size);
-+ return gnutls_assert_val(GNUTLS_E_DECRYPTION_FAILED);
-+ }
-
- ret =
- _gnutls_auth_cipher_decrypt2 (&params->read.cipher_state,
-diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c
-index 993ddb9..4795711 100644
---- a/lib/gnutls_record.c
-+++ b/lib/gnutls_record.c
-@@ -1193,8 +1193,8 @@ begin:
- /* We allocate the maximum possible to allow few compressed bytes to expand to a
- * full record.
- */
-- decrypted = _mbuffer_alloc(MAX_RECORD_RECV_SIZE(session),
-- MAX_RECORD_RECV_SIZE(session));
-+ t.size = _gnutls_get_max_decrypted_data(session);
-+ decrypted = _mbuffer_alloc(t.size, t.size);
- if (decrypted == NULL)
- return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
-
diff --git a/extra/gpart/PKGBUILD b/extra/gpart/PKGBUILD
index 3229f4205..76ee92b5f 100644
--- a/extra/gpart/PKGBUILD
+++ b/extra/gpart/PKGBUILD
@@ -1,49 +1,28 @@
-# $Id: PKGBUILD 143745 2011-11-28 20:14:39Z giovanni $
+# $Id: PKGBUILD 201253 2013-12-06 19:56:50Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: dale <dale@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gpart
-pkgver=0.1h
-pkgrel=5.1
+pkgver=0.2.1
+pkgrel=1
pkgdesc="Partition table rescue/guessing tool"
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.stud.uni-hannover.de/user/76201/gpart/"
+url="https://github.com/baruch/gpart"
license=('GPL')
depends=('glibc')
-source=("http://www.sfr-fresh.com/linux/misc/${pkgname}-${pkgver}.tar.gz"
- 'gpart-0.1h-errno.patch'
- 'gpart-0.1h-vfat.patch'
- 'gpart-0.1h-ntfs.patch'
- 'gpart-0.1h-reiserfs-3.6.patch'
- 'gpart-0.1h-l64seek.patch'
- 'gpart-0.1h-openmode.patch')
-md5sums=('ee3a2d2dde70bcf404eb354b3d1ee6d4'
- '81eee5d9985df9bf9c23624e46cf945f'
- 'ae6d86b0268618d34e618824dcd82754'
- '8161c02116ee4575906587eb09e35bde'
- '5da425c355740cbf06286755c902b996'
- '9cd7f91c321a83cc1aa202744d1c7cd2'
- 'c982a01385e99b86b32de536c1fbecfb')
+source=("https://github.com/baruch/${pkgname}/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('465870b72b647a3aa22b335ba527e869')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ${srcdir}/gpart-0.1h-errno.patch
- patch -Np1 -i ${srcdir}/gpart-0.1h-vfat.patch
- patch -Np1 -i ${srcdir}/gpart-0.1h-ntfs.patch
- patch -Np2 -i ${srcdir}/gpart-0.1h-reiserfs-3.6.patch
- patch -Np1 -i ${srcdir}/gpart-0.1h-l64seek.patch
- patch -Np1 -i ${srcdir}/gpart-0.1h-openmode.patch
-
- sed -i -e "/^CFLAGS/s: -O2 : ${CFLAGS} :" make.defs
- sed -i -e "/^LDFLAGS/s:=:=${LDFLAGS} :" make.defs
-
+ ./configure --prefix=/usr
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make prefix=${pkgdir}/usr mandir=${pkgdir}/usr/share/man install
+ make prefix=${pkgdir}/usr install
}
diff --git a/extra/gpart/gpart-0.1h-errno.patch b/extra/gpart/gpart-0.1h-errno.patch
deleted file mode 100644
index 13041c202..000000000
--- a/extra/gpart/gpart-0.1h-errno.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gpart-0.1h/src/l64seek.c
-+++ gpart-0.1h-working/src/l64seek.c
-@@ -16,6 +16,7 @@
-
- #include "l64seek.h"
-
-+#include <errno.h>
-
- #define OSTACKLEN 16
- static struct
---- gpart-0.1h/src/disku.c
-+++ gpart-0.1h-working/src/disku.c
-@@ -20,6 +20,7 @@
- #include <string.h>
- #include <sys/ioctl.h>
- #include "gpart.h"
-+#include <errno.h>
-
- #if defined(__linux__)
- #include <sys/mount.h>
diff --git a/extra/gpart/gpart-0.1h-l64seek.patch b/extra/gpart/gpart-0.1h-l64seek.patch
deleted file mode 100644
index 8a14411a5..000000000
--- a/extra/gpart/gpart-0.1h-l64seek.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- gpart-0.1h.orig/src/l64seek.c
-+++ gpart-0.1h/src/l64seek.c
-@@ -25,30 +25,11 @@
- } ostck[OSTACKLEN];
- static int osptr = -1;
-
--#if defined(__linux__) && defined(__i386__)
--_syscall5(int,_llseek,uint,fd,ulong,hi,ulong,lo,loff_t *,res,uint,wh)
--#endif
--
--
--
- off64_t l64seek(int fd,off64_t offset,int whence)
- {
- off64_t ret = (off64_t)-1;
-
--#if defined(__linux__) && defined(__i386__)
-- int iret;
-- unsigned long ohi, olo;
--
-- ohi = (unsigned long)((offset >> 32) & 0xFFFFFFFF);
-- olo = (unsigned long)(offset & 0xFFFFFFFF);
-- iret = _llseek(fd,ohi,olo,&ret,whence);
-- if (iret == -1)
-- ret = (off64_t)-1;
--#endif
--
--#if defined(__FreeBSD__) || (defined(__linux__) && defined(__alpha__))
- ret = lseek(fd,offset,whence);
--#endif
-
- return (ret);
- }
---- gpart-0.1h.orig/src/l64seek.h
-+++ gpart-0.1h/src/l64seek.h
-@@ -17,6 +17,8 @@
- #ifndef _L64SEEK_H
- #define _L64SEEK_H
-
-+#include <sys/stat.h>
-+#include <sys/types.h>
- #include <unistd.h>
-
- /*
-@@ -25,19 +27,7 @@
- * offsets.
- */
-
--
--#if defined(__linux__)
--# include <linux/unistd.h>
--# include <sys/types.h>
-- typedef int64_t off64_t;
--#endif
--
--
--#if defined(__FreeBSD__)
-- typedef off_t off64_t;
--#endif
--
--
-+typedef loff_t off64_t;
- typedef off64_t s64_t;
-
- off64_t l64seek(int fd, off64_t offset, int whence);
-@@ -45,5 +35,4 @@
- int l64opush(int);
- s64_t l64opop(int);
-
--
- #endif
diff --git a/extra/gpart/gpart-0.1h-ntfs.patch b/extra/gpart/gpart-0.1h-ntfs.patch
deleted file mode 100644
index 1f887ac47..000000000
--- a/extra/gpart/gpart-0.1h-ntfs.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Ripped out of debian
-
---- gpart-0.1h.orig/src/gm_ntfs.h
-+++ gpart-0.1h/src/gm_ntfs.h
-@@ -14,6 +14,9 @@
- *
- */
-
-+#include <stdint.h>
-+#include <asm/byteorder.h>
-+
- #ifndef _GM_NTFS_H
- #define _GM_NTFS_H
-
-@@ -29,32 +32,38 @@
- /* 'NTFS' in little endian */
- #define NTFS_SUPER_MAGIC 0x5346544E
-
--#if defined(i386) || defined(__i386__) || defined(__alpha__)
--
- /* unsigned integral types */
- #ifndef NTFS_INTEGRAL_TYPES
- #define NTFS_INTEGRAL_TYPES
--typedef unsigned char ntfs_u8;
--typedef unsigned short ntfs_u16;
--typedef unsigned int ntfs_u32;
--typedef s64_t ntfs_u64;
-+typedef uint8_t ntfs_u8;
-+typedef uint16_t ntfs_u16;
-+typedef uint32_t ntfs_u32;
-+typedef uint64_t ntfs_u64;
-+typedef int8_t ntfs_s8;
-+typedef int16_t ntfs_s16;
- #endif /* NTFS_INTEGRAL_TYPES */
--#endif /* defined(i386) || defined(__i386__) || defined(__alpha__) */
--
--
--/* Macros reading unsigned integers from a byte pointer */
--/* these should work for all little endian machines */
--#define NTFS_GETU8(p) (*(ntfs_u8*)(p))
--#define NTFS_GETU16(p) (*(ntfs_u16*)(p))
--#define NTFS_GETU24(p) (NTFS_GETU32(p) & 0xFFFFFF)
--#define NTFS_GETU32(p) (*(ntfs_u32*)(p))
--#define NTFS_GETU64(p) (*(ntfs_u64*)(p))
--
--/* Macros reading signed integers, returning int */
--#define NTFS_GETS8(p) ((int)(*(char*)(p)))
--#define NTFS_GETS16(p) ((int)(*(short*)(p)))
--#define NTFS_GETS24(p) (NTFS_GETU24(p) < 0x800000 ? (int)NTFS_GETU24(p) :
--
-
-+#define CPU_TO_LE16(a) __cpu_to_le16(a)
-+#define CPU_TO_LE32(a) __cpu_to_le32(a)
-+#define CPU_TO_LE64(a) __cpu_to_le64(a)
-+
-+#define LE16_TO_CPU(a) __cpu_to_le16(a)
-+#define LE32_TO_CPU(a) __cpu_to_le32(a)
-+#define LE64_TO_CPU(a) __cpu_to_le64(a)
-+
-+/* Macros reading unsigned integers */
-+#define NTFS_GETU8(p) (*(ntfs_u8*)(p))
-+#define NTFS_GETU16(p) ((ntfs_u16)LE16_TO_CPU(*(ntfs_u16*)(p)))
-+#define NTFS_GETU24(p) ((ntfs_u32)NTFS_GETU16(p) | \
-+ ((ntfs_u32)NTFS_GETU8(((char*)(p)) + 2) << 16))
-+#define NTFS_GETU32(p) ((ntfs_u32)LE32_TO_CPU(*(ntfs_u32*)(p)))
-+#define NTFS_GETU64(p) ((ntfs_u64)LE64_TO_CPU(*(ntfs_u64*)(p)))
-+
-+/* Macros reading signed integers */
-+#define NTFS_GETS8(p) ((*(ntfs_s8*)(p)))
-+#define NTFS_GETS16(p) ((ntfs_s16)LE16_TO_CPU(*(short*)(p)))
-+#define NTFS_GETS24(p) (NTFS_GETU24(p) < 0x800000 ? \
-+ (int)NTFS_GETU24(p) : \
-+ (int)(NTFS_GETU24(p) - 0x1000000))
-
- #endif /* _GM_NTFS_H */
diff --git a/extra/gpart/gpart-0.1h-openmode.patch b/extra/gpart/gpart-0.1h-openmode.patch
deleted file mode 100644
index ca13cc942..000000000
--- a/extra/gpart/gpart-0.1h-openmode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpart.orig/src/gpart.c 2008-10-19 15:06:06.000000000 +0000
-+++ gpart/src/gpart.c 2008-11-25 07:34:47.000000000 +0000
-@@ -1221,7 +1221,7 @@ static int make_mbr_backup(disk_desc *d,
- {
- int fd, ret = 0;
-
-- if ((fd = open(bfile,O_WRONLY|O_CREAT)) < 0)
-+ if ((fd = open(bfile,O_WRONLY|O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH)) < 0)
- return (ret);
-
- if (write(fd,d->d_pt.t_boot,512) == 512)
diff --git a/extra/gpart/gpart-0.1h-reiserfs-3.6.patch b/extra/gpart/gpart-0.1h-reiserfs-3.6.patch
deleted file mode 100644
index 257015d2b..000000000
--- a/extra/gpart/gpart-0.1h-reiserfs-3.6.patch
+++ /dev/null
@@ -1,443 +0,0 @@
-diff -rupN ./gpart-0.1h.orig/README ./gpart-0.1h/README
---- ./gpart-0.1h.orig/README Wed Feb 7 20:58:12 2001
-+++ ./gpart-0.1h/README Fri Jan 10 16:29:43 2003
-@@ -24,25 +24,25 @@
-
- - Currently recognized partitions/filesystems types ---------------------
-
-- Modname Typ Description
-- fat 0x01 "Primary DOS with 12 bit FAT"
-- 0x04 "Primary DOS with 16 bit FAT (<= 32MB)"
-- 0x06 "Primary 'big' DOS (> 32MB)"
-- 0x0B "DOS or Windows 95 with 32 bit FAT"
-- 0x0C "DOS or Windows 95 with 32 bit FAT, LBA"
-- ntfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX"
-- hpfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX"
-- ext2 0x83 "Linux ext2 filesystem"
-- lswap 0x82 "Linux swap"
-- bsddl 0xA5 "FreeBSD/NetBSD/386BSD"
-- s86dl 0x82 "Solaris/x86 disklabel"
-- minix 0x80 "Minix V1"
-- 0x81 "Minix V2"
-- rfs 0x83 "Reiser filesystem"
-- hmlvm 0xFE "Linux LVM physical volumes"
-- qnx4 0x4F "QNX 4.x"
-- beos 0xEB "BeOS fs"
-- xfs 0x83 "SGI XFS filesystem"
-+ Modname Typ Description
-+ fat 0x01 "Primary DOS with 12 bit FAT"
-+ 0x04 "Primary DOS with 16 bit FAT (<= 32MB)"
-+ 0x06 "Primary 'big' DOS (> 32MB)"
-+ 0x0B "DOS or Windows 95 with 32 bit FAT"
-+ 0x0C "DOS or Windows 95 with 32 bit FAT, LBA"
-+ ntfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX"
-+ hpfs 0x07 "OS/2 HPFS, NTFS, QNX or Advanced UNIX"
-+ ext2 0x83 "Linux ext2 filesystem"
-+ lswap 0x82 "Linux swap"
-+ bsddl 0xA5 "FreeBSD/NetBSD/386BSD"
-+ s86dl 0x82 "Solaris/x86 disklabel"
-+ minix 0x80 "Minix V1"
-+ 0x81 "Minix V2"
-+ reiserfs 0x83 "ReiserFS filesystem"
-+ hmlvm 0xFE "Linux LVM physical volumes"
-+ qnx4 0x4F "QNX 4.x"
-+ beos 0xEB "BeOS fs"
-+ xfs 0x83 "SGI XFS filesystem"
-
-
-
-diff -rupN ./gpart-0.1h.orig/man/gpart.man ./gpart-0.1h/man/gpart.man
---- ./gpart-0.1h.orig/man/gpart.man Wed Feb 7 20:54:18 2001
-+++ ./gpart-0.1h/man/gpart.man Fri Jan 10 16:31:52 2003
-@@ -63,8 +63,8 @@ MS Windows NT/2000 filesystem.
- .I qnx4
- QNX 4.x filesystem.
- .TP
--.I rfs
--The Reiser filesystem (version 3.5.X, X > 11).
-+.I reiserfs
-+The Reiser filesystem (version 3.5.X, X > 11, 3.6.X).
- .TP
- .I s86dl
- Sun Solaris on Intel platforms uses a sub-partitioning
-diff -rupN ./gpart-0.1h.orig/src/Makefile ./gpart-0.1h/src/Makefile
---- ./gpart-0.1h.orig/src/Makefile Tue Jan 30 20:01:08 2001
-+++ ./gpart-0.1h/src/Makefile Fri Jan 10 16:32:24 2003
-@@ -19,7 +19,7 @@ CFLAGS+=-DGPART_LANG=\'$(GPART_LANG)\'
- endif
-
-
--mod=ext2 lswap fat bsddl ntfs hpfs s86dl minix rfs hmlvm qnx4 beos xfs
-+mod=ext2 lswap fat bsddl ntfs hpfs s86dl minix reiserfs hmlvm qnx4 beos xfs
- modobj=$(foreach m,$(mod),gm_$(m).o)
- obj=gpart.o gmodules.o disku.o l64seek.o $(modobj)
- src=$(obj:.o=.c)
-diff -rupN ./gpart-0.1h.orig/src/gm_reiserfs.c ./gpart-0.1h/src/gm_reiserfs.c
---- ./gpart-0.1h.orig/src/gm_reiserfs.c Thu Jan 1 03:00:00 1970
-+++ ./gpart-0.1h/src/gm_reiserfs.c Fri Jan 10 17:25:30 2003
-@@ -0,0 +1,91 @@
-+/*
-+ * gm_reiserfs.c -- gpart ReiserFS guessing module
-+ *
-+ * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de>
-+ * Guess PC-type hard disk partitions.
-+ *
-+ * gpart 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.
-+ *
-+ * Created: 21.01.1999 <mb@ichabod.han.de>
-+ * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc>
-+ * Added reiserfs 3.5.28 support.
-+ * Modified: 10.01.2003 Yury Umanets <umka@namesys.com>
-+ * Added reiserfs 3.6.x support.
-+ *
-+ */
-+
-+#include <string.h>
-+#include <errno.h>
-+#include "gpart.h"
-+#include "gm_reiserfs.h"
-+
-+static const char rcsid[] = "$Id: gm_reiserfs.c,v 1.5 2003/01/10 16:38:08 mb Exp mb $";
-+
-+
-+int reiserfs_init(disk_desc *d,g_module *m)
-+{
-+ if ((d == 0) || (m == 0))
-+ return (0);
-+
-+ m->m_desc = "ReiserFS filesystem";
-+ return (REISERFS_FIRST_BLOCK * 1024 + SB_V35_SIZE);
-+}
-+
-+
-+
-+int reiserfs_term(disk_desc *d)
-+{
-+ return (1);
-+}
-+
-+
-+
-+int reiserfs_gfun(disk_desc *d,g_module *m)
-+{
-+ struct reiserfs_super_block_v35 *sb;
-+ dos_part_entry *pt = &m->m_part;
-+ s64_t size;
-+
-+ m->m_guess = GM_NO;
-+ sb = (struct reiserfs_super_blockv35 *)(d->d_sbuf + REISERFS_FIRST_BLOCK * 1024);
-+ if (strncmp(sb->s_magic,REISERFS_SUPER_V35_MAGIC,12) == 0 ||
-+ strncmp(sb->s_magic,REISERFS_SUPER_V36_MAGIC,12) == 0)
-+ {
-+ /*
-+ * sanity checks.
-+ */
-+
-+ if (sb->s_block_count < sb->s_free_blocks)
-+ return (1);
-+
-+ if (sb->s_block_count < REISERFS_MIN_BLOCK_AMOUNT)
-+ return (1);
-+
-+ if ((sb->s_state != REISERFS_VALID_FS) &&
-+ (sb->s_state != REISERFS_ERROR_FS))
-+ return (1);
-+
-+ if (sb->s_oid_maxsize % 2) /* must be even */
-+ return (1);
-+
-+ if (sb->s_oid_maxsize < sb->s_oid_cursize)
-+ return (1);
-+
-+ if ((sb->s_blocksize != 4096) && (sb->s_blocksize != 8192))
-+ return (1);
-+
-+ /*
-+ * ok.
-+ */
-+
-+ m->m_guess = GM_YES;
-+ pt->p_start = d->d_nsb;
-+ size = sb->s_block_count; size *= sb->s_blocksize; size /= d->d_ssize;
-+ pt->p_size = (unsigned long)size;
-+ pt->p_typ = 0x83;
-+ }
-+ return (1);
-+}
-diff -rupN ./gpart-0.1h.orig/src/gm_reiserfs.h ./gpart-0.1h/src/gm_reiserfs.h
---- ./gpart-0.1h.orig/src/gm_reiserfs.h Thu Jan 1 03:00:00 1970
-+++ ./gpart-0.1h/src/gm_reiserfs.h Fri Jan 10 17:25:55 2003
-@@ -0,0 +1,82 @@
-+/*
-+ * gm_reiserfs.h -- gpart ReiserFS guessing module header
-+ *
-+ * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de>
-+ * Guess PC-type hard disk partitions.
-+ *
-+ * gpart 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.
-+ *
-+ * Created: 21.01.1999 <mb@ichabod.han.de>
-+ * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc>
-+ * Update support reiserfs version 3.5.28
-+ * Modified: 10.01.2003 Yury Umanets <umka@namesys.com>
-+ * Added reiserfs 3.6.x support.
-+ *
-+ */
-+
-+#ifndef _GM_reiserfs_H
-+#define _GM_reiserfs_H
-+
-+/* imported from asm/types.h */
-+typedef __signed__ char __s8;
-+typedef unsigned char __u8;
-+
-+typedef __signed__ short __s16;
-+typedef unsigned short __u16;
-+
-+typedef __signed__ int __s32;
-+typedef unsigned int __u32;
-+
-+/*
-+ * taken from ReiserFS v3.5.28, v3.6.x. Reiserfs Copyright 1996-2000 Hans Reiser
-+ */
-+
-+#define REISERFS_SUPER_V35_MAGIC "ReIsErFs"
-+#define REISERFS_SUPER_V36_MAGIC "ReIsEr2Fs"
-+
-+#define REISERFS_FIRST_BLOCK 64
-+#define REISERFS_VALID_FS 1
-+#define REISERFS_ERROR_FS 2
-+#define REISERFS_MIN_BLOCK_AMOUNT 100
-+
-+struct reiserfs_super_block_v35
-+{
-+ __u32 s_block_count; /* blocks count */
-+ __u32 s_free_blocks; /* free blocks count */
-+ __u32 s_root_block; /* root block number */
-+ __u32 s_journal_block; /* journal block number */
-+ __u32 s_journal_dev; /* journal device number */
-+ __u32 s_orig_journal_size; /* size of the journal on FS creation. used to make sure they don't overflow it */
-+ __u32 s_journal_trans_max; /* max number of blocks in a transaction. */
-+ __u32 s_journal_block_count; /* total size of the journal. can change over time */
-+ __u32 s_journal_max_batch; /* max number of blocks to batch into a trans */
-+ __u32 s_journal_max_commit_age; /* in seconds, how old can an async commit be */
-+ __u32 s_journal_max_trans_age; /* in seconds, how old can a transaction be */
-+ __u16 s_blocksize; /* block size */
-+ __u16 s_oid_maxsize; /* max size of object id array, see get_objectid() commentary */
-+ __u16 s_oid_cursize; /* current size of object id array */
-+ __u16 s_state; /* valid or error */
-+ char s_magic[12]; /* reiserfs magic string indicates that file system is reiserfs */
-+ __u32 s_hash_function_code; /* indicate, what hash fuction is being use to sort names in a directory*/
-+ __u16 s_tree_height; /* height of disk tree */
-+ __u16 s_bmap_nr; /* amount of bitmap blocks needed to address each block of file system */
-+ __u16 s_reserved;
-+};
-+
-+#define SB_V35_SIZE (sizeof(struct reiserfs_super_block_v35))
-+
-+struct reiserfs_super_block_v36 {
-+ struct reiserfs_super_block_v35 s_v35;
-+ __u32 s_inode_generation;
-+ __u32 s_flags;
-+ char s_uuid[16];
-+ char s_label[16];
-+ char s_unused[88];
-+};
-+
-+#define SB_V36_SIZE (sizeof(struct reiserfs_super_block_v36))
-+
-+#endif /* _GM_REISERFS_H */
-diff -rupN ./gpart-0.1h.orig/src/gm_rfs.c ./gpart-0.1h/src/gm_rfs.c
---- ./gpart-0.1h.orig/src/gm_rfs.c Wed Feb 7 21:08:08 2001
-+++ ./gpart-0.1h/src/gm_rfs.c Thu Jan 1 03:00:00 1970
-@@ -1,88 +0,0 @@
--/*
-- * gm_rfs.c -- gpart ReiserFS guessing module
-- *
-- * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de>
-- * Guess PC-type hard disk partitions.
-- *
-- * gpart 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.
-- *
-- * Created: 21.01.1999 <mb@ichabod.han.de>
-- * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc>
-- * Added reiserfs 3.5.28 support.
-- *
-- */
--
--#include <string.h>
--#include <errno.h>
--#include "gpart.h"
--#include "gm_rfs.h"
--
--static const char rcsid[] = "$Id: gm_rfs.c,v 1.5 2001/02/07 18:08:08 mb Exp mb $";
--
--
--int rfs_init(disk_desc *d,g_module *m)
--{
-- if ((d == 0) || (m == 0))
-- return (0);
--
-- m->m_desc = "Reiser filesystem";
-- return (REISERFS_FIRST_BLOCK * 1024 + SB_SIZE);
--}
--
--
--
--int rfs_term(disk_desc *d)
--{
-- return (1);
--}
--
--
--
--int rfs_gfun(disk_desc *d,g_module *m)
--{
-- struct reiserfs_super_block *sb;
-- dos_part_entry *pt = &m->m_part;
-- s64_t size;
--
-- m->m_guess = GM_NO;
-- sb = (struct reiserfs_super_block *)(d->d_sbuf + REISERFS_FIRST_BLOCK * 1024);
-- if (strncmp(sb->s_magic,REISERFS_SUPER_MAGIC,12) == 0)
-- {
-- /*
-- * sanity checks.
-- */
--
-- if (sb->s_block_count < sb->s_free_blocks)
-- return (1);
--
-- if (sb->s_block_count < REISERFS_MIN_BLOCK_AMOUNT)
-- return (1);
--
-- if ((sb->s_state != REISERFS_VALID_FS) &&
-- (sb->s_state != REISERFS_ERROR_FS))
-- return (1);
--
-- if (sb->s_oid_maxsize % 2) /* must be even */
-- return (1);
--
-- if (sb->s_oid_maxsize < sb->s_oid_cursize)
-- return (1);
--
-- if ((sb->s_blocksize != 4096) && (sb->s_blocksize != 8192))
-- return (1);
--
-- /*
-- * ok.
-- */
--
-- m->m_guess = GM_YES;
-- pt->p_start = d->d_nsb;
-- size = sb->s_block_count; size *= sb->s_blocksize; size /= d->d_ssize;
-- pt->p_size = (unsigned long)size;
-- pt->p_typ = 0x83;
-- }
-- return (1);
--}
-diff -rupN ./gpart-0.1h.orig/src/gm_rfs.h ./gpart-0.1h/src/gm_rfs.h
---- ./gpart-0.1h.orig/src/gm_rfs.h Mon Jan 29 16:34:35 2001
-+++ ./gpart-0.1h/src/gm_rfs.h Thu Jan 1 03:00:00 1970
-@@ -1,68 +0,0 @@
--/*
-- * gm_rfs.h -- gpart ReiserFS guessing module header
-- *
-- * gpart (c) 1999-2001 Michail Brzitwa <mb@ichabod.han.de>
-- * Guess PC-type hard disk partitions.
-- *
-- * gpart 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.
-- *
-- * Created: 21.01.1999 <mb@ichabod.han.de>
-- * Modified: 26.12.2000 Francis Devereux <francis@devereux.tc>
-- * Update support reiserfs version 3.5.28
-- *
-- */
--
--#ifndef _GM_RFS_H
--#define _GM_RFS_H
--
--/* imported from asm/types.h */
--typedef __signed__ char __s8;
--typedef unsigned char __u8;
--
--typedef __signed__ short __s16;
--typedef unsigned short __u16;
--
--typedef __signed__ int __s32;
--typedef unsigned int __u32;
--
--/*
-- * taken from ReiserFS v3.5.28. Reiserfs Copyright 1996-2000 Hans Reiser
-- */
--
--#define REISERFS_SUPER_MAGIC "ReIsErFs"
--#define REISERFS_FIRST_BLOCK 64
--#define REISERFS_VALID_FS 1
--#define REISERFS_ERROR_FS 2
--#define REISERFS_MIN_BLOCK_AMOUNT 100
--
--struct reiserfs_super_block
--{
-- __u32 s_block_count; /* blocks count */
-- __u32 s_free_blocks; /* free blocks count */
-- __u32 s_root_block; /* root block number */
-- __u32 s_journal_block; /* journal block number */
-- __u32 s_journal_dev; /* journal device number */
-- __u32 s_orig_journal_size; /* size of the journal on FS creation. used to make sure they don't overflow it */
-- __u32 s_journal_trans_max; /* max number of blocks in a transaction. */
-- __u32 s_journal_block_count; /* total size of the journal. can change over time */
-- __u32 s_journal_max_batch; /* max number of blocks to batch into a trans */
-- __u32 s_journal_max_commit_age; /* in seconds, how old can an async commit be */
-- __u32 s_journal_max_trans_age; /* in seconds, how old can a transaction be */
-- __u16 s_blocksize; /* block size */
-- __u16 s_oid_maxsize; /* max size of object id array, see get_objectid() commentary */
-- __u16 s_oid_cursize; /* current size of object id array */
-- __u16 s_state; /* valid or error */
-- char s_magic[12]; /* reiserfs magic string indicates that file system is reiserfs */
-- __u32 s_hash_function_code; /* indicate, what hash fuction is being use to sort names in a directory*/
-- __u16 s_tree_height; /* height of disk tree */
-- __u16 s_bmap_nr; /* amount of bitmap blocks needed to address each block of file system */
-- __u16 s_reserved;
--};
--
--#define SB_SIZE (sizeof(struct reiserfs_super_block))
--
--
--#endif /* _GM_RFS_H */
-diff -rupN ./gpart-0.1h.orig/src/gmodules.c ./gpart-0.1h/src/gmodules.c
---- ./gpart-0.1h.orig/src/gmodules.c Tue Jan 30 20:01:00 2001
-+++ ./gpart-0.1h/src/gmodules.c Fri Jan 10 16:31:28 2003
-@@ -154,7 +154,7 @@ void g_mod_addinternals()
- GMODINS(bsddl);
- GMODINS(lswap);
- GMODINS(qnx4);
-- GMODINS(rfs);
-+ GMODINS(reiserfs);
- GMODINS(ntfs);
- GMODINS(hpfs);
- GMODINS(minix);
-diff -rupN ./gpart-0.1h.orig/src/gmodules.h ./gpart-0.1h/src/gmodules.h
---- ./gpart-0.1h.orig/src/gmodules.h Tue Jan 30 20:00:47 2001
-+++ ./gpart-0.1h/src/gmodules.h Fri Jan 10 16:31:23 2003
-@@ -63,7 +63,7 @@ g_module *g_mod_setweight(char *,float);
-
- GMODDECL(bsddl); GMODDECL(ext2); GMODDECL(fat);
- GMODDECL(hpfs); GMODDECL(lswap); GMODDECL(ntfs);
--GMODDECL(s86dl); GMODDECL(minix); GMODDECL(rfs);
-+GMODDECL(s86dl); GMODDECL(minix); GMODDECL(reiserfs);
- GMODDECL(hmlvm); GMODDECL(qnx4); GMODDECL(beos);
- GMODDECL(xfs);
-
diff --git a/extra/gpart/gpart-0.1h-vfat.patch b/extra/gpart/gpart-0.1h-vfat.patch
deleted file mode 100644
index 7234ac689..000000000
--- a/extra/gpart/gpart-0.1h-vfat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Ripped out of debian
-
---- gpart-0.1h.orig/src/gm_fat.h
-+++ gpart-0.1h/src/gm_fat.h
-@@ -60,6 +60,10 @@
- __u16 info_sector; /* filesystem info sector */
- __u16 backup_boot; /* backup boot sector */
- __u16 reserved2[6]; /* Unused */
--};
--
-+} __attribute__ ((packed));
-+/* "__attribute__ ((packed))"
-+ added by davidc@debian.org,
-+ as suggested by falk@zxmjz18.extern.uni-tuebingen.de
-+ Fri Jul 07 18:04:15 2000
-+ in debian bug report #66893 "FAT detection broken on Alpha" */
- #endif /* _GM_FAT_H */
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index 877de6c6d..a88e4c179 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 194596 2013-09-19 09:44:46Z giovanni $
+# $Id: PKGBUILD 201370 2013-12-09 18:57:47Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
# Contributor: György Balló <ballogy@freestart.hu>
pkgname=gparted
-pkgver=0.16.2
+pkgver=0.17.0
pkgrel=1
pkgdesc="A Partition Magic clone, frontend to GNU Parted"
arch=('i686' 'x86_64' 'mips64el')
url="http://gparted.sourceforge.net"
license=('GPL')
-depends=('parted' 'gtkmm' 'hicolor-icon-theme')
+depends=('parted' 'gtkmm')
makedepends=('intltool' 'pkg-config' 'gnome-doc-utils')
optdepends=('dosfstools: for FAT16 and FAT32 partitions'
'jfsutils: for jfs partitions'
@@ -28,7 +28,7 @@ install=gparted.install
source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
'org.archlinux.pkexec.gparted.policy'
'gparted_polkit')
-md5sums=('4e722a48a90c6d65d212711d45c9c0d1'
+md5sums=('ecd66491bb2061c6aa6077cc24823b9e'
'122ed3120c846376bead22b25f6a3b19'
'0b68a4e2bc6bc15440730ebe2d7bf9f6')
diff --git a/extra/grantlee/PKGBUILD b/extra/grantlee/PKGBUILD
index 3e5bdf542..451ea8d21 100644
--- a/extra/grantlee/PKGBUILD
+++ b/extra/grantlee/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178957 2013-03-01 10:20:25Z andrea $
+# $Id: PKGBUILD 200579 2013-11-29 06:36:26Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=grantlee
-pkgver=0.3.0
-pkgrel=2
+pkgver=0.4.0
+pkgrel=1
pkgdesc="A string template engine based on the Django template system and written in Qt"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gitorious.org/grantlee/pages/Home"
@@ -11,12 +11,13 @@ license=('LGPL3')
depends=('qt4')
makedepends=('cmake' 'doxygen')
source=("http://downloads.grantlee.org/${pkgname}-${pkgver}.tar.gz")
-md5sums=('195763a3238f51f8885881fc8012cd83')
-
-build() {
- . /etc/profile.d/qt4.sh
+md5sums=('fa8a2e9be7be7e3a89e700679e6f3014')
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 6c9ac7775..2b19aa09f 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198048 2013-10-30 12:29:09Z allan $
+# $Id: PKGBUILD 202659 2013-12-23 18:00:07Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
@@ -6,27 +6,43 @@
pkgname=graphicsmagick
pkgver=1.3.18
-pkgrel=3
+pkgrel=6
pkgdesc='Image processing system'
url='http://www.graphicsmagick.org/'
arch=('i686' 'x86_64' 'mips64el')
license=('MIT')
-makedepends=('perl')
-depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
- 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4')
+optdepends=('jasper: jp2 module'
+ 'libpng: png module'
+ 'libwmf: wmf module'
+ 'libxml2: msl, svg, url modules'
+ 'libtiff: ps2, ps3, tiff modules'
+ 'ghostscript: pdf, ps modules')
+makedepends=('perl' 'jasper' 'libpng' 'libwmf' 'libxml2' 'libtiff')
+depends=('freetype2' 'libxext' 'libsm' 'lcms2' 'libltdl' 'bzip2' 'xz')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz"
+ 'benign.patch')
+sha1sums=('085c23666adcf88585119cb6aea7efe5c58481d4'
+ '04e16b9fe255e87cf16d4c61e313e8cdf7b2e24e')
+
+options=('!emptydirs' 'libtool')
+
+prepare() {
+ cd "${srcdir}/GraphicsMagick-${pkgver}"
+ patch -p1 -i ../benign.patch
+}
build() {
cd "${srcdir}/GraphicsMagick-${pkgver}"
./configure \
--prefix=/usr \
- --with-perl \
--enable-shared \
- --disable-static \
+ --with-modules \
+ --with-perl \
--with-gs-font-dir=/usr/share/fonts/Type1 \
-
+ --with-quantum-depth=32 \
+ --with-openmp \
+ --with-threads
make
}
diff --git a/extra/graphicsmagick/benign.patch b/extra/graphicsmagick/benign.patch
new file mode 100644
index 000000000..f9fe6a642
--- /dev/null
+++ b/extra/graphicsmagick/benign.patch
@@ -0,0 +1,43 @@
+diff -Naur old/ChangeLog new/ChangeLog
+--- old/ChangeLog 2013-03-09 13:19:31.000000000 -1000
++++ new/ChangeLog 2013-11-22 06:33:59.189976814 -1000
+@@ -1,3 +1,10 @@
++2013-10-16 Glenn Randers-Pehrson <glennrp@simple.dallas.tx.us>
++
++ * Added calls to png_set_benign_errors() to allow benign errors
++ to be handled as warnings. In particular, GM builds with libpng-1.6.x
++ will not crash while copying a PNG with a "known incorrect ICC
++ profile".
++
+ 2013-03-09 Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
+ * version.sh, www/index.rst: Prepare for 1.3.18 release.
+diff -Naur old/coders/png.c new/coders/png.c
+--- old/coders/png.c 2013-03-09 13:19:31.000000000 -1000
++++ new/coders/png.c 2013-11-22 06:33:25.423156308 -1000
+@@ -1689,6 +1689,12 @@
+ }
+ return(image);
+ }
++
++#ifdef PNG_BENIGN_ERRORS_SUPPORTED
++ /* Allow benign errors */
++ png_set_benign_errors(ping, 1);
++#endif
++
+ /*
+ Prepare PNG for reading.
+ */
+@@ -6453,6 +6459,12 @@
+ #endif
+ return(MagickFail);
+ }
++
++#ifdef PNG_BENIGN_ERRORS_SUPPORTED
++ /* Allow benign errors */
++ png_set_benign_errors(ping, 1);
++#endif
++
+ /*
+ Prepare PNG for writing.
+ */
diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index f948f5b09..92ec2f872 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198049 2013-10-30 12:29:30Z allan $
+# $Id: PKGBUILD 200651 2013-11-30 19:11:13Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
pkgname=graphite
-pkgver=1.2.3
+pkgver=1.2.4
pkgrel=1
epoch=1
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'freetype2' 'python2')
options=('!emptydirs')
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
graphite2-1.2.0-cmakepath.patch)
-md5sums=('7042305e4208af4c2d5249d814ccce58'
+md5sums=('2ef839348fe28e3b923bf8cced440227'
'00353b67941dbc30b76a43253760769e')
build() {
diff --git a/extra/gsl/PKGBUILD b/extra/gsl/PKGBUILD
index 617c996fd..edb884817 100644
--- a/extra/gsl/PKGBUILD
+++ b/extra/gsl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198053 2013-10-30 12:31:09Z allan $
+# $Id: PKGBUILD 202886 2013-12-28 22:44:06Z bpiotrowski $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Juergen Hoetzel <juergen.archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=gsl
-pkgver=1.15
-pkgrel=3
+pkgver=1.16
+pkgrel=1
pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers"
url="http://www.gnu.org/software/gsl/gsl.html"
source=("http://ftp.gnu.org/gnu/gsl/$pkgname-$pkgver.tar.gz")
@@ -13,7 +13,7 @@ install=gsl.install
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('glibc' 'bash')
-sha1sums=('d914f84b39a5274b0a589d9b83a66f44cd17ca8e')
+sha1sums=('210af9366485f149140973700d90dc93a4b6213e')
build() {
unset LDFLAGS
diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD
index e3167fb81..61ba2f655 100644
--- a/extra/gst-libav/PKGBUILD
+++ b/extra/gst-libav/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198055 2013-10-30 12:31:51Z allan $
+# $Id: PKGBUILD 199372 2013-11-11 17:53:04Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gst-libav
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc="Gstreamer libav Plugin"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('yasm')
options=(!emptydirs)
provides=("gst-ffmpeg=$pkgver-$pkgrel")
source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('48721eb318ffffdd134edea754d0b65d76b08c8209a8d2c8a42bca1f799f9099')
+sha256sums=('fd152b7aec56ae76ad58b9759913a8bfe1792bdf64f260d0acaba75b75076676')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD
index 0969a6a00..160761869 100644
--- a/extra/gst-plugins-base/PKGBUILD
+++ b/extra/gst-plugins-base/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198057 2013-10-30 12:32:34Z allan $
+# $Id: PKGBUILD 199366 2013-11-11 17:42:32Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gst-plugins-base
pkgname=('gst-plugins-base-libs' 'gst-plugins-base')
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Base Plugins"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv
options=(!emptydirs)
url="http://gstreamer.freedesktop.org/"
source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('8656e20bf4b675e5696fb4af193793351926d428ca02826c5667a6384729a45d')
+sha256sums=('de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f')
build() {
cd $pkgbase-$pkgver
diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD
index dcd044f02..988072d46 100644
--- a/extra/gst-plugins-good/PKGBUILD
+++ b/extra/gst-plugins-good/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198058 2013-10-30 12:32:54Z allan $
+# $Id: PKGBUILD 199367 2013-11-11 17:42:49Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gst-plugins-good
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc="GStreamer Multimedia Framework Good Plugins"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' '
makedepends=('gstreamer' 'speex' 'flac' 'libraw1394' 'python')
options=(!emptydirs)
source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('2256a6b2744ea18d8810642cf9061a2f12f4b7eba87d3fbc98004262b4f0fdfa')
+sha256sums=('660fa02dbe01086fcf702d87acc0ba5dde2559d6a11ecf438874afe504c50517')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD
index 87ea800c9..d24e638c0 100644
--- a/extra/gst-plugins-ugly/PKGBUILD
+++ b/extra/gst-plugins-ugly/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 198059 2013-10-30 12:33:14Z allan $
+# $Id: PKGBUILD 199864 2013-11-17 12:53:56Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gst-plugins-ugly
-pkgver=1.2.0
-pkgrel=1
+pkgver=1.2.1
+pkgrel=2
pkgdesc="GStreamer Multimedia Framework Ugly Plugins"
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')
+makedepends=('python')
options=(!emptydirs)
source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('e4760af4b12bf97ba0a8001cfe733d9d52160a0ad81f6c6f0d0d3a9e798626de')
+sha256sums=('35ae5d45de54827604e24f57f54ab30a5ab2245b4c4120977273eb11d19c2395')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD
index e6da373b9..4d2b02e42 100644
--- a/extra/gstreamer-vaapi/PKGBUILD
+++ b/extra/gstreamer-vaapi/PKGBUILD
@@ -1,54 +1,51 @@
-# $Id: PKGBUILD 198068 2013-10-30 12:36:23Z allan $
+# $Id: PKGBUILD 200351 2013-11-26 23:08:09Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=gstreamer-vaapi
pkgname=(gst-vaapi gstreamer0.10-vaapi)
-pkgver=0.5.6
+pkgver=0.5.7
pkgrel=1
pkgdesc="GStreamer Multimedia Framework VA Plugins"
arch=(i686 x86_64)
license=(LGPL)
url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/"
-makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva
- libxrandr)
+makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins
+ libva libxrandr)
options=(!emptydirs)
+#source=(git://gitorious.org/vaapi/${pkgbase}.git#tag=$pkgver)
source=($url/$pkgbase-${pkgver}.tar.bz2)
-sha1sums=('884a47cc4916f441bec160235927556a79c7ea09')
+sha1sums=('6baa794e5f95a22fbb5e0788ec29c8a78f40b5b3')
prepare() {
- cd $pkgbase-$pkgver
- mkdir build-1.0 build-0.10
+ mkdir build build-0.10
+ #cd $pkgbase
+ #NO_CONFIGURE=1 ./autogen.sh
}
-build() {
- cd $pkgbase-$pkgver/build-1.0
- ../configure --prefix=/usr --disable-static --with-gstreamer-api=1.0
+_build() (
+ cd "$1"; shift
+ ../$pkgbase-$pkgver/configure --prefix=/usr --disable-static "$@"
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
+)
- cd ../build-0.10
- ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10 --disable-wayland
- make
+build() {
+ _build build
+ _build build-0.10 --with-gstreamer-api=0.10 --disable-wayland
}
check() {
- cd $pkgbase-$pkgver/build-1.0
- make check
-
- cd ../build-0.10
- make check
+ make -C build -k check
+ make -C build-0.10 -k check
}
package_gst-vaapi() {
depends=(gst-plugins-base gst-plugins-bad libva libxrandr)
-
- cd $pkgbase-$pkgver/build-1.0
- make DESTDIR="$pkgdir" install
+ make -C build DESTDIR="$pkgdir" install
}
package_gstreamer0.10-vaapi() {
depends=(gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva libxrandr)
-
- cd $pkgbase-$pkgver/build-0.10
- make DESTDIR="$pkgdir" install
+ make -C build-0.10 DESTDIR="$pkgdir" install
}
diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD
index 47a882b6e..fdda4c0ec 100644
--- a/extra/gstreamer/PKGBUILD
+++ b/extra/gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198060 2013-10-30 12:33:34Z allan $
+# $Id: PKGBUILD 199371 2013-11-11 17:52:47Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gstreamer
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc="GStreamer Multimedia Framework"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libxml2' 'glib2')
optdepends=('sh: feedback script')
makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection')
source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz)
-sha256sums=('94af5274299f845adf41cc504e0209b269acab7721293f49850fea27b4099463')
+sha256sums=('a4523d2471bca6cd0059a32e3b042f50faa4dadc6439852af8b43ca3f17d1fc9')
build() {
cd "${srcdir}/gstreamer-${pkgver}"
diff --git a/extra/gstreamer0.10-base/PKGBUILD b/extra/gstreamer0.10-base/PKGBUILD
index bcc6a7b95..d61da1d98 100644
--- a/extra/gstreamer0.10-base/PKGBUILD
+++ b/extra/gstreamer0.10-base/PKGBUILD
@@ -1,46 +1,62 @@
-# $Id: PKGBUILD 198063 2013-10-30 12:34:39Z allan $
+# $Id: PKGBUILD 201390 2013-12-10 12:53:56Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=('gstreamer0.10-base')
pkgname=('gstreamer0.10-base' 'gstreamer0.10-base-plugins')
pkgver=0.10.36
-pkgrel=1.2
+pkgrel=2
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')
+makedepends=('pkgconfig' 'gstreamer0.10>=0.10.36' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libvisual' 'libvorbis' 'libtheora' 'pango' 'gobject-introspection' 'git' 'gtk-doc')
options=(!emptydirs)
url="http://gstreamer.freedesktop.org/"
-source=(${url}/src/gst-plugins-base/gst-plugins-base-${pkgver}.tar.xz)
-sha256sums=('1fe45c3894903001d4d008b0713dab089f53726dcb5842d5b40c2595a984e64a')
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-base#commit=48d5966f12d4e6b71c96db0600cf76ef0ef14b3a"
+ fix-crash-0-byte-ogg.patch
+ colorbalance-fix-abi.patch
+ revert-decodebin-playbin-removal.patch
+ videoscale-fix-negotiation.patch
+ ayuv64-lanczos.patch
+ gstaudio-symbols.patch)
+sha256sums=('SKIP'
+ 'a6a01035ea9627737f9c17f72919857ed43ccc7c2cb08b645b43ed89f78d0f4f'
+ '7442c5c68068428b8c7ac1d3825ce29f1bb152b75b77047b9e806c7d322b780c'
+ 'ba20659fafea73db016ddaecd128f12087e0957ce35cf2c3ce29f72c51551ef3'
+ 'ae27f7be58997217f67898b37b138a485c203389e56b65e6b31c23f769ef39ca'
+ '3792dfe80c69f51c0db98533e8fb16707b5dd2ee6933ea6098583af873ceb44a'
+ '56e7a988df39d2ec4befa265536ad8c30d3c8d18d136cebef64e8d6baac1abae')
-build() {
- cd "${srcdir}/gst-plugins-base-${pkgver}"
- sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' \
- configure.ac
- autoreconf
+prepare() {
+ cd gst-plugins-base
+ sed -i -e '/AC_PATH_XTRA/d' -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
+ patch -Np1 -i ../fix-crash-0-byte-ogg.patch
+ patch -Np1 -i ../colorbalance-fix-abi.patch
+ patch -Np1 -i ../ayuv64-lanczos.patch
+ patch -Np1 -i ../videoscale-fix-negotiation.patch
+ patch -Np1 -i ../gstaudio-symbols.patch
+ patch -Np1 -R -i ../revert-decodebin-playbin-removal.patch
}
build() {
- cd "${srcdir}/gst-plugins-base-${pkgver}"
+ cd gst-plugins-base
+ NOCONFIGURE=1 ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --enable-experimental --disable-gnome_vfs \
+ --disable-static --enable-experimental --disable-gnome_vfs --enable-gtk-doc \
--with-package-name="GStreamer Base Plugins (Parabola)" \
--with-package-origin="https://parabolagnulinux.org/"
-
make
sed -e 's/^SUBDIRS_EXT =.*/SUBDIRS_EXT =/' -i Makefile
}
check() {
- cd "${srcdir}/gst-plugins-base-${pkgver}"
+ cd gst-plugins-base
make check
}
package_gstreamer0.10-base() {
pkgdesc="GStreamer Multimedia Framework Base plugin libraries"
- depends=('gstreamer0.10>=0.10.35' 'orc' 'libxv')
+ depends=('gstreamer0.10>=0.10.36' 'orc' 'libxv')
- cd "${srcdir}/gst-plugins-base-${pkgver}"
+ cd gst-plugins-base
make DESTDIR="${pkgdir}" install
}
@@ -51,7 +67,7 @@ package_gstreamer0.10-base-plugins() {
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}"
+ cd gst-plugins-base
make -C gst-libs DESTDIR="${pkgdir}" install
make -C ext DESTDIR="${pkgdir}" install
make -C gst-libs DESTDIR="${pkgdir}" uninstall
diff --git a/extra/gstreamer0.10-base/ayuv64-lanczos.patch b/extra/gstreamer0.10-base/ayuv64-lanczos.patch
new file mode 100644
index 000000000..64106e465
--- /dev/null
+++ b/extra/gstreamer0.10-base/ayuv64-lanczos.patch
@@ -0,0 +1,236 @@
+From e4f01106d08f3c2a65897bfe919bd65ce55545a8 Mon Sep 17 00:00:00 2001
+From: David Schleef <ds@schleef.org>
+Date: Wed, 25 Jan 2012 23:49:00 +0000
+Subject: videoscale: Add AYUV64 path to Lanczos
+
+---
+diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
+index 7b44647..6df4ba6 100644
+--- a/gst/videoscale/gstvideoscale.c
++++ b/gst/videoscale/gstvideoscale.c
+@@ -1199,6 +1199,11 @@ gst_video_scale_transform (GstBaseTransform * trans, GstBuffer * in,
+ case GST_VIDEO_SCALE_4TAP:
+ vs_image_scale_4tap_AYUV64 (&dest, &src, videoscale->tmp_buf);
+ break;
++ case GST_VIDEO_SCALE_LANCZOS:
++ vs_image_scale_lanczos_AYUV64 (&dest, &src, videoscale->tmp_buf,
++ videoscale->sharpness, videoscale->dither, videoscale->submethod,
++ videoscale->envelope, videoscale->sharpen);
++ break;
+ default:
+ goto unknown_mode;
+ }
+diff --git a/gst/videoscale/vs_image.h b/gst/videoscale/vs_image.h
+index 2312acc..7b34991 100644
+--- a/gst/videoscale/vs_image.h
++++ b/gst/videoscale/vs_image.h
+@@ -52,6 +52,9 @@ void vs_image_scale_linear_RGBA (const VSImage *dest, const VSImage *src,
+ void vs_image_scale_lanczos_AYUV (const VSImage * dest, const VSImage * src,
+ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod,
+ double a, double sharpen);
++void vs_image_scale_lanczos_AYUV64 (const VSImage * dest, const VSImage * src,
++ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod,
++ double a, double sharpen);
+
+ void vs_image_scale_nearest_RGB (const VSImage *dest, const VSImage *src,
+ uint8_t *tmpbuf);
+diff --git a/gst/videoscale/vs_lanczos.c b/gst/videoscale/vs_lanczos.c
+index 1c87ba3..d141a01 100644
+--- a/gst/videoscale/vs_lanczos.c
++++ b/gst/videoscale/vs_lanczos.c
+@@ -204,6 +204,9 @@ static void vs_image_scale_lanczos_AYUV_float (const VSImage * dest,
+ static void vs_image_scale_lanczos_AYUV_double (const VSImage * dest,
+ const VSImage * src, uint8_t * tmpbuf, double sharpness, gboolean dither,
+ double a, double sharpen);
++static void vs_image_scale_lanczos_AYUV64_double (const VSImage * dest,
++ const VSImage * src, uint8_t * tmpbuf, double sharpness, gboolean dither,
++ double a, double sharpen);
+
+ static double
+ sinc (double x)
+@@ -590,6 +593,15 @@ vs_image_scale_lanczos_AYUV (const VSImage * dest, const VSImage * src,
+ }
+ }
+
++void
++vs_image_scale_lanczos_AYUV64 (const VSImage * dest, const VSImage * src,
++ uint8_t * tmpbuf, double sharpness, gboolean dither, int submethod,
++ double a, double sharpen)
++{
++ vs_image_scale_lanczos_AYUV64_double (dest, src, tmpbuf, sharpness, dither,
++ a, sharpen);
++}
++
+
+
+ #define RESAMPLE_HORIZ_FLOAT(function, dest_type, tap_type, src_type, _n_taps) \
+@@ -813,9 +825,9 @@ RESAMPLE_VERT_DITHER (resample_vert_dither_int16_generic, gint16, gint16,
+ n_taps, shift)
+ /* *INDENT-ON* */
+
+-#define RESAMPLE_VERT_FLOAT(function, tap_type, src_type, _n_taps, _shift) \
++#define RESAMPLE_VERT_FLOAT(function, dest_type, clamp, tap_type, src_type, _n_taps, _shift) \
+ static void \
+-function (guint8 *dest, \
++function (dest_type *dest, \
+ const tap_type *taps, const src_type *src, int stride, int n_taps, \
+ int shift, int n) \
+ { \
+@@ -828,13 +840,13 @@ function (guint8 *dest, \
+ const src_type *line = PTR_OFFSET(src, stride * l); \
+ sum_y += line[i] * taps[l]; \
+ } \
+- dest[i] = CLAMP (floor(0.5 + sum_y), 0, 255); \
++ dest[i] = CLAMP (floor(0.5 + sum_y), 0, clamp); \
+ } \
+ }
+
+-#define RESAMPLE_VERT_FLOAT_DITHER(function, tap_type, src_type, _n_taps, _shift) \
++#define RESAMPLE_VERT_FLOAT_DITHER(function, dest_type, clamp, tap_type, src_type, _n_taps, _shift) \
+ static void \
+-function (guint8 *dest, \
++function (dest_type *dest, \
+ const tap_type *taps, const src_type *src, int stride, int n_taps, \
+ int shift, int n) \
+ { \
+@@ -849,19 +861,24 @@ function (guint8 *dest, \
+ sum_y += line[i] * taps[l]; \
+ } \
+ err_y += sum_y; \
+- dest[i] = CLAMP (floor (err_y), 0, 255); \
++ dest[i] = CLAMP (floor (err_y), 0, clamp); \
+ err_y -= floor (err_y); \
+ } \
+ }
+
+ /* *INDENT-OFF* */
+-RESAMPLE_VERT_FLOAT (resample_vert_double_generic, double, double, n_taps,
++RESAMPLE_VERT_FLOAT (resample_vert_double_generic, guint8, 255, double, double, n_taps,
+ shift)
+-RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic, double, double,
++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic, guint8, 255, double, double,
+ n_taps, shift)
+
+-RESAMPLE_VERT_FLOAT (resample_vert_float_generic, float, float, n_taps, shift)
+-RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_float_generic, float, float,
++RESAMPLE_VERT_FLOAT (resample_vert_double_generic_u16, guint16, 65535, double, double, n_taps,
++ shift)
++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_double_generic_u16, guint16, 65535, double, double,
++ n_taps, shift)
++
++RESAMPLE_VERT_FLOAT (resample_vert_float_generic, guint8, 255, float, float, n_taps, shift)
++RESAMPLE_VERT_FLOAT_DITHER (resample_vert_dither_float_generic, guint8, 255, float, float,
+ n_taps, shift)
+ /* *INDENT-ON* */
+
+@@ -1556,3 +1573,77 @@ vs_image_scale_lanczos_AYUV_float (const VSImage * dest, const VSImage * src,
+ scale1d_cleanup (&scale->y_scale1d);
+ g_free (scale->tmpdata);
+ }
++
++static void
++vs_scale_lanczos_AYUV64_double (Scale * scale)
++{
++ int j;
++ int yi;
++ int tmp_yi;
++
++ tmp_yi = 0;
++
++ for (j = 0; j < scale->dest->height; j++) {
++ guint16 *destline;
++ double *taps;
++
++ destline = (guint16 *) (scale->dest->pixels + scale->dest->stride * j);
++
++ yi = scale->y_scale1d.offsets[j];
++
++ while (tmp_yi < yi + scale->y_scale1d.n_taps) {
++ scale->horiz_resample_func (TMP_LINE_DOUBLE_AYUV (tmp_yi),
++ scale->x_scale1d.offsets, scale->x_scale1d.taps, SRC_LINE (tmp_yi),
++ scale->x_scale1d.n_taps, 0, scale->dest->width);
++ tmp_yi++;
++ }
++
++ taps = (double *) scale->y_scale1d.taps + j * scale->y_scale1d.n_taps;
++ if (scale->dither) {
++ resample_vert_dither_double_generic_u16 (destline,
++ taps, TMP_LINE_DOUBLE_AYUV (scale->y_scale1d.offsets[j]),
++ sizeof (double) * 4 * scale->dest->width,
++ scale->y_scale1d.n_taps, 0, scale->dest->width * 4);
++ } else {
++ resample_vert_double_generic_u16 (destline,
++ taps, TMP_LINE_DOUBLE_AYUV (scale->y_scale1d.offsets[j]),
++ sizeof (double) * 4 * scale->dest->width,
++ scale->y_scale1d.n_taps, 0, scale->dest->width * 4);
++ }
++ }
++}
++
++void
++vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, const VSImage * src,
++ uint8_t * tmpbuf, double sharpness, gboolean dither, double a,
++ double sharpen)
++{
++ Scale s = { 0 };
++ Scale *scale = &s;
++ int n_taps;
++
++ scale->dest = dest;
++ scale->src = src;
++
++ n_taps = scale1d_get_n_taps (src->width, dest->width, a, sharpness);
++ scale1d_calculate_taps (&scale->x_scale1d,
++ src->width, dest->width, n_taps, a, sharpness, sharpen);
++
++ n_taps = scale1d_get_n_taps (src->height, dest->height, a, sharpness);
++ scale1d_calculate_taps (&scale->y_scale1d,
++ src->height, dest->height, n_taps, a, sharpness, sharpen);
++
++ scale->dither = dither;
++
++ scale->horiz_resample_func =
++ (HorizResampleFunc) resample_horiz_double_ayuv_generic;
++
++ scale->tmpdata =
++ g_malloc (sizeof (double) * scale->dest->width * scale->src->height * 4);
++
++ vs_scale_lanczos_AYUV64_double (scale);
++
++ scale1d_cleanup (&scale->x_scale1d);
++ scale1d_cleanup (&scale->y_scale1d);
++ g_free (scale->tmpdata);
++}
+--
+cgit v0.9.0.2-2-gbebe
+From f8dc679ca7e9542e6f410062df5e332fc8e0ba9d Mon Sep 17 00:00:00 2001
+From: David Schleef <ds@schleef.org>
+Date: Sun, 19 Feb 2012 08:03:03 +0000
+Subject: videoscale: fix AYUV64 scaling
+
+---
+diff --git a/gst/videoscale/vs_lanczos.c b/gst/videoscale/vs_lanczos.c
+index d141a01..67cd401 100644
+--- a/gst/videoscale/vs_lanczos.c
++++ b/gst/videoscale/vs_lanczos.c
+@@ -728,6 +728,9 @@ RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_double_ayuv_generic, double, double,
+ RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_float_ayuv_generic, float, float,
+ guint8, n_taps)
+
++RESAMPLE_HORIZ_AYUV_FLOAT (resample_horiz_double_ayuv_generic_s16, double, double,
++ guint16, n_taps)
++
+ RESAMPLE_HORIZ (resample_horiz_int32_int32_u8_generic, gint32, gint32,
+ guint8, n_taps, shift)
+ RESAMPLE_HORIZ (resample_horiz_int16_int16_u8_generic, gint16, gint16,
+@@ -1636,7 +1639,7 @@ vs_image_scale_lanczos_AYUV64_double (const VSImage * dest, const VSImage * src,
+ scale->dither = dither;
+
+ scale->horiz_resample_func =
+- (HorizResampleFunc) resample_horiz_double_ayuv_generic;
++ (HorizResampleFunc) resample_horiz_double_ayuv_generic_s16;
+
+ scale->tmpdata =
+ g_malloc (sizeof (double) * scale->dest->width * scale->src->height * 4);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-base/colorbalance-fix-abi.patch b/extra/gstreamer0.10-base/colorbalance-fix-abi.patch
new file mode 100644
index 000000000..1e7b8f2c1
--- /dev/null
+++ b/extra/gstreamer0.10-base/colorbalance-fix-abi.patch
@@ -0,0 +1,23 @@
+From 0cb4ccb1f09d39820682e052fc106f5fd7fa1309 Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Fri, 24 Feb 2012 20:37:00 +0000
+Subject: interfaces: fix ABI class padding after the recent changes
+
+---
+(limited to 'gst-libs/gst/interfaces/colorbalance.h')
+
+diff --git a/gst-libs/gst/interfaces/colorbalance.h b/gst-libs/gst/interfaces/colorbalance.h
+index fd8ceaa..9f0a1cd 100644
+--- a/gst-libs/gst/interfaces/colorbalance.h
++++ b/gst-libs/gst/interfaces/colorbalance.h
+@@ -102,7 +102,7 @@ struct _GstColorBalanceClass {
+ GstColorBalanceType (*get_balance_type) (GstColorBalance *balance);
+
+ /*< private >*/
+- gpointer _gst_reserved[GST_PADDING];
++ gpointer _gst_reserved[GST_PADDING-1];
+ };
+
+ GType gst_color_balance_get_type (void);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-base/fix-crash-0-byte-ogg.patch b/extra/gstreamer0.10-base/fix-crash-0-byte-ogg.patch
new file mode 100644
index 000000000..2c03e820b
--- /dev/null
+++ b/extra/gstreamer0.10-base/fix-crash-0-byte-ogg.patch
@@ -0,0 +1,22 @@
+From 7f22e3ea7f713867e1fbf2ef71b6a6e36e1f0531 Mon Sep 17 00:00:00 2001
+From: Jonathan Liu <net147@gmail.com>
+Date: Sun, 28 Oct 2012 10:07:16 +0000
+Subject: oggstream: fix crash with 0 byte ogg packets
+
+https://bugzilla.gnome.org/show_bug.cgi?id=687030
+---
+diff --git a/ext/ogg/gstoggstream.c b/ext/ogg/gstoggstream.c
+index c79f088..fe28f2e 100644
+--- a/ext/ogg/gstoggstream.c
++++ b/ext/ogg/gstoggstream.c
+@@ -790,7 +790,7 @@ setup_vorbis_mapper (GstOggStream * pad, ogg_packet * packet)
+ static gboolean
+ is_header_vorbis (GstOggStream * pad, ogg_packet * packet)
+ {
+- if (packet->bytes > 0 && (packet->packet[0] & 0x01) == 0)
++ if (packet->bytes == 0 || (packet->packet[0] & 0x01) == 0)
+ return FALSE;
+
+ if (packet->packet[0] == 5) {
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-base/gstaudio-symbols.patch b/extra/gstreamer0.10-base/gstaudio-symbols.patch
new file mode 100644
index 000000000..7e2ad0f47
--- /dev/null
+++ b/extra/gstreamer0.10-base/gstaudio-symbols.patch
@@ -0,0 +1,10 @@
+--- gst-plugins-base/win32/common/libgstaudio.def.orig 2013-12-10 12:09:41.280012610 +0000
++++ gst-plugins-base/win32/common/libgstaudio.def 2013-12-10 12:10:12.253127720 +0000
+@@ -24,6 +24,7 @@
+ gst_audio_decoder_get_plc_aware
+ gst_audio_decoder_get_tolerance
+ gst_audio_decoder_get_type
++ gst_audio_decoder_merge_tags
+ gst_audio_decoder_set_byte_time
+ gst_audio_decoder_set_drainable
+ gst_audio_decoder_set_latency
diff --git a/extra/gstreamer0.10-base/revert-decodebin-playbin-removal.patch b/extra/gstreamer0.10-base/revert-decodebin-playbin-removal.patch
new file mode 100644
index 000000000..2e5913930
--- /dev/null
+++ b/extra/gstreamer0.10-base/revert-decodebin-playbin-removal.patch
@@ -0,0 +1,122 @@
+From fece626254e3b250e4514d1c92ac8289421d9511 Mon Sep 17 00:00:00 2001
+From: Sebastian Dröge <sebastian.droege@collabora.co.uk>
+Date: Thu, 15 Mar 2012 11:34:22 +0000
+Subject: Disable old playbin and decodebin
+
+---
+diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
+index a0f1abc..700f581 100644
+--- a/gst/playback/Makefile.am
++++ b/gst/playback/Makefile.am
+@@ -6,19 +6,15 @@ glib_gen_basename = gstplay
+ built_sources = gstplay-marshal.c
+ built_headers = gstplay-marshal.h
+
+-plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin.la libgstdecodebin2.la
++plugin_LTLIBRARIES = libgstplaybin.la libgstdecodebin2.la
+
+ csp_cflags = -DCOLORSPACE=\"ffmpegcolorspace\"
+
+ libgstplaybin_la_SOURCES = \
+ gstplayback.c \
+- gstplaybin.c \
+ gstplaybin2.c \
+ gstplaysink.c \
+- gstplaybasebin.c \
+ gstplay-enum.c \
+- gststreaminfo.c \
+- gststreamselector.c \
+ gstsubtitleoverlay.c \
+ gstplaysinkvideoconvert.c \
+ gstplaysinkaudioconvert.c \
+@@ -37,17 +33,6 @@ if !GST_PLUGIN_BUILD_STATIC
+ libgstplaybin_la_LIBTOOLFLAGS = --tag=disable-static
+ endif
+
+-libgstdecodebin_la_SOURCES = gstdecodebin.c
+-nodist_libgstdecodebin_la_SOURCES = $(built_sources)
+-libgstdecodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags)
+-libgstdecodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+-libgstdecodebin_la_LIBADD = \
+- $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_MAJORMINOR@.la \
+- $(GST_LIBS)
+-if !GST_PLUGIN_BUILD_STATIC
+-libgstdecodebin_la_LIBTOOLFLAGS = --tag=disable-static
+-endif
+-
+ libgstdecodebin2_la_SOURCES = gstdecodebin2.c gsturidecodebin.c gstplay-enum.c
+ nodist_libgstdecodebin2_la_SOURCES = $(built_sources)
+ libgstdecodebin2_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(csp_cflags)
+@@ -61,11 +46,8 @@ endif
+
+ noinst_HEADERS = \
+ gstplayback.h \
+- gstplaybasebin.h \
+ gstplaysink.h \
+- gststreaminfo.h \
+ gstplay-enum.h \
+- gststreamselector.h \
+ gstrawcaps.h \
+ gstsubtitleoverlay.h \
+ gstplaysinkvideoconvert.h \
+@@ -83,18 +65,6 @@ include $(top_srcdir)/common/gst-glib-gen.mak
+
+ Android.mk: Makefile.am $(BUILT_SOURCES)
+ androgenizer \
+- -:PROJECT libgstdecodebin -:SHARED libgstdecodebin \
+- -:TAGS eng debug \
+- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+- -:SOURCES $(libgstdecodebin_la_SOURCES) \
+- $(nodist_libgstdecodebin_la_SOURCES) \
+- -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstdecodebin_la_CFLAGS) $(csp_cflags) \
+- -:LDFLAGS $(libgstdecodebin_la_LDFLAGS) \
+- $(libgstdecodebin_la_LIBADD) \
+- -ldl \
+- -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
+- LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
+- \
+ -:PROJECT libgstdecodebin2 -:SHARED libgstdecodebin2 \
+ -:TAGS eng debug \
+ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
+diff --git a/gst/playback/gstplayback.c b/gst/playback/gstplayback.c
+index 5b74786..f99df6e 100644
+--- a/gst/playback/gstplayback.c
++++ b/gst/playback/gstplayback.c
+@@ -29,8 +29,6 @@
+
+ #include "gstplayback.h"
+ #include "gstplaysink.h"
+-#include "gststreamselector.h"
+-#include "gststreaminfo.h"
+ #include "gstsubtitleoverlay.h"
+
+ static gboolean
+@@ -47,13 +45,7 @@ plugin_init (GstPlugin * plugin)
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ #endif /* ENABLE_NLS */
+
+- /* ref class from a thread-safe context to work around missing bit of
+- * thread-safety in GObject */
+- g_type_class_ref (GST_TYPE_STREAM_INFO);
+- g_type_class_ref (GST_TYPE_STREAM_SELECTOR);
+-
+- res = gst_play_bin_plugin_init (plugin);
+- res &= gst_play_bin2_plugin_init (plugin);
++ res = gst_play_bin2_plugin_init (plugin);
+ res &= gst_play_sink_plugin_init (plugin);
+ res &= gst_subtitle_overlay_plugin_init (plugin);
+
+diff --git a/gst/playback/gstplayback.h b/gst/playback/gstplayback.h
+index 4be121c..5981cdd 100644
+--- a/gst/playback/gstplayback.h
++++ b/gst/playback/gstplayback.h
+@@ -24,7 +24,6 @@
+ #include <gst/gst.h>
+
+ gboolean gst_decode_bin_plugin_init (GstPlugin * plugin);
+-gboolean gst_play_bin_plugin_init (GstPlugin * plugin);
+ gboolean gst_play_bin2_plugin_init (GstPlugin * plugin);
+
+
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-base/videoscale-fix-negotiation.patch b/extra/gstreamer0.10-base/videoscale-fix-negotiation.patch
new file mode 100644
index 000000000..6e34d41c5
--- /dev/null
+++ b/extra/gstreamer0.10-base/videoscale-fix-negotiation.patch
@@ -0,0 +1,171 @@
+From 63d1316c0fd4ce22cf4a53f4aa7cb1ca16a07aa8 Mon Sep 17 00:00:00 2001
+From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
+Date: Sun, 26 Feb 2012 18:19:57 +0000
+Subject: videoscale: fix negotiation after addition of new formats and methods
+
+Now that we no longer support all methods for all formats, we
+need to cater for that in the transform function: we can't
+transform formats not supported by the currently-selected
+mehod.
+
+make check, folks. It's da bomb.
+---
+diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
+index 9f072a3..60dd5ff 100644
+--- a/gst/videoscale/gstvideoscale.c
++++ b/gst/videoscale/gstvideoscale.c
+@@ -424,10 +424,118 @@ gst_video_scale_get_property (GObject * object, guint prop_id, GValue * value,
+ }
+ }
+
++#define NEAREST (1 << GST_VIDEO_SCALE_NEAREST)
++#define BILINEAR (1 << GST_VIDEO_SCALE_BILINEAR)
++#define FOURTAP (1 << GST_VIDEO_SCALE_4TAP)
++#define LANCZOS (1 << GST_VIDEO_SCALE_LANCZOS)
++
++/* or we could just do lookups via table[format] if we could be bothered.. */
++static const struct
++{
++ GstVideoFormat format;
++ guint8 methods;
++} formats_methods_table[] = {
++ {
++ GST_VIDEO_FORMAT_RGBx, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_xRGB, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_BGRx, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_xBGR, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_RGBA, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_ARGB, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_BGRA, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_ABGR, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_AYUV, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_ARGB64, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_AYUV64, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_RGB, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_BGR, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_v308, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_YUY2, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_YVYU, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_UYVY, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_Y800, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_GRAY8, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_GRAY16_LE, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_GRAY16_BE, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_Y16, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_I420, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_YV12, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_Y444, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_Y42B, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_Y41B, NEAREST | BILINEAR | FOURTAP | LANCZOS}, {
++ GST_VIDEO_FORMAT_NV12, NEAREST | BILINEAR}, {
++ GST_VIDEO_FORMAT_RGB16, NEAREST | BILINEAR | FOURTAP}, {
++ GST_VIDEO_FORMAT_RGB15, NEAREST | BILINEAR | FOURTAP}
++};
++
++static gboolean
++gst_video_scale_format_supported_for_method (GstVideoFormat format,
++ GstVideoScaleMethod method)
++{
++ int i;
++
++ for (i = 0; i < G_N_ELEMENTS (formats_methods_table); ++i) {
++ if (formats_methods_table[i].format == format)
++ return ((formats_methods_table[i].methods & (1 << method)) != 0);
++ }
++ return FALSE;
++}
++
++static gboolean
++gst_video_scale_transform_supported (GstVideoScale * videoscale,
++ GstVideoScaleMethod method, GstStructure * structure)
++{
++ const GValue *val;
++ GstVideoFormat fmt;
++ gboolean supported = TRUE;
++ GstStructure *s;
++ GstCaps *c;
++
++ /* we support these methods for all formats */
++ if (method == GST_VIDEO_SCALE_NEAREST || method == GST_VIDEO_SCALE_BILINEAR)
++ return TRUE;
++
++ /* we need fixed caps if we want to use gst_video_parse_caps() */
++ s = gst_structure_new (gst_structure_get_name (structure),
++ "width", G_TYPE_INT, 1, "height", G_TYPE_INT, 1, NULL);
++
++ if ((val = gst_structure_get_value (structure, "format"))) {
++ gst_structure_set_value (s, "format", val);
++ } else {
++ if ((val = gst_structure_get_value (structure, "endianness")))
++ gst_structure_set_value (s, "endianness", val);
++ if ((val = gst_structure_get_value (structure, "red_mask")))
++ gst_structure_set_value (s, "red_mask", val);
++ if ((val = gst_structure_get_value (structure, "blue_mask")))
++ gst_structure_set_value (s, "blue_mask", val);
++ if ((val = gst_structure_get_value (structure, "green_mask")))
++ gst_structure_set_value (s, "green_mask", val);
++ if ((val = gst_structure_get_value (structure, "alpha_mask")))
++ gst_structure_set_value (s, "alpha_mask", val);
++ if ((val = gst_structure_get_value (structure, "depth")))
++ gst_structure_set_value (s, "depth", val);
++ if ((val = gst_structure_get_value (structure, "bpp")))
++ gst_structure_set_value (s, "bpp", val);
++ }
++ c = gst_caps_new_full (s, NULL);
++ if (!gst_video_format_parse_caps (c, &fmt, NULL, NULL)) {
++ GST_ERROR_OBJECT (videoscale, "couldn't parse %" GST_PTR_FORMAT, c);
++ } else if (!gst_video_scale_format_supported_for_method (fmt, method)) {
++ supported = FALSE;
++ }
++ GST_LOG_OBJECT (videoscale, "method %d %ssupported for format %d",
++ method, (supported) ? "" : "not ", fmt);
++ gst_caps_unref (c);
++
++ return supported;
++}
++
+ static GstCaps *
+ gst_video_scale_transform_caps (GstBaseTransform * trans,
+ GstPadDirection direction, GstCaps * caps)
+ {
++ GstVideoScale *videoscale = GST_VIDEO_SCALE (trans);
++ GstVideoScaleMethod method;
+ GstCaps *ret;
+ GstStructure *structure;
+
+@@ -441,6 +549,13 @@ gst_video_scale_transform_caps (GstBaseTransform * trans,
+ ret = gst_caps_copy (caps);
+ structure = gst_structure_copy (gst_caps_get_structure (ret, 0));
+
++ GST_OBJECT_LOCK (videoscale);
++ method = videoscale->method;
++ GST_OBJECT_UNLOCK (videoscale);
++
++ if (!gst_video_scale_transform_supported (videoscale, method, structure))
++ goto format_not_supported;
++
+ gst_structure_set (structure,
+ "width", GST_TYPE_INT_RANGE, 1, G_MAXINT,
+ "height", GST_TYPE_INT_RANGE, 1, G_MAXINT, NULL);
+@@ -452,9 +567,19 @@ gst_video_scale_transform_caps (GstBaseTransform * trans,
+ }
+ gst_caps_append_structure (ret, structure);
+
++done:
++
+ GST_DEBUG_OBJECT (trans, "returning caps: %" GST_PTR_FORMAT, ret);
+
+ return ret;
++
++format_not_supported:
++ {
++ gst_structure_free (structure);
++ gst_caps_unref (ret);
++ ret = gst_caps_new_empty ();
++ goto done;
++ }
+ }
+
+ static gboolean
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-ffmpeg/PKGBUILD b/extra/gstreamer0.10-ffmpeg/PKGBUILD
index fa183d3dc..0f3da5702 100644
--- a/extra/gstreamer0.10-ffmpeg/PKGBUILD
+++ b/extra/gstreamer0.10-ffmpeg/PKGBUILD
@@ -1,29 +1,32 @@
-# $Id: PKGBUILD 198064 2013-10-30 12:34:59Z allan $
+# $Id: PKGBUILD 201497 2013-12-12 23:22:05Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gstreamer0.10-ffmpeg
pkgver=0.10.13
-pkgrel=1.1
+pkgrel=2
pkgdesc="Gstreamer FFMpeg Plugin"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('gstreamer0.10-base' 'bzip2')
-makedepends=('pkgconfig' 'yasm' 'sdl')
+makedepends=('pkgconfig' 'yasm' 'sdl' 'git' 'gtk-doc')
url="http://www.gstreamer.net"
groups=('gstreamer0.10-plugins')
-source=(http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-${pkgver}.tar.bz2)
-sha256sums=('76fca05b08e00134e3cb92fa347507f42cbd48ddb08ed3343a912def187fbb62')
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-ffmpeg#commit=94e587b9182c6d2fde9a61c9def790c8047453c0")
+sha256sums=('SKIP')
build() {
- cd "${srcdir}/gst-ffmpeg-${pkgver}"
- unset CFLAGS
- unset CXXFLAGS
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --with-ffmpeg-extra-configure="--enable-runtime-cpudetect"
+ cd gst-ffmpeg
+ NOCONFIGURE=1 ./autogen.sh
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-static --enable-gtk-doc --with-ffmpeg-extra-configure="--enable-runtime-cpudetect"
make
}
-package() {
- cd "${srcdir}/gst-ffmpeg-${pkgver}"
+check() {
+ cd gst-ffmpeg
+ make check
+}
+package() {
+ cd gst-ffmpeg
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/gstreamer0.10-good/PKGBUILD b/extra/gstreamer0.10-good/PKGBUILD
index 4831eb827..4721a06b2 100644
--- a/extra/gstreamer0.10-good/PKGBUILD
+++ b/extra/gstreamer0.10-good/PKGBUILD
@@ -1,36 +1,36 @@
-# $Id: PKGBUILD 198065 2013-10-30 12:35:19Z allan $
+# $Id: PKGBUILD 201392 2013-12-10 15:08:37Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gstreamer0.10-good
pkgname=('gstreamer0.10-good' 'gstreamer0.10-good-plugins')
pkgver=0.10.31
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
-makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'udev' 'gtk-doc')
+makedepends=('intltool' 'pkgconfig' 'gstreamer0.10-base' 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'bzip2' 'gdk-pixbuf2' 'libpulse' 'jack' 'gtk-doc' 'git' 'cairo')
url="http://gstreamer.freedesktop.org/"
options=(!emptydirs)
-source=(${url}/src/gst-plugins-good/gst-plugins-good-${pkgver}.tar.xz
- linux-3.6.patch)
-sha256sums=('77a8436a7c0a15f876bad29616835046890df2bcaf72da02151bd91e3d292b64'
- 'd14a9ebfdbff69a3dd27057d764ad0c68f62aa6ae9f20bb62a0d09b29c0c2cfe')
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-good#commit=e28fd8886f05bb51c147f871f3a1db2fc2b735a9"
+ test-rtp-payloading.patch)
+sha256sums=('SKIP'
+ 'c2f7f07f9bf5ca3afddc81d0a44665d2d54b1e9aea0ef1b25d219cf34bf7bb29')
prepare() {
- cd "${srcdir}/gst-plugins-good-${pkgver}"
- # https://bugzilla.gnome.org/show_bug.cgi?id=681491
- patch -Np1 -i "${srcdir}/linux-3.6.patch"
+ cd gst-plugins-good
sed -i '/AC_PATH_XTRA/d' configure.ac
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
- ./autogen.sh
+ patch -Np1 -i ../test-rtp-payloading.patch
}
build() {
- cd "${srcdir}/gst-plugins-good-${pkgver}"
+ cd gst-plugins-good
+ NOCONFIGURE=1 ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
--disable-static --enable-experimental \
--disable-schemas-install \
--disable-hal \
--disable-esd \
+ --enable-gtk-doc \
--with-package-name="GStreamer Good Plugins (Parabola)" \
--with-package-origin="https://parabolagnulinux.org/"
@@ -39,7 +39,7 @@ build() {
}
check() {
- cd "${srcdir}/gst-plugins-good-${pkgver}"
+ cd gst-plugins-good
make check
}
@@ -47,20 +47,20 @@ package_gstreamer0.10-good() {
depends=('gstreamer0.10-base>=0.10.34' 'bzip2')
pkgdesc="GStreamer Multimedia Framework Good plugin libraries"
- cd "${srcdir}/gst-plugins-good-${pkgver}"
+ cd gst-plugins-good
make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
rm -rf "${pkgdir}/etc/gconf"
}
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')
+ depends=("gstreamer0.10-good=${pkgver}" 'libavc1394' 'libiec61883' 'aalib' 'libshout' 'libdv' 'flac' 'gconf' 'wavpack' 'taglib' 'libsoup-gnome' 'v4l-utils' 'libcaca' 'libpng' 'libjpeg' 'jack' 'libpulse' 'cairo' 'gdk-pixbuf2')
pkgdesc="GStreamer Multimedia Framework Good Plugins (gst-plugins-good)"
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')
install=gstreamer0.10-good-plugins.install
- cd "${srcdir}/gst-plugins-good-${pkgver}"
+ cd gst-plugins-good
make -C sys DESTDIR="${pkgdir}" install
make -C ext GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
diff --git a/extra/gstreamer0.10-good/linux-3.6.patch b/extra/gstreamer0.10-good/linux-3.6.patch
deleted file mode 100644
index aad179198..000000000
--- a/extra/gstreamer0.10-good/linux-3.6.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 09 Aug 2012 07:35:23 +0000
-Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed
-
-This was unused apparently and removed in the kernel in commit:
-
- From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001
- From: Sakari Ailus <sakari.ailus@iki.fi>
- Date: Wed, 2 May 2012 09:40:03 -0300
- Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT
-
- Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which
- tells the former is valid. The flag is used by no driver currently.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=681491
----
-diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c
-index 2e3a563..5aaed5a 100644
---- a/sys/v4l2/gstv4l2bufferpool.c
-+++ b/sys/v4l2/gstv4l2bufferpool.c
-@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps)
- GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u",
- ret->vbuffer.m.offset);
- GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length);
-- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input);
-
- ret->mmap_length = ret->vbuffer.length;
- data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-good/test-rtp-payloading.patch b/extra/gstreamer0.10-good/test-rtp-payloading.patch
new file mode 100644
index 000000000..e8a943136
--- /dev/null
+++ b/extra/gstreamer0.10-good/test-rtp-payloading.patch
@@ -0,0 +1,422 @@
+From dca42d4767adff3578e5d5990604766735ec1f9b Mon Sep 17 00:00:00 2001
+From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
+Date: Fri, 10 Feb 2012 13:44:43 +0000
+Subject: tests: clean up rtp-payloading test a little
+
+Feed data into the pipeline using appsrc instead of fdsrc and
+a pipe. Store unsigned byte values in guint8 instead of char.
+Getting rid of the capsfilter also helps to avoid 'format is
+not fully specified' warnings when pushing "video/x-h264" data
+into rtph264pay with fully specified h264 caps in the sink template.
+---
+diff --git a/tests/check/elements/rtp-payloading.c b/tests/check/elements/rtp-payloading.c
+index b2160f4..7b4985b 100644
+--- a/tests/check/elements/rtp-payloading.c
++++ b/tests/check/elements/rtp-payloading.c
+@@ -31,13 +31,11 @@
+ typedef struct
+ {
+ GstElement *pipeline;
+- GstElement *fdsrc;
+- GstElement *capsfilter;
++ GstElement *appsrc;
+ GstElement *rtppay;
+ GstElement *rtpdepay;
+ GstElement *fakesink;
+- int fd[2];
+- const char *frame_data;
++ const guint8 *frame_data;
+ int frame_data_size;
+ int frame_count;
+ } rtp_pipeline;
+@@ -140,13 +138,11 @@ rtp_bus_callback (GstBus * bus, GstMessage * message, gpointer data)
+ * The user must free the RTP pipeline when it's not used anymore.
+ */
+ static rtp_pipeline *
+-rtp_pipeline_create (const char *frame_data, int frame_data_size,
++rtp_pipeline_create (const guint8 * frame_data, int frame_data_size,
+ int frame_count, const char *filtercaps, const char *pay, const char *depay)
+ {
+ gchar *pipeline_name;
+-
+ rtp_pipeline *p;
+-
+ GstCaps *caps;
+
+ /* Check parameters. */
+@@ -165,60 +161,39 @@ rtp_pipeline_create (const char *frame_data, int frame_data_size,
+ pipeline_name = g_strdup_printf ("%s-%s-pipeline", pay, depay);
+ p->pipeline = gst_pipeline_new (pipeline_name);
+ g_free (pipeline_name);
+- p->fdsrc = gst_element_factory_make ("fdsrc", NULL);
+- p->capsfilter = gst_element_factory_make ("capsfilter", NULL);
++ p->appsrc = gst_element_factory_make ("appsrc", NULL);
+ p->rtppay = gst_element_factory_make (pay, NULL);
+ p->rtpdepay = gst_element_factory_make (depay, NULL);
+ p->fakesink = gst_element_factory_make ("fakesink", NULL);
+
+ /* One or more elements are not created successfully or failed to create p? */
+- if (!p->pipeline || !p->fdsrc || !p->capsfilter || !p->rtppay || !p->rtpdepay
+- || !p->fakesink || pipe (p->fd) == -1) {
++ if (!p->pipeline || !p->appsrc || !p->rtppay || !p->rtpdepay || !p->fakesink) {
+ /* Release created elements. */
+ RELEASE_ELEMENT (p->pipeline);
+- RELEASE_ELEMENT (p->fdsrc);
+- RELEASE_ELEMENT (p->capsfilter);
++ RELEASE_ELEMENT (p->appsrc);
+ RELEASE_ELEMENT (p->rtppay);
+ RELEASE_ELEMENT (p->rtpdepay);
+ RELEASE_ELEMENT (p->fakesink);
+
+- /* Close pipe. */
+- if (p->fd[0]) {
+- close (p->fd[0]);
+- }
+-
+- if (p->fd[1]) {
+- close (p->fd[1]);
+- }
+-
+ /* Release allocated memory. */
+ free (p);
+
+ return NULL;
+ }
+
+- /* Set fdsrc properties. */
+- g_object_set (p->fdsrc, "fd", p->fd[0], NULL);
+- g_object_set (p->fdsrc, "do-timestamp", TRUE, NULL);
+- g_object_set (p->fdsrc, "blocksize", p->frame_data_size, NULL);
+- g_object_set (p->fdsrc, "num-buffers", p->frame_count * LOOP_COUNT, NULL);
+-
+- /* Set caps filters. */
++ /* Set src properties. */
+ caps = gst_caps_from_string (filtercaps);
+-
+- g_object_set (p->capsfilter, "caps", caps, NULL);
++ g_object_set (p->appsrc, "do-timestamp", TRUE, "caps", caps, NULL);
+ gst_caps_unref (caps);
+
+ /* Add elements to the pipeline. */
+- gst_bin_add (GST_BIN (p->pipeline), p->fdsrc);
+- gst_bin_add (GST_BIN (p->pipeline), p->capsfilter);
++ gst_bin_add (GST_BIN (p->pipeline), p->appsrc);
+ gst_bin_add (GST_BIN (p->pipeline), p->rtppay);
+ gst_bin_add (GST_BIN (p->pipeline), p->rtpdepay);
+ gst_bin_add (GST_BIN (p->pipeline), p->fakesink);
+
+ /* Link elements. */
+- gst_element_link (p->fdsrc, p->capsfilter);
+- gst_element_link (p->capsfilter, p->rtppay);
++ gst_element_link (p->appsrc, p->rtppay);
+ gst_element_link (p->rtppay, p->rtpdepay);
+ gst_element_link (p->rtpdepay, p->fakesink);
+
+@@ -240,15 +215,6 @@ rtp_pipeline_destroy (rtp_pipeline * p)
+ /* Release pipeline. */
+ RELEASE_ELEMENT (p->pipeline);
+
+- /* Close pipe. */
+- if (p->fd[0]) {
+- close (p->fd[0]);
+- }
+-
+- if (p->fd[1]) {
+- close (p->fd[1]);
+- }
+-
+ /* Release allocated memory. */
+ free (p);
+ }
+@@ -260,11 +226,10 @@ rtp_pipeline_destroy (rtp_pipeline * p)
+ static void
+ rtp_pipeline_run (rtp_pipeline * p)
+ {
++ GstFlowReturn flow_ret;
+ GMainLoop *mainloop = NULL;
+-
+ GstBus *bus;
+-
+- gint i;
++ gint i, j;
+
+ /* Check parameters. */
+ if (p == NULL) {
+@@ -286,22 +251,28 @@ rtp_pipeline_run (rtp_pipeline * p)
+ /* Set pipeline to PLAYING. */
+ gst_element_set_state (p->pipeline, GST_STATE_PLAYING);
+
+- /* TODO: Writing may need some changes... */
+-
++ /* Push data into the pipeline */
+ for (i = 0; i < LOOP_COUNT; i++) {
+- const char *frame_data_pointer = p->frame_data;
+- int res;
+- int frame_count = p->frame_count;
+-
+- /* Write in to the pipe. */
+- while (frame_count > 0) {
+- res = write (p->fd[1], frame_data_pointer, p->frame_data_size);
+- fail_unless_equals_int (res, p->frame_data_size);
+- frame_data_pointer += p->frame_data_size;
+- frame_count--;
++ const guint8 *data = p->frame_data;
++
++ for (j = 0; j < p->frame_count; j++) {
++ GstBuffer *buf;
++
++ buf = gst_buffer_new ();
++ GST_BUFFER_DATA (buf) = (guint8 *) data;
++ GST_BUFFER_SIZE (buf) = p->frame_data_size;
++ GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_READONLY);
++
++ g_signal_emit_by_name (p->appsrc, "push-buffer", buf, &flow_ret);
++ fail_unless_equals_int (flow_ret, GST_FLOW_OK);
++ data += p->frame_data_size;
++
++ gst_buffer_unref (buf);
+ }
+ }
+
++ g_signal_emit_by_name (p->appsrc, "end-of-stream", &flow_ret);
++
+ /* Run mainloop. */
+ g_main_loop_run (mainloop);
+
+@@ -350,8 +321,8 @@ rtp_pipeline_enable_lists (rtp_pipeline * p, guint mtu_size)
+ * @use_lists enable buffer lists
+ */
+ static void
+-rtp_pipeline_test (const char *frame_data, int frame_data_size, int frame_count,
+- const char *filtercaps, const char *pay, const char *depay,
++rtp_pipeline_test (const guint8 * frame_data, int frame_data_size,
++ int frame_count, const char *filtercaps, const char *pay, const char *depay,
+ guint bytes_sent, guint mtu_size, gboolean use_lists)
+ {
+ /* Create RTP pipeline. */
+@@ -380,7 +351,7 @@ rtp_pipeline_test (const char *frame_data, int frame_data_size, int frame_count,
+ }
+ }
+
+-static char rtp_ilbc_frame_data[] =
++static const guint8 rtp_ilbc_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -397,7 +368,7 @@ GST_START_TEST (rtp_ilbc)
+ }
+
+ GST_END_TEST;
+-static char rtp_gsm_frame_data[] =
++static const guint8 rtp_gsm_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -414,7 +385,7 @@ GST_START_TEST (rtp_gsm)
+ }
+
+ GST_END_TEST;
+-static char rtp_amr_frame_data[] =
++static const guint8 rtp_amr_frame_data[] =
+ { 0x3c, 0x24, 0x03, 0xb3, 0x48, 0x10, 0x68, 0x46, 0x6c, 0xec, 0x03,
+ 0x7a, 0x37, 0x16, 0x41, 0x41, 0xc0, 0x00, 0x0d, 0xcd, 0x12, 0xed,
+ 0xad, 0x80, 0x00, 0x00, 0x11, 0x31, 0x00, 0x00, 0x0d, 0xa0
+@@ -432,7 +403,7 @@ GST_START_TEST (rtp_amr)
+ }
+
+ GST_END_TEST;
+-static char rtp_pcma_frame_data[] =
++static const guint8 rtp_pcma_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -449,7 +420,7 @@ GST_START_TEST (rtp_pcma)
+ }
+
+ GST_END_TEST;
+-static char rtp_pcmu_frame_data[] =
++static const guint8 rtp_pcmu_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -466,7 +437,7 @@ GST_START_TEST (rtp_pcmu)
+ }
+
+ GST_END_TEST;
+-static char rtp_mpa_frame_data[] =
++static const guint8 rtp_mpa_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -483,7 +454,7 @@ GST_START_TEST (rtp_mpa)
+ }
+
+ GST_END_TEST;
+-static char rtp_h263_frame_data[] =
++static const guint8 rtp_h263_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -495,12 +466,12 @@ static int rtp_h263_frame_count = 1;
+ GST_START_TEST (rtp_h263)
+ {
+ rtp_pipeline_test (rtp_h263_frame_data, rtp_h263_frame_data_size,
+- rtp_h263_frame_count, "video/x-h263,variant=itu,h263version=h263",
++ rtp_h263_frame_count, "video/x-h263,variant=(string)itu,h263version=h263",
+ "rtph263pay", "rtph263depay", 0, 0, FALSE);
+ }
+
+ GST_END_TEST;
+-static char rtp_h263p_frame_data[] =
++static const guint8 rtp_h263p_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -512,12 +483,12 @@ static int rtp_h263p_frame_count = 1;
+ GST_START_TEST (rtp_h263p)
+ {
+ rtp_pipeline_test (rtp_h263p_frame_data, rtp_h263p_frame_data_size,
+- rtp_h263p_frame_count, "video/x-h263,variant=itu", "rtph263ppay",
++ rtp_h263p_frame_count, "video/x-h263,variant=(string)itu", "rtph263ppay",
+ "rtph263pdepay", 0, 0, FALSE);
+ }
+
+ GST_END_TEST;
+-static char rtp_h264_frame_data[] =
++static const guint8 rtp_h264_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -528,13 +499,14 @@ static int rtp_h264_frame_count = 1;
+
+ GST_START_TEST (rtp_h264)
+ {
++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */
+ rtp_pipeline_test (rtp_h264_frame_data, rtp_h264_frame_data_size,
+ rtp_h264_frame_count, "video/x-h264", "rtph264pay", "rtph264depay",
+ 0, 0, FALSE);
+ }
+
+ GST_END_TEST;
+-static char rtp_h264_list_lt_mtu_frame_data[] =
++static const guint8 rtp_h264_list_lt_mtu_frame_data[] =
+ /* not packetized, next NAL starts with 0001 */
+ { 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
+@@ -552,6 +524,7 @@ static int rtp_h264_list_lt_mtu_mtu_size = 1024;
+
+ GST_START_TEST (rtp_h264_list_lt_mtu)
+ {
++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */
+ rtp_pipeline_test (rtp_h264_list_lt_mtu_frame_data,
+ rtp_h264_list_lt_mtu_frame_data_size, rtp_h264_list_lt_mtu_frame_count,
+ "video/x-h264", "rtph264pay", "rtph264depay",
+@@ -559,7 +532,7 @@ GST_START_TEST (rtp_h264_list_lt_mtu)
+ }
+
+ GST_END_TEST;
+-static char rtp_h264_list_gt_mtu_frame_data[] =
++static const guint8 rtp_h264_list_gt_mtu_frame_data[] =
+ /* not packetized, next NAL starts with 0001 */
+ { 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+@@ -580,6 +553,7 @@ static int rtp_h264_list_gt_mtu_mty_size = 28;
+
+ GST_START_TEST (rtp_h264_list_gt_mtu)
+ {
++ /* FIXME 0.11: fully specify h264 caps (and make payloader check) */
+ rtp_pipeline_test (rtp_h264_list_gt_mtu_frame_data,
+ rtp_h264_list_gt_mtu_frame_data_size, rtp_h264_list_gt_mtu_frame_count,
+ "video/x-h264", "rtph264pay", "rtph264depay",
+@@ -587,7 +561,7 @@ GST_START_TEST (rtp_h264_list_gt_mtu)
+ }
+
+ GST_END_TEST;
+-static char rtp_L16_frame_data[] =
++static const guint8 rtp_L16_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -605,7 +579,7 @@ GST_START_TEST (rtp_L16)
+ }
+
+ GST_END_TEST;
+-static char rtp_mp2t_frame_data[] =
++static const guint8 rtp_mp2t_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -622,7 +596,7 @@ GST_START_TEST (rtp_mp2t)
+ }
+
+ GST_END_TEST;
+-static char rtp_mp4v_frame_data[] =
++static const guint8 rtp_mp4v_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -639,7 +613,7 @@ GST_START_TEST (rtp_mp4v)
+ }
+
+ GST_END_TEST;
+-static char rtp_mp4v_list_frame_data[] =
++static const guint8 rtp_mp4v_list_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -659,7 +633,7 @@ GST_START_TEST (rtp_mp4v_list)
+ }
+
+ GST_END_TEST;
+-static char rtp_mp4g_frame_data[] =
++static const guint8 rtp_mp4g_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -677,7 +651,7 @@ GST_START_TEST (rtp_mp4g)
+ }
+
+ GST_END_TEST;
+-static char rtp_theora_frame_data[] =
++static const guint8 rtp_theora_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -694,7 +668,7 @@ GST_START_TEST (rtp_theora)
+ }
+
+ GST_END_TEST;
+-static char rtp_vorbis_frame_data[] =
++static const guint8 rtp_vorbis_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+@@ -711,7 +685,7 @@ GST_START_TEST (rtp_vorbis)
+ }
+
+ GST_END_TEST;
+-static char rtp_jpeg_frame_data[] =
++static const guint8 rtp_jpeg_frame_data[] =
+ { /* SOF */ 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08,
+ 0x03, 0x00, 0x21, 0x08, 0x01, 0x11, 0x08, 0x02, 0x11, 0x08,
+ /* DQT */ 0xFF, 0xDB, 0x00, 0x43, 0x08,
+@@ -738,7 +712,7 @@ GST_START_TEST (rtp_jpeg)
+ }
+
+ GST_END_TEST;
+-static char rtp_jpeg_list_frame_data[] =
++static const guint8 rtp_jpeg_list_frame_data[] =
+ { /* SOF */ 0xFF, 0xC0, 0x00, 0x11, 0x08, 0x00, 0x08, 0x00, 0x08,
+ 0x03, 0x00, 0x21, 0x08, 0x01, 0x11, 0x08, 0x02, 0x11, 0x08,
+ /* DQT */ 0xFF, 0xDB, 0x00, 0x43, 0x08,
+@@ -767,7 +741,7 @@ GST_START_TEST (rtp_jpeg_list)
+ }
+
+ GST_END_TEST;
+-static char rtp_g729_frame_data[] =
++static const guint8 rtp_g729_frame_data[] =
+ { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ };
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD
index 0ba48c793..583ca4c8f 100644
--- a/extra/gstreamer0.10-ugly/PKGBUILD
+++ b/extra/gstreamer0.10-ugly/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 198067 2013-10-30 12:36:02Z allan $
+# $Id: PKGBUILD 201394 2013-12-10 15:34:19Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gstreamer0.10-ugly
pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins')
pkgver=0.10.19
-pkgrel=6
+pkgrel=8
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')
+makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr' 'gtk-doc' 'git')
url="http://gstreamer.freedesktop.org/"
-source=(${url}/src/gst-plugins-ugly/gst-plugins-ugly-${pkgver}.tar.xz
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-ugly#commit=d637756a8e569753e9869c2c0728288f5dbc5089"
opencore-amr.patch
cdio-cd-text-api.patch)
-md5sums=('ba26045c8c8c91f0d48d327ccf53ac0c'
+md5sums=('SKIP'
'd8feb6c99bfaff8be6b2c48ea4e98e47'
'6c1c665f864387f3a77d32231fedeaab')
+prepare() {
+ cd gst-plugins-ugly
+ patch -Np0 -i ../opencore-amr.patch
+ patch -Np1 -i ../cdio-cd-text-api.patch
+ sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
+}
+
build() {
- cd "${srcdir}/gst-plugins-ugly-${pkgver}"
- patch -Np0 -i "${srcdir}/opencore-amr.patch"
- patch -Np1 -i "${srcdir}/cdio-cd-text-api.patch"
+ cd gst-plugins-ugly
+ NOCONFIGURE=1 ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --enable-experimental \
+ --disable-static --enable-experimental --enable-gtk-doc \
--with-package-name="GStreamer Ugly Plugins (Parabola GNU/Linux-libre)" \
--with-package-origin="https://parabolagnulinux.org/"
make
@@ -29,7 +35,7 @@ build() {
}
check() {
- cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+ cd gst-plugins-ugly
make check
}
@@ -37,7 +43,7 @@ package_gstreamer0.10-ugly() {
pkgdesc="GStreamer Multimedia Framework Ugly plugin libraries"
depends=('gstreamer0.10-base>=0.10.34')
- cd "${srcdir}/gst-plugins-ugly-${pkgver}"
+ cd gst-plugins-ugly
make DESTDIR="${pkgdir}" install
}
@@ -48,6 +54,6 @@ package_gstreamer0.10-ugly-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}"
+ cd gst-plugins-ugly
make -C ext DESTDIR="${pkgdir}" install
}
diff --git a/extra/gstreamer0.10/PKGBUILD b/extra/gstreamer0.10/PKGBUILD
index ddd359dc0..acaebc2fa 100644
--- a/extra/gstreamer0.10/PKGBUILD
+++ b/extra/gstreamer0.10/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198061 2013-10-30 12:33:54Z allan $
+# $Id: PKGBUILD 201380 2013-12-10 10:18:42Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=gstreamer0.10
pkgver=0.10.36
-pkgrel=2
+pkgrel=3
pkgdesc="GStreamer Multimedia Framework"
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
@@ -11,15 +11,21 @@ url="http://gstreamer.com"
depends=('libxml2' 'glib2')
optdepends=('sh: feedback script')
makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection' 'git')
-source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=ce96cff8e2bf1772dc330387fa98e94f187fc2ab"
- tests-remove-silly-test_fail_abstract_new-check.patch)
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gstreamer#commit=3ddc31eaa18c3be1613e43430eca78a3e445639e"
+ tests-remove-silly-test_fail_abstract_new-check.patch
+ bison3.patch)
sha256sums=('SKIP'
- 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52')
+ 'd3d3f4f04453831fdb4244bfe174a38c4e6f9f4da5c8c9050dcfa1a6097aad52'
+ 'ed154e280abf59b24d98a8ab0fe868b449b26aa61f7ae3813fab8ac615fcaefa')
-build() {
- cd "${srcdir}/gstreamer"
+prepare() {
+ cd gstreamer
patch -Np1 -i ../tests-remove-silly-test_fail_abstract_new-check.patch
+ patch -Np1 -i ../bison3.patch
sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
+}
+build() {
+ cd gstreamer
NOCONFIGURE=1 ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib \
--with-package-name="GStreamer (Parabola)" \
@@ -29,12 +35,12 @@ build() {
}
check() {
- cd "${srcdir}/gstreamer"
+ cd gstreamer
make check
}
package() {
- cd "${srcdir}/gstreamer"
+ cd gstreamer
make DESTDIR="${pkgdir}" install
#Remove unversioned gst-* binaries to get rid of conflicts
diff --git a/extra/gstreamer0.10/bison3.patch b/extra/gstreamer0.10/bison3.patch
new file mode 100644
index 000000000..4f4f52111
--- /dev/null
+++ b/extra/gstreamer0.10/bison3.patch
@@ -0,0 +1,31 @@
+From bd2a01cfe222367493a71f3269f12250c8972db0 Mon Sep 17 00:00:00 2001
+From: Kerrick Staley <kerrick@kerrickstaley.com>
+Date: Wed, 21 Aug 2013 06:59:29 +0000
+Subject: parse: make grammar.y work with Bison 3
+
+YYLEX_PARAM is no longer supported in Bison 3.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=706462
+---
+diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y
+index 8a9019c..f533389 100644
+--- a/gst/parse/grammar.y
++++ b/gst/parse/grammar.y
+@@ -26,7 +26,6 @@
+ */
+
+ #define YYERROR_VERBOSE 1
+-#define YYLEX_PARAM scanner
+
+ #define YYENABLE_NLS 0
+
+@@ -659,6 +658,7 @@ static int yyerror (void *scanner, graph_t *graph, const char *s);
+ %right '.'
+ %left '!' '='
+
++%lex-param { void *scanner }
+ %parse-param { void *scanner }
+ %parse-param { graph_t *graph }
+ %pure-parser
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gthumb/PKGBUILD b/extra/gthumb/PKGBUILD
index c22e4f301..1d4db805a 100644
--- a/extra/gthumb/PKGBUILD
+++ b/extra/gthumb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198069 2013-10-30 12:36:47Z allan $
+# $Id: PKGBUILD 202999 2013-12-30 22:49:00Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Tobias Kieslich <tobias@justdreams.de>
pkgname=gthumb
-pkgver=3.2.4
+pkgver=3.2.6
pkgrel=1
pkgdesc="Image browser and viewer for the GNOME Desktop"
arch=(i686 x86_64 mips64el)
@@ -22,7 +22,7 @@ optdepends=('libopenraw: read RAW files'
options=('!emptydirs')
install=gthumb.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('0b94e7317911334c80fce5116970186963419fd0c25eed4ecca2a4ddcc968177')
+sha256sums=('6c7dbd574f720ec308f8a76354cdf254598b820b2ce8fe73209fb0aec17f757e')
prepare() {
cd $pkgname-$pkgver
diff --git a/extra/gtk-vnc/PKGBUILD b/extra/gtk-vnc/PKGBUILD
index f44c7b0d6..ed721437a 100644
--- a/extra/gtk-vnc/PKGBUILD
+++ b/extra/gtk-vnc/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 198085 2013-10-30 12:42:46Z allan $
+# $Id: PKGBUILD 200822 2013-12-06 03:01:44Z eric $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <mcrae_allan@hotmail.com>
# Contributor: lp76 <l.peduto@gmail.com>
pkgname=gtk-vnc
-pkgver=0.5.2
-pkgrel=2
+pkgver=0.5.3
+pkgrel=1
pkgdesc="A VNC viewer widget for GTK"
arch=('i686' 'x86_64' 'mips64el')
-url="http://live.gnome.org/gtk-vnc"
+url="https://wiki.gnome.org/Projects/gtk-vnc"
license=('LGPL')
depends=('libgcrypt' 'gtk3')
optdepends=('gtk2: GTK2 widget')
makedepends=('intltool' 'pygtk' 'pygobject2-devel' 'gtk-doc' 'gtk2' 'vala' 'gobject-introspection')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('b51bda7edebb82ab142c292bd1b1493406bc8225a5c834d854bbafef9e9a471f')
+sha256sums=('d490a6c8f40e550d43aef0043ce3bec498ec220d5eb3dc5cdcff8fd561149caf')
build() {
rm -rf gtk2-build gtk3-build
diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD
index 819910bd3..bc7c1f060 100644
--- a/extra/gtk3/PKGBUILD
+++ b/extra/gtk3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198071 2013-10-30 12:37:29Z allan $
+# $Id: PKGBUILD 200800 2013-12-05 17:20:20Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=gtk3
-pkgver=3.10.2
+pkgver=3.10.6
pkgrel=1
pkgdesc="GObject-based multi-platform GUI toolkit (v3)"
arch=(i686 x86_64 mips64el)
@@ -17,11 +17,14 @@ optdepends=('gnome-themes-standard: Default widget theme'
license=(LGPL)
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
settings.ini)
-sha256sums=('93af12d28e5f6ccc373ea59f31147e2884c9b3c15dc4841ce3b5cee45b13814c'
+sha256sums=('3c24c57fc5cb7a5ea39d3a3ff7b12be63d7f21a52fd6f20f7b983e19b7b0268a'
'14369dfd1d325c393e17c105d5d5cc5501663277bd4047ea04a50abb3cfbd119')
prepare() {
cd "gtk+-$pkgver"
+
+ # protocols too new; made with a wayland from git, not 1.3.0
+ rm gdk/wayland/gtk-shell-{client-protocol.h,protocol.c}
}
build() {
diff --git a/extra/gucharmap/PKGBUILD b/extra/gucharmap/PKGBUILD
index 10d7a06c5..8918560d1 100644
--- a/extra/gucharmap/PKGBUILD
+++ b/extra/gucharmap/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198088 2013-10-30 12:43:49Z allan $
+# $Id: PKGBUILD 199398 2013-11-11 22:33:46Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan De Groot <jgc@archlinux.org>
pkgname=gucharmap
-pkgver=3.10.0
+pkgver=3.10.1
pkgrel=1
pkgdesc="Gnome Unicode Charmap"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ options=('!emptydirs')
groups=(gnome)
install=gucharmap.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('a0447b5dd13e3364c5ca9bacb1f7387043d664effd64980e400c5b3d7301b617')
+sha256sums=('04e8606c65adb14d267b50b1cf9eb4fee92bd9c5ab512a346bd4c9c686403f78')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gupnp-av/PKGBUILD b/extra/gupnp-av/PKGBUILD
index 703a85af0..1f59f948c 100644
--- a/extra/gupnp-av/PKGBUILD
+++ b/extra/gupnp-av/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198092 2013-10-30 12:45:19Z allan $
+# $Id: PKGBUILD 199920 2013-11-19 00:13:08Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Thijs Vermeir <thijsvermeir@gmail.com>
# Contributor: Denis Zawada <deno@rootnode.net>
pkgname=gupnp-av
-pkgver=0.12.3
+pkgver=0.12.4
pkgrel=1
pkgdesc="Library to ease handling and implementation of UPnP A/V profiles"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=(LGPL)
depends=(gupnp)
makedepends=(gobject-introspection gtk-doc vala)
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('fa37325ee8aa22909131eedff871b61ccd183b66c7770c147a0d4c34b83bbf02')
+sha256sums=('548a9cef8ab3007734e20a4ce284c422ae299b7e024a4824299f6ae7e3dd7a5b')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gupnp/PKGBUILD b/extra/gupnp/PKGBUILD
index 1c04627ee..3da64d2e7 100644
--- a/extra/gupnp/PKGBUILD
+++ b/extra/gupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198637 2013-10-31 15:45:29Z heftig $
+# $Id: PKGBUILD 201545 2013-12-14 15:50:45Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: György Balló <ballogy@freestart.hu>
pkgname=gupnp
-pkgver=0.20.8
+pkgver=0.20.9
pkgrel=1
pkgdesc="An object-oriented UPNP framework"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=(gssdp util-linux)
makedepends=(gobject-introspection gtk-doc vala)
optdepends=('python2: gupnp-binding-tool')
source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('f70da127e0d35a7b8aecaf6f58b740bbb56836451be33d7aeb7979a5c131eac8')
+sha256sums=('61650a3be46979973b82c79eab5c3baf16a4ad3a051d8a710e5d1c376cf32c6e')
build() {
cd $pkgname-$pkgver
diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD
index 1eb1dd97a..2cb265268 100644
--- a/extra/gvfs/PKGBUILD
+++ b/extra/gvfs/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198095 2013-10-30 12:46:31Z allan $
+# $Id: PKGBUILD 199075 2013-11-08 14:49:13Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=gvfs
pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-goa' 'gvfs-mtp')
-pkgver=1.18.2
+pkgver=1.18.3
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
makedepends=('avahi' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray')
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('a24ce342a3369f7ec34f19deadc5da46bf51070d39d8733f0848d9ba4bb55da7')
+sha256sums=('1d829716dcf1c5c016ee0c8aaff4cfd4fc4c719a4125f5c4f206f26c5bdc472c')
build() {
cd "$pkgbase-$pkgver"
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 1fd370d1c..ee811c27e 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198735 2013-11-02 15:15:10Z heftig $
+# $Id: PKGBUILD 200683 2013-12-02 11:18:15Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=(harfbuzz)
pkgname=(harfbuzz harfbuzz-icu)
-pkgver=0.9.23
+pkgver=0.9.24
pkgrel=1
pkgdesc="OpenType text shaping engine"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ url="http://www.freedesktop.org/wiki/Software/HarfBuzz"
license=(MIT)
makedepends=(glib2 freetype2 graphite cairo icu gobject-introspection)
source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgbase}-${pkgver}.tar.bz2)
-sha256sums=('171ab7f58e7243082a4582f4d1f21b3f44462931ea92a6909d303ad3614794c7')
+sha256sums=('edf25dd8a318acdeacd2aeade2387db23c109fec0da626f2127f43917a372422')
build() {
cd $pkgbase-$pkgver
diff --git a/extra/haskell-parsec/PKGBUILD b/extra/haskell-parsec/PKGBUILD
index 2b8284f13..613897c4d 100644
--- a/extra/haskell-parsec/PKGBUILD
+++ b/extra/haskell-parsec/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 199158 2013-11-08 18:16:08Z eric $
# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
_hkgname=parsec
@@ -11,7 +12,7 @@ arch=('i686' 'x86_64')
depends=('ghc=7.6.3-1' 'sh' 'haskell-mtl=2.1.2-3' 'haskell-text=0.11.2.3-3')
source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
install=${pkgname}.install
-options('staticlibs')
+options=('staticlibs')
md5sums=('d72fc94b81153132c61125a1ec52a4a5')
build() {
diff --git a/community/haveged/PKGBUILD b/extra/haveged/PKGBUILD
index e764207f8..55a8d59b4 100644
--- a/community/haveged/PKGBUILD
+++ b/extra/haveged/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100564 2013-11-05 21:52:50Z heftig $
+# $Id: PKGBUILD 199016 2013-11-06 11:28:54Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
# Contributor: kfgz <kfgz at interia dot pl>
# Contributor: pootzko <pootzko at gmail dot com>
diff --git a/extra/haveged/cleanexit.patch b/extra/haveged/cleanexit.patch
new file mode 100644
index 000000000..01f8c7f94
--- /dev/null
+++ b/extra/haveged/cleanexit.patch
@@ -0,0 +1,21 @@
+diff -u -r haveged-1.7c/src/haveged.c haveged-1.7c-cleanexit/src/haveged.c
+--- haveged-1.7c/src/haveged.c 2013-01-12 19:20:04.000000000 +0100
++++ haveged-1.7c-cleanexit/src/haveged.c 2013-11-05 22:40:22.202935493 +0100
+@@ -642,7 +642,16 @@
+ static void tidy_exit( /* OUT: nothing */
+ int signum) /* IN: signal number */
+ {
+- error_exit("Stopping due to signal %d\n", signum);
++#ifndef NO_DAEMON
++ if (params->detached!=0) {
++ unlink(params->pid_file);
++ syslog(LOG_INFO, "%s Stopping due to signal %d", params->daemon, signum);
++ }
++ else
++#endif
++ fprintf(stderr, "%s Stopping due to signal %d\n", params->daemon, signum);
++ havege_destroy(handle);
++ exit(0);
+ }
+ /**
+ * send usage display to stderr
diff --git a/community/haveged/service b/extra/haveged/service
index 676fb1893..676fb1893 100644
--- a/community/haveged/service
+++ b/extra/haveged/service
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index d632332e4..528d1f6f3 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198592 2013-10-30 16:39:01Z bisson $
+# $Id: PKGBUILD 201259 2013-12-07 10:34:58Z bpiotrowski $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Tobias Kieslich <tobias@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=hugin
pkgver=2013.0.0
-pkgrel=2
+pkgrel=3
pkgdesc='Panorama photo stitcher'
url='http://hugin.sourceforge.net/'
license=('GPL')
diff --git a/extra/hwloc/PKGBUILD b/extra/hwloc/PKGBUILD
index 27767cc6c..cbb1b7822 100644
--- a/extra/hwloc/PKGBUILD
+++ b/extra/hwloc/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197744 2013-10-29 02:18:00Z eric $
+# $Id: PKGBUILD 200289 2013-11-24 22:34:03Z eric $
# Maintainer : Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Sylvain HENRY <hsyl20@yahoo.fr>
# Contributor: Hervé YVIQUEL <elldekaa@gmail.com>
pkgname=hwloc
-pkgver=1.7.2
+pkgver=1.8
pkgrel=1
pkgdesc="Portable Hardware Locality is a portable abstraction of hierarchical architectures"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ url="http://www.open-mpi.org/projects/hwloc/"
license=('BSD')
depends=('sh' 'pciutils' 'cairo' 'libxml2')
options=('!docs')
-source=(http://www.open-mpi.org/software/hwloc/v${pkgver%.*}/downloads/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('bcd7d71e038af6e1f06a233fdf1c00739033e128')
+source=(http://www.open-mpi.org/software/hwloc/v${pkgver}/downloads/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('548a0d111775bceca9f1388d1d03e86a209ed6a8')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/icewm/PKGBUILD b/extra/icewm/PKGBUILD
index 290f16ec2..4f8b7adc2 100644
--- a/extra/icewm/PKGBUILD
+++ b/extra/icewm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160075 2012-05-29 22:01:31Z eric $
+# $Id: PKGBUILD 199904 2013-11-18 16:10:20Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=icewm
-pkgver=1.3.7
-pkgrel=3.1 # only change when Arch updates
+pkgver=1.3.8
+pkgrel=1
pkgdesc="A Window Manager designed for speed, usability, and consistency"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.icewm.org/"
@@ -11,28 +11,26 @@ license=('LGPL')
depends=('libxrandr' 'libxft' 'libsm' 'libxinerama' 'gdk-pixbuf2')
makedepends=('xorg-mkfontdir')
source=(http://downloads.sourceforge.net/sourceforge/icewm/${pkgname}-${pkgver}.tar.gz
- use_ICEWM_deprecated.patch ignore_workarea_hints.patch no_proc_acpi.patch
- wmclient.patch icewm-cpustatus.patch)
-sha1sums=('ce8d86190e275dc7db2d8c28472a579264120803'
- 'ac8f352ba5ee33e19ce75fdeed890361550e125a'
- '49ca37ae41290f17a71a177b1f774235f91d79f1'
- 'a47fb4191f30b8f42a6bd90ca5d7941bb3d65338'
- 'd16b4b3ab269a657e735e343833973d000c0b35b'
+ ignore_workarea_hints.patch icewm-cpustatus.patch)
+sha1sums=('dc9155227129be14aced00c24c572356e0fa5cd8'
+ '88b4b198827d6590901c2c8bdba8826d928f6f1a'
'0f4a02153496dadd26742f6bd3bdc166d7eafaed')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/use_ICEWM_deprecated.patch"
+prepare() {
+ cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}/ignore_workarea_hints.patch"
- patch -p1 -i "${srcdir}/no_proc_acpi.patch"
- patch -p1 -i "${srcdir}/wmclient.patch"
patch -p2 -i "${srcdir}/icewm-cpustatus.patch"
- LIBS+="-lfontconfig" ./configure --build=$CHOST --prefix=/usr --sysconfdir=/etc \
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --build=$CHOST \
--enable-shaped-decorations --enable-gradients
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install install-man install-docs install-desktop
}
diff --git a/extra/icewm/ignore_workarea_hints.patch b/extra/icewm/ignore_workarea_hints.patch
index 99ffa4a28..df0a2a502 100644
--- a/extra/icewm/ignore_workarea_hints.patch
+++ b/extra/icewm/ignore_workarea_hints.patch
@@ -3,9 +3,9 @@ Index: icewm-1.3.7/src/wmapp.cc
--- icewm-1.3.7.orig/src/wmapp.cc 2010-10-31 15:09:36.000000000 +0100
+++ icewm-1.3.7/src/wmapp.cc 2012-01-15 17:01:47.284927292 +0100
@@ -187,7 +187,6 @@
- _XA_NET_ACTIVE_WINDOW,
_XA_NET_CLOSE_WINDOW,
_XA_NET_WM_STRUT,
+ _XA_NET_WM_STRUT_PARTIAL,
- _XA_NET_WORKAREA,
_XA_NET_WM_STATE,
_XA_NET_WM_STATE_MAXIMIZED_VERT,
diff --git a/extra/icewm/no_proc_acpi.patch b/extra/icewm/no_proc_acpi.patch
deleted file mode 100644
index 4cd92360c..000000000
--- a/extra/icewm/no_proc_acpi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Check for sysfs' acpi file, procfs may not contain acpi data with recent kernels
-Author: Andrey Danin <danindrey@mail.ru>, Eduard Bloch <blade@debian.org>
-Bug: http://sourceforge.net/mailarchive/forum.php?thread_name=E1SHwYx-00029t-1N.danindrey-mail-ru%40f232.mail.ru&forum_name=icewm-devel
-Forwarded: Yes
-
-Index: icewm-1.3.7/src/wmtaskbar.cc
-===================================================================
---- icewm-1.3.7.orig/src/wmtaskbar.cc 2010-10-31 15:09:36.000000000 +0100
-+++ icewm-1.3.7/src/wmtaskbar.cc 2012-04-11 23:22:23.466564372 +0200
-@@ -467,6 +467,7 @@
- #endif
- #ifdef CONFIG_APPLET_APM
- if (taskBarShowApm && (access(APMDEV, 0) == 0 ||
-+ access("/sys/class/power_supply", 0) == 0 ||
- access("/proc/acpi", 0) == 0 ||
- access("/dev/acpi", 0) == 0 ||
- access("/proc/pmu", R_OK|X_OK) == 0))
diff --git a/extra/icewm/use_ICEWM_deprecated.patch b/extra/icewm/use_ICEWM_deprecated.patch
deleted file mode 100644
index 3533d31e3..000000000
--- a/extra/icewm/use_ICEWM_deprecated.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Don't use "deprecated" as identifier, will FTBFS if another
- library defines functions as deprecated.
-Author: Andreas Moog <amoog@ubuntu.com>
-Bug: https://sourceforge.net/tracker/?func=detail&aid=3494034&group_id=31&atid=100031
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/935179
-Forwarded: Yes
-
---- icewm-1.3.7.orig/src/base.h
-+++ icewm-1.3.7/src/base.h
-@@ -2,9 +2,9 @@
- #define __BASE_H
-
- #if ( __GNUC__ == 3 && __GNUC_MINOR__ > 0 ) || __GNUC__ > 3
--#define deprecated __attribute__((deprecated))
-+#define ICEWM_deprecated __attribute__((deprecated))
- #else
--#define deprecated
-+#define ICEWM_deprecated
- #endif
-
- /*** Atomar Data Types ********************************************************/
diff --git a/extra/icewm/wmclient.patch b/extra/icewm/wmclient.patch
deleted file mode 100644
index 95f00614d..000000000
--- a/extra/icewm/wmclient.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -uNr icewm-1.3.7.orig/src/wmclient.cc icewm-1.3.7/src/wmclient.cc
---- icewm-1.3.7.orig/src/wmclient.cc 2012-05-27 11:54:25.663101746 +0200
-+++ icewm-1.3.7/src/wmclient.cc 2012-05-27 12:17:40.236339580 +0200
-@@ -1044,20 +1044,11 @@
- while (XGetWindowProperty(display, handle,
- propAtom, (itemCount * itemSize) / 32, 1024*32, False, AnyPropertyType,
- &r_type, &r_format, &nitems, &bytes_remain,
-- &prop) == Success && prop && bytes_remain == 0)
-+ &prop) == Success && prop)
- {
- if (r_format == itemSize1 && nitems > 0) {
- data = realloc(data, (itemCount + nitems) * itemSize / 8);
-
-- // access to memory beyound 256MiB causes crashes! But anyhow, size
-- // >>2MiB looks suspicious. Detect this case ASAP. However, if
-- // the usable icon is somewhere in the beginning, it's okay to
-- // return truncated data.
-- if (itemCount * itemSize / 8 >= 2097152) {
-- XFree(prop);
-- break;
-- }
--
- memcpy((char *)data + itemCount * itemSize / 8, prop, nitems * itemSize / 8);
- itemCount += nitems;
- XFree(prop);
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 1e30e166c..df6809ea9 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198752 2013-11-03 00:30:32Z eric $
+# $Id: PKGBUILD 201665 2013-12-17 20:27:22Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.8.7.4
-pkgrel=2
+pkgver=6.8.7.10
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://www.imagemagick.org/"
license=('custom')
@@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz{,.asc} \
perlmagick.rpath.patch)
-sha1sums=('88e936a1738967d078a9500f430e9017400a05e9'
+sha1sums=('a74ebac95fb592e98cbe33e25c05978590807c57'
'SKIP'
'e143cf9d530fabf3b58023899b5cc544ba93daec')
@@ -37,18 +37,19 @@ build() {
--with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \
--enable-opencl --without-gvc --without-djvu --without-autotrace \
--without-jbig --without-fpx --without-dps --without-fftw $EXTRAOPTS
- make
+ make
}
check() {
cd ImageMagick-${pkgver%.*}-${pkgver##*.}
-# make check
+ make check
}
package_imagemagick() {
pkgdesc="An image viewing/manipulation program"
- depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr')
- optdepends=('ghostscript: for Ghostscript support'
+ depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr' 'libcl')
+ optdepends=('imagemagick-doc: for additional information'
+ 'ghostscript: for Ghostscript support'
'openexr: for OpenEXR support'
'libwmf: for WMF support'
'librsvg: for SVG support'
diff --git a/extra/imake/PKGBUILD b/extra/imake/PKGBUILD
index ed2f84bff..110f34ffd 100644
--- a/extra/imake/PKGBUILD
+++ b/extra/imake/PKGBUILD
@@ -1,41 +1,52 @@
-# $Id: PKGBUILD 191324 2013-07-23 16:42:27Z jgc $
+# $Id: PKGBUILD 201359 2013-12-09 12:44:37Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=imake
pkgver=1.0.6
-pkgrel=1
+pkgrel=2
pkgdesc="X.Org imake program and related utilities"
arch=('i686' 'x86_64' 'mips64el')
url="http://xorg.freedesktop.org/"
license=('custom')
depends=('glibc')
-makedepends=('pkgconfig' 'xproto' 'perl')
+makedepends=('pkgconfig' 'xproto' 'perl' 'xorg-util-macros' 'xorg-font-util')
optdepends=('perl: for mkhtmlindex')
-source=("http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2"
- 'http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2'
- 'http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2'
- 'http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2'
- 'http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2'
- 'linuxconfig.patch'
- 'LICENSE')
+source=(http://xorg.freedesktop.org/releases/individual/util/imake-${pkgver}.tar.bz2
+ http://xorg.freedesktop.org/releases/individual/util/gccmakedep-1.0.2.tar.bz2
+ http://xorg.freedesktop.org/releases/individual/util/lndir-1.0.3.tar.bz2
+ http://xorg.freedesktop.org/releases/individual/util/makedepend-1.0.5.tar.bz2
+ http://xorg.freedesktop.org/releases/individual/util/xorg-cf-files-1.0.5.tar.bz2
+ gccmakedep-cpp-4.8-compat.patch
+ imake-cpp-4.8-compat.patch
+ linuxconfig.patch
+ LICENSE)
sha1sums=('a54c025d7ac9894b6bc919d13454c6adb12ae140'
'a3d971a507a460233afd8ed46e9f06135fed634d'
'fc71a6ff2cc0a1065cfb608796ffd6b4f0ce76fe'
'2599afa039d2070bae9df6ce43da288b3a4adf97'
'ae22eb81d56d018f0b3b149f70965ebfef2385fd'
+ 'ef7bb90e30ce35131d049f45b650cd0cf6dc0a20'
+ '24f87a945307d4336ab2afd5cade683f0e94533c'
'72f2d4cc4d4cc5f85ba6982718ae1bbb7e56e0d0'
'c5ecffb25ad079ba3858e3aec047d046df603a89')
prepare() {
cd xorg-cf-files-1.0.5
- patch -p1 -i "${srcdir}/linuxconfig.patch"
+ patch -p1 -i ../linuxconfig.patch
+
+ cd ../imake-1.0.6
+ patch -Np1 -i ../imake-cpp-4.8-compat.patch
+
+ cd ../gccmakedep-1.0.2
+ patch -Np1 -i ../gccmakedep-cpp-4.8-compat.patch
}
build() {
for i in *; do
if [ -d "${i}" ]; then
pushd "${i}"
+ autoreconf -fi
./configure --prefix=/usr --mandir=/usr/share/man
make
popd
diff --git a/extra/imake/gccmakedep-cpp-4.8-compat.patch b/extra/imake/gccmakedep-cpp-4.8-compat.patch
new file mode 100644
index 000000000..0e5302a83
--- /dev/null
+++ b/extra/imake/gccmakedep-cpp-4.8-compat.patch
@@ -0,0 +1,8 @@
+--- gccmakedep-1.0.2/cpprules.in.orig 2013-12-09 12:24:06.246894574 +0000
++++ gccmakedep-1.0.2/cpprules.in 2013-12-09 12:24:44.806641603 +0000
+@@ -23,4 +23,4 @@
+ -e '/\@\@$$/s/\@\@$$/\\/'
+
+ .cpp:
+- $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
++ $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
diff --git a/extra/imake/imake-cpp-4.8-compat.patch b/extra/imake/imake-cpp-4.8-compat.patch
new file mode 100644
index 000000000..45e9ca305
--- /dev/null
+++ b/extra/imake/imake-cpp-4.8-compat.patch
@@ -0,0 +1,19 @@
+--- imake-1.0.6/Makefile.am.orig 2013-12-09 12:21:18.374675219 +0000
++++ imake-1.0.6/Makefile.am 2013-12-09 12:21:53.367776337 +0000
+@@ -76,13 +76,13 @@
+ $(MKHTMLINDEX)
+
+ xmkmf: xmkmf.cpp
+- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' < $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DCONFIGDIRSPEC='"-I$(XCONFDIR)"' $(srcdir)/xmkmf.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
+
+ ccmakedep: mdepend.cpp
+- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' < $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DPREPROC='"$(PREPROCESSCMD_MKDEPEND)"' $(srcdir)/mdepend.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
+
+ mergelib: mergelib.cpp
+- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" < $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) -DARCMD="$(ARCMD)" -DRANLIB="$(RANLIB)" $(srcdir)/mergelib.cpp | $(SED) -e /^\#/d | $(SED) -e s/XCOMM/\#/ > $@
+
+ if HAS_PERL
+ MKHTMLINDEX_SCRIPT = $(srcdir)/mkhtmlindex.pl
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 893fd7e0c..2d19ecc16 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,33 +1,37 @@
-# $Id: PKGBUILD 198681 2013-11-02 04:22:27Z bisson $
+# $Id: PKGBUILD 200656 2013-12-01 09:50:21Z andyrtr $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Tobias Kieslich <tobias@justdreams.de>
# Contributor: tobias <tobias@archlinux.org>
pkgname=inkscape
pkgver=0.48.4
-pkgrel=12
+pkgrel=13
pkgdesc='Vector graphics editor using the SVG file format'
url='http://inkscape.sourceforge.net/'
license=('GPL' 'LGPL')
arch=('i686' 'x86_64' 'mips64el')
makedepends=('boost' 'intltool')
-depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.22.3' 'popt'
+depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib>=0.24.4' 'popt'
'python2' 'desktop-file-utils' 'hicolor-icon-theme')
optdepends=('pstoedit: latex formulas'
'texlive-core: latex formulas'
'python2-numpy: some extensions'
'python2-lxml: some extensions and filters'
'uniconvertor: reading/writing to some proprietary formats')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2"
- 'spuriouscomma.patch')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+ spuriouscomma.patch
+ build_fix.diff)
sha1sums=('5f26f6ad191d1e7c2a9fb69a438722beb172224c'
- '7d1d5a6d1d2b0926721a994d5889c52890fc57c1')
+ '7d1d5a6d1d2b0926721a994d5889c52890fc57c1'
+ 'aba4d98bebae088c3401fd9259ea3cf70b96fbbf')
install=install
prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
patch -p0 -i ../spuriouscomma.patch
+ # fix build with freetype 2.5.1
+ patch -Np0 -i ../build_fix.diff
sed -i 's|/usr/bin/python\>|/usr/bin/python2|g' cxxtest/*.py
sed -i 's|/usr/bin/env python\>|/usr/bin/env python2|g' share/*/{test/,}*.py
sed -i 's|"python" },|"python2" },|g' src/extension/implementation/script.cpp
@@ -37,7 +41,7 @@ prepare() {
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure \
--prefix=/usr \
--with-python \
@@ -49,6 +53,6 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/inkscape/build_fix.diff b/extra/inkscape/build_fix.diff
new file mode 100644
index 000000000..84cdc1ca6
--- /dev/null
+++ b/extra/inkscape/build_fix.diff
@@ -0,0 +1,15 @@
+=== modified file 'src/libnrtype/FontFactory.h'
+--- src/libnrtype/FontFactory.h 2010-04-15 19:00:11 +0000
++++ src/libnrtype/FontFactory.h 2013-11-28 05:54:34 +0000
+@@ -31,7 +31,8 @@
+ #include <pango/pangowin32.h>
+ #else
+ #include <pango/pangoft2.h>
+-#include <freetype/freetype.h>
++#include <ft2build.h>
++#include FT_FREETYPE_H
+ #endif
+
+ namespace Glib
+
+
diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD
index eb1b9748f..bbb1a2c89 100644
--- a/extra/intel-tbb/PKGBUILD
+++ b/extra/intel-tbb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194497 2013-09-16 20:37:59Z eric $
+# $Id: PKGBUILD 201331 2013-12-09 01:11:29Z eric $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: Denis Martinez <deuns.martinez AT gmail.com>
pkgname=intel-tbb
-pkgver=4.2_20130725
+pkgver=4.2_20131118
pkgrel=1
pkgdesc='High level abstract threading library'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url='http://www.threadingbuildingblocks.org/'
license=('GPL')
depends=('gcc-libs')
source=("http://threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${pkgver/\./}oss_src.tgz")
-sha1sums=('f354bd9b67295f65c43531b751e34f483ed8a024')
+sha1sums=('46ab280c61b0e8cb953b3d9a75f93c858bcf8d05')
build() {
cd tbb${pkgver/\./}oss
diff --git a/extra/irssi/PKGBUILD b/extra/irssi/PKGBUILD
index 632c25308..069d5941c 100644
--- a/extra/irssi/PKGBUILD
+++ b/extra/irssi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198115 2013-10-30 12:52:50Z allan $
+# $Id: PKGBUILD 200011 2013-11-21 01:40:28Z allan $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Dan McGee <dan@archlinux.org>
pkgname=irssi
pkgver=0.8.15
-pkgrel=7
+pkgrel=8
pkgdesc="Modular text mode IRC client with Perl scripting"
arch=('i686' 'x86_64' 'mips64el')
url="http://irssi.org/"
diff --git a/extra/jasper/PKGBUILD b/extra/jasper/PKGBUILD
index 5e7751da1..fca5d5f1b 100644
--- a/extra/jasper/PKGBUILD
+++ b/extra/jasper/PKGBUILD
@@ -1,14 +1,16 @@
-# $Id: PKGBUILD 197251 2013-10-24 19:18:50Z eric $
+# $Id: PKGBUILD 201291 2013-12-08 01:10:40Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=jasper
pkgver=1.900.1
-pkgrel=9
+pkgrel=10
pkgdesc="A software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.ece.uvic.ca/~mdadams/jasper/"
license=('custom:JasPer2.0')
-depends=('libjpeg' 'freeglut' 'libxmu' 'glu')
+depends=('libjpeg')
+makedepends=('freeglut' 'libxmu' 'glu')
+optdepends=('freeglut: for jiv support' 'glu: for jiv support')
source=(http://www.ece.uvic.ca/~mdadams/${pkgname}/software/${pkgname}-${pkgver}.zip
patch-libjasper-stepsizes-overflow.diff jasper-1.900.1-CVE-2008-3520.patch
jpc_dec.c.patch jasper-1.900.1-CVE-2008-3522.patch)
diff --git a/extra/joe/PKGBUILD b/extra/joe/PKGBUILD
new file mode 100644
index 000000000..c3a691612
--- /dev/null
+++ b/extra/joe/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 199794 2013-11-16 14:39:23Z thomas $
+# Maintainer: Thomas Bächler <thomas@archlinux.org>
+pkgname=joe
+pkgver=3.7
+pkgrel=4
+pkgdesc="Joe's own editor"
+arch=('i686' 'x86_64')
+url="http://sourceforge.net/projects/joe-editor"
+license=('GPL')
+depends=('ncurses')
+optdepends=('gpm: console mouse support')
+backup=('etc/joe/ftyperc' 'etc/joe/jicerc.ru' 'etc/joe/jmacsrc'
+ 'etc/joe/joerc' 'etc/joe/jpicorc' 'etc/joe/jstarrc' 'etc/joe/rjoerc')
+source=("http://downloads.sourceforge.net/joe-editor/${pkgname}-${pkgver}.tar.gz")
+md5sums=('66de1b073e869ba12abbfcde3885c577')
+sha1sums=('54398578886d4a3d325aece52c308a939d31101d')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+
+ make DESTDIR="${pkgdir}/" install
+}
diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD
index 7d522dcb7..e210caafd 100644
--- a/extra/kactivities/PKGBUILD
+++ b/extra/kactivities/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198822 2013-11-05 19:43:12Z andrea $
+# $Id: PKGBUILD 202457 2013-12-22 12:46:37Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kactivities
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='API for using and interacting with the Activity Manager'
@@ -11,7 +11,7 @@ license=('GPL' 'FDL')
depends=('nepomuk-core')
makedepends=('cmake' 'automoc4' 'mesa')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('74521e39e32e647b400e4495bc2dba2be0567ffa')
+sha1sums=('966fa231942b24b510beafb4d3eb16226bde4ec0')
build() {
cd "${srcdir}"
diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD
index a1b81ae86..5c190c319 100644
--- a/extra/kdeaccessibility-jovie/PKGBUILD
+++ b/extra/kdeaccessibility-jovie/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198849 2013-11-05 19:49:19Z andrea $
+# $Id: PKGBUILD 202484 2013-12-22 12:47:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeaccessibility-jovie
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='A text to speech application'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdeaccessibility-kttsd')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz")
-sha1sums=('9b2d3058b7ff0324015e80f6ef6f6a3d1ad63b53')
+sha1sums=('c14c3afbc5f1290adc5d421330fd423b470542fe')
build() {
mkdir build
diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD
index a697cd3d8..bdb354243 100644
--- a/extra/kdeaccessibility-kaccessible/PKGBUILD
+++ b/extra/kdeaccessibility-kaccessible/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198850 2013-11-05 19:49:30Z andrea $
+# $Id: PKGBUILD 202485 2013-12-22 12:47:09Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeaccessibility-kaccessible
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='Provides accessibility services like focus tracking and a screenreader'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility')
depends=('kdelibs' 'speech-dispatcher')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz")
-sha1sums=('3aedf1a924ab691551a349514a4f7e215f4a98e4')
+sha1sums=('a1e850b14bbf08269557c2f1edea4ac5b0e2773f')
build() {
cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD
index 119b1c8d5..be5f4624d 100644
--- a/extra/kdeaccessibility-kmag/PKGBUILD
+++ b/extra/kdeaccessibility-kmag/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198851 2013-11-05 19:49:41Z andrea $
+# $Id: PKGBUILD 202486 2013-12-22 12:47:10Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeaccessibility-kmag
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='Screen Magnifier'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz")
-sha1sums=('44bf5f6ee2eaa9b56c2cb90650170d8d53d5e6bd')
+sha1sums=('b75992bfe53ab7e22e33d5746ed28ab9583be816')
build() {
cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD
index a2c70d887..9fd2e6ab8 100644
--- a/extra/kdeaccessibility-kmousetool/PKGBUILD
+++ b/extra/kdeaccessibility-kmousetool/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198852 2013-11-05 19:49:50Z andrea $
+# $Id: PKGBUILD 202487 2013-12-22 12:47:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeaccessibility-kmousetool
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz")
-sha1sums=('4a45d54d6baeb4df2528ec8ce7cb93c1c6f60723')
+sha1sums=('3c61d8a183c9e1fedb6eff6b0dd6937135a429f8')
build() {
cd "${srcdir}"
diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD
index ce56dd1a9..eafc248ab 100644
--- a/extra/kdeaccessibility-kmouth/PKGBUILD
+++ b/extra/kdeaccessibility-kmouth/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198853 2013-11-05 19:50:00Z andrea $
+# $Id: PKGBUILD 202488 2013-12-22 12:47:12Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeaccessibility-kmouth
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
pkgdesc='Speech Synthesizer Frontend'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz")
-sha1sums=('60f2417da21f5af70379a6186473b6e93973a5e8')
+sha1sums=('a934e8b73a5a71293a63b45f038751318c04a1bf')
build() {
cd "${srcdir}"
diff --git a/extra/kdeadmin-kcron/PKGBUILD b/extra/kdeadmin-kcron/PKGBUILD
index 7c311c68d..e58c57731 100644
--- a/extra/kdeadmin-kcron/PKGBUILD
+++ b/extra/kdeadmin-kcron/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198854 2013-11-05 19:50:10Z andrea $
+# $Id: PKGBUILD 202489 2013-12-22 12:47:13Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeadmin-kcron
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Configure and schedule tasks'
url='http://userbase.kde.org/KCron'
@@ -12,7 +12,7 @@ groups=('kde' 'kdeadmin')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/kcron-${pkgver}.tar.xz")
-sha1sums=('4c70b28a3830a5eb0db555366966f921eb8ee601')
+sha1sums=('7f64eb62048360f5d14ce273e7eff2c48c9d0567')
build() {
mkdir build
diff --git a/extra/kdeadmin-ksystemlog/PKGBUILD b/extra/kdeadmin-ksystemlog/PKGBUILD
index 1597fa6bf..ece449f1f 100644
--- a/extra/kdeadmin-ksystemlog/PKGBUILD
+++ b/extra/kdeadmin-ksystemlog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198855 2013-11-05 19:50:20Z andrea $
+# $Id: PKGBUILD 202490 2013-12-22 12:47:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeadmin-ksystemlog
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='System log viewer tool'
url='http://kde.org/applications/system/ksystemlog/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/ksystemlog-${pkgver}.tar.xz"
'syslog-path.patch')
-sha1sums=('31347f642b7735c477922b8dd8765b85c9ba5554'
+sha1sums=('0e7b62342acf505d384328de2528cb22120ef639'
'20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
prepare() {
diff --git a/extra/kdeadmin-kuser/PKGBUILD b/extra/kdeadmin-kuser/PKGBUILD
index 09a978f8f..76aa1fd4b 100644
--- a/extra/kdeadmin-kuser/PKGBUILD
+++ b/extra/kdeadmin-kuser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198856 2013-11-05 19:50:40Z andrea $
+# $Id: PKGBUILD 202491 2013-12-22 12:47:15Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeadmin-kuser
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='User Manager'
url='http://kde.org/applications/system/kuser/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kuser-${pkgver}.tar.xz")
-sha1sums=('675b2dd1745cd6566bea724e8b641c5408dead50')
+sha1sums=('36610297b6f41d075fc638fdab6910f3558cdcc2')
build() {
mkdir build
diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD
index 44194b935..522c8574e 100644
--- a/extra/kdeartwork/PKGBUILD
+++ b/extra/kdeartwork/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198857 2013-11-05 19:50:55Z andrea $
+# $Id: PKGBUILD 202492 2013-12-22 12:47:17Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -8,11 +8,10 @@ pkgname=('kdeartwork-colorschemes'
'kdeartwork-emoticons'
'kdeartwork-iconthemes'
'kdeartwork-kscreensaver'
- 'kdeartwork-sounds'
'kdeartwork-styles'
'kdeartwork-wallpapers'
'kdeartwork-weatherwallpapers')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -20,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeartwork')
makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('c51a79c907f294bc559e181fe7c4ec733361fe2b')
+sha1sums=('a5042ff6768a4857649a526199c9cda9c6976e6a')
build() {
cd $srcdir
@@ -67,12 +66,6 @@ package_kdeartwork-kscreensaver() {
make DESTDIR=$pkgdir install
}
-package_kdeartwork-sounds() {
- pkgdesc='KDE sounds'
- cd $srcdir/build/sounds
- make DESTDIR=$pkgdir install
-}
-
package_kdeartwork-styles() {
pkgdesc='KDE styles'
depends=('kdebase-workspace')
diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD
index 4947c16e4..67397523a 100644
--- a/extra/kdebase-konsole/PKGBUILD
+++ b/extra/kdebase-konsole/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198858 2013-11-05 19:51:42Z andrea $
+# $Id: PKGBUILD 202493 2013-12-22 12:47:18Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebase-konsole
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://kde.org/applications/system/konsole/'
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
depends=('kdebase-runtime' 'kdebase-lib')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('16b282bd0ec32e712631f4a2b5c32aa8439f15f4')
+sha1sums=('3e4d16c6837c1ba83e8e8440124bd870eca1ba1c')
build() {
cd "${srcdir}"
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index 4fbaba776..b6d1cd6a3 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198835 2013-11-05 19:46:28Z andrea $
+# $Id: PKGBUILD 202712 2013-12-25 21:25:47Z andyrtr $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdebase-workspace
_pkgname=kde-workspace
-pkgver=4.11.3
-pkgrel=1
+pkgver=4.11.4
+pkgrel=2
pkgdesc="Provides the interface and basic tools for the KDE workspace"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -28,7 +28,7 @@ backup=('usr/share/config/kdm/kdmrc')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('b806e54be72f31d8b2001bc953445e75b5b79da6'
+sha1sums=('c1e2b669f5a1607bcce7e92d9213af1ee809d79e'
'660eae40a707d2711d8d7f32a93214865506b795'
'6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
'106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD
index 4b8b4aeb5..9a7a50bab 100644
--- a/extra/kdebase/PKGBUILD
+++ b/extra/kdebase/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198837 2013-11-05 19:47:04Z andrea $
+# $Id: PKGBUILD 202472 2013-12-22 12:46:54Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -11,7 +11,7 @@ pkgname=('kdebase-dolphin'
'kdebase-konq-plugins'
'kdebase-lib'
'kdebase-plasma')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -19,7 +19,7 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz")
-sha1sums=('f2a6f4220efe395c124d8981edaaca0a462640b5')
+sha1sums=('e85b5445380e44894efcaa21f4c95fad1ed4c4f6')
prepare() {
mkdir build
diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD
index 759e535f8..4b73f21db 100644
--- a/extra/kdebindings-kimono/PKGBUILD
+++ b/extra/kdebindings-kimono/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198859 2013-11-05 19:51:53Z andrea $
+# $Id: PKGBUILD 202494 2013-12-22 12:47:19Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-kimono
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc=".NET/Mono bindings for the KDE libraries"
url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
optdepends=('kdepimlibs: akonadi bindings')
conflicts=('kdebindings-csharp')
source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz")
-sha1sums=('6e382ec674eaf19d865edf58f0c7d96824220cb8')
+sha1sums=('f943de3f84ddb0ff6beec922ae9f4d890f83bb5c')
build() {
cd "${srcdir}"
diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD
index af378260b..702a28e82 100644
--- a/extra/kdebindings-korundum/PKGBUILD
+++ b/extra/kdebindings-korundum/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198860 2013-11-05 19:52:04Z andrea $
+# $Id: PKGBUILD 202495 2013-12-22 12:47:20Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-korundum
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Ruby bindings for libraries created by the KDE community"
url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum"
@@ -16,7 +16,7 @@ optdepends=('kdegraphics-okular: okular bindings'
'kdepimlibs: akonadi bindings')
conflicts=('kdebindings-ruby')
source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz")
-sha1sums=('9622fd4a20a423b2fbc0de0b6258cb8de5262002')
+sha1sums=('0b2a5f4453116a773ae446268efe697accc0d4c4')
prepare() {
mkdir build
diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD
index 50e24db00..c4546ad49 100644
--- a/extra/kdebindings-kross/PKGBUILD
+++ b/extra/kdebindings-kross/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198861 2013-11-05 19:52:14Z andrea $
+# $Id: PKGBUILD 202496 2013-12-22 12:47:21Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=kdebindings-kross
pkgname=('kdebindings-kross-python'
# 'kdebindings-kross-ruby'
'kdebindings-kross-java')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kdebindings')
makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment')
source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz")
-sha1sums=('1e3af7d4f43ff744e64c7dc24677feeddcb9384c')
+sha1sums=('26663d13d13f001eaf359ac3af0aab133b0ed558')
build() {
cd "${srcdir}"
diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD
index c7fe9045f..2201a0e87 100644
--- a/extra/kdebindings-perlkde/PKGBUILD
+++ b/extra/kdebindings-perlkde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198862 2013-11-05 19:52:24Z andrea $
+# $Id: PKGBUILD 202497 2013-12-22 12:47:22Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-perlkde
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Perl bindings for the KDE libraries"
url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde"
@@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde')
makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
'kdegraphics-okular' 'kdesdk-kate')
source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz")
-sha1sums=('5b7aac1eab0577a0a95612535e7c0d0e02cb057d')
+sha1sums=('a69983100fd2b66f478e7b39b6fe0ce49813db6d')
build() {
mkdir build
diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD
index 845d4c168..7f1c356a2 100644
--- a/extra/kdebindings-perlqt/PKGBUILD
+++ b/extra/kdebindings-perlqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198831 2013-11-05 19:45:33Z andrea $
+# $Id: PKGBUILD 202467 2013-12-22 12:46:49Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-perlqt
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Perl bindings for the Qt libraries"
url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt"
@@ -12,7 +12,7 @@ groups=('kdebindings')
depends=('kdebindings-smokeqt' 'perl-list-moreutils')
makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz")
-sha1sums=('fb81299b5148cf6f9060e0ba09d4651e51f86404')
+sha1sums=('0b66d85af437dba188b9d9381dbd50114ff1c925')
build() {
mkdir build
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index dee0d2b37..72676f06a 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198828 2013-11-05 19:44:52Z andrea $
+# $Id: PKGBUILD 202464 2013-12-22 12:46:46Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=kdebindings-python
pkgname=('kdebindings-python'
'kdebindings-python2'
'kdebindings-python-common')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
url='https://projects.kde.org/projects/kde/kdebindings/pykde4'
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ groups=('kdebindings')
makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt4'
'python-pyqt4' 'qscintilla' 'python2-sip' 'python-sip' 'mesa')
source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz")
-sha1sums=('3a42c70bc994a1e74e777bad2e54478ae1d1da0c')
+sha1sums=('64661b5fcce6b45cddf1f6ddfc17862c939a18af')
prepare() {
mkdir build
diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD
index 811148b87..acdc7ccee 100644
--- a/extra/kdebindings-qtruby/PKGBUILD
+++ b/extra/kdebindings-qtruby/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198833 2013-11-05 19:45:56Z andrea $
+# $Id: PKGBUILD 202469 2013-12-22 12:46:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-qtruby
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Ruby bindings for the Qt libraries"
url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby')
makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
conflicts=('kdebindings-ruby')
source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz")
-sha1sums=('b2c8c16744c314af2fd6cc7afabe48fdfd274266')
+sha1sums=('a1ab8e5607bb8f2a046c06907592738652daf1dd')
build() {
mkdir build
diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD
index 00223368d..a87fd0c64 100644
--- a/extra/kdebindings-qyoto/PKGBUILD
+++ b/extra/kdebindings-qyoto/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198832 2013-11-05 19:45:45Z andrea $
+# $Id: PKGBUILD 202468 2013-12-22 12:46:50Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-qyoto
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc=".NET/Mono bindings for the Qt libraries"
url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto"
@@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono')
makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
conflicts=('kdebindings-csharp')
source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz")
-sha1sums=('5eb6107665cdf9cdc6b53dd17656866c252110d9')
+sha1sums=('581e1bf9eb0d056be21e32851919e9abf60c967e')
build() {
mkdir build
diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD
index 44e2da37c..7c9798f44 100644
--- a/extra/kdebindings-smokegen/PKGBUILD
+++ b/extra/kdebindings-smokegen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198825 2013-11-05 19:44:15Z andrea $
+# $Id: PKGBUILD 202460 2013-12-22 12:46:41Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-smokegen
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A general purpose C++ parser with a plugin infrastructure"
url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
conflicts=('kdebindings-smoke')
source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz")
-sha1sums=('ceb0385627c199384351d5c649ae384e5c5dcc02')
+sha1sums=('5385b2851d16d186be4cc4bc4d5af901d8f444bf')
build() {
cd "${srcdir}"
diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD
index a053ad548..bc680f29c 100644
--- a/extra/kdebindings-smokekde/PKGBUILD
+++ b/extra/kdebindings-smokekde/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198830 2013-11-05 19:45:21Z andrea $
+# $Id: PKGBUILD 202466 2013-12-22 12:46:48Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-smokekde
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Language independent library for KDE bindings"
url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde"
@@ -18,7 +18,7 @@ optdepends=('kdesdk-kate: Kate bindings'
'kdepimlibs: akonadi bindings')
conflicts=('kdebindings-smoke')
source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz")
-sha1sums=('6cd8c535a0f6b40dab4c96c45a0301a9c7abd507')
+sha1sums=('9f1d249d3fcedefba49dc26afc1a1c5c0ad730d6')
build() {
mkdir build
diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD
index 4079403da..48a639632 100644
--- a/extra/kdebindings-smokeqt/PKGBUILD
+++ b/extra/kdebindings-smokeqt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198826 2013-11-05 19:44:29Z andrea $
+# $Id: PKGBUILD 202461 2013-12-22 12:46:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdebindings-smokeqt
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Language independent library for Qt bindings"
url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt"
@@ -13,11 +13,13 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla')
makedepends=('cmake' 'automoc4' 'mesa')
conflicts=('kdebindings-smoke')
source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz")
-sha1sums=('eaa6df3360174a34ff987622d024d09c2fce358c')
+sha1sums=('d5b47c8a21f9856a7ea8729c0cb01dad4db2d13e')
-build() {
- cd "${srcdir}"
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../smokeqt-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
@@ -28,6 +30,6 @@ build() {
}
package() {
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD
index b96597258..b55854559 100644
--- a/extra/kdeedu-analitza/PKGBUILD
+++ b/extra/kdeedu-analitza/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 198844 2013-11-05 19:48:24Z andrea $
+# $Id: PKGBUILD 202478 2013-12-22 12:47:02Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-analitza
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A library to add mathematical features to your program"
url="https://projects.kde.org/projects/kde/kdeedu/analitza"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
+depends=('kdebase-runtime' 'glu')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz")
-sha1sums=('525844959de2c21888496eb5aaf5b7996ccf823e')
+sha1sums=('a90c58d24c8cba048fc5303ef35e870536603119')
-build() {
- cd "${srcdir}"
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../analitza-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
@@ -26,6 +28,6 @@ build() {
}
package() {
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD
index f420fe8ad..e984f8b4c 100644
--- a/extra/kdeedu-blinken/PKGBUILD
+++ b/extra/kdeedu-blinken/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198863 2013-11-05 19:52:35Z andrea $
+# $Id: PKGBUILD 202498 2013-12-22 12:47:23Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-blinken
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Memory Enhancement Game"
url="http://kde.org/applications/education/blinken/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz")
-sha1sums=('c556d8c35a93dd0a85c1a7508c0353dc1b6ef61e')
+sha1sums=('eb081e53375559f67cec380833b1514de635f985')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD
index 7b6ed11d4..471e93f99 100644
--- a/extra/kdeedu-cantor/PKGBUILD
+++ b/extra/kdeedu-cantor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198864 2013-11-05 19:52:47Z andrea $
+# $Id: PKGBUILD 202499 2013-12-22 12:47:24Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-cantor
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="KDE Frontend to Mathematical Software"
url="http://kde.org/applications/education/cantor/"
@@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend'
'r: R backend')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz")
-sha1sums=('fb0e450c0591db62ec9f71532a90c1ad15187c2e')
+sha1sums=('9a7a27a375bfbb3ffacf0b9b762eaa9b3d4310f2')
prepare() {
mkdir build
diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD
index 44e2a393e..75227703b 100644
--- a/extra/kdeedu-kalgebra/PKGBUILD
+++ b/extra/kdeedu-kalgebra/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198865 2013-11-05 19:52:57Z andrea $
+# $Id: PKGBUILD 202500 2013-12-22 12:47:26Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kalgebra
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Graph Calculator"
url="http://kde.org/applications/education/kalgebra/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz")
-sha1sums=('3852c19219164403c21ab4cab0ffa4e1599ddfa3')
+sha1sums=('b4a76e4c06fc68a363727a712b1ca4673d6c816d')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD
index b2a129968..d0c0d9b1a 100644
--- a/extra/kdeedu-kalzium/PKGBUILD
+++ b/extra/kdeedu-kalzium/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198866 2013-11-05 19:53:06Z andrea $
+# $Id: PKGBUILD 202501 2013-12-22 12:47:28Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kalzium
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Periodic Table of Elements"
url="http://kde.org/applications/education/kalzium/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'avogadro' 'ocaml' 'facile' 'chemical-mime-data')
makedepends=('cmake' 'automoc4' 'mesa')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz")
-sha1sums=('5a83d5fd65b9486c982f68070ece63a3ce1e0b8d')
+sha1sums=('8b21468f6149395b9fe0e5f38d7f8c359fa7375e')
build() {
mkdir build
diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD
index 405951c4a..8a81b93e8 100644
--- a/extra/kdeedu-kanagram/PKGBUILD
+++ b/extra/kdeedu-kanagram/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198867 2013-11-05 19:53:17Z andrea $
+# $Id: PKGBUILD 202502 2013-12-22 12:47:29Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kanagram
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Letter Order Game"
url="http://kde.org/applications/education/kanagram/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz")
-sha1sums=('eb86e5b7abc48dffdd14d68143484db1b4906d95')
+sha1sums=('13a836b56ea16693a56c320d8082e2153d1d0dcd')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD
index 88c297f45..a7731eead 100644
--- a/extra/kdeedu-kbruch/PKGBUILD
+++ b/extra/kdeedu-kbruch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198868 2013-11-05 19:53:27Z andrea $
+# $Id: PKGBUILD 202503 2013-12-22 12:47:30Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kbruch
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Exercise Fractions"
url="http://kde.org/applications/education/kbruch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz")
-sha1sums=('b9f693a95071e169e4593d090979e9263828a26a')
+sha1sums=('a8611ddfa4b22c8d13128c3e120d2407b9bf3674')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD
index ad01403b5..2c0cd59be 100644
--- a/extra/kdeedu-kgeography/PKGBUILD
+++ b/extra/kdeedu-kgeography/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198869 2013-11-05 19:53:37Z andrea $
+# $Id: PKGBUILD 202504 2013-12-22 12:47:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kgeography
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Geography Trainer"
url="http://kde.org/applications/education/kgeography/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz")
-sha1sums=('21fe59b502814181a604fbbd7546738294eba84e')
+sha1sums=('6984a2d88dc488257be8d3471a6241ca0e456788')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD
index 69ccd260e..43a70ae70 100644
--- a/extra/kdeedu-khangman/PKGBUILD
+++ b/extra/kdeedu-khangman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198870 2013-11-05 19:53:47Z andrea $
+# $Id: PKGBUILD 202505 2013-12-22 12:47:33Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-khangman
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Hangman Game"
url="http://kde.org/applications/education/khangman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz")
-sha1sums=('0cef2c1bbe9bdeab182de5abba55a79f98cc0b08')
+sha1sums=('a7e3883fd49843bb3e9addff24ebb748dd42b86a')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index 2d2b80167..fd3d408e0 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198871 2013-11-05 19:53:57Z andrea $
+# $Id: PKGBUILD 202506 2013-12-22 12:47:34Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kig
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Interactive Geometry"
url="http://kde.org/applications/education/kig/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'boost')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
-sha1sums=('02e485471a120ab2d39bfdc176cb136eaa1545c0')
+sha1sums=('16ed1da7cb7d49a87d009791026590ac9db7b1e2')
build() {
mkdir build
diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD
index 310e04121..98a1295ce 100644
--- a/extra/kdeedu-kiten/PKGBUILD
+++ b/extra/kdeedu-kiten/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198872 2013-11-05 19:54:08Z andrea $
+# $Id: PKGBUILD 202507 2013-12-22 12:47:37Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kiten
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Japanese Reference/Study Tool"
url="http://kde.org/applications/education/kiten/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz")
-sha1sums=('b57043aa783b61fba706058c161c5ccd925e6d19')
+sha1sums=('d5aa061642ff9e32722d4014ad0816d2fb70dbaa')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD
index 10710437b..cae25be11 100644
--- a/extra/kdeedu-klettres/PKGBUILD
+++ b/extra/kdeedu-klettres/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198873 2013-11-05 19:54:19Z andrea $
+# $Id: PKGBUILD 202508 2013-12-22 12:47:39Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-klettres
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Learn The Alphabet"
url="http://kde.org/applications/education/klettres/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz")
-sha1sums=('14500ed25d6837c9f822fd6b29f21152eebb82eb')
+sha1sums=('47a8e13c94111b7cf3fbabf4e84f22e30ac10884')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD
index eb73d2d87..e4f4f2bb1 100644
--- a/extra/kdeedu-kmplot/PKGBUILD
+++ b/extra/kdeedu-kmplot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198874 2013-11-05 19:54:48Z andrea $
+# $Id: PKGBUILD 202509 2013-12-22 12:47:41Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kmplot
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Mathematical Function Plotter"
url="http://kde.org/applications/education/kmplot/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz")
-sha1sums=('d2a5c8f6b01fd88c7d5acc91494c157df869f8e7')
+sha1sums=('6f6253c7cf2656777e1599747d36286bd75bf6f5')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD
index 2213a45af..a8c1dd525 100644
--- a/extra/kdeedu-kstars/PKGBUILD
+++ b/extra/kdeedu-kstars/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198875 2013-11-05 19:54:57Z andrea $
+# $Id: PKGBUILD 202510 2013-12-22 12:47:42Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kstars
-pkgver=4.11.3
-pkgrel=1
+pkgver=4.12.0
+pkgrel=3
pkgdesc="Desktop Planetarium"
url="http://kde.org/applications/education/kstars/"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'wcslib' 'libindi')
makedepends=('cmake' 'automoc4' 'eigen')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
-sha1sums=('92a54609a43a65e81ff80b15d6fd1be20e123a60')
+sha1sums=('b8e1b95b1b7b1c31ff628fb2b8779293c72a8d8a')
build() {
mkdir build
diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD
index 12ab43f7c..83672a8bd 100644
--- a/extra/kdeedu-ktouch/PKGBUILD
+++ b/extra/kdeedu-ktouch/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198876 2013-11-05 19:55:09Z andrea $
+# $Id: PKGBUILD 202511 2013-12-22 12:47:44Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-ktouch
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Touch Typing Tutor"
url="http://kde.org/applications/education/ktouch/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'mesa')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz")
-sha1sums=('4996509f4aa8d896095dd116be56c8f36739a465')
+sha1sums=('59f37ce92d918d3bce8520bc58c3651213d092e8')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD
index 71ab780c6..04255af9a 100644
--- a/extra/kdeedu-kturtle/PKGBUILD
+++ b/extra/kdeedu-kturtle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198877 2013-11-05 19:55:19Z andrea $
+# $Id: PKGBUILD 202512 2013-12-22 12:47:45Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kturtle
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Educational Programming Environment"
url="http://kde.org/applications/education/kturtle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz")
-sha1sums=('3faaf8994a6bbb7c4b5459aa0ea060e49f3a0c4d')
+sha1sums=('2623bf1647cc26706edcd4e0ed4b4fca0dfb3fb2')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD
index 97a7c3818..a0bdf3e7b 100644
--- a/extra/kdeedu-kwordquiz/PKGBUILD
+++ b/extra/kdeedu-kwordquiz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198878 2013-11-05 19:55:28Z andrea $
+# $Id: PKGBUILD 202513 2013-12-22 12:47:47Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kwordquiz
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Flash Card Trainer"
url="http://kde.org/applications/education/kwordquiz/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz")
-sha1sums=('f46e6b5919942d4b563bf1e867330550ec5594b7')
+sha1sums=('522e3dd60630be1c97e740d3fc80db231859df86')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD
index 4e190687e..6c21e24b0 100644
--- a/extra/kdeedu-marble/PKGBUILD
+++ b/extra/kdeedu-marble/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198839 2013-11-05 19:47:27Z andrea $
+# $Id: PKGBUILD 202474 2013-12-22 12:46:57Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-marble
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/"
@@ -11,13 +11,17 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdeedu')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: gps support')
+optdepends=('gpsd: GPS support'
+ 'quazip: reading and displaying KMZ files')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz")
-sha1sums=('b0b0cf06b4c60262861e748c6815d62513df13a7')
+sha1sums=('65f4272a015b36b06d7aacf1a4dd6e757557e2b9')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../marble-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD
index 6f8e7e2fb..1e0f6b287 100644
--- a/extra/kdeedu-pairs/PKGBUILD
+++ b/extra/kdeedu-pairs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198879 2013-11-05 19:55:38Z andrea $
+# $Id: PKGBUILD 202514 2013-12-22 12:47:48Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-pairs
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A memory and pairs game for KDE"
url="https://projects.kde.org/projects/kde/kdeedu/pairs"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz")
-sha1sums=('d4825df57d5526aea3dc4308aceee6c65f41efba')
+sha1sums=('a153626127d757105473a1a0b174e4f67f87aa2e')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD
index fb0e9fef7..3d8d68dcf 100644
--- a/extra/kdeedu-parley/PKGBUILD
+++ b/extra/kdeedu-parley/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198880 2013-11-05 19:55:48Z andrea $
+# $Id: PKGBUILD 202515 2013-12-22 12:47:49Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-parley
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Vocabulary Trainer"
url="http://kde.org/applications/education/parley/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
optdepends=('kdebindings-kross-python: scripting support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz")
-sha1sums=('2a0065fcfdb48db3dcdae992a7f8094035f6e81d')
+sha1sums=('6b5fac34f4f6c9cd9f43a1137574be0396d10768')
build() {
mkdir build
diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD
index c2e8d5276..b27c52d27 100644
--- a/extra/kdeedu-rocs/PKGBUILD
+++ b/extra/kdeedu-rocs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198881 2013-11-05 19:55:59Z andrea $
+# $Id: PKGBUILD 202516 2013-12-22 12:47:51Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-rocs
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Rocs Graph Theory"
url="http://kde.org/applications/education/rocs/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'boost')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz")
-sha1sums=('b1693d7bf589666334e08fa2258d7e4c90d44283')
+sha1sums=('bec5211b4c1c384f515bfaa0a98a5c2684bbdab4')
build() {
cd "${srcdir}"
diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD
index 47f85588a..948390579 100644
--- a/extra/kdeedu-step/PKGBUILD
+++ b/extra/kdeedu-step/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198882 2013-11-05 19:56:08Z andrea $
+# $Id: PKGBUILD 202517 2013-12-22 12:47:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-step
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Interactive Physical Simulator"
url="http://kde.org/applications/education/step/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl')
makedepends=('cmake' 'automoc4' 'eigen' 'mesa')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
-sha1sums=('03058d4d3d228aa1a6e57483fb52d1c2cc66319b')
+sha1sums=('0bc4592f7886abe1815de1290aff2efab230120b')
build() {
cd "${srcdir}"
diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD
index 021cd24fe..1c0c1b241 100644
--- a/extra/kdegames-bomber/PKGBUILD
+++ b/extra/kdegames-bomber/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198883 2013-11-05 19:56:17Z andrea $
+# $Id: PKGBUILD 202518 2013-12-22 12:47:53Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-bomber
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A single player arcade game"
url="http://kde.org/applications/games/bomber/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/bomber-${pkgver}.tar.xz")
-sha1sums=('c97235036e6e921529c108517ca35dfb4ca468e5')
+sha1sums=('6a52c44a3ac4c80cd5c60e417f13de2103a7c7ed')
build() {
mkdir build
diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD
index 96c290cbb..738f7abcc 100644
--- a/extra/kdegames-bovo/PKGBUILD
+++ b/extra/kdegames-bovo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198884 2013-11-05 19:56:25Z andrea $
+# $Id: PKGBUILD 202519 2013-12-22 12:47:55Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-bovo
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A Gomoku like game for two players"
url="http://kde.org/applications/games/bovo/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/bovo-${pkgver}.tar.xz")
-sha1sums=('5dac983929801c794eb4d60016991c5557f88dd8')
+sha1sums=('f805eabb8f2a18ae5371bbdcaffb5fce1ac9c5e0')
build() {
mkdir build
diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD
index dbf4a75c4..031aa41b6 100644
--- a/extra/kdegames-granatier/PKGBUILD
+++ b/extra/kdegames-granatier/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198885 2013-11-05 19:56:46Z andrea $
+# $Id: PKGBUILD 202520 2013-12-22 12:47:56Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-granatier
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A clone of the classic Bomberman game"
url="http://kde.org/applications/games/granatier/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/granatier-${pkgver}.tar.xz")
-sha1sums=('56069dbfa62e1da274c21d6e3fb41a30e3cc1460')
+sha1sums=('73fa16ffbef5915793fef03e25c2a755cb83cead')
build() {
mkdir build
diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD
index ca98177bb..3d4e440e5 100644
--- a/extra/kdegames-kapman/PKGBUILD
+++ b/extra/kdegames-kapman/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198887 2013-11-05 19:57:01Z andrea $
+# $Id: PKGBUILD 202522 2013-12-22 12:47:59Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kapman
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A clone of the well known game Pac-Man"
url="http://kde.org/applications/games/kapman/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kapman-${pkgver}.tar.xz")
-sha1sums=('3f064c087d477a896e86bf4d6b67d9c644cad60f')
+sha1sums=('ff8789b6703c6a1ff6bf3187188ca6399c8ede78')
build() {
mkdir build
diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD
index 7b8c9e556..b2f27fbc2 100644
--- a/extra/kdegames-katomic/PKGBUILD
+++ b/extra/kdegames-katomic/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198888 2013-11-05 19:57:11Z andrea $
+# $Id: PKGBUILD 202523 2013-12-22 12:48:00Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-katomic
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A fun and educational game built around molecular geometry"
url="http://kde.org/applications/games/katomic/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/katomic-${pkgver}.tar.xz")
-sha1sums=('9bd793a68f4ebfb468829eb89b951d6a5a36d917')
+sha1sums=('5b0644db827b9cb1fd96c2072677758bf1dd1b87')
build() {
mkdir build
diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD
index 940c6cdd3..06eba95c5 100644
--- a/extra/kdegames-kblackbox/PKGBUILD
+++ b/extra/kdegames-kblackbox/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198889 2013-11-05 19:57:21Z andrea $
+# $Id: PKGBUILD 202524 2013-12-22 12:48:02Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kblackbox
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A game of hide and seek played on a grid of boxes"
url="http://kde.org/applications/games/kblackbox/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kblackbox-${pkgver}.tar.xz")
-sha1sums=('30dfa88931acbf88fe24516d5003c96d638399c1')
+sha1sums=('c70a8460147042abe3dd75109e15e67e960e4e61')
build() {
mkdir build
diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD
index 855f67378..c58226d26 100644
--- a/extra/kdegames-kblocks/PKGBUILD
+++ b/extra/kdegames-kblocks/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198890 2013-11-05 19:57:30Z andrea $
+# $Id: PKGBUILD 202525 2013-12-22 12:48:04Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kblocks
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="The classic falling blocks game"
url="http://kde.org/applications/games/kblocks/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kblocks-${pkgver}.tar.xz")
-sha1sums=('d2ac45452acf281b8faff36fbbfbd080a7af7dec')
+sha1sums=('2cf67dce9caac87fe30ad2e8419b0ff15e2f2180')
build() {
mkdir build
diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD
index 5e2e46d62..54f7b0d09 100644
--- a/extra/kdegames-kbounce/PKGBUILD
+++ b/extra/kdegames-kbounce/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198891 2013-11-05 19:57:39Z andrea $
+# $Id: PKGBUILD 202526 2013-12-22 12:48:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kbounce
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A single player arcade game with the elements of puzzle"
url="http://kde.org/applications/games/kbounce/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kbounce-${pkgver}.tar.xz")
-sha1sums=('afc1fca732886e67d99cdb33276621cf67d85592')
+sha1sums=('4386ec1d2c770a8c2225755659245d28b8fc1ff6')
build() {
mkdir build
diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD
index 37a3bb4a9..fbcdda58e 100644
--- a/extra/kdegames-kbreakout/PKGBUILD
+++ b/extra/kdegames-kbreakout/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198892 2013-11-05 19:57:48Z andrea $
+# $Id: PKGBUILD 202527 2013-12-22 12:48:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kbreakout
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A Breakout-like game"
url="http://kde.org/applications/games/kbreakout/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kbreakout-${pkgver}.tar.xz")
-sha1sums=('c62ce7ad423f5c6ff3593ff22a3e851b2ee34471')
+sha1sums=('1752d83d4a8ea74bfc2f8f61bf2b93096dfdd24d')
build() {
mkdir build
diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD
index a5cf3e6f7..a064f9820 100644
--- a/extra/kdegames-kdiamond/PKGBUILD
+++ b/extra/kdegames-kdiamond/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198893 2013-11-05 19:57:57Z andrea $
+# $Id: PKGBUILD 202528 2013-12-22 12:48:09Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kdiamond
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A single player puzzle game"
url="http://kde.org/applications/games/kdiamond/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kdiamond-${pkgver}.tar.xz")
-sha1sums=('bcb32208702219f3fbbb6f3693680e4f2b9bbe90')
+sha1sums=('82c30d782087c41441f2b24dde2eb2c5c722807a')
build() {
mkdir build
diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD
index 280c80600..c0caf35a3 100644
--- a/extra/kdegames-kfourinline/PKGBUILD
+++ b/extra/kdegames-kfourinline/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198894 2013-11-05 19:58:06Z andrea $
+# $Id: PKGBUILD 202529 2013-12-22 12:48:10Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kfourinline
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A four-in-a-row game"
url="http://kde.org/applications/games/kfourinline/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kfourinline-${pkgver}.tar.xz")
-sha1sums=('bbbd81e2e91b10b61e56a498121f64a460a8328c')
+sha1sums=('226f7e8cf6da9517a2beeaa22caf51e35df123d9')
build() {
mkdir build
diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD
index df09c2cf4..c9fdf8d26 100644
--- a/extra/kdegames-kgoldrunner/PKGBUILD
+++ b/extra/kdegames-kgoldrunner/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198895 2013-11-05 19:58:15Z andrea $
+# $Id: PKGBUILD 202530 2013-12-22 12:48:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kgoldrunner
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A game of action and puzzle solving"
url="http://kde.org/applications/games/kgoldrunner/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kgoldrunner-${pkgver}.tar.xz")
-sha1sums=('a977911bff2c8fb603e1befc1ec98ad1b14c8480')
+sha1sums=('93b4b717fe92c3de68eea7d20cfc26fd6262e1d8')
build() {
mkdir build
diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD
index cd98155a1..224383c34 100644
--- a/extra/kdegames-kigo/PKGBUILD
+++ b/extra/kdegames-kigo/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198896 2013-11-05 19:58:25Z andrea $
+# $Id: PKGBUILD 202531 2013-12-22 12:48:12Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kigo
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="An open-source implementation of the popular Go game"
url="http://kde.org/applications/games/kigo/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'gnugo')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kigo-${pkgver}.tar.xz")
-sha1sums=('8538ed582dc74bb2767fd73634a5c76d7dfd490d')
+sha1sums=('d4a7f9fed23710237f18e1879d9128821e4f3f4a')
build() {
mkdir build
diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD
index 5effbff68..11b3e70f5 100644
--- a/extra/kdegames-killbots/PKGBUILD
+++ b/extra/kdegames-killbots/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198897 2013-11-05 20:00:15Z andrea $
+# $Id: PKGBUILD 202532 2013-12-22 12:48:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-killbots
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A simple game of evading killer robots"
url="http://kde.org/applications/games/killbots/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/killbots-${pkgver}.tar.xz")
-sha1sums=('34005bd79b80a1b1e2e62c65a9f410cc92cceff4')
+sha1sums=('2cbf37ae730340a9426c663291679969d4bfa336')
build() {
mkdir build
diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD
index e860427f7..f785895f4 100644
--- a/extra/kdegames-kiriki/PKGBUILD
+++ b/extra/kdegames-kiriki/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198898 2013-11-05 20:00:25Z andrea $
+# $Id: PKGBUILD 202533 2013-12-22 12:48:16Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kiriki
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="An addictive and fun dice game"
url="http://kde.org/applications/games/kiriki/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kiriki-${pkgver}.tar.xz")
-sha1sums=('d014ed9ca78ad3dff5c063f50e149a276c1ff70b')
+sha1sums=('97cc308eb01ded2e39aff57f736e72d24604d37f')
build() {
mkdir build
diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD
index 8a5c11ccd..b36e2f950 100644
--- a/extra/kdegames-kjumpingcube/PKGBUILD
+++ b/extra/kdegames-kjumpingcube/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198899 2013-11-05 20:01:44Z andrea $
+# $Id: PKGBUILD 202534 2013-12-22 12:48:18Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kjumpingcube
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A simple tactical game"
url="http://kde.org/applications/games/kjumpingcube/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kjumpingcube-${pkgver}.tar.xz")
-sha1sums=('80c138942b64911964dae05cceba7a948dcb8dd4')
+sha1sums=('c54a04bb1bc1769018ca31731190038ba3624ce7')
build() {
mkdir build
diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD
index b464cd554..96049c34b 100644
--- a/extra/kdegames-klickety/PKGBUILD
+++ b/extra/kdegames-klickety/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198900 2013-11-05 20:01:53Z andrea $
+# $Id: PKGBUILD 202535 2013-12-22 12:48:21Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-klickety
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="An adaptation of the Clickomania game"
url="http://kde.org/applications/games/klickety/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/klickety-${pkgver}.tar.xz")
-sha1sums=('e4e935f345101e2f72763a45b7d94169c4a30b40')
+sha1sums=('42cd4e8edbbd9bb60551ed7c4b45557ba71e52d2')
build() {
mkdir build
diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD
index 11be1ce1c..f9d588746 100644
--- a/extra/kdegames-klines/PKGBUILD
+++ b/extra/kdegames-klines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198901 2013-11-05 20:02:02Z andrea $
+# $Id: PKGBUILD 202536 2013-12-22 12:48:22Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-klines
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A simple but highly addictive, one player game"
url="http://kde.org/applications/games/klines/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/klines-${pkgver}.tar.xz")
-sha1sums=('bd6ffbe50dc8e6409c4fd4f4114a5dfdf98e0cc5')
+sha1sums=('a07893d319d8d27cc27a87bf8ab7636ba3fbc416')
build() {
mkdir build
diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD
index 6a52b9a62..ba3104001 100644
--- a/extra/kdegames-kmahjongg/PKGBUILD
+++ b/extra/kdegames-kmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198902 2013-11-05 20:02:10Z andrea $
+# $Id: PKGBUILD 202537 2013-12-22 12:48:24Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kmahjongg
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A tile matching game for one or two players"
url="http://kde.org/applications/games/kmahjongg/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkmahjongg' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kmahjongg-${pkgver}.tar.xz")
-sha1sums=('9c8ade62b91da960d194b5df0c0d87b994025a00')
+sha1sums=('e6ece3ec2fdcd5d454464f7c8677382a6c79359f')
build() {
mkdir build
diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD
index 2ae2f05ea..0ac6e1eac 100644
--- a/extra/kdegames-kmines/PKGBUILD
+++ b/extra/kdegames-kmines/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198903 2013-11-05 20:02:19Z andrea $
+# $Id: PKGBUILD 202538 2013-12-22 12:48:25Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kmines
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="The classic Minesweeper game"
url="http://kde.org/applications/games/kmines/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kmines-${pkgver}.tar.xz")
-sha1sums=('e22e62f54a4e259385bd8927b1d582d011acb807')
+sha1sums=('05de6c7620247d4b221a0cae5905e9c3a553843f')
build() {
mkdir build
diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD
index 4ba26e0fd..eb9b1d536 100644
--- a/extra/kdegames-knavalbattle/PKGBUILD
+++ b/extra/kdegames-knavalbattle/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198904 2013-11-05 20:03:35Z andrea $
+# $Id: PKGBUILD 202539 2013-12-22 12:48:27Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-knavalbattle
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A ship sinking game"
url="http://kde.org/applications/games/knavalbattle/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/knavalbattle-${pkgver}.tar.xz")
-sha1sums=('025c480ecea840efecbd20b41921ce56fe52d470')
+sha1sums=('039b6590ae20cecbb24f5f7a17e45e3fef49d98f')
build() {
mkdir build
diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD
index 605568d5a..55390e765 100644
--- a/extra/kdegames-knetwalk/PKGBUILD
+++ b/extra/kdegames-knetwalk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198905 2013-11-05 20:03:45Z andrea $
+# $Id: PKGBUILD 202540 2013-12-22 12:48:28Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-knetwalk
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Connect all the terminals to the server, in as few turns as possible"
url="http://kde.org/applications/games/knetwalk/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/knetwalk-${pkgver}.tar.xz")
-sha1sums=('ac66b169d7a7c3c42aa937efc2d6d1576b352d7e')
+sha1sums=('2aa6b90be52f74c97531862ae1688f0433bd0f17')
build() {
mkdir build
diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD
index 3f001c9a1..ea4269f3e 100644
--- a/extra/kdegames-kolf/PKGBUILD
+++ b/extra/kdegames-kolf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198906 2013-11-05 20:04:01Z andrea $
+# $Id: PKGBUILD 202541 2013-12-22 12:48:29Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kolf
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A miniature golf game with 2d top-down view"
url="http://kde.org/applications/games/kolf/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kolf-${pkgver}.tar.xz")
-sha1sums=('5302fa38428e790d288687f6cfb6975e4b3ea6c6')
+sha1sums=('e3a03d50676018934affe5a4c1a9b4f82dca79fc')
build() {
mkdir build
diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD
index 9ac6b370a..171120580 100644
--- a/extra/kdegames-kollision/PKGBUILD
+++ b/extra/kdegames-kollision/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198907 2013-11-05 20:04:47Z andrea $
+# $Id: PKGBUILD 202542 2013-12-22 12:48:30Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kollision
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A simple ball dodging game"
url="http://kde.org/applications/games/kollision/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kollision-${pkgver}.tar.xz")
-sha1sums=('1531e19d1a295590d343e7507d57f42479041d40')
+sha1sums=('434928e8cf6e37e4afcb91cee78201f3f79a243e')
build() {
mkdir build
diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD
index d614f7c9a..a911c974f 100644
--- a/extra/kdegames-konquest/PKGBUILD
+++ b/extra/kdegames-konquest/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198908 2013-11-05 20:04:59Z andrea $
+# $Id: PKGBUILD 202543 2013-12-22 12:48:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-konquest
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="The KDE version of Gnu-Lactic"
url="http://kde.org/applications/games/konquest/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/konquest-${pkgver}.tar.xz")
-sha1sums=('b0920dc829c4a06ca497d61c65db4e31df9a3297')
+sha1sums=('8e4b8f4cd1463c5f10292a945f5d0af2173b0079')
build() {
mkdir build
diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD
index becd68899..1a18814f9 100644
--- a/extra/kdegames-kpatience/PKGBUILD
+++ b/extra/kdegames-kpatience/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198909 2013-11-05 20:05:08Z andrea $
+# $Id: PKGBUILD 202544 2013-12-22 12:48:33Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kpatience
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Offers a selection of solitaire card games"
url="http://kde.org/applications/games/kpat/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kpat-${pkgver}.tar.xz")
-sha1sums=('17ec8411212a75b3a2fab2b85f9c88bfe2bfbdd7')
+sha1sums=('698a82df3cd00949ba7049c6a0806320992a651d')
build() {
mkdir build
diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD
index f34fd3546..bd2a06eeb 100644
--- a/extra/kdegames-kreversi/PKGBUILD
+++ b/extra/kdegames-kreversi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198910 2013-11-05 20:05:17Z andrea $
+# $Id: PKGBUILD 202545 2013-12-22 12:48:35Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kreversi
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A simple one player strategy game played against the computer"
url="http://kde.org/applications/games/kreversi/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kreversi-${pkgver}.tar.xz")
-sha1sums=('4bd4c5c96fc72ad6ea125f2ac5c4f3212d881763')
+sha1sums=('6a02522dda4d501ba4268acd14b24d9174837fb6')
build() {
mkdir build
diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD
index a103077ea..da306203f 100644
--- a/extra/kdegames-kshisen/PKGBUILD
+++ b/extra/kdegames-kshisen/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198911 2013-11-05 20:05:26Z andrea $
+# $Id: PKGBUILD 202546 2013-12-22 12:48:36Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kshisen
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A solitaire-like game played using the standard set of Mahjong tiles"
url="http://kde.org/applications/games/kshisen/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'libkmahjongg')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kshisen-${pkgver}.tar.xz")
-sha1sums=('8388960ca6964807b2dc9f6f54465a5408011c6d')
+sha1sums=('a027c93ff933ba5928fe539409b09cfcc50c9a6d')
build() {
mkdir build
diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD
index f36b31a9b..5d3babd0b 100644
--- a/extra/kdegames-ksirk/PKGBUILD
+++ b/extra/kdegames-ksirk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198912 2013-11-05 20:05:36Z andrea $
+# $Id: PKGBUILD 202547 2013-12-22 12:48:38Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-ksirk
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A computerized version of a well known strategy game"
url="http://kde.org/applications/games/ksirk/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ksirk-${pkgver}.tar.xz")
-sha1sums=('bfb8f1cab0a6cc94618b612f6b24979a3cc52ed7')
+sha1sums=('39fff63dca23268d83ba006bad733c1046d84beb')
build() {
mkdir build
diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD
index be13c6e7e..7db9b83d8 100644
--- a/extra/kdegames-ksnakeduel/PKGBUILD
+++ b/extra/kdegames-ksnakeduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198913 2013-11-05 20:05:45Z andrea $
+# $Id: PKGBUILD 202548 2013-12-22 12:48:39Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-ksnakeduel
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A simple snake duel game"
url="http://kde.org/applications/games/ksnakeduel/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ksnakeduel-${pkgver}.tar.xz")
-sha1sums=('c64fbe0973582938ed8aa46b65e29e3a6e38fb80')
+sha1sums=('dc0113638ea1eff7df3a8562431bcdc630ab896a')
build() {
mkdir build
diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD
index 9580ecb03..06f467932 100644
--- a/extra/kdegames-kspaceduel/PKGBUILD
+++ b/extra/kdegames-kspaceduel/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198914 2013-11-05 20:05:54Z andrea $
+# $Id: PKGBUILD 202549 2013-12-22 12:48:41Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kspaceduel
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Each of two possible players controls a satellite spaceship orbiting the sun"
url="http://kde.org/applications/games/kspaceduel/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kspaceduel-${pkgver}.tar.xz")
-sha1sums=('5c1507de0b2d20eda890895b03cbcffe6c3f57c5')
+sha1sums=('6b633e9e75119385b4aae8527645b6c3579f0af1')
build() {
mkdir build
diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD
index e8bf721dc..38645f952 100644
--- a/extra/kdegames-ksquares/PKGBUILD
+++ b/extra/kdegames-ksquares/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198915 2013-11-05 20:06:04Z andrea $
+# $Id: PKGBUILD 202550 2013-12-22 12:48:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-ksquares
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A modeled after the well known pen and paper based game of Dots and Boxes"
url="http://kde.org/applications/games/ksquares/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ksquares-${pkgver}.tar.xz")
-sha1sums=('a1ea089ce5a0373f78801b605b7828b720f0aada')
+sha1sums=('78ae226c767459b36ec69d806b2562e9341b94d4')
build() {
mkdir build
diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD
index 89b91f7b6..510afff4f 100644
--- a/extra/kdegames-ksudoku/PKGBUILD
+++ b/extra/kdegames-ksudoku/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198916 2013-11-05 20:06:13Z andrea $
+# $Id: PKGBUILD 202551 2013-12-22 12:48:44Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-ksudoku
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A logic-based symbol placement puzzle"
url="http://kde.org/applications/games/ksudoku/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ksudoku-${pkgver}.tar.xz")
-sha1sums=('5f311bea8dffa71001f311317ff98b55e57c525d')
+sha1sums=('a0e015d8377a450c7e309395c08568d484373fae')
build() {
mkdir build
diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD
index 612b7f6d0..d4e124ac5 100644
--- a/extra/kdegames-ktuberling/PKGBUILD
+++ b/extra/kdegames-ktuberling/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198917 2013-11-05 20:06:22Z andrea $
+# $Id: PKGBUILD 202552 2013-12-22 12:48:46Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-ktuberling
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A simple constructor game suitable for children and adults alike"
url="http://kde.org/applications/games/ktuberling/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ktuberling-${pkgver}.tar.xz")
-sha1sums=('808820f30903cb34b578ad431e4c7b789cf8b04e')
+sha1sums=('b3613320dc296bca59caab64d2c92fa1dcbbf589')
build() {
mkdir build
diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD
index 5e67848bf..1a72eabe6 100644
--- a/extra/kdegames-kubrick/PKGBUILD
+++ b/extra/kdegames-kubrick/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198918 2013-11-05 20:06:35Z andrea $
+# $Id: PKGBUILD 202553 2013-12-22 12:48:47Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-kubrick
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Based on the famous Rubik's Cube"
url="http://kde.org/applications/games/kubrick/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kubrick-${pkgver}.tar.xz")
-sha1sums=('38855de0bf35b3921632bb54e762b932e19e1a00')
+sha1sums=('87d888772bfc7f73cdef5a4b1644de9ba7babd38')
build() {
mkdir build
diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD
index e5df0606d..abd1df5cb 100644
--- a/extra/kdegames-lskat/PKGBUILD
+++ b/extra/kdegames-lskat/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198919 2013-11-05 20:06:44Z andrea $
+# $Id: PKGBUILD 202554 2013-12-22 12:48:48Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-lskat
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Lieutenant Skat is a fun and engaging card game for two players"
url="http://kde.org/applications/games/lskat/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/lskat-${pkgver}.tar.xz")
-sha1sums=('86046bcb33bbe85415fe0275964366236228ac3f')
+sha1sums=('bd66a6506caa9418b653a6d675a28073d31c41d4')
build() {
mkdir build
diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD
index 2aa47ea83..2b72ee3a5 100644
--- a/extra/kdegames-palapeli/PKGBUILD
+++ b/extra/kdegames-palapeli/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198920 2013-11-05 20:06:53Z andrea $
+# $Id: PKGBUILD 202555 2013-12-22 12:48:51Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-palapeli
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A single-player jigsaw puzzle game"
url="http://kde.org/applications/games/palapeli/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames' 'qhull')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz")
-sha1sums=('ebd7ad175b79d821ef0c2dc7fac07ec5339a85a3')
+sha1sums=('3c8b1eb087116316422a5c95798d1d7ad150254a')
build() {
mkdir build
diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD
index 970749ecb..32426f32f 100644
--- a/extra/kdegames-picmi/PKGBUILD
+++ b/extra/kdegames-picmi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198921 2013-11-05 20:07:02Z andrea $
+# $Id: PKGBUILD 202556 2013-12-22 12:48:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegames-picmi
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A nonogram logic game for KDE"
url="http://kde.org/applications/games/picmi/"
@@ -15,7 +15,7 @@ replaces=('picmi')
conflicts=('picmi')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/picmi-${pkgver}.tar.xz")
-sha1sums=('f87583d20afcf0a5f2d714c8b6575b114e5360af')
+sha1sums=('f7b3fa5e44b117ae44d173c14763896692e589d0')
build() {
mkdir build
diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD
index d32d10b77..958c8cd4c 100644
--- a/extra/kdegraphics-gwenview/PKGBUILD
+++ b/extra/kdegraphics-gwenview/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198922 2013-11-05 20:07:12Z andrea $
+# $Id: PKGBUILD 202557 2013-12-22 12:48:54Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-gwenview
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A fast and easy to use image viewer for KDE"
url="http://kde.org/applications/graphics/gwenview/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'mesa')
optdepends=('kipi-plugins: extra plugins to share photos')
install=$pkgname.install
source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz")
-sha1sums=('e4e6dcb883819fdc53e739d4d78d2b90c930f12e')
+sha1sums=('f801c71dd94f77caacfc812b7bcadf6023e2a58b')
build() {
mkdir build
diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD
index 12c7590ff..b5753788a 100644
--- a/extra/kdegraphics-kamera/PKGBUILD
+++ b/extra/kdegraphics-kamera/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198923 2013-11-05 20:07:22Z andrea $
+# $Id: PKGBUILD 202558 2013-12-22 12:48:56Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-kamera
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Configure Kamera"
url="http://kde.org/applications/graphics/kamera/"
@@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics')
depends=('kdebase-runtime' 'libgphoto2')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz")
-sha1sums=('e412f5d7ec52257e13184c5b70ae97579d8d9455')
+sha1sums=('4edc3add701c68a0327dcad772e69f2e23d697cf')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD
index 1a0aa03c9..1e0e01e30 100644
--- a/extra/kdegraphics-kcolorchooser/PKGBUILD
+++ b/extra/kdegraphics-kcolorchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198924 2013-11-05 20:07:32Z andrea $
+# $Id: PKGBUILD 202559 2013-12-22 12:48:57Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-kcolorchooser
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Color Chooser"
url="http://kde.org/applications/graphics/kcolorchooser/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz")
-sha1sums=('5ea857f02fb153f20c29f2e055f4de38c52c2d10')
+sha1sums=('46121f527af58b08738ce20623c1b25d00bf20e2')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD
index 39555de0a..d4f79cc64 100644
--- a/extra/kdegraphics-kgamma/PKGBUILD
+++ b/extra/kdegraphics-kgamma/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198925 2013-11-05 20:07:41Z andrea $
+# $Id: PKGBUILD 202560 2013-12-22 12:48:59Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-kgamma
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A monitor calibration tool"
url="http://kde.org/applications/graphics/kgamma/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics')
depends=('kdebase-runtime' 'libxxf86vm')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz")
-sha1sums=('54dbbf355bfed3b4d94fee10c30217443570926a')
+sha1sums=('b0ebd6963b4438069b0a016bf122207c00ac7da9')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD
index 35cda4e18..1efb3bb1b 100644
--- a/extra/kdegraphics-kolourpaint/PKGBUILD
+++ b/extra/kdegraphics-kolourpaint/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198926 2013-11-05 20:07:50Z andrea $
+# $Id: PKGBUILD 202561 2013-12-22 12:49:01Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-kolourpaint
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Paint Program"
url="http://kde.org/applications/graphics/kolourpaint/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz")
-sha1sums=('fb9adff50e0edc1bf01183e70fdf1a6b9438b7f9')
+sha1sums=('2bb9eb48b8dffe689c17d95ecb7e51d01ffc6cdc')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD
index 44adad058..df8db32ea 100644
--- a/extra/kdegraphics-kruler/PKGBUILD
+++ b/extra/kdegraphics-kruler/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198927 2013-11-05 20:08:00Z andrea $
+# $Id: PKGBUILD 202562 2013-12-22 12:49:02Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-kruler
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Screen Ruler"
url="http://kde.org/applications/graphics/kruler/"
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz")
-sha1sums=('be7a9cb78c8b2de25b6fbe22f2cce2dd885eafd5')
+sha1sums=('1c3de59f559c8621f667351a9b66f4de00e7731c')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD
index cbc6542ca..cb5dc127e 100644
--- a/extra/kdegraphics-ksaneplugin/PKGBUILD
+++ b/extra/kdegraphics-ksaneplugin/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198928 2013-11-05 20:08:10Z andrea $
+# $Id: PKGBUILD 202563 2013-12-22 12:49:04Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-ksaneplugin
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A scan plugin that implements the scanning"
url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz")
-sha1sums=('f6ec3a98fe99e38cfa6dbfd56837b344ca27b956')
+sha1sums=('e04f67e75a2cd0e98a097674cdc1b93b17f8d77c')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD
index d4214e897..703d1d2db 100644
--- a/extra/kdegraphics-ksnapshot/PKGBUILD
+++ b/extra/kdegraphics-ksnapshot/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198929 2013-11-05 20:08:18Z andrea $
+# $Id: PKGBUILD 202564 2013-12-22 12:49:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-ksnapshot
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Screen Capture Program"
url="http://kde.org/applications/graphics/ksnapshot/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
optdepends=('kipi-plugins')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz")
-sha1sums=('5e3837ef023ffa681417fbf7bc79e696e280cd1c')
+sha1sums=('20ced4e4fe02f8af84c61b7ff915e8baadce4639')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD
index 66afe8d39..3edf367e3 100644
--- a/extra/kdegraphics-mobipocket/PKGBUILD
+++ b/extra/kdegraphics-mobipocket/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 198930 2013-11-05 20:08:45Z andrea $
+# $Id: PKGBUILD 202453 2013-12-22 12:46:33Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-mobipocket
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A collection of plugins to handle mobipocket files"
url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
depends=('kdelibs')
-makedepends=('cmake' 'automoc4' 'kdegraphics-okular')
+makedepends=('cmake' 'automoc4')
groups=('kde' 'kdegraphics')
replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('53d52b27ed1dd0149dacf2cd672ef52e762385d8')
+sha1sums=('60fc877f9669d50ca77513b1de73b54140f6eddf')
-build() {
- cd "${srcdir}"
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
@@ -29,6 +31,6 @@ build() {
}
package() {
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index e840d5645..8fb927e60 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 198827 2013-11-05 19:44:40Z andrea $
+# $Id: PKGBUILD 202463 2013-12-22 12:46:45Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-okular
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Document Viewer'
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/graphics/okular/"
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
- 'ebook-tools' 'libspectre')
+depends=('kdebase-runtime' 'qimageblitz' 'chmlib' 'djvulibre' 'libspectre'
+ 'libkexiv2')
makedepends=('cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
-sha1sums=('b65e4124aab93220302721d03db09469f4c3d7c7')
+sha1sums=('1fde4dd5e271e541f0f4db525c2597c895f407d5')
-build() {
- cd "${srcdir}"
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../okular-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
@@ -30,6 +31,6 @@ build() {
}
package() {
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD
index 0b19e77a8..75ba60fef 100644
--- a/extra/kdegraphics-strigi-analyzer/PKGBUILD
+++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198931 2013-11-05 20:09:22Z andrea $
+# $Id: PKGBUILD 202565 2013-12-22 12:49:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-strigi-analyzer
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Strigi analyzers for various graphics file formats"
url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('eba5719133828a14c51d3f18f3ff079c1cb2b076')
+sha1sums=('bb7fbcc4e644baee5fa298cd3b0cc11d267da80d')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD
index 22be0b831..346b0f632 100644
--- a/extra/kdegraphics-svgpart/PKGBUILD
+++ b/extra/kdegraphics-svgpart/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198932 2013-11-05 20:09:32Z andrea $
+# $Id: PKGBUILD 202566 2013-12-22 12:49:08Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-svgpart
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A KPart for viewing SVGs"
url="https://projects.kde.org/projects/kde/kdegraphics/svgpart"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz")
-sha1sums=('555da194e7909ec47d6ca5fd108dc9f327b79c8b')
+sha1sums=('dd58aade7943c99904e753934986fdd901f960ff')
build() {
cd "${srcdir}"
diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD
index 4bd341b5d..516d7d3d3 100644
--- a/extra/kdegraphics-thumbnailers/PKGBUILD
+++ b/extra/kdegraphics-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198933 2013-11-05 20:09:42Z andrea $
+# $Id: PKGBUILD 202567 2013-12-22 12:49:10Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-thumbnailers
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Thumbnailers for various graphics file formats"
url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e23d895bcfd15584a3e405aaaae58c209ab70fa1')
+sha1sums=('2a9f551c2271298ee16f8e12f9d18c84bceb9c09')
build() {
cd "${srcdir}"
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index 876edb059..e4b58b8f2 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,21 +1,20 @@
-# $Id: PKGBUILD 184257 2013-05-05 07:01:52Z eric $
+# $Id: PKGBUILD 200735 2013-12-03 18:03:09Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=18
+pkgrel=19
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL' 'LGPL')
depends=('libxslt' 'libart-lgpl' 'alsa-lib' 'libcups' 'jasper'
- 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates')
+ 'libidn' 'openexr' 'aspell' 'qt3' 'ca-certificates' 'xorg-iceauth')
makedepends=('cups' 'hspell' 'optipng')
optdepends=('hspell: for Hebrew spell-checking support')
-options=('libtool' '!makeflags')
-install=kdelibs3.install
+options=('libtool' 'staticlibs' '!makeflags')
source=("ftp://ftp.kde.org/pub/kde/stable/${pkgver}/src/kdelibs-${pkgver}.tar.bz2"
'ftp://ftp.archlinux.org/other/kde/kde-3.5-1074156.patch.gz'
'acinclude.patch'
diff --git a/extra/kdelibs3/kdelibs3.install b/extra/kdelibs3/kdelibs3.install
deleted file mode 100644
index 7291ac0a2..000000000
--- a/extra/kdelibs3/kdelibs3.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- post_remove
-}
-
-post_upgrade() {
- post_remove
-}
-
-post_remove() {
- # this can be removed in future versions
- sed -ie '/\/opt\/kde\/lib/d' etc/ld.so.conf
-}
diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD
index 0c4c6d841..774bf8b3b 100644
--- a/extra/kdemultimedia-audiocd-kio/PKGBUILD
+++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198934 2013-11-05 20:09:53Z andrea $
+# $Id: PKGBUILD 202568 2013-12-22 12:49:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdemultimedia-audiocd-kio
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Kioslave for accessing audio CDs"
url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio'
@@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia')
replaces=('kdemultimedia-kioslave')
conflicts=('kdemultimedia-kioslave')
source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz")
-sha1sums=('9b23a28843b4d23fc1cbb947320a1dd66f2b0018')
+sha1sums=('f9218418414099b9ca30adba95f9032aa86dafc6')
build() {
cd "${srcdir}"
diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD
index 178b2372d..f26673c3c 100644
--- a/extra/kdemultimedia-dragonplayer/PKGBUILD
+++ b/extra/kdemultimedia-dragonplayer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198935 2013-11-05 20:10:03Z andrea $
+# $Id: PKGBUILD 202569 2013-12-22 12:49:13Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdemultimedia-dragonplayer
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A multimedia player where the focus is on simplicity, instead of
features"
@@ -14,7 +14,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz")
-sha1sums=('d6682f0dd7a62b7576bc9778ff711abdcc9ba45b')
+sha1sums=('22370adaedb5d689ccc1e36430936c5c2bad17db')
build() {
cd "${srcdir}"
diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
index 5cdf2c160..6958a80e5 100644
--- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
+++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198936 2013-11-05 20:10:13Z andrea $
+# $Id: PKGBUILD 202570 2013-12-22 12:49:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdemultimedia-ffmpegthumbs
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='FFmpeg-based thumbnail creator for video files'
url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs'
@@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia')
depends=('kdelibs' 'ffmpeg')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz")
-sha1sums=('23d911d71dbcd6e5704b0ebec66d5ba0f91f9931')
+sha1sums=('6546cf5cbaf3cb38cc79aa6dbc0f8187499cac55')
build() {
cd "${srcdir}"
diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD
index 308ef0f6a..747c69849 100644
--- a/extra/kdemultimedia-juk/PKGBUILD
+++ b/extra/kdemultimedia-juk/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198937 2013-11-05 20:10:22Z andrea $
+# $Id: PKGBUILD 202571 2013-12-22 12:49:16Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdemultimedia-juk
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='A jukebox, tagger and music collection manager'
url='http://kde.org/applications/multimedia/juk/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz")
-sha1sums=('05b684897ba8f4eb4cce1d10aaf1f1f6afa358be')
+sha1sums=('ea658f5e757baf850f7b3690da77d5754fe386ec')
build() {
cd "${srcdir}"
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index 61836c3b5..a44cb9ee5 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198938 2013-11-05 20:11:56Z andrea $
+# $Id: PKGBUILD 202572 2013-12-22 12:49:21Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdemultimedia-kmix
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="KDE volume control program"
url='http://kde.org/applications/multimedia/kmix/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('3d3813f66b034bbe603c0958d41b7b26cfa80e40')
+sha1sums=('839d23f2f76e79eb20bde46472774a8c678221c9')
build() {
cd "${srcdir}"
diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD
index 6bc6e9e53..5ba5ce2bc 100644
--- a/extra/kdemultimedia-kscd/PKGBUILD
+++ b/extra/kdemultimedia-kscd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198939 2013-11-05 20:12:04Z andrea $
+# $Id: PKGBUILD 202573 2013-12-22 12:49:23Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdemultimedia-kscd
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="KDE CD player"
url='http://kde.org/applications/multimedia/kscd/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libmusicbrainz3')
makedepends=('cmake' 'automoc4')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz")
-sha1sums=('c2028b71516c6ca3708aac2170e9e146c51110ce')
+sha1sums=('d43ee9e8fb00f368575c2f0e62f5efaa539b876e')
build() {
mkdir build
diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
index 3817fd6ad..bf2b6b887 100644
--- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD
+++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198940 2013-11-05 20:12:16Z andrea $
+# $Id: PKGBUILD 202574 2013-12-22 12:49:24Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdemultimedia-mplayerthumbs
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="MPlayer based thumbnail generator for video files"
url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs'
@@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL')
depends=('kdebase-runtime' 'mplayer')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz")
-sha1sums=('6f61935359f2dfb1073884a8d48738663b5aa33a')
+sha1sums=('1cc91d50e1747a640f951d13c2577d33679efaa2')
build() {
cd "${srcdir}"
diff --git a/extra/kdenetwork-filesharing/PKGBUILD b/extra/kdenetwork-filesharing/PKGBUILD
index fd7801fdb..dfbad589f 100644
--- a/extra/kdenetwork-filesharing/PKGBUILD
+++ b/extra/kdenetwork-filesharing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202575 2013-12-22 12:49:25Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdenetwork-filesharing
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Properties dialog plugin to share a directory with the local network'
url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-filesharing'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'smbclient')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-filesharing-${pkgver}.tar.xz")
-sha1sums=('db93e4617230aebd377e415475e7ad5dd4e9b549')
+sha1sums=('6ef2be648f6b4f64f9ff0542d9dceb79f4a9881f')
build() {
mkdir build
diff --git a/extra/kdenetwork-kdnssd/PKGBUILD b/extra/kdenetwork-kdnssd/PKGBUILD
index 26fb1a73e..bc97ce2c6 100644
--- a/extra/kdenetwork-kdnssd/PKGBUILD
+++ b/extra/kdenetwork-kdnssd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202576 2013-12-22 12:49:27Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdenetwork-kdnssd
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Monitors the network for DNS-SD services'
url='https://projects.kde.org/projects/kde/kdenetwork/kdnssd'
@@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/kdnssd-${pkgver}.tar.xz")
-sha1sums=('4d26fda0e964c5baca68336a1c035252d6f1d4bb')
+sha1sums=('4ebd5320344b02726652552536f28c468f9049ee')
build() {
mkdir build
diff --git a/extra/kdenetwork-kget/PKGBUILD b/extra/kdenetwork-kget/PKGBUILD
index 2382d20b8..5f5038376 100644
--- a/extra/kdenetwork-kget/PKGBUILD
+++ b/extra/kdenetwork-kget/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202577 2013-12-22 12:49:28Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdenetwork-kget
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Download Manager'
url='http://kde.org/applications/internet/kget/'
@@ -13,7 +13,7 @@ depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms' 'gpgme' 'nepom
makedepends=('cmake' 'automoc4' 'boost')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kget-${pkgver}.tar.xz")
-sha1sums=('1f186e190d6f396eeeacbcb36fcfce414abb4365')
+sha1sums=('5d327b26c68f0aaa7a088992de10136b1786aba9')
build() {
mkdir build
diff --git a/extra/kdenetwork-kppp/PKGBUILD b/extra/kdenetwork-kppp/PKGBUILD
index d34bd1c2f..e3b9426a0 100644
--- a/extra/kdenetwork-kppp/PKGBUILD
+++ b/extra/kdenetwork-kppp/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202579 2013-12-22 12:49:31Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdenetwork-kppp
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Internet Dial-Up Tool'
url='http://kde.org/applications/internet/kppp/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'ppp')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kppp-${pkgver}.tar.xz")
-sha1sums=('11608fce538eecb3496406e50c4d2e17f5f520b1')
+sha1sums=('6c8059159d38517311a532e97e33b7cdf7d714e5')
build() {
mkdir build
diff --git a/extra/kdenetwork-krdc/PKGBUILD b/extra/kdenetwork-krdc/PKGBUILD
index a268117fb..484ee097a 100644
--- a/extra/kdenetwork-krdc/PKGBUILD
+++ b/extra/kdenetwork-krdc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202580 2013-12-22 12:49:33Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdenetwork-krdc
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Remote Desktop Client'
url='http://kde.org/applications/internet/krdc/'
@@ -15,7 +15,7 @@ optdepends=('libvncserver: VNC support'
'freerdp: RDP support'
'kdebase-keditbookmarks: to edit bookmarks')
source=("http://download.kde.org/stable/${pkgver}/src/krdc-${pkgver}.tar.xz")
-sha1sums=('17b7da4c9acfefcedb67d017323c66279aedc428')
+sha1sums=('0f26191ada1fcbc2f785cd6f5d95df05dd1d37dd')
build() {
mkdir build
diff --git a/extra/kdenetwork-krfb/PKGBUILD b/extra/kdenetwork-krfb/PKGBUILD
index f5e209fdf..807bc44ce 100644
--- a/extra/kdenetwork-krfb/PKGBUILD
+++ b/extra/kdenetwork-krfb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202581 2013-12-22 12:49:34Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdenetwork-krfb
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Desktop Sharing'
url='http://www.kde.org/applications/system/krfb'
@@ -15,7 +15,7 @@ groups=('kde' 'kdenetwork')
depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/krfb-${pkgver}.tar.xz")
-sha1sums=('391f0bbc115a6e874d8c16e76c9bc0d75ea2ab5f')
+sha1sums=('b58f92ba9f1b98c5623bb4a0bc14ed9838f8280a')
build() {
mkdir build
diff --git a/extra/kdenetwork-strigi-analyzers/PKGBUILD b/extra/kdenetwork-strigi-analyzers/PKGBUILD
index c422a704f..c604a396f 100644
--- a/extra/kdenetwork-strigi-analyzers/PKGBUILD
+++ b/extra/kdenetwork-strigi-analyzers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202582 2013-12-22 12:49:35Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdenetwork-strigi-analyzers
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Strigi analyzers for various network protocols'
url='https://projects.kde.org/projects/kde/kdenetwork/kdenetwork-strigi-analyzers'
@@ -12,7 +12,7 @@ groups=('kde' 'kdenetwork')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4' 'boost')
source=("http://download.kde.org/stable/${pkgver}/src/kdenetwork-strigi-analyzers-${pkgver}.tar.xz")
-sha1sums=('7b294cbf762ee5649df1a1f65d0613ee4b783641')
+sha1sums=('f3c0b07765236d18a01865986cca134fce68a1d5')
build() {
mkdir build
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index 2a8d033dc..f18ca1d45 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198824 2013-11-05 19:44:04Z andrea $
+# $Id: PKGBUILD 202459 2013-12-22 12:46:39Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdepim-runtime
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Extends the functionality of kdepim'
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab' 'libkfbapi')
makedepends=('cmake' 'automoc4' 'boost')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('168455654655bd302c668ca91f18fab47fa6cd3c')
+sha1sums=('fe988ea74cf83f1dae99f81bc02eefaa834c664c')
prepare() {
mkdir build
diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 1bb258901..a1bfa5849 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198949 2013-11-05 20:17:31Z andrea $
+# $Id: PKGBUILD 202583 2013-12-22 12:49:38Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole'
'kdepim-ktimetracker'
'kdepim-ktnef'
'kdepim-libkdepim')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64')
url='http://pim.kde.org'
@@ -29,7 +29,7 @@ groups=('kde' 'kdepim')
makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link'
'kde-agent' 'nepomuk-widgets' 'link-grammar')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('627b027bb276c41ac8a1face093e777bfafcabf0')
+sha1sums=('1ca184dc89f8c8395ffe4ec62a3fdcd0a7397ac4')
build() {
mkdir build
@@ -59,8 +59,6 @@ package_kdepim-akregator() {
install='kdepim-akregator.install'
cd "${srcdir}"/build/akregator
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/akregator
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/akregator
make DESTDIR="${pkgdir}" install
}
@@ -74,23 +72,17 @@ package_kdepim-blogilo() {
install='kdepim.install'
cd "${srcdir}"/build/blogilo
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/blogilo
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/composereditor-ng
make DESTDIR="${pkgdir}" install
}
package_kdepim-console() {
pkgdesc='Command line tool for accessing calendar files'
- depends=('kdepim-runtime')
+ depends=('kdepim-libkdepim')
url='http://pim.kde.org'
install='kdepim.install'
cd "${srcdir}"/build/console
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kabcclient
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/konsolekalendar
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kaddressbook() {
@@ -98,12 +90,11 @@ package_kdepim-kaddressbook() {
depends=('kdepim-libkdepim')
url="http://kde.org/applications/office/kaddressbook/"
install='kdepim.install'
- cd "${srcdir}"/build/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
+ for i in kaddressbook kontact/plugins/kaddressbook \
+ plugins/kaddressbook contactthemeeditor; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
}
package_kdepim-kalarm() {
@@ -113,8 +104,6 @@ package_kdepim-kalarm() {
install='kdepim.install'
cd "${srcdir}"/build/kalarm
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kalarm
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kjots() {
@@ -124,8 +113,6 @@ package_kdepim-kjots() {
install='kdepim.install'
cd "${srcdir}"/build/kjots
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kjots
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/kjots
make DESTDIR="${pkgdir}" install
}
@@ -137,10 +124,6 @@ package_kdepim-kleopatra() {
url="http://kde.org/applications/utilities/kleopatra/"
cd "${srcdir}"/build/kleopatra
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kleopatra
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kwatchgnupg
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kmail() {
@@ -152,12 +135,12 @@ package_kdepim-kmail() {
'kdepim-mimelib' 'kdepim-plugins')
replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
'kdepim-mimelib' 'kdepim-plugins')
- for i in kmail doc/kmail kmailcvt archivemailagent \
- importwizard ksendemail libksieve messagelist mailfilteragent \
- ontologies kontact/plugins/kmail headerthemeeditor; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
+ for i in kmail kmailcvt agents/archivemailagent agents/folderarchiveagent\
+ agents/mailfilteragent importwizard ksendemail libksieve messagelist \
+ ontologies kontact/plugins/kmail headerthemeeditor mboximporter; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
}
package_kdepim-knode() {
@@ -167,10 +150,6 @@ package_kdepim-knode() {
install='kdepim-knode.install'
cd "${srcdir}"/build/knode
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kioslave/news
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/knode
make DESTDIR="${pkgdir}" install
}
@@ -182,8 +161,6 @@ package_kdepim-knotes() {
install='kdepim.install'
cd "${srcdir}"/build/knotes
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knotes
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/knotes
make DESTDIR="${pkgdir}" install
}
@@ -195,8 +172,8 @@ package_kdepim-kontact() {
install='kdepim.install'
conflcits=('kdepim-kontactinterfaces')
replaces=('kdepim-kontactinterfaces')
- for i in kontact/src doc/kontact kontact/plugins/summary \
- kontact/plugins/specialdates doc/kontact-admin; do
+ for i in kontact/src kontact/plugins/summary \
+ kontact/plugins/specialdates; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
@@ -207,9 +184,8 @@ package_kdepim-korganizer() {
depends=('kdepim-libkdepim')
url="http://kde.org/applications/office/korganizer"
install='kdepim-korganizer.install'
- for i in korganizer doc/korganizer kontact/plugins/korganizer \
- calendarviews; do
- cd "${srcdir}"/build/${i}
+ for i in korganizer korgac kontact/plugins/korganizer calendarviews; do
+ cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
}
@@ -229,8 +205,6 @@ package_kdepim-ktimetracker() {
install='kdepim.install'
cd "${srcdir}"/build/ktimetracker
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktimetracker
- make DESTDIR="${pkgdir}" install
}
package_kdepim-ktnef() {
@@ -240,8 +214,6 @@ package_kdepim-ktnef() {
install=kdepim-ktnef.install
cd "${srcdir}"/build/ktnef
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktnef
- make DESTDIR="${pkgdir}" install
}
package_kdepim-libkdepim() {
@@ -253,11 +225,12 @@ package_kdepim-libkdepim() {
'kdepim-akonadi')
replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
'kdepim-akonadi')
- for i in akonadi_next calendarsupport incidenceeditor-ng \
- kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
- mailcommon mailimporter messagecomposer messagecore messageviewer \
- icons templateparser plugins/messageviewer grammar sendlateragent \
- plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
+ for i in agents/sendlateragent akonadi_next calendarsupport \
+ incidenceeditor-ng kaddressbookgrantlee kdgantt2 libkdepim \
+ libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \
+ messagecomposer messagecore messageviewer icons templateparser \
+ plugins/messageviewer grammar grantleetheme grantleethemeeditor \
+ plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD
index 1c11bab4b..d89202b7c 100644
--- a/extra/kdepimlibs/PKGBUILD
+++ b/extra/kdepimlibs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198820 2013-11-05 19:40:54Z andrea $
+# $Id: PKGBUILD 202455 2013-12-22 12:46:35Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdepimlibs
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="KDE PIM Libraries"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('nepomuk-core' 'gpgme' 'akonadi' 'libical' 'prison' 'qjson')
makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl')
install='kdepimlibs.install'
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('ca131d0e1d24dd2c03e40de8b7d482abe4eba755')
+sha1sums=('60b7bea192c5914daf0a5258ac61b781aa257a4a')
build() {
mkdir build
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD
index 3485ab153..fccc1bf4e 100644
--- a/extra/kdeplasma-addons/PKGBUILD
+++ b/extra/kdeplasma-addons/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198950 2013-11-05 20:17:53Z andrea $
+# $Id: PKGBUILD 202584 2013-12-22 12:49:41Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball'
'kdeplasma-addons-wallpapers-qmlwallpapers'
'kdeplasma-addons-wallpapers-virus'
'kdeplasma-addons-wallpapers-weather')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdeplasma-addons'
@@ -86,7 +86,7 @@ groups=('kde' 'kdeplasma-addons')
makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen'
'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('8f2b219a3e3434ba67691ba642f6dc43419ce907')
+sha1sums=('0e0df64b06c77285a0119832cadd548b6b223ff1')
prepare() {
mkdir build
diff --git a/extra/kdeplasma-applets-plasma-nm/PKGBUILD b/extra/kdeplasma-applets-plasma-nm/PKGBUILD
index 8b3f6260e..908cd5c05 100644
--- a/extra/kdeplasma-applets-plasma-nm/PKGBUILD
+++ b/extra/kdeplasma-applets-plasma-nm/PKGBUILD
@@ -1,29 +1,24 @@
-# $Id: PKGBUILD 197151 2013-10-23 12:04:45Z andrea $
+# $Id: PKGBUILD 200039 2013-11-22 00:08:52Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
pkgname=kdeplasma-applets-plasma-nm
-pkgver=0.9.3.1
-pkgrel=3
+pkgver=0.9.3.2
+pkgrel=1
pkgdesc="Plasma applet written in QML for managing network connections"
arch=('i686' 'x86_64')
url="https://projects.kde.org/projects/playground/network/plasma-nm"
license=('GPL')
depends=('kdebase-workspace' 'libnm-qt')
-makedepends=('cmake' 'automoc4' 'openconnect')
+makedepends=('cmake' 'automoc4' 'openconnect' 'mobile-broadband-provider-info')
optdepends=('mobile-broadband-provider-info: Database of mobile broadband service providers'
'openconnect: Cisco AnyConnect VPN plugin')
conflicts=('kdeplasma-applets-networkmanagement')
-source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz"
- 'plasma-nm-fixes.patch')
-md5sums=('c6ce9cd8523ec0f99fe87dea8b76a02f'
- 'e5825709f49ba6c4386e909b80f75066')
+source=("http://download.kde.org/unstable/plasma-nm/plasma-nm-${pkgver}.tar.xz")
+md5sums=('67dde011a859f2d72633cf3af5c9f847')
prepare() {
mkdir build
-
- cd plasma-nm-${pkgver}
- patch -p1 -i "${srcdir}"/plasma-nm-fixes.patch
}
build() {
diff --git a/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch b/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch
deleted file mode 100644
index d98448d7a..000000000
--- a/extra/kdeplasma-applets-plasma-nm/plasma-nm-fixes.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-diff --git a/applet/declarative/contents/ui/main.qml b/applet/declarative/contents/ui/main.qml
-index 8ea88cc..aa81707 100644
---- a/applet/declarative/contents/ui/main.qml
-+++ b/applet/declarative/contents/ui/main.qml
-@@ -19,6 +19,7 @@
- */
-
- import QtQuick 1.1
-+import org.kde.plasma.extras 0.1 as PlasmaExtras
- import org.kde.plasma.components 0.1 as PlasmaComponents
- import org.kde.plasma.core 0.1 as PlasmaCore
- import org.kde.networkmanagement 0.1 as PlasmaNM
-@@ -77,16 +78,7 @@ Item {
- anchors.fill: parent
- }
-
-- ListView {
-- id: connectionView;
--
-- property bool expandedItem: false;
-- property string previouslyExpandedItem: "";
--
-- property bool activeExpanded: true;
-- property bool previousExpanded: true;
-- property bool unknownExpanded: true;
--
-+ PlasmaExtras.ScrollArea {
- anchors {
- left: parent.left;
- right: parent.right;
-@@ -95,50 +87,64 @@ Item {
- topMargin: padding.margins.top;
- bottomMargin: padding.margins.bottom
- }
-- clip: true
-- model: connectionSortModel;
-- currentIndex: -1;
-- interactive: true;
-- boundsBehavior: Flickable.StopAtBounds;
-- section.property: "itemSection";
-- section.delegate: SectionHeader {
-- onHideSection: {
-- if (section == i18n("Active connections")) {
-- connectionView.activeExpanded = false;
-- } else if (section == i18n("Previous connections")) {
-- connectionView.previousExpanded = false;
-- } else {
-- connectionView.unknownExpanded = false;
-+
-+ ListView {
-+ id: connectionView;
-+
-+ property bool expandedItem: false;
-+ property string previouslyExpandedItem: "";
-+
-+ property bool activeExpanded: true;
-+ property bool previousExpanded: true;
-+ property bool unknownExpanded: true;
-+
-+ anchors.fill: parent;
-+
-+ clip: true
-+ model: connectionSortModel;
-+ currentIndex: -1;
-+ interactive: true;
-+ boundsBehavior: Flickable.StopAtBounds;
-+ section.property: "itemSection";
-+ section.delegate: SectionHeader {
-+ onHideSection: {
-+ if (section == i18n("Active connections")) {
-+ connectionView.activeExpanded = false;
-+ } else if (section == i18n("Previous connections")) {
-+ connectionView.previousExpanded = false;
-+ } else {
-+ connectionView.unknownExpanded = false;
-+ }
- }
-- }
-
-- onShowSection: {
-- if (section == i18n("Active connections")) {
-- connectionView.activeExpanded = true;
-- } else if (section == i18n("Previous connections")) {
-- connectionView.previousExpanded = true;
-- } else {
-- connectionView.unknownExpanded = true;
-+ onShowSection: {
-+ if (section == i18n("Active connections")) {
-+ connectionView.activeExpanded = true;
-+ } else if (section == i18n("Previous connections")) {
-+ connectionView.previousExpanded = true;
-+ } else {
-+ connectionView.unknownExpanded = true;
-+ }
- }
- }
-- }
-
-- delegate: ConnectionItem {
-- expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni;
-- onItemExpanded: {
-- if (itemExpanded) {
-- connectionView.expandedItem = true;
-- connectionView.previouslyExpandedItem = itemUni;;
-- connectionView.currentIndex = index;
-- } else {
-- connectionView.expandedItem = false;
-- connectionView.previouslyExpandedItem = "";
-+ delegate: ConnectionItem {
-+ expanded: connectionView.expandedItem && connectionView.previouslyExpandedItem == itemUni;
-+ onItemExpanded: {
-+ if (itemExpanded) {
-+ connectionView.expandedItem = true;
-+ connectionView.previouslyExpandedItem = itemUni;;
-+ connectionView.currentIndex = index;
-+ } else {
-+ connectionView.expandedItem = false;
-+ connectionView.previouslyExpandedItem = "";
-+ }
- }
-- }
-
-- ListView.onRemove: {
-- if (ListView.isCurrentItem) {
-- connectionView.previouslyExpandedItem = "";
-+ ListView.onRemove: {
-+ if (ListView.isCurrentItem) {
-+ connectionView.previouslyExpandedItem = "";
-+ }
- }
- }
- }
-diff --git a/declarative-plugins/applet/connectionicon.cpp b/declarative-plugins/applet/connectionicon.cpp
-index c3f8540..76bdca0 100644
---- a/declarative-plugins/applet/connectionicon.cpp
-+++ b/declarative-plugins/applet/connectionicon.cpp
-@@ -166,12 +166,24 @@ void ConnectionIcon::setIcons()
-
- foreach (const NetworkManager::ActiveConnection::Ptr & active, actives) {
- if (((active->default4() || active->default6()) && active->state() == NetworkManager::ActiveConnection::Activated) || !defaultRouteExists) {
-+ NetworkManager::ActiveConnection::Ptr activeConnection;
-+ if (active->vpn()) {
-+ NetworkManager::ActiveConnection::Ptr activeTmp;
-+ activeTmp = NetworkManager::findActiveConnection(active->specificObject());
-+ if (activeTmp) {
-+ activeConnection = activeTmp;
-+ }
-
-- if (active->vpn() || active->devices().isEmpty()) {
-+ vpnFound = true;
-+ NMAppletDebug() << "Emit signal setHoverIcon(object-locked)";
-+ Q_EMIT setHoverIcon("object-locked");
-+ } else {
-+ activeConnection = active;
-+ }
-+ if (activeConnection->devices().isEmpty()) {
- continue;
- }
--
-- NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(active->devices().first());
-+ NetworkManager::Device::Ptr device = NetworkManager::findNetworkInterface(activeConnection->devices().first());
- if (device) {
- NetworkManager::Device::Type type = device->type();
-
-@@ -184,7 +196,7 @@ void ConnectionIcon::setIcons()
- setWirelessIconForSignalStrength(100);
- connectionFound = true;
- } else {
-- NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(active->specificObject());
-+ NetworkManager::AccessPoint::Ptr ap = wifiDevice->findAccessPoint(activeConnection->specificObject());
- if (ap) {
- setWirelessIcon(device, ap->ssid());
- connectionFound = true;
-@@ -222,9 +234,7 @@ void ConnectionIcon::setIcons()
- }
- }
- }
-- }
--
-- if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) {
-+ } else if (active->vpn() && active->state() == NetworkManager::ActiveConnection::Activated) {
- vpnFound = true;
- NMAppletDebug() << "Emit signal setHoverIcon(object-locked)";
- Q_EMIT setHoverIcon("object-locked");
-diff --git a/declarative-plugins/applet/networkstatus.cpp b/declarative-plugins/applet/networkstatus.cpp
-index d63066d..8149da9 100644
---- a/declarative-plugins/applet/networkstatus.cpp
-+++ b/declarative-plugins/applet/networkstatus.cpp
-@@ -129,8 +129,8 @@ void NetworkStatus::changeTooltip()
- }
-
- QString tooltip = "<qt>";
-- QString format = "<b>%1 - %2</b><br>%3<br><br>";
-- QString formatDefault = "<b>%1 - %2</b><br><b>%3</b><br><br>";
-+ const QString format = "<b>%1 - %2</b><br>%3<br><br>";
-+ const QString formatDefault = "<b>%1 - %2</b><br><b>%3</b><br><br>";
-
- foreach (const NetworkManager::ActiveConnection::Ptr & active, NetworkManager::activeConnections()) {
- if (!active->devices().isEmpty()) {
-@@ -145,7 +145,6 @@ void NetworkStatus::changeTooltip()
- } else {
- devName = device->ipInterfaceName();
- }
--// conType = NetworkManager::ConnectionSettings::typeAsString(active->connection()->settings()->connectionType());
- if (active->vpn()) {
- conType = i18n("VPN Connection");
- } else {
-diff --git a/declarative-plugins/model/model.cpp b/declarative-plugins/model/model.cpp
-index 1b3f4c3..bb88362 100644
---- a/declarative-plugins/model/model.cpp
-+++ b/declarative-plugins/model/model.cpp
-@@ -230,7 +230,7 @@ void Model::addConnection(const QString& connection, const QString& device)
- {
- NetworkManager::Connection::Ptr con = NetworkManager::findConnection(connection);
-
-- if (con->settings()->isSlave()) {
-+ if (con->settings()->isSlave() || con->name().isEmpty() || con->uuid().isEmpty()) {
- return;
- }
-
-@@ -395,7 +395,11 @@ void Model::removeWirelessNetwork(const QString& ssid, const QString& device)
- if (wirelessDevice) {
- accessPoint = wirelessDevice->findAccessPoint(item->specificPath());
- }
-- if (accessPoint && accessPoint->mode() == NetworkManager::AccessPoint::Adhoc &&
-+
-+ // When accesspoint in ad-hoc mode dissapears, we should remove the item only when there is no connection. Similar case is when
-+ // a wireless device is in AP mode, but in this case there could be only one visible AP and this should always be associated with some connection.
-+ if (accessPoint && ((accessPoint->mode() == NetworkManager::AccessPoint::Adhoc && !item->connectionPath().isEmpty()) ||
-+ wirelessDevice->mode() == NetworkManager::WirelessDevice::ApMode) &&
- NetworkManager::isWirelessEnabled() && NetworkManager::isWirelessHardwareEnabled()) {
- item->setWirelessNetwork(QString());
- if (updateItem(item)) {
-diff --git a/declarative-plugins/model/modelitem.cpp b/declarative-plugins/model/modelitem.cpp
-index 9a5931f..58d5c42 100644
---- a/declarative-plugins/model/modelitem.cpp
-+++ b/declarative-plugins/model/modelitem.cpp
-@@ -151,6 +151,17 @@ QString ModelItem::icon() const
- break;
- case NetworkManager::ConnectionSettings::Wireless:
- if (m_signal == 0 ) {
-+ if (!m_connectionPath.isEmpty()) {
-+ NetworkManager::Connection::Ptr con = NetworkManager::findConnection(m_connectionPath);
-+ if (con) {
-+ NetworkManager::WirelessSetting::Ptr wirelessSetting;
-+ wirelessSetting = con->settings()->setting(NetworkManager::Setting::Wireless).dynamicCast<NetworkManager::WirelessSetting>();
-+ if (wirelessSetting && (wirelessSetting->mode() == NetworkManager::WirelessSetting::Adhoc ||
-+ wirelessSetting->mode() == NetworkManager::WirelessSetting::Ap)) {
-+ return "network-wireless-100";
-+ }
-+ }
-+ }
- return "network-wireless-00";
- } else if (m_signal < 20) {
- return "network-wireless-20";
-diff --git a/kded/bluetoothmonitor.cpp b/kded/bluetoothmonitor.cpp
-index 2221d09..5d0218b 100644
---- a/kded/bluetoothmonitor.cpp
-+++ b/kded/bluetoothmonitor.cpp
-@@ -220,6 +220,7 @@ void BluetoothMonitor::init()
-
- mDunDevice = reply.value();
- }
-+
- #if WITH_MODEMMANAGER_SUPPORT
- void BluetoothMonitor::modemAdded(const QString &udi)
- {
-diff --git a/lib/editor/bridgewidget.cpp b/lib/editor/bridgewidget.cpp
-index 8815eb2..95344c4 100644
---- a/lib/editor/bridgewidget.cpp
-+++ b/lib/editor/bridgewidget.cpp
-@@ -216,5 +216,5 @@ void BridgeWidget::populateBridges()
-
- bool BridgeWidget::isValid() const
- {
-- return !m_ui->ifaceName->text().isEmpty() && m_ui->bridges->count() > 0;
-+ return !m_ui->ifaceName->text().isEmpty();
- }
-diff --git a/vpn/vpnc/vpnc.cpp b/vpn/vpnc/vpnc.cpp
-index d4a511d..645249d 100644
---- a/vpn/vpnc/vpnc.cpp
-+++ b/vpn/vpnc/vpnc.cpp
-@@ -145,7 +145,6 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
- KConfigGroup cg(config, "main"); // Keys&Values are stored under [main]
- if (cg.exists()) {
- // Setup cisco-decrypt binary to decrypt the passwords
-- QStringList decrArgs;
- const QString ciscoDecryptBinary = KStandardDirs::findExe("cisco-decrypt", QString::fromLocal8Bit(qgetenv("PATH")) + ":/usr/lib/vpnc");
- if (ciscoDecryptBinary.isEmpty()) {
- mErrorMessage = i18n("Needed executable cisco-decrypt could not be found.");
-@@ -174,11 +173,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
- }
- else if (!decrPlugin->readStringKeyValue(cg,"enc_UserPassword").isEmpty() && !ciscoDecryptBinary.isEmpty()) {
- // Decrypt the password and insert into map
-- decrArgs.clear();
-- decrArgs << decrPlugin->readStringKeyValue(cg,"enc_UserPassword");
-- decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs);
-+ decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary);
- decrPlugin->ciscoDecrypt->start();
-- if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) {
-+ decrPlugin->ciscoDecrypt->waitForStarted();
-+ decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_UserPassword").toUtf8());
-+ if (decrPlugin->ciscoDecrypt->waitForFinished()) {
- secretData.insert(NM_VPNC_KEY_XAUTH_PASSWORD, decrPlugin->decryptedPasswd);
- }
- }
-@@ -203,11 +202,11 @@ NMVariantMapMap VpncUiPlugin::importConnectionSettings(const QString &fileName)
- }
- else if (!decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").isEmpty() && !ciscoDecryptBinary.isEmpty()) {
- //Decrypt the password and insert into map
-- decrArgs.clear();
-- decrArgs << decrPlugin->readStringKeyValue(cg,"enc_GroupPwd");
-- decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary, decrArgs);
-+ decrPlugin->ciscoDecrypt->setProgram(ciscoDecryptBinary);
- decrPlugin->ciscoDecrypt->start();
-- if (decrPlugin->ciscoDecrypt->waitForStarted() && decrPlugin->ciscoDecrypt->waitForFinished()) {
-+ decrPlugin->ciscoDecrypt->waitForStarted();
-+ decrPlugin->ciscoDecrypt->write(decrPlugin->readStringKeyValue(cg,"enc_GroupPwd").toUtf8());
-+ if (decrPlugin->ciscoDecrypt->waitForFinished()) {
- secretData.insert(NM_VPNC_KEY_SECRET, decrPlugin->decryptedPasswd);
- data.insert(NM_VPNC_KEY_SECRET"-flags", QString::number(NetworkManager::Setting::AgentOwned));
- }
diff --git a/extra/kdesdk-cervisia/PKGBUILD b/extra/kdesdk-cervisia/PKGBUILD
index aba451b1a..2f347e69f 100644
--- a/extra/kdesdk-cervisia/PKGBUILD
+++ b/extra/kdesdk-cervisia/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202585 2013-12-22 12:49:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-cervisia
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='CVS Frontend'
url='http://kde.org/applications/development/cervisia/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/cervisia-${pkgver}.tar.xz")
-sha1sums=('5a15700bff3faf2dfddf440708edcb8e18163505')
+sha1sums=('c4609985634c38d1533a68d3f905c785ff780942')
build() {
mkdir build
diff --git a/extra/kdesdk-dev-scripts/PKGBUILD b/extra/kdesdk-dev-scripts/PKGBUILD
index 5a77797e8..b6715b259 100644
--- a/extra/kdesdk-dev-scripts/PKGBUILD
+++ b/extra/kdesdk-dev-scripts/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202587 2013-12-22 12:49:47Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-dev-scripts
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Scripts and setting files useful during development of KDE software'
url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
depends=('kdebase-runtime' 'python2')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-scripts-${pkgver}.tar.xz")
-sha1sums=('dc372da52cc14272974164aae8daa26a05e2e8c3')
+sha1sums=('e5c677542c7cfa206a2723c7c68a8c71c3e9ea5d')
build() {
mkdir build
diff --git a/extra/kdesdk-dev-utils/PKGBUILD b/extra/kdesdk-dev-utils/PKGBUILD
index 9a5f8fc43..441bb5285 100644
--- a/extra/kdesdk-dev-utils/PKGBUILD
+++ b/extra/kdesdk-dev-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202586 2013-12-22 12:49:44Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-dev-utils
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks'
url='https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils'
@@ -17,7 +17,7 @@ replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
'kdesdk-kstartperf' 'kdesdk-kuiviewer')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kde-dev-utils-${pkgver}.tar.xz")
-sha1sums=('0c8a8130e8e50b6fef336482c382533d9ff0ef83')
+sha1sums=('08a45595bae38d7d1833eb035c0a753421e4604c')
build() {
mkdir build
diff --git a/extra/kdesdk-dolphin-plugins/PKGBUILD b/extra/kdesdk-dolphin-plugins/PKGBUILD
index 8afead78f..cfe0f2a6b 100644
--- a/extra/kdesdk-dolphin-plugins/PKGBUILD
+++ b/extra/kdesdk-dolphin-plugins/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202588 2013-12-22 12:49:50Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-dolphin-plugins
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Extra Dolphin plugins'
url='https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins'
@@ -17,7 +17,7 @@ optdepends=('bzr: bazaar support'
'subversion: svn support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/dolphin-plugins-${pkgver}.tar.xz")
-sha1sums=('bea6d35772eb4de7db38ab77db56e397abf8c171')
+sha1sums=('281fcd97e1abbcd54eca76d83b1ce760ff472c2e')
build() {
mkdir build
diff --git a/extra/kdesdk-kapptemplate/PKGBUILD b/extra/kdesdk-kapptemplate/PKGBUILD
index 8bb65eb98..ab8d87515 100644
--- a/extra/kdesdk-kapptemplate/PKGBUILD
+++ b/extra/kdesdk-kapptemplate/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202589 2013-12-22 12:49:51Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-kapptemplate
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='KDE Template Generator'
url='http://kde.org/applications/development/kapptemplate/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kapptemplate-${pkgver}.tar.xz")
-sha1sums=('a0a8f04819b828c4bb0ccd85d77ac3861667ab72')
+sha1sums=('4034a10ec3a4f55e1c43a12b1610804d664088e1')
build() {
mkdir build
diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD
index 8c3cd1969..3293a046d 100644
--- a/extra/kdesdk-kate/PKGBUILD
+++ b/extra/kdesdk-kate/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 198829 2013-11-05 19:45:10Z andrea $
+# $Id: PKGBUILD 202465 2013-12-22 12:46:47Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=kdesdk-kate
pkgname=('kdebase-katepart'
'kdebase-kwrite'
'kdesdk-kate')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
makedepends=('kdelibs ''cmake' 'automoc4' 'kdebindings-python')
source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz"
'pkgbuild-syntax-highlight.patch')
-sha1sums=('c3e537ac9f47ba2c4b0d9ec7aef1c64c8060df79'
+sha1sums=('67b4ae3b3bc6959d29b03eeb43b58be772831e95'
'80c324c9db81c07a02374e7a092d75e0bdd6b4ea')
prepare() {
+ mkdir build
+
cd kate-${pkgver}
patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
}
build() {
- mkdir build
cd build
cmake ../kate-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
@@ -38,9 +39,6 @@ package_kdebase-katepart() {
cd build/part
make DESTDIR="${pkgdir}" install
-
- cd ../../build/addons
- make DESTDIR="${pkgdir}" install
}
package_kdebase-kwrite() {
@@ -71,4 +69,7 @@ package_kdesdk-kate() {
cd ../../build/doc/kate
make DESTDIR="${pkgdir}" install
+
+ cd ../../../build/addons
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/kdesdk-kcachegrind/PKGBUILD b/extra/kdesdk-kcachegrind/PKGBUILD
index 191bfa49f..6437f6a48 100644
--- a/extra/kdesdk-kcachegrind/PKGBUILD
+++ b/extra/kdesdk-kcachegrind/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202590 2013-12-22 12:49:53Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-kcachegrind
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Visualization of Performance Profiling Data'
url='http://kde.org/applications/development/kcachegrind/'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
optdepends=('php: PHP support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kcachegrind-${pkgver}.tar.xz")
-sha1sums=('7924d775688f0ecdadbe15ed59b5a00464efa16d')
+sha1sums=('8d1cdbceeca886c1a31af9fc3405b1d86917ed82')
build() {
mkdir build
diff --git a/extra/kdesdk-kioslaves/PKGBUILD b/extra/kdesdk-kioslaves/PKGBUILD
index 28e785f4f..2aac3df27 100644
--- a/extra/kdesdk-kioslaves/PKGBUILD
+++ b/extra/kdesdk-kioslaves/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202591 2013-12-22 12:49:54Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-kioslaves
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='KIO-Slaves'
url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'subversion')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-kioslaves-${pkgver}.tar.xz")
-sha1sums=('177d78db40c568a51c74d2c1e2e48d3838254e09')
+sha1sums=('a7c04650a37c28a8ccf316500918f0cef8f6164c')
build() {
mkdir build
diff --git a/extra/kdesdk-kompare/PKGBUILD b/extra/kdesdk-kompare/PKGBUILD
index 4c857b1bc..622c82c16 100644
--- a/extra/kdesdk-kompare/PKGBUILD
+++ b/extra/kdesdk-kompare/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id$
+# $Id: PKGBUILD 202592 2013-12-22 12:49:56Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-kompare
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Diff/Patch Frontend'
url='http://kde.org/applications/development/kompare/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdesdk')
-depends=('kdebase-runtime')
+depends=('kdebase-runtime' 'libkomparediff2')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kompare-${pkgver}.tar.xz")
-sha1sums=('7847720ac971d86a5b16309b024035db8e3bf3d3')
+sha1sums=('957723c68c9206d98d0c6dd3f42b4cf8feb88288')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../kompare-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/kdesdk-lokalize/PKGBUILD b/extra/kdesdk-lokalize/PKGBUILD
index aac50809a..a3d36497f 100644
--- a/extra/kdesdk-lokalize/PKGBUILD
+++ b/extra/kdesdk-lokalize/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202593 2013-12-22 12:49:58Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-lokalize
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Computer-Aided Translation System'
url='http://kde.org/applications/development/lokalize/'
@@ -16,7 +16,7 @@ optdepends=('translate-toolkit: enable extra scripts'
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/lokalize-${pkgver}.tar.xz"
'fix-python2-path.patch')
-sha1sums=('2a95316eae1045ed27ea2580d5530c5e9fa7d2f7'
+sha1sums=('bfe6363dae420e2b6ce82c201b45a0e337199bc4'
'07db42bbcae402c292eebf002e549b04162621c5')
prepare() {
diff --git a/extra/kdesdk-okteta/PKGBUILD b/extra/kdesdk-okteta/PKGBUILD
index 3d62399ba..ea5b5e86e 100644
--- a/extra/kdesdk-okteta/PKGBUILD
+++ b/extra/kdesdk-okteta/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202594 2013-12-22 12:49:59Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-okteta
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Hex Editor'
url='http://kde.org/applications/utilities/okteta/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/okteta-${pkgver}.tar.xz")
-sha1sums=('1b6d7a8911e401def759ac562fd0205a1160fa9b')
+sha1sums=('230e9715de29b16ff3aa542c5557021702cfe6dc')
build() {
mkdir build
diff --git a/extra/kdesdk-poxml/PKGBUILD b/extra/kdesdk-poxml/PKGBUILD
index a06233bc4..5cb62a12c 100644
--- a/extra/kdesdk-poxml/PKGBUILD
+++ b/extra/kdesdk-poxml/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202595 2013-12-22 12:50:00Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-poxml
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Translates DocBook XML files using gettext po files'
url='https://projects.kde.org/projects/kde/kdesdk/poxml'
@@ -13,7 +13,7 @@ depends=('kdelibs')
makedepends=('cmake' 'automoc4' 'antlr2')
optdepends=('antlr2: required for po2xml and swappo tool')
source=("http://download.kde.org/stable/${pkgver}/src/poxml-${pkgver}.tar.xz")
-sha1sums=('543bd37fdd8e876950aaaea254b53de0bdd122ae')
+sha1sums=('30d8d0f06a47965f336fd5428326a1c92fcaa7be')
build() {
mkdir build
diff --git a/extra/kdesdk-strigi-analyzers/PKGBUILD b/extra/kdesdk-strigi-analyzers/PKGBUILD
index 1326dacfc..5a8891763 100644
--- a/extra/kdesdk-strigi-analyzers/PKGBUILD
+++ b/extra/kdesdk-strigi-analyzers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202596 2013-12-22 12:50:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-strigi-analyzers
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Analyzer plugins for strigi'
url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-strigi-analyzers-${pkgver}.tar.xz")
-sha1sums=('c7672d1aaa6ecff3245c080252693536e7673461')
+sha1sums=('efe05955070149c54c65621327196c94d1c82e41')
build() {
mkdir build
diff --git a/extra/kdesdk-thumbnailers/PKGBUILD b/extra/kdesdk-thumbnailers/PKGBUILD
index 871977f2c..611fa2d8e 100644
--- a/extra/kdesdk-thumbnailers/PKGBUILD
+++ b/extra/kdesdk-thumbnailers/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198965 2013-11-05 20:21:59Z andrea $
+# $Id: PKGBUILD 202597 2013-12-22 12:50:07Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-thumbnailers
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Plugins for the thumbnailing system'
url='https://projects.kde.org/projects/kde/kdesdk/kdesdk-thumbnailers'
@@ -12,7 +12,7 @@ groups=('kde' 'kdesdk')
depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/kdesdk-thumbnailers-${pkgver}.tar.xz")
-sha1sums=('cd3aeee2dbb685ec5d6eaccc513ac3571c1a20bb')
+sha1sums=('094dbd49b3565b9bee38f9d4390740b2b8d8df34')
build() {
mkdir build
diff --git a/extra/kdesdk-umbrello/PKGBUILD b/extra/kdesdk-umbrello/PKGBUILD
index 0e0603afd..007e73234 100644
--- a/extra/kdesdk-umbrello/PKGBUILD
+++ b/extra/kdesdk-umbrello/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202598 2013-12-22 12:50:08Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdesdk-umbrello
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='UML Modeller'
url='http://kde.org/applications/development/umbrello/'
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'boost')
optdepends=('ruby')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/umbrello-${pkgver}.tar.xz")
-sha1sums=('98274cfe91db7b56429a9de0d23ae490adee9ce0')
+sha1sums=('307f2da8ea0a69e045c1013c20e0ffeb1690ad56')
build() {
mkdir build
diff --git a/extra/kdetoys-amor/PKGBUILD b/extra/kdetoys-amor/PKGBUILD
index 27b4196f1..19e9e2af0 100644
--- a/extra/kdetoys-amor/PKGBUILD
+++ b/extra/kdetoys-amor/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202599 2013-12-22 12:50:09Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdetoys-amor
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='On-Screen Creature'
url='https://projects.kde.org/projects/kde/kdetoys/amor'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/amor-${pkgver}.tar.xz")
-sha1sums=('b118d2fbee168d5bfd386ea67994f9730e80c5dc')
+sha1sums=('2cf0e4e8cfe069913c39e17aa59b2a6d013d0ad1')
build() {
mkdir build
diff --git a/extra/kdetoys-kteatime/PKGBUILD b/extra/kdetoys-kteatime/PKGBUILD
index c92f0c375..22ea04670 100644
--- a/extra/kdetoys-kteatime/PKGBUILD
+++ b/extra/kdetoys-kteatime/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202600 2013-12-22 12:50:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdetoys-kteatime
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Tea Cooker'
url='http://kde.org/applications/games/kteatime/'
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kteatime-${pkgver}.tar.xz")
-sha1sums=('5359a97a9a46ca75cd1ed7173182f838d929a4f5')
+sha1sums=('fba17a0e97ab31094b714811f74dbccfc3f70841')
build() {
mkdir build
diff --git a/extra/kdetoys-ktux/PKGBUILD b/extra/kdetoys-ktux/PKGBUILD
index a03f5e915..631148bf1 100644
--- a/extra/kdetoys-ktux/PKGBUILD
+++ b/extra/kdetoys-ktux/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202601 2013-12-22 12:50:12Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdetoys-ktux
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='A Tux-in-a-spaceship screen saver'
url='https://projects.kde.org/projects/kde/kdetoys/ktux'
@@ -13,7 +13,7 @@ depends=('kdebase-workspace')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ktux-${pkgver}.tar.xz")
-sha1sums=('333b912e51ec5c57d3346d8b7c609cc284d41e08')
+sha1sums=('acf49c182581c342abacedccabfe2daceec914e1')
build() {
mkdir build
diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD
index de0f2147c..ece96fd37 100644
--- a/extra/kdeutils-filelight/PKGBUILD
+++ b/extra/kdeutils-filelight/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198971 2013-11-05 20:24:57Z andrea $
+# $Id: PKGBUILD 202603 2013-12-22 12:50:14Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-filelight
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='View disk usage information'
url='http://kde.org/applications/utilities/filelight'
@@ -15,7 +15,7 @@ replaces=('filelight')
conflicts=('filelight')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz")
-sha1sums=('70b950c66d3eb517b59aac5119150b14ef7cb467')
+sha1sums=('5cec6ddbb501ee39be62b624c74258f6a8c8718a')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD
index 1476d580e..644c3e67b 100644
--- a/extra/kdeutils-kcalc/PKGBUILD
+++ b/extra/kdeutils-kcalc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198972 2013-11-05 20:25:05Z andrea $
+# $Id: PKGBUILD 202604 2013-12-22 12:50:16Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-kcalc
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Scientific Calculator'
url='http://kde.org/applications/utilities/kcalc/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz")
-sha1sums=('a62a37a16a699fdba715cda33b9f75755d81cb76')
+sha1sums=('a783b12395016d9cdec87e442a7591e7d61c3c6d')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD
index 334730c67..ca02300d6 100644
--- a/extra/kdeutils-kcharselect/PKGBUILD
+++ b/extra/kdeutils-kcharselect/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198973 2013-11-05 20:25:14Z andrea $
+# $Id: PKGBUILD 202605 2013-12-22 12:50:18Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-kcharselect
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Character Selector'
url="http://kde.org/applications/utilities/kcharselect/"
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz")
-sha1sums=('7fd5c926fc4d3c94690d03c883e5efd5a97d5b89')
+sha1sums=('f862a8d0299355146411f3f79943c6690a62c347')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD
index 1240c41fe..563b68878 100644
--- a/extra/kdeutils-kdf/PKGBUILD
+++ b/extra/kdeutils-kdf/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198974 2013-11-05 20:25:21Z andrea $
+# $Id: PKGBUILD 202606 2013-12-22 12:50:19Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-kdf
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
url="http://kde.org/applications/system/kdiskfree/"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz")
-sha1sums=('acd04e1fff3d410e2e3766871cac7bb086091c49')
+sha1sums=('2d56949fb0bc889403e3460d097e056bbce6ffd9')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD
index d59673532..cfe57191f 100644
--- a/extra/kdeutils-kfloppy/PKGBUILD
+++ b/extra/kdeutils-kfloppy/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198975 2013-11-05 20:25:29Z andrea $
+# $Id: PKGBUILD 202607 2013-12-22 12:50:20Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-kfloppy
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Floppy Formatter'
url='http://kde.org/applications/utilities/kfloppy/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz")
-sha1sums=('2e1588840cb5fd396c21d69ae3011efdcb6cf043')
+sha1sums=('642aeb278dca7b769d01f37d67e065ff6003d68d')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD
index 2390382d1..846f598df 100644
--- a/extra/kdeutils-kgpg/PKGBUILD
+++ b/extra/kdeutils-kgpg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198976 2013-11-05 20:25:37Z andrea $
+# $Id: PKGBUILD 202608 2013-12-22 12:50:24Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-kgpg
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='A GnuPG frontend'
url='http://kde.org/applications/utilities/kgpg/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz")
-sha1sums=('8b2172abb9ee002d1ac65d77363f29ece238aeb4')
+sha1sums=('28d08d701d35ad71eb5772a6aa8580a5205ea618')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD
index 1bb885a7c..4e4d16acc 100644
--- a/extra/kdeutils-kremotecontrol/PKGBUILD
+++ b/extra/kdeutils-kremotecontrol/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: PKGBUILD 202609 2013-12-22 12:50:25Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-kremotecontrol
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Configure your remote controls for use with applications'
url='http://kde.org/applications/utilities/kremotecontrol/'
@@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc')
conflicts=('kdeutils-kdelirc')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz")
-sha1sums=('deddf6f8e2310d955902d49c8b6b73fae635fd77')
+sha1sums=('27b8e567591723d29908c9ac85753c9a66d847ca')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD
index 634a66be4..5ce31b763 100644
--- a/extra/kdeutils-ktimer/PKGBUILD
+++ b/extra/kdeutils-ktimer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198978 2013-11-05 20:25:54Z andrea $
+# $Id: PKGBUILD 202610 2013-12-22 12:50:26Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-ktimer
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Countdown Launcher'
url='http://kde.org/applications/utilities/ktimer/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz")
-sha1sums=('f6d8f80ecb79a4baf26ae54f681026a2c9363319')
+sha1sums=('fb8f46dc90f41e62c0a4f4bdff46894659125938')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD
index 78f71dc51..4756ef6b5 100644
--- a/extra/kdeutils-kwallet/PKGBUILD
+++ b/extra/kdeutils-kwallet/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198979 2013-11-05 20:26:01Z andrea $
+# $Id: PKGBUILD 202611 2013-12-22 12:50:29Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-kwallet
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Wallet Management Tool'
url='http://kde.org/applications/system/kwalletmanager/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz")
-sha1sums=('7d9a7cfdec09d7acf662aba75478bbd41b52e1ad')
+sha1sums=('44c7e225989b77fd9be7e6804bf3f4702c62efa3')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD
index 39e061087..7483697e7 100644
--- a/extra/kdeutils-print-manager/PKGBUILD
+++ b/extra/kdeutils-print-manager/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198980 2013-11-05 20:26:10Z andrea $
+# $Id: PKGBUILD 202612 2013-12-22 12:50:30Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-print-manager
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A tool for managing print jobs and printers"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ replaces=('print-manager' 'kdeutils-printer-applet' 'kdeadmin-system-config-prin
conflicts=('print-manager')
groups=('kde' 'kdeutils')
source=("http://download.kde.org/stable/${pkgver}/src/print-manager-${pkgver}.tar.xz")
-sha1sums=('d477e8cf7ea96ba0b1c842e557ca2860cec37df5')
+sha1sums=('9d16dabd15278d0fac6ad3b3aabe58c7bc26ac07')
build() {
mkdir build
diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD
index b8cc0b1f3..b46884b96 100644
--- a/extra/kdeutils-superkaramba/PKGBUILD
+++ b/extra/kdeutils-superkaramba/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198981 2013-11-05 20:26:18Z andrea $
+# $Id: PKGBUILD 202613 2013-12-22 12:50:31Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-superkaramba
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='An engine for cool desktop eyecandy'
url='http://kde.org/applications/utilities/superkaramba/'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz")
-sha1sums=('19211613d819f79fae23c726e123fd25d65f2ca6')
+sha1sums=('d50d682fd1960ab50fdd2ec3c605d0599dc3e6de')
build() {
cd "${srcdir}"
diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD
index de7b8b918..5567ca9f6 100644
--- a/extra/kdeutils-sweeper/PKGBUILD
+++ b/extra/kdeutils-sweeper/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198982 2013-11-05 20:27:12Z andrea $
+# $Id: PKGBUILD 202614 2013-12-22 12:50:32Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeutils-sweeper
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='System Cleaner'
url='http://kde.org/applications/utilities/sweeper'
@@ -12,7 +12,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
groups=('kde' 'kdeutils')
source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz")
-sha1sums=('f2badf883646ff5a12c4f4daf309a87dba0e8af9')
+sha1sums=('2b117aa90b46ea0eeba9a07f8f0aa95744014d57')
build() {
cd "${srcdir}"
diff --git a/extra/kdevelop-php/PKGBUILD b/extra/kdevelop-php/PKGBUILD
index a7125d836..3654d030a 100644
--- a/extra/kdevelop-php/PKGBUILD
+++ b/extra/kdevelop-php/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198620 2013-10-30 22:42:00Z andrea $
+# $Id: PKGBUILD 201355 2013-12-09 10:50:13Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdevelop-php
-pkgver=1.5.2
-_pkgver=4.5.2
+pkgver=1.6.0
+_pkgver=4.6.0
pkgrel=1
pkgdesc="PHP language and documentation plugin for KDevelop"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,8 +14,8 @@ makedepends=('cmake' 'automoc4' 'kdevelop-pg-qt')
replaces=('kdevelop-php-docs')
conflicts=('kdevelop-php-docs')
source=(http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-{,docs-}${pkgver}.tar.xz)
-sha1sums=('784f76dd12ee0ab443fa0f9d05d0e3062aafdb38'
- '44e737743d0c9663912480508adac0ccbb826a56')
+sha1sums=('705b1f36a6fbbac207e8ca78619827206b75b48e'
+ '98d7efe6f983c4b439c6cbdc40d427e14954298f')
prepare() {
mkdir build
diff --git a/extra/kdevelop-python/PKGBUILD b/extra/kdevelop-python/PKGBUILD
index 4dc31ff6f..fc48657db 100644
--- a/extra/kdevelop-python/PKGBUILD
+++ b/extra/kdevelop-python/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 197794 2013-10-30 08:55:59Z andrea $
+# $Id: PKGBUILD 201382 2013-12-10 11:10:02Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdevelop-python
-pkgver=1.5.2
+pkgver=1.6.0
+_pkgver=4.6.0
pkgrel=1
pkgdesc="Python language and documentation plugin for KDevelop"
arch=('i686' 'x86_64' 'mips64el')
@@ -10,8 +11,8 @@ url="http://www.kdevelop.org/"
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.xz")
-sha1sums=('aa08a4f164fabde363b1bc5141e1f673405949f3')
+source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/kdev-python-${pkgver}.tar.xz")
+sha1sums=('88618dbd3a80d5193f49f6c61a6ad02a5e9c0652')
prepare() {
mkdir build
@@ -19,7 +20,7 @@ prepare() {
build() {
cd build
- cmake ../kdev-python-v${pkgver} \
+ cmake ../kdev-python-${pkgver} \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release
make
diff --git a/extra/kdevelop/PKGBUILD b/extra/kdevelop/PKGBUILD
index abdaad6a2..93d1c0e74 100644
--- a/extra/kdevelop/PKGBUILD
+++ b/extra/kdevelop/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198618 2013-10-30 22:40:58Z andrea $
+# $Id: PKGBUILD 201353 2013-12-09 10:44:21Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=kdevelop
-pkgver=4.5.2
+pkgver=4.6.0
pkgrel=1
pkgdesc="A C/C++ development environment for KDE"
arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ optdepends=('kdesdk-okteta: hex editor integration'
'cmake: cmake integration')
install="${pkgname}.install"
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('3bd354ca9ff8562c8099a41836ccd72456561409')
+sha1sums=('2b723c3e16c41dbcd9817336893eff85712cb11d')
prepare() {
mkdir build
diff --git a/extra/kdevplatform/PKGBUILD b/extra/kdevplatform/PKGBUILD
index d7be656c0..75a08932f 100644
--- a/extra/kdevplatform/PKGBUILD
+++ b/extra/kdevplatform/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198616 2013-10-30 22:25:51Z andrea $
+# $Id: PKGBUILD 201351 2013-12-09 10:43:58Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
pkgname=kdevplatform
-pkgver=1.5.2
-_pkgver=4.5.2
+pkgver=1.6.0
+_pkgver=4.6.0
pkgrel=1
pkgdesc="A C/C++ development platform for KDE"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ optdepends=("kdesdk-kompare: difference checking")
makedepends=('cmake' 'automoc4' 'boost')
install="${pkgname}.install"
source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('a2fa1f765e992739546fa04d0aaffc4f2200c520')
+sha1sums=('8ed8ccb63b64a3675716f1ad14b4a73fcbf4133d')
prepare() {
mkdir build
diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD
index a1725fd2b..0a6c6236f 100644
--- a/extra/kdewebdev/PKGBUILD
+++ b/extra/kdewebdev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198983 2013-11-05 20:28:42Z andrea $
+# $Id: PKGBUILD 202615 2013-12-22 12:50:34Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace'
'kdewebdev-kimagemapeditor'
'kdewebdev-klinkstatus'
'kdewebdev-kommander')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdewebdev')
makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('2178b219f0220592e039b337529a5962acf97db1')
+sha1sums=('3ff61d129f428cffd4ddfed6d6007fe5625ca724')
build() {
cd $srcdir
diff --git a/extra/kino/PKGBUILD b/extra/kino/PKGBUILD
deleted file mode 100644
index b107e8a9d..000000000
--- a/extra/kino/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 198121 2013-10-30 12:54:59Z allan $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Robert Emil Berge <robert@rebi.no>
-
-pkgname=kino
-pkgver=1.3.4
-pkgrel=5
-pkgdesc="A non-linear DV editor"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.kinodv.org/"
-license=('GPL')
-depends=('libavc1394' 'libiec61883' 'libdv' 'libglade' 'libxv' 'libsamplerate' 'libsm' 'desktop-file-utils')
-makedepends=('intltool' 'v4l-utils')
-install=kino.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'videodev-header.patch')
-md5sums=('52f8ce690e45a089e3edc6c7af61a05c'
- '940404c0eec3c9d954c289ceb52d15a6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- patch -p1 -i "${srcdir}"/videodev-header.patch
-
- ./configure --prefix=/usr \
- --with-udev-rules-dir=/usr/lib/udev/rules.d
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- # Fix permissions
- chown -R root:root "${pkgdir}/usr/share/kino/help"
-}
diff --git a/extra/kino/kino.install b/extra/kino/kino.install
deleted file mode 100644
index 83b78df92..000000000
--- a/extra/kino/kino.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime 1> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-mime-database usr/share/mime 1> /dev/null
- update-desktop-database -q
-}
diff --git a/extra/kino/videodev-header.patch b/extra/kino/videodev-header.patch
deleted file mode 100644
index 01394fc47..000000000
--- a/extra/kino/videodev-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c
-===================================================================
---- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c 2011-04-11 15:12:41.915593967 +0200
-+++ kino-1.3.4/ffmpeg/libavdevice/v4l.c 2011-04-11 15:13:05.825593979 +0200
-@@ -26,7 +26,7 @@
- #include <sys/mman.h>
- #include <sys/time.h>
- #define _LINUX_TIME_H 1
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <time.h>
-
- typedef struct {
-Index: kino-1.3.4/src/v4l.h
-===================================================================
---- kino-1.3.4.orig/src/v4l.h 2011-04-11 15:12:41.895593967 +0200
-+++ kino-1.3.4/src/v4l.h 2011-04-11 15:12:57.555593975 +0200
-@@ -40,7 +40,7 @@
-
- #define _DEVICE_H_
- #define _LINUX_TIME_H
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
-
- #include "displayer.h"
-
diff --git a/extra/kscreen/PKGBUILD b/extra/kscreen/PKGBUILD
index d810f9794..8da9942fb 100644
--- a/extra/kscreen/PKGBUILD
+++ b/extra/kscreen/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 192014 2013-08-04 07:38:09Z lcarlier $
+# $Id: PKGBUILD 200209 2013-11-22 10:46:39Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: birdflesh <antkoul at gmail dot com>
pkgname=kscreen
-pkgver=1.0.1
+pkgver=1.0.2.1
pkgrel=1
pkgdesc="KDE's screen management software"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/kscreen'
license=('GPL' 'LGPL')
-depends=('kdebase-runtime' "libkscreen>=${pkgver}")
+depends=('kdebase-runtime' 'libkscreen')
makedepends=('cmake' 'automoc4')
install=$pkgname.install
-#source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('2d6bd56a2edcadb9ba80c00fbd330a60')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('cd3d6ffdb0e44c418c2804fc72b8391b')
prepare() {
mkdir build
diff --git a/extra/lensfun/PKGBUILD b/extra/lensfun/PKGBUILD
index 39c211128..f2c082d5c 100644
--- a/extra/lensfun/PKGBUILD
+++ b/extra/lensfun/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 182923 2013-04-16 07:16:05Z tpowa $
+# $Id: PKGBUILD 201246 2013-12-06 16:02:09Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=lensfun
-pkgver=0.2.7
+pkgver=0.2.8
pkgrel=1
pkgdesc="Database of photographic lenses and a library that allows advanced access to the database"
arch=(i686 x86_64 'mips64el')
@@ -10,7 +10,8 @@ url="http://lensfun.berlios.de/"
license=('LGPL3')
depends=('glibc' 'glib2')
makedepends=('python2' 'libpng' 'doxygen')
-source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+ lensfun-0.2.8-make-4.0.patch)
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,6 +21,8 @@ prepare() {
confflags=""
fi
sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' configure
+ # fix configure script for make 4.0
+ patch -Np0 -i "${srcdir}/lensfun-0.2.8-make-4.0.patch"
}
build() {
@@ -34,4 +37,5 @@ package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make INSTALL_PREFIX="$pkgdir" install
}
-md5sums=('6061cc2d00a42d3e62512878426fc841')
+md5sums=('db2988505e7432c6b331aa597789c639'
+ '9464d933a5e4ccefed7fc38656a9ec18')
diff --git a/extra/lensfun/lensfun-0.2.3-as-needed.patch b/extra/lensfun/lensfun-0.2.3-as-needed.patch
deleted file mode 100644
index 12287dba2..000000000
--- a/extra/lensfun/lensfun-0.2.3-as-needed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru lensfun-0.2.3.orig/build/mak/compiler/gcc.mak lensfun-0.2.3/build/mak/compiler/gcc.mak
---- lensfun-0.2.3.orig/build/mak/compiler/gcc.mak 2009-03-15 02:42:40.000000000 +0100
-+++ lensfun-0.2.3/build/mak/compiler/gcc.mak 2009-03-15 02:43:37.000000000 +0100
-@@ -71,7 +71,7 @@
- endef
-
- LINK.GCC.AR = $(GCC.AR) $(GCC.ARFLAGS) $@ $^
--LINK.GCC.EXEC = $(GCC.LD) -o $@ $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
-+LINK.GCC.EXEC = $(GCC.LD) $(LDFLAGS) $^ $2 $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $(GCC.LDFLAGS) $1 -o $@
- define LINK.GCC.SO
- $(GCC.LD) -o $@.$(SHARED.$3) -Wl,"-soname=$(notdir $@).$(basename $(basename $(SHARED.$3)))" $(GCC.LDFLAGS.SHARED) $(GCC.LDFLAGS) $(LDFLAGS) $1 $^ $(GCC.LDFLAGS.LIBS) $(LDFLAGS.LIBS) $2
- ln -fs $(notdir $@.$(SHARED.$3)) $@.$(basename $(basename $(SHARED.$3)))
-Only in lensfun-0.2.3/out/posix/release: deps
diff --git a/extra/lensfun/lensfun-0.2.3-glibc-2.10.patch b/extra/lensfun/lensfun-0.2.3-glibc-2.10.patch
deleted file mode 100644
index 41a29563a..000000000
--- a/extra/lensfun/lensfun-0.2.3-glibc-2.10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- lensfun-0.2.3.orig/tools/makedep/cppsetup.cpp 2009-07-04 21:20:49.000000000 +0200
-+++ lensfun-0.2.3/tools/makedep/cppsetup.cpp 2009-07-04 22:19:18.000000000 +0200
-@@ -195,7 +195,7 @@
- }
- while (s);
-
-- eol = strchr (var, 0);
-+ eol = (char *)strchr (var, 0);
-
- // Skip parentheses which Microsoft likes so much
- if (*var == '(')
diff --git a/extra/lensfun/lensfun-0.2.8-make-4.0.patch b/extra/lensfun/lensfun-0.2.8-make-4.0.patch
new file mode 100644
index 000000000..c7694457d
--- /dev/null
+++ b/extra/lensfun/lensfun-0.2.8-make-4.0.patch
@@ -0,0 +1,11 @@
+--- configure.old 2013-12-06 16:55:09.098654166 +0100
++++ configure 2013-12-06 16:55:20.298676545 +0100
+@@ -45,7 +45,7 @@
+ }
+
+ # Check for tools
+-tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "3.81", True)
++tibs.check_program ("GNU Make", "make --version", ".*?([0-9\.]+).*", "4.0", True)
+ if tibs.check_program ("makedep", "makedep -V", ".*Version.*?([0-9\.]+).*", "0.1.0"):
+ tibs.add_config_mak ("MAKEDEP", "makedep")
+ makedep = "yes"
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 5271b475f..089421b33 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 196341 2013-10-11 16:33:42Z andyrtr $
+# $Id: PKGBUILD 201537 2013-12-14 08:34:10Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=lftp
-pkgver=4.4.10
+pkgver=4.4.14
pkgrel=1
pkgdesc="Sophisticated command line based FTP client"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
-depends=('gcc-libs' 'readline>=6.2' "gnutls" "expat>=2.0.1-4" 'sh')
+depends=('gcc-libs' 'readline' 'gnutls' 'expat' 'sh')
optdepends=('perl: needed for convert-netscape-cookies and verify-file')
url="http://lftp.yar.ru/"
backup=('etc/lftp.conf')
source=(http://lftp.yar.ru/ftp/${pkgname}-${pkgver}.tar.xz{,.asc})
-md5sums=('1b8d77f1a5a9cfe4e48e45636b775101'
+md5sums=('809544255f668a6d3af867f643cc321f'
'SKIP')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
--with-gnutls \
--without-openssl \
@@ -27,7 +27,7 @@ build() {
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
rm -rf ${pkgdir}/usr/lib
}
diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD
index da95a708c..defa33a5c 100644
--- a/extra/libbluedevil/PKGBUILD
+++ b/extra/libbluedevil/PKGBUILD
@@ -1,25 +1,31 @@
-# $Id: PKGBUILD 194548 2013-09-18 11:33:02Z tomegun $
+# $Id: PKGBUILD 202650 2013-12-23 08:20:14Z andrea $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgname=libbluedevil
-pkgver=1.9.4
-pkgrel=1
+pkgver=2.0rc1
+_pkgver=2.0-rc1
+pkgrel=2
+epoch=1
pkgdesc='A Qt4 wrapper for bluez used in the new KDE bluetooth stack'
arch=('i686' 'x86_64' 'mips64el')
url="https://projects.kde.org/projects/playground/libs/libbluedevil"
license=('GPL')
-depends=('qt4' 'bluez4')
+depends=('qt4' 'bluez')
makedepends=('cmake')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('25d114ba52218f4cf44c7b4525399835')
+source=("http://download.kde.org/unstable/${pkgname}/${_pkgver}/src/${pkgname}-${_pkgver}.tar.xz")
+md5sums=('3883a20334ed210fb46077ebea163c0a')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
- cmake ../${pkgname}-v${pkgver} \
+ cmake ../${pkgname}-${_pkgver} \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4
make
}
diff --git a/extra/libbluray/PKGBUILD b/extra/libbluray/PKGBUILD
index 9a5788976..469d9a79d 100644
--- a/extra/libbluray/PKGBUILD
+++ b/extra/libbluray/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198685 2013-11-02 07:22:33Z bpiotrowski $
+# $Id: PKGBUILD 202445 2013-12-22 07:44:29Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Andrew Cook <ariscop@gmail.com>
pkgname=libbluray
-pkgver=0.4.0
+pkgver=0.5.0
pkgrel=1
pkgdesc='Library to access Blu-Ray disks for video playback'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url='http://www.videolan.org/developers/libbluray.html'
license=('LGPL2.1')
depends=('libxml2' 'freetype2')
source=(ftp://ftp.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('63a3218d69f179f4834ef3b48bfa95268ad62c302ff38bfc052e2fc6916ae3f8')
+md5sums=('04cf15d0f3581a955d3a2ccb9dc06e9e')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD
index 9e098c77b..daa26832e 100644
--- a/extra/libburn/PKGBUILD
+++ b/extra/libburn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198131 2013-10-30 12:58:36Z allan $
+# $Id: PKGBUILD 201539 2013-12-14 08:38:34Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=libburn
-pkgver=1.3.2 # .pl01
+pkgver=1.3.4 # .pl01
pkgrel=1
pkgdesc="Library for reading, mastering and writing optical discs"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
depends=('glibc')
source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
options=('!emptydirs')
-md5sums=('3c6ee25f172ff28e7b5e5de4f9f26ba9'
+md5sums=('6aaaf2cfb09584e69991250e619789b4'
'SKIP')
build() {
diff --git a/extra/libconfig/PKGBUILD b/extra/libconfig/PKGBUILD
index 1ec4c0c54..6f20da5e1 100644
--- a/extra/libconfig/PKGBUILD
+++ b/extra/libconfig/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=libconfig
pkgver=1.4.9
-pkgrel=1
+pkgrel=2
pkgdesc="C/C++ Configuration File Library"
arch=('i686' 'x86_64' 'mips64el')
url="http://hyperrealm.com/libconfig/libconfig.html"
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index fb01cb3f6..ef9b363f2 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 198149 2013-10-30 13:05:35Z allan $
+# $Id: PKGBUILD 200740 2013-12-03 19:25:26Z lcarlier $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libdrm
-pkgver=2.4.47
+pkgver=2.4.50
pkgrel=1
pkgdesc="Userspace interface to kernel DRM services"
arch=(i686 x86_64 'mips64el')
license=('custom')
depends=('glibc' 'libpciaccess')
+[ "$CARCH" != "mips64el" ] && makedepends=('valgrind')
checkdepends=('cairo')
-[ "$CARCH" != "mips64el" ] && makedepends+=('clang' 'valgrind')
replaces=('libdrm-new' 'libdrm-nouveau')
url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
COPYING)
-sha256sums=('c2dac2250adbcea23efb18fa8cf484c0f43c8ffbf5064ec82678bc410084f8e7'
+sha256sums=('3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045'
'9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
build() {
@@ -24,11 +24,6 @@ build() {
sed -i "/pthread-stubs/d" configure.ac
autoreconf --force --install
- # gcc 4.8 introduces graphic corruption and X crashes with nouveau cards (nv44)
- # http://gcc.gnu.org/ml/gcc-help/2013-07/msg00103.html
- # we use clang compiler meanwhile
- [ "$CARCH" != "mips64el" ] && export CC=clang
-
./configure --prefix=/usr --enable-udev
make
}
diff --git a/extra/libdvbpsi/PKGBUILD b/extra/libdvbpsi/PKGBUILD
index 0d9e690d3..7f7e39917 100644
--- a/extra/libdvbpsi/PKGBUILD
+++ b/extra/libdvbpsi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198150 2013-10-30 13:05:56Z allan $
+# $Id: PKGBUILD 199858 2013-11-17 11:33:45Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=libdvbpsi
-pkgver=1.1.1
+pkgver=1.1.2
pkgrel=1
epoch=1
pkgdesc="A library designed for decoding and generation of MPEG TS and DVB PSI tables"
@@ -14,7 +14,7 @@ replaces=('libdvbpsi4' 'libdvbpsi5')
conflicts=('libdvbpsi4' 'libdvbpsi5')
url="http://developers.videolan.org/libdvbpsi/"
source=("http://download.videolan.org/pub/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('0c7c355201f325ea99c522d8ec97bf86')
+md5sums=('0d8ffb38d0ebfeb55c40ce6fe232f5d3')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libftdi-compat/PKGBUILD b/extra/libftdi-compat/PKGBUILD
new file mode 100644
index 000000000..9be6032cf
--- /dev/null
+++ b/extra/libftdi-compat/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 200728 2013-12-03 16:50:08Z eric $
+# Maintainer:
+
+pkgname=libftdi-compat
+pkgver=0.20
+pkgrel=1
+pkgdesc="A library to talk to FTDI chips"
+arch=('i686' 'x86_64')
+url="http://www.intra2net.com/en/developer/libftdi/download.php"
+license=('GPL2' 'LGPL2.1')
+depends=('libusb-compat' 'gcc-libs')
+makedepends=('boost')
+source=(http://www.intra2net.com/en/developer/libftdi/download/libftdi-$pkgver.tar.gz{,.sig})
+sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2'
+ '807d145147c9bee08b4cea4d7ca82ccaf1330f02')
+
+build() {
+ cd libftdi-$pkgver
+ ./configure --prefix=/usr --without-examples
+ make
+}
+
+package() {
+ cd libftdi-$pkgver
+ make DESTDIR="$pkgdir" install
+}
diff --git a/extra/libftdi/PKGBUILD b/extra/libftdi/PKGBUILD
index 33529c424..164883361 100644
--- a/extra/libftdi/PKGBUILD
+++ b/extra/libftdi/PKGBUILD
@@ -1,27 +1,36 @@
-# $Id: PKGBUILD 197346 2013-10-25 02:47:00Z allan $
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+# $Id: PKGBUILD 200729 2013-12-03 16:51:00Z eric $
+# Maintainer:
pkgname=libftdi
-pkgver=0.20
+pkgver=1.0
pkgrel=2
pkgdesc="A library to talk to FTDI chips"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.intra2net.com/en/developer/libftdi/download.php"
license=('GPL2' 'LGPL2.1')
-depends=('libusb-compat' 'gcc-libs')
-makedepends=('boost')
-source=(http://www.intra2net.com/en/developer/libftdi/download/$pkgname-$pkgver.tar.gz{,.sig})
-sha1sums=('4bc6ce70c98a170ada303fbd00b8428d8a2c1aa2'
- '807d145147c9bee08b4cea4d7ca82ccaf1330f02')
+depends=('libusbx')
+makedepends=('boost' 'cmake')
+source=(http://www.intra2net.com/en/developer/libftdi/download/${pkgname}1-$pkgver.tar.bz2{,.sig})
+sha1sums=('5be76cfd7cd36c5291054638f7caf4137303386f'
+ 'SKIP')
+
+prepare() {
+ cd ${pkgname}1-$pkgver
+ sed -i 's|LIB_SUFFIX 64|LIB_SUFFIX ""|' CMakeLists.txt
+}
build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -i '/no-install/d' examples/Makefile.in
- ./configure --prefix=/usr
+ cd ${pkgname}1-$pkgver
+ mkdir build
+ cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_TYPE=Release
make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd ${pkgname}1-$pkgver/build
make DESTDIR="$pkgdir" install
+ find examples -type f -perm -755 -exec install {} "$pkgdir/usr/bin" \;
+ # Remove eepreom (conflict with i2c-tools FS#37925)
+ rm "$pkgdir/usr/bin/eeprom"
}
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index 356f93787..678256ec8 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198160 2013-10-30 13:09:39Z allan $
+# $Id: PKGBUILD 199873 2013-11-17 20:47:22Z heftig $
# Maintainer: tobias <tobias@archlinux.org>
# Contributor: Tobias Kieslich <tobias@justdreams.de>
pkgname=libgda
-pkgver=5.1.2
-pkgrel=2
+pkgver=5.2.1
+pkgrel=1
pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
arch=(i686 x86_64 'mips64el')
license=('GPL')
@@ -12,11 +12,11 @@ depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
'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')
+makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala' 'itstool')
url="http://www.gnome-db.org"
install=libgda.install
source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('59c4416a151297a406091fcfe7af781ea88af3381d10b365ba73b1eb8e23b6c5')
+sha256sums=('c29aa77e9a2f22cacf2d2af0429e0828feece7386fb07709b519642dcdb3f041')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libgdata/PKGBUILD b/extra/libgdata/PKGBUILD
index e4c19b657..d450ec29a 100644
--- a/extra/libgdata/PKGBUILD
+++ b/extra/libgdata/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 198161 2013-10-30 13:09:59Z allan $
+# $Id: PKGBUILD 202189 2013-12-19 01:51:33Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libgdata
-pkgver=0.13.4
+pkgver=0.14.1
pkgrel=1
pkgdesc="GLib-based library for accessing online service APIs using the GData protocol"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('libsoup' 'liboauth' 'gcr' 'gnome-online-accounts')
-makedepends=('intltool' 'gobject-introspection')
+makedepends=('intltool' 'gobject-introspection' 'vala')
url="http://www.gnome.org"
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ae405145bb6a2109488b7123206b469b141f17317066471dd485b4ea50499c83')
+sha256sums=('68bbb2cb70028d79edfaec17184389275044fd58bf881e36df2663e7e191ff1a')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index aadb73f5f..f3410e472 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198162 2013-10-30 13:10:21Z allan $
+# $Id: PKGBUILD 200003 2013-11-21 01:30:41Z allan $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
pkgname=libgdiplus
pkgver=2.10.9
-pkgrel=2
+pkgrel=3
pkgdesc="An Open Source Implementation of the GDI+ API"
arch=(i686 x86_64 'mips64el')
license=('MPL' 'LGPL')
@@ -26,6 +26,7 @@ prepare() {
sed -i -e 's/-L\${libjpeg_prefix}\/lib -ljpeg/-ljpeg/' configure
}
+
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr --with-cairo=system
diff --git a/extra/libgpod/PKGBUILD b/extra/libgpod/PKGBUILD
index 993eee3c0..6670538a4 100644
--- a/extra/libgpod/PKGBUILD
+++ b/extra/libgpod/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198175 2013-10-30 13:15:45Z allan $
+# $Id: PKGBUILD 200005 2013-11-21 01:32:03Z allan $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=libgpod
pkgver=0.8.2
-pkgrel=7
+pkgrel=8
pkgdesc="A shared library to access the contents of an iPod"
arch=(i686 x86_64 'mips64el')
license=('LGPL')
diff --git a/extra/libiec61883/PKGBUILD b/extra/libiec61883/PKGBUILD
index 6c086997e..e71d39c4b 100644
--- a/extra/libiec61883/PKGBUILD
+++ b/extra/libiec61883/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198184 2013-10-30 13:19:06Z allan $
+# $Id: PKGBUILD 200001 2013-11-21 01:26:16Z allan $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,14 +6,14 @@
pkgname=libiec61883
pkgver=1.2.0
-pkgrel=3.1
+pkgrel=4
pkgdesc="A higher level API for streaming DV, MPEG-2 and audio over Linux IEEE 1394"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.kernel.org/pub/linux/libs/ieee1394/"
license=('LGPL')
depends=('libraw1394')
-source=("http://ftp.osuosl.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.gz")
-md5sums=('8af39fff74988073c3ad53fbab147da9')
+source=("https://www.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.xz")
+md5sums=('ed91bc1727fac8e019402fc3724a283d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libindi/PKGBUILD b/extra/libindi/PKGBUILD
index b0e8a4d22..b5d898f87 100644
--- a/extra/libindi/PKGBUILD
+++ b/extra/libindi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198755 2013-11-03 09:14:05Z andrea $
+# $Id: PKGBUILD 202208 2013-12-19 13:43:24Z fyan $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libindi
pkgver=0.9.6
-pkgrel=5
+pkgrel=7
pkgdesc="A distributed control protocol designed to operate astronomical instrumentation"
url="http://www.indilib.org/index.php?title=Main_Page"
license=('GPL2')
diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD
index 839a5ad5a..3f171a9f3 100644
--- a/extra/libisoburn/PKGBUILD
+++ b/extra/libisoburn/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 197415 2013-10-25 18:23:05Z andyrtr $
+# $Id: PKGBUILD 201543 2013-12-14 08:42:49Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Gour <Gour <gour@mail.inet.hr>
pkgname=libisoburn
-pkgver=1.3.2
-pkgrel=3
+pkgver=1.3.4
+pkgrel=1
pkgdesc="frontend for libraries libburn and libisofs"
url="http://libburnia-project.org"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
-depends=('libburn>=1.3.2' 'libisofs>=1.3.2' 'readline')
+depends=('libburn>=1.3.4' 'libisofs>=1.3.4' 'readline')
optdepends=('tk: for xorriso-tcltk frontend'
'bwidget: for xorriso-tcltk frontend')
provides=('xorriso' 'xorriso-tcltk')
install=${pkgname}.install
source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('7ebee7c1d4e09565daddca15467035af'
+md5sums=('d8ebfe9407aca0d6b799706647703692'
'SKIP')
build() {
diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD
index 335b4d930..5147d5a57 100644
--- a/extra/libisofs/PKGBUILD
+++ b/extra/libisofs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198189 2013-10-30 13:20:51Z allan $
+# $Id: PKGBUILD 201541 2013-12-14 08:40:10Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Hugo Doria <hugodoria@gmail.com>
# Contributor: Bjorn Martensen
pkgname=libisofs
-pkgver=1.3.2
+pkgver=1.3.4
pkgrel=1
pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://libburnia-project.org"
license=('GPL')
depends=('acl' 'zlib')
source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('3dfdaaf964ed7a779bc23de50c5f2175'
+md5sums=('dcd2cb0485579b4973e4ce7291fda647'
'SKIP')
build() {
diff --git a/extra/libjpeg-turbo/PKGBUILD b/extra/libjpeg-turbo/PKGBUILD
index 4690791fb..75c606a81 100644
--- a/extra/libjpeg-turbo/PKGBUILD
+++ b/extra/libjpeg-turbo/PKGBUILD
@@ -1,23 +1,30 @@
-# $Id: PKGBUILD 198190 2013-10-30 13:21:13Z allan $
+# $Id: PKGBUILD 201420 2013-12-11 04:56:37Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
pkgname=libjpeg-turbo
pkgver=1.3.0
-pkgrel=3
+pkgrel=4
pkgdesc='JPEG image codec with accelerated baseline compression and decompression'
url='http://libjpeg-turbo.virtualgl.org/'
license=('GPL' 'custom')
arch=('i686' 'x86_64' 'mips64el')
makedepends=('nasm')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28')
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ 'cve-2013-6629.patch')
+sha1sums=('1792c964b35604cebd3a8846f1ca6de5976e9c28'
+ '10f2cf2276244d2b94d35bfca24639bc83ce1185')
provides=('libjpeg=8.0.2' 'turbojpeg')
conflicts=('libjpeg' 'turbojpeg')
replaces=('libjpeg' 'turbojpeg')
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -i ../cve-2013-6629.patch # FS#38094
+}
+
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --with-jpeg8 --mandir=/usr/share/man
diff --git a/extra/libjpeg-turbo/cve-2013-6629.patch b/extra/libjpeg-turbo/cve-2013-6629.patch
new file mode 100644
index 000000000..7fb02730f
--- /dev/null
+++ b/extra/libjpeg-turbo/cve-2013-6629.patch
@@ -0,0 +1,36 @@
+Index: jdmarker.c
+===================================================================
+--- jdmarker.c (revision 1088)
++++ jdmarker.c (revision 1089)
+@@ -304,7 +304,7 @@
+ /* Process a SOS marker */
+ {
+ INT32 length;
+- int i, ci, n, c, cc;
++ int i, ci, n, c, cc, pi;
+ jpeg_component_info * compptr;
+ INPUT_VARS(cinfo);
+
+@@ -348,6 +348,13 @@
+
+ TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
+ compptr->dc_tbl_no, compptr->ac_tbl_no);
++
++ /* This CSi (cc) should differ from the previous CSi */
++ for (pi = 0; pi < i; pi++) {
++ if (cinfo->cur_comp_info[pi] == compptr) {
++ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
++ }
++ }
+ }
+
+ /* Collect the additional scan parameters Ss, Se, Ah/Al. */
+@@ -465,6 +472,8 @@
+ for (i = 0; i < count; i++)
+ INPUT_BYTE(cinfo, huffval[i], return FALSE);
+
++ MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8));
++
+ length -= count;
+
+ if (index & 0x10) { /* AC table definition */
diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD
index fa4a8f5b3..86a52b06f 100644
--- a/extra/libkcddb/PKGBUILD
+++ b/extra/libkcddb/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198845 2013-11-05 19:48:35Z andrea $
+# $Id: PKGBUILD 202479 2013-12-22 12:47:03Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkcddb
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="KDE CDDB library"
url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdemultimedia-kioslave')
conflicts=('kdemultimedia-kioslave')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('2e1b5381d704445d08a87353c2b1528349dfcbd0')
+sha1sums=('e0a195f145719defb1ad52493b41118a3b31c58e')
build() {
cd "${srcdir}"
diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD
index b4ba341f0..cda9af6cf 100644
--- a/extra/libkcompactdisc/PKGBUILD
+++ b/extra/libkcompactdisc/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198846 2013-11-05 19:48:45Z andrea $
+# $Id: PKGBUILD 202480 2013-12-22 12:47:04Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkcompactdisc
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A library for interfacing with CDs"
url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc'
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdemultimedia-kioslave')
conflicts=('kdemultimedia-kioslave')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e8c3e8efe5454538a7e7538355d099ebdbf6ac2b')
+sha1sums=('dc8b0bc7839942eb5e22ea6a3faf1d9960a99b98')
build() {
cd "${srcdir}"
diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD
index 99ed4d169..f9a7ec339 100644
--- a/extra/libkdcraw/PKGBUILD
+++ b/extra/libkdcraw/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 198840 2013-11-05 19:47:41Z andrea $
+# $Id: PKGBUILD 202475 2013-12-22 12:46:58Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkdcraw
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A C++ interface used to decode RAW picture"
url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'lcms2')
+depends=('kdelibs' 'libraw')
makedepends=('cmake' 'automoc4')
replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('c6eb63d1675aa028b1217b79958e1c63c245ca77')
+sha1sums=('7f2aae2f91edc4de668dee8138305148242ef34b')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DKDE4_BUILD_TESTS=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DENABLE_LCMS2=ON
+ -DCMAKE_INSTALL_PREFIX=/usr
make
}
diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD
index dd725401e..55fd8ebf0 100644
--- a/extra/libkdeedu/PKGBUILD
+++ b/extra/libkdeedu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198838 2013-11-05 19:47:18Z andrea $
+# $Id: PKGBUILD 202473 2013-12-22 12:46:55Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkdeedu
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Libraries used by KDE Education applications"
url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu"
@@ -14,7 +14,7 @@ install=${pkgname}.install
replaces=('kdeedu-libkdeedu' 'kdeedu-data')
options=('staticlibs') # libqtmmlwidget.a needed by KAlgebra
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('5db8e436ac5a77c3dacaf8279988e0121df10cd8')
+sha1sums=('b974648cc561d02eb999d2a5d197a93125142b39')
build() {
cd "${srcdir}"
diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD
index aff0e9f59..477da05d3 100644
--- a/extra/libkdegames/PKGBUILD
+++ b/extra/libkdegames/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198847 2013-11-05 19:48:57Z andrea $
+# $Id: PKGBUILD 202481 2013-12-22 12:47:05Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkdegames
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Common code and data for many KDE games"
url="https://projects.kde.org/projects/kde/kdegames/libkdegames"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdegames-libkdegames')
conflicts=('kdegames-libkdegames')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('df08248949aa8e0df3ec6cba3ca228078abe980d')
+sha1sums=('7c67c6ed68adc09937b20a5d46b7dde330e47400')
build() {
mkdir build
diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD
index 3ae406dd8..431c00afe 100644
--- a/extra/libkexiv2/PKGBUILD
+++ b/extra/libkexiv2/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198841 2013-11-05 19:47:52Z andrea $
+# $Id: PKGBUILD 202462 2013-12-22 12:46:44Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkexiv2
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="A library to manipulate pictures metadata"
url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('7095a438080173a2c5bd77fe57f59580056d1a4c')
+sha1sums=('554839aa4ea94f2ed55aa48c10c41d65c266da37')
build() {
cd "${srcdir}"
diff --git a/extra/libkgapi/PKGBUILD b/extra/libkgapi/PKGBUILD
index d21ade318..c190312bb 100644
--- a/extra/libkgapi/PKGBUILD
+++ b/extra/libkgapi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 186926 2013-06-01 08:09:09Z andrea $
+# $Id: PKGBUILD 200783 2013-12-05 06:48:36Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkgapi
-pkgver=2.0.1
+pkgver=2.0.2
pkgrel=1
pkgdesc="A KDE-based library for accessing various Google services via their public API"
url='https://projects.kde.org/projects/extragear/libs/libkgapi'
@@ -12,15 +12,19 @@ depends=('kdepimlibs')
makedepends=('cmake' 'automoc4' 'boost')
replaces=('akonadi-google' 'libkgoogle')
conflicts=('akonadi-google' 'libkgoogle')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('a421c6b5e0b262136121e3734b29fcce')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('27c406bb32b8cf0199cd44952bb8680e')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DKDE4_BUILD_TESTS=OFF
make
}
diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD
index 2cd942a48..87e9a07c8 100644
--- a/extra/libkipi/PKGBUILD
+++ b/extra/libkipi/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 145371 2011-12-22 07:58:59Z andrea $
+# $Id
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkipi
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="An interface to use kipi-plugins from a KDE application"
url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi"
@@ -14,11 +14,13 @@ replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('8fa8453b4314521e41d51972cec628c3ebd4294d')
+sha1sums=('bb0f8708071a07246e0ac553568102c743c3b13f')
-build() {
- cd "${srcdir}"
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
@@ -28,6 +30,6 @@ build() {
}
package() {
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD
index e93dc88e0..48c9c3862 100644
--- a/extra/libkmahjongg/PKGBUILD
+++ b/extra/libkmahjongg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198848 2013-11-05 19:49:09Z andrea $
+# $Id: PKGBUILD 202482 2013-12-22 12:47:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkmahjongg
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Common code, backgrounds and tile sets for games using Mahjongg tiles"
url="https://projects.kde.org/projects/kde/kdegames/libmahjongg"
@@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4')
replaces=('kdegames-libkmahjongg')
conflicts=('kdegames-libkmahjongg')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d0018922e1b7b05847b544fd4f365da196f0f812')
+sha1sums=('be38eb549b5502181bad65cfeb45b832d711bc7e')
build() {
mkdir build
diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD
index 85d66d4ea..c2ab05da6 100644
--- a/extra/libkolabxml/PKGBUILD
+++ b/extra/libkolabxml/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 190041 2013-07-13 12:41:18Z svenstaro $
+# $Id: PKGBUILD 201260 2013-12-07 10:34:59Z bpiotrowski $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkolabxml
pkgver=0.8.4
-pkgrel=2
+pkgrel=3
pkgdesc="Kolab XML Format Schema Definitions Library"
url='http://git.kolab.org/libkolabxml/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
depends=('xerces-c' 'boost-libs')
-makedepends=('cmake' 'boost' 'xsd' 'qt4')
+makedepends=('cmake' 'boost' 'xsd' 'qt4' 'swig')
source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"{,.gpg})
md5sums=('64887f52c6629bbd8e2390d591ef5892'
'55fcdaff82818c4a0eac50570db31e53')
diff --git a/extra/libkomparediff2/PKGBUILD b/extra/libkomparediff2/PKGBUILD
new file mode 100644
index 000000000..9ce18d38c
--- /dev/null
+++ b/extra/libkomparediff2/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 202483 2013-12-22 12:47:06Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgname=libkomparediff2
+pkgver=4.12.0
+pkgrel=1
+pkgdesc="Library to compare files and strings"
+url='https://projects.kde.org/projects/kde/kdesdk/libkomparediff2'
+arch=('i686' 'x86_64')
+license=('GPL' 'LGPL' 'FDL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('ba6dcfd8da41d5f441d6f2a8352eb28e3b504e08')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD
index 348b95332..cbca8e99c 100644
--- a/extra/libksane/PKGBUILD
+++ b/extra/libksane/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198843 2013-11-05 19:48:13Z andrea $
+# $Id: PKGBUILD 202477 2013-12-22 12:47:01Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libksane
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="An image scanning library"
url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane"
@@ -14,7 +14,7 @@ replaces=('kdegraphics-libs')
conflicts=('kdegraphics-libs')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('e52dd9db0c5222ba6febe96dec9362b46f7453f4')
+sha1sums=('c3473dbe3b5e68d85828fbcd585a957781e73cde')
build() {
cd "${srcdir}"
diff --git a/extra/libkscreen/PKGBUILD b/extra/libkscreen/PKGBUILD
index 5a374b892..9ee91db84 100644
--- a/extra/libkscreen/PKGBUILD
+++ b/extra/libkscreen/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 194203 2013-09-10 14:07:21Z andrea $
+# $Id: PKGBUILD 199946 2013-11-20 08:45:12Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: birdflesh <antkoul at gmail dot com>
pkgname=libkscreen
-pkgver=1.0.1
-pkgrel=3
+pkgver=1.0.2
+pkgrel=1
pkgdesc="KDE's screen management library"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/libkscreen'
license=('GPL')
depends=('kdelibs' 'qjson')
makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('52aeaf2d987bffd05b111e89b445bd00')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+md5sums=('39f5316ef4f9203dd7a42180edbab122')
prepare() {
mkdir build
diff --git a/extra/libmikmod/PKGBUILD b/extra/libmikmod/PKGBUILD
index 18fbfe4d5..174fb9d9c 100644
--- a/extra/libmikmod/PKGBUILD
+++ b/extra/libmikmod/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 198197 2013-10-30 13:23:49Z allan $
+# $Id: PKGBUILD 201341 2013-12-09 07:42:41Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=libmikmod
-pkgver=3.3.3
+pkgver=3.3.4
pkgrel=1
pkgdesc="A portable sound library"
license=(GPL LGPL)
-url="http://mikmod.shlomifish.org/"
+url="http://mikmod.sourceforge.net"
arch=('i686' 'x86_64' 'mips64el')
depends=(openal sh)
makedepends=(alsa-lib)
install=$pkgname.install
-source=($url/files/$pkgname-$pkgver.tar.gz)
-sha256sums=('79f02478c5abd8b2af73df4cc5f9d52625aa044327c01563168e270cf79b2437')
+source=(http://downloads.sourceforge.net/mikmod/$pkgname-$pkgver.tar.gz)
+sha256sums=('2e8ca1d945ff7330741d085548a6d4e8b2f6a9d41edda773607905d8905683ae')
prepare() {
mkdir build
diff --git a/extra/libmm-qt/PKGBUILD b/extra/libmm-qt/PKGBUILD
index d6a6c6c22..8a92de4fb 100644
--- a/extra/libmm-qt/PKGBUILD
+++ b/extra/libmm-qt/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 196394 2013-10-12 17:04:01Z andrea $
+# $Id: PKGBUILD 200035 2013-11-21 23:29:06Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libmm-qt
-pkgver=0.5.1
+pkgver=1.0.0
pkgrel=1
pkgdesc='Qt-only wrapper for ModemManager DBus API'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/extragear/libs/libmm-qt'
license=('LGPL')
-depends=('qt4')
-makedepends=('cmake')
+depends=('qt4' 'modemmanager')
+makedepends=('cmake' 'doxygen')
source=("http://download.kde.org/unstable/modemmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('97a61c398426ea596564d1c876025d93')
+md5sums=('421dc7ebe8439fabc9d24da46ca0cfa7')
prepare() {
mkdir -p build
diff --git a/extra/libmp4v2/PKGBUILD b/extra/libmp4v2/PKGBUILD
index df8c470df..dc1aaa20d 100644
--- a/extra/libmp4v2/PKGBUILD
+++ b/extra/libmp4v2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198201 2013-10-30 13:25:21Z allan $
+# $Id: PKGBUILD 199979 2013-11-20 12:29:54Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=libmp4v2
pkgver=2.0.0
-pkgrel=2.1
+pkgrel=3
pkgdesc="MPEG-4 library"
arch=('i686' 'x86_64' 'mips64el')
license=('MPL')
diff --git a/extra/libmtp/PKGBUILD b/extra/libmtp/PKGBUILD
index 5c1dec838..b56ae93b0 100644
--- a/extra/libmtp/PKGBUILD
+++ b/extra/libmtp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198802 2013-11-04 17:57:04Z andyrtr $
+# $Id: PKGBUILD 202983 2013-12-30 08:41:18Z foutrelis $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: damir <damir@archlinux.org>
# Contributor: Kevin Edmonds <edmondskevin@hotmail.com>
pkgname=libmtp
pkgver=1.1.6
-pkgrel=3
+pkgrel=5
pkgdesc="Library implementation of the Media Transfer Protocol"
arch=("i686" "x86_64" "mips64el")
url="http://libmtp.sourceforge.net"
diff --git a/extra/libnet/PKGBUILD b/extra/libnet/PKGBUILD
index 1d8c4c0e8..d86db5bc6 100644
--- a/extra/libnet/PKGBUILD
+++ b/extra/libnet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198207 2013-10-30 13:27:29Z allan $
+# $Id: PKGBUILD 199977 2013-11-20 12:23:09Z allan $
# Maintainer:
# Contributor: damir <damir@archlinux.org>
pkgname=libnet
pkgver=1.1.6
-pkgrel=1.1
+pkgrel=2
pkgdesc="A library which provides API for commonly used low-level net functions"
arch=('i686' 'x86_64' 'mips64el')
url="http://sourceforge.net/projects/libnet-dev/"
diff --git a/extra/libnm-qt/PKGBUILD b/extra/libnm-qt/PKGBUILD
index 65855e02c..d5e9ccd9a 100644
--- a/extra/libnm-qt/PKGBUILD
+++ b/extra/libnm-qt/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 196551 2013-10-15 09:59:45Z andrea $
+# $Id: PKGBUILD 200037 2013-11-21 23:30:26Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libnm-qt
-pkgver=0.9.0.1
+pkgver=0.9.8.0
pkgrel=1
pkgdesc='Qt-only wrapper for NetworkManager DBus API'
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/extragear/libs/libnm-qt'
license=('LGPL')
depends=('libmm-qt' 'networkmanager')
-makedepends=('cmake')
+makedepends=('cmake' 'doxygen')
source=("http://download.kde.org/unstable/networkmanager-qt/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha256sums=('88239444df7fb7bbbadbe4bff50f68bcb7debe5efb101300aeb1b1e3cbb192cf')
+sha256sums=('02242d49958ac88e056f093cff08f9e94ff888d14a6765180ddc991caceb5db8')
prepare() {
mkdir -p build
diff --git a/extra/libnova/PKGBUILD b/extra/libnova/PKGBUILD
index 89992d5f4..f0ac20ffa 100644
--- a/extra/libnova/PKGBUILD
+++ b/extra/libnova/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 198210 2013-10-30 13:28:34Z allan $
+# $Id: PKGBUILD 199819 2013-11-17 07:04:35Z allan $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libnova
-pkgver=0.14.0
+pkgver=0.15.0
pkgrel=1
pkgdesc="A general purpose, double precision, celestial mechanics, astrometry and astrodynamics library."
url="http://libnova.sourceforge.net/"
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
depends=('glibc')
-makedepends=('pkgconfig')
source=(http://downloads.sourceforge.net/sourceforge/libnova/$pkgname-$pkgver.tar.gz)
-sha1sums=('4ea7034a907d0578646b0d12fc4a095de8b23f51')
+sha1sums=('4b8d04cfca0be8d49c1ef7c3607d405a7a8b167d')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
+ autoreconf -i
./configure --prefix=/usr
make
}
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index 506212bfd..86949c097 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 198221 2013-10-30 13:32:47Z allan $
+# $Id: PKGBUILD 200277 2013-11-24 16:59:45Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
# Contributor: Travis Willard <travis@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=libpng
-pkgver=1.6.6
-_apngver=1.6.6
+pkgver=1.6.7
+_apngver=1.6.7
pkgrel=1
pkgdesc="A collection of routines used to create PNG format graphics files"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,9 +15,9 @@ license=('custom')
depends=('zlib' 'sh')
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz{,.asc}
http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz)
-md5sums=('3a41dcd58bcac7cc191c2ec80c7fb2ac'
+md5sums=('7023a9eacd7b6a3eb95761a2f574d456'
'SKIP'
- '8af242769611daf62a8a17349b6059f7')
+ 'aad92ea0cc3e29415b90c78f1d267799')
prepare() {
cd $pkgname-$pkgver
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 73abae98e..293a198fd 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198223 2013-10-30 13:33:34Z allan $
+# $Id: PKGBUILD 201261 2013-12-07 10:35:00Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=libpst
pkgname=('libpst' 'libpst-docs')
pkgver=0.6.58
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.five-ten-sg.com/libpst/"
license=('GPL')
diff --git a/extra/libqmi/PKGBUILD b/extra/libqmi/PKGBUILD
index fe83c4cb8..58bf84b2f 100644
--- a/extra/libqmi/PKGBUILD
+++ b/extra/libqmi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198225 2013-10-30 13:34:34Z allan $
+# $Id: PKGBUILD 202885 2013-12-28 22:44:05Z bpiotrowski $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=libqmi
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
pkgdesc="QMI modem protocol helper library"
arch=(i686 x86_64 mips64el)
url="http://www.freedesktop.org/wiki/Software/libqmi/"
@@ -11,12 +11,12 @@ license=(GPL2)
depends=(glib2 bash)
makedepends=(gtk-doc python)
source=(http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz)
-sha256sums=('812515c36fd77c5f7eb9d52804e9666c4341e8c7dd3d932ca1e607b467831af3')
+sha256sums=('fadd8070dd6f95eb00d04058c616ade57966d8e54d894da8ddbf31e98310ee0d')
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --with-tests
+ --disable-static --with-tests --libexecdir=/usr/lib
make
}
diff --git a/extra/libquvi/PKGBUILD b/extra/libquvi/PKGBUILD
index 7a309d73c..7195e4f13 100644
--- a/extra/libquvi/PKGBUILD
+++ b/extra/libquvi/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 198226 2013-10-30 13:34:55Z allan $
+# $Id: PKGBUILD 199434 2013-11-12 17:02:09Z heftig $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
pkgname=libquvi
-pkgver=0.9.3
+pkgver=0.9.4
pkgrel=1
pkgdesc='Library for parsing video download links.'
arch=('i686' 'x86_64' 'mips64el')
url='http://quvi.sourceforge.net/'
license=('AGPL3')
-depends=('libquvi-scripts' 'curl' 'lua51' 'libproxy' 'libgcrypt' 'glib2')
+depends=('libquvi-scripts' 'curl' 'lua' 'libproxy' 'libgcrypt' 'glib2')
conflicts=('quvi<0.9.0')
source=("http://downloads.sourceforge.net/sourceforge/quvi/${pkgname}-${pkgver}.tar.xz"{,.sig})
-md5sums=('12a62c4fcde9b6109193191b7bd3d685'
+md5sums=('8e3f2134a6b3376934bd884b07dcdac5'
'SKIP')
build() {
diff --git a/community/libraw/PKGBUILD b/extra/libraw/PKGBUILD
index b767a9218..99edbbae0 100644
--- a/community/libraw/PKGBUILD
+++ b/extra/libraw/PKGBUILD
@@ -1,35 +1,35 @@
-# $Id: PKGBUILD 99878 2013-10-31 02:14:23Z allan $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# $Id: PKGBUILD 199050 2013-11-07 23:03:25Z andrea $
+# Maintainer: Andre Scarpino <andrea@archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
pkgname=libraw
pkgver=0.15.4
-pkgrel=2
+pkgrel=3
pkgdesc="A library for reading RAW files obtained from digital photo cameras (CRW/CR2, NEF, RAF, DNG, and others)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.libraw.org/"
license=('CDDL' 'LGPL' 'custom')
-depends=('lcms')
-options=('!makeflags')
-changelog=$pkgname.changelog
-source=(http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz)
+depends=('lcms2' 'jasper')
+source=("http://www.libraw.org/data/LibRaw-${pkgver}.tar.gz")
sha256sums=('b3fcfee33bc34ae5869a9741880e28a62f029f196cb1d1a007ab156f4a110f79')
build() {
- cd ${srcdir}/LibRaw-${pkgver}
+ cd LibRaw-${pkgver}
- ./configure --prefix=/usr
+ ./configure --prefix=/usr \
+ --disable-static
make
}
package() {
- cd ${srcdir}/LibRaw-${pkgver}
+ cd LibRaw-${pkgver}
make DESTDIR=${pkgdir} install
-
-#license
- install -D -m644 ${srcdir}/LibRaw-${pkgver}/LICENSE.LibRaw.pdf \
- ${pkgdir}/usr/share/licenses/libraw/LICENSE.LibRaw.pdf
+
+ install -d "${pkgdir}"/usr/share/licenses/${pkgname}
+ install -D -m644 LICENSE.LibRaw.pdf \
+ "${pkgdir}"/usr/share/licenses/${pkgname}
}
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index d1c61c515..966132226 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198659 2013-11-01 15:09:06Z andyrtr $
+# $Id: PKGBUILD 202184 2013-12-18 22:51:10Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
@@ -19,8 +19,8 @@ pkgname=('libreoffice-common'
'libreoffice-extension-presentation-minimizer'
'libreoffice-extension-wiki-publisher'
'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.1.3.2
-pkgver=4.1.3
+_LOver=4.1.4.2
+pkgver=4.1.4
pkgrel=1
arch=('i686' 'x86_64')
license=('LGPL3')
@@ -34,7 +34,7 @@ makedepends=( # makedepends
# the runtime dependencies
"curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1"
- 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0'
+ 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.4'
'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
'ttf-dejavu') # to satisfy regression tests
# there's only one single static library in libreoffice-sdk,
@@ -120,9 +120,9 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
libmspub-0.0.6.tar.bz2
libmwaw-0.1.11.tar.bz2
libvisio-0.0.31.tar.bz2 )
-md5sums=('7c5248b9141df6c4844c81515a41942f'
- 'c5a692983c429a142b1c109fd28425fa'
- 'f5131da6395034246eb26aa94c7de8b2'
+md5sums=('2e7880600b26387f342f277c5d198bfa'
+ '1235bb27ff2a060cc666752143dfbf6b'
+ '083f211866fe1f77fd2712b822a56f5c'
'f02578f5218f217a9f20e9c30e119c6a'
'1f24ab1d39f4a51faf22244c94a6203f'
'35c94d2df8893241173de1d16b6034c0'
@@ -288,7 +288,7 @@ package_libreoffice-common() {
pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
install=libreoffice-common.install
depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups'
- 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0"
+ 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.4"
'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
optdepends=('libreoffice-langpack: additional language support'
'java-runtime: adds java support'
diff --git a/extra/libreoffice/PKGBUILD.42 b/extra/libreoffice/PKGBUILD.42
new file mode 100644
index 000000000..22a082ba7
--- /dev/null
+++ b/extra/libreoffice/PKGBUILD.42
@@ -0,0 +1,672 @@
+# $Id: PKGBUILD 198658 2013-11-01 15:08:02Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+
+pkgbase="libreoffice"
+pkgname=('libreoffice-common'
+ 'libreoffice-base'
+ 'libreoffice-calc'
+ 'libreoffice-draw'
+ 'libreoffice-gnome'
+ 'libreoffice-impress'
+ 'libreoffice-kde4'
+ 'libreoffice-math'
+ 'libreoffice-sdk'
+ 'libreoffice-sdk-doc'
+ 'libreoffice-writer'
+ 'libreoffice-en-US'
+ 'libreoffice-postgresql-connector'
+ 'libreoffice-extension-wiki-publisher'
+ 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
+_LOver=4.2.0.0.beta1
+pkgver=4.2.0
+pkgrel=0.1
+arch=('i686' 'x86_64')
+license=('LGPL3')
+url="http://www.libreoffice.org/"
+makedepends=( # makedepends
+ 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost'
+ 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit'
+ 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick'
+ 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen'
+ 'clucene' 'bluez-libs' 'harfbuzz-icu' 'gdb'
+ # the runtime dependencies
+ "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
+ 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=52.1"
+ 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.24.0'
+ 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
+ 'ttf-liberation' # to satisfy regression tests
+ 'git')
+# there's only one single static library in libreoffice-sdk,
+# the next build that removes it may lead to trouble if people may use it
+# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
+# options=('staticlibs')
+
+# http://download.documentfoundation.org/mirrors/all.html
+# http://wiki.documentfoundation.org/Mirrors
+
+#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
+_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
+_additional_source_url="http://dev-www.libreoffice.org/src"
+_additional_source_url2="http://dev-www.libreoffice.org/extern"
+source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
+ ${_additional_source_url}/15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
+ ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+ ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+ ${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
+ ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+ ${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
+ ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ${_additional_source_url}/8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2
+ ${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+ ${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
+ ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
+ ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
+ ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+ ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ ${_additional_source_url}/libcdr-0.0.14.tar.bz2
+ ${_additional_source_url}/libmspub-0.0.6.tar.bz2
+ ${_additional_source_url}/libmwaw-0.2.0.tar.bz2
+ ${_additional_source_url}/libvisio-0.0.31.tar.bz2
+ ${_additional_source_url}/libetonyek-0.0.1.tar.bz2
+ ${_additional_source_url}/libfreehand-0.0.0.tar.bz2
+ ${_additional_source_url}/libodfgen-0.0.3.tar.bz2
+ ${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
+ ${_additional_source_url}/libatomic_ops-7_2d.zip
+ ${_additional_source_url}/libe-book-0.0.2.tar.bz2
+ make-pyuno-work-with-system-wide-module-install.diff
+ libreoffice-common.sh libreoffice-common.csh)
+noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
+ 185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ 8c853024fbcff39113d9285250dafc66-mdds_0.9.1.tar.bz2
+ 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+ 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+ ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
+ 22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
+ 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+ a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
+ 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
+ 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz
+ 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
+ 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz
+ eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
+ 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+ 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
+ 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
+ f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
+ 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
+ d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
+ 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
+ ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
+ db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
+ ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
+ ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
+ 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
+ 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+ 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+ libcdr-0.0.14.tar.bz2
+ libmspub-0.0.6.tar.bz2
+ libmwaw-0.2.0.tar.bz2
+ libvisio-0.0.31.tar.bz2
+ libetonyek-0.0.1.tar.bz2
+ libfreehand-0.0.0.tar.bz2
+ libodfgen-0.0.3.tar.bz2
+ Firebird-2.5.2.26540-0.tar.bz2
+ libatomic_ops-7_2d.zip
+ libe-book-0.0.2.tar.bz2)
+md5sums=('dbb8b7f5f64a407b6aef66f98b8163ff'
+ '48481fd38699c598b19d637ead29d34a'
+ 'ec4982d81fac7c068095c7877273ca34'
+ '15cb8c0803064faef0c4ddf5bc5ca279'
+ '1f24ab1d39f4a51faf22244c94a6203f'
+ '35c94d2df8893241173de1d16b6034c0'
+ '798b2ffdc8bcfe7bca2cf92b62caf685'
+ 'a7983f859eafb2677d7ff386a023bc40'
+ '3c219630e4302863a9a83d0efde889db'
+ '625ff5f2f968dd908bca43c9469d6e6b'
+ '2c9b0f83ed5890af02c0df1c1776f39b'
+ '2e482c7567908d334785ce7d69ddfff7'
+ 'eeb2c7ddf0d302fba4bfc6e97eac9624'
+ '39bb3fcea1514f1369fcfc87542390fd'
+ '3404ab6b1792ae5f16bbd603bd1e1d03'
+ '97b2d4dba862397f446b217e2b623e71'
+ 'f94d9870737518e3b597f9265f4e9803'
+ '8ce2fcd72becf06c41f7201d15373ed9'
+ 'd8bd5eed178db6e2b18eeed243f85aa8'
+ '3bdf40c0d199af31923e900d082ca2dd'
+ 'ace6ab49184e329db254e454a010f56d'
+ 'db60e4fde8dd6d6807523deb71ee34dc'
+ 'ba2930200c9f019c2d93a8c88c651a0f'
+ '8c853024fbcff39113d9285250dafc66'
+ 'ae330b9493bd4503ac390106ff6060d7'
+ '22f8a85daf4a012180322e1f52a7563b'
+ 'ea2acaf140ae40a87a952caa75184f4d'
+ '36271d3fa0d9dec1632029b6d7aac925'
+ '0168229624cfac409e766913506961a8'
+ '17410483b5b5f267aa18b7e00b65e6e0'
+ '185d60944ea767075d27247c3162b3bc'
+ 'd88f9b94df880d2c05be943b000ca112'
+ '1120705cd0f0d9bd5506360bf57b6c2e'
+ 'd794625f156a9fb1c53b3f8a8aa13b5e'
+ '82628333418f101a20cd21f980cf9f40'
+ '040e0d7ce0cc0eb3a016964699d54a6c'
+ '496dd00028afcc19f896b01394769043'
+ '9cafe7f50a3b2c5ebd2dc9c6c509d2b4'
+ '21154d2004e025c8a3666625b0357bb5'
+ 'c0b86562d5aa40761a87134f83e6adcf'
+ '3a62e10c57270718cabfdfc4b7b4e095'
+ '07d2bf5ad839a394cca008b3ec6e7bb1'
+ '4195735a80876ae812fca5736b50192a'
+ 'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
+
+prepare() {
+
+ cd libreoffice-$_LOver
+#return 1
+ # fix exttextcat build error
+ # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
+ unset CPPFLAGS
+
+ # move external sources into place
+ mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
+ for source in "${noextract[@]}"; do
+ ln -s ${srcdir}/$source .
+ done
+ popd
+
+ # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
+ # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
+ cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
+
+ # fix not upstreamable pyuno paths - patch taken from Debian
+ patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
+
+ #use the CFLAGS but remove the LibO overridden ones
+ for i in $CFLAGS; do
+ case "$i" in
+ -O?|-pipe|-Wall|-g|-fexceptions) continue;;
+ esac
+ ARCH_FLAGS="$ARCH_FLAGS $i"
+ done
+
+
+ # qt4 fix
+ sed -i "s:qmake:qmake-qt4:g" configure.ac
+}
+
+build() {
+ cd libreoffice-$_LOver
+
+ #autoconf -f
+
+ # non-SMP test build
+ #export MAKEFLAGS="-j1"
+ #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
+
+ ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
+ --enable-split-app-modules \
+ --with-parallelism=${MAKEFLAGS/-j/} \
+ --with-external-tar="${srcdir}/ext_sources" \
+ --disable-fetch-external \
+ --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
+ --libdir=/usr/lib --mandir=/usr/share/man \
+ --with-lang="" \
+ --enable-crashdump \
+ --enable-dbus \
+ --enable-evolution2\
+ --enable-gio\
+ --disable-gnome-vfs\
+ --disable-kde\
+ --enable-kde4\
+ --enable-gtk3 \
+ --enable-gstreamer \
+ --enable-lockdown\
+ --enable-opengl \
+ --enable-odk\
+ --enable-python=system \
+ --enable-scripting-beanshell \
+ --enable-scripting-javascript \
+ --enable-ext-wiki-publisher \
+ --enable-ext-nlpsolver \
+ --without-fonts\
+ --without-afms\
+ --without-system-libwps\
+ --without-system-libcdr \
+ --without-system-mdds\
+ --without-myspell-dicts \
+ --without-system-libvisio \
+ --without-system-libcmis \
+ --without-system-libmspub \
+ --without-system-libexttextcat \
+ --without-system-orcus \
+ --without-system-liblangtag \
+ --without-system-jfreereport \
+ --without-system-apache-commons \
+ --without-system-libodfgen \
+ --without-system-libmwaw \
+ --without-system-libetonyek \
+ --without-system-libfreehand \
+ --without-system-firebird \
+ --without-system-libatomic-ops \
+ --without-system-libebook \
+ --with-system-dicts \
+ --with-external-dict-dir=/usr/share/hunspell \
+ --with-external-hyph-dir=/usr/share/hyphen \
+ --with-external-thes-dir=/usr/share/mythes \
+ --with-system-beanshell \
+ --with-system-cppunit\
+ --with-system-graphite\
+ --with-system-libwpg \
+ --with-system-libwps \
+ --with-system-redland\
+ --without-system-npapi-headers \
+ --with-ant-home="/usr/share/apache-ant"\
+ --without-system-boost\
+ --with-system-cairo\
+ --with-system-libs\
+ --with-system-mythes\
+ --with-system-headers\
+ --without-system-hsqldb \
+ --with-alloc=system\
+ --with-system-clucene \
+ --disable-dependency-tracking
+
+# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414
+
+# --without-ppds\ # breaks spadmin permission
+
+#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
+
+ touch src.downloaded
+ #./download
+ make
+ # fake installation to create split file lists
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
+}
+
+#check() {
+# cd ${srcdir}/build
+# make check
+#}
+
+package_libreoffice-common() {
+
+ pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
+ install=libreoffice-common.install
+ depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups'
+ 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=52.1" 'clucene' 'lcms2' "poppler>=0.24.0"
+ 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
+ optdepends=('libreoffice-langpack: additional language support'
+ 'java-runtime: adds java support'
+ 'pstoedit: translates PostScript and PDF graphics into other vector formats'
+ 'libmythes: for use in thesaurus'
+ 'beanshell: interactive java -- good for prototyping /macros'
+ 'vigra: C++ computer vision library, usable in Basebmp'
+ 'libmspack: library for Microsoft compression formats for use in FontOOo'
+ 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
+ 'sane: for scanner access'
+ 'unixodbc: adds ODBC database support'
+ 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress'
+ 'gtk2: for browser plugin')
+ backup=(etc/libreoffice/sofficerc
+ etc/libreoffice/bootstraprc
+ etc/libreoffice/psprint.conf
+ etc/profile.d/libreoffice-common.sh
+ etc/profile.d/libreoffice-common.csh)
+ groups=('libreoffice')
+ provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
+ 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
+ 'libreoffice-extension-report-builder')
+ conflicts=('go-openoffice')
+ replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
+ 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
+ 'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ # put configuration files into place
+ install -dm755 ${pkgdir}/etc/libreoffice
+ install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
+ install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
+ # install dummy links to make them found by LibO
+ cd ${pkgdir}/usr/lib/libreoffice/program/
+ ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
+ cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
+ ln -vsf /etc/libreoffice/psprint.conf .
+
+ # allow to preset desired VLC
+ install -dm755 ${pkgdir}/etc/profile.d
+ install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
+
+ # move bash-completion files to its new place
+ install -dm755 ${pkgdir}/usr/share/bash-completion/completions
+ mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
+ rm -rf ${pkgdir}/etc/bash_completion.d
+
+ # some files would conflict
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar
+ rm -vf ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb
+
+ # make pyuno find its modules
+ install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages
+ ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py
+ ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py
+
+ # workaround all packages now depend on that file
+ cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+}
+
+package_libreoffice-base() {
+ pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
+ install=libreoffice-base.install
+ depends=('libreoffice-common')
+ optdepends=('libreoffice-postgresql-connector')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-postgresql-connector() {
+ pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
+ depends=('libreoffice-base' 'postgresql-libs')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # workaround double entries in the file list
+ mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
+ sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-calc() {
+ pkgdesc="Spreadsheet application for LibreOffice."
+ install=libreoffice-calc.install
+ depends=('libreoffice-common' 'lpsolve' )
+ #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-draw() {
+ pkgdesc="Drawing Application for LibreOffice."
+ install=libreoffice-draw.install
+ depends=('libreoffice-common')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-gnome() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
+ depends=('libreoffice-common' 'gconf')
+ optdepends=('gtk3: for gtk3 Gnome integration'
+ 'gtk2: for older gtk2 desktop integration')
+ groups=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-impress() {
+ pkgdesc="Presentation Application for LibreOffice."
+ install=libreoffice-impress.install
+ depends=('libreoffice-common')
+ optdepends=('glu: for the OGLTrans extension')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-kde4() {
+ pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
+ depends=('libreoffice-common' 'kdelibs')
+ optdepends=()
+ backup=()
+ groups=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-math() {
+ pkgdesc="Equation Editor Application for LibreOffice."
+ depends=('libreoffice-common')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-sdk() {
+ pkgdesc="Software Development Kit for LibreOffice."
+ depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
+ groups=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ # fix environment path to keep compatibility with other java-environments
+# sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
+ sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
+}
+
+package_libreoffice-sdk-doc() {
+ pkgdesc="Software Development Kit documentation for LibreOffice"
+ depends=('libreoffice-common' 'libreoffice-sdk')
+ groups=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ #fix permissions
+ find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
+}
+
+package_libreoffice-writer() {
+ pkgdesc="Word Processor Application for LibreOffice."
+ install=libreoffice-writer.install
+ depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
+ optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images')
+ groups=('libreoffice')
+ replaces=('libreoffice')
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+
+ # for workaround this file belongs now to common
+ rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
+}
+
+package_libreoffice-en-US() {
+ pkgdesc="English (US) language pack for LibreOffice"
+ #arch=('any')
+ provides=('openoffice-en-US' 'libreoffice-langpack')
+ replaces=(openoffice-en-US)
+ conflicts=(openoffice-en-US)
+
+ # create directories from *list.txt file
+ for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
+ install -dm755 ${pkgdir}/${directory/\%dir/}
+ done
+ # install files into the pkg from fakeinstall dir
+ for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
+ dirname=`dirname $file`
+ # check if directory has been already been created - some are missing like manpages
+ [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
+ # mv file from fakeinstall to pkgdir
+ mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
+ done
+}
+
+package_libreoffice-extension-wiki-publisher() {
+
+ pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+ #unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+ unzip -q ${srcdir}/libreoffice-$_LOver/workdir/unxlng*/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
+}
+
+package_libreoffice-extension-nlpsolver() {
+
+ pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
+ #arch=('any')
+ depends=('libreoffice-common' 'java-environment')
+ groups=('libreoffice-extensions')
+
+ install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
+ unzip -q ${srcdir}/libreoffice-$_LOver/workdir/unxlng*/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
+}
diff --git a/extra/libreoffice/fix_install.diff b/extra/libreoffice/fix_install.diff
deleted file mode 100644
index b16320a22..000000000
--- a/extra/libreoffice/fix_install.diff
+++ /dev/null
@@ -1,82 +0,0 @@
-From 8ce82f83fb8146b684bec5d903d76f034ba37d4a Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmladek@suse.cz>
-Date: Fri, 07 Jun 2013 12:13:24 +0000
-Subject: distro-install-file-lists: handle new filelists created for 4.1
-
-Change-Id: I2d7a52b396a46f1f6546b92eb5612958a2cb7397
----
-diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
-index d83855b..bbd462b 100755
---- a/bin/distro-install-file-lists
-+++ b/bin/distro-install-file-lists
-@@ -80,6 +80,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
- gid_Module_Root_Files_[0-9] \
- gid_Module_Root_Hack \
- gid_Module_Oo_Linguistic \
-+ gid_Module_Root_Extension_Dictionary_* \
- gid_Module_Root_Ure_Hidden ; do
- merge_flists $module $FILELISTSDIR/common_list.txt
- done
-@@ -100,6 +101,9 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
- merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/math_list.txt
- merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/impress_list.txt
- merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/writer_list.txt
-+ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/base_list.txt
-+ merge_flists gid_Module_Pdfimport $FILELISTSDIR/draw_list.txt
-+
- # FIXME: small; low dependencies; why optional module?
- merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/impress_list.txt
- else
-@@ -115,6 +119,8 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
- merge_flists gid_Module_Brand_Prg_Math $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Brand_Prg_Impress $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Brand_Prg_Wrt $FILELISTSDIR/common_list.txt
-+ merge_flists gid_Module_Reportbuilder $FILELISTSDIR/common_list.txt
-+ merge_flists gid_Module_Pdfimport $FILELISTSDIR/common_list.txt
- # FIXME: small; low dependencies; why optional module?
- merge_flists gid_Module_Optional_OGLTrans $FILELISTSDIR/common_list.txt
- fi
-@@ -133,26 +139,26 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
- merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/draw_list.txt
- merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/pyuno_list.txt
-- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
-- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
-+ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt
-+ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
- merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt
- merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
- else
- merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/mailmerge_list.txt
-- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/pyuno_list.txt
-+ merge_flists gid_Module_Pyuno $FILELISTSDIR/pyuno_list.txt
- merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/pyuno_list.txt
-- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
-+ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/pyuno_list.txt
- merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/filters_list.txt
- fi
- else
- merge_flists gid_Module_Optional_Grfflt $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Headless $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Pymailmerge $FILELISTSDIR/common_list.txt
-- merge_flists gid_Module_Optional_Pyuno $FILELISTSDIR/common_list.txt
-+ merge_flists gid_Module_Pyuno $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Pyuno_LibreLogo $FILELISTSDIR/common_list.txt
-- merge_flists gid_Module_Optional_Extensions_Script_Provider_For_Python $FILELISTSDIR/common_list.txt
-+ merge_flists gid_Module_Script_Provider_For_Python $FILELISTSDIR/common_list.txt
- merge_flists gid_Module_Optional_Xsltfiltersamples $FILELISTSDIR/common_list.txt
- fi
-
-@@ -413,7 +419,7 @@ else
- create_package_directory gid_Module_Brand_Prg_Wrt pkg/libreoffice-writer
- create_package_directory gid_Module_Brand_Prg_Impress pkg/libreoffice-impress
- create_package_directory gid_Module_Brand_Prg_Base pkg/libreoffice-base
-- create_package_directory gid_Module_Optional_Pyuno pkg/python-uno
-+ create_package_directory gid_Module_Pyuno pkg/python-uno
- create_package_directory gid_Module_Optional_Gnome pkg/libreoffice-gnome
- create_package_directory gid_Module_Optional_Tde pkg/libreoffice-tde
- create_package_directory gid_Module_Optional_Kde pkg/libreoffice-kde
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index deb28ce24..be27ac174 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198229 2013-10-30 13:35:58Z allan $
+# $Id: PKGBUILD 199931 2013-11-19 18:03:47Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=librsvg
-pkgver=2.40.0
+pkgver=2.40.1
pkgrel=1
epoch=1
pkgdesc="A SVG viewing library"
@@ -15,7 +15,7 @@ options=('!emptydirs')
url="https://live.gnome.org/LibRsvg"
install=librsvg.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8f7db31df235813dbd035888035cf862d682e7cc5706c4e7ec05750d3f64a2f9')
+sha256sums=('8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libseccomp/PKGBUILD b/extra/libseccomp/PKGBUILD
index c28bbc0b9..a8c4d5488 100644
--- a/extra/libseccomp/PKGBUILD
+++ b/extra/libseccomp/PKGBUILD
@@ -2,14 +2,14 @@
# Contributor: Patryk Kowalczyk < patryk at kowalczyk dot ws>
pkgname=libseccomp
-pkgver=2.1.0
+pkgver=2.1.1
pkgrel=1
pkgdesc='Enhanced seccomp library'
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL2.1')
url="http://sourceforge.net/projects/libseccomp/"
depends=('glibc')
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.gz")
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz")
build() {
cd $pkgname-$pkgver
@@ -21,4 +21,4 @@ package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir" install
}
-md5sums=('3961103c1234c13a810f6a12e60c797f')
+md5sums=('1f41207b29e66a7e5e375dd48a64de85')
diff --git a/extra/libsidplay/PKGBUILD b/extra/libsidplay/PKGBUILD
index 774482c0d..8c9e4a9a7 100644
--- a/extra/libsidplay/PKGBUILD
+++ b/extra/libsidplay/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198233 2013-10-30 13:37:26Z allan $
+# $Id: PKGBUILD 199975 2013-11-20 12:18:31Z allan $
# Maintainer:
# Contributor: Kritoke <kritoke@gamebox.net>
pkgname=libsidplay
pkgver=1.36.59
-pkgrel=5.2
+pkgrel=6
pkgdesc="A library for playing SID music files."
arch=('i686' 'x86_64' 'mips64el')
url="http://critical.ch/distfiles/"
@@ -12,9 +12,13 @@ license=('GPL')
source=(http://critical.ch/distfiles/${pkgname}-${pkgver}.tgz libsidplay-1.36.59-gcc43.patch)
md5sums=('37c51ba4bd57164b1b0bb7b43b9adece' 'c24d7bca2639f4fee03c40c7dcaadfee')
-build() {
+prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -Np1 -i $srcdir/libsidplay-1.36.59-gcc43.patch
+}
+
+build() {
+ cd ${srcdir}/${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
diff --git a/extra/libsigsegv/PKGBUILD b/extra/libsigsegv/PKGBUILD
index 4ba90b054..6cfba18b3 100644
--- a/extra/libsigsegv/PKGBUILD
+++ b/extra/libsigsegv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198236 2013-10-30 13:38:33Z allan $
+# $Id: PKGBUILD 199822 2013-11-17 07:46:24Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Johannes Weiner <hannes@saeurebad.de>
pkgname=libsigsegv
pkgver=2.10
-pkgrel=1.1
+pkgrel=2
arch=('x86_64' 'i686' 'mips64el')
pkgdesc="Page fault detection library"
url="http://www.gnu.org/software/libsigsegv/"
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 93f77e6d2..2afe38f43 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198239 2013-10-30 13:39:34Z allan $
+# $Id: PKGBUILD 199410 2013-11-11 23:23:16Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libsoup
-pkgver=2.44.1
+pkgver=2.44.2
pkgrel=1
pkgdesc="GNOME HTTP Library"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ conflicts=(libsoup-gnome)
replaces=(libsoup-gnome)
options=('!emptydirs')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('c532c331dd5f7eb78438867302ed6897a847c82b287ed9347bea8d1937974c1d')
+sha256sums=('e7e4b5ab74a6c00fc267c9f5963852d28759ad3154dab6388e2d6e1962d598f3')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libtasn1/PKGBUILD b/extra/libtasn1/PKGBUILD
index de8317c64..8e1eff3fc 100644
--- a/extra/libtasn1/PKGBUILD
+++ b/extra/libtasn1/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197093 2013-10-21 18:40:47Z andyrtr $
+# $Id: PKGBUILD 200598 2013-11-29 16:35:20Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=libtasn1
-pkgver=3.3
-pkgrel=2
+pkgver=3.4
+pkgrel=1
pkgdesc="The ASN.1 library used in GNUTLS"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3' 'LGPL')
@@ -12,7 +12,7 @@ url="http://www.gnu.org/software/libtasn1/"
depends=('glibc' 'texinfo')
install=libtasn1.install
source=(http://ftp.gnu.org/gnu/libtasn1/${pkgname}-${pkgver}.tar.gz{,.sig})
-md5sums=('2bdd687f487c50a0382b99553866a6e0'
+md5sums=('21ec021c534b0f30b2834ce233c70f15'
'SKIP')
build() {
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index aff383828..627e0b739 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198715 2013-11-02 08:58:54Z ioni $
+# $Id: PKGBUILD 201262 2013-12-07 10:35:01Z bpiotrowski $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=libtorrent-rasterbar
pkgver=0.16.12
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
url="http://www.rasterbar.com/products/libtorrent/"
diff --git a/extra/libupnp/PKGBUILD b/extra/libupnp/PKGBUILD
index 83dcc39d4..ebf8ff252 100644
--- a/extra/libupnp/PKGBUILD
+++ b/extra/libupnp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198254 2013-10-30 13:45:10Z allan $
+# $Id: PKGBUILD 199852 2013-11-17 10:36:13Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: kastor <kastor@fobos.org.ar>
pkgname=libupnp
-pkgver=1.6.18
+pkgver=1.6.19
pkgrel=1
pkgdesc="Portable Open Source UPnP Development Kit"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('glibc')
makedepends=('pkgconfig')
source=("http://downloads.sourceforge.net/sourceforge/pupnp/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('11c6484fd2e2927bf3b8d8108407ca56')
+md5sums=('ee16e5d33a3ea7506f38d71facc057dd')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD
index 1402cd45d..e0766f72d 100644
--- a/extra/libva-intel-driver/PKGBUILD
+++ b/extra/libva-intel-driver/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198687 2013-11-02 07:27:16Z bpiotrowski $
+# $Id: PKGBUILD 202383 2013-12-21 14:15:26Z bpiotrowski $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
pkgname=libva-intel-driver
-pkgver=1.2.1
+pkgver=1.2.2
pkgrel=1
pkgdesc='VA-API implementation for Intel G45 and HD Graphics family'
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('MIT')
depends=('libva')
replaces=('libva-driver-intel')
source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2)
-sha1sums=('f65de5edf69162f0731b0ffb7f8d6c17499ae8e3')
+sha1sums=('ece479b51926764edd2be6599f9c067cae2a3942')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD
index d784e7086..9995e36e5 100644
--- a/extra/libvpx/PKGBUILD
+++ b/extra/libvpx/PKGBUILD
@@ -1,29 +1,36 @@
-# $Id: PKGBUILD 197350 2013-10-25 02:49:53Z bisson $
+# $Id: PKGBUILD 201279 2013-12-07 18:33:32Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
pkgname=libvpx
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="The VP8 Codec SDK"
+pkgver=1.3.0
+pkgrel=1
+pkgdesc='The VP8 Codec SDK'
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.webmproject.org/"
+url='http://www.webmproject.org/'
license=('BSD')
depends=('glibc')
-[ "$CARCH" != "mips64el" ] && makedepends=('yasm')
-source=(ftp://ftp.archlinux.org/other/libvpx/libvpx-$pkgver.tar.xz{,.sig}
+makedepends=('git')
+[ "$CARCH" != "mips64el" ] && makedepends+=('yasm')
+source=($pkgname::git+http://code.google.com/p/webm.libvpx#tag=v$pkgver
mips64el.patch)
-sha1sums=('75cd953cf2db694412569272803fbdc73f2b599f'
- 'SKIP'
- '78ea367dc417f64ad3ce8e33fda210e56a083f4b')
+md5sums=('SKIP'
+ '78ea367dc417f64ad3ce8e33fda210e56a083f4b')
-build() {
- cd "$pkgname-$pkgver"
+prepare() {
+ if [ "$CARCH" = "mips64el" ]; then
+ patch -Np1 -i ${srcdir}/mips64el.patch
+ fi
+}
+build() {
if [ "$CARCH" = "mips64el" ]; then
extra="--target=mips64el-linux-gcc"
- patch -Np1 -i ${srcdir}/mips64el.patch
fi
- ./configure --prefix=/usr --enable-vp8 \
+ cd $pkgname
+ ./configure --prefix=/usr \
+ --enable-vp8 \
+ --enable-vp9 \
--enable-runtime-cpu-detect \
--enable-shared \
--enable-postproc \
@@ -34,7 +41,7 @@ build() {
}
package() {
- cd "$pkgname-$pkgver"
+ cd $pkgname
make DIST_DIR="$pkgdir/usr" install
- install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
diff --git a/extra/libxcb/PKGBUILD b/extra/libxcb/PKGBUILD
index 6869b57ce..9d0e216c1 100644
--- a/extra/libxcb/PKGBUILD
+++ b/extra/libxcb/PKGBUILD
@@ -1,29 +1,26 @@
-# $Id: PKGBUILD 198271 2013-10-30 13:51:13Z allan $
+# $Id: PKGBUILD 202710 2013-12-25 21:25:44Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=libxcb
-pkgver=1.9.1
-pkgrel=2
+pkgver=1.10
+pkgrel=1
pkgdesc="X11 client-side library"
arch=('i686' 'x86_64' 'mips64el')
url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.8-2' 'libxdmcp' 'libxau')
+depends=('xcb-proto>=1.10' 'libxdmcp' 'libxau')
makedepends=('pkgconfig' 'libxslt' 'python')
license=('custom')
source=($url/dist/$pkgname-$pkgver.tar.bz2
- libxcb-1.1-no-pthread-stubs.patch
- reorder-configure.patch)
-sha256sums=('d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f'
- '1ec7a6e7dc8639baa6c3fbc61ca8556108fb824598bd6ab5ef1fa50d48d6d310'
- '3e1adc51246e1f48545c1ab9703219c987685d241f1eab5d912b0840ce8a122a')
+ libxcb-1.1-no-pthread-stubs.patch)
+sha256sums=('98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5'
+ '748ed83af60468a0eb6785222e4a5ca589d28f20b9bfc60d5936ec93b8eef356')
prepare() {
cd "$pkgname-$pkgver"
patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch
- # https://bugs.freedesktop.org/show_bug.cgi?id=66413
- patch -Np1 -i ../reorder-configure.patch
- NOCONFIGURE=1 ./autogen.sh
+ autoreconf -vfi
}
build() {
@@ -35,6 +32,11 @@ build() {
make
}
+check() {
+ cd $pkgname-$pkgver
+ make -k check
+}
+
package() {
cd "$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
diff --git a/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch b/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch
index 8e8162f0a..52c22ab7e 100644
--- a/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch
+++ b/extra/libxcb/libxcb-1.1-no-pthread-stubs.patch
@@ -1,9 +1,9 @@
--- libxcb-1.8.1/configure.ac 2012-03-09 15:38:38.000000000 +0100
+++ libxcb-1.8.1/configure.ac.new 2012-03-09 16:50:40.107109896 +0100
-@@ -35,7 +35,7 @@
+@@ -43,7 +43,7 @@
# Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.7)
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.10)
-NEEDED="pthread-stubs xau >= 0.99.2"
+NEEDED="xau >= 0.99.2"
PKG_CHECK_MODULES(NEEDED, $NEEDED)
diff --git a/extra/libxcb/reorder-configure.patch b/extra/libxcb/reorder-configure.patch
deleted file mode 100644
index afeeffe7e..000000000
--- a/extra/libxcb/reorder-configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- libxcb-1.9.1/configure.ac 2013-05-30 17:38:01.000000000 +0200
-+++ libxcb-1.9.1/configure.ac.new 2013-06-30 21:01:30.134153288 +0200
-@@ -2,20 +2,21 @@
- # Process this file with autoconf to produce a configure script.
-
- # Initialize Autoconf
--AC_PREREQ(2.57)
- AC_INIT([libxcb],
- 1.9.1,
- [xcb@lists.freedesktop.org])
-+AC_PREREQ(2.57)
-+
-+# Initialize Automake
-+AM_INIT_AUTOMAKE([foreign dist-bzip2])
-+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-+
- AC_CONFIG_SRCDIR([xcb.pc.in])
- # Set common system defines for POSIX extensions, such as _GNU_SOURCE
- # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
- # to avoid autoconf errors.
- AC_USE_SYSTEM_EXTENSIONS
-
--# Initialize Automake
--AM_INIT_AUTOMAKE([foreign dist-bzip2])
--m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
--
- AM_PATH_PYTHON([2.6])
-
- PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no])
diff --git a/extra/libxft/PKGBUILD b/extra/libxft/PKGBUILD
index 2c1be43f5..4322484f0 100644
--- a/extra/libxft/PKGBUILD
+++ b/extra/libxft/PKGBUILD
@@ -1,20 +1,24 @@
-# $Id: PKGBUILD 198283 2013-10-30 13:55:28Z allan $
+# $Id: PKGBUILD 202705 2013-12-25 17:35:47Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=libxft
pkgver=2.3.1
-pkgrel=1
+pkgrel=2
pkgdesc="FreeType-based font drawing library for X"
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
url="http://xorg.freedesktop.org/"
depends=('fontconfig' 'libxrender')
makedepends=('pkgconfig')
-source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2")
-sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd')
+source=("${url}/releases/individual/lib/libXft-${pkgver}.tar.bz2"
+ freetype_header.patch)
+sha256sums=('7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd'
+ '991c91998e61e83061c6c08218a2e6ac5643f16183750f73ee74f29fdd440be9')
build() {
cd "${srcdir}/libXft-${pkgver}"
+ # fix build for freetype header moved - http://cgit.freedesktop.org/xorg/lib/libXft/patch/?id=4acfdaf95adb0a05c2a25550bdde036c865902f4
+ patch -Np1 -i ${srcdir}/freetype_header.patch
./configure --prefix=/usr --sysconfdir=/etc --disable-static
make
}
diff --git a/extra/libxft/freetype_header.patch b/extra/libxft/freetype_header.patch
new file mode 100644
index 000000000..9aba8ee29
--- /dev/null
+++ b/extra/libxft/freetype_header.patch
@@ -0,0 +1,30 @@
+From 4acfdaf95adb0a05c2a25550bdde036c865902f4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Mon, 02 Dec 2013 15:26:24 +0000
+Subject: Use FT_*_H macros instead of including <freetype/*.h>
+
+freetype moved its headers around in 2.5.1.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+diff --git a/src/xftglyphs.c b/src/xftglyphs.c
+index 2f3dc5a..4b5fb82 100644
+--- a/src/xftglyphs.c
++++ b/src/xftglyphs.c
+@@ -21,10 +21,10 @@
+ */
+
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
+
+-#include <freetype/ftsynth.h>
++#include FT_SYNTHESIS_H
+
+ /*
+ * Validate the memory info for a font
+--
+cgit v0.9.0.2-2-gbebe
+
diff --git a/extra/libxkbcommon/PKGBUILD b/extra/libxkbcommon/PKGBUILD
index c6f5655c2..0e90dbb98 100644
--- a/extra/libxkbcommon/PKGBUILD
+++ b/extra/libxkbcommon/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 198285 2013-10-30 13:56:09Z allan $
+# $Id: PKGBUILD 200283 2013-11-24 18:55:11Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Daniel Micay <danielmicay@gmail.com>
# Contributor: Mladen Pejakovic <pejakm@gmail.com>
pkgname=libxkbcommon
-pkgver=0.3.1
+pkgver=0.3.2
pkgrel=1
pkgdesc="Keyboard handling library using XKB data"
arch=(i686 x86_64 mips64el)
url="http://xkbcommon.org/"
license=(custom)
-depends=(xkeyboard-config)
+depends=(xkeyboard-config glibc)
makedepends=(doxygen xorg-util-macros)
source=("http://xkbcommon.org/download/$pkgname-$pkgver.tar.xz")
#source=("$pkgname-$pkgver::git://github.com/xkbcommon/$pkgname.git")
-md5sums=('7287ea51df79c0f80e92b970a30b95e9')
+md5sums=('935cf416354bf05210de2e389484f7e8')
build() {
cd $pkgname-$pkgver
diff --git a/extra/libxmi/PKGBUILD b/extra/libxmi/PKGBUILD
index 0fc134016..a1f0a01a2 100644
--- a/extra/libxmi/PKGBUILD
+++ b/extra/libxmi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198288 2013-10-30 13:57:15Z allan $
+# $Id: PKGBUILD 199824 2013-11-17 07:48:18Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Tobias Kieslich [tobias.justdreams.de]
pkgname=libxmi
pkgver=1.2
-pkgrel=5.1
+pkgrel=6
pkgdesc="A library for rasterizing 2-D vector graphics"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/libxmi/libxmi.html"
diff --git a/extra/libxshmfence/COPYING b/extra/libxshmfence/COPYING
deleted file mode 100644
index 313c8f18e..000000000
--- a/extra/libxshmfence/COPYING
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright © 2013 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that copyright
- * notice and this permission notice appear in supporting documentation, and
- * that the name of the copyright holders not be used in advertising or
- * publicity pertaining to distribution of the software without specific,
- * written prior permission. The copyright holders make no representations
- * about the suitability of this software for any purpose. It is provided "as
- * is" without express or implied warranty.
- *
- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- * OF THIS SOFTWARE.
- */
diff --git a/extra/libxshmfence/PKGBUILD b/extra/libxshmfence/PKGBUILD
index 162aac75d..f12f9e2f0 100644
--- a/extra/libxshmfence/PKGBUILD
+++ b/extra/libxshmfence/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198729 2013-11-02 10:02:59Z andyrtr $
+# $Id: PKGBUILD 200612 2013-11-29 20:50:42Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
pkgname=libxshmfence
-pkgver=1.0
+pkgver=1.1
pkgrel=1
pkgdesc="a library that exposes a event API on top of Linux futexes"
arch=('i686' 'x86_64')
@@ -10,17 +10,15 @@ url="http://xorg.freedesktop.org/"
license=('GPL')
#groups=()
depends=('glibc')
-makedepends=('xorg-util-macros')
-source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2
- COPYING)
-sha256sums=('625089553939baa20e665873a6c8f3d694cfde78fb3110aa59da92fd2b14f14f'
- '5e46864ede2fda46c3cb7cfe3a7b9f9e4bd36d8d21d8010a284caa64b81d465a')
+makedepends=('xorg-util-macros' 'xproto')
+source=(${url}/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe')
build() {
cd $pkgname-$pkgver
# fix some libtools errors
- autoreconf -vfi
+ #autoreconf -vfi
./configure --prefix=/usr
make
@@ -34,10 +32,6 @@ check() {
package() {
cd $pkgname-$pkgver
make DESTDIR="$pkgdir/" install
-
- # license is still missing
- # COPYING is taken from top of /usr/include/X11/xshmfence.h
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 ${srcdir}/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
}
diff --git a/extra/libzip/PKGBUILD b/extra/libzip/PKGBUILD
index 17b60e395..17451905a 100644
--- a/extra/libzip/PKGBUILD
+++ b/extra/libzip/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198305 2013-10-30 14:03:27Z allan $
+# $Id: PKGBUILD 199973 2013-11-20 12:11:27Z allan $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libzip
pkgver=0.11.1
-pkgrel=1
+pkgrel=2
pkgdesc="A C library for reading, creating, and modifying zip archives"
url="http://www.nih.at/libzip/index.html"
license=('BSD')
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index abfe2ab94..252244505 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198307 2013-10-30 14:04:09Z allan $
+# $Id: PKGBUILD 201263 2013-12-07 10:35:02Z bpiotrowski $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
pkgname=licq
pkgver=1.7.1
-pkgrel=5
+pkgrel=6
pkgdesc="Advanced graphical ICQ clone and more for Unix"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.licq.org"
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 7c2619757..878bac376 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198746 2013-11-02 22:40:11Z pierre $
+# $Id: PKGBUILD 199543 2013-11-15 09:39:54Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=lighttpd
pkgver=1.4.33
-pkgrel=2
+pkgrel=3
pkgdesc='A secure, fast, compliant and very flexible web-server'
license=('custom')
arch=('i686' 'x86_64' 'mips64el')
@@ -19,14 +19,37 @@ options=('emptydirs')
install='lighttpd.install'
source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
"http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
+ "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch"
+ "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_setuid.patch.asc"
+ "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch"
+ "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_fam_use_after_free.patch.asc"
+ "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch"
+ "http://download.lighttpd.net/lighttpd/security/lighttpd-1.4.33_fix_ssl_sni.patch.asc"
'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
sha256sums=('2886aedc23857ca44df91b8fe6f36059ec82a859ae0eb230220e42abc331610c'
'SKIP'
+ '87792bcf62a554ac094263b931a8ae369d975b7e6bf83778f8f0a6c0ff31b979'
+ 'SKIP'
+ '1772cae2a0678c93dd5fa54f2622a563c3eb0a0047ba2a6648a5680d50d3bfde'
+ 'SKIP'
+ 'babf177f2e88a1444550825ce8e8ad1a95dbc78cfaa59c2c3f121ccbb37799d2'
+ 'SKIP'
'41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
'fece4581bebf39768571962dedce176b2b5f487c0abb5c1cfb35395de216c01f'
'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
'503fd8557297f4fb814d74effcb59633135b3c2407a87f5abe97467f0822c147')
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+
+ # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_02.txt
+ patch -p1 -i $srcdir/lighttpd-1.4.33_fix_setuid.patch
+ # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_03.txt
+ patch -p1 -i $srcdir/lighttpd-1.4.33_fix_fam_use_after_free.patch
+ # http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2013_01.txt
+ patch -p1 -i $srcdir/lighttpd-1.4.33_fix_ssl_sni.patch
+}
+
build() {
cd $srcdir/$pkgname-$pkgver
diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD
index f7b51428e..d3eb47cbf 100644
--- a/extra/link-grammar/PKGBUILD
+++ b/extra/link-grammar/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198311 2013-10-30 14:05:41Z allan $
+# $Id: PKGBUILD 200788 2013-12-05 08:49:59Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=link-grammar
-pkgver=4.8.0
+pkgver=4.8.2
pkgrel=1
pkgdesc="A Grammar Checking library"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
depends=('aspell')
options=('!makeflags')
source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('218a2ee5ffed258bc52a0718811ca66e')
+md5sums=('57eb0738c57a177e2e76f0b398af811d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 1f4025a67..da1130f5e 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197637 2013-10-27 15:07:22Z giovanni $
+# $Id: PKGBUILD 200849 2013-12-06 11:57:53Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2013.10.25
+pkgver=2013.12.05
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ url="http://live555.com/liveMedia"
depends=('gcc-libs')
options=('staticlibs')
source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('43a8d3a622db8a4582174fa2ddc7461b')
+md5sums=('7f3d0e17b6d894a3140c35f9091a8a70')
build() {
cd ${srcdir}/live
diff --git a/extra/lua/PKGBUILD b/extra/lua/PKGBUILD
index 58ad58b9f..2255b35b1 100644
--- a/extra/lua/PKGBUILD
+++ b/extra/lua/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 181843 2013-04-04 12:42:25Z bpiotrowski $
+# $Id: PKGBUILD 201274 2013-12-07 13:31:55Z bpiotrowski $
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=lua
-pkgver=5.2.2
+pkgver=5.2.3
pkgrel=1
pkgdesc='Powerful light-weight programming language designed for extending applications'
arch=('i686' 'x86_64' 'mips64el')
@@ -12,34 +12,42 @@ url='http://www.lua.org/'
depends=('readline')
license=('MIT')
options=('!makeflags' '!emptydirs')
-source=("http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz"
- 'liblua.so.patch' 'lua.pc' 'LICENSE')
-md5sums=('efbb645e897eae37cad4344ce8b0a614'
+source=(http://www.lua.org/ftp/$pkgname-$pkgver.tar.gz
+ liblua.so.patch
+ lua.pc
+ LICENSE)
+md5sums=('dc7f94ec6ff15c985d2d6ad0f1b35654'
'bdc663c7b82ffc0b5df67611621fb625'
'e7ba6c2b695b0b84a5ea0cbff5fc9067'
'0e2bd67b909b9ff673da844ca3480df2')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../liblua.so.patch
+}
+
build() {
cd $pkgname-$pkgver
- patch -p1 -i "$srcdir/liblua.so.patch"
+
export CFLAGS="$CFLAGS -fPIC"
make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+
sed "s/%VER%/${pkgver%.*}/g;s/%REL%/$pkgver/g" ../lua.pc > lua.pc
}
package() {
cd $pkgname-$pkgver
+
make \
- TO_LIB="liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.1" \
- INSTALL_DATA="cp -d" \
- INSTALL_TOP="$pkgdir/usr" \
- INSTALL_MAN="$pkgdir/usr/share/man/man1" \
+ TO_LIB='liblua.a liblua.so liblua.so.5.2 liblua.so.5.2.3' \
+ INSTALL_DATA='cp -d' \
+ INSTALL_TOP="$pkgdir"/usr \
+ INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
install
- install -Dm644 lua.pc "$pkgdir/usr/lib/pkgconfig/lua.pc"
+ install -Dm644 lua.pc "$pkgdir"/usr/lib/pkgconfig/lua.pc
+
# Install the documentation
- install -d "$pkgdir/usr/share/doc/lua"
- install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/lua"
- install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -d "$pkgdir"/usr/share/doc/lua
+ install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/lua
+ install -Dm644 ../LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-
-# vim:set ts=4 sw=4 et:
diff --git a/extra/lua51/PKGBUILD b/extra/lua51/PKGBUILD
index 435788e88..f5a8ca11d 100644
--- a/extra/lua51/PKGBUILD
+++ b/extra/lua51/PKGBUILD
@@ -1,56 +1,61 @@
-# $Id $
+# $Id: PKGBUILD 201273 2013-12-07 10:54:38Z bpiotrowski $
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=lua51
pkgver=5.1.5
-pkgrel=3.1
-pkgdesc='A powerful light-weight programming language designed for extending applications'
+pkgrel=4
+pkgdesc='Powerful lightweight programming language designed for extending applications'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.lua.org/'
depends=('readline')
license=('MIT')
options=('!makeflags' '!emptydirs')
-source=("http://www.lua.org/ftp/lua-$pkgver.tar.gz"
- 'lua-arch.patch'
- 'lua-5.1-cflags.diff')
+source=(http://www.lua.org/ftp/lua-$pkgver.tar.gz
+ lua-arch.patch
+ lua-5.1-cflags.diff)
md5sums=('2e115fe26e435e33b0d5c022e4490567'
'fa25feb70ef9fec975b1c20da5098b3c'
'249582bf1fd861ccf492d2c35a9fe732')
+prepare() {
+ cd lua-$pkgver
+ patch -p1 -i ../lua-arch.patch
+ patch -p1 -i ../lua-5.1-cflags.diff
+}
+
build() {
- cd lua-$pkgver
- patch -p1 -i "$srcdir/lua-arch.patch"
- patch -p1 -i "$srcdir/lua-5.1-cflags.diff"
- [[ $CARCH != i686 ]] && export CFLAGS="$CFLAGS -fPIC"
- sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
- sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' -i src/Makefile
- make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
+ cd lua-$pkgver
+
+ [[ $CARCH == x86_64 ]] && export CFLAGS="$CFLAGS -fPIC"
+ sed -e 's:llua:llua5.1:' -e 's:/include:/include/lua5.1:' -i etc/lua.pc
+ sed -r -e '/^LUA_(SO|A|T)=/ s/lua/lua5.1/' -e '/^LUAC_T=/ s/luac/luac5.1/' \
+ -i src/Makefile
+ make MYCFLAGS="$CFLAGS" MYLDFLAGS="$LDFLAGS" linux
}
package() {
- cd lua-$pkgver
- make \
- TO_BIN="lua5.1 luac5.1" \
- TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \
- INSTALL_DATA='cp -d' \
- INSTALL_TOP="$pkgdir/usr" \
- INSTALL_INC="$pkgdir/usr/include/lua5.1" \
- INSTALL_MAN="$pkgdir/usr/share/man/man1" \
- install
- install -D -m644 etc/lua.pc "$pkgdir/usr/lib/pkgconfig/lua5.1.pc"
- # Install the documentation
- install -d "$pkgdir/usr/share/doc/$pkgname"
- install -m644 doc/*.{gif,png,css,html} "$pkgdir/usr/share/doc/$pkgname"
- # Install copyrigth file
- install -D -m644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT"
- # fixups
- ln -s liblua5.1.so "$pkgdir/usr/lib/liblua.so.5.1"
- ln -s liblua5.1.so "$pkgdir/usr/lib/liblua.so.$pkgver"
- cd "$pkgdir/usr/share/man/man1"
- mv lua.1 lua5.1.1
- mv luac.1 luac5.1.1
-}
+ cd lua-$pkgver
-# vim:set ts=4 sw=4 et:
+ make \
+ TO_BIN='lua5.1 luac5.1' \
+ TO_LIB="liblua5.1.a liblua5.1.so liblua5.1.so.5.1 liblua5.1.so.$pkgver" \
+ INSTALL_DATA='cp -d' \
+ INSTALL_TOP="$pkgdir"/usr \
+ INSTALL_INC="$pkgdir"/usr/include/lua5.1 \
+ INSTALL_MAN="$pkgdir"/usr/share/man/man1 \
+ install
+
+ install -Dm644 etc/lua.pc "$pkgdir"/usr/lib/pkgconfig/lua5.1.pc
+ install -d "$pkgdir/usr/share/doc/$pkgname"
+ install -m644 doc/*.{gif,png,css,html} "$pkgdir"/usr/share/doc/$pkgname
+ install -Dm644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
+
+ ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.5.1
+ ln -s liblua5.1.so "$pkgdir"/usr/lib/liblua.so.$pkgver
+
+ cd "$pkgdir"/usr/share/man/man1
+ mv lua.1 lua5.1.1
+ mv luac.1 luac5.1.1
+}
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index 4a2246fa2..495de1fee 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 190045 2013-07-13 12:41:55Z svenstaro $
+# $Id: PKGBUILD 201264 2013-12-07 10:35:03Z bpiotrowski $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=lyx
pkgver=2.0.6
-pkgrel=3
+pkgrel=4
pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lyx.org"
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
index 0910aaf7c..92322d3aa 100644
--- a/extra/mariadb/PKGBUILD
+++ b/extra/mariadb/PKGBUILD
@@ -1,35 +1,30 @@
-# $Id: PKGBUILD 198814 2013-11-05 17:28:31Z bpiotrowski $
+# $Id: PKGBUILD 200716 2013-12-03 07:22:47Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
pkgbase=mariadb
pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
-pkgver=5.5.33.a
+pkgver=5.5.34
_pkgver=${pkgver/.a/a}
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib')
+makedepends=('cmake' 'openssl' 'zlib' 'libaio')
source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$_pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$_pkgver.tar.gz
mariadb.service
mariadb-post.sh
mariadb-tmpfile.conf)
-sha256sums=('adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b'
+sha256sums=('a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89'
'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
'368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
'2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
-prepare() {
- cd $pkgbase-$_pkgver
- sed -i '63d' storage/tokudb/ft-index/cmake_modules/TokuSetupCTest.cmake
-}
-
build() {
mkdir build
cd build
cmake ../$pkgbase-$_pkgver \
- -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_CONFIG=mysql_release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONFDIR=/etc/mysql \
-DMYSQL_DATADIR=/var/lib/mysql \
@@ -72,9 +67,10 @@ build() {
package_libmariadbclient() {
pkgdesc='MariaDB client libraries'
- depends=('openssl')
+ depends=('openssl' 'libaio')
conflicts=('libmysqlclient')
provides=("libmysqlclient=$pkgver")
+ options=('staticlibs')
cd build
for dir in include libmysql libmysqld libservices; do
@@ -120,7 +116,7 @@ package_mariadb() {
pkgdesc='Fast SQL database server, drop-in replacement for MySQL'
backup=('etc/mysql/my.cnf')
install=mariadb.install
- depends=('mariadb-clients' 'inetutils')
+ depends=('mariadb-clients' 'inetutils' 'libaio')
conflicts=('mysql')
provides=("mysql=$pkgver")
options=('emptydirs')
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index 275cbd3a2..1e9de43bf 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 196297 2013-10-11 08:53:38Z juergen $
+# $Id: PKGBUILD 202771 2013-12-27 14:33:26Z juergen $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Damir Perisa <damir@archlinux.org>
pkgname=maxima
-pkgver=5.30.0
-pkgrel=4
-pkgdesc="Maxima - a sophisticated computer algebra system"
+pkgver=5.31.0
+pkgrel=2
+pkgdesc="A sophisticated computer algebra system"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://maxima.sourceforge.net"
if [ "${CARCH}" == "mips64el" ] ; then
depends=('clisp' 'texinfo' 'sh')
else
- depends=('sbcl=1.1.12' 'texinfo' 'sh')
+ depends=('sbcl=1.1.14' 'texinfo' 'sh')
fi
makedepends=('python2')
optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
@@ -21,7 +21,7 @@ optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/
options=('!makeflags' '!zipman') # don't zip info pages or they won't work inside maxima
install=maxima.install
source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" "$pkgname.desktop")
-sha1sums=('ae009d71524f55264b346b03dac8e504e3b18ac0'
+sha1sums=('07623644b2962d68388cfd3f507e3d381e33ce02'
'4398ebb1ec85ccfa12f37516a56d60c26f74b18b')
build() {
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index 6607a487c..75cc48987 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198757 2013-11-03 10:27:39Z giovanni $
+# $Id: PKGBUILD 200687 2013-12-02 16:02:10Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=mercurial
-pkgver=2.8
+pkgver=2.8.1
pkgrel=1
pkgdesc="A scalable distributed SCM tool"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI')
backup=('etc/mercurial/hgrc')
source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
'mercurial.profile')
-md5sums=('76b565f48000e9f331356ab107a5bcbb'
+md5sums=('bede5869f9b5d09ab3269bac472495e7'
'43e1d36564d4c7fbe9a091d3ea370a44')
package() {
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index eba327774..b7f449906 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198319 2013-10-30 14:08:41Z allan $
+# $Id: PKGBUILD 201668 2013-12-17 21:04:31Z lcarlier $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
pkgname=('mesa' 'mesa-libgl')
-pkgver=9.2.2
+pkgver=10.0.1
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
@@ -17,7 +17,7 @@ url="http://mesa3d.sourceforge.net"
license=('custom')
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
LICENSE)
-md5sums=('20887f8020db7d1736a01ae9cd5d8c38'
+md5sums=('0a72ca5b36046a658bf6038326ff32ed'
'5c65a0fe315dd347e09b1f2826a1df5a')
build() {
@@ -64,12 +64,12 @@ build() {
package_ati-dri() {
pkgdesc="Mesa drivers for AMD/ATI Radeon"
- depends=("mesa-libgl=${pkgver}")
+ depends=('mesa-libgl' "mesa=${pkgver}")
optdepends=('libtxc_dxtn: S3 Texture Compressed support')
conflicts=('xf86-video-ati<6.9.0-6')
install -m755 -d ${pkgdir}/usr/lib/vdpau/
- mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r300,r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/
+ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/
install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
@@ -84,7 +84,7 @@ package_ati-dri() {
package_intel-dri() {
pkgdesc="Mesa drivers for Intel"
optdepends=('libtxc_dxtn: S3 Texture Compressed support')
- depends=("mesa-libgl=${pkgver}")
+ depends=('mesa-libgl' "mesa=${pkgver}")
install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
@@ -96,7 +96,7 @@ package_intel-dri() {
package_nouveau-dri() {
pkgdesc="Mesa drivers for Nouveau"
optdepends=('libtxc_dxtn: S3 Texture Compressed support')
- depends=("mesa-libgl=${pkgver}")
+ depends=('mesa-libgl' "mesa=${pkgver}")
install -m755 -d ${pkgdir}/usr/lib/vdpau/
mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
@@ -107,9 +107,6 @@ package_nouveau-dri() {
install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
- # vdpau drivers are still buggy with nouveau, so remove them (FS#36754)
- rm -rf ${pkgdir}/usr/lib/vdpau/
-
install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
}
@@ -140,6 +137,7 @@ package_mesa() {
mv -v ${srcdir}/fakeinstall/* ${pkgdir}
# rename libgl.so to not conflict with blobs - may break gl.pc ?
mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1
rm ${pkgdir}/usr/lib/libGL.so{,.1}
install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
diff --git a/extra/mjpegtools/PKGBUILD b/extra/mjpegtools/PKGBUILD
index 48a5577e3..762555038 100644
--- a/extra/mjpegtools/PKGBUILD
+++ b/extra/mjpegtools/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 198321 2013-10-30 14:09:25Z allan $
+# $Id: PKGBUILD 199969 2013-11-20 11:33:02Z allan $
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Maintainer: Roberto Carvajal <roberto@archlinux.org>
pkgname=mjpegtools
pkgver=2.0.0
-pkgrel=3
+pkgrel=4
pkgdesc="Set of tools that can do recording of videos and playback, simple cut-and-paste editing and the MPEG compression of audio and video"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://mjpeg.sourceforge.net/"
depends=('libjpeg' 'libpng' 'sdl' 'gcc-libs' 'libdv')
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index e99537856..50adf382d 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 197567 2013-10-27 00:07:32Z giovanni $
+# $Id: PKGBUILD 201265 2013-12-07 10:35:05Z bpiotrowski $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: xduugu <xduugu@gmx.com>
pkgbase=mkvtoolnix
pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.5.0
-pkgrel=1
+pkgver=6.6.0
+pkgrel=3
arch=('i686' 'x86_64' 'mips64el')
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=('e2d8d539b8cb9249b6c398690bc61c78')
+md5sums=('1e952a3196b0c43150801eeaecba68ed')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD
index 75fe89169..9f6d204bd 100644
--- a/extra/modemmanager/PKGBUILD
+++ b/extra/modemmanager/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198323 2013-10-30 14:10:06Z allan $
+# $Id: PKGBUILD 202884 2013-12-28 22:44:05Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=modemmanager
_realname=ModemManager
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="Mobile broadband modem management service"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.freedesktop.org/wiki/Software/ModemManager/"
diff --git a/extra/mpc/PKGBUILD b/extra/mpc/PKGBUILD
index 0367e36a3..489f8a4fc 100644
--- a/extra/mpc/PKGBUILD
+++ b/extra/mpc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198598 2013-10-30 16:56:48Z bisson $
+# $Id: PKGBUILD 199304 2013-11-09 22:09:32Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,15 +6,15 @@
# Contributor: Link Dupont <link@subpop.net>
pkgname=mpc
-pkgver=0.24
+pkgver=0.25
pkgrel=1
pkgdesc='Minimalist command line interface to MPD'
url='http://www.musicpd.org/clients/mpc/'
license=('GPL2')
arch=('i686' 'x86_64' 'mips64el')
depends=('libmpdclient')
-source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d98d9d431e7bcdf9123f18f213b3a1f9a03835f7')
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+sha1sums=('c649cd19e4195749ca7da309c10acd53ac139b49' 'SKIP')
options=('!emptydirs')
diff --git a/extra/mpd/PKGBUILD b/extra/mpd/PKGBUILD
index f180e6361..d9260882a 100644
--- a/extra/mpd/PKGBUILD
+++ b/extra/mpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198643 2013-10-31 16:50:38Z bisson $
+# $Id: PKGBUILD 202687 2013-12-24 18:48:56Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -6,35 +6,31 @@
# Contributor: Ben <ben@benmazer.net>
pkgname=mpd
-pkgver=0.18
+pkgver=0.18.6
pkgrel=1
pkgdesc='Flexible, powerful, server-side application for playing music'
url='http://www.musicpd.org/'
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('libao' 'ffmpeg' 'libmodplug' 'audiofile' 'libshout' 'libmad' 'curl' 'faad2'
- 'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl')
+ 'sqlite' 'jack' 'libmms' 'wavpack' 'avahi' 'libid3tag' 'yajl' 'libmpdclient')
makedepends=('doxygen')
-source=("http://www.musicpd.org/download/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+source=("http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
'tmpfiles.d'
'conf')
-sha1sums=('e3cc99de0c2c595ca576cdb455c6aaedd4f7726a'
+sha1sums=('06951d043a57ce460b728402768a235d8b18ba93' 'SKIP'
'f4d5922abb69abb739542d8e93f4dfd748acdad7'
'67c145c046cddd885630d72ce8ebe71f8321ff3b')
backup=('etc/mpd.conf')
install=install
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:g' -i src/input/CdioParanoiaInputPlugin.cxx
-}
-
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
--sysconfdir=/etc \
+ --enable-libmpdclient \
--enable-jack \
--enable-soundcloud \
--enable-pipe-output \
@@ -50,6 +46,7 @@ package() {
install -Dm644 ../conf "${pkgdir}"/etc/mpd.conf
install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/mpd.conf
install -d -g 45 -o 45 "${pkgdir}"/var/lib/mpd/playlists
- install -d "${pkgdir}"/usr/lib/systemd/user
- ln -s ../system/mpd.service "${pkgdir}"/usr/lib/systemd/user/mpd.service
+
+ install -Dm644 "${pkgdir}"/usr/lib/systemd/{system,user}/mpd.service
+ sed '/WantedBy=/c WantedBy=default.target' -i "${pkgdir}"/usr/lib/systemd/user/mpd.service
}
diff --git a/extra/musicbrainz/PKGBUILD b/extra/musicbrainz/PKGBUILD
index a367e09e7..a8c740023 100644
--- a/extra/musicbrainz/PKGBUILD
+++ b/extra/musicbrainz/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198331 2013-10-30 14:13:00Z allan $
+# $Id: PKGBUILD 201368 2013-12-09 18:27:42Z eric $
# Maintainer:
# Contributor: Alexander Baldeck <alexander@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
@@ -14,7 +14,7 @@ url="http://www.musicbrainz.org"
license=('LGPL')
depends=('expat>=2.0' 'gcc-libs')
makedepends=('python2')
-source=(ftp://ftp.musicbrainz.org/pub/$pkgname/libmusicbrainz-${pkgver}.tar.gz
+source=(ftp://ftp.musicbrainz.org/pub/$pkgname/historical/libmusicbrainz-${pkgver}.tar.gz
'gcc4.3.patch')
build() {
diff --git a/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch b/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch
new file mode 100644
index 000000000..0d6d7424f
--- /dev/null
+++ b/extra/mutter-wayland/0001-monitor-expose-min-backlight-step.patch
@@ -0,0 +1,29 @@
+From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001
+From: Asad Mehmood <asad78611@googlemail.com>
+Date: Thu, 17 Oct 2013 16:05:59 +0100
+Subject: [PATCH] monitor: expose min-backlight-step
+
+Expose min-backlight-step so that gnome-settings-daemon can
+support backlights with less than 10 steps without mutter
+normalizing the brightness back to its original value
+---
+ src/core/monitor.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/monitor.c b/src/core/monitor.c
+index 9ec0c2a..6d65f9e 100644
+--- a/src/core/monitor.c
++++ b/src/core/monitor.c
+@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
+ g_variant_new_take_string (make_display_name (manager, output)));
+ g_variant_builder_add (&properties, "{sv}", "backlight",
+ g_variant_new_int32 (output->backlight));
++ g_variant_builder_add (&properties, "{sv}", "min-backlight-step",
++ g_variant_new_int32 ((output->backlight_max - output->backlight_min) ?
++ 100 / (output->backlight_max - output->backlight_min) : -1));
+ g_variant_builder_add (&properties, "{sv}", "primary",
+ g_variant_new_boolean (output->is_primary));
+ g_variant_builder_add (&properties, "{sv}", "presentation",
+--
+1.8.4.1
+
diff --git a/extra/mutter-wayland/PKGBUILD b/extra/mutter-wayland/PKGBUILD
index 1547fc910..cb61970d4 100644
--- a/extra/mutter-wayland/PKGBUILD
+++ b/extra/mutter-wayland/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198333 2013-10-30 14:13:43Z allan $
+# $Id: PKGBUILD 199788 2013-11-16 12:17:37Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgname=mutter-wayland
pkgver=3.10.1
-pkgrel=1
+pkgrel=2
pkgdesc="A Wayland compositor for GNOME"
arch=(i686 x86_64)
license=(GPL)
@@ -13,9 +13,11 @@ url="http://www.gnome.org"
options=('!emptydirs')
install=mutter-wayland.install
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
- mutter-wayland-3.10.0.1-logfile.patch)
+ mutter-wayland-3.10.0.1-logfile.patch
+ 0001-monitor-expose-min-backlight-step.patch)
sha256sums=('bdb6bcc25791309256b09ec9aa7e0be311ef311778450aafccb86caf2753b6b4'
- 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644')
+ 'b79866b6b3fa6029b35ef2b5c5d0cb92886ec2ed0173f780c4d46a5b8d9a1644'
+ 'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7')
prepare() {
@@ -23,6 +25,9 @@ prepare() {
# From Fedora: Don't try to redirect the logfile. It won't work.
patch -Np1 -i ../mutter-wayland-3.10.0.1-logfile.patch
+
+ # FS#37224
+ patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch
}
build() {
diff --git a/extra/mutter/0001-monitor-expose-min-backlight-step.patch b/extra/mutter/0001-monitor-expose-min-backlight-step.patch
new file mode 100644
index 000000000..0d6d7424f
--- /dev/null
+++ b/extra/mutter/0001-monitor-expose-min-backlight-step.patch
@@ -0,0 +1,29 @@
+From 6b150b3e9f1d16e6c374e178107ab490a18346dd Mon Sep 17 00:00:00 2001
+From: Asad Mehmood <asad78611@googlemail.com>
+Date: Thu, 17 Oct 2013 16:05:59 +0100
+Subject: [PATCH] monitor: expose min-backlight-step
+
+Expose min-backlight-step so that gnome-settings-daemon can
+support backlights with less than 10 steps without mutter
+normalizing the brightness back to its original value
+---
+ src/core/monitor.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/core/monitor.c b/src/core/monitor.c
+index 9ec0c2a..6d65f9e 100644
+--- a/src/core/monitor.c
++++ b/src/core/monitor.c
+@@ -806,6 +806,9 @@ meta_monitor_manager_handle_get_resources (MetaDBusDisplayConfig *skeleton,
+ g_variant_new_take_string (make_display_name (manager, output)));
+ g_variant_builder_add (&properties, "{sv}", "backlight",
+ g_variant_new_int32 (output->backlight));
++ g_variant_builder_add (&properties, "{sv}", "min-backlight-step",
++ g_variant_new_int32 ((output->backlight_max - output->backlight_min) ?
++ 100 / (output->backlight_max - output->backlight_min) : -1));
+ g_variant_builder_add (&properties, "{sv}", "primary",
+ g_variant_new_boolean (output->is_primary));
+ g_variant_builder_add (&properties, "{sv}", "presentation",
+--
+1.8.4.1
+
diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD
index 27b5d4955..fe4153570 100644
--- a/extra/mutter/PKGBUILD
+++ b/extra/mutter/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198332 2013-10-30 14:13:20Z allan $
+# $Id: PKGBUILD 199787 2013-11-16 12:16:33Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: Michael Kanis <mkanis_at_gmx_dot_de>
pkgname=mutter
-pkgver=3.10.1.1
-pkgrel=1
+pkgver=3.10.2
+pkgrel=2
pkgdesc="A window manager for GNOME"
arch=(i686 x86_64 mips64el)
license=('GPL')
@@ -15,8 +15,17 @@ url="http://www.gnome.org"
groups=('gnome')
options=('!emptydirs')
install=mutter.install
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fa05200a367cd72dbba8c023f6828f79db24b8922e51b71f55148d3e35701c00')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz
+ 0001-monitor-expose-min-backlight-step.patch)
+sha256sums=('438163bc7fbab88366b589cab895a1df79eeac389e012c6e26ec559316651100'
+ 'f1ef173d96ac27abdcf765972d2ac434f63bf4629b8bd51c177e8963d07f5eb7')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ # FS#37224
+ patch -Np1 -i ../0001-monitor-expose-min-backlight-step.patch
+}
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD
index 9ff6922fb..4e7f7cacb 100644
--- a/extra/nepomuk-core/PKGBUILD
+++ b/extra/nepomuk-core/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 198819 2013-11-05 19:40:45Z andrea $
+# $Id: PKGBUILD 202454 2013-12-22 12:46:34Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=nepomuk-core
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries"
url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools')
+depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg' 'ebook-tools' 'kdegraphics-mobipocket')
makedepends=('cmake' 'automoc4' 'doxygen')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('9d97cb731728a43037eb208e2322b6e0b4e8b7e5')
+sha1sums=('2b4ec16c5e664ae7dcd4035229000b8d7712181d')
prepare() {
mkdir build
diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD
index 463bbfabb..1763b3ad5 100644
--- a/extra/nepomuk-widgets/PKGBUILD
+++ b/extra/nepomuk-widgets/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198836 2013-11-05 19:46:51Z andrea $
+# $Id: PKGBUILD 202471 2013-12-22 12:46:53Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=nepomuk-widgets
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="The Library containing the Nepomuk Widgets"
url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-widgets"
@@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL')
depends=('nepomuk-core')
makedepends=('cmake' 'automoc4')
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d43a410fd9ed02b52e8d4076e080a66a4b2c435a')
+sha1sums=('2edb8e026f35574167026838e9d5b382a5f8148b')
build() {
mkdir build
diff --git a/extra/netcdf-cxx/PKGBUILD b/extra/netcdf-cxx/PKGBUILD
index d4fa61d24..e98d925b6 100644
--- a/extra/netcdf-cxx/PKGBUILD
+++ b/extra/netcdf-cxx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198338 2013-10-30 14:15:40Z allan $
+# $Id: PKGBUILD 199828 2013-11-17 07:52:48Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=netcdf-cxx
pkgver=4.2
-pkgrel=1
+pkgrel=2
pkgdesc="NetCDF c++ bindings"
arch=("i686" "x86_64" "mips64el")
url="http://www.unidata.ucar.edu/downloads/netcdf/netcdf-cxx/index.jsp"
diff --git a/extra/netcdf/PKGBUILD b/extra/netcdf/PKGBUILD
index 6454ab5d6..bc935104c 100644
--- a/extra/netcdf/PKGBUILD
+++ b/extra/netcdf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198337 2013-10-30 14:15:18Z allan $
+# $Id: PKGBUILD 199827 2013-11-17 07:52:15Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=netcdf
pkgver=4.3.0
-pkgrel=1
+pkgrel=2
pkgdesc="network Common Data Form interface for array-oriented data access and corresponding library"
arch=("i686" "x86_64" 'mips64el')
url="http://www.unidata.ucar.edu/downloads/netcdf/index.jsp"
diff --git a/extra/network-manager-applet/PKGBUILD b/extra/network-manager-applet/PKGBUILD
index 12a464bb6..2308ea051 100644
--- a/extra/network-manager-applet/PKGBUILD
+++ b/extra/network-manager-applet/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198342 2013-10-30 14:17:08Z allan $
+# $Id: PKGBUILD 199354 2013-11-11 16:09:20Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Arjan Timmerman <arjan@archlinux.org>
# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org>
@@ -6,8 +6,8 @@
# Contributor: Will Rea <sillywilly@gmail.com>
pkgname=network-manager-applet
-pkgver=0.9.8.4
-pkgrel=2
+pkgver=0.9.8.8
+pkgrel=1
pkgdesc="GNOME frontends to NetWorkmanager"
arch=('i686' 'x86_64' 'mips64el')
license=(GPL)
@@ -19,7 +19,7 @@ optdepends=('gnome-bluetooth: for PAN/DUN support')
options=('!emptydirs')
install=network-manager-applet.install
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/0.9/$pkgname-$pkgver.tar.xz)
-sha256sums=('f68849291047c94487279aab4a6cb90945ad351df02da621a73b413e6c6c198c')
+sha256sums=('581ebf9ead919e33d7e910322c2f64919f98716d8636f1a640b72c9b2e3ba9eb')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index f9db70957..de23ae7f8 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197714 2013-10-28 19:33:38Z jgc $
+# $Id: PKGBUILD 199496 2013-11-13 14:59:50Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=nspr
-pkgver=4.10.1
-pkgrel=2
+pkgver=4.10.2
+pkgrel=1
pkgdesc="Netscape Portable Runtime"
arch=(i686 x86_64 'mips64el')
url="http://www.mozilla.org/projects/nspr/"
@@ -13,8 +13,8 @@ depends=('glibc')
makedepends=('zip')
options=('!emptydirs')
source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('bd1cdf5e7e107846ffe431c5c62b81a560e8c3f7')
-md5sums=('2e354084ca2bc5fbbb820762597f3890')
+sha1sums=('650e4aa35d58624bc1083ed585c81c4af09cf23c')
+md5sums=('f0d254da0b2b870d9a5fa094e879d4b8')
build() {
cd $pkgname-$pkgver
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index cac42649f..a803f5101 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 197720 2013-10-28 23:19:38Z jgc $
+# $Id: PKGBUILD 201408 2013-12-10 17:56:17Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=nss
-pkgver=3.15.2
+pkgver=3.15.3.1
pkgrel=1
pkgdesc="Mozilla Network Security Services"
arch=(i686 x86_64 'mips64el')
url="http://www.mozilla.org/projects/security/pki/nss/"
license=('MPL' 'GPL')
-_nsprver=4.10
+_nsprver=4.10.2
depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
makedepends=('perl')
options=('!strip' '!makeflags' 'staticlibs')
@@ -17,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/s
nss-config.in
ssl-renegotiate-transitional.patch
add_spi+cacert_ca_certs.patch)
-sha1sums=('2d900c296bf11deabbf833ebd6ecdea549c97a5f'
+sha1sums=('4e0f81a1f770447dc5440201a579151b601463e2'
'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
'8a964a744ba098711b80c0d279a2993524e8eb92'
diff --git a/extra/numactl/PKGBUILD b/extra/numactl/PKGBUILD
index 79086d802..68560df5c 100644
--- a/extra/numactl/PKGBUILD
+++ b/extra/numactl/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=numactl
pkgver=2.0.9
-pkgrel=1
+pkgrel=2
pkgdesc="Simple NUMA policy support"
arch=('i686' 'x86_64' 'mips64el')
url="http://oss.sgi.com/projects/libnuma/"
diff --git a/extra/obexd/PKGBUILD b/extra/obexd/PKGBUILD
deleted file mode 100644
index 083752d7c..000000000
--- a/extra/obexd/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 187865 2013-06-07 09:25:01Z tomegun $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
-
-pkgbase=obexd
-pkgname=('obexd-client' 'obexd-server')
-epoch=1
-pkgver=0.46
-pkgrel=2
-url="http://www.bluez.org/"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL2')
-makedepends=('bluez4' 'bluez-libs' 'libical' 'glib2')
-source=("http://www.kernel.org/pub/linux/bluetooth/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('625f0417d119437429c9cce29479cfa4')
-
-build() {
- cd ${pkgbase}-${pkgver}
- sed -i 's/#include <string.h>/&\n#include <stdio.h>/' plugins/mas.c
- ./configure --prefix=/usr \
- --libexecdir=/usr/lib/obexd
- make
-}
-
-package_obexd-client() {
- pkgdesc="D-Bus service providing high-level OBEX client side functionality"
- depends=('bluez4' 'bluez-libs' 'glib2')
- provides=("obexd=${pkgver}")
- replaces=('obexd')
- conflicts=('obexd')
-
- cd ${pkgbase}-${pkgver}/client
- install -m755 -d "${pkgdir}/usr/lib/obexd"
- install -m755 -d "${pkgdir}/usr/share/dbus-1/services"
- install -m755 obex-client "${pkgdir}/usr/lib/obexd/"
- install -m644 obex-client.service "${pkgdir}/usr/share/dbus-1/services/"
-}
-
-package_obexd-server() {
- pkgdesc="D-Bus service providing high-level OBEX server side functionality"
- depends=('bluez4' 'bluez-libs' 'libical' 'glib2')
- conflicts=('obex-data-server')
-
- cd ${pkgbase}-${pkgver}/src
- install -m755 -d "${pkgdir}/usr/lib/obexd"
- install -m755 -d "${pkgdir}/usr/share/dbus-1/services"
- install -m755 obexd "${pkgdir}/usr/lib/obexd/"
- install -m644 obexd.service "${pkgdir}/usr/share/dbus-1/services/"
-}
diff --git a/extra/octave/PKGBUILD b/extra/octave/PKGBUILD
index b1ca44a0d..5fc6d0120 100644
--- a/extra/octave/PKGBUILD
+++ b/extra/octave/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 196805 2013-10-19 13:44:27Z bpiotrowski $
+# $Id: PKGBUILD 202666 2013-12-23 21:05:04Z ronald $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor : shining <shiningxc.at.gmail.com>
# Contributor : cyberdune <cyberdune@gmail.com>
pkgname=octave
pkgver=3.6.4
-pkgrel=4
+pkgrel=5
pkgdesc="A high-level language, primarily intended for numerical computations."
arch=('i686' 'x86_64' 'mips64el')
url="http://www.octave.org"
license=('GPL')
-depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'suitesparse' 'arpack')
-makedepends=('gcc-fortran' 'texlive-core')
+depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu')
+makedepends=('gcc-fortran' 'texlive-core' 'suitesparse')
optdepends=('texinfo: for help-support in octave'
'gnuplot: alternative plotting')
source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}
@@ -22,16 +22,21 @@ sha1sums=('3cc9366b6dbbd336eaf90fe70ad16e63705d82c4'
'SKIP'
'0608af9b7ccce8455f534d2fc4acf2f4c8f83a60')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# https://savannah.gnu.org/bugs/?38746
patch -Np1 -i "${srcdir}/mex-gcc-4.8.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
autoreconf -vfi
./configure --prefix=/usr --libexecdir=/usr/lib \
--enable-shared --disable-static \
+ --with-quantum-depth=32 \
--with-umfpack="-lumfpack -lsuitesparseconfig" # https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
LANG=C make
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index c990b95df..49d97bb11 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197009 2013-10-21 12:41:49Z jgc $
+# $Id: PKGBUILD 199861 2013-11-17 12:53:54Z bpiotrowski $
# Maintainer: Jan de Groot <jan@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=opal
pkgver=3.10.11
-pkgrel=1
+pkgrel=2
pkgdesc="Open Phone Abstraction Library"
arch=(i686 x86_64 'mips64el')
url="http://www.opalvoip.org"
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index ac07b0dcf..5ffcc6cc4 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,22 +1,22 @@
-# $Id: PKGBUILD 196269 2013-10-10 11:00:54Z schiv $
+# $Id: PKGBUILD 199540 2013-11-15 08:46:07Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgbase=opencv
pkgname=('opencv' 'opencv-samples')
_realname=OpenCV
-pkgver=2.4.6.1
-pkgrel=3
+pkgver=2.4.7
+pkgrel=2
pkgdesc="Open Source Computer Vision Library"
arch=('i686' 'x86_64' 'mips64el')
license=('BSD')
url="http://opencv.org/"
-depends=('jasper' 'gstreamer0.10-base'
- 'xine-lib' 'libdc1394' 'openexr' 'gtkglext')
-makedepends=('cmake' 'python2-numpy' 'mesa'
- 'eigen2')
+depends=('gstreamer0.10-base' 'intel-tbb' 'openexr'
+ 'xine-lib' 'libdc1394' 'gtkglext')
+makedepends=('cmake' 'python2-numpy' 'mesa' 'eigen2')
optdepends=('opencv-samples'
'eigen2'
+ 'libcl: For coding with OpenCL'
'python2-numpy: Python 2.x interface')
if [ "$CARCH" != "mips64el" ]; then
depends+=('intel-tbb' 'libcl')
@@ -24,12 +24,10 @@ if [ "$CARCH" != "mips64el" ]; then
fi
source=("http://downloads.sourceforge.net/opencvlibrary/$pkgname-$pkgver.tar.gz"
'pkgconfig.patch'
- 'fsh.patch'
- 'cldetect.patch')
-md5sums=('d756bfa460891697571d5c90050e1cfe'
- 'cb916260b5ec594fe7a0cc2e54fc569f'
- '35256e3ccace373feba8131d1540a0de'
- '0dd6572405adc2387ded4c95be0f189c')
+ 'fsh.patch')
+md5sums=('33a12a8bba6e6dc32c97298c99b083b2'
+ 'c7cea48ed7d4f729ebdb9673bac41bd3'
+ 'c597598d142dd34d0eb4af7d6e9779d8')
if [ "$CARCH" != "mips64el" ]; then
_cmakeopts=('-D WITH_OPENCL=ON'
@@ -62,18 +60,14 @@ _cmakeopts+=(
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # fix missing opencl module
- # see https://bugs.archlinux.org/task/36076
- # and http://code.opencv.org/issues/3140
- patch -Np1 -i "$srcdir/cldetect.patch"
-
- # fix pkg-config mess
+ # hack-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 that they won't fix
+ # hack-fix folder naming inconsistency that they won't fix
# see http://code.opencv.org/issues/2512
+ # and https://bugs.archlinux.org/task/32342
patch -Np1 -i "$srcdir/fsh.patch"
# no longer including docs, see https://bugs.archlinux.org/task/34185
@@ -90,6 +84,8 @@ build() {
}
package_opencv() {
+ options=('staticlibs')
+
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir" install
@@ -101,14 +97,17 @@ package_opencv() {
cd "$pkgdir/usr/share"
# separate samples package; also be -R friendly
- [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples"
+ if [[ -d $pkgname/samples ]]; then
+ mv $pkgname/samples "$srcdir/opencv-samples"
+ elif [[ -d $_realname ]]; then
+ warn "Directory naming issue; samples package may not be built!"
+ fi
}
package_opencv-samples() {
pkgdesc+=" (samples)"
- depends=('bash')
+ depends=("opencv=$pkgver") # sample codes change with lib/API
unset optdepends
- unset options
mkdir -p "$pkgdir/usr/share/opencv"
cp -r "$srcdir/opencv-samples" "$pkgdir/usr/share/opencv/samples"
diff --git a/extra/opencv/cldetect.patch b/extra/opencv/cldetect.patch
deleted file mode 100644
index 6dbe1608c..000000000
--- a/extra/opencv/cldetect.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake
---- opencv-2.4.6.orig/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 18:57:27.363199736 +0000
-+++ opencv-2.4.6/cmake/OpenCVDetectOpenCL.cmake 2013-07-11 19:04:00.577069207 +0000
-@@ -17,8 +17,7 @@
- NAMES OpenCL/cl.h CL/cl.h
- HINTS ${OPENCL_ROOT_DIR}
- PATH_SUFFIXES include include/nvidia-current
-- DOC "OpenCL include directory"
-- NO_DEFAULT_PATH)
-+ DOC "OpenCL include directory")
-
- if (X86_64)
- set(OPENCL_POSSIBLE_LIB_SUFFIXES lib/Win64 lib/x86_64 lib/x64)
-@@ -30,8 +29,7 @@
- NAMES OpenCL
- HINTS ${OPENCL_ROOT_DIR}
- PATH_SUFFIXES ${OPENCL_POSSIBLE_LIB_SUFFIXES}
-- DOC "OpenCL library"
-- NO_DEFAULT_PATH)
-+ DOC "OpenCL library")
-
- mark_as_advanced(OPENCL_INCLUDE_DIR OPENCL_LIBRARY)
- include(FindPackageHandleStandardArgs)
diff --git a/extra/opencv/fsh.patch b/extra/opencv/fsh.patch
index fc6fb4b2a..650d46a70 100644
--- a/extra/opencv/fsh.patch
+++ b/extra/opencv/fsh.patch
@@ -1,7 +1,7 @@
-diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-05 18:42:32.460958392 +0000
-+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-05 18:52:43.766689315 +0000
-@@ -47,7 +47,7 @@
+diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:54.923577113 +0000
+@@ -46,7 +46,7 @@
#need better solution....
if(libpath MATCHES "3rdparty")
@@ -10,10 +10,22 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/
else()
set(installDir "${OPENCV_LIB_INSTALL_PATH}")
endif()
-diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
---- OpenCV-2.4.3.orig/CMakeLists.txt 2012-11-05 18:42:32.700956757 +0000
-+++ OpenCV-2.4.3/CMakeLists.txt 2012-11-05 18:55:42.358787848 +0000
-@@ -221,9 +221,9 @@
+diff -baur opencv-2.4.7.orig/cmake/OpenCVModule.cmake opencv-2.4.7/cmake/OpenCVModule.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVModule.cmake 2013-11-12 20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVModule.cmake 2013-11-12 20:35:37.805415871 +0000
+@@ -807,7 +807,7 @@
+ if(INSTALL_C_EXAMPLES AND NOT WIN32 AND EXISTS "${samples_path}")
+ file(GLOB sample_files "${samples_path}/*")
+ install(FILES ${sample_files}
+- DESTINATION share/OpenCV/samples/${module_id}
++ DESTINATION share/opencv/samples/${module_id}
+ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
+ endfunction()
+diff -baur opencv-2.4.7.orig/CMakeLists.txt opencv-2.4.7/CMakeLists.txt
+--- opencv-2.4.7.orig/CMakeLists.txt 2013-11-12 20:31:27.437095684 +0000
++++ opencv-2.4.7/CMakeLists.txt 2013-11-12 20:40:21.160171499 +0000
+@@ -243,9 +243,9 @@
if(ANDROID OR WIN32)
set(OPENCV_DOC_INSTALL_PATH doc)
elseif(INSTALL_TO_MANGLED_PATHS)
@@ -24,16 +36,17 @@ diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
+ set(OPENCV_DOC_INSTALL_PATH share/doc/opencv)
endif()
- if(ANDROID)
-@@ -237,14 +237,14 @@
- set(LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/lib")
- set(3P_LIBRARY_OUTPUT_PATH "${OpenCV_BINARY_DIR}/3rdparty/lib${LIB_SUFFIX}")
- set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX})
-- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
-+ set(OPENCV_3P_LIB_INSTALL_PATH share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
- set(OPENCV_INCLUDE_INSTALL_PATH include)
+ if(WIN32)
+@@ -282,7 +282,7 @@
+ set(OPENCV_3P_LIB_INSTALL_PATH "${OpenCV_INSTALL_BINARIES_PREFIX}staticlib${LIB_SUFFIX}")
+ else()
+ set(OPENCV_LIB_INSTALL_PATH lib${LIB_SUFFIX})
+- set(OPENCV_3P_LIB_INSTALL_PATH share/OpenCV/3rdparty/${OPENCV_LIB_INSTALL_PATH})
++ set(OPENCV_3P_LIB_INSTALL_PATH share/opencv/3rdparty/${OPENCV_LIB_INSTALL_PATH})
+ endif()
+ set(OPENCV_INCLUDE_INSTALL_PATH "include")
- math(EXPR SIZEOF_VOID_P_BITS "8 * ${CMAKE_SIZEOF_VOID_P}")
+@@ -290,7 +290,7 @@
if(LIB_SUFFIX AND NOT SIZEOF_VOID_P_BITS EQUAL LIB_SUFFIX)
set(OPENCV_CONFIG_INSTALL_PATH lib${LIB_SUFFIX}/cmake/opencv)
else()
@@ -42,9 +55,9 @@ diff -Nbaur OpenCV-2.4.3.orig/CMakeLists.txt OpenCV-2.4.3/CMakeLists.txt
endif()
endif()
-diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.txt
---- OpenCV-2.4.3.orig/data/CMakeLists.txt 2012-11-05 18:42:32.460958392 +0000
-+++ OpenCV-2.4.3/data/CMakeLists.txt 2012-11-05 18:52:43.816688977 +0000
+diff -baur opencv-2.4.7.orig/data/CMakeLists.txt opencv-2.4.7/data/CMakeLists.txt
+--- opencv-2.4.7.orig/data/CMakeLists.txt 2013-11-12 20:31:27.280430213 +0000
++++ opencv-2.4.7/data/CMakeLists.txt 2013-11-12 20:31:54.923577113 +0000
@@ -5,6 +5,6 @@
install(FILES ${HAAR_CASCADES} DESTINATION sdk/etc/haarcascades COMPONENT main)
install(FILES ${LBP_CASCADES} DESTINATION sdk/etc/lbpcascades COMPONENT main)
@@ -54,10 +67,22 @@ diff -Nbaur OpenCV-2.4.3.orig/data/CMakeLists.txt OpenCV-2.4.3/data/CMakeLists.t
+ install(FILES ${HAAR_CASCADES} DESTINATION share/opencv/haarcascades COMPONENT main)
+ install(FILES ${LBP_CASCADES} DESTINATION share/opencv/lbpcascades COMPONENT main)
endif()
-diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CMakeLists.txt
---- OpenCV-2.4.3.orig/samples/c/CMakeLists.txt 2012-11-05 18:42:32.697623446 +0000
-+++ OpenCV-2.4.3/samples/c/CMakeLists.txt 2012-11-05 18:52:43.826688906 +0000
-@@ -54,7 +54,7 @@
+diff -baur opencv-2.4.7.orig/modules/java/CMakeLists.txt opencv-2.4.7/modules/java/CMakeLists.txt
+--- opencv-2.4.7.orig/modules/java/CMakeLists.txt 2013-11-12 20:31:27.360429532 +0000
++++ opencv-2.4.7/modules/java/CMakeLists.txt 2013-11-12 20:36:41.984985273 +0000
+@@ -279,7 +279,7 @@
+ if(WIN32)
+ set(JAR_INSTALL_DIR java)
+ else(WIN32)
+- set(JAR_INSTALL_DIR share/OpenCV/java)
++ set(JAR_INSTALL_DIR share/opencv/java)
+ endif(WIN32)
+ install(FILES ${JAR_FILE} DESTINATION ${JAR_INSTALL_DIR} COMPONENT main)
+ endif(ANDROID)
+diff -baur opencv-2.4.7.orig/samples/c/CMakeLists.txt opencv-2.4.7/samples/c/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/c/CMakeLists.txt 2013-11-12 20:31:27.433762373 +0000
++++ opencv-2.4.7/samples/c/CMakeLists.txt 2013-11-12 20:31:54.923577113 +0000
+@@ -54,6 +54,6 @@
if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${C_SAMPLES}
@@ -65,11 +90,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/c/CMakeLists.txt OpenCV-2.4.3/samples/c/CM
+ DESTINATION share/opencv/samples/c
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif ()
-
-diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cpp/CMakeLists.txt
---- OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt 2012-11-05 18:42:32.677623583 +0000
-+++ OpenCV-2.4.3/samples/cpp/CMakeLists.txt 2012-11-05 18:52:43.823355598 +0000
-@@ -64,7 +64,7 @@
+diff -baur opencv-2.4.7.orig/samples/cpp/CMakeLists.txt opencv-2.4.7/samples/cpp/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/cpp/CMakeLists.txt 2013-11-12 20:31:27.417095818 +0000
++++ opencv-2.4.7/samples/cpp/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000
+@@ -83,6 +83,6 @@
if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${C_SAMPLES}
@@ -77,11 +101,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/cpp/CMakeLists.txt OpenCV-2.4.3/samples/cp
+ DESTINATION share/opencv/samples/cpp
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif()
-
-diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gpu/CMakeLists.txt
---- OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt 2012-11-05 18:42:32.670956962 +0000
-+++ OpenCV-2.4.3/samples/gpu/CMakeLists.txt 2012-11-05 18:52:43.820022288 +0000
-@@ -64,7 +64,7 @@
+diff -baur opencv-2.4.7.orig/samples/gpu/CMakeLists.txt opencv-2.4.7/samples/gpu/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/gpu/CMakeLists.txt 2013-11-12 20:31:27.407095885 +0000
++++ opencv-2.4.7/samples/gpu/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000
+@@ -83,6 +83,6 @@
if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${install_list}
@@ -89,11 +112,10 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/CMakeLists.txt OpenCV-2.4.3/samples/gp
+ DESTINATION share/opencv/samples/${project}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif()
-
-diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt
---- OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt 2012-11-05 18:42:32.674290272 +0000
-+++ OpenCV-2.4.3/samples/gpu/performance/CMakeLists.txt 2012-11-05 18:52:43.823355598 +0000
-@@ -21,6 +21,6 @@
+diff -baur opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt opencv-2.4.7/samples/gpu/performance/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/gpu/performance/CMakeLists.txt 2013-11-12 20:31:27.407095885 +0000
++++ opencv-2.4.7/samples/gpu/performance/CMakeLists.txt 2013-11-12 20:31:55.110242982 +0000
+@@ -29,6 +29,6 @@
if(INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB GPU_FILES performance/*.cpp performance/*.h)
install(FILES ${GPU_FILES}
@@ -101,3 +123,14 @@ diff -Nbaur OpenCV-2.4.3.orig/samples/gpu/performance/CMakeLists.txt OpenCV-2.4.
+ DESTINATION share/opencv/samples/gpu/performance
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif()
+diff -baur opencv-2.4.7.orig/samples/ocl/CMakeLists.txt opencv-2.4.7/samples/ocl/CMakeLists.txt
+--- opencv-2.4.7.orig/samples/ocl/CMakeLists.txt 2013-11-12 20:31:27.397095952 +0000
++++ opencv-2.4.7/samples/ocl/CMakeLists.txt 2013-11-12 20:39:29.227200043 +0000
+@@ -54,6 +54,6 @@
+ if (INSTALL_C_EXAMPLES AND NOT WIN32)
+ file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
+ install(FILES ${install_list}
+- DESTINATION share/OpenCV/samples/${project}
++ DESTINATION share/opencv/samples/${project}
+ PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ endif()
diff --git a/extra/opencv/pkgconfig.patch b/extra/opencv/pkgconfig.patch
index 84d268e61..5626eb6e0 100644
--- a/extra/opencv/pkgconfig.patch
+++ b/extra/opencv/pkgconfig.patch
@@ -1,6 +1,6 @@
-diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake
---- OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:14.243505926 +0000
-+++ OpenCV-2.4.3/cmake/OpenCVGenPkgconfig.cmake 2012-11-04 08:40:42.286649120 +0000
+diff -baur opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake
+--- opencv-2.4.7.orig/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:31:27.253763202 +0000
++++ opencv-2.4.7/cmake/OpenCVGenPkgconfig.cmake 2013-11-12 20:41:48.936262732 +0000
@@ -10,7 +10,7 @@
# -------------------------------------------------------------------------------------------
set(prefix "${CMAKE_INSTALL_PREFIX}")
@@ -8,9 +8,9 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/
-set(libdir "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
+set(libdir "\${prefix}/${OPENCV_LIB_INSTALL_PATH}")
set(includedir "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
- set(VERSION ${OPENCV_VERSION})
-@@ -36,10 +36,11 @@
+ if(CMAKE_BUILD_TYPE MATCHES "Release")
+@@ -35,10 +35,11 @@
ocv_list_reverse(OpenCV_EXTRA_COMPONENTS)
#build the list of components
@@ -23,7 +23,7 @@ diff -Nbaur OpenCV-2.4.3.orig/cmake/OpenCVGenPkgconfig.cmake OpenCV-2.4.3/cmake/
if(INSTALL_TO_MANGLED_PATHS)
set(libname "${libname}.${OPENCV_VERSION}")
-@@ -52,7 +53,8 @@
+@@ -51,7 +52,8 @@
set(installDir "${OPENCV_LIB_INSTALL_PATH}")
endif()
diff --git a/extra/openobex/PKGBUILD b/extra/openobex/PKGBUILD
index 5d153c9bc..9d2c6fd98 100644
--- a/extra/openobex/PKGBUILD
+++ b/extra/openobex/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 187866 2013-06-07 09:25:02Z tomegun $
+# $Id: PKGBUILD 199321 2013-11-10 20:21:49Z eric $
# Maintainer:
# Contributor: Geoffroy Carrier <geoffroy@archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=openobex
-pkgver=1.7
-pkgrel=6
+pkgver=1.7.1
+pkgrel=1
pkgdesc="Implementation of the OBject EXchange (OBEX) protocol"
url="http://dev.zuckschwerdt.org/openobex/"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL')
depends=('libusbx' 'bluez-libs')
-makedepends=('cmake')
-options=('!makeflags')
+makedepends=('cmake' 'libxslt')
+options=('staticlibs' '!makeflags')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}-Source.tar.gz)
-md5sums=('11031f6f0b876bb6259bd27106491528')
+md5sums=('3181bfed9cb7db591605391068cb0085')
prepare() {
- mkdir build
+ sed -i 's|MODE="660", GROUP="plugdev"|TAG+="uaccess"|' ${pkgname}-${pkgver}-Source/udev/openobex.rules.in
}
build() {
+ mkdir build
cd build
cmake ../${pkgname}-${pkgver}-Source \
-DCMAKE_BUILD_TYPE=Release \
@@ -37,9 +38,4 @@ package() {
make DESTDIR="${pkgdir}" install
cp ../${pkgname}-${pkgver}-Source/apps/lib/*.h "${pkgdir}/usr/include/openobex/"
install -m644 apps/lib/libopenobex-apps-common.a "${pkgdir}/usr/lib/libopenobex-apps-common.a"
-
- # usrmove
- cd "$pkgdir"
- mv lib/udev usr/lib/
- rmdir lib
}
diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD
index 66dd97e39..91068b1ad 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 198357 2013-10-30 14:22:43Z allan $
+# $Id: PKGBUILD 200804 2013-12-05 18:41:22Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
# Contributor: pumbur
pkgname=opus
-pkgver=1.0.3
-pkgrel=2
+pkgver=1.1
+pkgrel=1
pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
arch=(i686 x86_64 mips64el)
url="http://www.opus-codec.org/"
license=(BSD)
depends=(glibc)
source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('86eedbd3c5a0171d2437850435e6edff')
+md5sums=('c5a8cf7c0b066759542bc4ca46817ac6')
build() {
cd $pkgname-$pkgver
diff --git a/extra/orage/PKGBUILD b/extra/orage/PKGBUILD
index 3934c60a3..f62ad6189 100644
--- a/extra/orage/PKGBUILD
+++ b/extra/orage/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 198358 2013-10-30 14:23:04Z allan $
+# $Id: PKGBUILD 201376 2013-12-10 01:11:45Z eric $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Tobias Kieslich <tobias (at) archlinux.org>
pkgname=orage
-pkgver=4.8.4
-pkgrel=2
+pkgver=4.10.0
+pkgrel=1
pkgdesc="A simple calendar application with reminders for Xfce"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
-url="http://www.xfce.org/projects/orage/"
+url="http://www.xfce.org/projects/"
groups=('xfce4-goodies')
-depends=('xfce4-panel' 'libical' 'popt' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'xfce4-dev-tools' 'popt')
+depends=('xfce4-panel' 'libical' 'popt' 'libnotify')
+makedepends=('intltool')
replaces=('xfcalendar')
install=${pkgname}.install
source=(http://archive.xfce.org/src/apps/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('8b9facb0393385e4d639dd6a886c216729672958')
+sha1sums=('1d19e097958b710005789973d385ca13338b26f9')
build() {
cd ${pkgname}-${pkgver}
@@ -24,7 +24,6 @@ build() {
--libexecdir=/usr/lib \
--localstatedir=/var \
--enable-libical \
- --disable-static \
--disable-debug
make
}
diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD
index f7d334747..731189fda 100644
--- a/extra/oxygen-gtk2/PKGBUILD
+++ b/extra/oxygen-gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 193727 2013-08-29 13:10:55Z andrea $
+# $Id: PKGBUILD 201423 2013-12-11 13:48:51Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: birdflesh <antkoul at gmail dot com>
pkgname=oxygen-gtk2
-pkgver=1.4.0
+pkgver=1.4.1
pkgrel=1
pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,10 +14,13 @@ conflicts=('oxygen-gtk')
replaces=('oxygen-gtk')
makedepends=('cmake')
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('ccc9e468a5ea04159ca2040ee3f434e1')
+md5sums=('27bb5826d936fe2bddab35057739908f')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD
index 63609d242..1d99341f8 100644
--- a/extra/oxygen-gtk3/PKGBUILD
+++ b/extra/oxygen-gtk3/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 193729 2013-08-29 13:11:38Z andrea $
+# $Id: PKGBUILD 201533 2013-12-14 07:15:21Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=oxygen-gtk3
-pkgver=1.2.0
+pkgver=1.3.1
pkgrel=1
pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,10 +11,13 @@ license=('LGPL')
depends=('gtk3')
makedepends=('cmake')
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('c89352459fa41bd35e64072e6bc89593')
+md5sums=('a8ca81ea29a93c5859f179266f07c66e')
-build() {
+prepare() {
mkdir build
+}
+
+build() {
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index 269ed6e70..dad4b9de6 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198364 2013-10-30 14:25:12Z allan $
+# $Id: PKGBUILD 199375 2013-11-11 18:06:12Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=pango
-pkgver=1.36.0
+pkgver=1.36.1
pkgrel=1
pkgdesc="A library for layout and rendering of text"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ makedepends=('harfbuzz' 'fontconfig' 'cairo' 'libxft' 'libthai' 'gobject-introsp
install=pango.install
source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
url="http://www.pango.org/"
-sha256sums=('bb41d1b26ee7450e5430a7d2765f38c51ebe72db9fce616a9ee52611b55906a0')
+sha256sums=('42e4b51cdc99e6878a9ea2a5ef2b31b79c1033f8518726df738a3c54c90e59f8')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/parted/PKGBUILD b/extra/parted/PKGBUILD
index 1bb21237c..9827d6612 100644
--- a/extra/parted/PKGBUILD
+++ b/extra/parted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198367 2013-10-30 14:26:16Z allan $
+# $Id: PKGBUILD 199967 2013-11-20 11:26:39Z allan $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=parted
pkgver=3.1
-pkgrel=2
+pkgrel=3
pkgdesc="A program for creating, destroying, resizing, checking and copying partitions"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index c753576ec..8528d032d 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 197755 2013-10-29 18:05:53Z bpiotrowski $
+# $Id: PKGBUILD 199869 2013-11-17 12:58:57Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: kevin <kevin@archlinux.org>
# Contributor: Eric Johnson <eric@coding-zone.com>
pkgname=perl-dbd-mysql
_realname=DBD-mysql
-pkgver=4.024
+pkgver=4.025
pkgrel=1
-pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
+pkgdesc='Perl/CPAN DBD::mysql module for interacting with MySQL via DBD'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'PerlArtistic')
url="http://search.cpan.org/dist/${_realname}/"
@@ -15,7 +15,7 @@ depends=('libmariadbclient' 'perl-dbi')
makedepends=('mariadb')
options=('!emptydirs')
source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
-md5sums=('280922d577aa95bf3f9ae21bd75e08c4')
+md5sums=('093ed74c3bd327d4e0d0bc70d1035ac3')
build() {
cd $_realname-$pkgver
diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD
index acee27788..b9a5f6540 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -1,34 +1,32 @@
-# $Id: PKGBUILD 186412 2013-05-26 09:25:29Z bluewind $
+# $Id: PKGBUILD 201329 2013-12-09 00:20:22Z eric $
# Maintainer: kevin <kevin@archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=perl-net-dns
-_realname=Net-DNS
-pkgver=0.72
-pkgrel=2
+pkgver=0.73
+pkgrel=1
pkgdesc="Perl Module: Interface to the DNS resolver."
arch=('i686' 'x86_64' 'mips64el')
license=('PerlArtistic')
-url="http://search.cpan.org/dist/${_realname}/"
+url="http://search.cpan.org/dist/Net-DNS/"
depends=('perl-digest-hmac' 'perl-net-ip' 'perl')
+checkdepends=('perl-test-pod')
options=('!emptydirs')
-source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/${_realname}-$pkgver.tar.gz)
-md5sums=('393e48ec6f28abe5ed30204276e02775')
+source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz)
+sha1sums=('03c02d04c4346e4a3f52e28885d870b6be96feda')
build() {
- cd "$srcdir/${_realname}-${pkgver}"
- # install module in vendor directories.
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ cd Net-DNS-${pkgver}
+ perl Makefile.PL INSTALLDIRS=vendor
make
}
check() {
- cd "$srcdir/${_realname}-${pkgver}"
+ cd Net-DNS-${pkgver}
make test
}
package() {
- cd "$srcdir/${_realname}-${pkgver}"
- make install DESTDIR="${pkgdir}"
+ cd Net-DNS-${pkgver}
+ make DESTDIR="${pkgdir}" install
}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/extra/perl-sdl/PKGBUILD b/extra/perl-sdl/PKGBUILD
index 1e38d7bb1..310c7fa1d 100644
--- a/extra/perl-sdl/PKGBUILD
+++ b/extra/perl-sdl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 186414 2013-05-26 09:25:36Z bluewind $
+# $Id: PKGBUILD 199485 2013-11-13 12:47:51Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
pkgname=perl-sdl
pkgver=2.540
-pkgrel=4
+pkgrel=5
pkgdesc="Simple DirectMedia Layer for Perl"
arch=(i686 x86_64 'mips64el')
license=(LGPL)
diff --git a/extra/phonon-gstreamer/PKGBUILD b/extra/phonon-gstreamer/PKGBUILD
index 715f54cd5..61259bbb6 100644
--- a/extra/phonon-gstreamer/PKGBUILD
+++ b/extra/phonon-gstreamer/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198817 2013-11-05 19:40:13Z andrea $
+# $Id: PKGBUILD 201235 2013-12-06 13:45:03Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=phonon-gstreamer
-pkgver=4.7.0
+pkgver=4.7.1
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://phonon.kde.org/'
@@ -12,8 +12,8 @@ depends=('gstreamer0.10-base-plugins')
makedepends=('cmake' 'automoc4' 'phonon-qt4')
provides=('phonon-backend')
install="${pkgname}.install"
-source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/src/phonon-backend-gstreamer-${pkgver}.tar.xz")
-md5sums=('f00a1529d43158ce9faea516814562d3')
+source=("http://download.kde.org/stable/phonon/phonon-backend-gstreamer/${pkgver}/phonon-backend-gstreamer-${pkgver}.tar.xz")
+md5sums=('7c0cfab4ec0bbe1f201503e6ccc7290a')
prepare() {
mkdir build
diff --git a/extra/phonon-vlc/PKGBUILD b/extra/phonon-vlc/PKGBUILD
index bb52cf251..06f5807ce 100644
--- a/extra/phonon-vlc/PKGBUILD
+++ b/extra/phonon-vlc/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198816 2013-11-05 19:40:02Z andrea $
+# $Id: PKGBUILD 202703 2013-12-25 15:37:00Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=phonon-vlc
-pkgver=0.7.0
-pkgrel=1
+pkgver=0.7.1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url='http://phonon.kde.org/'
pkgdesc="Phonon VLC backend"
@@ -11,8 +11,8 @@ license=('LGPL')
depends=('vlc')
makedepends=('cmake' 'automoc4' 'phonon-qt4')
provides=('phonon-backend')
-source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/src/phonon-backend-vlc-${pkgver}.tar.xz")
-md5sums=('1a172744eb0fd9cb0dbe0ea8b69e50f1')
+source=("http://download.kde.org/stable/phonon/phonon-backend-vlc/${pkgver}/phonon-backend-vlc-${pkgver}.tar.xz")
+md5sums=('3c41a3d141d40cedd2819676cdca5ea4')
prepare() {
mkdir build
@@ -23,7 +23,8 @@ build() {
cmake ../phonon-backend-vlc-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_SKIP_RPATH=ON
+ -DCMAKE_SKIP_RPATH=ON \
+ -DPLUGIN_INSTALL_DIR=/usr/lib/kde4
make
}
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
new file mode 100644
index 000000000..98a064784
--- /dev/null
+++ b/extra/phonon/PKGBUILD
@@ -0,0 +1,69 @@
+# $Id: PKGBUILD 201231 2013-12-06 13:43:35Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+
+pkgbase=phonon
+pkgname=('phonon-qt4' 'phonon-qt5')
+pkgver=4.7.1
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+makedepends=('cmake' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools' 'qt5-quick1')
+options=('!emptydirs')
+source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz")
+md5sums=('0935e1c00440a03e3032860030398665')
+
+prepare() {
+ mkdir build
+ mkdir build-qt5
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ make
+
+ cd ../build-qt5
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+ -DPHONON_BUILD_PHONON4QT5=ON \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ make
+}
+
+package_phonon-qt4(){
+ pkgdesc="The multimedia framework for KDE4"
+ depends=('phonon-backend' 'libpulse' 'libqzeitgeist')
+ optdepends=('pulseaudio: PulseAudio support')
+ replaces=('phonon')
+ provides=('phonon')
+ conflicts=('phonon')
+
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ # Install headers into the Qt4 dir
+ install -d "${pkgdir}"/usr/include/qt4
+ mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
+
+ sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
+ "${pkgdir}/usr/lib/pkgconfig/phonon.pc"
+}
+
+package_phonon-qt5(){
+ pkgdesc="The multimedia framework for KF5"
+ depends=('phonon-backend' 'libpulse' 'qt5-base')
+ optdepends=('pulseaudio: PulseAudio support')
+
+ cd build-qt5
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 9d23df37f..d03b72284 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196746 2013-10-17 14:02:52Z andyrtr $
+# $Id: PKGBUILD 201484 2013-12-12 18:14:36Z pierre $
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
'php-sqlite'
'php-tidy'
'php-xsl')
-pkgver=5.5.5
+pkgver=5.5.7
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('PHP')
@@ -33,10 +33,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"
'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('a4788118fdb0c4d8cef08be72025e983'
- 'f9ee638591aaf1526767db7976d95847'
+md5sums=('0c02437f661105221e99a301a5275a41'
+ '799cd5f91f5253f4b47ec4fd7fccf4f1'
'dec2cbaad64e3abf4f0ec70e1de4e8e9'
- '880afea327bb00c47082d22c507e6bfc'
+ '9f8263996836e27f5be1483e86ac2e33'
'e036c721e5ad927cd1613c7475a58b3a'
'cc2940f5312ba42e7aa1ddfab74b84c4'
'c60343df74f8e1afb13b084d5c0e47ed')
@@ -46,6 +46,9 @@ prepare() {
patch -p0 -i ${srcdir}/php.ini.patch
patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
+ # freetype2 headers moved
+ # see README at http://sourceforge.net/projects/freetype/files/freetype2/2.5.1/
+ sed 's#/include/freetype2/freetype/freetype.h#/include/freetype2/freetype.h#g' -i configure
}
build() {
diff --git a/extra/php/php-fpm.conf.in.patch b/extra/php/php-fpm.conf.in.patch
index 317c2024f..4bcdb73d5 100644
--- a/extra/php/php-fpm.conf.in.patch
+++ b/extra/php/php-fpm.conf.in.patch
@@ -1,5 +1,5 @@
---- sapi/fpm/php-fpm.conf.in 2013-06-19 22:03:18.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in 2013-06-20 17:03:03.728835784 +0200
+--- sapi/fpm/php-fpm.conf.in 2013-11-12 15:17:27.000000000 +0100
++++ sapi/fpm/php-fpm.conf.in 2013-11-12 17:27:21.283279538 +0100
@@ -12,7 +12,7 @@
; Relative path can also be used. They will be prefixed by:
; - the global prefix if it's been set (-p argument)
@@ -27,7 +27,7 @@
+listen = /run/php-fpm/php-fpm.sock
; Set listen(2) backlog.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
+ ; Default Value: 65535 (-1 on FreeBSD and OpenBSD)
@@ -167,9 +168,9 @@
; BSD-derived systems allow connections regardless of permissions.
; Default Values: user and group are set as the running user
diff --git a/extra/php/php.ini.patch b/extra/php/php.ini.patch
index b2e7d8f87..aa8100ecc 100644
--- a/extra/php/php.ini.patch
+++ b/extra/php/php.ini.patch
@@ -1,6 +1,6 @@
---- php.ini-production 2013-08-15 22:42:04.000000000 +0200
-+++ php.ini-production 2013-08-16 08:03:36.178726858 +0200
-@@ -305,7 +305,7 @@
+--- php.ini-production 2013-11-12 15:17:27.000000000 +0100
++++ php.ini-production 2013-11-12 17:28:12.715321014 +0100
+@@ -306,7 +306,7 @@
; or per-virtualhost web server configuration file. This directive is
; *NOT* affected by whether Safe Mode is turned On or Off.
; http://php.net/open-basedir
@@ -9,7 +9,7 @@
; This directive allows you to disable certain functions for security reasons.
; It receives a comma-delimited list of function names. This directive is
-@@ -702,7 +702,7 @@
+@@ -703,7 +703,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;
; UNIX: "/path1:/path2"
@@ -18,7 +18,7 @@
;
; Windows: "\path1;\path2"
;include_path = ".;c:\php\includes"
-@@ -725,7 +725,7 @@
+@@ -726,7 +726,7 @@
; Directory in which the loadable extensions (modules) reside.
; http://php.net/extension-dir
@@ -27,7 +27,7 @@
; On windows:
; extension_dir = "ext"
-@@ -863,50 +863,48 @@
+@@ -864,50 +864,48 @@
; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
index 569909f7f..0a6759911 100644
--- a/extra/pigeonhole/PKGBUILD
+++ b/extra/pigeonhole/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198784 2013-11-04 13:57:55Z andyrtr $
+# $Id: PKGBUILD 202250 2013-12-20 22:01:35Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributorr: Peter Lewis <plewis@aur.archlinux.org>
@@ -7,12 +7,12 @@
# This must be built against the version of dovecot being used,
# else mail delivery will fail.
# Specify the version of dovecot to be used here:
-_dcpkgver=2.2.7
+_dcpkgver=2.2.10
# Make sure to bump pkgrel if changing this.
pkgname=pigeonhole
pkgver=0.4.2
-pkgrel=2
+pkgrel=5
pkgdesc="Sieve implementation for Dovecot"
arch=('i686' 'x86_64' 'mips64el')
url="http://pigeonhole.dovecot.org/"
diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD
index 4938f1525..73eb5758f 100644
--- a/extra/pixman/PKGBUILD
+++ b/extra/pixman/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198371 2013-10-30 14:27:45Z allan $
+# $Id: PKGBUILD 199934 2013-11-19 19:10:39Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=pixman
-pkgver=0.30.2
+pkgver=0.32.4
pkgrel=1
pkgdesc="The pixel-manipulation library for X and cairo"
arch=(i686 x86_64 'mips64el')
@@ -12,21 +12,21 @@ url="http://xorg.freedesktop.org"
license=('custom')
depends=('glibc')
source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('4ea0832932fd5447a1d5768e0d5403b6c7c4dbaf')
+sha1sums=('e2708db16595412e5aaf21a66b6f18b7223eb6c3')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
./configure --prefix=/usr --disable-static
make
}
check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd $pkgname-$pkgver
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD
index b64159482..4b1244e25 100644
--- a/extra/pkgfile/PKGBUILD
+++ b/extra/pkgfile/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 194358 2013-09-14 14:21:19Z dreisner $
+# $Id: PKGBUILD 199801 2013-11-16 17:11:51Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
pkgname=pkgfile
-pkgver=10
+pkgver=11
pkgrel=1
pkgdesc="a pacman .files metadata explorer"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('libarchive' 'curl' 'pcre' 'pacman')
conflicts=('pkgtools<24-2')
source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
install=pkgfile.install
-md5sums=('262d7359423dedbf1f7323cc14d4a1e3'
+md5sums=('55402bf0e7c8ad729601b9f20f8326aa'
'SKIP')
options=(!strip)
diff --git a/extra/plotutils/PKGBUILD b/extra/plotutils/PKGBUILD
index a1665cd14..f80754a11 100644
--- a/extra/plotutils/PKGBUILD
+++ b/extra/plotutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198372 2013-10-30 14:28:06Z allan $
+# $Id: PKGBUILD 199834 2013-11-17 08:03:32Z allan $
# Maintainer: damir <damir@archlinux.org>
# Packager: Maksim Sipos (maxsipos at gmail dot com)
pkgname=plotutils
pkgver=2.6
-pkgrel=5
+pkgrel=6
arch=('x86_64' 'i686' 'mips64el')
pkgdesc="Set of utilities and libraries for plotting."
url="http://directory.fsf.org/graphics/plotutils.html"
diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD
index 7016eca39..eca8f6385 100644
--- a/extra/poppler/PKGBUILD
+++ b/extra/poppler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198662 2013-11-01 16:03:58Z andyrtr $
+# $Id: PKGBUILD 200652 2013-12-01 09:50:16Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=poppler
pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5')
-pkgver=0.24.3
+pkgver=0.24.4
pkgrel=1
arch=(i686 x86_64 mips64el)
license=('GPL')
@@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/"
_testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a
source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz
http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2)
-md5sums=('31299f26a998029c85295dbbf4c30beb'
+md5sums=('2da22b966cf7a2f8da5bf021e68188ce'
'9dc64c254a31e570507bdd4ad4ba629a')
prepare() {
@@ -40,14 +40,7 @@ build() {
check() {
cd "${srcdir}/${pkgbase}-${pkgver}"
- # qt related errors are now reported:
- # FAIL: check_password
- # Makefile:1146: recipe for target 'test-suite.log' failed
- # make[4]: *** [test-suite.log] Error 1
- # make[4]: Leaving directory '/build/poppler/src/poppler-0.24.3/qt4/tests'
- # Makefile:1252: recipe for target 'check-TESTS' failed
-
- LANG=en_US.UTF8 make check || /bin/true
+ LANG=en_US.UTF8 make check
}
package_poppler() {
diff --git a/extra/postgresql-old-upgrade/PKGBUILD b/extra/postgresql-old-upgrade/PKGBUILD
index ca2ff9e0f..5be9ccaa9 100644
--- a/extra/postgresql-old-upgrade/PKGBUILD
+++ b/extra/postgresql-old-upgrade/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 196303 2013-10-11 09:53:41Z dan $
+# $Id: PKGBUILD 201242 2013-12-06 15:41:36Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgname=postgresql-old-upgrade
-pkgver=9.2.5
+pkgver=9.2.6
_majorver=${pkgver%.*}
pkgrel=1
pkgdesc="PostgreSQL build for migrating between major versions with pg_upgrade"
@@ -47,5 +47,5 @@ package() {
rm -rf "${pkgdir}/opt/pgsql-${_majorver}/include/"
}
-md5sums=('e8438e0ed5e6371741be7697886e7340')
-sha256sums=('22c1edfd6a404bb15fba655863e94f09a10716ded1910a8bc98ee85f413007a4')
+md5sums=('3e68c0c7468c56f73060a88a377dbde8')
+sha256sums=('4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886')
diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD
index beca39e8f..e5e74a440 100644
--- a/extra/postgresql/PKGBUILD
+++ b/extra/postgresql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196301 2013-10-11 09:52:27Z dan $
+# $Id: PKGBUILD 201244 2013-12-06 16:00:26Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
pkgbase=postgresql
pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.3.1
+pkgver=9.3.2
_majorver=${pkgver%.*}
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64' 'mips64el')
url="http://www.postgresql.org/"
license=('custom:PostgreSQL')
@@ -14,14 +14,14 @@ source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar
postgresql-run-socket.patch
postgresql.pam postgresql.logrotate
postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir)
-md5sums=('c003d871f712d4d3895956b028a96e74'
+md5sums=('8c905155e3e9f9367b4299a9acb41d2a'
'75c579eed03ffb2312631f0b649175b4'
'96f82c38f3f540b53f3e5144900acf17'
'd28e443f9f65a5712c52018b84e27137'
'89b48774b0dae7c37fbb0e907c3c1db8'
'1c5a1f99e8e93776c593c468e2612985'
'ea7f9f914900e60835d20cb95010e63c')
-sha256sums=('8ea4a7a92a6f5a79359b02e683ace335c5eb45dffe7f8a681a9ce82470a8a0b8'
+sha256sums=('700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7'
'8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
'57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
'6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
@@ -95,7 +95,7 @@ package_postgresql-libs() {
package_postgresql-docs() {
pkgdesc="HTML documentation for PostgreSQL"
- options=(docs)
+ options=('docs')
cd "${srcdir}/postgresql-${pkgver}"
@@ -118,6 +118,7 @@ package_postgresql() {
'perl: for PL/Perl support'
'tcl: for PL/Tcl support'
'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
+ options=('staticlibs')
install=postgresql.install
cd "${srcdir}/postgresql-${pkgver}"
diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install
index 6dbbb6da8..699efe692 100644
--- a/extra/postgresql/postgresql.install
+++ b/extra/postgresql/postgresql.install
@@ -10,6 +10,10 @@ post_install() {
passwd -l postgres >/dev/null
fi
systemd-tmpfiles --create postgresql.conf
+ if [ ! -d '/var/lib/postgres/data' ]; then
+ mkdir -p '/var/lib/postgres/data'
+ chown postgres:postgres '/var/lib/postgres/data'
+ fi
}
post_upgrade() {
diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD
index de1a0606e..d1da89910 100644
--- a/extra/psiconv/PKGBUILD
+++ b/extra/psiconv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198377 2013-10-30 14:30:08Z allan $
+# $Id: PKGBUILD 199959 2013-11-20 11:08:50Z allan $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=psiconv
pkgver=0.9.8
-pkgrel=13
+pkgrel=14
pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
arch=('i686' 'x86_64' 'mips64el')
url="http://software.frodo.looijaard.name/psiconv/"
diff --git a/extra/pycrypto/PKGBUILD b/extra/pycrypto/PKGBUILD
index 17f58e616..0bb6ad0d1 100644
--- a/extra/pycrypto/PKGBUILD
+++ b/extra/pycrypto/PKGBUILD
@@ -1,28 +1,31 @@
-# $Id: PKGBUILD 169001 2012-10-17 10:19:44Z allan $
+# $Id: PKGBUILD 199045 2013-11-07 22:03:21Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Kritoke <kritoke@gamebox.net>
pkgbase=pycrypto
pkgname=('python2-crypto' 'python-crypto')
-pkgver=2.6
-pkgrel=3
+pkgver=2.6.1
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
makedepends=('python2' 'python')
url="http://www.dlitz.net/software/pycrypto/"
license=('custom')
-source=("http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz")
-sha256sums=('7293c9d7e8af2e44a82f86eb9c3b058880f4bcc884bf3ad6c8a34b64986edde8')
+source=(http://ftp.dlitz.net/pub/dlitz/crypto/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc})
+sha256sums=('f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c'
+ 'c2ab0516cc55321e6543ae75e2aa6f6e56e97432870f32a7799f3b89f467dc1b')
-build() {
- cd "${srcdir}"
+prepare() {
find ${pkgbase}-${pkgver}/LEGAL -type f -exec chmod 644 {} \;
find ${pkgbase}-${pkgver}/LEGAL -type d -exec chmod 755 {} \;
cp -r ${pkgbase}-${pkgver} ${pkgbase}-${pkgver}-py3
- cd "${srcdir}/${pkgbase}-${pkgver}"
+}
+
+build() {
+ cd ${pkgbase}-${pkgver}
python2 setup.py build
- cd "${srcdir}/${pkgbase}-${pkgver}-py3"
+ cd ../${pkgbase}-${pkgver}-py3
python setup.py build
}
@@ -33,7 +36,7 @@ package_python2-crypto() {
conflicts=('pycrypto')
provides=("pycrypto=${pkgver}")
- cd "${srcdir}/${pkgbase}-${pkgver}"
+ cd ${pkgbase}-${pkgver}
python2 setup.py install --root="${pkgdir}" --optimize=1
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
@@ -44,9 +47,17 @@ package_python-crypto() {
pkgdesc="Collection of cryptographic algorithms and protocols, implemented for use from Python 3."
depends=('python')
- cd "${srcdir}/${pkgbase}-${pkgver}-py3"
+ cd ${pkgbase}-${pkgver}-py3
python setup.py install --root="${pkgdir}" --optimize=1
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/"
cp -r LEGAL "${pkgdir}/usr/share/licenses/${pkgname}/"
}
+
+check() {
+ cd ${pkgbase}-${pkgver}
+ python2 setup.py test
+
+ cd ../${pkgbase}-${pkgver}-py3
+ python setup.py test
+}
diff --git a/extra/pygobject/PKGBUILD b/extra/pygobject/PKGBUILD
index 27bd1dd9c..f27a8031f 100644
--- a/extra/pygobject/PKGBUILD
+++ b/extra/pygobject/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198381 2013-10-30 14:31:36Z allan $
+# $Id: PKGBUILD 199350 2013-11-11 16:08:18Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=pygobject
pkgname=(python-gobject python2-gobject pygobject-devel)
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
arch=(i686 x86_64 mips64el)
url="https://live.gnome.org/PyGObject"
license=(LGPL)
makedepends=(python python2 python-cairo python2-cairo gobject-introspection)
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:4}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('87a4d3de4b8ea30a1290229f62092aeb0b77e6b21ca6588bb4704e05fd750837')
+sha256sums=('75608f2c4052f0277508fc79debef026d9e84cb9261de2b922387c093d32c326')
prepare() {
mkdir build-py2 build-py3 devel
diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD
index 7643e2d15..19a40a2c8 100644
--- a/extra/python-geoip/PKGBUILD
+++ b/extra/python-geoip/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 195467 2013-09-30 13:27:17Z jgc $
-# Maintainer:
+# $Id: PKGBUILD 199014 2013-11-06 11:10:37Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Angel Velasquez <angvp@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=('python2-geoip')
pkgbase=python-geoip
pkgver=1.2.8
-pkgrel=2
+pkgrel=3
pkgdesc="Python bindings for the GeoIP IP-to-country resolver library"
arch=('i686' 'x86_64' 'mips64el')
url="http://dev.maxmind.com/geoip/legacy/downloadable#Python-10"
@@ -21,6 +20,8 @@ build() {
}
package_python2-geoip() {
+ conflicts=('python-geoip<1.2.8')
+
cd "GeoIP-Python-$pkgver"
python2 setup.py install --root="$pkgdir" -O1
}
diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 70b51dbc5..496e84da1 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 192296 2013-08-09 23:05:32Z angvp $
+# $Id: PKGBUILD 200744 2013-12-03 23:01:49Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
pkgbase=python-lxml
pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs')
-pkgver=3.2.3
+pkgver=3.2.4
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('BSD' 'custom')
url="http://lxml.de/"
makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect')
source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-md5sums=('fef47bb4ac72ac38ce778518dac42236'
+md5sums=('cc363499060f615aca1ec8dcc04df331'
'SKIP')
# Temporary commented due a conflict with devtools and lxml
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index 27c1fe3e4..6cf982f31 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 197708 2013-10-28 18:10:31Z jgc $
+# $Id: PKGBUILD 200823 2013-12-06 08:09:29Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
pkgbase=python-numpy
pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.7.1
-pkgrel=3
+pkgver=1.8.0
+pkgrel=1
pkgdesc="Scientific tools for Python"
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
@@ -14,21 +14,28 @@ url="http://www.numpy.org/"
makedepends=('lapack' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'gcc-fortran' 'python-nose' 'python2-nose')
options=('staticlibs')
source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
-md5sums=('0ab72b3b83528a7ae79c6df9042d61c6')
+md5sums=('2a4b0423a758706d592abb6721ec8dcd')
-build() {
- cd "${srcdir}"
- cp -a numpy-${pkgver} numpy-py2-${pkgver}
+prepare() {
+ cp -a numpy-$pkgver numpy-py2-$pkgver
+ cd numpy-py2-$pkgver
+
+ sed -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
+ -i $(find . -name '*.py')
+}
+build() {
export ATLAS=None
export LDFLAGS="$LDFLAGS -shared"
echo "Building Python2"
- cd "${srcdir}/numpy-py2-${pkgver}"
+ cd numpy-py2-$pkgver
python2 setup.py config_fc --fcompiler=gnu95 build
echo "Building Python3"
- cd "${srcdir}/numpy-${pkgver}"
+ cd ../numpy-$pkgver
python setup.py config_fc --fcompiler=gnu95 build
}
@@ -41,17 +48,12 @@ package_python2-numpy() {
export ATLAS=None
export LDFLAGS="$LDFLAGS -shared"
- cd "${srcdir}/numpy-py2-${pkgver}"
+ cd numpy-py2-$pkgver
python2 setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
install -m755 -d "${pkgdir}/usr/share/licenses/python2-numpy"
install -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/python2-numpy/"
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
- $(find ${pkgdir} -name '*.py')
-
install -m755 -d "${pkgdir}/usr/include/python${_pyver}"
ln -sf /usr/lib/python${_pyver}/site-packages/numpy/core/include/numpy "${pkgdir}/usr/include/python${_pyver}/numpy"
}
@@ -69,7 +71,7 @@ package_python-numpy() {
export ATLAS=None
export LDFLAGS="$LDFLAGS -shared"
- cd "${srcdir}/numpy-${pkgver}"
+ cd numpy-$pkgver
python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" --optimize=1
install -m755 -d "${pkgdir}/usr/share/licenses/python-numpy"
diff --git a/extra/python/PKGBUILD b/extra/python/PKGBUILD
index 8733625fe..93ef74a26 100644
--- a/extra/python/PKGBUILD
+++ b/extra/python/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 193927 2013-09-06 07:53:42Z bpiotrowski $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# $Id: PKGBUILD 200587 2013-11-29 15:17:24Z angvp $
+# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=python
-pkgver=3.3.2
-pkgrel=2
+pkgver=3.3.3
+pkgrel=1
_pybasever=3.3
pkgdesc="Next generation of the python high-level scripting language"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,15 +16,11 @@ depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib')
makedepends=('tk>=8.6.0' 'sqlite' 'bluez-libs')
[ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
optdepends=('tk: for tkinter' 'sqlite')
+options=('!makeflags')
provides=('python3')
replaces=('python3')
-options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
- python-3.3.2-CVE-2013-2099.patch
- python-3.3.2-CVE-2013-4238.patch)
-sha1sums=('87009d0c156c6e1354dfec5c98c328cae93950ad'
- 'bfe07759daacd4ffa0e682e65f0c9fb84f715c73'
- 'c30297201ef5cd803b685085ca6defb7ca66d2cd')
+source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz)
+sha1sums=('af4e75a34bd538c79b9871227c2e7f56569ac107')
prepare() {
cd "${srcdir}/Python-${pkgver}"
@@ -36,6 +33,10 @@ prepare() {
rm -r Modules/expat
rm -r Modules/zlib
rm -r Modules/_ctypes/{darwin,libffi}*
+}
+
+build() {
+ cd "${srcdir}/Python-${pkgver}"
if [ "$CARCH" != "mips64el" ]; then
extraconf=--with-valgrind
@@ -43,13 +44,6 @@ prepare() {
extraconf=""
fi
- patch -Np1 -i ../python-3.3.2-CVE-2013-2099.patch
- patch -Np1 -i ../python-3.3.2-CVE-2013-4238.patch
-}
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
./configure --prefix=/usr \
--enable-shared \
--with-threads \
@@ -66,7 +60,7 @@ build() {
check() {
cd "${srcdir}/Python-${pkgver}"
LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
- "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging
+ "${srcdir}/Python-${pkgver}/python" -m test.regrtest -x test_posixpath test_logging test_uuid
}
package() {
diff --git a/extra/python/python-3.3.2-CVE-2013-2099.patch b/extra/python/python-3.3.2-CVE-2013-2099.patch
deleted file mode 100644
index 888b43b00..000000000
--- a/extra/python/python-3.3.2-CVE-2013-2099.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-# HG changeset patch
-# User Antoine Pitrou <solipsis@pitrou.net>
-# Date 1368892602 -7200
-# Node ID c627638753e2d25a98950585b259104a025937a9
-# Parent 9682241dc8fcb4b1aef083bd30860efa070c3d6d
-Issue #17980: Fix possible abuse of ssl.match_hostname() for denial of service using certificates with many wildcards (CVE-2013-2099).
-
-diff --git a/Lib/ssl.py b/Lib/ssl.py
---- a/Lib/ssl.py
-+++ b/Lib/ssl.py
-@@ -129,9 +129,16 @@ class CertificateError(ValueError):
- pass
-
-
--def _dnsname_to_pat(dn):
-+def _dnsname_to_pat(dn, max_wildcards=1):
- pats = []
- for frag in dn.split(r'.'):
-+ if frag.count('*') > max_wildcards:
-+ # Issue #17980: avoid denials of service by refusing more
-+ # than one wildcard per fragment. A survery of established
-+ # policy among SSL implementations showed it to be a
-+ # reasonable choice.
-+ raise CertificateError(
-+ "too many wildcards in certificate DNS name: " + repr(dn))
- if frag == '*':
- # When '*' is a fragment by itself, it matches a non-empty dotless
- # fragment.
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -349,6 +349,17 @@ class BasicSocketTests(unittest.TestCase
- self.assertRaises(ValueError, ssl.match_hostname, None, 'example.com')
- self.assertRaises(ValueError, ssl.match_hostname, {}, 'example.com')
-
-+ # Issue #17980: avoid denials of service by refusing more than one
-+ # wildcard per fragment.
-+ cert = {'subject': ((('commonName', 'a*b.com'),),)}
-+ ok(cert, 'axxb.com')
-+ cert = {'subject': ((('commonName', 'a*b.co*'),),)}
-+ ok(cert, 'axxb.com')
-+ cert = {'subject': ((('commonName', 'a*b*.com'),),)}
-+ with self.assertRaises(ssl.CertificateError) as cm:
-+ ssl.match_hostname(cert, 'axxbxxc.com')
-+ self.assertIn("too many wildcards", str(cm.exception))
-+
- def test_server_side(self):
- # server_hostname doesn't work for server sockets
- ctx = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
diff --git a/extra/python/python-3.3.2-CVE-2013-4238.patch b/extra/python/python-3.3.2-CVE-2013-4238.patch
deleted file mode 100644
index 2de2ed47f..000000000
--- a/extra/python/python-3.3.2-CVE-2013-4238.patch
+++ /dev/null
@@ -1,255 +0,0 @@
-
-# HG changeset patch
-# User Christian Heimes <christian@cheimes.de>
-# Date 1376693687 -7200
-# Node ID c9f073e593b037e8a29e386326859537691bcf62
-# Parent 3105b78d34346ea36c52a3b7e635954f4b444120
-Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
-inside subjectAltName correctly. Formerly the module has used OpenSSL's
-GENERAL_NAME_print() function to get the string represention of ASN.1
-strings for rfc822Name (email), dNSName (DNS) and
-uniformResourceIdentifier (URI).
-
-diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem
-new file mode 100644
---- /dev/null
-+++ b/Lib/test/nullbytecert.pem
-@@ -0,0 +1,90 @@
-+Certificate:
-+ Data:
-+ Version: 3 (0x2)
-+ Serial Number: 0 (0x0)
-+ Signature Algorithm: sha1WithRSAEncryption
-+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
-+ Validity
-+ Not Before: Aug 7 13:11:52 2013 GMT
-+ Not After : Aug 7 13:12:52 2013 GMT
-+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
-+ Subject Public Key Info:
-+ Public Key Algorithm: rsaEncryption
-+ Public-Key: (2048 bit)
-+ Modulus:
-+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
-+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
-+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
-+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
-+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
-+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
-+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
-+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
-+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
-+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
-+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
-+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
-+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
-+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
-+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
-+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
-+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
-+ 2f:85
-+ Exponent: 65537 (0x10001)
-+ X509v3 extensions:
-+ X509v3 Basic Constraints: critical
-+ CA:FALSE
-+ X509v3 Subject Key Identifier:
-+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
-+ X509v3 Key Usage:
-+ Digital Signature, Non Repudiation, Key Encipherment
-+ X509v3 Subject Alternative Name:
-+ *************************************************************
-+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL
-+ doesn't print the text after a NULL byte.
-+ *************************************************************
-+ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
-+ Signature Algorithm: sha1WithRSAEncryption
-+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
-+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
-+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
-+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
-+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
-+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
-+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
-+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
-+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
-+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
-+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
-+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
-+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
-+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
-+ c1:ca:a9:94
-+-----BEGIN CERTIFICATE-----
-+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
-+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
-+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
-+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
-+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
-+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
-+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
-+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
-+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
-+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
-+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
-+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
-+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
-+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
-+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
-+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
-+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
-+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
-+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
-+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
-+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
-+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
-+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
-+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
-+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
-+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
-+-----END CERTIFICATE-----
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -55,6 +55,7 @@ BADCERT = data_file("badcert.pem")
- WRONGCERT = data_file("XXXnonexisting.pem")
- BADKEY = data_file("badkey.pem")
- NOKIACERT = data_file("nokia.pem")
-+NULLBYTECERT = data_file("nullbytecert.pem")
-
- DHFILE = data_file("dh512.pem")
- BYTES_DHFILE = os.fsencode(DHFILE)
-@@ -162,6 +163,27 @@ class BasicSocketTests(unittest.TestCase
- ('DNS', 'projects.forum.nokia.com'))
- )
-
-+ def test_parse_cert_CVE_2013_4238(self):
-+ p = ssl._ssl._test_decode_cert(NULLBYTECERT)
-+ if support.verbose:
-+ sys.stdout.write("\n" + pprint.pformat(p) + "\n")
-+ subject = ((('countryName', 'US'),),
-+ (('stateOrProvinceName', 'Oregon'),),
-+ (('localityName', 'Beaverton'),),
-+ (('organizationName', 'Python Software Foundation'),),
-+ (('organizationalUnitName', 'Python Core Development'),),
-+ (('commonName', 'null.python.org\x00example.org'),),
-+ (('emailAddress', 'python-dev@python.org'),))
-+ self.assertEqual(p['subject'], subject)
-+ self.assertEqual(p['issuer'], subject)
-+ self.assertEqual(p['subjectAltName'],
-+ (('DNS', 'altnull.python.org\x00example.com'),
-+ ('email', 'null@python.org\x00user@example.org'),
-+ ('URI', 'http://null.python.org\x00http://example.org'),
-+ ('IP Address', '192.0.2.1'),
-+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
-+ )
-+
- def test_DER_to_PEM(self):
- with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
- pem = f.read()
-@@ -294,6 +316,13 @@ class BasicSocketTests(unittest.TestCase
- fail(cert, 'foo.a.com')
- fail(cert, 'bar.foo.com')
-
-+ # NULL bytes are bad, CVE-2013-4073
-+ cert = {'subject': ((('commonName',
-+ 'null.python.org\x00example.org'),),)}
-+ ok(cert, 'null.python.org\x00example.org') # or raise an error?
-+ fail(cert, 'example.org')
-+ fail(cert, 'null.python.org')
-+
- # Slightly fake real-world example
- cert = {'notAfter': 'Jun 26 21:41:46 2011 GMT',
- 'subject': ((('commonName', 'linuxfrz.org'),),),
-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
---- a/Modules/_ssl.c
-+++ b/Modules/_ssl.c
-@@ -771,12 +771,14 @@ static PyObject *
- ext->value->length));
-
- for(j = 0; j < sk_GENERAL_NAME_num(names); j++) {
--
- /* get a rendering of each name in the set of names */
-+ int gntype;
-+ ASN1_STRING *as = NULL;
-
- name = sk_GENERAL_NAME_value(names, j);
-- if (name->type == GEN_DIRNAME) {
--
-+ gntype = name-> type;
-+ switch (gntype) {
-+ case GEN_DIRNAME:
- /* we special-case DirName as a tuple of
- tuples of attributes */
-
-@@ -798,11 +800,62 @@ static PyObject *
- goto fail;
- }
- PyTuple_SET_ITEM(t, 1, v);
-+ break;
-
-- } else {
-+ case GEN_EMAIL:
-+ case GEN_DNS:
-+ case GEN_URI:
-+ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string
-+ correctly, CVE-2013-4238 */
-+ t = PyTuple_New(2);
-+ if (t == NULL)
-+ goto fail;
-+ switch (gntype) {
-+ case GEN_EMAIL:
-+ v = PyUnicode_FromString("email");
-+ as = name->d.rfc822Name;
-+ break;
-+ case GEN_DNS:
-+ v = PyUnicode_FromString("DNS");
-+ as = name->d.dNSName;
-+ break;
-+ case GEN_URI:
-+ v = PyUnicode_FromString("URI");
-+ as = name->d.uniformResourceIdentifier;
-+ break;
-+ }
-+ if (v == NULL) {
-+ Py_DECREF(t);
-+ goto fail;
-+ }
-+ PyTuple_SET_ITEM(t, 0, v);
-+ v = PyUnicode_FromStringAndSize((char *)ASN1_STRING_data(as),
-+ ASN1_STRING_length(as));
-+ if (v == NULL) {
-+ Py_DECREF(t);
-+ goto fail;
-+ }
-+ PyTuple_SET_ITEM(t, 1, v);
-+ break;
-
-+ default:
- /* for everything else, we use the OpenSSL print form */
--
-+ switch (gntype) {
-+ /* check for new general name type */
-+ case GEN_OTHERNAME:
-+ case GEN_X400:
-+ case GEN_EDIPARTY:
-+ case GEN_IPADD:
-+ case GEN_RID:
-+ break;
-+ default:
-+ if (PyErr_WarnFormat(PyExc_RuntimeWarning, 1,
-+ "Unknown general name type %d",
-+ gntype) == -1) {
-+ goto fail;
-+ }
-+ break;
-+ }
- (void) BIO_reset(biobuf);
- GENERAL_NAME_print(biobuf, name);
- len = BIO_gets(biobuf, buf, sizeof(buf)-1);
-@@ -829,6 +882,7 @@ static PyObject *
- goto fail;
- }
- PyTuple_SET_ITEM(t, 1, v);
-+ break;
- }
-
- /* and add that rendering to the list */
-
diff --git a/extra/python2/PKGBUILD b/extra/python2/PKGBUILD
index 15770f376..b6bd4cd78 100644
--- a/extra/python2/PKGBUILD
+++ b/extra/python2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 193929 2013-09-06 08:06:17Z bpiotrowski $
+# $Id: PKGBUILD 200588 2013-11-29 15:17:25Z angvp $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributer: Allan McRae <allan@archlinux.org>
# Contributer: Jason Chu <jason@archlinux.org>
pkgname=python2
-pkgver=2.7.5
-pkgrel=2
+pkgver=2.7.6
+pkgrel=1
_pybasever=2.7
pkgdesc="A high-level scripting language"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,17 +16,12 @@ makedepends=('tk>=8.6.0' 'bluez-libs')
optdepends=('tk: for IDLE')
conflicts=('python<3')
options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
- python-2.7.5-CVE-2013-4238.patch)
-sha1sums=('b7389791f789625c2ba9d897aa324008ff482daf'
- 'fb1f95ca21d9c00eaaea5a58236d1d97300482d7')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80')
prepare() {
cd "${srcdir}/Python-${pkgver}"
- # http://bugs.python.org/issue18709
- patch -Np1 -i ../python-2.7.5-CVE-2013-4238.patch
-
# Temporary workaround for FS#22322
# See http://bugs.python.org/issue10835 for upstream report
sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
@@ -86,9 +81,12 @@ package() {
mv "${pkgdir}"/usr/bin/2to3{,-2.7}
# clean up #!s
- find "${pkgdir}"/usr/lib/python${_pybasever}/ -name '*.py' | \
+ find . -name '*.py' | \
xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+ # Workaround asdl_c.py error
+ touch Include/Python-ast.h Python/Python-ast.c
+
# clean-up reference to build directory
sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile
diff --git a/extra/python2/python-2.7.5-CVE-2013-4238.patch b/extra/python2/python-2.7.5-CVE-2013-4238.patch
deleted file mode 100644
index c37190182..000000000
--- a/extra/python2/python-2.7.5-CVE-2013-4238.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-
-# HG changeset patch
-# User Christian Heimes <christian@cheimes.de>
-# Date 1376693687 -7200
-# Node ID bd2360476bdbb1477b81b0e18b8d86b3452ba77b
-# Parent 87fcc13ade91874971ad577efaa2254c744a2b07
-Issue #18709: Fix CVE-2013-4238. The SSL module now handles NULL bytes
-inside subjectAltName correctly. Formerly the module has used OpenSSL's
-GENERAL_NAME_print() function to get the string represention of ASN.1
-strings for rfc822Name (email), dNSName (DNS) and
-uniformResourceIdentifier (URI).
-
-diff --git a/Lib/test/nullbytecert.pem b/Lib/test/nullbytecert.pem
-new file mode 100644
---- /dev/null
-+++ b/Lib/test/nullbytecert.pem
-@@ -0,0 +1,90 @@
-+Certificate:
-+ Data:
-+ Version: 3 (0x2)
-+ Serial Number: 0 (0x0)
-+ Signature Algorithm: sha1WithRSAEncryption
-+ Issuer: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
-+ Validity
-+ Not Before: Aug 7 13:11:52 2013 GMT
-+ Not After : Aug 7 13:12:52 2013 GMT
-+ Subject: C=US, ST=Oregon, L=Beaverton, O=Python Software Foundation, OU=Python Core Development, CN=null.python.org\x00example.org/emailAddress=python-dev@python.org
-+ Subject Public Key Info:
-+ Public Key Algorithm: rsaEncryption
-+ Public-Key: (2048 bit)
-+ Modulus:
-+ 00:b5:ea:ed:c9:fb:46:7d:6f:3b:76:80:dd:3a:f3:
-+ 03:94:0b:a7:a6:db:ec:1d:df:ff:23:74:08:9d:97:
-+ 16:3f:a3:a4:7b:3e:1b:0e:96:59:25:03:a7:26:e2:
-+ 88:a9:cf:79:cd:f7:04:56:b0:ab:79:32:6e:59:c1:
-+ 32:30:54:eb:58:a8:cb:91:f0:42:a5:64:27:cb:d4:
-+ 56:31:88:52:ad:cf:bd:7f:f0:06:64:1f:cc:27:b8:
-+ a3:8b:8c:f3:d8:29:1f:25:0b:f5:46:06:1b:ca:02:
-+ 45:ad:7b:76:0a:9c:bf:bb:b9:ae:0d:16:ab:60:75:
-+ ae:06:3e:9c:7c:31:dc:92:2f:29:1a:e0:4b:0c:91:
-+ 90:6c:e9:37:c5:90:d7:2a:d7:97:15:a3:80:8f:5d:
-+ 7b:49:8f:54:30:d4:97:2c:1c:5b:37:b5:ab:69:30:
-+ 68:43:d3:33:78:4b:02:60:f5:3c:44:80:a1:8f:e7:
-+ f0:0f:d1:5e:87:9e:46:cf:62:fc:f9:bf:0c:65:12:
-+ f1:93:c8:35:79:3f:c8:ec:ec:47:f5:ef:be:44:d5:
-+ ae:82:1e:2d:9a:9f:98:5a:67:65:e1:74:70:7c:cb:
-+ d3:c2:ce:0e:45:49:27:dc:e3:2d:d4:fb:48:0e:2f:
-+ 9e:77:b8:14:46:c0:c4:36:ca:02:ae:6a:91:8c:da:
-+ 2f:85
-+ Exponent: 65537 (0x10001)
-+ X509v3 extensions:
-+ X509v3 Basic Constraints: critical
-+ CA:FALSE
-+ X509v3 Subject Key Identifier:
-+ 88:5A:55:C0:52:FF:61:CD:52:A3:35:0F:EA:5A:9C:24:38:22:F7:5C
-+ X509v3 Key Usage:
-+ Digital Signature, Non Repudiation, Key Encipherment
-+ X509v3 Subject Alternative Name:
-+ *************************************************************
-+ WARNING: The values for DNS, email and URI are WRONG. OpenSSL
-+ doesn't print the text after a NULL byte.
-+ *************************************************************
-+ DNS:altnull.python.org, email:null@python.org, URI:http://null.python.org, IP Address:192.0.2.1, IP Address:2001:DB8:0:0:0:0:0:1
-+ Signature Algorithm: sha1WithRSAEncryption
-+ ac:4f:45:ef:7d:49:a8:21:70:8e:88:59:3e:d4:36:42:70:f5:
-+ a3:bd:8b:d7:a8:d0:58:f6:31:4a:b1:a4:a6:dd:6f:d9:e8:44:
-+ 3c:b6:0a:71:d6:7f:b1:08:61:9d:60:ce:75:cf:77:0c:d2:37:
-+ 86:02:8d:5e:5d:f9:0f:71:b4:16:a8:c1:3d:23:1c:f1:11:b3:
-+ 56:6e:ca:d0:8d:34:94:e6:87:2a:99:f2:ae:ae:cc:c2:e8:86:
-+ de:08:a8:7f:c5:05:fa:6f:81:a7:82:e6:d0:53:9d:34:f4:ac:
-+ 3e:40:fe:89:57:7a:29:a4:91:7e:0b:c6:51:31:e5:10:2f:a4:
-+ 60:76:cd:95:51:1a:be:8b:a1:b0:fd:ad:52:bd:d7:1b:87:60:
-+ d2:31:c7:17:c4:18:4f:2d:08:25:a3:a7:4f:b7:92:ca:e2:f5:
-+ 25:f1:54:75:81:9d:b3:3d:61:a2:f7:da:ed:e1:c6:6f:2c:60:
-+ 1f:d8:6f:c5:92:05:ab:c9:09:62:49:a9:14:ad:55:11:cc:d6:
-+ 4a:19:94:99:97:37:1d:81:5f:8b:cf:a3:a8:96:44:51:08:3d:
-+ 0b:05:65:12:eb:b6:70:80:88:48:72:4f:c6:c2:da:cf:cd:8e:
-+ 5b:ba:97:2f:60:b4:96:56:49:5e:3a:43:76:63:04:be:2a:f6:
-+ c1:ca:a9:94
-+-----BEGIN CERTIFICATE-----
-+MIIE2DCCA8CgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBxTELMAkGA1UEBhMCVVMx
-+DzANBgNVBAgMBk9yZWdvbjESMBAGA1UEBwwJQmVhdmVydG9uMSMwIQYDVQQKDBpQ
-+eXRob24gU29mdHdhcmUgRm91bmRhdGlvbjEgMB4GA1UECwwXUHl0aG9uIENvcmUg
-+RGV2ZWxvcG1lbnQxJDAiBgNVBAMMG251bGwucHl0aG9uLm9yZwBleGFtcGxlLm9y
-+ZzEkMCIGCSqGSIb3DQEJARYVcHl0aG9uLWRldkBweXRob24ub3JnMB4XDTEzMDgw
-+NzEzMTE1MloXDTEzMDgwNzEzMTI1MlowgcUxCzAJBgNVBAYTAlVTMQ8wDQYDVQQI
-+DAZPcmVnb24xEjAQBgNVBAcMCUJlYXZlcnRvbjEjMCEGA1UECgwaUHl0aG9uIFNv
-+ZnR3YXJlIEZvdW5kYXRpb24xIDAeBgNVBAsMF1B5dGhvbiBDb3JlIERldmVsb3Bt
-+ZW50MSQwIgYDVQQDDBtudWxsLnB5dGhvbi5vcmcAZXhhbXBsZS5vcmcxJDAiBgkq
-+hkiG9w0BCQEWFXB5dGhvbi1kZXZAcHl0aG9uLm9yZzCCASIwDQYJKoZIhvcNAQEB
-+BQADggEPADCCAQoCggEBALXq7cn7Rn1vO3aA3TrzA5QLp6bb7B3f/yN0CJ2XFj+j
-+pHs+Gw6WWSUDpybiiKnPec33BFawq3kyblnBMjBU61ioy5HwQqVkJ8vUVjGIUq3P
-+vX/wBmQfzCe4o4uM89gpHyUL9UYGG8oCRa17dgqcv7u5rg0Wq2B1rgY+nHwx3JIv
-+KRrgSwyRkGzpN8WQ1yrXlxWjgI9de0mPVDDUlywcWze1q2kwaEPTM3hLAmD1PESA
-+oY/n8A/RXoeeRs9i/Pm/DGUS8ZPINXk/yOzsR/XvvkTVroIeLZqfmFpnZeF0cHzL
-+08LODkVJJ9zjLdT7SA4vnne4FEbAxDbKAq5qkYzaL4UCAwEAAaOB0DCBzTAMBgNV
-+HRMBAf8EAjAAMB0GA1UdDgQWBBSIWlXAUv9hzVKjNQ/qWpwkOCL3XDALBgNVHQ8E
-+BAMCBeAwgZAGA1UdEQSBiDCBhYIeYWx0bnVsbC5weXRob24ub3JnAGV4YW1wbGUu
-+Y29tgSBudWxsQHB5dGhvbi5vcmcAdXNlckBleGFtcGxlLm9yZ4YpaHR0cDovL251
-+bGwucHl0aG9uLm9yZwBodHRwOi8vZXhhbXBsZS5vcmeHBMAAAgGHECABDbgAAAAA
-+AAAAAAAAAAEwDQYJKoZIhvcNAQEFBQADggEBAKxPRe99SaghcI6IWT7UNkJw9aO9
-+i9eo0Fj2MUqxpKbdb9noRDy2CnHWf7EIYZ1gznXPdwzSN4YCjV5d+Q9xtBaowT0j
-+HPERs1ZuytCNNJTmhyqZ8q6uzMLoht4IqH/FBfpvgaeC5tBTnTT0rD5A/olXeimk
-+kX4LxlEx5RAvpGB2zZVRGr6LobD9rVK91xuHYNIxxxfEGE8tCCWjp0+3ksri9SXx
-+VHWBnbM9YaL32u3hxm8sYB/Yb8WSBavJCWJJqRStVRHM1koZlJmXNx2BX4vPo6iW
-+RFEIPQsFZRLrtnCAiEhyT8bC2s/Njlu6ly9gtJZWSV46Q3ZjBL4q9sHKqZQ=
-+-----END CERTIFICATE-----
-diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
---- a/Lib/test/test_ssl.py
-+++ b/Lib/test/test_ssl.py
-@@ -25,6 +25,7 @@ ssl = test_support.import_module("ssl")
- HOST = test_support.HOST
- CERTFILE = None
- SVN_PYTHON_ORG_ROOT_CERT = None
-+NULLBYTECERT = None
-
- def handle_error(prefix):
- exc_format = ' '.join(traceback.format_exception(*sys.exc_info()))
-@@ -123,6 +124,27 @@ class BasicSocketTests(unittest.TestCase
- ('DNS', 'projects.forum.nokia.com'))
- )
-
-+ def test_parse_cert_CVE_2013_4238(self):
-+ p = ssl._ssl._test_decode_cert(NULLBYTECERT)
-+ if test_support.verbose:
-+ sys.stdout.write("\n" + pprint.pformat(p) + "\n")
-+ subject = ((('countryName', 'US'),),
-+ (('stateOrProvinceName', 'Oregon'),),
-+ (('localityName', 'Beaverton'),),
-+ (('organizationName', 'Python Software Foundation'),),
-+ (('organizationalUnitName', 'Python Core Development'),),
-+ (('commonName', 'null.python.org\x00example.org'),),
-+ (('emailAddress', 'python-dev@python.org'),))
-+ self.assertEqual(p['subject'], subject)
-+ self.assertEqual(p['issuer'], subject)
-+ self.assertEqual(p['subjectAltName'],
-+ (('DNS', 'altnull.python.org\x00example.com'),
-+ ('email', 'null@python.org\x00user@example.org'),
-+ ('URI', 'http://null.python.org\x00http://example.org'),
-+ ('IP Address', '192.0.2.1'),
-+ ('IP Address', '2001:DB8:0:0:0:0:0:1\n'))
-+ )
-+
- def test_DER_to_PEM(self):
- with open(SVN_PYTHON_ORG_ROOT_CERT, 'r') as f:
- pem = f.read()
-@@ -1360,7 +1382,7 @@ else:
-
-
- def test_main(verbose=False):
-- global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT
-+ global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, NOKIACERT, NULLBYTECERT
- CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir,
- "keycert.pem")
- SVN_PYTHON_ORG_ROOT_CERT = os.path.join(
-@@ -1368,10 +1390,13 @@ def test_main(verbose=False):
- "https_svn_python_org_root.pem")
- NOKIACERT = os.path.join(os.path.dirname(__file__) or os.curdir,
- "nokia.pem")
-+ NULLBYTECERT = os.path.join(os.path.dirname(__file__) or os.curdir,
-+ "nullbytecert.pem")
-
- if (not os.path.exists(CERTFILE) or
- not os.path.exists(SVN_PYTHON_ORG_ROOT_CERT) or
-- not os.path.exists(NOKIACERT)):
-+ not os.path.exists(NOKIACERT) or
-+ not os.path.exists(NULLBYTECERT)):
- raise test_support.TestFailed("Can't read certificate files!")
-
- tests = [BasicTests, BasicSocketTests]
-diff --git a/Modules/_ssl.c b/Modules/_ssl.c
---- a/Modules/_ssl.c
-+++ b/Modules/_ssl.c
-@@ -738,13 +738,16 @@ static PyObject *
- ext->value->length));
-
- for(j = 0; j < sk_GENERAL_NAME_num(names); j++) {
--
- /* get a rendering of each name in the set of names */
-+ int gntype;
-+ ASN1_STRING *as = NULL;
-
- name = sk_GENERAL_NAME_value(names, j);
-- if (name->type == GEN_DIRNAME) {
--
-- /* we special-case DirName as a tuple of tuples of attributes */
-+ gntype = name-> type;
-+ switch (gntype) {
-+ case GEN_DIRNAME:
-+ /* we special-case DirName as a tuple of
-+ tuples of attributes */
-
- t = PyTuple_New(2);
- if (t == NULL) {
-@@ -764,11 +767,61 @@ static PyObject *
- goto fail;
- }
- PyTuple_SET_ITEM(t, 1, v);
-+ break;
-
-- } else {
-+ case GEN_EMAIL:
-+ case GEN_DNS:
-+ case GEN_URI:
-+ /* GENERAL_NAME_print() doesn't handle NULL bytes in ASN1_string
-+ correctly, CVE-2013-4238 */
-+ t = PyTuple_New(2);
-+ if (t == NULL)
-+ goto fail;
-+ switch (gntype) {
-+ case GEN_EMAIL:
-+ v = PyString_FromString("email");
-+ as = name->d.rfc822Name;
-+ break;
-+ case GEN_DNS:
-+ v = PyString_FromString("DNS");
-+ as = name->d.dNSName;
-+ break;
-+ case GEN_URI:
-+ v = PyString_FromString("URI");
-+ as = name->d.uniformResourceIdentifier;
-+ break;
-+ }
-+ if (v == NULL) {
-+ Py_DECREF(t);
-+ goto fail;
-+ }
-+ PyTuple_SET_ITEM(t, 0, v);
-+ v = PyString_FromStringAndSize((char *)ASN1_STRING_data(as),
-+ ASN1_STRING_length(as));
-+ if (v == NULL) {
-+ Py_DECREF(t);
-+ goto fail;
-+ }
-+ PyTuple_SET_ITEM(t, 1, v);
-+ break;
-
-+ default:
- /* for everything else, we use the OpenSSL print form */
--
-+ switch (gntype) {
-+ /* check for new general name type */
-+ case GEN_OTHERNAME:
-+ case GEN_X400:
-+ case GEN_EDIPARTY:
-+ case GEN_IPADD:
-+ case GEN_RID:
-+ break;
-+ default:
-+ if (PyErr_Warn(PyExc_RuntimeWarning,
-+ "Unknown general name type") == -1) {
-+ goto fail;
-+ }
-+ break;
-+ }
- (void) BIO_reset(biobuf);
- GENERAL_NAME_print(biobuf, name);
- len = BIO_gets(biobuf, buf, sizeof(buf)-1);
-@@ -794,6 +847,7 @@ static PyObject *
- goto fail;
- }
- PyTuple_SET_ITEM(t, 1, v);
-+ break;
- }
-
- /* and add that rendering to the list */
-
diff --git a/extra/qca-ossl/PKGBUILD b/extra/qca-ossl/PKGBUILD
index a804ec832..1270b7f1b 100644
--- a/extra/qca-ossl/PKGBUILD
+++ b/extra/qca-ossl/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=qca-ossl
pkgver=2.0.0
_pkgver=2.0.0-beta3
-pkgrel=6
+pkgrel=7
pkgdesc="Qt Cryptographic Architecture"
arch=('i686' 'x86_64' 'mips64el')
url="http://delta.affinix.com/qca/"
@@ -12,13 +12,18 @@ license=('LGPL')
depends=('qca')
makedepends=('icu')
source=("http://delta.affinix.com/download/qca/2.0/plugins/${pkgname}-${_pkgver}.tar.bz2"
- 'no-whirlpool.patch')
+ 'qca-ossl-openssl-1.0.0.patch')
md5sums=('bdc62c01321385c7da8d27b3902910ce'
- '1be7ee2e5f32733b90452fb46b9c69f9')
+ '3b443b8e0347cf3cdf8f6c70e519a18f')
+
+prepare() {
+ cd $srcdir/${pkgname}-${_pkgver}
+ # Patch by Gentoo
+ patch -p1 -i $srcdir/qca-ossl-openssl-1.0.0.patch
+}
build() {
cd $srcdir/${pkgname}-${_pkgver}
- patch -p1 -i $srcdir/no-whirlpool.patch
./configure \
--release \
--no-separate-debug-info
diff --git a/extra/qca-ossl/no-whirlpool.patch b/extra/qca-ossl/no-whirlpool.patch
deleted file mode 100644
index 609ea61f2..000000000
--- a/extra/qca-ossl/no-whirlpool.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up qca-ossl-2.0.0-beta3/qca-ossl.cpp.no-whirlpool qca-ossl-2.0.0-beta3/qca-ossl.cpp
---- qca-ossl-2.0.0-beta3/qca-ossl.cpp.no-whirlpool 2007-12-11 07:34:57.000000000 +0100
-+++ qca-ossl-2.0.0-beta3/qca-ossl.cpp 2009-01-26 14:59:42.000000000 +0100
-@@ -6597,7 +6597,7 @@ static QStringList all_hash_types()
- #ifdef SHA512_DIGEST_LENGTH
- list += "sha512";
- #endif
--#ifdef OBJ_whirlpool
-+#ifdef WHIRLPOOL_DIGEST_LENGTH
- list += "whirlpool";
- #endif
- return list;
-@@ -6810,7 +6810,7 @@ public:
- else if ( type == "sha512" )
- return new opensslHashContext( EVP_sha512(), this, type);
- #endif
--#ifdef OBJ_whirlpool
-+#ifdef WHIRLPOOL_DIGEST_LENGTH
- else if ( type == "whirlpool" )
- return new opensslHashContext( EVP_whirlpool(), this, type);
- #endif
diff --git a/extra/qca-ossl/qca-ossl-openssl-1.0.0.patch b/extra/qca-ossl/qca-ossl-openssl-1.0.0.patch
new file mode 100644
index 000000000..c7d6e47b1
--- /dev/null
+++ b/extra/qca-ossl/qca-ossl-openssl-1.0.0.patch
@@ -0,0 +1,155 @@
+diff -ru a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2007-06-29 23:10:53.000000000 +0200
++++ b/CMakeLists.txt 2010-04-18 04:05:09.000000000 +0200
+@@ -1,5 +1,12 @@
+ # QCA OSSL
+
++INCLUDE(CheckFunctionExists)
++SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
++CHECK_FUNCTION_EXISTS(EVP_md2 HAVE_OPENSSL_MD2)
++IF (HAVE_OPENSSL_MD2)
++ ADD_DEFINITIONS(-DHAVE_OPENSSL_MD2)
++ENDIF (HAVE_OPENSSL_MD2)
++
+ SET(QCA_OSSL_SOURCES qca-ossl.cpp)
+
+ MY_AUTOMOC( QCA_OSSL_SOURCES )
+diff -ru a/qca-ossl.cpp b/qca-ossl.cpp
+--- a/qca-ossl.cpp 2007-12-11 07:34:57.000000000 +0100
++++ b/qca-ossl.cpp 2010-04-18 04:08:46.000000000 +0200
+@@ -42,6 +42,15 @@
+ #define OSSL_097
+ #endif
+
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
++// OpenSSL 1.0.0 makes a few changes that aren't very C++ friendly...
++// Among other things, CHECKED_PTR_OF returns a void*, but is used in
++// contexts requiring STACK pointers.
++#undef CHECKED_PTR_OF
++#define CHECKED_PTR_OF(type, p) \
++ ((_STACK*) (1 ? p : (type*)0))
++#endif
++
+ using namespace QCA;
+
+ namespace opensslQCAPlugin {
+@@ -1771,8 +1780,10 @@
+ md = EVP_sha1();
+ else if(alg == EMSA3_MD5)
+ md = EVP_md5();
++#ifdef HAVE_OPENSSL_MD2
+ else if(alg == EMSA3_MD2)
+ md = EVP_md2();
++#endif
+ else if(alg == EMSA3_RIPEMD160)
+ md = EVP_ripemd160();
+ else if(alg == EMSA3_Raw)
+@@ -1789,8 +1800,10 @@
+ md = EVP_sha1();
+ else if(alg == EMSA3_MD5)
+ md = EVP_md5();
++#ifdef HAVE_OPENSSL_MD2
+ else if(alg == EMSA3_MD2)
+ md = EVP_md2();
++#endif
+ else if(alg == EMSA3_RIPEMD160)
+ md = EVP_ripemd160();
+ else if(alg == EMSA3_Raw)
+@@ -3385,9 +3398,11 @@
+ case NID_md5WithRSAEncryption:
+ p.sigalgo = QCA::EMSA3_MD5;
+ break;
++#ifdef HAVE_OPENSSL_MD2
+ case NID_md2WithRSAEncryption:
+ p.sigalgo = QCA::EMSA3_MD2;
+ break;
++#endif
+ case NID_ripemd160WithRSA:
+ p.sigalgo = QCA::EMSA3_RIPEMD160;
+ break;
+@@ -3871,9 +3886,11 @@
+ case NID_md5WithRSAEncryption:
+ p.sigalgo = QCA::EMSA3_MD5;
+ break;
++#ifdef HAVE_OPENSSL_MD2
+ case NID_md2WithRSAEncryption:
+ p.sigalgo = QCA::EMSA3_MD2;
+ break;
++#endif
+ case NID_ripemd160WithRSA:
+ p.sigalgo = QCA::EMSA3_RIPEMD160;
+ break;
+@@ -4061,9 +4078,11 @@
+ case NID_md5WithRSAEncryption:
+ p.sigalgo = QCA::EMSA3_MD5;
+ break;
++#ifdef HAVE_OPENSSL_MD2
+ case NID_md2WithRSAEncryption:
+ p.sigalgo = QCA::EMSA3_MD2;
+ break;
++#endif
+ case NID_ripemd160WithRSA:
+ p.sigalgo = QCA::EMSA3_RIPEMD160;
+ break;
+@@ -6582,7 +6601,9 @@
+ list += "sha1";
+ list += "sha0";
+ list += "ripemd160";
++#ifdef HAVE_OPENSSL_MD2
+ list += "md2";
++#endif
+ list += "md4";
+ list += "md5";
+ #ifdef SHA224_DIGEST_LENGTH
+@@ -6597,9 +6618,11 @@
+ #ifdef SHA512_DIGEST_LENGTH
+ list += "sha512";
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ list += "whirlpool";
+ #endif
++*/
+ return list;
+ }
+
+@@ -6757,7 +6780,9 @@
+ list += all_hash_types();
+ list += all_mac_types();
+ list += all_cipher_types();
++#ifdef HAVE_OPENSSL_MD2
+ list += "pbkdf1(md2)";
++#endif
+ list += "pbkdf1(sha1)";
+ list += "pbkdf2(sha1)";
+ list += "pkey";
+@@ -6788,8 +6813,10 @@
+ return new opensslHashContext( EVP_sha(), this, type);
+ else if ( type == "ripemd160" )
+ return new opensslHashContext( EVP_ripemd160(), this, type);
++#ifdef HAVE_OPENSSL_MD2
+ else if ( type == "md2" )
+ return new opensslHashContext( EVP_md2(), this, type);
++#endif
+ else if ( type == "md4" )
+ return new opensslHashContext( EVP_md4(), this, type);
+ else if ( type == "md5" )
+@@ -6810,14 +6837,18 @@
+ else if ( type == "sha512" )
+ return new opensslHashContext( EVP_sha512(), this, type);
+ #endif
++/*
+ #ifdef OBJ_whirlpool
+ else if ( type == "whirlpool" )
+ return new opensslHashContext( EVP_whirlpool(), this, type);
+ #endif
++*/
+ else if ( type == "pbkdf1(sha1)" )
+ return new opensslPbkdf1Context( EVP_sha1(), this, type );
++#ifdef HAVE_OPENSSL_MD2
+ else if ( type == "pbkdf1(md2)" )
+ return new opensslPbkdf1Context( EVP_md2(), this, type );
++#endif
+ else if ( type == "pbkdf2(sha1)" )
+ return new opensslPbkdf2Context( this, type );
+ else if ( type == "hmac(md5)" )
diff --git a/extra/qemu/PKGBUILD b/extra/qemu/PKGBUILD
index 127fb2afc..6c086ad03 100644
--- a/extra/qemu/PKGBUILD
+++ b/extra/qemu/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 198649 2013-11-01 08:14:43Z thomas $
+# $Id: PKGBUILD 201269 2013-12-07 10:40:12Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=('qemu' 'libcacard')
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.7.0
+pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2' 'LGPL2.1')
url="http://wiki.qemu.org/Index.html"
@@ -16,8 +16,6 @@ makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2')
replaces=('qemu-kvm')
options=(!strip)
-md5sums=('3a897d722457c5a895cd6ac79a28fda0'
- '33ab286a20242dda7743a900f369d68a')
build ()
{
@@ -28,7 +26,7 @@ build ()
# gtk gui breaks keymappings at the moment
./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
--python=/usr/bin/python2 --smbd=/usr/bin/smbd \
- --enable-docs --enable-mixemu --libexecdir=/usr/lib/qemu \
+ --enable-docs --libexecdir=/usr/lib/qemu \
--disable-gtk --enable-linux-aio --enable-seccomp \
--enable-spice --localstatedir=/var
make V=99
@@ -82,3 +80,5 @@ package_libcacard() {
cp -a ${srcdir}/qemu-${pkgver}/libcacard.pc ${pkgdir}/usr/lib/pkgconfig/
cp -a ${srcdir}/qemu-${pkgver}/.libs/vscclient ${pkgdir}/usr/bin/
}
+md5sums=('32893941d40d052a5e649efcf06aca06'
+ '33ab286a20242dda7743a900f369d68a')
diff --git a/extra/qpdf/PKGBUILD b/extra/qpdf/PKGBUILD
index 9d9682af7..9a0664d63 100644
--- a/extra/qpdf/PKGBUILD
+++ b/extra/qpdf/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198391 2013-10-30 14:35:14Z allan $
+# $Id: PKGBUILD 202244 2013-12-20 19:54:40Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Miguel Revilla <yo at miguelrevilla.com>
# Contributor: David Sotelo <dvsotelo at gmail.com>
# Contributor: Nuno Araujo <nuno.araujo@russo79.com>
pkgname=qpdf
-pkgver=5.0.1
+pkgver=5.1.0
pkgrel=1
pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,21 +14,21 @@ license=('custom:Artistic-2.0')
depends=('pcre' 'perl')
makedepends=('make')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6efd89c18461cb73f77bb60cb2da4bce')
+md5sums=('7c614bdb5f8610427c5dc0b494cabc0e')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr --disable-static
make
}
check() {
- cd "$srcdir/$pkgname-$pkgver"
+ cd $pkgname-$pkgver
make -k check
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}/" install
mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname}
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 99e8cfb6d..30703ad59 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,29 +1,31 @@
-# $Id: PKGBUILD 193634 2013-08-26 13:32:44Z andrea $
+# $Id: PKGBUILD 199276 2013-11-09 07:16:28Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
pkgbase=qscintilla
pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
'python-qscintilla-common')
-pkgver=2.7.2
-pkgrel=3
+pkgver=2.8
+pkgrel=1
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
makedepends=('python2-pyqt4' 'python-pyqt4' 'chrpath')
source=("http://downloads.sourceforge.net/pyqt/QScintilla-gpl-${pkgver}.tar.gz"
'configure.py-objdir-support.diff')
-md5sums=('0fbfb06078f206a241a62c94861cce21'
+md5sums=('02c406d8cd5db661f127303e91775c0b'
'eae1bd23117c5f1f7f172a1c1e11f600')
-build() {
- cd "${srcdir}/QScintilla-gpl-${pkgver}"
+prepare() {
+ cd QScintilla-gpl-${pkgver}
patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
+}
- cd Qt4Qt5
+build() {
+ cd QScintilla-gpl-${pkgver}/Qt4Qt5
qmake-qt4 qscintilla.pro
make
-
+
cd ../designer-Qt4Qt5
qmake-qt4 designer.pro INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5
make
@@ -36,17 +38,17 @@ build() {
cd ../Python2
python2 configure.py -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c --qmake /usr/bin/qmake-qt4
- make
+ make
}
package_qscintilla() {
pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
depends=('qt4')
- cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
+ cd QScintilla-gpl-${pkgver}/Qt4Qt5
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
- cd "${srcdir}/QScintilla-gpl-${pkgver}/designer-Qt4Qt5"
+ cd ../designer-Qt4Qt5
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
}
@@ -54,27 +56,27 @@ package_python-qscintilla-common() {
pkgdesc="Common python qscintilla bindings files shared between python-qscintilla and python2-qscintilla"
depends=('qscintilla')
- cd "${srcdir}/QScintilla-gpl-${pkgver}"/Python
+ cd QScintilla-gpl-${pkgver}/Python
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
+
# Provided by python-qscintilla
- rm "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
+ rm "${pkgdir}"/usr/lib/python3.3/site-packages/PyQt4/Qsci.so
}
package_python-qscintilla() {
pkgdesc="Python 3.x bindings for QScintilla2"
depends=('python-qscintilla-common' 'python-pyqt4')
- cd "${srcdir}/QScintilla-gpl-${pkgver}/Python"
+ cd QScintilla-gpl-${pkgver}/Python
install -Dm755 Qsci.so \
- "${pkgdir}/usr/lib/python3.3/site-packages/PyQt4/Qsci.so"
+ "${pkgdir}"/usr/lib/python3.3/site-packages/PyQt4/Qsci.so
}
package_python2-qscintilla() {
pkgdesc="Python 2.x bindings for QScintilla2"
depends=('python-qscintilla-common' 'python2-pyqt4')
- cd "${srcdir}/QScintilla-gpl-${pkgver}/Python2"
+ cd QScintilla-gpl-${pkgver}/Python2
install -Dm755 Qsci.so \
- "${pkgdir}/usr/lib/python2.7/site-packages/PyQt4/Qsci.so"
+ "${pkgdir}"/usr/lib/python2.7/site-packages/PyQt4/Qsci.so
}
diff --git a/extra/qt4/CVE-2013-4549.patch b/extra/qt4/CVE-2013-4549.patch
new file mode 100644
index 000000000..8084f4a41
--- /dev/null
+++ b/extra/qt4/CVE-2013-4549.patch
@@ -0,0 +1,233 @@
+From 512a1ce0698d370c313bb561bbf078935fa0342e Mon Sep 17 00:00:00 2001
+From: Mitch Curtis <mitch.curtis@digia.com>
+Date: Thu, 7 Nov 2013 09:36:29 +0100
+Subject: [PATCH] Disallow deep or widely nested entity references.
+
+Nested references with a depth of 2 or greater will fail. References
+that partially expand to greater than 1024 characters will also fail.
+
+This is a backport of 46a8885ae486e238a39efa5119c2714f328b08e4.
+
+Change-Id: I0c2e1fa13d6ccb5f88641dae2ed3f28bfdeaf609
+Reviewed-by: Richard J. Moore <rich@kde.org>
+Reviewed-by: Lars Knoll <lars.knoll@digia.com>
+
+From cecceb0cdd87482124a73ecf537f3445d68be13e Mon Sep 17 00:00:00 2001
+From: Mitch Curtis <mitch.curtis@digia.com>
+Date: Tue, 12 Nov 2013 13:44:56 +0100
+Subject: [PATCH] Fully expand entities to ensure deep or widely nested ones fail parsing
+
+With 512a1ce0698d370c313bb561bbf078935fa0342e, we failed when parsing
+entities whose partially expanded size was greater than 1024
+characters. That was not enough, so now we fully expand all entities.
+
+This is a backport of f1053d94f59f053ce4acad9320df14f1fbe4faac.
+
+Change-Id: I41dd6f4525c63e82fd320a22d19248169627f7e0
+Reviewed-by: Richard J. Moore <rich@kde.org>
+
+diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
+index a1777c5..3904632 100644
+--- a/src/xml/sax/qxml.cpp
++++ b/src/xml/sax/qxml.cpp
+@@ -424,6 +424,10 @@ private:
+ int stringValueLen;
+ QString emptyStr;
+
++ // The limit to the amount of times the DTD parsing functions can be called
++ // for the DTD currently being parsed.
++ int dtdRecursionLimit;
++
+ const QString &string();
+ void stringClear();
+ void stringAddC(QChar);
+@@ -492,6 +496,7 @@ private:
+ void unexpectedEof(ParseFunction where, int state);
+ void parseFailed(ParseFunction where, int state);
+ void pushParseState(ParseFunction function, int state);
++ bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage);
+
+ Q_DECLARE_PUBLIC(QXmlSimpleReader)
+ QXmlSimpleReader *q_ptr;
+@@ -2759,6 +2764,7 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
+ useNamespacePrefixes = false;
+ reportWhitespaceCharData = true;
+ reportEntities = false;
++ dtdRecursionLimit = 2;
+ }
+
+ QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate()
+@@ -5018,6 +5024,11 @@ bool QXmlSimpleReaderPrivate::parseDoctype()
+ }
+ break;
+ case Mup:
++ if (dtdRecursionLimit > 0 && parameterEntities.size() > dtdRecursionLimit) {
++ reportParseError(QString::fromLatin1(
++ "DTD parsing exceeded recursion limit of %1.").arg(dtdRecursionLimit));
++ return false;
++ }
+ if (!parseMarkupdecl()) {
+ parseFailed(&QXmlSimpleReaderPrivate::parseDoctype, state);
+ return false;
+@@ -6627,6 +6638,37 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq()
+ return false;
+ }
+
++bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage)
++{
++ const QString value = string();
++ QMap<QString, int> referencedEntityCounts;
++ foreach (QString entityName, entities.keys()) {
++ for (int i = 0; i < value.size() && i != -1; ) {
++ i = value.indexOf(entityName, i);
++ if (i != -1) {
++ // The entityName we're currently trying to find
++ // was matched in this string; increase our count.
++ ++referencedEntityCounts[entityName];
++ i += entityName.size();
++ }
++ }
++ }
++
++ foreach (QString entityName, referencedEntityCounts.keys()) {
++ const int timesReferenced = referencedEntityCounts[entityName];
++ const QString entityValue = entities[entityName];
++ if (entityValue.size() * timesReferenced > 1024) {
++ if (errorMessage) {
++ *errorMessage = QString::fromLatin1("The XML entity \"%1\""
++ "expands too a string that is too large to process when "
++ "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced);
++ }
++ return true;
++ }
++ }
++ return false;
++}
++
+ /*
+ Parse a EntityDecl [70].
+
+@@ -6721,6 +6763,15 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl()
+ switch (state) {
+ case EValue:
+ if ( !entityExist(name())) {
++ QString errorMessage;
++ if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) {
++ // The entity at entityName is entityValue.size() characters
++ // long in its unexpanded form, and was mentioned timesReferenced times,
++ // resulting in a string that would be greater than 1024 characters.
++ reportParseError(errorMessage);
++ return false;
++ }
++
+ entities.insert(name(), string());
+ if (declHnd) {
+ if (!declHnd->internalEntityDecl(name(), string())) {
+diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
+index 3904632..befa801 100644
+--- a/src/xml/sax/qxml.cpp
++++ b/src/xml/sax/qxml.cpp
+@@ -426,7 +426,9 @@ private:
+
+ // The limit to the amount of times the DTD parsing functions can be called
+ // for the DTD currently being parsed.
+- int dtdRecursionLimit;
++ static const int dtdRecursionLimit = 2;
++ // The maximum amount of characters an entity value may contain, after expansion.
++ static const int entityCharacterLimit = 1024;
+
+ const QString &string();
+ void stringClear();
+@@ -496,7 +498,7 @@ private:
+ void unexpectedEof(ParseFunction where, int state);
+ void parseFailed(ParseFunction where, int state);
+ void pushParseState(ParseFunction function, int state);
+- bool isPartiallyExpandedEntityValueTooLarge(QString *errorMessage);
++ bool isExpandedEntityValueTooLarge(QString *errorMessage);
+
+ Q_DECLARE_PUBLIC(QXmlSimpleReader)
+ QXmlSimpleReader *q_ptr;
+@@ -2764,7 +2766,6 @@ QXmlSimpleReaderPrivate::QXmlSimpleReaderPrivate(QXmlSimpleReader *reader)
+ useNamespacePrefixes = false;
+ reportWhitespaceCharData = true;
+ reportEntities = false;
+- dtdRecursionLimit = 2;
+ }
+
+ QXmlSimpleReaderPrivate::~QXmlSimpleReaderPrivate()
+@@ -6638,30 +6639,43 @@ bool QXmlSimpleReaderPrivate::parseChoiceSeq()
+ return false;
+ }
+
+-bool QXmlSimpleReaderPrivate::isPartiallyExpandedEntityValueTooLarge(QString *errorMessage)
++bool QXmlSimpleReaderPrivate::isExpandedEntityValueTooLarge(QString *errorMessage)
+ {
+- const QString value = string();
+- QMap<QString, int> referencedEntityCounts;
+- foreach (QString entityName, entities.keys()) {
+- for (int i = 0; i < value.size() && i != -1; ) {
+- i = value.indexOf(entityName, i);
+- if (i != -1) {
+- // The entityName we're currently trying to find
+- // was matched in this string; increase our count.
+- ++referencedEntityCounts[entityName];
+- i += entityName.size();
++ QMap<QString, int> literalEntitySizes;
++ // The entity at (QMap<QString,) referenced the entities at (QMap<QString,) (int>) times.
++ QMap<QString, QMap<QString, int> > referencesToOtherEntities;
++ QMap<QString, int> expandedSizes;
++
++ // For every entity, check how many times all entity names were referenced in its value.
++ foreach (QString toSearch, entities.keys()) {
++ // The amount of characters that weren't entity names, but literals, like 'X'.
++ QString leftOvers = entities.value(toSearch);
++ // How many times was entityName referenced by toSearch?
++ foreach (QString entityName, entities.keys()) {
++ for (int i = 0; i < leftOvers.size() && i != -1; ) {
++ i = leftOvers.indexOf(QString::fromLatin1("&%1;").arg(entityName), i);
++ if (i != -1) {
++ leftOvers.remove(i, entityName.size() + 2);
++ // The entityName we're currently trying to find was matched in this string; increase our count.
++ ++referencesToOtherEntities[toSearch][entityName];
++ }
+ }
+ }
++ literalEntitySizes[toSearch] = leftOvers.size();
+ }
+
+- foreach (QString entityName, referencedEntityCounts.keys()) {
+- const int timesReferenced = referencedEntityCounts[entityName];
+- const QString entityValue = entities[entityName];
+- if (entityValue.size() * timesReferenced > 1024) {
++ foreach (QString entity, referencesToOtherEntities.keys()) {
++ expandedSizes[entity] = literalEntitySizes[entity];
++ foreach (QString referenceTo, referencesToOtherEntities.value(entity).keys()) {
++ const int references = referencesToOtherEntities.value(entity).value(referenceTo);
++ // The total size of an entity's value is the expanded size of all of its referenced entities, plus its literal size.
++ expandedSizes[entity] += expandedSizes[referenceTo] * references + literalEntitySizes[referenceTo] * references;
++ }
++
++ if (expandedSizes[entity] > entityCharacterLimit) {
+ if (errorMessage) {
+- *errorMessage = QString::fromLatin1("The XML entity \"%1\""
+- "expands too a string that is too large to process when "
+- "referencing \"%2\" %3 times.").arg(entityName).arg(entityName).arg(timesReferenced);
++ *errorMessage = QString::fromLatin1("The XML entity \"%1\" expands too a string that is too large to process (%2 characters > %3).");
++ *errorMessage = (*errorMessage).arg(entity).arg(expandedSizes[entity]).arg(entityCharacterLimit);
+ }
+ return true;
+ }
+@@ -6764,10 +6778,7 @@ bool QXmlSimpleReaderPrivate::parseEntityDecl()
+ case EValue:
+ if ( !entityExist(name())) {
+ QString errorMessage;
+- if (isPartiallyExpandedEntityValueTooLarge(&errorMessage)) {
+- // The entity at entityName is entityValue.size() characters
+- // long in its unexpanded form, and was mentioned timesReferenced times,
+- // resulting in a string that would be greater than 1024 characters.
++ if (isExpandedEntityValueTooLarge(&errorMessage)) {
+ reportParseError(errorMessage);
+ return false;
+ }
+--
+1.7.1
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index 7aeae075b..a35a577f3 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 197232 2013-10-24 13:09:09Z andrea $
+# $Id: PKGBUILD 201436 2013-12-11 15:31:04Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=qt4
pkgver=4.8.5
-pkgrel=6
+pkgrel=7
arch=('i686' 'x86_64' 'mips64el')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
pkgdesc='A cross-platform application and UI framework'
depends=('libtiff' 'libpng' 'sqlite' 'ca-certificates' 'dbus'
'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
+ 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'libmng')
makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
'mesa')
optdepends=('qtchooser: set the default Qt toolkit'
@@ -36,7 +36,8 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk
'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop'
'improve-cups-support.patch'
'declarative-fix-sigbus.patch'
- 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch')
+ 'qtbug-31579.patch' 'qtbug-32534.patch' 'qtbug-32908.patch'
+ 'libmng2.patch' 'CVE-2013-4549.patch')
md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
'a16638f4781e56e7887ff8212a322ecc'
'8a28b3f52dbeb685d4b69440b520a3e1'
@@ -47,7 +48,9 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133'
'aac963d05a9d5733e2bfce9e26607f51'
'6ed8d26a8e4a9bba1f6c08fb99cc8357'
'bb0e0fa6ba953fa590d81ac612374e11'
- 'db343dcae522bc90d802ad1e83b7f5dd')
+ 'db343dcae522bc90d802ad1e83b7f5dd'
+ '0ba4ffc9ff1acb9bf8a5f592ba956d48'
+ '8701bd7445426c1ad5da3ddbd72df6b4')
prepare() {
cd ${_pkgfqn}
@@ -65,6 +68,11 @@ prepare() {
# (FS#36947) (QTBUG#32908)
patch -p1 -i "${srcdir}"/qtbug-32908.patch
+ # (FS#38081)
+ patch -p1 -i "${srcdir}"/CVE-2013-4549.patch
+ # (QTBUG#34894)
+ patch -p1 -i "${srcdir}"/libmng2.patch
+
sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf
sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
@@ -80,8 +88,6 @@ build() {
if [ "${CARCH}" = "mips64el" ]; then
export CXXFLAGS="${CXXFLAGS} -fpermissive"
- else
- extra="-plugin-sql-ibase"
fi
cd ${_pkgfqn}
@@ -113,8 +119,7 @@ build() {
-optimized-qmake \
-reduce-relocations \
-dbus-linked \
- -no-openvg \
- $extra
+ -no-openvg
make
}
diff --git a/extra/qt4/libmng2.patch b/extra/qt4/libmng2.patch
new file mode 100644
index 000000000..b6000fc0b
--- /dev/null
+++ b/extra/qt4/libmng2.patch
@@ -0,0 +1,35 @@
+From 515617e55be9a7bfa738a9c32ef8b19065de37d4 Mon Sep 17 00:00:00 2001
+From: aavit <eirik.aavitsland@digia.com>
+Date: Fri, 22 Nov 2013 15:49:44 +0100
+Subject: [PATCH] Recognize newer libmng versions in config test
+
+libmng 2.0.x has been released and is compatible and usable, but since
+it no longer provides a VERSION_MAJOR macro, the config test would fail.
+
+Task-number: QTBUG-34894
+Change-Id: I36f6ed9d69dbae88feb1b88ce099bf36c9283133
+Reviewed-by: Liang Qi <liang.qi@digia.com>
+(cherry picked from qtimageformats/9ae386653c321c8ddc10fad5ea88f32ebb3d3ffe)
+---
+ config.tests/unix/libmng/libmng.cpp | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/config.tests/unix/libmng/libmng.cpp b/config.tests/unix/libmng/libmng.cpp
+index 0fbe554..9db10ff 100644
+--- a/config.tests/unix/libmng/libmng.cpp
++++ b/config.tests/unix/libmng/libmng.cpp
+@@ -46,9 +46,11 @@ int main(int, char **)
+ mng_handle hMNG;
+ mng_cleanup(&hMNG);
+
++#if defined(MNG_VERSION_MAJOR)
+ #if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9)
+ #error System libmng version is less than 1.0.9; using built-in version instead.
+ #endif
++#endif
+
+ return 0;
+ }
+--
+1.7.1
+
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index 7c197b293..0adac69d7 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,18 +1,14 @@
-# $Id: PKGBUILD 197149 2013-10-23 11:49:27Z andrea $
+# $Id: PKGBUILD 202711 2013-12-25 21:25:46Z andyrtr $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=qt5
pkgname=('qt5-base'
- 'qt5-imageformats'
- 'qt5-script'
- 'qt5-svg'
- 'qt5-xmlpatterns')
-# V8 is not ported yet to mips64el, don't build jsbackend and its reverse dependencies there.
-[ "$CARCH" != "mips64el" ] && pkgname+=(
+ 'qt5-connectivity'
'qt5-declarative'
'qt5-doc'
'qt5-graphicaleffects'
- 'qt5-jsbackend'
+ 'qt5-imageformats'
+ 'qt5-location'
'qt5-multimedia'
'qt5-quick1'
'qt5-quickcontrols'
@@ -25,32 +21,30 @@ pkgname=('qt5-base'
'qt5-webkit'
'qt5-x11extras'
'qt5-xmlpatterns')
-pkgver=5.1.1
-pkgrel=5
+pkgver=5.2.0
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url='http://qt-project.org/'
license=('GPL3' 'LGPL' 'FDL' 'custom')
makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
- 'mesa' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
+ 'mesa' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' 'libmng'
'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc'
'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
- 'openal' 'gtk2' 'libxkbcommon')
+ 'openal' 'gtk2' 'libxkbcommon' 'python')
[ "$CARCH" != "mips64el" ] && makedepends+=('libfbclient')
groups=('qt' 'qt5')
_pkgfqn="qt-everywhere-opensource-src-${pkgver}"
-source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz"
+source=("http://download.qt-project.org/official_releases/qt/5.2/${pkgver}/single/${_pkgfqn}.tar.xz"
'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop'
- 'use-python2.patch' 'qatomic-before-mips32.patch'
- 'bison3.patch')
-md5sums=('697b7b8768ef8895e168366ab6b44760'
+ 'use-python2.patch' 'qatomic-before-mips32.patch')
+md5sums=('8f60b47ca9461831d940f579ee90517e'
'b2897dd6a2967bccf8f10e397aafee55'
'9638a78e502719ef8fe5f8d10d0361a9'
'188da8f4c87316e730ebf1c6217bf5a0'
'322b419b16c75d4de0ee7ad0a246caa1'
- '92831f79144d5cb8121915423ba47575'
- '84d7fcc2b5f270f482d5522ae01c29e2'
- '6b162cd2bc104f0ae83ca039401be7bf')
+ 'a378deccf363bd6079da459c89aff7b9'
+ '84d7fcc2b5f270f482d5522ae01c29e2')
prepare() {
cd ${_pkgfqn}
@@ -67,10 +61,6 @@ prepare() {
# Fix build without -march=mips32, mips64 or its superset.
patch -p1 -i "$srcdir/qatomic-before-mips32.patch"
-
- # Fix build with bison 3.x
- cd qtwebkit
- patch -p1 -i "${srcdir}"/bison3.patch
}
build() {
@@ -121,20 +111,20 @@ fi
package_qt5-base() {
pkgdesc='A cross-platform application and UI framework'
depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
- 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image'
- 'icu' 'qtchooser' 'libxkbcommon')
+ 'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'xcb-util-image' 'icu'
+ 'qtchooser' 'libxkbcommon')
optdepends=('postgresql-libs: PostgreSQL driver'
'libmariadbclient: MariaDB driver'
'unixodbc: ODBC driver')
[ "$CARCH" != "mips64el" ] && optdepends+=('libfbclient: Firebird/iBase driver')
conflicts=('qt')
+ options=('staticlibs') #libQt5PlatformSupport builds static only
cd ${_pkgfqn}/qtbase
make INSTALL_ROOT="${pkgdir}" install
- cd "${srcdir}"
- install -D -m644 ${_pkgfqn}/qtbase/LGPL_EXCEPTION.txt \
- ${pkgdir}/usr/share/licenses/${pkgbase}/LGPL_EXCEPTION.txt
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
# Fix wrong path in prl files
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
@@ -142,7 +132,7 @@ package_qt5-base() {
# Fix wrong qmake path in pri file
sed -i "s|${srcdir}/${_pkgfqn}/qtbase|/usr|" \
- "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap.pri
+ "${pkgdir}"/usr/lib/qt/mkspecs/modules/qt_lib_bootstrap_private.pri
# Useful symlinks
install -d "${pkgdir}"/usr/bin
@@ -151,9 +141,24 @@ package_qt5-base() {
done
}
+package_qt5-connectivity() {
+ pkgdesc='A cross-platform application and UI framework (QtBluetooth, QtNfc)'
+ depends=('qt5-declarative')
+
+ cd ${_pkgfqn}/qtconnectivity
+ make INSTALL_ROOT="${pkgdir}" install
+
+ # Fix wrong path in prl files
+ find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
package_qt5-declarative() {
pkgdesc='A cross-platform application and UI framework (QtQml, QtQuick)'
- depends=('qt5-jsbackend' 'qt5-xmlpatterns')
+ depends=('qt5-xmlpatterns')
conflicts=('qt')
cd ${_pkgfqn}/qtdeclarative
@@ -168,6 +173,9 @@ package_qt5-declarative() {
for b in "${pkgdir}"/usr/lib/qt/bin/*; do
ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
done
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-doc() {
@@ -177,23 +185,14 @@ package_qt5-doc() {
conflicts=('qt-doc')
replaces=('qt-doc')
provides=('qt-doc')
- options=('docs')
+ options=('docs' '!emptydirs')
groups=()
cd ${_pkgfqn}
make INSTALL_ROOT="${pkgdir}" install_docs
-}
-package_qt5-jsbackend() {
- pkgdesc='A cross-platform application and UI framework (QtV8)'
- depends=('qt5-base')
-
- cd ${_pkgfqn}/qtjsbackend
- make INSTALL_ROOT="${pkgdir}" install
-
- # Fix wrong path in prl files
- find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-xmlpatterns() {
@@ -213,6 +212,9 @@ package_qt5-xmlpatterns() {
for b in "${pkgdir}"/usr/lib/qt/bin/*; do
ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
done
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-translations() {
@@ -222,6 +224,9 @@ package_qt5-translations() {
cd ${_pkgfqn}/qttranslations
make INSTALL_ROOT="${pkgdir}" install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-multimedia() {
@@ -235,6 +240,9 @@ package_qt5-multimedia() {
# Fix wrong path in prl files
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-graphicaleffects() {
@@ -243,6 +251,9 @@ package_qt5-graphicaleffects() {
cd ${_pkgfqn}/qtgraphicaleffects
make INSTALL_ROOT="${pkgdir}" install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-imageformats() {
@@ -252,6 +263,24 @@ package_qt5-imageformats() {
cd ${_pkgfqn}/qtimageformats
make INSTALL_ROOT="${pkgdir}" install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
+}
+
+package_qt5-location() {
+ pkgdesc='A cross-platform application and UI framework (QtLocation, QtPositioning)'
+ depends=('qt5-declarative')
+
+ cd ${_pkgfqn}/qtlocation
+ make INSTALL_ROOT="${pkgdir}" install
+
+ # Fix wrong path in prl files
+ find "${pkgdir}/usr/lib" -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-quick1() {
@@ -271,6 +300,9 @@ package_qt5-quick1() {
for b in "${pkgdir}"/usr/lib/qt/bin/*; do
ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
done
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-quickcontrols() {
@@ -279,6 +311,9 @@ package_qt5-quickcontrols() {
cd ${_pkgfqn}/qtquickcontrols
make INSTALL_ROOT="${pkgdir}" install
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-script() {
@@ -292,6 +327,9 @@ package_qt5-script() {
# Fix wrong path in prl files
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-sensors() {
@@ -304,6 +342,9 @@ package_qt5-sensors() {
# Fix wrong path in prl files
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-serialport() {
@@ -316,6 +357,9 @@ package_qt5-serialport() {
# Fix wrong path in prl files
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-svg() {
@@ -329,6 +373,9 @@ package_qt5-svg() {
# Fix wrong path in prl files
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-tools() {
@@ -338,7 +385,7 @@ package_qt5-tools() {
optdepends=('qt5-doc: documentation')
install='qt5-tools.install'
conflicts=('qt')
- options=('staticlibs') # libQtUiTools builds as static only$
+ options=('staticlibs') # libQt5UiTools builds as static only$
cd ${_pkgfqn}/qttools
make INSTALL_ROOT="${pkgdir}" install
@@ -373,11 +420,15 @@ package_qt5-tools() {
for b in "${pkgdir}"/usr/lib/qt/bin/*; do
ln -s /usr/lib/qt/bin/$(basename $b) "${pkgdir}"/usr/bin/$(basename $b)-qt5
done
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
package_qt5-webkit() {
pkgdesc='A cross-platform application and UI framework (QtWebKit)'
- depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite' 'qt5-sensors')
+ depends=('qt5-sensors' 'qt5-location' 'gstreamer0.10-base' 'libxslt' 'libxcomposite')
+ license=('GPL3' 'LGPL' 'FDL')
cd ${_pkgfqn}/qtwebkit
make INSTALL_ROOT="${pkgdir}" install
@@ -400,4 +451,7 @@ package_qt5-x11extras() {
# Fix wrong path in prl files
find "${pkgdir}/usr/lib" -type f -name '*.prl' \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+ install -D -m644 LGPL_EXCEPTION.txt \
+ "${pkgdir}"/usr/share/licenses/${pkgname}/LGPL_EXCEPTION.txt
}
diff --git a/extra/qt5/bison3.patch b/extra/qt5/bison3.patch
deleted file mode 100644
index 4070c88e8..000000000
--- a/extra/qt5/bison3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen <allan.jensen@digia.com>
-Date: Fri, 16 Aug 2013 18:27:07 +0200
-Subject: [PATCH] ANGLE doesn't build with bison 3.0
-
-https://bugs.webkit.org/show_bug.cgi?id=119798
-
-Reviewed by Antti Koivisto.
-
-Make glslang.y compatible with bison 3.0
-by using %lex-param to set YYLEX_PARAM.
-
-* src/compiler/glslang.y:
-
-git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-Task-number: QTBUG-32913
-Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3
-Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
----
- Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-index 3cad335..b41e95a 100644
---- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-+++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y
-@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h).
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
-
- %union {
- struct {
---
-1.7.1
-
diff --git a/extra/qt5/use-python2.patch b/extra/qt5/use-python2.patch
index 57487b996..3433766db 100644
--- a/extra/qt5/use-python2.patch
+++ b/extra/qt5/use-python2.patch
@@ -1,54 +1,6 @@
---- qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri~ 2013-01-11 06:50:55.241495644 +0000
-+++ qt-everywhere-opensource-src-5.0.0/qtjsbackend/src/v8/v8.pri 2013-01-11 06:51:29.987894356 +0000
-@@ -303,7 +303,7 @@
- V8_EXPERIMENTAL_LIBRARY_FILES = \
- $$V8SRC/proxy.js \
-
--v8_js2c.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off
-+v8_js2c.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/libraries.cpp CORE off
- v8_js2c.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN}
- v8_js2c.output = $$V8_GENERATED_SOURCES_DIR/libraries.cpp
- v8_js2c.input = V8_LIBRARY_FILES
-@@ -314,7 +314,7 @@
- v8_js2c.name = generating[v8] ${QMAKE_FILE_IN}
- silent:v8_js2c.commands = @echo generating[v8] ${QMAKE_FILE_IN} && $$v8_js2c.commands
-
--v8_js2c_experimental.commands = python $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off
-+v8_js2c_experimental.commands = python2 $$V8DIR/tools/js2c.py $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp EXPERIMENTAL off
- v8_js2c_experimental.commands += $$V8SRC/macros.py ${QMAKE_FILE_IN}
- v8_js2c_experimental.output = $$V8_GENERATED_SOURCES_DIR/experimental-libraries.cpp
- v8_js2c_experimental.input = V8_EXPERIMENTAL_LIBRARY_FILES
---- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri~ 2013-01-09 11:29:16.452266719 +0000
-+++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/JavaScriptCore/DerivedSources.pri 2013-01-09 11:30:18.188538725 +0000
-@@ -85,14 +85,14 @@
- retgen.output = RegExpJitTables.h
- retgen.script = $$PWD/create_regex_tables
- retgen.input = retgen.script
--retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
-+retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT}
- GENERATORS += retgen
-
- #GENERATOR: "KeywordLookup.h": decision tree used by the lexer
- klgen.output = KeywordLookup.h
- klgen.script = $$PWD/KeywordLookupGenerator.py
- klgen.input = KEYWORDLUT_FILES
--klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
-+klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
- GENERATORS += klgen
-
- EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION
-@@ -117,7 +117,7 @@
- disassembler.input = DISASSEMBLER_FILES
- disassembler.script = $$PWD/disassembler/udis86/itab.py
- disassembler.depends = $$DISASSEMBLER_DEPENDENCY
-- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
-+ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
- disassembler.CONFIG += no_link
- GENERATORS += disassembler
- }
---- qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri~ 2013-01-09 11:46:01.165612894 +0000
-+++ qt-everywhere-opensource-src-5.0.0/qtwebkit/Source/WebCore/DerivedSources.pri 2013-01-09 11:46:27.465404725 +0000
-@@ -779,7 +779,7 @@
+--- qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/WebCore/DerivedSources.pri~ 2013-11-29 16:57:47.573721157 +0000
++++ qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/WebCore/DerivedSources.pri 2013-11-29 16:58:22.270157823 +0000
+@@ -819,7 +819,7 @@
inspectorValidate.output = InspectorProtocolVersion.h
inspectorValidate.input = INSPECTOR_JSON
inspectorValidate.script = $$PWD/inspector/generate-inspector-protocol-version
@@ -57,7 +9,7 @@
inspectorValidate.depends = $$PWD/inspector/generate-inspector-protocol-version
inspectorValidate.add_output_to_sources = false
GENERATORS += inspectorValidate
-@@ -787,7 +787,7 @@
+@@ -827,7 +827,7 @@
inspectorJSON.output = InspectorFrontend.cpp InspectorBackendDispatcher.cpp InspectorTypeBuilder.cpp
inspectorJSON.input = INSPECTOR_JSON
inspectorJSON.script = $$PWD/inspector/CodeGeneratorInspector.py
@@ -66,7 +18,7 @@
inspectorJSON.depends = $$inspectorJSON.script
GENERATORS += inspectorJSON
-@@ -908,7 +908,7 @@
+@@ -927,7 +927,7 @@
entities.output = HTMLEntityTable.cpp
entities.input = HTML_ENTITIES
entities.script = $$PWD/html/parser/create-html-entity-table
@@ -75,44 +27,62 @@
entities.clean = ${QMAKE_FILE_OUT}
entities.depends = $$PWD/html/parser/create-html-entity-table
GENERATORS += entities
---- qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri~ 2013-02-10 13:48:49.800319915 +0000
-+++ qt-everywhere-opensource-src-5.0.1/qtwebkit/Source/WebKit2/DerivedSources.pri 2013-02-10 13:49:09.966867900 +0000
-@@ -120,14 +120,14 @@
- $$PWD/Scripts/webkit2/model.py \
- $$PWD/Scripts/webkit2/parser.py
+--- qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/JavaScriptCore/DerivedSources.pri~ 2013-11-29 16:58:05.470269189 +0000
++++ qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Source/JavaScriptCore/DerivedSources.pri 2013-11-29 16:58:44.276678608 +0000
+@@ -83,14 +83,14 @@
+ retgen.output = RegExpJitTables.h
+ retgen.script = $$PWD/create_regex_tables
+ retgen.input = retgen.script
+-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT}
+ GENERATORS += retgen
--message_header_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-+message_header_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-messages-header.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
- message_header_generator.input = MESSAGE_RECEIVERS
- message_header_generator.depends = $$SCRIPTS
- message_header_generator.output_function = message_header_generator_output
- message_header_generator.add_output_to_sources = false
- GENERATORS += message_header_generator
+ #GENERATOR: "KeywordLookup.h": decision tree used by the lexer
+ klgen.output = KeywordLookup.h
+ klgen.script = $$PWD/KeywordLookupGenerator.py
+ klgen.input = KEYWORDLUT_FILES
+-klgen.commands = python $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
++klgen.commands = python2 $$klgen.script ${QMAKE_FILE_NAME} > ${QMAKE_FILE_OUT}
+ GENERATORS += klgen
--message_receiver_generator.commands = $${PYTHON} $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
-+message_receiver_generator.commands = python2 $${SOURCE_DIR}/WebKit2/Scripts/generate-message-receiver.py ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT}
- message_receiver_generator.input = MESSAGE_RECEIVERS
- message_receiver_generator.depends = $$SCRIPTS
- message_receiver_generator.output_function = message_receiver_generator_output
---- qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-04-11 08:05:15.149214600 +0000
-+++ qt-everywhere-opensource-src-5.0.2/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-04-11 08:05:28.829105110 +0000
+ EXTRACTOR_BINARY = LLIntOffsetsExtractor$$BIN_EXTENSION
+@@ -114,7 +114,7 @@
+ disassembler.input = DISASSEMBLER_FILES
+ disassembler.script = $$PWD/disassembler/udis86/itab.py
+ disassembler.depends = $$DISASSEMBLER_DEPENDENCY
+- disassembler.commands = python $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
++ disassembler.commands = python2 $$disassembler.script ${QMAKE_FILE_NAME} --outputDir ${QMAKE_FUNC_FILE_OUT_PATH}
+ disassembler.CONFIG += no_link
+ GENERATORS += disassembler
+ }
+--- qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf~ 2013-11-29 16:59:04.859875494 +0000
++++ qt-everywhere-opensource-src-5.2.0-rc1/qtwebkit/Tools/qmake/mkspecs/features/configure.prf 2013-11-29 16:59:40.539638968 +0000
@@ -116,7 +116,7 @@
- production_build:blackberry {
- addReasonForSkippingBuild("Build not supported on BB10 yet.")
+ production_build:blackberry|qnx {
+ addReasonForSkippingBuild("Build not supported on BB10/QNX yet.")
}
- requiredPrograms = gperf python perl bison ruby flex
+ requiredPrograms = gperf python2 perl bison ruby flex
for(program, requiredPrograms): \
!programExistsInPath($$program): \
addReasonForSkippingBuild("Missing $$program from PATH")
---- qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp.old 2013-07-03 19:22:34.536705691 +0000
-+++ qt-everywhere-opensource-src-5.1.0/qtjsbackend/src/3rdparty/v8/src/d8.gyp 2013-07-03 19:22:25.606770334 +0000
-@@ -99,7 +99,7 @@
- '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
- ],
- 'action': [
-- 'python',
-+ 'python2',
- '../tools/js2c.py',
- '<@(_outputs)',
- 'D8',
+--- qt-everywhere-opensource-src-5.2.0-rc1/qtdeclarative/src/3rdparty/masm/masm.pri~ 2013-11-29 17:03:43.228028589 +0000
++++ qt-everywhere-opensource-src-5.2.0-rc1/qtdeclarative/src/3rdparty/masm/masm.pri 2013-11-29 17:03:57.537933557 +0000
+@@ -47,7 +47,7 @@
+ udis86.output = udis86_itab.h
+ udis86.input = ITAB
+ udis86.CONFIG += no_link
+- udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
++ udis86.commands = python2 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
+ QMAKE_EXTRA_COMPILERS += udis86
+
+ udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
+@@ -67,7 +67,7 @@
+ retgen.script = $$PWD/create_regex_tables
+ retgen.input = retgen.script
+ retgen.CONFIG += no_link
+-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
++retgen.commands = python2 $$retgen.script > ${QMAKE_FILE_OUT}
+ QMAKE_EXTRA_COMPILERS += retgen
+
+ # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
diff --git a/extra/qtchooser/PKGBUILD b/extra/qtchooser/PKGBUILD
index 41a01e509..e3b8090bc 100644
--- a/extra/qtchooser/PKGBUILD
+++ b/extra/qtchooser/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 188894 2013-06-24 14:42:11Z andrea $
+# $Id: PKGBUILD 201641 2013-12-17 11:16:59Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=qtchooser
-pkgver=31
+pkgver=39
pkgrel=1
pkgdesc='Wrap the other Qt tools by searching for different instances of Qt on the system'
arch=('i686' 'x86_64' 'mips64el')
@@ -10,26 +10,26 @@ url='http://qt.gitorious.org/qt/qtchooser'
license=('GPL')
backup=('etc/xdg/qtchooser/default.conf')
depends=('gcc-libs')
-source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g980c64c.tar.gz"
+source=("http://macieira.org/${pkgname}/${pkgname}-${pkgver}-g4717841.tar.gz"
{3,4,5}.conf)
-md5sums=('36497558a0266dcbe4cccb6477bfc158'
+md5sums=('fcf1b5e8373147e48ce72b9c1ffe3d10'
'7c5da2b7911d1c4fabc63d6ef00f0020'
'aa4d49b269e1b806f5eea170801f0aa6'
'cf83f09a9a5a44d898b93f624d74dd11')
build() {
- cd ${pkgname}-${pkgver}-g980c64c
+ cd ${pkgname}-${pkgver}-g4717841
make
}
package() {
- cd ${pkgname}-${pkgver}-g980c64c
+ cd ${pkgname}-${pkgver}-g4717841
make INSTALL_ROOT="${pkgdir}" install
install -d "${pkgdir}"/etc/xdg/qtchooser
install -m644 "${srcdir}"/{3,4,5}.conf \
"${pkgdir}"/etc/xdg/qtchooser/
-
+
# Set the default Qt
ln -s /etc/xdg/qtchooser/5.conf \
"${pkgdir}"/etc/xdg/qtchooser/default.conf
diff --git a/community/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index b9bda96e3..0097a14a0 100644
--- a/community/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 96448 2013-08-29 04:44:01Z svenstaro $
-# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
+# $Id: PKGBUILD 101820 2013-12-02 00:06:01Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Contributor: Dan Vratil <progdan@progdansoft.com>
# Contributor: thotypous <matiasΘarchlinux-br·org>
# Contributor: delor <bartekpiech gmail com>
pkgname=qtcreator
-pkgver=2.8.1
-_pkgver=2.8.1
-pkgrel=1
+pkgver=3.0.0
+_pkgver=3.0.0
+pkgrel=2
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64')
url='http://qt-project.org'
license=('LGPL')
-depends=('qt5-quick1' 'qt5-tools')
-makedepends=('git')
+depends=('qt5-quick1' 'qt5-tools' 'qt5-quickcontrols')
+makedepends=('git' 'mesa')
options=('docs')
optdepends=('qt5-doc: for the integrated Qt documentation'
'gdb: for the debugger'
@@ -26,16 +26,25 @@ optdepends=('qt5-doc: for the integrated Qt documentation'
'bzr: for bazaar support'
'valgrind: for analyze support')
install=qtcreator.install
-source=("http://download.qt-project.org/official_releases/qtcreator/2.8/${pkgver}/qt-creator-${pkgver}-src.tar.gz"
+source=("git://gitorious.org/qt-creator/qt-creator.git#tag=v${_pkgver}"
+ "git://gitorious.org/qt-labs/qbs.git"
'qtcreator.desktop')
-md5sums=('79ef6c6ece0c00035ef744c9d6e3bd3b'
+md5sums=('SKIP'
+ 'SKIP'
'82888d4be900e7833d768050a135cd37')
+prepare() {
+ cd qt-creator
+ git submodule init
+ git config submodule.qbs.url $srcdir/qbs
+ git submodule update
+}
+
build() {
[[ -d build ]] && rm -r build
mkdir build && cd build
- qmake ../qt-creator-${pkgver}-src/qtcreator.pro
+ qmake ../qt-creator/qtcreator.pro
make
make docs -j1
}
@@ -47,5 +56,5 @@ package() {
make INSTALL_ROOT="${pkgdir}/usr/" install_docs
install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop
- install -Dm644 ${srcdir}/qt-creator-${pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
+ install -Dm644 ${srcdir}/qt-creator/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
}
diff --git a/community/qtcreator/qtcreator.desktop b/extra/qtcreator/qtcreator.desktop
index 0e8f73e64..0e8f73e64 100644
--- a/community/qtcreator/qtcreator.desktop
+++ b/extra/qtcreator/qtcreator.desktop
diff --git a/community/qtcreator/qtcreator.install b/extra/qtcreator/qtcreator.install
index 4d4a283db..4d4a283db 100644
--- a/community/qtcreator/qtcreator.install
+++ b/extra/qtcreator/qtcreator.install
diff --git a/extra/quadrapassel/PKGBUILD b/extra/quadrapassel/PKGBUILD
index bcb594e50..bcbe599f7 100644
--- a/extra/quadrapassel/PKGBUILD
+++ b/extra/quadrapassel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198393 2013-10-30 14:35:57Z allan $
+# $Id: PKGBUILD 199337 2013-11-11 11:09:38Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=quadrapassel
-pkgver=3.10.0
+pkgver=3.10.2
pkgrel=1
pkgdesc="Fit falling blocks together (Tetris-like game for GNOME)"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ install=quadrapassel.install
url="https://live.gnome.org/Quadrapassel"
groups=('gnome-extra')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('02e035d5486f023b2fee410dc909034163fd61369ee77cdfb0f07ac3069c46fa')
+sha256sums=('c944acc9d13e82ecef68456f4d8d9ddab15970e605f439d84860f7d57018183c')
build() {
cd $pkgname-$pkgver
diff --git a/extra/quazip/PKGBUILD b/extra/quazip/PKGBUILD
new file mode 100644
index 000000000..78e0282a2
--- /dev/null
+++ b/extra/quazip/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 199053 2013-11-07 23:52:10Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: trya <tryagainprod@gmail.com>
+
+pkgname=quazip
+pkgver=0.5.1
+pkgrel=3
+pkgdesc="C++ wrapper for the Gilles Vollant's ZIP/UNZIP C package"
+url="http://sourceforge.net/projects/quazip/"
+license=('LGPL')
+arch=('i686' 'x86_64')
+depends=('qt4')
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('eec6b9b6f19654230dfcd158f29ea9d0')
+
+build() {
+ cd ${pkgname}-${pkgver}/${pkgname}
+ qmake-qt4 PREFIX=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}/${pkgname}
+ make INSTALL_ROOT="${pkgdir}" install
+
+ install -d "${pkgdir}"/usr/share/apps/cmake-2.8/Modules
+ install -m644 ../FindQuaZip.cmake\
+ "${pkgdir}"/usr/share/apps/cmake-2.8/Modules
+}
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD
index 5e5ec46eb..38ffedc13 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179293 2013-03-04 21:34:48Z andrea $
+# $Id: PKGBUILD 201366 2013-12-09 17:09:35Z bpiotrowski $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
pkgname=qwt
-pkgver=6.0.2
-pkgrel=2
+pkgver=6.1.0
+pkgrel=1
pkgdesc="Qt Widgets for Technical Applications"
arch=('i686' 'x86_64' 'mips64el')
url="http://qwt.sourceforge.net/"
@@ -11,7 +11,7 @@ depends=('qt4')
license=("custom:$pkgname")
source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.bz2" \
"qwtconfig-archlinux.pri")
-sha1sums=('cbdd00b29521987c9e7bc6aa51092f0474b9428d'
+sha1sums=('48a967038f7aa9a9c87c64bcb2eb07c5df375565'
'aba0fc75f6d450237028b7b143bdcf05a79cabb3')
build() {
diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD
index 6492837fd..be7400cdf 100644
--- a/extra/raptor/PKGBUILD
+++ b/extra/raptor/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 198394 2013-10-30 14:36:18Z allan $
+# $Id: PKGBUILD 202202 2013-12-19 10:41:19Z bpiotrowski $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
# Contributor: eric <eric@archlinux.org>
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
pkgname=raptor
-pkgver=2.0.10
-pkgrel=3
+pkgver=2.0.12
+pkgrel=1
pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples"
arch=('i686' 'x86_64' 'mips64el')
url="http://librdf.org/raptor"
@@ -32,4 +32,4 @@ package() {
cd "${srcdir}"/raptor2-${pkgver}
make prefix="${pkgdir}"/usr install
}
-md5sums=('d9b0314eb835551adb48af037dcfd46e')
+md5sums=('a015a7fcc2cbdd38ee1450a5eb526ab5')
diff --git a/extra/rasqal/PKGBUILD b/extra/rasqal/PKGBUILD
index a0f1ed7b4..1e9f54dec 100644
--- a/extra/rasqal/PKGBUILD
+++ b/extra/rasqal/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198396 2013-10-30 14:37:02Z allan $
+# $Id: PKGBUILD 202985 2013-12-30 08:44:05Z foutrelis $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: AndyRTR <andyrtr@archlinux.org>
# Contributor: Lawrence Lee <valheru@facticius.net>
@@ -6,13 +6,14 @@
pkgname=rasqal
epoch=1
pkgver=0.9.30
-pkgrel=1
+pkgrel=3
pkgdesc="A free C library that handles Resource Description Framework (RDF) query syntaxes, query construction and query execution returning result bindings"
url="http://librdf.org/rasqal"
license=('GPL' 'LGPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('raptor' 'mpfr' 'util-linux')
source=(http://download.librdf.org/source/${pkgname}-${pkgver}.tar.gz)
+md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
@@ -31,4 +32,3 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}
make DESTDIR=${pkgdir} install
}
-md5sums=('b12c5f9cfdb6b04efce5a4a186b8416b')
diff --git a/extra/rcs/PKGBUILD b/extra/rcs/PKGBUILD
index b3331b406..363c3677d 100644
--- a/extra/rcs/PKGBUILD
+++ b/extra/rcs/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 181864 2013-04-05 00:36:01Z bisson $
-# Contributor: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 200617 2013-11-29 21:23:04Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
pkgname=rcs
-pkgver=5.8.2
+pkgver=5.9.2
pkgrel=1
pkgdesc='Revision Control System: manages multiple revisions of files'
url='http://www.gnu.org/software/rcs/'
license=('GPL3')
arch=('i686' 'x86_64' 'mips64el')
-source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('5972a7f97ab307e775083144cdf6b425c4aba7fe')
+depends=('ed')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+sha1sums=('cb053f6ba87ab6ea03306d6241e1cde67182100b' 'SKIP')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/rdesktop/PKGBUILD b/extra/rdesktop/PKGBUILD
deleted file mode 100644
index 9b3b81803..000000000
--- a/extra/rdesktop/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 193090 2013-08-15 23:15:47Z eric $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Dan McGee <dan@archlinux.org>
-
-pkgname=rdesktop
-pkgver=1.8.0
-pkgrel=3
-pkgdesc="An open source client for Windows Remote Desktop Services"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.rdesktop.org/"
-license=('GPL3')
-depends=('libao' 'libsamplerate' 'xorg-xrandr' 'pcsclite')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'rdesktop-send_physical_buttons.diff' 'rdesktop-libao.patch' 'rdesktop-tcp.patch'
- rdesktop-r1729.patch rdesktop-r1731.patch rdesktop-r1732.patch)
-sha1sums=('2d39a41d29ad1ad2509d1e343a2817a3c7d666de'
- '809a9dc11ad4f704f79fc4bc2a70b76a4f42596d'
- '68a48061e5ed76150c1444891a192f7884fd056e'
- 'a14793c72194bed74725bcf75fdb8b93c7577399'
- '972d6ec59cf140383880464e3ef43e03969f3bfe'
- '9a417aba27ded0ab595cbb07fccd452bdc0af20c'
- '1bc92e04058a2f5c02f42a5c97da7ee672a71698')
-
-prepare() {
- cd ${pkgname}-${pkgver}
-
- # FS#15113
- patch -i "${srcdir}/rdesktop-send_physical_buttons.diff"
-
- # Fix libao segfault, from Fedora
- patch -i "${srcdir}/rdesktop-libao.patch"
-
- # FS#36488
- patch -i "${srcdir}/rdesktop-tcp.patch"
- patch -i "${srcdir}/rdesktop-r1731.patch"
- patch -i "${srcdir}/rdesktop-r1732.patch"
-
- # FS#36505
- patch -i "${srcdir}/rdesktop-r1729.patch"
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- ./configure --prefix=/usr \
- --enable-smartcard \
- --with-ipv6
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/rdesktop/rdesktop-libao.patch b/extra/rdesktop/rdesktop-libao.patch
deleted file mode 100644
index 9def24443..000000000
--- a/extra/rdesktop/rdesktop-libao.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: rdpsnd_libao.c
-===================================================================
---- rdpsnd_libao.c (revision 1729)
-+++ rdpsnd_libao.c (revision 1730)
-@@ -111,6 +111,7 @@
- {
- ao_sample_format format;
-
-+ memset(&format, 0, sizeof(format));
- format.bits = pwfx->wBitsPerSample;
- format.channels = pwfx->nChannels;
- format.rate = 44100;
diff --git a/extra/rdesktop/rdesktop-r1729.patch b/extra/rdesktop/rdesktop-r1729.patch
deleted file mode 100644
index 3f38a692c..000000000
--- a/extra/rdesktop/rdesktop-r1729.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: scard.c
-===================================================================
---- scard.c (revision 1728)
-+++ scard.c (revision 1729)
-@@ -2,8 +2,8 @@
- rdesktop: A Remote Desktop Protocol client.
- Smart Card support
- Copyright (C) Alexi Volkov <alexi@myrealbox.com> 2006
-- Copyright 2010 Pierre Ossman <ossman@cendio.se> for Cendio AB
-- Copyright 2011 Henrik Andersson <hean01@cendio.se> for Cendio AB
-+ Copyright 2010-2013 Pierre Ossman <ossman@cendio.se> for Cendio AB
-+ Copyright 2011-2013 Henrik Andersson <hean01@cendio.se> for Cendio AB
-
- 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
-@@ -1109,6 +1109,7 @@
- MYPCSC_SCARDCONTEXT myHContext;
- SERVER_DWORD dwTimeout;
- SERVER_DWORD dwCount;
-+ SERVER_DWORD dwPointerId;
- SERVER_LPSCARD_READERSTATE_A rsArray, cur;
- MYPCSC_LPSCARD_READERSTATE_A myRsArray;
- long i;
-@@ -1133,7 +1134,8 @@
- memset(rsArray, 0, dwCount * sizeof(SERVER_SCARD_READERSTATE_A));
- for (i = 0, cur = rsArray; i < dwCount; i++, cur++)
- {
-- in_uint32_le(in, cur->szReader);
-+ in_uint32_le(in, dwPointerId);
-+ cur->szReader = (char *)(intptr_t)dwPointerId;
- in_uint32_le(in, cur->dwCurrentState);
- in_uint32_le(in, cur->dwEventState);
- in_uint32_le(in, cur->cbAtr);
diff --git a/extra/rdesktop/rdesktop-r1731.patch b/extra/rdesktop/rdesktop-r1731.patch
deleted file mode 100644
index f72728191..000000000
--- a/extra/rdesktop/rdesktop-r1731.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: rdesktop.c
-===================================================================
---- rdesktop.c (revision 1730)
-+++ rdesktop.c (revision 1731)
-@@ -87,7 +87,7 @@
- RD_BOOL g_sendmotion = True;
- RD_BOOL g_bitmap_cache = True;
- RD_BOOL g_bitmap_cache_persist_enable = False;
--RD_BOOL g_bitmap_cache_precache = True;
-+RD_BOOL g_bitmap_cache_precache = False;
- RD_BOOL g_use_ctrl = True;
- RD_BOOL g_encryption = True;
- RD_BOOL g_encryption_initial = True;
diff --git a/extra/rdesktop/rdesktop-r1732.patch b/extra/rdesktop/rdesktop-r1732.patch
deleted file mode 100644
index a4260d0d0..000000000
--- a/extra/rdesktop/rdesktop-r1732.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Index: proto.h
-===================================================================
---- proto.h (revision 1731)
-+++ proto.h (revision 1732)
-@@ -144,6 +144,7 @@
- char *l_to_a(long N, int base);
- int load_licence(unsigned char **data);
- void save_licence(unsigned char *data, int length);
-+void rd_create_ui(void);
- RD_BOOL rd_pstcache_mkdir(void);
- int rd_open_file(char *filename);
- void rd_close_file(int fd);
-Index: rdp.c
-===================================================================
---- rdp.c (revision 1731)
-+++ rdp.c (revision 1732)
-@@ -1044,6 +1044,9 @@
- uint8 type;
- uint16 len_src_descriptor, len_combined_caps;
-
-+ /* at this point we need to ensure that we have ui created */
-+ rd_create_ui();
-+
- in_uint32_le(s, g_rdp_shareid);
- in_uint16_le(s, len_src_descriptor);
- in_uint16_le(s, len_combined_caps);
-Index: rdesktop.c
-===================================================================
---- rdesktop.c (revision 1731)
-+++ rdesktop.c (revision 1732)
-@@ -87,7 +87,7 @@
- RD_BOOL g_sendmotion = True;
- RD_BOOL g_bitmap_cache = True;
- RD_BOOL g_bitmap_cache_persist_enable = False;
--RD_BOOL g_bitmap_cache_precache = False;
-+RD_BOOL g_bitmap_cache_precache = True;
- RD_BOOL g_use_ctrl = True;
- RD_BOOL g_encryption = True;
- RD_BOOL g_encryption_initial = True;
-@@ -1132,13 +1132,7 @@
- DEBUG(("Connection successful.\n"));
- memset(password, 0, sizeof(password));
-
-- /* only create a window if we dont have one intialized */
-- if (!ui_have_window())
-- {
-- if (!ui_create_window())
-- return EX_OSERR;
-- }
--
-+ rd_create_ui();
- tcp_run_ui(True);
-
- g_redirect = False;
-@@ -1732,6 +1726,18 @@
- close(fd);
- }
-
-+/* create rdesktop ui */
-+void
-+rd_create_ui()
-+{
-+ /* only create a window if we dont have one intialized */
-+ if (!ui_have_window())
-+ {
-+ if (!ui_create_window())
-+ return EX_OSERR;
-+ }
-+}
-+
- /* Create the bitmap cache directory */
- RD_BOOL
- rd_pstcache_mkdir(void)
diff --git a/extra/rdesktop/rdesktop-tcp.patch b/extra/rdesktop/rdesktop-tcp.patch
deleted file mode 100644
index f20182978..000000000
--- a/extra/rdesktop/rdesktop-tcp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/rdesktop/trunk/tcp.c
-+++ b/rdesktop/trunk/tcp.c
-@@ -193,7 +193,7 @@
- int rcvd = 0, ssl_err;
-
- if (g_network_error == True)
-- return;
-+ return NULL;
-
- if (s == NULL)
- {
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index aef4fa34c..1206cb882 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194269 2013-09-12 15:17:40Z tpowa $
+# $Id: PKGBUILD 201584 2013-12-16 08:10:23Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Keshav Padram Amburay <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -17,7 +17,7 @@ _COMPILER="GCC47"
#######
pkgname="refind-efi"
-pkgver="0.7.4"
+pkgver="0.7.6"
pkgrel="1"
pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
url="http://www.rodsbooks.com/refind/index.html"
@@ -40,7 +40,7 @@ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModul
source+=("${_TIANO_DIR_}_${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}#revision=${_TIANO_SVN_REV_}")
done
-sha1sums=('410d2694c5005a5312d48414df8acf8291da42a9'
+sha1sums=('431423452190c9840335f2dd9af887aded52a787'
'3d53eb615c3363d45feb95b9bfbf1d5491bf1c24'
'SKIP'
'SKIP'
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index d83c509b6..066f751b0 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 191263 2013-07-22 13:50:52Z schiv $
+# $Id: PKGBUILD 199804 2013-11-16 21:20:01Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: Robert Emil Berge <robert@rebi.no>
pkgname=rosegarden
-pkgver=13.06
+pkgver=13.10
pkgrel=1
pkgdesc="MIDI/audio sequencer and notation editor"
arch=('i686' 'x86_64' 'mips64el')
@@ -23,7 +23,7 @@ optdepends=('lilypond: notation display'
[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
install=$pkgname.install
source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('67b110277718b6ef2ec098a8fc452340')
+md5sums=('730a830da4d3b60fa8b15716d8dcd8a4')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD
index d194d2baf..44306886d 100644
--- a/extra/rtmpdump/PKGBUILD
+++ b/extra/rtmpdump/PKGBUILD
@@ -1,27 +1,29 @@
-# $Id: PKGBUILD 197306 2013-10-25 02:06:12Z bisson $
-# Maintainer:
+# $Id: PKGBUILD 202973 2013-12-29 17:17:31Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: xduugu
# Contributor: Elis Hughes <elishughes@googlemail.com>
pkgname=rtmpdump
-pkgver=20121230
-pkgrel=3
-pkgdesc="A tool to download rtmp streams"
+pkgver=20131205
+pkgrel=1
+pkgdesc='Tool to download rtmp streams'
arch=('i686' 'x86_64' 'mips64el')
-url="http://rtmpdump.mplayerhq.hu/"
+url='http://rtmpdump.mplayerhq.hu/'
license=('GPL2' 'LGPL2.1')
depends=('openssl')
+makedepends=('git')
options=('!makeflags')
-#git://git.ffmpeg.org/rtmpdump
-source=(ftp://ftp.archlinux.org/other/packages/$pkgname/$pkgname-git-$pkgver.tar.xz)
-sha256sums=('2612ccbc041281c90d1fa59d20aec783fa3ef29de952323d8d89699fc3d5c4d2')
+source=(git://git.ffmpeg.org/rtmpdump#commit=dc76f0a8)
+md5sums=('SKIP')
build() {
- cd $pkgname-$pkgver
+ cd $pkgname
make
}
package() {
- cd $pkgname-$pkgver
- make prefix=/usr sbindir=/usr/bin mandir=/usr/share/man DESTDIR="$pkgdir" install
+ cd $pkgname
+ make prefix=/usr sbindir=/usr/bin \
+ mandir=/usr/share/man DESTDIR="$pkgdir" \
+ install
}
diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD
index 4d15ff815..61d6516d2 100644
--- a/extra/rubberband/PKGBUILD
+++ b/extra/rubberband/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176992 2013-02-03 15:07:34Z schiv $
+# $Id: PKGBUILD 199957 2013-11-20 11:04:01Z allan $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com>
pkgname=rubberband
pkgver=1.8.1
-pkgrel=1
+pkgrel=2
pkgdesc="Time-stretching and pitch-shifting audio library and utility"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.breakfastquay.com/rubberband/"
diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 5795f61a6..6170e75d9 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -4,8 +4,8 @@
# Contributor: Jeramy Rutley <jrutley@gmail.com>
pkgname=('ruby' 'ruby-docs')
-pkgver=2.0.0_p247
-pkgrel=3
+pkgver=2.0.0_p353
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://www.ruby-lang.org/en/'
license=('BSD' 'custom')
@@ -13,7 +13,7 @@ makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml')
options=('!emptydirs' '!makeflags' 'staticlibs')
source=("http://cache.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2"
'gemrc')
-md5sums=('60913f3eec0c4071f44df42600be2604'
+md5sums=('20eb8f067d20f6b76b7e16cce2a85a55'
'6fb8e7a09955e0f64be3158fb4a27e7a')
build() {
diff --git a/extra/rygel/PKGBUILD b/extra/rygel/PKGBUILD
index ebf73026a..cda87a7c5 100644
--- a/extra/rygel/PKGBUILD
+++ b/extra/rygel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198400 2013-10-30 14:38:24Z allan $
+# $Id: PKGBUILD 202451 2013-12-22 12:20:10Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Balló György <ballogyor+arch at gmail dot com>
pkgname=rygel
-pkgver=0.20.1
+pkgver=0.20.3
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' 'mips64el')
@@ -21,7 +21,7 @@ backup=(etc/rygel.conf)
install=rygel.install
groups=('gnome-extra')
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('00792c8db8f5ca0cb655ab00d90bec6f90e2a4b505f10faf03924800285a7ec3')
+sha256sums=('4e7e3105a1d27d126938b7530f60bd7867121188651cee806f36694fbd7dd349')
build() {
cd $pkgname-$pkgver
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index f34be2154..ebada4fbd 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -10,11 +10,11 @@
pkgbase=samba
pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=4.1.0
+pkgver=4.1.3
# We use the 'A' to fake out pacman's version comparators. Samba chooses
# to append 'a','b',etc to their subsequent releases, which pamcan
# misconstrues as alpha, beta, etc. Bad samba!
-_realver=4.1.0
+_realver=4.1.3
pkgrel=1
arch=(i686 x86_64 mips64el)
url="http://www.samba.org"
@@ -240,7 +240,7 @@ sys.path.insert(0, '/usr/lib/python${_pyver}/site-packages')" \
# copy ldap example
install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
}
-md5sums=('f448d18ae678c72afb72e0510cd69710'
+md5sums=('a5dbfe87f4cb3d9d91e15e5df99a59a1'
'5697da77590ec092cc8a883bae06093c'
'96f82c38f3f540b53f3e5144900acf17'
'ee4763a656cf00d92bfda31b6bb2c5cb'
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 0c4e1146f..cf0de9ce2 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196298 2013-10-11 08:53:55Z juergen $
+# $Id: PKGBUILD 202769 2013-12-27 14:21:30Z juergen $
# Contributor: John Proctor <jproctor@prium.net>
# Contributor: Daniel White <daniel@whitehouse.id.au>
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Leslie Polzer (skypher)
pkgname=sbcl
-pkgver=1.1.12
+pkgver=1.1.14
pkgrel=1
pkgdesc="Steel Bank Common Lisp"
url="http://www.sbcl.org/"
@@ -19,7 +19,7 @@ makedepends=('clisp')
install=sbcl.install
source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
"arch-fixes.lisp")
-md5sums=('817e0606e4615e758c0bf3d381197711'
+md5sums=('e3f933f7cb0053c3438d86e90f5bd73b'
'7ac0c1936547f4278198b8bf7725204d')
diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD
index 76aa6c8c0..49d13c490 100644
--- a/extra/sdl2/PKGBUILD
+++ b/extra/sdl2/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=sdl2
pkgver=2.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)"
arch=('i686' 'x86_64')
url="http://www.libsdl.org"
license=('MIT')
-depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl')
+depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl' 'libxcursor')
makedepends=('alsa-lib' 'mesa' 'libpulse' 'libxrandr' 'libxinerama')
optdepends=('alsa-lib: ALSA audio driver'
'libpulse: PulseAudio audio driver')
diff --git a/extra/sdl2_gfx/PKGBUILD b/extra/sdl2_gfx/PKGBUILD
index 2f73cb43c..465751dc9 100644
--- a/extra/sdl2_gfx/PKGBUILD
+++ b/extra/sdl2_gfx/PKGBUILD
@@ -2,7 +2,8 @@
# Contributor: Jameson Pugh <imntreal@gmail.com>
pkgname=sdl2_gfx
-pkgver=7
+epoch=1
+pkgver=1.0.0
pkgrel=1
pkgdesc="SDL Graphic Primitives (Version 2)"
arch=('i686' 'x86_64')
@@ -10,11 +11,11 @@ url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-softw
license=('zlib')
depends=('sdl2')
makedepends=('svn')
-source=("sdl2-gfx::svn://svn.code.sf.net/p/sdl2gfx/code/trunk#revision=$pkgver")
-md5sums=('SKIP')
+source=("http://www.ferzkopp.net/Software/SDL2_gfx/SDL2_gfx-${pkgver}.tar.gz")
+md5sums=('f008cc117cb901aec6bf5c2f0b11f7ea')
build() {
- cd "${srcdir}/sdl2-gfx"
+ cd "${srcdir}/SDL2_gfx-${pkgver}"
./autogen.sh
./configure --disable-static --prefix=/usr
@@ -22,7 +23,7 @@ build() {
}
package() {
- cd "${srcdir}/sdl2-gfx"
+ cd "${srcdir}/SDL2_gfx-${pkgver}"
make DESTDIR="${pkgdir}/" install
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/extra/sdl_gfx/PKGBUILD b/extra/sdl_gfx/PKGBUILD
index 4c20a897b..977657e01 100644
--- a/extra/sdl_gfx/PKGBUILD
+++ b/extra/sdl_gfx/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 198418 2013-10-30 14:45:20Z allan $
+# $Id: PKGBUILD 199486 2013-11-13 12:47:52Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sdl_gfx
-pkgver=2.0.24
-pkgrel=2
+pkgver=2.0.25
+pkgrel=1
pkgdesc="SDL Graphic Primitives"
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
url="http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx"
source=(http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${pkgver}.tar.gz)
depends=('sdl')
-md5sums=('838514185ff9a3b6377760aaa52fef8a')
+md5sums=('ea24ed4b82ff1304809c363494fa8e16')
build() {
cd SDL_gfx-${pkgver}
diff --git a/extra/serf/PKGBUILD b/extra/serf/PKGBUILD
index 33e18236a..36f7856c7 100644
--- a/extra/serf/PKGBUILD
+++ b/extra/serf/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198428 2013-10-30 14:48:58Z allan $
+# $Id: PKGBUILD 200589 2013-11-29 15:17:26Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=serf
-pkgver=1.3.1
-pkgrel=2
+pkgver=1.3.2
+pkgrel=1
pkgdesc="High-performance asynchronous HTTP client library"
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/serf/"
@@ -12,15 +12,8 @@ license=('Apache')
depends=('apr-util')
makedepends=('scons')
options=('!staticlibs')
-source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2 'serf-ssl-allocator-v2.patch')
-md5sums=('da5aca0cad19fd9c19129c3f8f7393dd'
- 'a0ff486ee26f86cb2825decfd1dc8355')
-
-prepare() {
- mv serf-ssl-allocator-v2.patch ${pkgname}-${pkgver}
- cd ${pkgname}-${pkgver}
- patch -Np0 -i serf-ssl-allocator-v2.patch
-}
+source=(http://serf.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('43ce30fccf39ab0186a7590e2733e3ec')
build() {
cd ${pkgname}-${pkgver}
diff --git a/extra/serf/serf-ssl-allocator-v2.patch b/extra/serf/serf-ssl-allocator-v2.patch
new file mode 100644
index 000000000..09ad42477
--- /dev/null
+++ b/extra/serf/serf-ssl-allocator-v2.patch
@@ -0,0 +1,57 @@
+Index: buckets/ssl_buckets.c
+===================================================================
+--- buckets/ssl_buckets.c (revision 2130)
++++ buckets/ssl_buckets.c (working copy)
+@@ -1192,21 +1192,16 @@
+ context->server_cert_userdata = data;
+ }
+
+-static serf_ssl_context_t *ssl_init_context(void)
++static serf_ssl_context_t *ssl_init_context(serf_bucket_alloc_t *allocator)
+ {
+ serf_ssl_context_t *ssl_ctx;
+- apr_pool_t *pool;
+- serf_bucket_alloc_t *allocator;
+
+ init_ssl_libraries();
+
+- apr_pool_create(&pool, NULL);
+- allocator = serf_bucket_allocator_create(pool, NULL, NULL);
+-
+ ssl_ctx = serf_bucket_mem_alloc(allocator, sizeof(*ssl_ctx));
+
+ ssl_ctx->refcount = 0;
+- ssl_ctx->pool = pool;
++ ssl_ctx->pool = serf_bucket_allocator_get_pool(allocator);
+ ssl_ctx->allocator = allocator;
+
+ ssl_ctx->ctx = SSL_CTX_new(SSLv23_client_method());
+@@ -1263,8 +1258,6 @@
+ static apr_status_t ssl_free_context(
+ serf_ssl_context_t *ssl_ctx)
+ {
+- apr_pool_t *p;
+-
+ /* If never had the pending buckets, don't try to free them. */
+ if (ssl_ctx->decrypt.pending != NULL) {
+ serf_bucket_destroy(ssl_ctx->decrypt.pending);
+@@ -1277,10 +1270,7 @@
+ SSL_free(ssl_ctx->ssl);
+ SSL_CTX_free(ssl_ctx->ctx);
+
+- p = ssl_ctx->pool;
+-
+ serf_bucket_mem_free(ssl_ctx->allocator, ssl_ctx);
+- apr_pool_destroy(p);
+
+ return APR_SUCCESS;
+ }
+@@ -1294,7 +1284,7 @@
+
+ ctx = serf_bucket_mem_alloc(allocator, sizeof(*ctx));
+ if (!ssl_ctx) {
+- ctx->ssl_ctx = ssl_init_context();
++ ctx->ssl_ctx = ssl_init_context(allocator);
+ }
+ else {
+ ctx->ssl_ctx = ssl_ctx;
diff --git a/extra/signon/PKGBUILD b/extra/signon/PKGBUILD
index 51d85f4e7..cf6eaf4f5 100644
--- a/extra/signon/PKGBUILD
+++ b/extra/signon/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197629 2013-10-27 14:39:15Z andrea $
-#Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# $Id: PKGBUILD 202670 2013-12-24 08:58:48Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Balló György <ballogyor+arch at gmail dot com>
pkgbase=signon
pkgname=('signon' 'signon-doc')
-pkgver=8.54
-pkgrel=2
+pkgver=8.55
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/accounts-sso/"
license=('LGPL')
@@ -13,15 +13,15 @@ makedepends=('qt4' 'libproxy' 'doxygen' 'graphviz' 'ttf-font')
options=('!emptydirs')
source=("http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2"
'use_keyring.patch')
-sha1sums=('a29a12d6fe3747930e94932f6e1b1339b471d108'
+sha1sums=('e71bfe54bdd4ad50705eb7071c3a426293370b2a'
'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1')
prepare() {
cd $pkgbase-$pkgver
-
+
# Use gnome-keyring secrets storage if signon-keyring-extension is available
patch -Np1 -i "$srcdir/use_keyring.patch"
-
+
# qt4 fix
sed -i 's/qdbusxml2cpp/qdbusxml2cpp-qt4/' src/signond/signond.pro
}
diff --git a/extra/slim/PKGBUILD b/extra/slim/PKGBUILD
index 8fcf5c524..0610cba7d 100644
--- a/extra/slim/PKGBUILD
+++ b/extra/slim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195944 2013-10-06 06:46:09Z foutrelis $
+# $Id: PKGBUILD 202652 2013-12-23 08:42:02Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Thayer Williams <thayer@archlinux.org>
@@ -7,14 +7,15 @@
pkgname=slim
pkgver=1.3.6
-pkgrel=2
+pkgrel=3
pkgdesc="Desktop-independent graphical login manager for X11"
arch=('i686' 'x86_64' 'mips64el')
url="http://slim.berlios.de/"
license=('GPL2')
depends=('pam' 'libxmu' 'libpng' 'libjpeg' 'libxft' 'libxrandr' 'xorg-xauth')
makedepends=('cmake' 'freeglut')
-backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim')
+backup=('etc/slim.conf' 'etc/logrotate.d/slim' 'etc/pam.d/slim'
+ 'etc/slimlock.conf')
source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz
slim-1.3.6-fix-libslim-libraries.patch
slim-1.3.6-add-sessiondir.patch
@@ -55,6 +56,7 @@ package() {
install -Dm644 "$srcdir/slim.pam" "$pkgdir/etc/pam.d/slim"
install -Dm644 "$srcdir/slim.logrotate" "$pkgdir/etc/logrotate.d/slim"
+ install -Dm644 slimlock.conf "$pkgdir/etc/slimlock.conf"
# Provide sane defaults
sed -i -e 's|#xserver_arguments.*|xserver_arguments -nolisten tcp vt07|' \
diff --git a/extra/smb4k/PKGBUILD b/extra/smb4k/PKGBUILD
index db21950eb..07e372757 100644
--- a/extra/smb4k/PKGBUILD
+++ b/extra/smb4k/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 197642 2013-10-27 16:28:17Z giovanni $
+# $Id: PKGBUILD 199073 2013-11-08 10:00:05Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Emanuele Rampichini <emanuele.rampichini@gmail.com>
pkgname=smb4k
-pkgver=1.0.8
+pkgver=1.0.9
pkgrel=1
pkgdesc="A KDE program that browses samba shares"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('kdebase-runtime')
makedepends=('cmake' 'automoc4')
install=smb4k.install
source=("http://downloads.sourceforge.net/project/${pkgname}/Smb4K%20%28stable%20releases%29/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('8dac25845830cee18b72776d0f90d62c')
+md5sums=('7a27698842663c6197228ff3c282a079')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/snappy/PKGBUILD b/extra/snappy/PKGBUILD
index 85e15cd87..b94dd1c44 100644
--- a/extra/snappy/PKGBUILD
+++ b/extra/snappy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198433 2013-10-30 14:50:42Z allan $
+# $Id: PKGBUILD 199910 2013-11-18 18:54:19Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Antony Male <antony dot male at geemail dot com>>
pkgname=snappy
-pkgver=1.1.0
-pkgrel=2
+pkgver=1.1.1
+pkgrel=1
pkgdesc='A fast compressor/decompressor library'
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/snappy/"
@@ -12,7 +12,7 @@ license=('BSD')
depends=('glibc' 'gcc-libs')
checkdepends=('zlib')
source=("http://snappy.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-md5sums=('c8f3ef29b5281e78f4946b2d739cea4f')
+md5sums=('8887e3b7253b22a31f5486bca3cbc1c2')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD
index 2a23dc657..aa68286a9 100644
--- a/extra/snd/PKGBUILD
+++ b/extra/snd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197656 2013-10-27 21:04:41Z schiv $
+# $Id: PKGBUILD 199037 2013-11-07 17:11:41Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: see .contrib
pkgname=snd
pkgver=14.1
-pkgrel=1
+pkgrel=2
pkgdesc="An advanced sound editor"
arch=('i686' 'x86_64')
url="http://ccrma.stanford.edu/software/snd/"
@@ -15,16 +15,16 @@ makedepends=('ladspa' 'wavpack' 'flac' 'speex' 'gmp'
'timidity++' 'mpg123' 'vorbis-tools')
optdepends=('wavpack' 'flac' 'speex' 'mpg123'
'timidity++' 'vorbis-tools')
-install=$pkgname.install
source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz"
'type_error.patch')
md5sums=('955ca19ca70ac0e4d03cd710516c0174'
- '6e96d59346b53a1c73060857f688dbd0')
+ '9bfea0dccdfb5da1ba81e721672b11cc')
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # work around incomplete type error
+ # fix incomplete type error
+ # see http://www.mail-archive.com/cmdist@ccrma.stanford.edu/msg04241.html
patch -Np1 -i "$srcdir/type_error.patch"
}
diff --git a/extra/snd/snd.install b/extra/snd/snd.install
deleted file mode 100644
index 57b42ddff..000000000
--- a/extra/snd/snd.install
+++ /dev/null
@@ -1,3 +0,0 @@
-post_upgrade() {
- echo " > snd GUI is now GTK+ due to lesstif/libxpm build issues"
-}
diff --git a/extra/snd/type_error.patch b/extra/snd/type_error.patch
index e7bf9ab91..1232c6e36 100644
--- a/extra/snd/type_error.patch
+++ b/extra/snd/type_error.patch
@@ -1,20 +1,12 @@
-diff -ur snd-14.1.orig/vct.h snd-14.1/vct.h
---- snd-14.1.orig/vct.h 2013-10-28 02:22:35.073798054 +0800
-+++ snd-14.1/vct.h 2013-10-28 02:45:27.166364791 +0800
-@@ -1,11 +1,11 @@
- #ifndef VCT_H
- #define VCT_H
-
--#if HAVE_SCHEME
-- typedef struct s7_cell vct;
--#else
--typedef struct vct vct;
--#endif
-+typedef struct {
-+ mus_long_t length;
-+ mus_float_t *data;
-+ bool dont_free;
-+} vct;
-
- #ifdef __cplusplus
- extern "C" {
+diff -bur snd-14.1.orig/snd-ladspa.c snd-14.1/snd-ladspa.c
+--- snd-14.1.orig/snd-ladspa.c 2013-10-28 16:07:53.260612114 +0800
++++ snd-14.1/snd-ladspa.c 2013-10-28 16:11:18.792831983 +0800
+@@ -1191,7 +1191,7 @@
+ if (descriptor->connect_port)
+ descriptor->connect_port(XEN_TO_C_Ladspa_Handle(ptr),
+ XEN_TO_C_ULONG(port),
+- double_to_float(samples->data, samples->length)
++ double_to_float(mus_vct_data(samples), mus_vct_length(samples))
+ );
+ return(XEN_FALSE);
+ }
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 86b6509e0..c223c4fef 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198436 2013-10-30 14:51:45Z allan $
+# $Id: PKGBUILD 201266 2013-12-07 10:35:06Z bpiotrowski $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=source-highlight
pkgver=3.1.7
-pkgrel=6
+pkgrel=9
pkgdesc="Convert source code to syntax highlighted document"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/src-highlite/"
@@ -16,7 +16,7 @@ source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
md5sums=('0ff81588d3536b4c4e571122ba940595')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -25,7 +25,10 @@ build() {
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make prefix="${pkgdir}/usr" bash_completiondir="${pkgdir}/usr/share/bash-completion/completions" install
+
+ # PKGBUILD syntax highlighting
+ echo -e "\npkgbuild = sh.lang" >> "${pkgdir}"/usr/share/${pkgname}/lang.map
}
diff --git a/extra/spice/CVE-2013-4282.patch b/extra/spice/CVE-2013-4282.patch
new file mode 100644
index 000000000..3dfa1c8f2
--- /dev/null
+++ b/extra/spice/CVE-2013-4282.patch
@@ -0,0 +1,104 @@
+From 8af619009660b24e0b41ad26b30289eea288fcc2 Mon Sep 17 00:00:00 2001
+From: Christophe Fergeau <cfergeau@redhat.com>
+Date: Fri, 23 Aug 2013 09:29:44 +0000
+Subject: Fix buffer overflow when decrypting client SPICE ticket
+
+reds_handle_ticket uses a fixed size 'password' buffer for the decrypted
+password whose size is SPICE_MAX_PASSWORD_LENGTH. However,
+RSA_private_decrypt which we call for the decryption expects the
+destination buffer to be at least RSA_size(link->tiTicketing.rsa)
+bytes long. On my spice-server build, SPICE_MAX_PASSWORD_LENGTH
+is 60 while RSA_size() is 128, so we end up overflowing 'password'
+when using long passwords (this was reproduced using the string:
+'fullscreen=1proxy=#enter proxy here; e.g spice_proxy = http://[proxy]:[port]'
+as a password).
+
+When the overflow occurs, QEMU dies with:
+*** stack smashing detected ***: qemu-system-x86_64 terminated
+
+This commit ensures we use a corectly sized 'password' buffer,
+and that it's correctly nul-terminated so that we can use strcmp
+instead of strncmp. To keep using strncmp, we'd need to figure out
+which one of 'password' and 'taTicket.password' is the smaller buffer,
+and use that size.
+
+This fixes rhbz#999839
+---
+diff --git a/server/reds.c b/server/reds.c
+index 892d247..2a0002b 100644
+--- a/server/reds.c
++++ b/server/reds.c
+@@ -1926,39 +1926,59 @@ static void reds_handle_link(RedLinkInfo *link)
+ static void reds_handle_ticket(void *opaque)
+ {
+ RedLinkInfo *link = (RedLinkInfo *)opaque;
+- char password[SPICE_MAX_PASSWORD_LENGTH];
++ char *password;
+ time_t ltime;
++ int password_size;
+
+ //todo: use monotonic time
+ time(&ltime);
+- RSA_private_decrypt(link->tiTicketing.rsa_size,
+- link->tiTicketing.encrypted_ticket.encrypted_data,
+- (unsigned char *)password, link->tiTicketing.rsa, RSA_PKCS1_OAEP_PADDING);
++ if (RSA_size(link->tiTicketing.rsa) < SPICE_MAX_PASSWORD_LENGTH) {
++ spice_warning("RSA modulus size is smaller than SPICE_MAX_PASSWORD_LENGTH (%d < %d), "
++ "SPICE ticket sent from client may be truncated",
++ RSA_size(link->tiTicketing.rsa), SPICE_MAX_PASSWORD_LENGTH);
++ }
++
++ password = g_malloc0(RSA_size(link->tiTicketing.rsa) + 1);
++ password_size = RSA_private_decrypt(link->tiTicketing.rsa_size,
++ link->tiTicketing.encrypted_ticket.encrypted_data,
++ (unsigned char *)password,
++ link->tiTicketing.rsa,
++ RSA_PKCS1_OAEP_PADDING);
++ if (password_size == -1) {
++ spice_warning("failed to decrypt RSA encrypted password: %s",
++ ERR_error_string(ERR_get_error(), NULL));
++ goto error;
++ }
++ password[password_size] = '\0';
+
+ if (ticketing_enabled && !link->skip_auth) {
+ int expired = taTicket.expiration_time < ltime;
+
+ if (strlen(taTicket.password) == 0) {
+- reds_send_link_result(link, SPICE_LINK_ERR_PERMISSION_DENIED);
+ spice_warning("Ticketing is enabled, but no password is set. "
+- "please set a ticket first");
+- reds_link_free(link);
+- return;
++ "please set a ticket first");
++ goto error;
+ }
+
+- if (expired || strncmp(password, taTicket.password, SPICE_MAX_PASSWORD_LENGTH) != 0) {
++ if (expired || strcmp(password, taTicket.password) != 0) {
+ if (expired) {
+ spice_warning("Ticket has expired");
+ } else {
+ spice_warning("Invalid password");
+ }
+- reds_send_link_result(link, SPICE_LINK_ERR_PERMISSION_DENIED);
+- reds_link_free(link);
+- return;
++ goto error;
+ }
+ }
+
+ reds_handle_link(link);
++ goto end;
++
++error:
++ reds_send_link_result(link, SPICE_LINK_ERR_PERMISSION_DENIED);
++ reds_link_free(link);
++
++end:
++ g_free(password);
+ }
+
+ static inline void async_read_clear_handlers(AsyncRead *obj)
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/spice/PKGBUILD b/extra/spice/PKGBUILD
index 0e209a9e1..65f55a0a2 100644
--- a/extra/spice/PKGBUILD
+++ b/extra/spice/PKGBUILD
@@ -1,18 +1,23 @@
-# $Id: PKGBUILD 198438 2013-10-30 14:52:32Z allan $
+# $Id: PKGBUILD 199889 2013-11-18 07:36:22Z tpowa $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws>
pkgname=spice
pkgver=0.12.4
-pkgrel=2
+pkgrel=3
pkgdesc="SPICE client and server"
arch=('i686' 'x86_64')
url="http://spice-space.org"
license=('LGPL2.1')
depends=(alsa-lib celt0.5.1 libcacard libjpeg-turbo libsasl libxinerama libxfixes libxrandr pixman)
makedepends=(python2-pyparsing qemu spice-protocol)
-source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2)
-md5sums=('325b1c42ce24e75de45a75876b73a8bd')
+source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2
+ CVE-2013-4282.patch)
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -Np1 -i ../CVE-2013-4282.patch
+}
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -24,3 +29,5 @@ package() {
cd "$srcdir/$pkgname-$pkgver"
make DESTDIR="$pkgdir/" install
}
+md5sums=('325b1c42ce24e75de45a75876b73a8bd'
+ '24a1648e7c684b4444d7921b5534767e')
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 6cef631d0..46315af84 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 198439 2013-10-30 14:52:53Z allan $
+# $Id: PKGBUILD 201374 2013-12-09 21:50:07Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgbase="sqlite"
pkgname=('sqlite' 'sqlite-tcl')
-_amalgamationver=3080100
+_amalgamationver=3080200
_docver=${_amalgamationver}
#_docver=3080001
-pkgver=3.8.1
-pkgrel=2
+pkgver=3.8.2
+pkgrel=1
pkgdesc="A C library that implements an SQL database engine"
arch=('i686' 'x86_64' 'mips64el')
license=('custom:Public Domain')
@@ -17,12 +17,10 @@ makedepends=('tcl' 'readline')
source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with a configure script and makefile for building it; includes now also the Tcl Extension Architecture (TEA)
http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
http://www.sqlite.org/2013/sqlite-doc-${_docver}.zip
- xbmc.patch
license.txt)
options=('!emptydirs')
-sha1sums=('42464b07df2d6f8aa28f73ce4cc6d48b47be810e'
- 'd7cb698f32318fbf5dce9f10c9cd7b84c3d70105'
- '01bcbffc422b354a4ad6737e472f06b321ce52ef'
+sha1sums=('6033ef603ce221d367c665477514d972ef1dc90e'
+ 'b9cbd42d08b8c1ce96656a6b111e918bb515b605'
'f34f6daa4ab3073d74e774aad21d66878cf26853')
build() {
@@ -31,10 +29,6 @@ build() {
# build sqlite
cd "$srcdir"/sqlite-autoconf-$_amalgamationver
- # fix http://www.sqlite.org/src/info/9aac4e588c?sbs=0
- # https://bugs.archlinux.org/task/37417
- patch -Np1 -i $srcdir/xbmc.patch
-
./configure --prefix=/usr \
--disable-static
make
diff --git a/extra/sqlite/xbmc.patch b/extra/sqlite/xbmc.patch
deleted file mode 100644
index 3a58dd242..000000000
--- a/extra/sqlite/xbmc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: src/where.c
-==================================================================
---- src/sqlite3.c
-+++ src/sqlite3.c
-@@ -876,11 +876,14 @@
- while( pScan->iEquiv<=pScan->nEquiv ){
- iCur = pScan->aEquiv[pScan->iEquiv-2];
- iColumn = pScan->aEquiv[pScan->iEquiv-1];
- while( (pWC = pScan->pWC)!=0 ){
- for(pTerm=pWC->a+k; k<pWC->nTerm; k++, pTerm++){
-- if( pTerm->leftCursor==iCur && pTerm->u.leftColumn==iColumn ){
-+ if( pTerm->leftCursor==iCur
-+ && pTerm->u.leftColumn==iColumn
-+ && (pScan->iEquiv<=2 || !ExprHasProperty(pTerm->pExpr, EP_FromJoin))
-+ ){
- if( (pTerm->eOperator & WO_EQUIV)!=0
- && pScan->nEquiv<ArraySize(pScan->aEquiv)
- ){
- int j;
- pX = sqlite3ExprSkipCollate(pTerm->pExpr->pRight);
-
-
diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD
index d0bc12d08..a0e3cd17e 100644
--- a/extra/subversion/PKGBUILD
+++ b/extra/subversion/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198442 2013-10-30 14:53:59Z allan $
+# $Id: PKGBUILD 200590 2013-11-29 15:17:27Z angvp $
# Maintainer: Angel Velasquez <angvp@archlinux.org>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=subversion
-pkgver=1.8.3
+pkgver=1.8.5
pkgrel=1
pkgdesc="A Modern Concurrent Version Control System"
arch=('i686' 'x86_64' 'mips64el')
@@ -31,7 +31,7 @@ source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc
svnserve.tmpfiles
svnserve.service
subversion.rpath.fix.patch)
-md5sums=('7d7bd97347a4491e1ffb529563ce2e9e'
+md5sums=('77349caf0ef5a612c9718c53516a9934'
'SKIP'
'a0db6dd43af33952739b6ec089852630'
'c459e299192552f61578f3438abf0664'
@@ -103,3 +103,4 @@ package() {
ln -sf subversion "${pkgdir}"/usr/share/bash-completion/completions/${i}
done
}
+
diff --git a/extra/suitesparse/PKGBUILD b/extra/suitesparse/PKGBUILD
index 81bc936a3..399dd7c78 100644
--- a/extra/suitesparse/PKGBUILD
+++ b/extra/suitesparse/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 185110 2013-05-11 08:04:24Z ronald $
+# $Id: PKGBUILD 199830 2013-11-17 07:57:13Z allan $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
pkgname=suitesparse
@@ -13,6 +13,7 @@ replaces=('umfpack')
depends=('blas' 'lapack')
makedepends=('gcc-fortran')
license=('GPL')
+options=('staticlibs')
source=(http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-$pkgver.tar.gz)
sha1sums=('ea6688bd6f6adf81e2e5aacdc71d7dcf9a5d208d')
diff --git a/extra/syslog-ng/PKGBUILD b/extra/syslog-ng/PKGBUILD
index 585357deb..3bf81bf20 100644
--- a/extra/syslog-ng/PKGBUILD
+++ b/extra/syslog-ng/PKGBUILD
@@ -1,54 +1,47 @@
-# $Id: PKGBUILD 198445 2013-10-30 14:55:06Z allan $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Eric Bélanger <eric@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
+# $Id: PKGBUILD 201450 2013-12-11 20:06:25Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=syslog-ng
-pkgver=3.4.3
+pkgver=3.5.2
pkgrel=1
pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
arch=('i686' 'x86_64')
-license=('GPL2')
url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('awk' 'eventlog' 'glib2' 'libcap' 'openssl' 'systemd')
-makedepends=('flex' 'pkg-config' 'python2')
+license=('GPL2' 'LGPL2.1')
+depends=('awk' 'eventlog' 'openssl' 'systemd')
+makedepends=('python2' 'libxslt')
optdepends=('logrotate: for rotating log files')
backup=('etc/syslog-ng/scl.conf'
'etc/syslog-ng/syslog-ng.conf'
'etc/logrotate.d/syslog-ng')
-install=$pkgname.install
-source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
- syslog-ng.conf
- syslog-ng.logrotate)
-sha1sums=('70433d041b2e48c598ee7595d89ddb2e1f6450b4'
- '0aaf695ea6756b59198ff2e4af237b4a6186525d'
+source=(http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz
+ syslog-ng.conf syslog-ng.logrotate)
+sha1sums=('f0c91e14ee1f691cf680daf942d84ed87e5469c0'
+ 'b5b0d54ec295c6f8a62f68238c36fe62da01ef6e'
'949128fe3d7f77a7aab99048061f885bc758000c')
-build() {
+prepare() {
cd "$pkgname-$pkgver"
+ sed -i -e 's,/bin/,/usr/bin/,' -e 's,/sbin/,/bin/,' contrib/systemd/syslog-ng.service
+}
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc/syslog-ng \
- --libexecdir=/usr/lib \
- --sbindir=/usr/bin \
- --localstatedir=/var/lib/syslog-ng \
- --datadir=/usr/share/syslog-ng \
- --with-pidfile-dir=/run \
- --disable-spoof-source \
- --enable-ipv6 \
- --enable-systemd \
- --with-systemdsystemunitdir=/usr/lib/systemd/system
-
+build() {
+ cd "$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc/syslog-ng --libexecdir=/usr/lib \
+ --sbindir=/usr/bin --localstatedir=/var/lib/syslog-ng --datadir=/usr/share/syslog-ng \
+ --with-pidfile-dir=/run --disable-spoof-source --enable-ipv6 \
+ --enable-systemd --with-systemdsystemunitdir=/usr/lib/systemd/system
make
}
+check() {
+ cd "$pkgname-$pkgver"
+ make check
+}
+
package() {
make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
-
- sed -i 's,/sbin/,/bin/,' "$pkgdir/usr/lib/systemd/system/syslog-ng.service"
}
diff --git a/extra/syslog-ng/syslog-ng.conf b/extra/syslog-ng/syslog-ng.conf
index 969798e6d..bb89a82f3 100644
--- a/extra/syslog-ng/syslog-ng.conf
+++ b/extra/syslog-ng/syslog-ng.conf
@@ -1,4 +1,4 @@
-@version: 3.4
+@version: 3.5
#
# /etc/syslog-ng/syslog-ng.conf
#
diff --git a/extra/syslog-ng/syslog-ng.install b/extra/syslog-ng/syslog-ng.install
deleted file mode 100644
index a9365d6fe..000000000
--- a/extra/syslog-ng/syslog-ng.install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
- if [ "$(vercmp 3.3.6-3 "$2")" -eq 1 ]; then
- printf '==> syslog-ng now reads from /run/systemd/journal/syslog in the\n'
- printf ' default config. If you still use sysvinit/initscripts, this\n'
- printf ' must be /dev/log in /etc/syslog-ng/syslog-ng.conf\n'
- fi
-}
diff --git a/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch b/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch
new file mode 100644
index 000000000..0d08a3da8
--- /dev/null
+++ b/extra/system-config-printer/40_scp-dbus-service-fix-dbus-signature-typo.patch
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' system-config-printer-1.4.2+20130920/scp-dbus-service.py system-config-printer-1.4.2+20130920.new/scp-dbus-service.py
+--- system-config-printer-1.4.2+20130920/scp-dbus-service.py 2013-09-20 22:26:27.000000000 +0200
++++ system-config-printer-1.4.2+20130920.new/scp-dbus-service.py 2013-10-24 13:12:44.998717234 +0200
+@@ -367,7 +367,7 @@
+ pass
+
+ @dbus.service.signal(dbus_interface=CONFIG_NEWPRINTERDIALOG_IFACE,
+- signature='a{s}')
++ signature='a(s)')
+ def DriverDownloadChecked(self, installed_files):
+ pass
+
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index a798f6ed6..d7864141f 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 195976 2013-10-06 19:13:25Z eric $
+# $Id: PKGBUILD 200771 2013-12-04 20:14:29Z jgc $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
pkgname=system-config-printer
-pkgver=1.4.2
-pkgrel=1
+pkgver=1.4.3
+pkgrel=2
pkgdesc="A CUPS printer configuration tool and status applet"
url="http://cyberelk.net/tim/software/system-config-printer/"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,12 +15,16 @@ makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
optdepends=('gnome-keyring: password management')
replaces=('system-config-printer-common' 'system-config-printer-gnome')
conflicts=('system-config-printer-common' 'system-config-printer-gnome')
-source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('7f6462d84056be13aadeb6e3030aad5e'
- 'SKIP')
+source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}
+ 40_scp-dbus-service-fix-dbus-signature-typo.patch)
+md5sums=('99e251bfd281526fb6ea109b3e2bace3'
+ 'SKIP'
+ 'a616371aff9fae27b99d036c4143bf37')
prepare() {
cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../40_scp-dbus-service-fix-dbus-signature-typo.patch
+
sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
-e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
$(find . -name '*.py')
diff --git a/extra/tali/PKGBUILD b/extra/tali/PKGBUILD
index ddeb7113c..d5994380d 100644
--- a/extra/tali/PKGBUILD
+++ b/extra/tali/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168943 2012-10-16 16:31:44Z heftig $
+# $Id: PKGBUILD 199338 2013-11-11 11:09:59Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=tali
-pkgver=3.10.0
+pkgver=3.10.2
pkgrel=1
pkgdesc="Beat the odds in a poker-style dice game"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ install=tali.install
url="https://live.gnome.org/Tali"
groups=('gnome-extra')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2e276e6965057fe3136fe831809b2cedab3e8f59346b0fbe37f3f383a25c68c6')
+sha256sums=('6a1c1f1dfe8591d3f74f2d46edae9172606581efbb6bbe04f43b2b908a24383b')
build() {
cd $pkgname-$pkgver
diff --git a/extra/tamu-anova/PKGBUILD b/extra/tamu-anova/PKGBUILD
index d6a14160f..5153853ee 100644
--- a/extra/tamu-anova/PKGBUILD
+++ b/extra/tamu-anova/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 151550 2012-02-27 16:38:42Z giovanni $
+# $Id: PKGBUILD 199832 2013-11-17 07:59:39Z allan $
# Maintainer: Ronald van Haren <ronald@archlinux.org>
# Contributor: Gergely Imreh <imrehg(at)gmail(dot)com>
@@ -12,6 +12,7 @@ license=('GPL')
depends=('gsl')
makedepends=('gcc')
install=tamu-anova.install
+options=('staticlibs')
source=(http://www.mirrorservice.org/sites/www.ibiblio.org/gentoo/distfiles/tamu_anova-0.2.1.tar.gz)
sha1sums=('8c7ffae14ebe92f27d20ff1f0e325875fa6ced53')
diff --git a/extra/tcpdump/PKGBUILD b/extra/tcpdump/PKGBUILD
index c7a65c864..9811fa83e 100644
--- a/extra/tcpdump/PKGBUILD
+++ b/extra/tcpdump/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185812 2013-05-19 11:54:46Z giovanni $
+# $Id: PKGBUILD 200343 2013-11-26 17:54:59Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: dorphell <dorphell@archlinux.org>
pkgname=tcpdump
-pkgver=4.4.0
-pkgrel=2
+pkgver=4.5.1
+pkgrel=1
pkgdesc="A tool for network monitoring and data acquisition"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.tcpdump.org"
@@ -12,14 +12,18 @@ license=('BSD')
depends=('libpcap' 'openssl')
source=("http://www.tcpdump.org/release/${pkgname}-${pkgver}.tar.gz"
'tcpdump_duplicate_executable.patch')
-md5sums=('6f75aabcffd012f73bd7c331bb5d8232'
+md5sums=('973a2513d0076e34aa9da7e15ed98e1b'
'01379e4a12a208ce951c6c2abe80300f')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
# do not install tcpdump-4.1.1 executable (FS#23346)
patch -Np1 -i "${srcdir}/tcpdump_duplicate_executable.patch"
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
--sbindir=/usr/bin \
diff --git a/extra/tevent/PKGBUILD b/extra/tevent/PKGBUILD
index 82c199ad0..6ecf5e917 100644
--- a/extra/tevent/PKGBUILD
+++ b/extra/tevent/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 182652 2013-04-12 07:10:43Z tpowa $
+# $Id: PKGBUILD 200377 2013-11-27 08:49:58Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Christian Hesse <mail@eworm.de>
# Contributor: Marco A Rojas <marquicus at gmail dot com>
@@ -6,7 +6,7 @@
# Contributor: Thomas Burdick <thomas.burdick@gmail.com>
pkgname=tevent
-pkgver=0.9.18
+pkgver=0.9.19
pkgrel=1
pkgdesc="An event system based on the talloc memory management library"
arch=('i686' 'x86_64' 'mips64el')
@@ -33,4 +33,4 @@ package() {
make
make DESTDIR=${pkgdir}/ install
}
-md5sums=('952535f0bcf002eee5a8db68deb6374b')
+md5sums=('f9ecb7e344bd20fb40f05e97116523f2')
diff --git a/extra/thinkfinger/PKGBUILD b/extra/thinkfinger/PKGBUILD
index 5e82da674..7760f310b 100644
--- a/extra/thinkfinger/PKGBUILD
+++ b/extra/thinkfinger/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198456 2013-10-30 14:59:04Z allan $
+# $Id: PKGBUILD 199955 2013-11-20 10:57:59Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: François Charette <francois.archlinux.org>
# Contributor: Damir Perisa <damir.archlinux.org>
@@ -6,7 +6,7 @@
pkgname=thinkfinger
pkgver=0.3
-pkgrel=7
+pkgrel=8
pkgdesc="A driver for the SGS Thomson Microelectronics fingerprint reader found in most IBM/Lenovo ThinkPads"
url="http://thinkfinger.sourceforge.net/"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/totem-plparser/PKGBUILD b/extra/totem-plparser/PKGBUILD
index 7dea33a64..0554a7d3f 100644
--- a/extra/totem-plparser/PKGBUILD
+++ b/extra/totem-plparser/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198463 2013-10-30 15:01:39Z allan $
+# $Id: PKGBUILD 199437 2013-11-12 18:17:30Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=totem-plparser
pkgver=3.10.0
-pkgrel=2
+pkgrel=3
url="http://www.gnome.org"
pkgdesc="Totem playlist parser library"
license=('LGPL')
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index 7cc1868a5..fb4e6ede9 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198661 2013-11-01 15:51:58Z heftig $
+# $Id: PKGBUILD 200225 2013-11-23 08:02:48Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Alexander Fehr <pizzapunk gmail com>
pkgbase=tracker
pkgname=(tracker libtracker-sparql)
-pkgver=0.16.3
+pkgver=0.16.4
_tver=${pkgver%.*}
pkgrel=1
pkgdesc="All-in-one indexer, search tool and metadata database"
@@ -19,7 +19,7 @@ makedepends=(libgee libsecret upower libexif exempi
url="http://www.gnome.org"
options=('!emptydirs')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz)
-sha256sums=('c5299cbfb2b33f62f06afeb2ebca5b7095b77438fc6c8db6a24dc2ef649537ba')
+sha256sums=('9c2f50839c2b8b352ab9a022597ef985c1900e6286c0c3bcb7a64da39dbb3580')
build() {
cd $pkgbase-$pkgver
diff --git a/extra/twisted/PKGBUILD b/extra/twisted/PKGBUILD
index 9dc4e570f..e5fd06a78 100644
--- a/extra/twisted/PKGBUILD
+++ b/extra/twisted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191375 2013-07-24 21:41:22Z eric $
+# $Id: PKGBUILD 199383 2013-11-11 21:37:43Z eric $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=twisted
-pkgver=13.1.0
+pkgver=13.2.0
pkgrel=1
pkgdesc="Asynchronous networking framework written in Python"
arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ optdepends=('python2-pyopenssl'
'tk: for using tkconch')
install=twisted.install
source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-sha1sums=('7f6e07b8098b248157ac26378fafa9e018f279a7')
+sha1sums=('e1d43645fd3d84dc2867f36b60d2e469a71eb01d')
prepare() {
cd "Twisted-$pkgver"
diff --git a/extra/vala/PKGBUILD b/extra/vala/PKGBUILD
index f1a689a05..5625554de 100644
--- a/extra/vala/PKGBUILD
+++ b/extra/vala/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198473 2013-10-30 15:04:37Z allan $
+# $Id: PKGBUILD 199492 2013-11-13 13:49:20Z heftig $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Timm Preetz <timm@preetz.us>
pkgname=vala
-pkgver=0.22.0
+pkgver=0.22.1
pkgrel=1
pkgdesc="Compiler for the GObject type system"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL')
depends=('glib2')
makedepends=('libxslt')
source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2f60a7ff887fcb16ed70fa84bb5872c2c54099a0732ce3f9e2c56e51a9208037')
+sha256sums=('92c61b94a427f281ba2537b69135a3be23248b153268057d7195003dd6aba28c')
build() {
cd $pkgname-$pkgver
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index 6123b6b6f..2a0fc272e 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196839 2013-10-20 12:23:36Z allan $
+# $Id: PKGBUILD 199307 2013-11-10 08:38:12Z allan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer: Allan McRae <allan@archlinux.org>
pkgname=valgrind
-pkgver=3.8.1
-pkgrel=4
+pkgver=3.9.0
+pkgrel=1
pkgdesc="A tool to help find memory-management problems in programs"
arch=('i686' 'x86_64')
license=('GPL')
@@ -12,28 +12,9 @@ url="http://valgrind.org/"
depends=('glibc>=2.18' 'glibc<2.19' 'perl')
makedepends=('gdb')
options=('staticlibs' '!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
- valgrind-3.8.1-glibc-2.18.patch
- valgrind-3.8.1-ptrace-build-fix.patch
- valgrind-3.8.1-xaddb.patch)
-md5sums=('288758010b271119a0ffc0183f1d6e38'
- 'f3f911e6f5b0ab9d176d40b47d6cae24'
- '9d429e62255621a0c190a8180d8ab1a4'
- 'aad7751a3e4ee899093dcfa9f70a449b')
+source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('0947de8112f946b9ce64764af7be6df2')
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- patch -p1 -i $srcdir/valgrind-3.8.1-glibc-2.18.patch
-
- # based on svn commits 13471 & 13482
- patch -p0 -i $srcdir/valgrind-3.8.1-ptrace-build-fix.patch
-
- # https://bugs.kde.org/show_bug.cgi?id=307106
- patch -p0 -i $srcdir/valgrind-3.8.1-xaddb.patch
-
- ./autogen.sh
-}
build() {
cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD
index bc6751e26..e0cc501ea 100644
--- a/extra/vamp-plugin-sdk/PKGBUILD
+++ b/extra/vamp-plugin-sdk/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198474 2013-10-30 15:05:08Z allan $
+# $Id: PKGBUILD 199953 2013-11-20 10:54:48Z allan $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Orivej Desh <smpuj@bk.ru>
pkgname=vamp-plugin-sdk
pkgver=2.5
_dir=690
-pkgrel=1
+pkgrel=2
pkgdesc="The Vamp audio analysis plug-in system"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.vamp-plugins.org/"
diff --git a/extra/varnish/PKGBUILD b/extra/varnish/PKGBUILD
index 537dae473..49bb04f81 100644
--- a/extra/varnish/PKGBUILD
+++ b/extra/varnish/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 198475 2013-10-30 15:05:30Z allan $
+# $Id: PKGBUILD 200724 2013-12-03 14:59:11Z dreisner $
# Maintainer: Dave Reisner <dreisner@archlinux.org>
# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Douglas Soares de Andrade
# Contributor: Roberto Alsina <ralsina@kde.org>
pkgname=varnish
-pkgver=3.0.4
-pkgrel=2
+pkgver=3.0.5
+pkgrel=1
pkgdesc="High-performance HTTP accelerator"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.varnish-cache.org/"
@@ -17,9 +17,9 @@ install=$pkgname.install
source=("http://repo.varnish-cache.org/source/$pkgname-$pkgver.tar.gz"
varnish-vcl-reload
varnish.service)
-md5sums=('a130ce9c3504b9603a46542635e18701'
+md5sums=('674d44775cc927aee4601edb37f60198'
'03196dee7fc68e75069393d52c370762'
- 'a59b17d8e3066abcf3dd7755a2212dd4')
+ '276f1761b3c7c6a83688038659194bbb')
build() {
cd "$pkgname-$pkgver"
diff --git a/extra/varnish/varnish.service b/extra/varnish/varnish.service
index 851e32140..01fda89c2 100644
--- a/extra/varnish/varnish.service
+++ b/extra/varnish/varnish.service
@@ -3,7 +3,7 @@ Description=Web Application Accelerator
After=network.target
[Service]
-ExecStart=/usr/bin/varnishd -a 0.0.0.0:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
+ExecStart=/usr/bin/varnishd -a 0.0.0.0:80,[::]:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M -u nobody -g nobody -F
ExecReload=/usr/bin/varnish-vcl-reload
[Install]
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 3f1c3e15b..b2fb1429e 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 197516 2013-10-26 12:19:28Z andyrtr $
+# $Id: PKGBUILD 201267 2013-12-07 10:35:07Z bpiotrowski $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgbase=vigra
pkgname=('vigra' 'vigra-doc')
pkgver=1.9.0
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64' 'mips64el')
url="http://hci.iwr.uni-heidelberg.de/vigra/"
license=('custom:MIT')
diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD
index a2fba37ca..1f59b65e5 100644
--- a/extra/vim/PKGBUILD
+++ b/extra/vim/PKGBUILD
@@ -6,11 +6,11 @@
pkgbase=vim
pkgname=('vim' 'gvim' 'vim-runtime')
_topver=7.4
-_patchlevel=16
-__hgrev=d17ef148ada4
+_patchlevel=86
+__hgrev=f6940759212d
_versiondir="vim${_topver//./}"
pkgver=${_topver}.${_patchlevel}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('custom:vim')
url="http://www.vim.org"
@@ -20,7 +20,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
'vimrc'
'archlinux.vim'
'gvim.desktop')
-md5sums=('733cce44a08ea953ad0e1f9d574670e0'
+md5sums=('436d4d3c6402ce20309bf2cdedce63c0'
'SKIP'
'b9d4dcb9d3ee2e151dc4be1e94934f6a'
'10353a61aadc3f276692d0e17db1478e'
diff --git a/extra/vinagre/PKGBUILD b/extra/vinagre/PKGBUILD
index 474e69271..a29e6644e 100644
--- a/extra/vinagre/PKGBUILD
+++ b/extra/vinagre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198477 2013-10-30 15:06:10Z allan $
+# $Id: PKGBUILD 199391 2013-11-11 22:11:24Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Allan McRae <mcrae_allan@hotmail.com>
# Contributor: lp76 <l.peduto@gmail.com>
pkgname=vinagre
-pkgver=3.10.1
+pkgver=3.10.2
pkgrel=1
pkgdesc="A VNC Client for the GNOME Desktop"
arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ makedepends=(docbook-xsl intltool freerdp openssh itstool spice-protocol)
groups=(gnome-extra)
options=('!emptydirs')
source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('ea8cc79e227148359d3582ff121dab864913eb1dfcba6458e11da32d4dfec503')
+sha256sums=('72907079da70dcda63870a790db956bebee241a920daa99c4a80766c177ead87')
build() {
cd $pkgname-$pkgver
diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD
index d091bb6e8..7b00b5e82 100644
--- a/extra/vlc/PKGBUILD
+++ b/extra/vlc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198478 2013-10-30 15:06:33Z allan $
+# $Id: PKGBUILD 201400 2013-12-10 17:02:18Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
-pkgver=2.1.0
-pkgrel=5
+pkgver=2.1.2
+pkgrel=1
pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.videolan.org/vlc/"
@@ -13,12 +13,13 @@ license=('LGPL2.1' 'GPL2')
depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'qt4' 'libproxy'
'sdl_image' 'libdvdnav' 'libtiger' 'lua' 'libmatroska'
'zvbi' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp'
- 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms')
+ 'libshout' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar'
+ 'libxinerama')
makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs'
'libdc1394' 'libavc1394' 'libcaca'
'librsvg' 'portaudio' 'libgme' 'xosd'
'twolame' 'aalib' 'libmtp' 'libdvdcss' 'gnome-vfs'
- 'libgoom2' 'libtar' 'vcdimager' 'opus' 'libssh2' 'mesa')
+ 'libgoom2' 'vcdimager' 'opus' 'libssh2' 'mesa')
[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'projectm')
optdepends=('avahi: for service discovery using bonjour protocol'
'libnotify: for notification plugin'
@@ -42,7 +43,6 @@ optdepends+=('libcaca: for colored ASCII art video output'
'gnome-vfs: for GNOME Virtual File System support'
'libgoom2: for libgoom plugin'
'vcdimager: navigate VCD with libvcdinfo'
- 'xosd: for xosd support'
'aalib: for ASCII art plugin'
'libmtp: for MTP devices support'
'smbclient: for SMB access plugin'
@@ -50,29 +50,30 @@ optdepends+=('libcaca: for colored ASCII art video output'
'ttf-freefont: for subtitle font '
'ttf-dejavu: for subtitle font'
'opus: for opus support'
- 'libssh2: for sftp support')
+ 'libssh2: for sftp support'
+ 'lua-socket: for http interface')
conflicts=('vlc-plugin')
replaces=('vlc-plugin')
backup=('usr/share/vlc/lua/http/.hosts'
'usr/share/vlc/lua/http/dialogs/.hosts')
options=('!emptydirs')
install=vlc.install
-source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver/.a}/${pkgname}-${pkgver/.a/a}.tar.xz"
-vlc-2.0.7-vaapi-compat.patch)
-md5sums=('8c77bda671821f5b9ede96b6816e2ade'
+source=("http://download.videolan.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ 'vlc-2.0.7-vaapi-compat.patch')
+md5sums=('fb6787ad749aadcfaeab3471939b3426'
'6df10774bb7acf20e09d6139e5c7839e')
prepare() {
- cd "${srcdir}/${pkgname}-${pkgver/.a}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../vlc-2.0.7-vaapi-compat.patch
+ patch -Np1 -i "${srcdir}/vlc-2.0.7-vaapi-compat.patch"
sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c
sed -i -e 's:truetype/ttf-dejavu:TTF:g' modules/visualization/projectm.cpp
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver/.a}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
[ "$CARCH" = "mips64el" ] && extraconf="--disable-lirc"
CFLAGS+="-I/usr/include/samba-4.0" CPPFLAGS+="-I/usr/include/samba-4.0" \
@@ -82,29 +83,27 @@ build() {
--enable-faad \
--enable-nls \
--enable-lirc \
- --enable-pvr \
--enable-ncurses \
--enable-realrtsp \
- --enable-xosd \
--enable-aa \
--enable-vcdx \
--enable-upnp \
--enable-opus \
--enable-sftp \
$extraconf \
- LUAC=luac5.1 \
+ LUAC=/usr/bin/luac LUA_LIBS="`pkg-config --libs lua`" \
RCC=/usr/bin/rcc-qt4
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver/.a}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
for res in 16 32 48 128; do
- install -D -m644 "${srcdir}/vlc-${pkgver/.a}/share/icons/${res}x${res}/vlc.png" \
- "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
+ install -D -m644 "${srcdir}/vlc-${pkgver}/share/icons/${res}x${res}/vlc.png" \
+ "${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
done
}
diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD
index 8f522c943..68462be22 100644
--- a/extra/w3m/PKGBUILD
+++ b/extra/w3m/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 175136 2013-01-15 01:58:54Z bisson $
-# Contributor: dorphell <dorphell@archlinux.org>
+# $Id: PKGBUILD 199274 2013-11-09 05:21:55Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
pkgname=w3m
pkgver=0.5.3
-pkgrel=4.1
+pkgrel=5
pkgdesc='Text-based Web browser, as well as pager'
url='http://w3m.sourceforge.net/'
license=('custom')
@@ -12,22 +12,24 @@ arch=('i686' 'x86_64' 'mips64el')
makedepends=('imlib2')
optdepends=('imlib2: for graphics support')
depends=('openssl' 'gc' 'ncurses')
-source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz"
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ 'form_unknown.patch'
'file_handle.patch'
'https.patch'
'gc72.patch')
sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237'
+ '23d648033ad77f3c67d370c62cf7b7ed86b5c6f2'
'457de43be7eabc652614461a7ab25e3ba76b2aff'
'66affb2f695fe0bdde25cf774642bfd6a9404e88'
'7baa06ca684fd140503a2adc65e2d606970c4662')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ ls ../*.patch | xargs -i patch -p1 -i {}
+}
- patch -p1 -i ../file_handle.patch
- patch -p1 -i ../https.patch
- patch -p1 -i ../gc72.patch
-
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure \
--prefix=/usr \
--libexecdir=/usr/lib \
diff --git a/extra/w3m/form_unknown.patch b/extra/w3m/form_unknown.patch
new file mode 100644
index 000000000..b22b176ac
--- /dev/null
+++ b/extra/w3m/form_unknown.patch
@@ -0,0 +1,15 @@
+See: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615843
+
+Index: w3m-git/form.c
+===================================================================
+--- w3m-git.orig/form.c 2011-02-28 15:03:36.000000000 +0100
++++ w3m-git/form.c 2011-02-28 15:32:33.000000000 +0100
+@@ -196,7 +196,7 @@
+ if (!strcasecmp(typestr, _formtypetbl[i]))
+ return i;
+ }
+- return FORM_UNKNOWN;
++ return FORM_INPUT_TEXT;
+ }
+
+ void
diff --git a/extra/wcslib/PKGBUILD b/extra/wcslib/PKGBUILD
index 142469968..dce642c4c 100644
--- a/extra/wcslib/PKGBUILD
+++ b/extra/wcslib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197080 2013-10-21 16:11:19Z andrea $
+# $Id: PKGBUILD 202210 2013-12-19 13:51:19Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=wcslib
-pkgver=4.19
+pkgver=4.20
pkgrel=1
pkgdesc="A C library that implements the 'World Coordinate System' (WCS) standard in FITS"
arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('GPL3')
depends=('cfitsio')
makedepends=('gcc-fortran')
source=("ftp://ftp.atnf.csiro.au/pub/software/${pkgname}/${pkgname}.tar.bz2")
-md5sums=('79d47ab10dfde08d91c0e6184cf73bda')
+md5sums=('3513e20f236274fbc2fa22251fd0726f')
build() {
cd $pkgname-$pkgver
@@ -28,12 +28,9 @@ build() {
#}
package() {
- # Fix install on i686
- install -d "${pkgdir}"/usr/include/${pkgname}-${pkgver}
-
cd $pkgname-$pkgver
- make -j1 DESTDIR="$pkgdir/" install
-
+ make DESTDIR="$pkgdir/" install
+
# Fix wrong permissions
chmod g=rx,-s "${pkgdir}"/usr/{bin/,/lib/{,pkgconfig},share/man/man1/}
chmod -s "${pkgdir}"/usr/{include/wcslib-${pkgver}/,share/doc/wcslib-${pkgver}/{,html/}}
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD
index e5e2a4eb0..8da5919dd 100644
--- a/extra/webkitgtk/PKGBUILD
+++ b/extra/webkitgtk/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198482 2013-10-30 15:07:59Z allan $
+# $Id: PKGBUILD 200757 2013-12-04 18:15:50Z heftig $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=webkitgtk
-pkgver=2.2.0
-pkgrel=2
+pkgver=2.2.3
+pkgrel=1
pkgdesc="GTK+ Web content engine library"
arch=(i686 x86_64 mips64el)
url="http://webkitgtk.org/"
@@ -17,7 +17,7 @@ conflicts=(webkitgtk3 libwebkit3)
replaces=(webkitgtk3 libwebkit3)
options=(!emptydirs)
source=(http://webkitgtk.org/releases/$pkgname-${pkgver}.tar.xz)
-sha256sums=('84902e3255dcc6efa1298c8a1f2d2a49674126dcacea383f309aeed9e734d538')
+sha256sums=('94bcb3303aadce8454b572ab0e5d178eca3b7238f34bd3e7177b0daec04e4605')
prepare() {
cd $pkgbase-$pkgver
diff --git a/extra/weechat/PKGBUILD b/extra/weechat/PKGBUILD
index d831a5712..74a7bede6 100644
--- a/extra/weechat/PKGBUILD
+++ b/extra/weechat/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 198485 2013-10-30 15:09:03Z allan $
+# $Id: PKGBUILD 200241 2013-11-23 18:13:47Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: lucke <lucke at o2 dot pl>
pkgname=weechat
pkgver=0.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="Fast, light and extensible IRC client (curses UI)"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.weechat.org/"
license=('GPL')
depends=('gnutls' 'curl' 'libgcrypt')
-makedepends=('cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
+makedepends=('asciidoc' 'source-highlight' 'cmake' 'pkg-config' 'perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
optdepends=('perl' 'python2' 'lua' 'tcl' 'ruby' 'aspell' 'guile')
source=("http://www.weechat.org/files/src/${pkgname}-${pkgver}.tar.bz2")
md5sums=('fbbb4c319474d4a3b123fea7e8402fa2')
@@ -23,7 +23,9 @@ build() {
cd build
cmake ../${pkgname}-${pkgver} -DPREFIX=/usr \
-DPYTHON_EXECUTABLE=/usr/bin/python2 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so
+ -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
+ -DENABLE_MAN=ON \
+ -DENABLE_DOC=ON
}
package() {
diff --git a/extra/whois/PKGBUILD b/extra/whois/PKGBUILD
index 6564b180f..50e76ef90 100644
--- a/extra/whois/PKGBUILD
+++ b/extra/whois/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 191778 2013-07-30 17:02:46Z giovanni $
+# $Id: PKGBUILD 199908 2013-11-18 18:15:18Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=whois
pkgver=5.0.26
-pkgrel=1
+pkgrel=2
pkgdesc="The whois client by Marco d'Itri"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.linux.it/~md/software/"
license=('GPL')
depends=('libidn')
makedepends=('perl')
+backup=('etc/whois.conf')
source=("http://ftp.debian.org/debian/pool/main/w/whois/${pkgname}_${pkgver}.tar.xz")
md5sums=('236829eea77e85df2443a54815a1b41d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make prefix=/usr CFLAGS="$CFLAGS" HAVE_LIBIDN=1 HAVE_ICONV=1
+ make prefix=/usr \
+ CFLAGS="$CFLAGS $CPPFLAGS" \
+ CONFIG_FILE=/etc/whois.conf \
+ HAVE_LIBIDN=1 \
+ HAVE_ICONV=1
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
make prefix=/usr BASEDIR="${pkgdir}" install-whois
+ install -D -m644 whois.conf "${pkgdir}/etc/whois.conf"
}
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index 2a17fdd5b..a8c56ff10 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 198487 2013-10-30 15:09:48Z allan $
+# $Id: PKGBUILD 199951 2013-11-20 10:48:41Z allan $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
+
pkgname=windowmaker
pkgver=0.95.5
-pkgrel=1
+pkgrel=2
pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
-arch=(i686 x86_64 'mips64el')
+arch=('i686' 'x86_64' 'mips64el')
url="http://www.windowmaker.org/"
license=('GPL' 'custom')
depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
@@ -21,6 +22,7 @@ prepare() {
patch -Np0 -i ../wm-giflib.patch
autoreconf -fi
}
+
build() {
cd WindowMaker-$pkgver
[ -z "$LINGUAS" ] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
diff --git a/extra/wxmaxima/PKGBUILD b/extra/wxmaxima/PKGBUILD
index 0e3a76672..133aedbcb 100644
--- a/extra/wxmaxima/PKGBUILD
+++ b/extra/wxmaxima/PKGBUILD
@@ -4,7 +4,7 @@
# Contributor: Vinay S Shastry <vinayshastry@gmail.com>
pkgname=wxmaxima
-pkgver=13.04.1
+pkgver=13.04.2
pkgrel=1
pkgdesc="A wxWidgets GUI for the computer algebra system Maxima"
arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL2')
depends=('maxima' 'libxml2' 'wxgtk' 'shared-mime-info' 'desktop-file-utils')
source=(http://downloads.sourceforge.net/$pkgname/wxMaxima-$pkgver.tar.gz)
install=wxmaxima.install
-sha1sums=('c1d8be28f92820d0e447d186271a48a72545c887')
+sha1sums=('9508d3badb6c339f34e73e01c5065f679329a17c')
build() {
cd "${srcdir}/wxMaxima-${pkgver}"
diff --git a/extra/x11vnc/PKGBUILD b/extra/x11vnc/PKGBUILD
index eb9471cdf..5a723ce00 100644
--- a/extra/x11vnc/PKGBUILD
+++ b/extra/x11vnc/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 191363 2013-07-24 02:13:55Z bisson $
+# $Id: PKGBUILD 202637 2013-12-23 05:41:09Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: damir <damir@archlinux.org>
pkgname=x11vnc
pkgver=0.9.13
-pkgrel=4
+pkgrel=5
pkgdesc='VNC server for real X displays'
url='http://www.karlrunge.com/x11vnc/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL2')
-optdepends=('tk: for GUI support')
+optdepends=('tk: for GUI support'
+ 'net-tools: for -auth guess')
depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
'service')
diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD
index 4a06db7df..f630a3891 100644
--- a/extra/x264/PKGBUILD
+++ b/extra/x264/PKGBUILD
@@ -1,41 +1,32 @@
-# $Id: PKGBUILD 191968 2013-08-02 08:00:53Z bpiotrowski $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
+# $Id: PKGBUILD 201499 2013-12-13 07:56:25Z bpiotrowski $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: damir <damir@archlinux.org>
# Contributor: Paul Mattal <paul@archlinux.org>
pkgname=x264
-pkgver=20130702
+pkgver=20131030
pkgrel=2
-pkgdesc="free library for encoding H264/AVC video streams"
+pkgdesc='Library for encoding H264/AVC video streams'
arch=('i686' 'x86_64' 'mips64el')
-url="http://www.videolan.org/developers/x264.html"
+url='http://www.videolan.org/developers/x264.html'
license=('GPL')
depends=('glibc')
makedepends=('yasm' 'git')
-source=(git://git.videolan.org/x264.git#commit=585324fee3)
+source=(git://git.videolan.org/x264.git#commit=c628e3bac)
md5sums=('SKIP')
-pkgver() {
- cd $pkgname
- git log -1 --format="%cd" --date=short | sed 's|-||g'
-}
-
build() {
cd $pkgname
- ./configure --enable-shared \
+ ./configure --prefix=/usr \
+ --enable-shared \
--enable-pic
+
make
}
package() {
cd $pkgname
-
- make DESTDIR="$pkgdir" \
- bindir=/usr/bin \
- libdir=/usr/lib \
- includedir=/usr/include \
- install
+ make DESTDIR="$pkgdir" install
}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/x2goclient/PKGBUILD b/extra/x2goclient/PKGBUILD
index 5ac5eb002..e9c5e1e55 100644
--- a/extra/x2goclient/PKGBUILD
+++ b/extra/x2goclient/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 194273 2013-09-12 19:24:14Z andyrtr $
+# $Id: PKGBUILD 201675 2013-12-17 22:03:50Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Gerhard Brauer <gerbra@archlinux.de>
# Contributor: Richard Murri <admin@richardmurri.com>
pkgname=x2goclient
-pkgver=4.0.1.1
+pkgver=4.0.1.2
pkgrel=1
pkgdesc="x2go qt4 client"
arch=('i686' 'x86_64' 'mips64el')
@@ -14,13 +14,16 @@ depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-the
makedepends=('man2html')
install=x2goclient.install
source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('13b6729acfd5c6a00441430ef6ab69d6')
+md5sums=('500c94ce4c8a63ecabde347d526f1356')
build() {
cd ${pkgname}-${pkgver}
sed -i "s:-o root -g root ::" Makefile
- sed -i "s:lrelease:lrelease-qt4:g" Makefile
- make PREFIX=/usr
+ #make PREFIX=/usr
+ #make PREFIX=/usr build_man # target broken and making the build hang
+ make PREFIX=/usr build_pluginprovider
+ make PREFIX=/usr build_client
+ make PREFIX=/usr build_plugin
}
package() {
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD
index dba40a0bf..a3669d2b8 100644
--- a/extra/x2goserver/PKGBUILD
+++ b/extra/x2goserver/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 191716 2013-07-29 13:47:21Z andyrtr $
+# $Id: PKGBUILD 200258 2013-11-23 21:59:15Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Gerhard Brauer <gerbra@archlinux.de>
@@ -7,7 +7,7 @@
# Contributor: Milan Knížek <knizek@volny.cz>
pkgname=x2goserver
-pkgver=4.0.1.6
+pkgver=4.0.1.8
pkgrel=1
pkgdesc="Open source terminal server"
arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ install=x2goserver.install
backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql')
source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz
x2goserver.service)
-md5sums=('61f2248fb16bc035f92b9588ab19c35e'
+md5sums=('754ee94f2b4b57fc08973027a174cf81'
'f76081c01e40b6206895d194dc949707')
build() {
@@ -60,4 +60,7 @@ package() {
install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
install -m 644 "debian/changelog" "${pkgdir}/usr/share/doc/${pkgname}/changelog.DEBIAN"
install -m 644 "debian/copyright" "${pkgdir}/usr/share/doc/${pkgname}/copyright.DEBIAN"
+
+ # fix permission
+ chmod 750 ${pkgdir}/etc/sudoers.d
}
diff --git a/extra/xaos/PKGBUILD b/extra/xaos/PKGBUILD
index f964132bf..81638c8cf 100644
--- a/extra/xaos/PKGBUILD
+++ b/extra/xaos/PKGBUILD
@@ -1,25 +1,23 @@
-# $Id: PKGBUILD 184451 2013-05-06 19:40:17Z foutrelis $
+# $Id: PKGBUILD 199875 2013-11-17 22:02:34Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=xaos
-pkgver=3.5
-pkgrel=6
+pkgver=3.6
+pkgrel=1
pkgdesc="A fast portable real-time interactive fractal zoomer"
arch=('i686' 'x86_64' 'mips64el')
-url="http://sourceforge.net/projects/xaos/"
+url="http://matek.hu/xaos/"
license=('GPL')
depends=('gsl' 'libpng' 'aalib')
options=('!makeflags')
install=xaos.install
-source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz \
- xaos-3.5-libpng15.patch xaos-3.5-build-fix-i686.patch)
-sha1sums=('6d16a58187fba7276e6bd0547cc2fd6bb073b801'
- '6c51cb2ee1c5f28973680ffc3a040c2cea65fd33'
+source=(http://downloads.sourceforge.net/sourceforge/xaos/${pkgname}-${pkgver}.tar.gz
+ xaos-3.5-build-fix-i686.patch)
+sha1sums=('0c68d25c4f9c8eaf557e37d9e4586a04ab56d7a0'
'd2ea8f0460c79c47fb289a4c2f87fe5c44057f9d')
prepare() {
cd ${pkgname}-${pkgver}
- patch -p0 -i ../xaos-3.5-libpng15.patch
if [[ $CARCH == "i686" ]]; then
patch -p1 -i ../xaos-3.5-build-fix-i686.patch
fi
diff --git a/extra/xaos/xaos-3.5-libpng15.patch b/extra/xaos/xaos-3.5-libpng15.patch
deleted file mode 100644
index beece8339..000000000
--- a/extra/xaos/xaos-3.5-libpng15.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-http://code.google.com/p/gnuxaos/issues/detail?id=55
-
---- src/util/png.c
-+++ src/util/png.c
-@@ -3,6 +3,7 @@
- #include <aconfig.h>
- #ifdef USE_PNG
- #include <png.h>
-+#include <zlib.h>
- #endif
- #include <stdlib.h>
- #include <stdio.h>
-@@ -31,6 +32,9 @@
- png_structp png_ptr;
- png_infop info_ptr;
- png_color palette[256];
-+ png_color_8 sig_bit;
-+ int color_type;
-+ int bit_depth;
- volatile unsigned short a = 255;
- volatile unsigned char *b = (volatile unsigned char *) &a;
- #ifdef _undefined_
-@@ -59,7 +63,7 @@
- png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
- return "No memory to create png info structure";
- }
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_write_struct(&png_ptr, &info_ptr);
- fclose(file);
- return strerror(errno);
-@@ -78,57 +82,70 @@
- png_set_compression_window_bits(png_ptr, 15);
- png_set_compression_method(png_ptr, 8);
-
-- info_ptr->width = image->width;
-- info_ptr->height = image->height;
-- /*info_ptr->gamma=1.0; */
-- info_ptr->gamma = 0.5;
-- info_ptr->valid |= PNG_INFO_gAMA | PNG_INFO_pHYs;
-- info_ptr->x_pixels_per_unit = (png_uint_32) (100 / image->pixelwidth);
-- info_ptr->y_pixels_per_unit = (png_uint_32) (100 / image->pixelheight);
-+ switch (image->palette->type)
-+ {
-+ case C256:
-+ color_type = PNG_COLOR_TYPE_PALETTE;
-+ bit_depth = image->bytesperpixel * 8;
-+ break;
-+ case SMALLITER:
-+ case LARGEITER:
-+ case GRAYSCALE:
-+ color_type = PNG_COLOR_TYPE_GRAY;
-+ bit_depth = image->bytesperpixel * 8;
-+ break;
-+ case TRUECOLOR:
-+ case TRUECOLOR24:
-+ case TRUECOLOR16:
-+ color_type = PNG_COLOR_TYPE_RGB;
-+ bit_depth = 8;
-+ break;
-+ }
-
-+ png_set_IHDR (png_ptr, info_ptr, image->width, image->height, bit_depth,
-+ color_type, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE,
-+ PNG_FILTER_TYPE_BASE);
-
- switch (image->palette->type) {
- case C256:
- {
- int i;
-- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE;
-- info_ptr->bit_depth = image->bytesperpixel * 8;
-- info_ptr->palette = palette;
-- info_ptr->valid |= PNG_INFO_PLTE;
-+ png_color png_palette[257];
-+ int png_num_palette;
- for (i = 0; i < image->palette->end; i++)
-- info_ptr->palette[i].red = image->palette->rgb[i][0],
-- info_ptr->palette[i].green = image->palette->rgb[i][1],
-- info_ptr->palette[i].blue = image->palette->rgb[i][2],
-- info_ptr->num_palette = image->palette->end;
-+ png_palette[i].red = image->palette->rgb[i][0],
-+ png_palette[i].green = image->palette->rgb[i][1],
-+ png_palette[i].blue = image->palette->rgb[i][2],
-+ png_num_palette = image->palette->end;
-+ png_set_PLTE(png_ptr, info_ptr, png_palette, png_num_palette);
- }
- break;
-- case SMALLITER:
-- case LARGEITER:
-- case GRAYSCALE:
-- info_ptr->color_type = PNG_COLOR_TYPE_GRAY;
-- info_ptr->bit_depth = image->bytesperpixel * 8;
-- break;
- case TRUECOLOR:
- case TRUECOLOR24:
- case TRUECOLOR16:
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-- info_ptr->bit_depth = 8;
-- info_ptr->sig_bit.red = 8 - image->palette->info.truec.rprec;
-- info_ptr->sig_bit.green = 8 - image->palette->info.truec.gprec;
-- info_ptr->sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+ sig_bit.red = 8 - image->palette->info.truec.rprec;
-+ sig_bit.green = 8 - image->palette->info.truec.gprec;
-+ sig_bit.blue = 8 - image->palette->info.truec.bprec;
-+ png_set_sBIT(png_ptr, info_ptr, &sig_bit);
- break;
- }
-- info_ptr->interlace_type = 0;
-+
-+ png_write_info (png_ptr, info_ptr);
-+
- #ifdef _undefined_
- png_set_text(png_ptr, info_ptr, comments,
- sizeof(comments) / sizeof(png_text));
- #endif
-
-- png_write_info(png_ptr, info_ptr);
-+ png_set_gAMA(png_ptr, info_ptr, 0.5 /* 1.0 */);
-+ png_set_pHYs(png_ptr, info_ptr, (png_uint_32) (100 / image->pixelwidth),
-+ (png_uint_32) (100 / image->pixelheight),
-+ PNG_RESOLUTION_UNKNOWN);
-+
- /*png_set_filler(png_ptr,0,PNG_FILLER_AFTER); */
- png_set_packing(png_ptr);
- if (image->palette->type & (TRUECOLOR | TRUECOLOR24 | TRUECOLOR16))
-- png_set_shift(png_ptr, &(info_ptr->sig_bit));
-+ png_set_shift (png_ptr, &sig_bit);
- if (*b == 255)
- png_set_swap(png_ptr);
- png_set_bgr(png_ptr);
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index b235d50a3..aea961639 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198505 2013-10-30 15:16:55Z allan $
+# $Id: PKGBUILD 201440 2013-12-11 17:08:28Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Bächler <thomas@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xf86-input-synaptics
-pkgver=1.7.1
+pkgver=1.7.2
pkgrel=1
pkgdesc="Synaptics driver for notebook touchpads"
arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ groups=('xorg-drivers' 'xorg')
backup=('etc/X11/xorg.conf.d/50-synaptics.conf')
source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
add_tapbuttons.diff)
-sha256sums=('db5825660e1fb23190697f609bf75d4450fe707344a14298e1c9b47039bbb58e'
+sha256sums=('63957fa55f0d8662ef8c57f6325155c9884a854554d33921f0738e097f2a7dcd'
'5298d3e871db3768b34cf8516d3f53f9291202e2ea5de3300256e1cd9119a1ec')
build() {
diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD
index 3da23a305..cc6389ae9 100644
--- a/extra/xf86-video-mga/PKGBUILD
+++ b/extra/xf86-video-mga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198523 2013-10-30 15:22:57Z allan $
+# $Id: PKGBUILD 200806 2013-12-05 19:33:54Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-mga
-pkgver=1.6.2
-pkgrel=3
+pkgver=1.6.3
+pkgrel=1
pkgdesc="X.org mga video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -14,16 +14,16 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
optdepends=('mga-dri: DRI1 support from community repo')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('3f89ce250eea93f0de890954687790e06c0bab9e3e303df393e8759a187eca6c')
+sha256sums=('7704b1ea35098769787a9c93e903b827be97a99facfb1696aa5236a58ff1c7d7')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD
index fa9b0e673..8aafb538c 100644
--- a/extra/xf86-video-modesetting/PKGBUILD
+++ b/extra/xf86-video-modesetting/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198524 2013-10-30 15:23:19Z allan $
+# $Id: PKGBUILD 200763 2013-12-04 19:37:59Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
pkgname=xf86-video-modesetting
-pkgver=0.8.0
+pkgver=0.8.1
pkgrel=1
pkgdesc="X.org generic modesetting video driver"
arch=('i686' 'x86_64' 'mips64el')
@@ -15,16 +15,16 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
groups=('xorg-drivers' 'xorg')
groups=('xorg-drivers' 'xorg')
source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('13dc349e9aa50987ab2479d27d6879cda2c1f9ad8c8d3a1422a2f53c36f047f8')
+sha256sums=('3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr
make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 09b5d3c4d..9db8e5154 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198527 2013-10-30 15:24:00Z allan $
+# $Id: PKGBUILD 199041 2013-11-07 17:46:41Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: buddabrod <buddabrod@gmail.com>
pkgname=xf86-video-nouveau
-pkgver=1.0.9
+pkgver=1.0.10
pkgrel=1
pkgdesc="Open Source 2D acceleration driver for nVidia cards"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
groups=('xorg-drivers' 'xorg')
install=$pkgname.install
source=(http://xorg.freedesktop.org/archive/individual/driver/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b247c800e532fad1c80a5666d8ca0d4e5712064b6d7a3b030b32206a8de04482')
+sha256sums=('c1bab3160bae96d485fc93a048d19775398aa85b407bac53020675f7e995db9d')
build() {
cd $pkgname-$pkgver
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
index a9b857ec0..9b3247d92 100644
--- a/extra/xf86-video-vmware/PKGBUILD
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -1,20 +1,28 @@
-# $Id: PKGBUILD 198544 2013-10-30 15:30:51Z allan $
+# $Id: PKGBUILD 201669 2013-12-17 21:04:57Z lcarlier $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-vmware
pkgver=13.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="X.org vmware video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
license=('custom')
-depends=('libdrm' 'svga-dri' 'mesa')
+depends=('libdrm' 'svga-dri' 'mesa>=10.0')
makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
groups=('xorg-drivers' 'xorg')
options=('!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ xatracker-v2-fixes.patch)
+sha256sums=('802dda415c22412edad6c3df44fe18a06e91d0f8456d9a58bac0d340fdf8fe3d'
+ '7ab392cbc6258dc36df14ef60072c655d850bcfb6885111b41bcfe25dc1faacc')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # grab from upstream git repo, needed for mesa>10.0
+ patch -Np1 -i ../xatracker-v2-fixes.patch
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-vmware/xatracker-v2-fixes.patch b/extra/xf86-video-vmware/xatracker-v2-fixes.patch
new file mode 100644
index 000000000..9b8ed54a5
--- /dev/null
+++ b/extra/xf86-video-vmware/xatracker-v2-fixes.patch
@@ -0,0 +1,1583 @@
+From 0945bea5fc32eacb7bf42639efbd45dcd43e7ab5 Mon Sep 17 00:00:00 2001
+From: Rob Clark <robdclark@gmail.com>
+Date: Mon, 10 Jun 2013 13:31:31 -0400
+Subject: [PATCH 01/11] vmwgfx: update for XA API changes
+
+Signed-off-by: Rob Clark <robdclark@gmail.com>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Tested-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ configure.ac | 2 +-
+ vmwgfx/vmwgfx_dri2.c | 5 +++--
+ vmwgfx/vmwgfx_driver.c | 3 ++-
+ vmwgfx/vmwgfx_saa.c | 20 ++++++++++++++------
+ vmwgfx/vmwgfx_tex_video.c | 5 +++--
+ 5 files changed, 23 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0631bcc..dccfb27 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,7 @@ if test x$BUILD_VMWGFX = xyes; then
+ PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
+ fi
+ if test x$BUILD_VMWGFX = xyes; then
+- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],[],[BUILD_VMWGFX=no])
++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
+ fi
+
+ DRIVER_NAME=vmware
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 7de0772..2f007f0 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -201,7 +201,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ }
+
+ private->srf = srf;
+- if (xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
++ if (xa_surface_handle(srf, xa_handle_type_shared,
++ &buffer->name, &buffer->pitch) != 0)
+ return FALSE;
+
+ buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
+@@ -222,7 +223,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
+
+ if (--private->refcount == 0 && srf) {
+- xa_surface_destroy(srf);
++ xa_surface_unref(srf);
+ }
+
+ /*
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 7863ba2..3002285 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -617,7 +617,8 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
+ return FALSE;
+ }
+
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0) {
+ LogMessage(X_ERROR, "Could not get present surface handle.\n");
+ return FALSE;
+ }
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 63df3a1..ed3c1ee 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -140,7 +140,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
+ vpix->malloc = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
+- xa_surface_destroy(vpix->hw);
++ xa_surface_unref(vpix->hw);
+ vpix->hw = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
+@@ -286,7 +286,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ if (vpix->gmr && vsaa->can_optimize_dma) {
+ uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+ to_hw) != 0)
+@@ -305,6 +306,8 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ (int) to_hw,
+ (struct xa_box *) REGION_RECTS(reg),
+ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
+ if (vpix->gmr)
+ vmwgfx_dmabuf_unmap(vpix->gmr);
+ if (ret)
+@@ -441,7 +444,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
+ &spix->dirty_hw))
+ return FALSE;
+
+- xa_surface_destroy(vpix->hw);
++ xa_surface_unref(vpix->hw);
+ vpix->hw = NULL;
+
+ /*
+@@ -683,7 +686,8 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
+
+ (void) pScreen;
+ if (src_vpix == dst_vpix || !src_vpix->hw ||
+- xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
++ xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
++ &vsaa->src_handle, &dummy) != 0)
+ return FALSE;
+
+ REGION_NULL(pScreen, &vsaa->present_region);
+@@ -784,7 +788,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
+ return TRUE;
+
+ out_no_damage:
+- xa_surface_destroy(hw);
++ xa_surface_unref(hw);
+ return FALSE;
+ }
+
+@@ -929,6 +933,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
+
+ if (!vmwgfx_hw_validate(src_pixmap, src_reg)) {
+ xa_copy_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ return FALSE;
+ }
+
+@@ -1029,6 +1034,7 @@ vmwgfx_copy_done(struct saa_driver *driver)
+ return;
+ }
+ xa_copy_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ }
+
+ static Bool
+@@ -1175,6 +1181,7 @@ vmwgfx_composite_done(struct saa_driver *driver)
+ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(driver);
+
+ xa_composite_done(vsaa->xa_ctx);
++ xa_context_flush(vsaa->xa_ctx);
+ }
+
+ static void
+@@ -1436,7 +1443,8 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
+ */
+ if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+ goto out_err;
+- if (xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+ depth = xa_format_depth(xa_surface_format(vpix->hw));
+
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 449266b..2971ed7 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+
+ for (i=0; i<3; ++i) {
+ if (priv->yuv[i]) {
+- xa_surface_destroy(priv->yuv[i]);
++ xa_surface_unref(priv->yuv[i]);
+ priv->yuv[i] = NULL;
+ }
+ for (j=0; j<2; ++j) {
+@@ -539,7 +539,8 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ REGION_RESET(pScrn->pScreen, &reg, &box);
+ }
+
+- if (xa_surface_handle(srf, &handle, &stride) != 0) {
++ if (xa_surface_handle(srf, xa_handle_type_shared,
++ &handle, &stride) != 0) {
+ ret = BadAlloc;
+ break;
+ }
+--
+1.8.5.1
+
+
+From 835ce4698f916ba080f4132988fd4caf898e0b1e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 26 Sep 2013 01:25:33 -0700
+Subject: [PATCH 02/11] vmwgfx: Avoid HW operations when not master
+
+Note that for DRI2, a dri2_copy_region becomes a NOP when not master.
+Additionally, all dri2 operations that lead to a potential kernel
+access will return FALSE.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_dri2.c | 13 +++++++++++++
+ vmwgfx/vmwgfx_driver.c | 3 +++
+ vmwgfx/vmwgfx_saa.c | 44 +++++++++++++++++++++++++++++++++++++++++++-
+ vmwgfx/vmwgfx_saa.h | 8 ++++++++
+ vmwgfx/vmwgfx_saa_priv.h | 2 ++
+ vmwgfx/vmwgfx_xa_surface.c | 6 ++++++
+ 6 files changed, 75 insertions(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 2f007f0..57f2d9d 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -138,6 +138,8 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ return TRUE;
+ case DRI2BufferStencil:
+ case DRI2BufferDepthStencil:
++ if (!pScrn->vtSema)
++ return FALSE;
+
+ depth = (format) ? vmwgfx_zs_format_to_depth(format) : 32;
+
+@@ -155,6 +157,9 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+
+ break;
+ case DRI2BufferDepth:
++ if (!pScrn->vtSema)
++ return FALSE;
++
+ depth = (format) ? vmwgfx_z_format_to_depth(format) :
+ pDraw->bitsPerPixel;
+
+@@ -291,6 +296,14 @@ dri2_copy_region(DrawablePtr pDraw, RegionPtr pRegion,
+ DrawablePtr dst_draw;
+ RegionPtr myClip;
+ GCPtr gc;
++ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
++
++ /*
++ * This is a fragile protection against HW operations when not master.
++ * Needs to be blocked higher up in the dri2 code.
++ */
++ if (!pScrn->vtSema)
++ return;
+
+ /*
+ * In driCreateBuffers we dewrap windows into the
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 3002285..eeaea4b 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1116,6 +1116,7 @@ drv_leave_vt(VT_FUNC_ARGS_DECL)
+
+ vmwgfx_cursor_bypass(ms->fd, 0, 0);
+ vmwgfx_disable_scanout(pScrn);
++ vmwgfx_saa_drop_master(pScrn->pScreen);
+
+ if (drmDropMaster(ms->fd))
+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
+@@ -1136,6 +1137,8 @@ drv_enter_vt(VT_FUNC_ARGS_DECL)
+ if (!drv_set_master(pScrn))
+ return FALSE;
+
++ vmwgfx_saa_set_master(pScrn->pScreen);
++
+ if (!xf86SetDesiredModes(pScrn))
+ return FALSE;
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index ed3c1ee..5534ca3 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -423,6 +423,7 @@ vmwgfx_create_pixmap(struct saa_driver *driver, struct saa_pixmap *spix,
+
+ WSBMINITLISTHEAD(&vpix->sync_x_head);
+ WSBMINITLISTHEAD(&vpix->scanout_list);
++ WSBMINITLISTHEAD(&vpix->pixmap_list);
+
+ return TRUE;
+ }
+@@ -499,6 +500,7 @@ vmwgfx_destroy_pixmap(struct saa_driver *driver, PixmapPtr pixmap)
+ */
+
+ vmwgfx_pixmap_remove_present(vpix);
++ WSBMLISTDELINIT(&vpix->pixmap_list);
+ WSBMLISTDELINIT(&vpix->sync_x_head);
+
+ if (vpix->hw_is_dri2_fronts)
+@@ -627,6 +629,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
+ int bpp, int devkind, void *pixdata)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
++ ScreenPtr pScreen = pixmap->drawable.pScreen;
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
+ unsigned int old_height;
+ unsigned int old_width;
+ unsigned int old_pitch;
+@@ -670,6 +674,8 @@ vmwgfx_modify_pixmap_header (PixmapPtr pixmap, int w, int h, int depth,
+
+ vmwgfx_pix_resize(pixmap, old_pitch, old_height, old_width);
+ vmwgfx_pixmap_free_storage(vpix);
++ WSBMLISTADDTAIL(&vpix->pixmap_list, &vsaa->pixmaps);
++
+ return TRUE;
+
+ out_no_modify:
+@@ -860,7 +866,7 @@ vmwgfx_copy_prepare(struct saa_driver *driver,
+ Bool has_valid_hw;
+
+ if (!vsaa->xat || !SAA_PM_IS_SOLID(&dst_pixmap->drawable, plane_mask) ||
+- alu != GXcopy)
++ alu != GXcopy || !vsaa->is_master)
+ return FALSE;
+
+ src_vpix = vmwgfx_saa_pixmap(src_pixmap);
+@@ -1057,6 +1063,9 @@ vmwgfx_composite_prepare(struct saa_driver *driver, CARD8 op,
+ RegionRec empty;
+ struct xa_composite *xa_comp;
+
++ if (!vsaa->is_master)
++ return FALSE;
++
+ REGION_NULL(pScreen, &empty);
+
+ /*
+@@ -1367,7 +1376,9 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
++ vsaa->is_master = TRUE;
+ WSBMINITLISTHEAD(&vsaa->sync_x_list);
++ WSBMINITLISTHEAD(&vsaa->pixmaps);
+
+ vsaa->driver = vmwgfx_saa_driver;
+ vsaa->vcomp = vmwgfx_alloc_composite();
+@@ -1518,3 +1529,34 @@ vmwgfx_scanout_unref(struct vmwgfx_screen_entry *entry)
+ entry->pixmap = NULL;
+ pixmap->drawable.pScreen->DestroyPixmap(pixmap);
+ }
++
++void
++vmwgfx_saa_set_master(ScreenPtr pScreen)
++{
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
++
++ vsaa->is_master = TRUE;
++}
++
++void
++vmwgfx_saa_drop_master(ScreenPtr pScreen)
++{
++ struct vmwgfx_saa *vsaa = to_vmwgfx_saa(saa_get_driver(pScreen));
++ struct _WsbmListHead *list;
++ struct vmwgfx_saa_pixmap *vpix;
++ struct saa_pixmap *spix;
++
++ WSBMLISTFOREACH(list, &vsaa->pixmaps) {
++ vpix = WSBMLISTENTRY(list, struct vmwgfx_saa_pixmap, pixmap_list);
++ spix = &vpix->base;
++
++ if (!vpix->hw)
++ continue;
++
++ (void) vmwgfx_download_from_hw(&vsaa->driver, spix->pixmap,
++ &spix->dirty_hw);
++ REGION_EMPTY(draw->pScreen, &spix->dirty_hw);
++ }
++
++ vsaa->is_master = FALSE;
++}
+diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h
+index bb8ec96..d8aa3d3 100644
+--- a/vmwgfx/vmwgfx_saa.h
++++ b/vmwgfx/vmwgfx_saa.h
+@@ -54,6 +54,7 @@ struct vmwgfx_saa_pixmap {
+ int hw_is_dri2_fronts;
+ struct _WsbmListHead sync_x_head;
+ struct _WsbmListHead scanout_list;
++ struct _WsbmListHead pixmap_list;
+
+ uint32_t xa_flags;
+ uint32_t staging_add_flags;
+@@ -107,4 +108,11 @@ Bool
+ vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth,
+ uint32_t add_flags, uint32_t remove_flags,
+ RegionPtr region);
++
++void
++vmwgfx_saa_set_master(ScreenPtr pScreen);
++
++void
++vmwgfx_saa_drop_master(ScreenPtr pScreen);
++
+ #endif
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index 5f46dee..16583b0 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -54,8 +54,10 @@ struct vmwgfx_saa {
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
++ Bool is_master;
+ void (*present_flush) (ScreenPtr pScreen);
+ struct _WsbmListHead sync_x_list;
++ struct _WsbmListHead pixmaps;
+ struct vmwgfx_composite *vcomp;
+ };
+
+diff --git a/vmwgfx/vmwgfx_xa_surface.c b/vmwgfx/vmwgfx_xa_surface.c
+index 8b30e45..2f23c57 100644
+--- a/vmwgfx/vmwgfx_xa_surface.c
++++ b/vmwgfx/vmwgfx_xa_surface.c
+@@ -362,6 +362,12 @@ vmwgfx_hw_accel_validate(PixmapPtr pixmap, unsigned int depth,
+ Bool
+ vmwgfx_hw_dri2_validate(PixmapPtr pixmap, unsigned int depth)
+ {
++ struct vmwgfx_saa *vsaa =
++ to_vmwgfx_saa(saa_get_driver(pixmap->drawable.pScreen));
++
++ if (!vsaa->is_master)
++ return FALSE;
++
+ return (vmwgfx_hw_dri2_stage(pixmap, depth) &&
+ vmwgfx_hw_commit(pixmap) &&
+ vmwgfx_hw_validate(pixmap, NULL));
+--
+1.8.5.1
+
+
+From 7192acf9f0bf8e7176ab0b803b861a858623f709 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 19 Sep 2012 20:36:57 +0200
+Subject: [PATCH 03/11] vmwgfx: Implement textured video completely on top of
+ XA.
+
+Remove device-specific hacks. This may increase resource usage a little
+on old hardware revisions, but we don't need separate code paths on
+different hardware revisions.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_tex_video.c | 109 ++++++----------------------------------------
+ 1 file changed, 14 insertions(+), 95 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 2971ed7..a0a4f4a 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -111,8 +111,7 @@ struct xorg_xv_port_priv {
+ int hue;
+
+ int current_set;
+- struct vmwgfx_dmabuf *bounce[2][3];
+- struct xa_surface *yuv[3];
++ struct xa_surface *yuv[2][3];
+
+ int drm_fd;
+
+@@ -198,14 +197,10 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ priv->fence = NULL;
+
+ for (i=0; i<3; ++i) {
+- if (priv->yuv[i]) {
+- xa_surface_unref(priv->yuv[i]);
+- priv->yuv[i] = NULL;
+- }
+ for (j=0; j<2; ++j) {
+- if (priv->bounce[j][i]) {
+- vmwgfx_dmabuf_destroy(priv->bounce[j][i]);
+- priv->bounce[0][i] = NULL;
++ if (priv->yuv[i]) {
++ xa_surface_unref(priv->yuv[j][i]);
++ priv->yuv[j][i] = NULL;
+ }
+ }
+ }
+@@ -297,11 +292,9 @@ static int
+ check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id,
+ int width, int height)
+ {
+- struct xa_surface **yuv = priv->yuv;
+- struct vmwgfx_dmabuf **bounce = priv->bounce[priv->current_set];
++ struct xa_surface **yuv = priv->yuv[priv->current_set];
+ int ret = 0;
+ int i;
+- size_t size;
+
+ for (i=0; i<3; ++i) {
+
+@@ -334,19 +327,6 @@ check_yuv_surfaces(struct xorg_xv_port_priv *priv, int id,
+ if (ret || !yuv[i])
+ return BadAlloc;
+
+- size = width * height;
+-
+- if (bounce[i] && (bounce[i]->size < size ||
+- bounce[i]->size > 2*size)) {
+- vmwgfx_dmabuf_destroy(bounce[i]);
+- bounce[i] = NULL;
+- }
+-
+- if (!bounce[i]) {
+- bounce[i] = vmwgfx_dmabuf_alloc(priv->drm_fd, size);
+- if (!bounce[i])
+- return BadAlloc;
+- }
+ }
+ return Success;
+ }
+@@ -413,28 +393,20 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ unsigned short w, unsigned short h)
+ {
+ int i;
+- struct vmwgfx_dmabuf **bounce = port->bounce[port->current_set];
++ struct xa_surface **yuv = port->yuv[port->current_set];
+ char *ymap, *vmap, *umap;
+ unsigned char y1, y2, u, v;
+ int yidx, uidx, vidx;
+ int y_array_size = w * h;
+ int ret = BadAlloc;
+
+- /*
+- * Here, we could use xa_surface_[map|unmap], but given the size of
+- * the yuv textures, that could stress the xa tracker dma buffer pool,
+- * particularaly with multiple videos rendering simultaneously.
+- *
+- * Instead, cheat and allocate vmwgfx dma buffers directly.
+- */
+-
+- ymap = (char *)vmwgfx_dmabuf_map(bounce[0]);
++ ymap = xa_surface_map(port->r, yuv[0], XA_MAP_WRITE);
+ if (!ymap)
+ return BadAlloc;
+- umap = (char *)vmwgfx_dmabuf_map(bounce[1]);
++ umap = xa_surface_map(port->r, yuv[1], XA_MAP_WRITE);
+ if (!umap)
+ goto out_no_umap;
+- vmap = (char *)vmwgfx_dmabuf_map(bounce[2]);
++ vmap = xa_surface_map(port->r, yuv[2], XA_MAP_WRITE);
+ if (!vmap)
+ goto out_no_vmap;
+
+@@ -493,65 +465,11 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ }
+
+ ret = Success;
+- vmwgfx_dmabuf_unmap(bounce[2]);
++ xa_surface_unmap(yuv[2]);
+ out_no_vmap:
+- vmwgfx_dmabuf_unmap(bounce[1]);
++ xa_surface_unmap(yuv[1]);
+ out_no_umap:
+- vmwgfx_dmabuf_unmap(bounce[0]);
+-
+- if (ret == Success) {
+- struct xa_surface *srf;
+- struct vmwgfx_dmabuf *buf;
+- uint32_t handle;
+- unsigned int stride;
+- BoxRec box;
+- RegionRec reg;
+-
+- box.x1 = 0;
+- box.x2 = w;
+- box.y1 = 0;
+- box.y2 = h;
+-
+- REGION_INIT(pScrn->pScreen, &reg, &box, 1);
+-
+- for (i=0; i<3; ++i) {
+- srf = port->yuv[i];
+- buf = bounce[i];
+-
+- if (i == 1) {
+- switch(id) {
+- case FOURCC_YV12:
+- h /= 2;
+- /* Fall through */
+- case FOURCC_YUY2:
+- case FOURCC_UYVY:
+- w /= 2;
+- break;
+- default:
+- break;
+- }
+-
+- box.x1 = 0;
+- box.x2 = w;
+- box.y1 = 0;
+- box.y2 = h;
+-
+- REGION_RESET(pScrn->pScreen, &reg, &box);
+- }
+-
+- if (xa_surface_handle(srf, xa_handle_type_shared,
+- &handle, &stride) != 0) {
+- ret = BadAlloc;
+- break;
+- }
+-
+- if (vmwgfx_dma(0, 0, &reg, buf, w, handle, 1) != 0) {
+- ret = BadAlloc;
+- break;
+- }
+- }
+- REGION_UNINIT(pScrn->pScreen, &reg);
+- }
++ xa_surface_unmap(yuv[0]);
+
+ return ret;
+ }
+@@ -610,7 +528,8 @@ display_video(ScreenPtr pScreen, struct xorg_xv_port_priv *pPriv, int id,
+ (struct xa_box *)REGION_RECTS(dstRegion),
+ REGION_NUM_RECTS(dstRegion),
+ pPriv->cm,
+- vpix->hw, pPriv->yuv);
++ vpix->hw,
++ pPriv->yuv[pPriv->current_set ]);
+
+ saa_pixmap_dirty(pPixmap, TRUE, dstRegion);
+ DamageRegionProcessPending(&pPixmap->drawable);
+--
+1.8.5.1
+
+
+From 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 19 Sep 2012 21:50:40 +0200
+Subject: [PATCH 04/11] vmwgfx: Get rid of device-specific DMA code
+
+It's rarely used and things seem to work well enough on top of XA.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Zack Rusin <zackr@vmware.com>
+---
+ vmwgfx/vmwgfx_drmi.c | 103 -----------------------------------------------
+ vmwgfx/vmwgfx_drmi.h | 5 ---
+ vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------
+ vmwgfx/vmwgfx_saa_priv.h | 1 -
+ 4 files changed, 26 insertions(+), 136 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c
+index 496a16b..1e23f4a 100644
+--- a/vmwgfx/vmwgfx_drmi.c
++++ b/vmwgfx/vmwgfx_drmi.c
+@@ -284,109 +284,6 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf)
+ }
+
+ int
+-vmwgfx_dma(unsigned int host_x, unsigned int host_y,
+- RegionPtr region, struct vmwgfx_dmabuf *buf,
+- uint32_t buf_pitch, uint32_t surface_handle, int to_surface)
+-{
+- BoxPtr clips = REGION_RECTS(region);
+- unsigned int num_clips = REGION_NUM_RECTS(region);
+- struct drm_vmw_execbuf_arg arg;
+- struct drm_vmw_fence_rep rep;
+- int ret;
+- unsigned int size;
+- unsigned i;
+- SVGA3dCopyBox *cb;
+- SVGA3dCmdSurfaceDMASuffix *suffix;
+- SVGA3dCmdSurfaceDMA *body;
+- struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf);
+-
+- struct {
+- SVGA3dCmdHeader header;
+- SVGA3dCmdSurfaceDMA body;
+- SVGA3dCopyBox cb;
+- } *cmd;
+-
+- if (num_clips == 0)
+- return 0;
+-
+- size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) +
+- sizeof(*suffix);
+- cmd = malloc(size);
+- if (!cmd)
+- return -1;
+-
+- cmd->header.id = SVGA_3D_CMD_SURFACE_DMA;
+- cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) +
+- sizeof(*suffix);
+- cb = &cmd->cb;
+-
+- suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips];
+- suffix->suffixSize = sizeof(*suffix);
+- suffix->maximumOffset = (uint32_t) -1;
+- suffix->flags.discard = 0;
+- suffix->flags.unsynchronized = 0;
+- suffix->flags.reserved = 0;
+-
+- body = &cmd->body;
+- body->guest.ptr.gmrId = buf->gmr_id;
+- body->guest.ptr.offset = buf->gmr_offset;
+- body->guest.pitch = buf_pitch;
+- body->host.sid = surface_handle;
+- body->host.face = 0;
+- body->host.mipmap = 0;
+-
+- body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM :
+- SVGA3D_READ_HOST_VRAM);
+-
+-
+- for (i=0; i < num_clips; i++, cb++, clips++) {
+- cb->x = (uint16_t) clips->x1 + host_x;
+- cb->y = (uint16_t) clips->y1 + host_y;
+- cb->z = 0;
+- cb->srcx = (uint16_t) clips->x1;
+- cb->srcy = (uint16_t) clips->y1;
+- cb->srcz = 0;
+- cb->w = (uint16_t) (clips->x2 - clips->x1);
+- cb->h = (uint16_t) (clips->y2 - clips->y1);
+- cb->d = 1;
+-#if 0
+- LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n",
+- cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h,
+- to_surface ? "to" : "from");
+-#endif
+-
+- }
+-
+- memset(&arg, 0, sizeof(arg));
+- memset(&rep, 0, sizeof(rep));
+-
+- rep.error = -EFAULT;
+- arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep);
+- arg.commands = (unsigned long)cmd;
+- arg.command_size = size;
+- arg.throttle_us = 0;
+- arg.version = DRM_VMW_EXECBUF_VERSION;
+-
+- ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg));
+- if (ret) {
+- LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret));
+- }
+-
+- free(cmd);
+-
+- if (rep.error == 0) {
+- ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE);
+- if (ret) {
+- LogMessage(X_ERROR, "DMA from host fence wait error %s.\n",
+- strerror(-ret));
+- vmwgfx_fence_unref(ibuf->drm_fd, rep.handle);
+- }
+- }
+-
+- return 0;
+-}
+-
+-int
+ vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out)
+ {
+ struct drm_vmw_getparam_arg gp_arg;
+diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h
+index 2435009..fff728a 100644
+--- a/vmwgfx/vmwgfx_drmi.h
++++ b/vmwgfx/vmwgfx_drmi.h
+@@ -60,11 +60,6 @@ extern void
+ vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf);
+
+ extern int
+-vmwgfx_dma(unsigned int host_x, unsigned int host_y,
+- RegionPtr region, struct vmwgfx_dmabuf *buf,
+- uint32_t buf_pitch, uint32_t surface_handle, int to_surface);
+-
+-extern int
+ vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree);
+
+ extern int
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 5534ca3..fd80682 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -279,40 +279,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ Bool to_hw)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
++ void *data = vpix->malloc;
++ int ret;
+
+ if (!vpix->hw || (!vpix->gmr && !vpix->malloc))
+ return TRUE;
+
+- if (vpix->gmr && vsaa->can_optimize_dma) {
+- uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
+- goto out_err;
+- if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+- to_hw) != 0)
++ if (vpix->gmr) {
++ data = vmwgfx_dmabuf_map(vpix->gmr);
++ if (!data)
+ goto out_err;
+- } else {
+- void *data = vpix->malloc;
+- int ret;
++ }
+
+- if (vpix->gmr) {
+- data = vmwgfx_dmabuf_map(vpix->gmr);
+- if (!data)
+- goto out_err;
+- }
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++
++ if (ret)
++ goto out_err;
++
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++ if (ret)
++ goto out_err;
+
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (to_hw)
+- xa_context_flush(vsaa->xa_ctx);
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+- if (ret)
+- goto out_err;
+- }
+ return TRUE;
+ out_err:
+ LogMessage(X_ERROR, "DMA %s surface failed.\n",
+@@ -1372,7 +1372,6 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->xa_ctx = xa_context_default(xat);
+ vsaa->drm_fd = drm_fd;
+ vsaa->present_flush = present_flush;
+- vsaa->can_optimize_dma = FALSE;
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index 16583b0..f5f45ba 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -50,7 +50,6 @@ struct vmwgfx_saa {
+ int ydiff;
+ RegionRec present_region;
+ uint32_t src_handle;
+- Bool can_optimize_dma;
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
+--
+1.8.5.1
+
+
+From e26dec8f5278df74a102493bf6d2d8444dab5d6d Mon Sep 17 00:00:00 2001
+From: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon, 28 Oct 2013 18:21:29 -0400
+Subject: [PATCH 05/11] vmwgfx: handle changes of DamageUnregister API in
+ 1.14.99.2
+
+Fix is inspired from the intel driver.
+
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_saa.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index fd80682..346e7f4 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -26,6 +26,7 @@
+ */
+
+ #include <xorg-server.h>
++#include <xorgVersion.h>
+ #include <mi.h>
+ #include <fb.h>
+ #include <xf86drmMode.h>
+@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap)
+ if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc)
+ return;
+
++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
++ DamageUnregister(spix->damage);
++#else
+ DamageUnregister(&pixmap->drawable, spix->damage);
++#endif
++
+ DamageDestroy(spix->damage);
+ spix->damage = NULL;
+ }
+--
+1.8.5.1
+
+
+From 7ac45326eccbf3bea9a4a8f95b9662a36ab58eb0 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 28 Nov 2013 02:02:20 -0800
+Subject: [PATCH 06/11] vmwgfx: Fix some compilation warnings and indentations
+
+Most of the compilation warnings we're seeing are due to bad xorg headers,
+but fix the ones we can fix in the driver. Some indentation fixes as well.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ src/vmware_bootstrap.c | 2 --
+ src/vmwarevideo.c | 4 ++--
+ vmwgfx/vmwgfx_driver.c | 1 -
+ vmwgfx/vmwgfx_output.c | 2 +-
+ vmwgfx/vmwgfx_overlay.c | 4 ++--
+ vmwgfx/vmwgfx_tex_video.c | 26 +++++++++++++-------------
+ 6 files changed, 18 insertions(+), 21 deletions(-)
+
+diff --git a/src/vmware_bootstrap.c b/src/vmware_bootstrap.c
+index ea5be19..bb58325 100644
+--- a/src/vmware_bootstrap.c
++++ b/src/vmware_bootstrap.c
+@@ -256,7 +256,6 @@ VMwarePciProbe (DriverPtr drv,
+ intptr_t match_data)
+ {
+ ScrnInfoPtr scrn = NULL;
+- EntityInfoPtr entity;
+
+ scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VMWAREPciChipsets,
+ NULL, NULL, NULL, NULL, NULL);
+@@ -267,7 +266,6 @@ VMwarePciProbe (DriverPtr drv,
+ scrn->Probe = NULL;
+ }
+
+- entity = xf86GetEntityInfo(entity_num);
+ switch (DEVICE_ID(device)) {
+ case PCI_DEVICE_ID_VMWARE_SVGA2:
+ case PCI_DEVICE_ID_VMWARE_SVGA:
+diff --git a/src/vmwarevideo.c b/src/vmwarevideo.c
+index 745c71f..8d7d171 100644
+--- a/src/vmwarevideo.c
++++ b/src/vmwarevideo.c
+@@ -82,7 +82,7 @@
+ #define VMWARE_VID_MAX_HEIGHT 2048
+
+ #define VMWARE_VID_NUM_ENCODINGS 1
+-static XF86VideoEncodingRec vmwareVideoEncodings[] =
++static const XF86VideoEncodingRec vmwareVideoEncodings[] =
+ {
+ {
+ 0,
+@@ -108,7 +108,7 @@ static XF86ImageRec vmwareVideoImages[] =
+ };
+
+ #define VMWARE_VID_NUM_ATTRIBUTES 2
+-static XF86AttributeRec vmwareVideoAttributes[] =
++static const XF86AttributeRec vmwareVideoAttributes[] =
+ {
+ {
+ XvGettable | XvSettable,
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index eeaea4b..bfc07f8 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -658,7 +658,6 @@ void xorg_flush(ScreenPtr pScreen)
+ if (crtc->enabled) {
+ pixmap = crtc_get_scanout(crtc);
+ if (pixmap) {
+- unsigned int j;
+
+ /*
+ * Remove duplicates.
+diff --git a/vmwgfx/vmwgfx_output.c b/vmwgfx/vmwgfx_output.c
+index 4f52f1d..f9e4263 100644
+--- a/vmwgfx/vmwgfx_output.c
++++ b/vmwgfx/vmwgfx_output.c
+@@ -60,7 +60,7 @@ struct output_private
+ Bool is_implicit;
+ };
+
+-static char *output_enum_list[] = {
++static const char *output_enum_list[] = {
+ "Unknown",
+ "VGA",
+ "DVI",
+diff --git a/vmwgfx/vmwgfx_overlay.c b/vmwgfx/vmwgfx_overlay.c
+index 6624a10..986dd06 100644
+--- a/vmwgfx/vmwgfx_overlay.c
++++ b/vmwgfx/vmwgfx_overlay.c
+@@ -84,7 +84,7 @@ typedef uint8_t uint8;
+ #define VMWARE_VID_MAX_HEIGHT 2048
+
+ #define VMWARE_VID_NUM_ENCODINGS 1
+-static XF86VideoEncodingRec vmwareVideoEncodings[] =
++static const XF86VideoEncodingRec vmwareVideoEncodings[] =
+ {
+ {
+ 0,
+@@ -110,7 +110,7 @@ static XF86ImageRec vmwareVideoImages[] =
+ };
+
+ #define VMWARE_VID_NUM_ATTRIBUTES 2
+-static XF86AttributeRec vmwareVideoAttributes[] =
++static const XF86AttributeRec vmwareVideoAttributes[] =
+ {
+ {
+ XvGettable | XvSettable,
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index a0a4f4a..3ba40ef 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -70,11 +70,11 @@ static const float bt_709[] = {
+ static Atom xvBrightness, xvContrast, xvSaturation, xvHue;
+
+ #define NUM_TEXTURED_ATTRIBUTES 4
+-static XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = {
+- {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"},
+- {XvSettable | XvGettable, -1000, 1000, "XV_HUE"}
++static const XF86AttributeRec TexturedAttributes[NUM_TEXTURED_ATTRIBUTES] = {
++ {XvSettable | XvGettable, -1000, 1000, "XV_BRIGHTNESS"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_CONTRAST"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_SATURATION"},
++ {XvSettable | XvGettable, -1000, 1000, "XV_HUE"}
+ };
+
+ #define NUM_FORMATS 3
+@@ -82,7 +82,7 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] = {
+ {15, TrueColor}, {16, TrueColor}, {24, TrueColor}
+ };
+
+-static XF86VideoEncodingRec DummyEncoding[1] = {
++static const XF86VideoEncodingRec DummyEncoding[1] = {
+ {
+ 0,
+ "XV_IMAGE",
+@@ -416,16 +416,16 @@ copy_packed_data(ScrnInfoPtr pScrn,
+ switch (id) {
+ case FOURCC_YV12: {
+ int pitches[3], offsets[3];
+- unsigned char *y, *u, *v;
++ unsigned char *yp, *up, *vp;
+ query_image_attributes(pScrn, FOURCC_YV12,
+ &w, &h, pitches, offsets);
+
+- y = buf + offsets[0];
+- v = buf + offsets[1];
+- u = buf + offsets[2];
+- memcpy(ymap, y, w*h);
+- memcpy(vmap, v, w*h/4);
+- memcpy(umap, u, w*h/4);
++ yp = buf + offsets[0];
++ vp = buf + offsets[1];
++ up = buf + offsets[2];
++ memcpy(ymap, yp, w*h);
++ memcpy(vmap, vp, w*h/4);
++ memcpy(umap, up, w*h/4);
+ break;
+ }
+ case FOURCC_UYVY:
+--
+1.8.5.1
+
+
+From a40cbd7b4fa19219849b4b0a48f07538772c3e22 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Thu, 5 Dec 2013 02:58:47 -0800
+Subject: [PATCH 07/11] vmwgfx: Support also XA version 1 v2
+
+We need to support also XA version 1, since we want to be backwards
+compatible with older mesa releases.
+Unfortunately, the intended way of detecting XA major version at
+compile-time was broken on mesa 10 so we need a workaround that tests
+for XA version 2 at config time.
+
+v2: Update the test for XA version 2.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ configure.ac | 10 +++++++++-
+ vmwgfx/vmwgfx_dri2.c | 5 ++---
+ vmwgfx/vmwgfx_driver.c | 3 +--
+ vmwgfx/vmwgfx_saa.c | 12 +++++-------
+ vmwgfx/vmwgfx_saa.h | 12 ++++++++++++
+ vmwgfx/vmwgfx_tex_video.c | 2 +-
+ 6 files changed, 30 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index dccfb27..123356c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,15 @@ if test x$BUILD_VMWGFX = xyes; then
+ PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
+ fi
+ if test x$BUILD_VMWGFX = xyes; then
+- PKG_CHECK_MODULES([XATRACKER], [xatracker >= 2.0.0],[],[BUILD_VMWGFX=no])
++#
++# Early versions of mesa 10 forgot to bump the XA major version number in
++# the xa_tracker.h header
++#
++ PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
++ [PKG_CHECK_EXISTS([xatracker = 2.0.0],
++ [AC_DEFINE([HAVE_XA_2], 1,
++ [Has version 2 of XA])])],
++ [],[BUILD_VMWGFX=no])
+ fi
+
+ DRIVER_NAME=vmware
+diff --git a/vmwgfx/vmwgfx_dri2.c b/vmwgfx/vmwgfx_dri2.c
+index 57f2d9d..4c74a6b 100644
+--- a/vmwgfx/vmwgfx_dri2.c
++++ b/vmwgfx/vmwgfx_dri2.c
+@@ -206,8 +206,7 @@ dri2_do_create_buffer(DrawablePtr pDraw, DRI2Buffer2Ptr buffer, unsigned int for
+ }
+
+ private->srf = srf;
+- if (xa_surface_handle(srf, xa_handle_type_shared,
+- &buffer->name, &buffer->pitch) != 0)
++ if (_xa_surface_handle(srf, &buffer->name, &buffer->pitch) != 0)
+ return FALSE;
+
+ buffer->cpp = xa_format_depth(xa_surface_format(srf)) / 8;
+@@ -228,7 +227,7 @@ dri2_do_destroy_buffer(DrawablePtr pDraw, DRI2BufferPtr buffer)
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(private->pPixmap);
+
+ if (--private->refcount == 0 && srf) {
+- xa_surface_unref(srf);
++ xa_surface_destroy(srf);
+ }
+
+ /*
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index bfc07f8..6301c29 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -617,8 +617,7 @@ vmwgfx_scanout_present(ScreenPtr pScreen, int drm_fd,
+ return FALSE;
+ }
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0) {
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0) {
+ LogMessage(X_ERROR, "Could not get present surface handle.\n");
+ return FALSE;
+ }
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 346e7f4..1459933 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -146,7 +146,7 @@ vmwgfx_pixmap_free_storage(struct vmwgfx_saa_pixmap *vpix)
+ vpix->malloc = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_SURFACE) && vpix->hw) {
+- xa_surface_unref(vpix->hw);
++ xa_surface_destroy(vpix->hw);
+ vpix->hw = NULL;
+ }
+ if (!(vpix->backing & VMWGFX_PIX_GMR) && vpix->gmr) {
+@@ -451,7 +451,7 @@ vmwgfx_hw_kill(struct vmwgfx_saa *vsaa,
+ &spix->dirty_hw))
+ return FALSE;
+
+- xa_surface_unref(vpix->hw);
++ xa_surface_destroy(vpix->hw);
+ vpix->hw = NULL;
+
+ /*
+@@ -698,8 +698,7 @@ vmwgfx_present_prepare(struct vmwgfx_saa *vsaa,
+
+ (void) pScreen;
+ if (src_vpix == dst_vpix || !src_vpix->hw ||
+- xa_surface_handle(src_vpix->hw, xa_handle_type_shared,
+- &vsaa->src_handle, &dummy) != 0)
++ _xa_surface_handle(src_vpix->hw, &vsaa->src_handle, &dummy) != 0)
+ return FALSE;
+
+ REGION_NULL(pScreen, &vsaa->present_region);
+@@ -800,7 +799,7 @@ vmwgfx_create_hw(struct vmwgfx_saa *vsaa,
+ return TRUE;
+
+ out_no_damage:
+- xa_surface_unref(hw);
++ xa_surface_destroy(hw);
+ return FALSE;
+ }
+
+@@ -1459,8 +1458,7 @@ vmwgfx_scanout_ref(struct vmwgfx_screen_entry *entry)
+ */
+ if (!vmwgfx_hw_accel_validate(pixmap, 0, XA_FLAG_SCANOUT, 0, NULL))
+ goto out_err;
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
+ goto out_err;
+ depth = xa_format_depth(xa_surface_format(vpix->hw));
+
+diff --git a/vmwgfx/vmwgfx_saa.h b/vmwgfx/vmwgfx_saa.h
+index d8aa3d3..5e1f40c 100644
+--- a/vmwgfx/vmwgfx_saa.h
++++ b/vmwgfx/vmwgfx_saa.h
+@@ -115,4 +115,16 @@ vmwgfx_saa_set_master(ScreenPtr pScreen);
+ void
+ vmwgfx_saa_drop_master(ScreenPtr pScreen);
+
++#if (XA_TRACKER_VERSION_MAJOR <= 1) && !defined(HAVE_XA_2)
++
++#define _xa_surface_handle(_a, _b, _c) xa_surface_handle(_a, _b, _c)
++#define xa_context_flush(_a)
++
++#else
++
++#define xa_surface_destroy(_a) xa_surface_unref(_a)
++#define _xa_surface_handle(_a, _b, _c) \
++ xa_surface_handle(_a, xa_handle_type_shared, _b, _c)
++
++#endif /* (XA_TRACKER_VERSION_MAJOR <= 1) */
+ #endif
+diff --git a/vmwgfx/vmwgfx_tex_video.c b/vmwgfx/vmwgfx_tex_video.c
+index 3ba40ef..9fd8f22 100644
+--- a/vmwgfx/vmwgfx_tex_video.c
++++ b/vmwgfx/vmwgfx_tex_video.c
+@@ -199,7 +199,7 @@ stop_video(ScrnInfoPtr pScrn, pointer data, Bool shutdown)
+ for (i=0; i<3; ++i) {
+ for (j=0; j<2; ++j) {
+ if (priv->yuv[i]) {
+- xa_surface_unref(priv->yuv[j][i]);
++ xa_surface_destroy(priv->yuv[j][i]);
+ priv->yuv[j][i] = NULL;
+ }
+ }
+--
+1.8.5.1
+
+
+From c36cbcefb8526944141eb431e1e736dc4485a36e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Mon, 9 Dec 2013 00:19:55 -0800
+Subject: [PATCH 08/11] vmwgfx: Remove stray 1
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_saa.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 1459933..28819c1 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -1230,7 +1230,7 @@ vmwgfx_operation_complete(struct saa_driver *driver,
+ */
+
+ if (vpix->hw && vpix->hw_is_dri2_fronts) {
+- if (1 && pScrn->vtSema &&
++ if (pScrn->vtSema &&
+ vmwgfx_upload_to_hw(driver, pixmap, &spix->dirty_shadow)) {
+
+ REGION_EMPTY(vsaa->pScreen, &spix->dirty_shadow);
+--
+1.8.5.1
+
+
+From 4af6062ce281a7f4aaa50985fe757e9569208ee1 Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 11 Dec 2013 04:59:49 -0800
+Subject: [PATCH 09/11] Revert "vmwgfx: Get rid of device-specific DMA code"
+
+This reverts commit 45b2457516a9db4bd1d60fbb24a1efbe2d9dd932.
+
+Reverting this because using direct DMA for shared pixmaps should
+boost performance. It should be usable both in a composited environment
+and when running hosted. Need to retest the DMA flaws I saw before disabling
+this code.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_drmi.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++
+ vmwgfx/vmwgfx_drmi.h | 5 +++
+ vmwgfx/vmwgfx_saa.c | 53 ++++++++++++------------
+ vmwgfx/vmwgfx_saa_priv.h | 1 +
+ 4 files changed, 136 insertions(+), 26 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_drmi.c b/vmwgfx/vmwgfx_drmi.c
+index 1e23f4a..496a16b 100644
+--- a/vmwgfx/vmwgfx_drmi.c
++++ b/vmwgfx/vmwgfx_drmi.c
+@@ -284,6 +284,109 @@ vmwgfx_dmabuf_destroy(struct vmwgfx_dmabuf *buf)
+ }
+
+ int
++vmwgfx_dma(unsigned int host_x, unsigned int host_y,
++ RegionPtr region, struct vmwgfx_dmabuf *buf,
++ uint32_t buf_pitch, uint32_t surface_handle, int to_surface)
++{
++ BoxPtr clips = REGION_RECTS(region);
++ unsigned int num_clips = REGION_NUM_RECTS(region);
++ struct drm_vmw_execbuf_arg arg;
++ struct drm_vmw_fence_rep rep;
++ int ret;
++ unsigned int size;
++ unsigned i;
++ SVGA3dCopyBox *cb;
++ SVGA3dCmdSurfaceDMASuffix *suffix;
++ SVGA3dCmdSurfaceDMA *body;
++ struct vmwgfx_int_dmabuf *ibuf = vmwgfx_int_dmabuf(buf);
++
++ struct {
++ SVGA3dCmdHeader header;
++ SVGA3dCmdSurfaceDMA body;
++ SVGA3dCopyBox cb;
++ } *cmd;
++
++ if (num_clips == 0)
++ return 0;
++
++ size = sizeof(*cmd) + (num_clips - 1) * sizeof(cmd->cb) +
++ sizeof(*suffix);
++ cmd = malloc(size);
++ if (!cmd)
++ return -1;
++
++ cmd->header.id = SVGA_3D_CMD_SURFACE_DMA;
++ cmd->header.size = sizeof(cmd->body) + num_clips * sizeof(cmd->cb) +
++ sizeof(*suffix);
++ cb = &cmd->cb;
++
++ suffix = (SVGA3dCmdSurfaceDMASuffix *) &cb[num_clips];
++ suffix->suffixSize = sizeof(*suffix);
++ suffix->maximumOffset = (uint32_t) -1;
++ suffix->flags.discard = 0;
++ suffix->flags.unsynchronized = 0;
++ suffix->flags.reserved = 0;
++
++ body = &cmd->body;
++ body->guest.ptr.gmrId = buf->gmr_id;
++ body->guest.ptr.offset = buf->gmr_offset;
++ body->guest.pitch = buf_pitch;
++ body->host.sid = surface_handle;
++ body->host.face = 0;
++ body->host.mipmap = 0;
++
++ body->transfer = (to_surface ? SVGA3D_WRITE_HOST_VRAM :
++ SVGA3D_READ_HOST_VRAM);
++
++
++ for (i=0; i < num_clips; i++, cb++, clips++) {
++ cb->x = (uint16_t) clips->x1 + host_x;
++ cb->y = (uint16_t) clips->y1 + host_y;
++ cb->z = 0;
++ cb->srcx = (uint16_t) clips->x1;
++ cb->srcy = (uint16_t) clips->y1;
++ cb->srcz = 0;
++ cb->w = (uint16_t) (clips->x2 - clips->x1);
++ cb->h = (uint16_t) (clips->y2 - clips->y1);
++ cb->d = 1;
++#if 0
++ LogMessage(X_INFO, "DMA! x: %u y: %u srcx: %u srcy: %u w: %u h: %u %s\n",
++ cb->x, cb->y, cb->srcx, cb->srcy, cb->w, cb->h,
++ to_surface ? "to" : "from");
++#endif
++
++ }
++
++ memset(&arg, 0, sizeof(arg));
++ memset(&rep, 0, sizeof(rep));
++
++ rep.error = -EFAULT;
++ arg.fence_rep = ((to_surface) ? 0UL : (unsigned long)&rep);
++ arg.commands = (unsigned long)cmd;
++ arg.command_size = size;
++ arg.throttle_us = 0;
++ arg.version = DRM_VMW_EXECBUF_VERSION;
++
++ ret = drmCommandWrite(ibuf->drm_fd, DRM_VMW_EXECBUF, &arg, sizeof(arg));
++ if (ret) {
++ LogMessage(X_ERROR, "DMA error %s.\n", strerror(-ret));
++ }
++
++ free(cmd);
++
++ if (rep.error == 0) {
++ ret = vmwgfx_fence_wait(ibuf->drm_fd, rep.handle, TRUE);
++ if (ret) {
++ LogMessage(X_ERROR, "DMA from host fence wait error %s.\n",
++ strerror(-ret));
++ vmwgfx_fence_unref(ibuf->drm_fd, rep.handle);
++ }
++ }
++
++ return 0;
++}
++
++int
+ vmwgfx_get_param(int drm_fd, uint32_t param, uint64_t *out)
+ {
+ struct drm_vmw_getparam_arg gp_arg;
+diff --git a/vmwgfx/vmwgfx_drmi.h b/vmwgfx/vmwgfx_drmi.h
+index fff728a..2435009 100644
+--- a/vmwgfx/vmwgfx_drmi.h
++++ b/vmwgfx/vmwgfx_drmi.h
+@@ -60,6 +60,11 @@ extern void
+ vmwgfx_dmabuf_unmap(struct vmwgfx_dmabuf *buf);
+
+ extern int
++vmwgfx_dma(unsigned int host_x, unsigned int host_y,
++ RegionPtr region, struct vmwgfx_dmabuf *buf,
++ uint32_t buf_pitch, uint32_t surface_handle, int to_surface);
++
++extern int
+ vmwgfx_num_streams(int drm_fd, uint32_t *ntot, uint32_t *nfree);
+
+ extern int
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 28819c1..96275a5 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -285,40 +285,40 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ Bool to_hw)
+ {
+ struct vmwgfx_saa_pixmap *vpix = vmwgfx_saa_pixmap(pixmap);
+- void *data = vpix->malloc;
+- int ret;
+
+ if (!vpix->hw || (!vpix->gmr && !vpix->malloc))
+ return TRUE;
+
++ if (vpix->gmr && vsaa->can_optimize_dma) {
++ uint32_t handle, dummy;
+
+- if (vpix->gmr) {
+- data = vmwgfx_dmabuf_map(vpix->gmr);
+- if (!data)
++ if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
++ &handle, &dummy) != 0)
+ goto out_err;
+- }
+-
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+-
+- if (ret)
+- goto out_err;
++ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
++ to_hw) != 0)
++ goto out_err;
++ } else {
++ void *data = vpix->malloc;
++ int ret;
+
+- ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
+- (int) to_hw,
+- (struct xa_box *) REGION_RECTS(reg),
+- REGION_NUM_RECTS(reg));
+- if (to_hw)
+- xa_context_flush(vsaa->xa_ctx);
+- if (vpix->gmr)
+- vmwgfx_dmabuf_unmap(vpix->gmr);
+- if (ret)
+- goto out_err;
++ if (vpix->gmr) {
++ data = vmwgfx_dmabuf_map(vpix->gmr);
++ if (!data)
++ goto out_err;
++ }
+
++ ret = xa_surface_dma(vsaa->xa_ctx, vpix->hw, data, pixmap->devKind,
++ (int) to_hw,
++ (struct xa_box *) REGION_RECTS(reg),
++ REGION_NUM_RECTS(reg));
++ if (to_hw)
++ xa_context_flush(vsaa->xa_ctx);
++ if (vpix->gmr)
++ vmwgfx_dmabuf_unmap(vpix->gmr);
++ if (ret)
++ goto out_err;
++ }
+ return TRUE;
+ out_err:
+ LogMessage(X_ERROR, "DMA %s surface failed.\n",
+@@ -1377,6 +1377,7 @@ vmwgfx_saa_init(ScreenPtr pScreen, int drm_fd, struct xa_tracker *xat,
+ vsaa->xa_ctx = xa_context_default(xat);
+ vsaa->drm_fd = drm_fd;
+ vsaa->present_flush = present_flush;
++ vsaa->can_optimize_dma = FALSE;
+ vsaa->use_present_opt = direct_presents;
+ vsaa->only_hw_presents = only_hw_presents;
+ vsaa->rendercheck = rendercheck;
+diff --git a/vmwgfx/vmwgfx_saa_priv.h b/vmwgfx/vmwgfx_saa_priv.h
+index f5f45ba..16583b0 100644
+--- a/vmwgfx/vmwgfx_saa_priv.h
++++ b/vmwgfx/vmwgfx_saa_priv.h
+@@ -50,6 +50,7 @@ struct vmwgfx_saa {
+ int ydiff;
+ RegionRec present_region;
+ uint32_t src_handle;
++ Bool can_optimize_dma;
+ Bool use_present_opt;
+ Bool only_hw_presents;
+ Bool rendercheck;
+--
+1.8.5.1
+
+
+From 93228f3dd3355a25583d22dbb96791678b93be3e Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Wed, 11 Dec 2013 06:54:02 -0800
+Subject: [PATCH 10/11] vmwgfx: Really allow XA version 2.
+
+When XA starts to correctly advertise version 2, we didn't allow it.
+Fix this.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
+---
+ vmwgfx/vmwgfx_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 6301c29..4e28097 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -79,7 +79,7 @@ typedef uint8_t uint8;
+
+ #define XA_VERSION_MINOR_REQUIRED 0
+ #define XA_VERSION_MAJOR_REQUIRED 1
+-#define XA_VERSION_MAJOR_COMPAT 1
++#define XA_VERSION_MAJOR_COMPAT 2
+
+ #define DRM_VERSION_MAJOR_REQUIRED 2
+ #define DRM_VERSION_MINOR_REQUIRED 3
+--
+1.8.5.1
+
+
+From f45a551e9b70ccec8f92df02747d4e2af299cf8c Mon Sep 17 00:00:00 2001
+From: Thomas Hellstrom <thellstrom@vmware.com>
+Date: Mon, 16 Dec 2013 10:38:21 +0100
+Subject: [PATCH 11/11] vmwgfx: Fix compile breakage on XA version 1.
+
+A recent revert brought back code that assumed XA version 2.
+
+Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
+Reviewed-by: trivial
+---
+ vmwgfx/vmwgfx_saa.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
+index 96275a5..e76bd09 100644
+--- a/vmwgfx/vmwgfx_saa.c
++++ b/vmwgfx/vmwgfx_saa.c
+@@ -292,8 +292,7 @@ vmwgfx_saa_dma(struct vmwgfx_saa *vsaa,
+ if (vpix->gmr && vsaa->can_optimize_dma) {
+ uint32_t handle, dummy;
+
+- if (xa_surface_handle(vpix->hw, xa_handle_type_shared,
+- &handle, &dummy) != 0)
++ if (_xa_surface_handle(vpix->hw, &handle, &dummy) != 0)
+ goto out_err;
+ if (vmwgfx_dma(0, 0, reg, vpix->gmr, pixmap->devKind, handle,
+ to_hw) != 0)
+--
+1.8.5.1
+
diff --git a/extra/xfce4-terminal/PKGBUILD b/extra/xfce4-terminal/PKGBUILD
index 413d20ee9..fbde79f9f 100644
--- a/extra/xfce4-terminal/PKGBUILD
+++ b/extra/xfce4-terminal/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198571 2013-10-30 15:41:02Z allan $
+# $Id: PKGBUILD 202765 2013-12-27 11:06:12Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: tobias <tobias funnychar archlinux.org>
# Contributor: Aurelien Foret <orelien@chez.com>
pkgname=xfce4-terminal
-pkgver=0.6.2
+pkgver=0.6.3
pkgrel=1
pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ conflicts=('terminal')
replaces=('terminal')
install=$pkgname.install
source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2)
-sha256sums=('3d92422288d26311880af694bb4e02c9235997ca307a5e85001bf6bef65c3b35')
+sha256sums=('912f4716c2395a14a80620ef982b4af1e2a67a8df9a1ef0b802ecae826057e08')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch b/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
new file mode 100644
index 000000000..dba52d294
--- /dev/null
+++ b/extra/xfce4-terminal/xfce4-terminal-0.6.2-fix-up-the-encoding-menu-creation.patch
@@ -0,0 +1,50 @@
+From 71bd87a532f250d6bc98d52a5d546d43056bbd99 Mon Sep 17 00:00:00 2001
+From: Alistair Buxton <a.j.buxton@gmail.com>
+Date: Sun, 13 Oct 2013 23:41:45 +0000
+Subject: Fix up the encoding menu creation.
+
+Don't add non-radio items to the radio item group.
+Don't leak list nodes by prepending twice to the same list.
+Fixes BUG #10395.
+---
+diff --git a/terminal/terminal-encoding-action.c b/terminal/terminal-encoding-action.c
+index 83242e9..77c916c 100644
+--- a/terminal/terminal-encoding-action.c
++++ b/terminal/terminal-encoding-action.c
+@@ -253,7 +253,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu,
+ /* action to reset to the default */
+ default_label = g_strdup_printf (_("Default (%s)"), default_charset);
+ item = gtk_radio_menu_item_new_with_label (groups, default_label);
+- groups = g_slist_prepend (groups, item);
++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), found);
+ g_signal_connect (G_OBJECT (item), "activate",
+@@ -267,7 +267,6 @@ terminal_encoding_action_menu_shown (GtkWidget *menu,
+ /* category item */
+ item = gtk_menu_item_new_with_label (_(terminal_encodings_names[n]));
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+- groups = g_slist_prepend (groups, item);
+ gtk_widget_show (item);
+
+ submenu = gtk_menu_new ();
+@@ -281,7 +280,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu,
+ break;
+
+ item2 = gtk_radio_menu_item_new_with_label (groups, charset);
+- groups = g_slist_prepend (groups, item2);
++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2));
+ gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2);
+ g_object_set_qdata (G_OBJECT (item2), encoding_action_quark, (gchar *) charset);
+ gtk_widget_show (item2);
+@@ -304,7 +303,7 @@ terminal_encoding_action_menu_shown (GtkWidget *menu,
+ {
+ /* add an action with the unknown charset */
+ item2 = gtk_radio_menu_item_new_with_label (groups, action->current);
+- groups = g_slist_prepend (groups, item2);
++ groups = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item2));
+ g_object_set_qdata_full (G_OBJECT (item2), encoding_action_quark,
+ g_strdup (action->current), g_free);
+ gtk_menu_shell_append (GTK_MENU_SHELL (submenu), item2);
+--
+cgit v0.9.2
diff --git a/extra/xmlto/PKGBUILD b/extra/xmlto/PKGBUILD
index 2b719ac92..299f5ac51 100644
--- a/extra/xmlto/PKGBUILD
+++ b/extra/xmlto/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 149980 2012-02-11 23:31:41Z allan $
+# $Id: PKGBUILD 201307 2013-12-08 11:06:49Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
@@ -6,12 +6,12 @@
pkgname=xmlto
pkgver=0.0.25
-pkgrel=2.1
+pkgrel=3
pkgdesc="Convert xml to many other formats"
arch=('i686' 'x86_64' 'mips64el')
url="http://cyberelk.net/tim/software/xmlto/"
license=('GPL')
-depends=('libxslt' 'perl-yaml-syck' 'perl-test-pod')
+depends=('libxslt')
makedepends=('docbook-xsl')
source=("https://fedorahosted.org/releases/x/m/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
md5sums=('6b6267b1470f8571fe5f63a128970364')
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index ff5a25796..da0871cc8 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198667 2013-11-01 16:16:16Z andyrtr $
+# $Id: PKGBUILD 201503 2013-12-13 14:16:21Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=xorg-server
pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.14.4
+pkgver=1.14.5
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
@@ -24,7 +24,7 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
10-quirks.conf
loongson.patch
fb-rename-wfbDestroyGlyphCache.patch)
-sha256sums=('608ccfaafb845f6e559884a30f946d365209172416710d687b190e9e1ff65dc3'
+sha256sums=('8d0f06bf1416487a5170318477088826a8d737d4a201e996b2dc1ecff47461d1'
'66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD
index 38ccfeb49..ac6ae855a 100644
--- a/extra/xorg-xinit/PKGBUILD
+++ b/extra/xorg-xinit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 197640 2013-10-27 15:15:12Z andyrtr $
+# $Id: PKGBUILD 201357 2013-12-09 12:20:22Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xorg-xinit
pkgver=1.3.3
-pkgrel=2
+pkgrel=3
pkgdesc="X.Org initialisation program "
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
@@ -21,24 +21,31 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2
fs25361.patch
xinitrc
xsession
- xserverrc)
+ xserverrc
+ cpp-4.8-compat.patch
+ fix-globals-shadowing.patch)
options=(!emptydirs)
sha256sums=('74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af'
'a5c6ced5822bbb3145e0f30a4b12995782ca6d80ff2d927851ec91b5e41212cb'
'431335ceb84f75aaa96fba285a596f61a63629f94756f8063e4f621ae143629b'
'38a23848b49de8a5c635a128a8b32a6cd0a08a9ee153ad97cb25abd82cfda1bc'
'2b94a42f2521cb5662fb9a5765a7507456dc0352ac9d0f44c56b359dcdb38898'
- '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f')
+ '5e87bff928c143d9db9966048f6530e83e9e9a1cac09ce4c25f8aabc08611b6f'
+ '194104efba9bcbf8ec0bd9ac1b145017d459b734afbc8bbfc37e361efd467a96'
+ '6491c96dd0e98b6f5a45c4f0183eabcf2fb54728c81e793910c19d4107606bb1')
prepare() {
cd xinit-${pkgver}
- patch -Np1 -i "${srcdir}/06_move_serverauthfile_into_tmp.diff"
- patch -Np1 -i "${srcdir}/fs25361.patch"
+ patch -Np1 -i ../06_move_serverauthfile_into_tmp.diff
+ patch -Np1 -i ../fs25361.patch
+ patch -Np1 -i ../cpp-4.8-compat.patch
+ patch -Np1 -i ../fix-globals-shadowing.patch
sed -i -e 's/XSLASHGLOB.sh/XSLASHGLOB/' xinitrc.cpp
}
build() {
cd xinit-${pkgver}
+ autoreconf -fi
./configure --prefix=/usr --with-xinitdir=/etc/X11/xinit
make
}
@@ -53,9 +60,4 @@ package() {
install -m644 "${srcdir}/xserverrc" "${pkgdir}/etc/X11/xinit/xserverrc"
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
-
- # a workaround for https://bugs.archlinux.org/task/36959
- sed -i '/^\s*$/d' $pkgdir/usr/bin/startx
- sed -i '/^\s*$/d' $pkgdir/etc/X11/xinit/xinitrc
-
}
diff --git a/extra/xorg-xinit/cpp-4.8-compat.patch b/extra/xorg-xinit/cpp-4.8-compat.patch
new file mode 100644
index 000000000..b19f53eee
--- /dev/null
+++ b/extra/xorg-xinit/cpp-4.8-compat.patch
@@ -0,0 +1,22 @@
+From 463b85fcf51d8ff5886ebe1f3481e5cb4d603436 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat, 23 Nov 2013 07:03:39 +0000
+Subject: Pass files to cpp via CLI arg instead of stdin to workaround gcc 4.8 change
+
+Fixes Bug 69439 - Empty lines before #!/bin/sh in startx
+https://bugs.freedesktop.org/show_bug.cgi?id=69439
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/cpprules.in b/cpprules.in
+index eaea428..0931bee 100644
+--- a/cpprules.in
++++ b/cpprules.in
+@@ -15,4 +15,4 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
+ SUFFIXES = .cpp
+
+ .cpp:
+- $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
++ $(AM_V_GEN)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) $< | $(CPP_SED_MAGIC) > $@
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-xinit/fix-globals-shadowing.patch b/extra/xorg-xinit/fix-globals-shadowing.patch
new file mode 100644
index 000000000..d9e0a18f9
--- /dev/null
+++ b/extra/xorg-xinit/fix-globals-shadowing.patch
@@ -0,0 +1,58 @@
+From 182920f156c87715d91b2f64b8781a0072af996e Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun, 08 Sep 2013 16:48:50 +0000
+Subject: Fix warnings about parameters to startServer & startClient shadowing globals
+
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/xinit.c b/xinit.c
+index 18e3e10..1b04911 100644
+--- a/xinit.c
++++ b/xinit.c
+@@ -390,7 +390,7 @@ processTimeout(int timeout, const char *string)
+ }
+
+ static pid_t
+-startServer(char *server[])
++startServer(char *server_argv[])
+ {
+ sigset_t mask, old;
+ const char * const *cpp;
+@@ -422,12 +422,12 @@ startServer(char *server[])
+ * if client is xterm -L
+ */
+ setpgid(0,getpid());
+- Execute(server);
++ Execute(server_argv);
+
+- Error("unable to run server \"%s\"", server[0]);
++ Error("unable to run server \"%s\"", server_argv[0]);
+
+ fprintf(stderr, "Use the -- option, or make sure that %s is in your path and\n", bindir);
+- fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server[0]);
++ fprintf(stderr, "that \"%s\" is a program or a link to the right type of server\n", server_argv[0]);
+ fprintf(stderr, "for your display. Possible server names include:\n\n");
+ for (cpp = server_names; *cpp; cpp++)
+ fprintf(stderr, " %s\n", *cpp);
+@@ -556,7 +556,7 @@ setWindowPath(void)
+ }
+
+ static pid_t
+-startClient(char *client[])
++startClient(char *client_argv[])
+ {
+ clientpid = fork();
+ if (clientpid == 0) {
+@@ -568,8 +568,8 @@ startClient(char *client[])
+ _exit(EXIT_FAILURE);
+ }
+ setpgid(0, getpid());
+- Execute(client);
+- Error("Unable to run program \"%s\"", client[0]);
++ Execute(client_argv);
++ Error("Unable to run program \"%s\"", client_argv[0]);
+
+ fprintf(stderr, "Specify a program on the command line or make sure that %s\n", bindir);
+ fprintf(stderr, "is in your path.\n\n");
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xsd/PKGBUILD b/extra/xsd/PKGBUILD
index 8309fe961..59484aca6 100644
--- a/extra/xsd/PKGBUILD
+++ b/extra/xsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 190051 2013-07-13 12:43:05Z svenstaro $
+# $Id: PKGBUILD 201407 2013-12-10 17:55:39Z bpiotrowski $
# Maintainer:
# Contributor: kevku <kevku@gmx.com>
pkgname=xsd
pkgver=3.3.0
_pkgver=3.3.0-2+dep
-pkgrel=9
+pkgrel=10
pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.codesynthesis.com/products/xsd"
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index 048e57d2b..0c503436a 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 194316 2013-09-13 08:17:42Z andyrtr $
+# $Id: PKGBUILD 200773 2013-12-04 20:25:36Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xterm
-pkgver=297
+pkgver=300
pkgrel=1
pkgdesc="X Terminal Emulator"
arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('custom')
depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
LICENSE)
-md5sums=('45610ae6fe90cf086fcd75b9cb97bbaf'
+md5sums=('6adc7c7f39ab2a71fd83747049d60358'
'10ecc3f8ee91e3189863a172f68282d2')
build() {
diff --git a/extra/zenity/PKGBUILD b/extra/zenity/PKGBUILD
index 442193471..7c0c12406 100644
--- a/extra/zenity/PKGBUILD
+++ b/extra/zenity/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 197413 2013-10-25 15:49:33Z heftig $
+# $Id: PKGBUILD 201378 2013-12-10 10:09:05Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=zenity
-pkgver=3.10.0
+pkgver=3.10.2
pkgrel=1
pkgdesc="Display graphical dialog boxes from shell scripts"
arch=(i686 x86_64 mips64el)
@@ -10,7 +10,7 @@ license=(LGPL)
depends=(gtk3 libnotify)
makedepends=(intltool gtk-doc itstool docbook-xsl git gnome-common yelp-tools)
url="http://www.gnome.org"
-source=(git://git.gnome.org/zenity#tag=ZENITY_3_10_0)
+source=(git://git.gnome.org/zenity#tag=ZENITY_${pkgver//./_})
sha256sums=('SKIP')
prepare() {
diff --git a/java/antlr2/PKGBUILD b/java/antlr2/PKGBUILD
index 6fdf7dd29..de5262698 100644
--- a/java/antlr2/PKGBUILD
+++ b/java/antlr2/PKGBUILD
@@ -6,11 +6,11 @@
pkgbase=antlr2
pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
pkgver=2.7.7
-pkgdesc="ANother Tool for Language Recognition (formerly PCCTS)"
+pkgdesc="ANother Tool for Language Recognition"
url="http://www.antlr2.org/"
license=('custom:Public Domain')
-pkgrel=3.2
+pkgrel=4.1
arch=('i686' 'x86_64')
makedepends=('java-environment' 'python2' 'sh' 'nant' 'jh')
source=("http://www.antlr2.org/download/antlr-${pkgver}.tar.gz"
@@ -94,6 +94,6 @@ package_antlr2-sharp() {
md5sums=('01cc9a2a454dd33dcd8c856ec89af090'
'78af3de823003f6d8dded39c70bc30ae'
- 'e4aa827cf78f97c4e5fae086831192d6'
+ '78e9bf86bd44722f232f80bc7b04dcfe'
'158677e4c0f357afbb56656231a54815'
'0d1960d27ff81f2fea0dd35a8290216f')
diff --git a/java/antlr2/runantlr2.sh b/java/antlr2/runantlr2.sh
index 716f6f887..aebc9dfa7 100644
--- a/java/antlr2/runantlr2.sh
+++ b/java/antlr2/runantlr2.sh
@@ -2,4 +2,4 @@
echo Running 'java antlr.Tool $*' with /usr/share/java/antlr2.jar appended to the CLASSPATH variable
export CLASSPATH
CLASSPATH=$CLASSPATH:/usr/share/java/antlr2.jar
-java antlr.Tool $*
+java antlr.Tool "$@"
diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD
index dfda3c28d..ae8967a2f 100755
--- a/java/apache-ant/PKGBUILD
+++ b/java/apache-ant/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Andrew Wright <andreww@photism.org>
pkgname=apache-ant
-pkgver=1.9.1
+pkgver=1.9.2
pkgdesc="A Java-based build tool"
license=('Apache' 'custom:BSD3')
url="http://ant.apache.org/"
@@ -12,7 +12,7 @@ provides=("apache-ant-libre=$pkgver")
replaces=("apache-ant-libre")
conflicts=("apache-ant-libre")
-pkgrel=3
+pkgrel=3.2 # newer than Arch's 1.9.2-3
arch=('any')
depends=('java-environment')
makedepends=('jh')
@@ -22,37 +22,45 @@ source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2
${pkgname}.sh ${pkgname}.csh)
# This list is adapted from https://ant.apache.org/manual/install.html#librarydependencies
-declare -A _opts
-_opts[junit]='to have JUnit on the classpath in javac tasks;/usr/share/java/junit.jar'
-_opts[xalan-java]='<junitreport> task;/usr/share/java/xalan.jar'
-_opts[java-antlr2]='<antlr> task;/usr/share/java/antlr2.jar::antlr.jar'
-_opts[java-commons-bsf2]='<script> task;/usr/share/java/bsf2.jar::bsf.jar'
-#_opts[groovy]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/groovy.jar'
-_opts[java-asm2]='Groovy with <script> and <scriptdef> tasks;/usr/share/java/asm-2.jar::asm.jar /usr/share/java/asm-util-2.jar::asm-util.jar'
-#_opts[netrexx]='<netrexx> task, Rexx with <script> task;/usr/share/java/netrexx.jar'
-_opts[java-rhino]='Javascript with <script> task;/usr/share/java/js.jar'
-_opts[jython]='Python with <script> task;/opt/jython/jython.jar'
-#_opts[jacl]='TCL with <script> task;/usr/share/java/jacl.jar'
-#_opts[tcljava]='TCL with <script> task;/usr/share/java/tcljava.jar'
-_opts[beanshell>=1.3]='BeanShell with <script> task;/usr/share/java/bsh.jar::beanshell.jar'
-_opts[jruby]='Ruby with <script> task;/opt/jruby/lib/jruby.jar'
-#_opts[judo]='Judoscript with <script> task;/usr/share/java/judo.jar'
-_opts[java-commons-logging]='CommonsLoggingListener;/usr/share/java/commons-logging/commons-logging.jar'
-#_opts[java-log4j]='Log4jListener;/usr/share/java/log4j.jar'
-_opts[java-commons-net1>=1.4.0]='<ftp>, <rexec> and <telnet> tasks;/usr/share/java/commons-net.jar'
-_opts[java-bcel]="'classfileset' data type, JavaClassHelper for ClassConstants filter reader;/usr/share/java/bcel.jar"
-#_opts[java-mail]='<mimemail> task, mime encoding with <mail>;/usr/share/java/mail.jar'
-_opts[java-activation-gnu]='<mimemail> task, mime encoding with <mail>;/usr/share/java/activation.jar'
-_opts[java-jdepend]='<jdepend> task;/usr/share/java/jdepend.jar'
-#_opts[java-xmlcommons-resolver>=1.1beta]="external files for 'xmlcatalog' datatype;/usr/share/java/resolver.jar"
-_opts[java-jsch>=0.1.42]='<sshexec> and <scp> tasks;/usr/share/java/jsch.jar'
-#_opts[java-advanced-imaging]='<image> task/usr/share/java/jai/*.jar'
-
-for pkg in "${!_opts[@]}"; do
- optdepends+=("$pkg: ${_opts[$pkg]%;*}")
- makedepends+=("$pkg")
- _jars+="${_opts[$pkg]#*;} "
+# The format is:
+# jarname:description:pkgname:jarpath
+_library_dependencies=(
+ #jakarta-regexp-1.3.jar:Disregard
+ jakarta-oro-2.0.8.jar:'<ftp task>':jakarta-oro:/usr/share/java/jakarta-oro.jar
+ junit.jar:'<junit> task':junit:/usr/share/java/junit.jar
+ xalan.jar:'<junitreport> task':xalan-java:/usr/share/java/xalan.jar
+ antlr.jar:'<antlr> task':java-antlr2:/usr/share/java/antlr2.jar
+ bsf.jar:'<script> task':java-commons-bsf2:/usr/share/java/bsf2.jar
+ groovy-all.jar:'Groovy with <script> and <scriptdef> tasks':groovy:/usr/share/groovy/embeddable/groovy-all.jar
+ #netrexx.jar:'<netrexx> task, Rexx with <script> task':???????:???????
+ js.jar:'Javascript with <script> task':java-rhino:/usr/share/java/js.jar
+ jython.jar:'Python with <script> task':jython:/opt/jython/jython.jar
+ #jpython.jar:Disregard
+ #jacl.jar:'TCL with <script> task':???????:???????
+ #tcljava.jar:'TCL with <script> task':???????:???????
+ beanshell.jar:'BeanShell with <script> task':'beanshell>=1.3':/usr/share/java/bsh.jar
+ jruby.jar:'Ruby with <script> task':jruby:/opt/jruby/lib/jruby.jar
+ #judo.jar:Judoscript with <script> task:???????:??????
+ commons-logging.jar:'CommonsLoggingListener':java-commons-logging:/usr/share/java/commons-logging/commons-logging.jar
+ #log4j.jar:'Log4jListener':???????:???????
+ commons-net.jar:'<ftp>, <rexec> and <telnet> tasks':'java-commons-net1>=1.4.0':/usr/share/java/commons-net.jar
+ bcel.jar:"'classfileset' data type, JavaClassHelper for ClassConstants filter reader":java-bcel:/usr/share/java/bcel.jar
+ mail.jar:'<mimemail> task, mime encoding with <mail>':java-gnumail:/usr/share/java/gnumail.jar
+ activation.jar:'<mimemail> task, mime encoding with <mail>':java-activation-gnu:/usr/share/java/activation.jar
+ jdepend.jar:'<jdepend> task':java-jdepend:/usr/share/java/jdepend.jar
+# FIXME: When FS#38243 is fixed, 'xerces2-java' should be changed to 'java-resolver'.
+# We use xerces in the mean time because xalan depends on it.
+ resolver.jar:"external files for 'xmlcatalog' datatype":xerces2-java:/usr/share/java/resolver.jar
+ jsch.jar:'<sshexec> and <scp> tasks':'java-jsch>=0.1.42':/usr/share/java/jsch.jar
+ #jai.jar:'<image> task':???????:???????
+)
+
+for _dep in "${_library_dependencies[@]}"; do
+ IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
+ optdepends+=("${_pkgname}: ${_desc}")
+ makedepends+=("${_pkgname}")
done
+unset _dep _jarname _desc _pkgname _jarpath
build() {
# This directory is what becomes
@@ -63,14 +71,24 @@ build() {
cd "${srcdir}"/${pkgname}-${pkgver}
# Symlink to external optional libraries/
- for jar in $_jars; do
- ln -sfv ${jar%::*} lib/optional/`basename ${jar#*::}`
+ local _dep _jarname _desc _pkgname _jarpath
+ for _dep in "${_library_dependencies[@]}"; do
+ IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
+ ln -sfv "${_jarpath}" lib/optional/${_jarname}
done
# Build
source "/etc/profile.d/jdk.sh" # Get the JAVA_HOME env var
sh build.sh -Ddist.dir="${srcdir}"/${pkgname}-${pkgver}-bin dist
}
+# Create a relative symlink
+_rellink() {
+ local src=$1
+ local dst=$2
+ mkdir -p "${pkgdir}/${dst%/*}"
+ ln -sfv "$(realpath -m "$src" --relative-to="${dst%/*}")" "${pkgdir}/${dst}"
+}
+
package() {
cd "${srcdir}"/${pkgname}-${pkgver}-bin
source "${srcdir}"/${pkgname}.sh # Get the ANT_HOME env var
@@ -90,33 +108,35 @@ package() {
# Fix python2 path
sed -i 's|/usr/bin/python|/usr/bin/python2|' "${pkgdir}"/${ANT_HOME}/bin/runant.py
# Symlink to external optional libraries
- for jar in $_jars; do
- ln -sf ${jar%::*} "${pkgdir}"/${ANT_HOME}/lib/`basename ${jar#*::}`
+ local _dep _jarname _desc _pkgname _jarpath
+ for _dep in "${_library_dependencies[@]}"; do
+ IFS=: read _jarname _desc _pkgname _jarpath <<<"$_dep"
+ _rellink "${_jarpath}" "${ANT_HOME}/lib/${_jarname}"
done
## Symlink the /opt distribution to the normal places
- install -d "${pkgdir}"/usr/bin
- install -d "${pkgdir}"/usr/share/doc/${pkgname}
- install -d "${pkgdir}"/usr/share/licenses/${pkgname}
cd "${pkgdir}"/${ANT_HOME}/lib
+ local pom a
for pom in *.pom; do
a=${pom%.pom}
base=$(jh mvn-basename org.apache.ant $a $pkgver)
- install -d "${pkgdir}${base%/*}"
- ln -sf ${ANT_HOME}/lib/$a.pom "${pkgdir}${base}".pom
- ln -sf ${ANT_HOME}/lib/$a.jar "${pkgdir}${base}".jar
+ _rellink "${ANT_HOME}/lib/$a.pom" "${base}.pom"
+ _rellink "${ANT_HOME}/lib/$a.jar" "${base}.jar"
done
- cd "${pkgdir}"/${ANT_HOME}
- for prog in bin/*; do
- ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin
+ cd "${pkgdir}"/${ANT_HOME}/bin
+ local prog
+ for prog in *; do
+ _rellink "${ANT_HOME}/bin/$prog" "/usr/bin/$prog"
done
- ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname}
- ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html
- ln -sf ${ANT_HOME}/{LICENSE,NOTICE} "${pkgdir}"/usr/share/licenses/${pkgname}
+ _rellink "${ANT_HOME}/README" "/usr/share/doc/${pkgname}/README"
+ _rellink "${ANT_HOME}/WHATSNEW" "/usr/share/doc/${pkgname}/WHATSNEW"
+ _rellink "${ANT_HOME}/docs" "/usr/share/doc/${pkgname}/html"
+ _rellink "${ANT_HOME}/LICENSE" "/usr/share/licenses/${pkgname}/LICENSE"
+ _rellink "${ANT_HOME}/NOTICE" "/usr/share/licenses/${pkgname}/NOTICE"
}
-md5sums=('39771fd8b4ba87cd77ff6f27001cce4e'
+md5sums=('8f610c1a0183507c2beebbf230f456af'
'bd63c881be406f515fc4d22635e8326a'
'aaa615512cbe1ed7f3b62c1ff46802f8')
diff --git a/java/closure-compiler/PKGBUILD b/java/closure-compiler/PKGBUILD
index 25d5d60ad..8c9ea0c34 100644
--- a/java/closure-compiler/PKGBUILD
+++ b/java/closure-compiler/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
pkgname=closure-compiler
-pkgver=20130603
+pkgver=20131118
pkgdesc="A JavaScript optimizing compiler."
url="https://code.google.com/closure/compiler/"
-license=('Apache2')
+license=('Apache')
pkgrel=1
arch=('any')
@@ -19,10 +19,13 @@ makedepends=(
#'java-jsr305' # does not exist
'junit'
#'java-protobuf' # does not build
- # maven-ant-tasks
- 'jh')
+ #'maven-ant-tasks' # does not exist
+ 'jh'
+)
source=("libre://$pkgname-$pkgver.tar.gz" 'closure-compiler.sh')
+md5sums=('0fceda3f4d43a6d266f9888e7683bdc9'
+ 'd4ead4585fcc7039d3c32eb5c4491bb9')
mksource=("$pkgname-$pkgver::git+https://code.google.com/p/closure-compiler/#tag=v${pkgver}")
mkmd5sums=('SKIP')
@@ -62,6 +65,3 @@ package() {
build/pom.xml build/compiler.jar \
closure-compiler.jar
}
-
-md5sums=('00b89084401b9550166a1f1294f9ba39'
- 'd4ead4585fcc7039d3c32eb5c4491bb9')
diff --git a/java/jakarta-oro/PKGBUILD b/java/jakarta-oro/PKGBUILD
index 9bc3e11b9..24f7a2772 100644
--- a/java/jakarta-oro/PKGBUILD
+++ b/java/jakarta-oro/PKGBUILD
@@ -1,30 +1,30 @@
-# Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Xiao-Long Chen <chenxiaolong@cxl.epac.to>
pkgname=jakarta-oro
pkgver=2.0.8
-pkgrel=1
-pkgdesc="Full regular expressions API"
+pkgrel=1.1
+pkgdesc="Java regular expression and text-processing library"
arch=('any')
-url="http://jakarta.apache.org/oro"
+url="https://jakarta.apache.org/oro"
license=('Apache')
makedepends=('apache-ant')
-source=("http://archive.apache.org/dist/jakarta/oro/jakarta-oro-${pkgver}.tar.gz")
+source=("http://archive.apache.org/dist/jakarta/oro/${pkgname}-${pkgver}.tar.gz")
sha512sums=('a7f6eb6a088765f273df18ccc823f918737f18ec8772275054839a87f8370f1848e795d481f226c712651104d7598ab86c7d90a991fb039df6581f42f1447920')
-build() {
+prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ find . \( -name '*.jar' -o -name '*.class' \) -delete
+}
- find . -name '*.jar' -o -name '*.class' -delete
-
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
ant jar
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- install -dm755 "${pkgdir}/usr/share/java/"
- install -m644 ${pkgname}-${pkgver}.jar \
+ install -Dm644 ${pkgname}-${pkgver}.jar \
"${pkgdir}/usr/share/java/${pkgname}.jar"
}
-
-# vim:set ts=2 sw=2 et:
diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD
index a5ec08c9f..7a9113529 100644
--- a/java/java-json-android/PKGBUILD
+++ b/java/java-json-android/PKGBUILD
@@ -10,14 +10,14 @@ pkgver=${_pkgver//_/.}
provides=(java-json)
conflicts=(java-json)
-pkgrel=2
+pkgrel=3
arch=(any)
depends=(java-runtime)
makedepends=(java-environment junit)
source=("libre://android-libcore-$_pkgver.tar.gz")
-md5sums=('367769bb9d7fe571ff4e1e82b99e99ed')
+md5sums=('546a4614552615a12f45b62db27acddf')
mkdepends=(git)
mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}")
diff --git a/java/junit/PKGBUILD b/java/junit/PKGBUILD
index 5e466a029..04dbcb2ac 100644
--- a/java/junit/PKGBUILD
+++ b/java/junit/PKGBUILD
@@ -7,24 +7,18 @@ pkgdesc="Automated testing framework for Java"
url="http://www.junit.org/"
license=('CPL')
-pkgrel=3.1
+pkgrel=3.2
arch=('any')
depends=('java-runtime' 'java-hamcrest')
makedepends=('apache-ant' 'jakarta-oro' 'jh')
source=("libre://$pkgname-$pkgver.tar.gz")
-md5sums=('47c8879e05effb2ab98461c43243cc65')
+md5sums=('cdaa9856761201de81a61aecb8cfcc9c')
-mksource=("$pkgname::git://github.com/junit-team/junit.git#tag=r$pkgver")
+mksource=("$pkgname-$pkgver::git://github.com/junit-team/junit.git#tag=r$pkgver")
mkmd5sums=('SKIP')
mksource() {
- cd "${srcdir}"p
- if [[ -d $pkgname ]]; then
- rm -rf "$pkgname"-*
- mv "$pkgname" "$pkgname-$pkgver"
- fi
-
- cd "${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-${pkgver}"
find . -name '*.jar' -delete
}
diff --git a/kernels/linux-libre-knock/Kbuild b/kernels/linux-libre-knock/Kbuild
new file mode 100644
index 000000000..8a9d7dceb
--- /dev/null
+++ b/kernels/linux-libre-knock/Kbuild
@@ -0,0 +1,19 @@
+# Fail on warnings - also for files referenced in subdirs
+# -Werror can be disabled for specific files using:
+# CFLAGS_<file.o> := -Wno-error
+subdir-ccflags-y := -Wno-error
+
+# platform specific definitions
+include arch/mips/Kbuild.platforms
+obj-y := $(platform-y)
+
+# make clean traverses $(obj-) without having included .config, so
+# everything ends up here
+obj- := $(platform-)
+
+# mips object files
+# The object files are linked as core-y files would be linked
+
+obj-y += kernel/
+obj-y += mm/
+obj-y += math-emu/
diff --git a/kernels/linux-libre-knock/Kbuild.platforms b/kernels/linux-libre-knock/Kbuild.platforms
new file mode 100644
index 000000000..90a226888
--- /dev/null
+++ b/kernels/linux-libre-knock/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/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
new file mode 100644
index 000000000..a59d29bdc
--- /dev/null
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -0,0 +1,425 @@
+# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
+# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: Thomas Baechler <thomas@archlinux.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+
+pkgbase=linux-libre-knock # Build stock -LIBRE-KNOCK kernel
+#pkgbase=linux-libre-custom # Build kernel with a different name
+_basekernel=3.12
+_sublevel=6
+_knockpatchver=${_basekernel}.4
+pkgver=${_basekernel}.${_sublevel}
+pkgrel=1
+_lxopkgver=${_basekernel}.6 # 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"
+ "http://gnunet.org/sites/default/files/tcp_stealth_${_knockpatchver}.diff"
+ # 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'
+ 'criu-no-expert.patch'
+ "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+ '4b18ce60daff87504e6740670edf6b50'
+ '387673a6510de1e1bce8188fc7a72bd1'
+ 'a903586ecfeaca65fe2abfa9e74f0816'
+ '58ab468b3f407f1471725f939638c8bd'
+ '18d660832d681a27084774222fc74c1d'
+ '2967cecc3af9f954ccc822fd63dca6ff'
+ '8267264d9a8966e57fdacd1fa1fc65c4'
+ '44260d2cb1a8b51c119d2ce1f83e457a'
+ '98beb36f9b8cf16e58de2483ea9985e3'
+ 'd50c1ac47394e9aec637002ef3392bd1'
+ '71bbddd5f9799aa045660d92baa05845')
+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-KNOCK
+
+prepare() {
+ cd "${srcdir}/linux-${_basekernel}"
+
+ if [ "${_basekernel}" != "${pkgver}" ]; then
+ patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+ fi
+
+ # add knock patch
+ patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff"
+
+ # add freedo as boot logo
+ patch -Np1 -i "${srcdir}/boot-logo.patch"
+
+ # fix issue on Hal8188EFWImg_CE.c deblobbed file
+ sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+
+ # 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"
+
+ # allow criu without expert option set
+ # patch from fedora
+ patch -Np1 -i "${srcdir}/criu-no-expert.patch"
+
+ if [ "$CARCH" == "mips64el" ]; then
+ sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-knock|" 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 with support for stealth TCP sockets"
+ [ "${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"
+
+ # set correct depmod command for install
+ cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
+ true && install=${install}.pkg
+ sed \
+ -e "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
+ -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \
+ -i "${startdir}/${install}"
+
+ # install mkinitcpio preset file for kernel
+ install -D -m644 "${srcdir}/${pkgbase}.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
+ 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-KNOCK}" "${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-KNOCK}"
+ echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}${_localversionname:--LIBRE-KNOCK}/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,arm64,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/kernels/linux-libre-knock/boot-logo.patch b/kernels/linux-libre-knock/boot-logo.patch
new file mode 100644
index 000000000..3f4e0dea4
--- /dev/null
+++ b/kernels/linux-libre-knock/boot-logo.patch
@@ -0,0 +1,23167 @@
+diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
+index 3c14e43..c9d8373 100644
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
+@@ -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 --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
+index 2f14d9f..3d3c358 100644
+--- a/drivers/video/logo/logo_linux_mono.pbm
++++ b/drivers/video/logo/logo_linux_mono.pbm
+@@ -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 --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
+index 1850c15..f279f97 100644
+--- a/drivers/video/logo/logo_linux_vga16.ppm
++++ b/drivers/video/logo/logo_linux_vga16.ppm
+@@ -1,1604 +1,18724 @@
+ P3
+-# Standard 16-color Linux logo
+-80 80
+-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
++# 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
++85
++85
++85
++85
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++85
++85
++85
++0
++0
++0
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++85
++85
++85
++0
++0
++0
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++85
++85
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++85
++85
++170
++170
++170
++255
++255
++255
++170
++170
++170
++170
++170
++170
++170
++170
++170
++85
++85
++85
++0
++0
++0
++85
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++170
++170
++170
++170
++170
++170
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++170
++170
++170
++85
++85
++85
++170
++170
++170
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++255
++85
++85
++255
++85
++85
++0
++0
++0
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++255
++255
++255
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++0
++0
++0
++0
++0
++0
++255
++85
++85
++0
++0
++0
++85
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++255
++85
++85
++85
++85
++85
++0
++0
++0
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++0
++0
++0
++85
++85
++85
++255
++85
++85
++0
++0
++0
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++255
++85
++85
++0
++0
++0
++255
++85
++85
++255
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++85
++85
++85
++0
++0
++0
++255
++85
++85
++0
++0
++0
++85
++85
++85
++255
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++255
++85
++85
++0
++0
++0
++85
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++85
++85
++85
++0
++0
++0
++255
++85
++85
++0
++0
++0
++85
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++85
++85
++85
++0
++0
++0
++255
++85
++85
++0
++0
++0
++85
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++85
++85
++85
++0
++0
++0
++255
++85
++85
++0
++0
++0
++85
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++85
++85
++85
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++170
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++170
++170
++170
++255
++255
++255
++170
++170
++170
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++85
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++85
++85
++85
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++85
++85
++85
++85
++85
++170
++170
++170
++170
++170
++170
++85
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++255
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++85
++85
++255
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++170
++170
++170
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++255
++255
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++85
++85
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++170
++170
++170
++0
++0
++0
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++85
++85
++85
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++0
++0
++0
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++85
++85
++85
++0
++0
++0
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++85
++85
++85
++85
++255
++255
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++85
++85
++170
++170
++170
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++255
++170
++170
++170
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++85
++85
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++85
++85
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++255
++255
++85
++255
++255
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++85
++85
++85
++255
++255
++85
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
++0
diff --git a/kernels/linux-libre-knock/change-default-console-loglevel.patch b/kernels/linux-libre-knock/change-default-console-loglevel.patch
new file mode 100644
index 000000000..22cd69a09
--- /dev/null
+++ b/kernels/linux-libre-knock/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/printk.c 2011-07-22 05:17:23.000000000 +0300
++++ linux-3.0/kernel/printk/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/linux-libre/config.i686.3.12 b/kernels/linux-libre-knock/config.i686
index be1ac2a86..f3ec493fa 100644
--- a/libre/linux-libre/config.i686.3.12
+++ b/kernels/linux-libre-knock/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-rc4 Kernel Configuration
+# Linux/x86 3.12.0-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -50,7 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-LIBRE"
+CONFIG_LOCALVERSION="-LIBRE-KNOCK"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
@@ -806,6 +806,7 @@ CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
+CONFIG_TCP_STEALTH=y
CONFIG_IPV6=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
@@ -1344,9 +1345,9 @@ 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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1452,7 +1453,7 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
@@ -1741,7 +1742,7 @@ 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=y
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -5553,7 +5554,13 @@ CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
# CONFIG_USB_DWC2 is not set
-CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
CONFIG_USB_BTMTK=m
# CONFIG_XILLYBUS is not set
CONFIG_DGNC=m
@@ -6063,7 +6070,6 @@ CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_KOBJECT_RELEASE is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_WRITECOUNT is not set
# CONFIG_DEBUG_LIST is not set
diff --git a/libre/linux-libre/config.x86_64.3.12 b/kernels/linux-libre-knock/config.x86_64
index e23ad6ef4..666c9005a 100644
--- a/libre/linux-libre/config.x86_64.3.12
+++ b/kernels/linux-libre-knock/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.12.0-rc4 Kernel Configuration
+# Linux/x86 3.12.1-3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -51,7 +51,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
-CONFIG_LOCALVERSION="-LIBRE"
+CONFIG_LOCALVERSION="-LIBRE-KNOCK"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
@@ -167,7 +167,7 @@ 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_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
@@ -472,6 +472,7 @@ CONFIG_FRONTSWAP=y
# CONFIG_CMA is not set
CONFIG_ZBUD=y
CONFIG_ZSWAP=y
+CONFIG_MEM_SOFT_DIRTY=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
@@ -785,6 +786,7 @@ CONFIG_DEFAULT_CUBIC=y
# CONFIG_DEFAULT_RENO is not set
CONFIG_DEFAULT_TCP_CONG="cubic"
# CONFIG_TCP_MD5SIG is not set
+CONFIG_TCP_STEALTH=y
CONFIG_IPV6=y
CONFIG_IPV6_PRIVACY=y
CONFIG_IPV6_ROUTER_PREF=y
@@ -1315,9 +1317,9 @@ 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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1424,7 +1426,7 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
@@ -1696,7 +1698,7 @@ 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=y
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -5343,7 +5345,13 @@ CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
# CONFIG_USB_DWC2 is not set
-CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
CONFIG_USB_BTMTK=m
# CONFIG_XILLYBUS is not set
CONFIG_DGNC=m
@@ -5849,7 +5857,6 @@ CONFIG_DEBUG_MUTEXES=y
# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_KOBJECT_RELEASE is not set
CONFIG_DEBUG_BUGVERBOSE=y
# CONFIG_DEBUG_WRITECOUNT is not set
# CONFIG_DEBUG_LIST is not set
diff --git a/kernels/linux-libre-knock/criu-no-expert.patch b/kernels/linux-libre-knock/criu-no-expert.patch
new file mode 100644
index 000000000..2124427e9
--- /dev/null
+++ b/kernels/linux-libre-knock/criu-no-expert.patch
@@ -0,0 +1,22 @@
+diff --git a/init/Kconfig b/init/Kconfig
+index be8b7f5..7461760 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP
+ endif # CGROUPS
+
+ config CHECKPOINT_RESTORE
+- bool "Checkpoint/restore support" if EXPERT
++ bool "Checkpoint/restore support"
+ default n
+ help
+ Enables additional kernel features in a sake of checkpoint/restore.
+@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE
+ If unsure, say N here.
+
+ menuconfig NAMESPACES
+- bool "Namespaces support" if EXPERT
++ bool "Namespaces support"
+ default !EXPERT
+ help
+ Provides the way to make tasks work with different objects using
diff --git a/kernels/linux-libre-knock/linux-libre-knock.install b/kernels/linux-libre-knock/linux-libre-knock.install
new file mode 100644
index 000000000..bc0352203
--- /dev/null
+++ b/kernels/linux-libre-knock/linux-libre-knock.install
@@ -0,0 +1,35 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+KERNEL_NAME=-knock
+KERNEL_VERSION=
+
+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
+}
+
+post_upgrade() {
+ 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${KERNEL_NAME}.img
+ rm -f boot/initramfs-linux-libre${KERNEL_NAME}-fallback.img
+}
diff --git a/kernels/linux-libre-knock/linux-libre-knock.preset b/kernels/linux-libre-knock/linux-libre-knock.preset
new file mode 100644
index 000000000..59fef2111
--- /dev/null
+++ b/kernels/linux-libre-knock/linux-libre-knock.preset
@@ -0,0 +1,14 @@
+# mkinitcpio preset file for the 'linux-libre-knock' package
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="/boot/vmlinuz-linux-libre-knock"
+
+PRESETS=('default' 'fallback')
+
+#default_config="/etc/mkinitcpio.conf"
+default_image="/boot/initramfs-linux-libre-knock.img"
+#default_options=""
+
+#fallback_config="/etc/mkinitcpio.conf"
+fallback_image="/boot/initramfs-linux-libre-knock-fallback.img"
+fallback_options="-S autodetect"
diff --git a/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch b/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch
deleted file mode 100644
index 1f376b518..000000000
--- a/kernels/linux-libre-pae/3.11-haswell-intel_pstate.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001
-From: Nell Hardcastle <nell@spicious.com>
-Date: Sun, 30 Jun 2013 22:58:57 +0000
-Subject: intel_pstate: Add Haswell CPU models
-
-Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge
-model (0x3E) is also included. Models referenced from
-tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit
-
-Signed-off-by: Nell Hardcastle <nell@spicious.com>
-Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
-Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
----
-diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 6efd96c..9733f29 100644
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
- ICPU(0x2a, default_policy),
- ICPU(0x2d, default_policy),
- ICPU(0x3a, default_policy),
-+ ICPU(0x3c, default_policy),
-+ ICPU(0x3e, default_policy),
-+ ICPU(0x3f, default_policy),
-+ ICPU(0x45, default_policy),
-+ ICPU(0x46, default_policy),
- {}
- };
- MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
---
-cgit v0.9.2
diff --git a/kernels/linux-libre-pae/3.12-btrfs-relocate-csums.patch b/kernels/linux-libre-pae/3.12-btrfs-relocate-csums.patch
new file mode 100644
index 000000000..7209276ef
--- /dev/null
+++ b/kernels/linux-libre-pae/3.12-btrfs-relocate-csums.patch
@@ -0,0 +1,63 @@
+From 4577b014d1bc3db386da3246f625888fc48083a9 Mon Sep 17 00:00:00 2001
+From: Josef Bacik <jbacik@fusionio.com>
+Date: Fri, 27 Sep 2013 13:33:09 +0000
+Subject: Btrfs: relocate csums properly with prealloc extents
+
+A user reported a problem where they were getting csum errors when running a
+balance and running systemd's journal. This is because systemd is awesome and
+fallocate()'s its log space and writes into it. Unfortunately we assume that
+when we read in all the csums for an extent that they are sequential starting at
+the bytenr we care about. This obviously isn't the case for prealloc extents,
+where we could have written to the middle of the prealloc extent only, which
+means the csum would be for the bytenr in the middle of our range and not the
+front of our range. Fix this by offsetting the new bytenr we are logging to
+based on the original bytenr the csum was for. With this patch I no longer see
+the csum errors I was seeing. Thanks,
+
+Cc: stable@vger.kernel.org
+Reported-by: Chris Murphy <lists@colorremedies.com>
+Signed-off-by: Josef Bacik <jbacik@fusionio.com>
+Signed-off-by: Chris Mason <chris.mason@fusionio.com>
+---
+diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
+index dec4f5a..0359eec 100644
+--- a/fs/btrfs/relocation.c
++++ b/fs/btrfs/relocation.c
+@@ -4472,6 +4472,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
+ struct btrfs_root *root = BTRFS_I(inode)->root;
+ int ret;
+ u64 disk_bytenr;
++ u64 new_bytenr;
+ LIST_HEAD(list);
+
+ ordered = btrfs_lookup_ordered_extent(inode, file_pos);
+@@ -4483,13 +4484,24 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
+ if (ret)
+ goto out;
+
+- disk_bytenr = ordered->start;
+ while (!list_empty(&list)) {
+ sums = list_entry(list.next, struct btrfs_ordered_sum, list);
+ list_del_init(&sums->list);
+
+- sums->bytenr = disk_bytenr;
+- disk_bytenr += sums->len;
++ /*
++ * We need to offset the new_bytenr based on where the csum is.
++ * We need to do this because we will read in entire prealloc
++ * extents but we may have written to say the middle of the
++ * prealloc extent, so we need to make sure the csum goes with
++ * the right disk offset.
++ *
++ * We can do this because the data reloc inode refers strictly
++ * to the on disk bytes, so we don't have to worry about
++ * disk_len vs real len like with real inodes since it's all
++ * disk length.
++ */
++ new_bytenr = ordered->start + (sums->bytenr - disk_bytenr);
++ sums->bytenr = new_bytenr;
+
+ btrfs_add_ordered_sum(inode, ordered, sums);
+ }
+--
+cgit v0.9.2
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 2ddd1ad62..530f6d6dd 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 196455 2013-10-14 06:53:31Z tpowa $
+# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.11
-pkgver=${_basekernel}.5
+_basekernel=3.12
+pkgver=${_basekernel}.6
pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
@@ -21,16 +21,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
"${pkgbase}.preset"
'boot-logo.patch'
'change-default-console-loglevel.patch'
- 'criu-no-expert.patch'
- '3.11-haswell-intel_pstate.patch')
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
- 'bcd700aa1ae7f13107a14885923358eb'
- '3c6c0273ea8624e94cf960091c7809e7'
+ 'criu-no-expert.patch')
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+ '4b18ce60daff87504e6740670edf6b50'
+ '0a663d07acafb493399e8a5706a4cb84'
'f302c931bd85309da9d9792b4cc96467'
- '36e90334b12b2e9d53fd92129ee98f5b'
+ '44260d2cb1a8b51c119d2ce1f83e457a'
'98beb36f9b8cf16e58de2483ea9985e3'
- 'd50c1ac47394e9aec637002ef3392bd1'
- '1040ae6c10d4a68f89899f94a2318a17')
+ 'd50c1ac47394e9aec637002ef3392bd1')
_kernelname=${pkgbase#linux-libre}
_localversionname=-LIBRE-PAE
@@ -45,16 +43,14 @@ prepare() {
# add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
+ # fix issue on Hal8188EFWImg_CE.c deblobbed file
+ sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+
# 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"
- # add intel haswell support to intel_pstate
- # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
- # will be in 3.12
- patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch"
-
# allow criu without expert option set
# patch from fedora
patch -Np1 -i "${srcdir}/criu-no-expert.patch"
diff --git a/kernels/linux-libre-pae/boot-logo.patch b/kernels/linux-libre-pae/boot-logo.patch
index cbd52ea22..3f4e0dea4 100644
--- a/kernels/linux-libre-pae/boot-logo.patch
+++ b/kernels/linux-libre-pae/boot-logo.patch
@@ -1,891 +1,1613 @@
diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 285d552..c9d8373 100644
+index 3c14e43..c9d8373 100644
--- a/drivers/video/logo/logo_linux_clut224.ppm
+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,883 +1,861 @@
+@@ -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 11 15 17 33 49 54 59 85 92 73 97 106
--83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 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 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106
--105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0
--0 0 0 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 1 1 1 1 1 1 0 0 0
--0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83
--108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0
--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 1 1 1 0 0 0 0 0 0 0 0 0
--11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133
--108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 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 1 1 1 7 12 13 21 31 35 42 59 64
--53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116
--132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13
--1 1 1 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 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92
--59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104
--117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60
--7 12 13 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 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35
--6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104
--108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129
--36 50 56 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
--
--27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39
--12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110
--117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152
--68 78 128 15 22 25 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
--
--36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64
--57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104
--152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152
--95 131 149 53 75 83 11 15 17 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
--
--17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83
--86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104
--137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157
--95 131 149 83 116 129 40 48 73 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
--
--1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79
--152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86
--94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152
--95 131 149 91 118 149 78 102 129 27 40 45 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
--
--4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79
--174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86
--79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152
--91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 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
--
--19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79
--174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32
--21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152
--91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 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
--
--34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79
--174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35
--12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157
--93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 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
--
--40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55
--123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69
--60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162
--91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 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 124 131 137 170 170 170 151 151 151 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
--
--34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18
--48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54
--68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149
--91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14
--124 131 137 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 124 131 137 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
--
--19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0
--6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8
--34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149
--73 97 106 36 50 56 33 49 54 18 18 18 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 170 170 170 124 127 131 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
--
--4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3
--13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35
--26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103
--53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106
--170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 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 151 151 151 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
--
--1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20
--18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79
--17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20
--42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116
--106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 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
--
--11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69
--63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128
--24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49
--29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101
--124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6
--170 170 170 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
--
--26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80
--133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128
--51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64
--18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58
--210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11
--220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 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
--
--27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80
--175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52
--20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56
--6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10
--195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25
--237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 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
--
--15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80
--175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0
--1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8
--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 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50
--237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 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
--
--1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80
--175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17
--21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 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 62 42 6
--180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50
--239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 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 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80
--175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39
--17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 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 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50
--241 208 19 241 208 19 241 208 19 204 160 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 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48
--149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17
--3 5 6 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 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22
--137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19
--241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 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 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12
--56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 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 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6
--88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13
--171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 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 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3
--8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 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
--124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11
--206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 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 11 15 17 31 45 49 26 35 39 3 5 6
--0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 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
--124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9
--180 123 7 185 146 40 198 179 130 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 1 1 1 15 22 25 36 54 60 18 25 28
--0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 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
--151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40
--168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180
--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 1 1 1 27 40 45 35 52 58
--18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 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 7 12 13 33 49 54
--52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--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 180 180 180
--253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190
--202 202 202 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 12 17 20
--36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
--21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 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 180 180 180 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
--12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 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 106 106 106 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 21 30 33 35 52 58 6 8 12 0 0 0 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 12 17 20 36 54 60 29 43 47 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 21 30 33 35 52 58 6 8 12 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 202 202 202 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 202 202 202 202 202 202 202 202 202
--198 198 198 202 202 202 180 180 180 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 12 17 20 36 54 60 29 43 47 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 180 180 180 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 151 151 151 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 21 30 33 35 52 58 6 8 12 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 170 170 170 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 202 202 202 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 6 8 8 33 49 54 29 43 47 6 8 12
--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 12 17 20 33 49 54 17 23 26
--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 15 22 25 36 54 60
--0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26
--22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 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 21 30 33
--36 54 60 0 0 0 0 0 0 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
--36 54 60 0 0 0 0 0 0 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 36 54 60 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 151 151 151 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 36 54 60 21 30 33 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 180 180 180 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 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6
--151 151 151 253 253 253 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 202 202 202 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 36 54 60 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 202 202 202 2 2 6
--22 22 22 34 34 34 20 16 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 63 55 20 184 138 11 204 160 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 151 151 151 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 138 132 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 214 187 87 214 187 87 185 146 40 35 31 12
--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 185 146 40 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 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26
--204 160 10 165 152 80 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 124 127 131
--174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10
--98 70 6 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 214 187 87 242 186 14 241 196 14 204 160 10 20 16 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 148 132 55 185 146 40 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
--220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 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 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15
--237 188 10 237 188 10 113 101 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 6 6 6
--22 22 22 54 54 54 148 132 55 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 138 11 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 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6
--20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 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 169 125 40 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 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9
--163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13
--242 186 14 242 186 14 165 152 80 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 185 146 40 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 204 160 10 20 16 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 202 202 202 198 198 198 213 164 39 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 220 174 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 140 55 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 185 146 40 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 213 164 39 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 140 55 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 230 187 11 62 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 169 125 40 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 213 164 39 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 149 139 69 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 20 16 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 220 174 15 149 139 69 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 149 139 69 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 20 16 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 149 139 69
--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 149 139 69 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 220 174 15 198 179 130 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 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 20 16 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 185 146 40
--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 169 125 40 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 35 31 12 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 149 139 69
--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 113 101 86 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 230 187 11 204 160 10 133 118 54
--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 62 42 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 148 132 55 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 148 132 55 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 204 160 10 163 110 8
--62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6
--2 2 6 2 2 6 62 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 185 146 40 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 169 125 40 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 171 120 8
--85 57 6 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 85 57 6 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 140 55 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 169 125 40 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 85 57 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
--169 125 40 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 133 118 54 169 125 40 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 184 138 11 152 99 6
--104 69 6 20 16 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 85 57 6 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 148 132 55
--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 133 118 54 156 107 11
--163 110 8 167 114 7 171 120 8 180 123 7 184 138 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 134 84 6
--85 57 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 62 42 6 137 92 6 171 120 8 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 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7
--184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6
--62 42 6 54 54 54 106 106 106 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 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11
--206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 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 113 101 86 121 92 8 120 80 7
--137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22
--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 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8
--171 120 8 167 114 7 152 99 6 121 92 8 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
--94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 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 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6
--134 84 6 120 80 7 94 86 71 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 71 94 86 71 94 86 71 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 94 86 71 94 86 71 94 86 71
--94 86 71 94 86 71 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 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 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
@@ -1743,7 +2465,7 @@ index 285d552..c9d8373 100644
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0
+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 --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
index 2f14d9f..3d3c358 100644
--- a/drivers/video/logo/logo_linux_mono.pbm
diff --git a/kernels/linux-libre-pae/config b/kernels/linux-libre-pae/config
index cc77645ce..3f24889c6 100644
--- a/kernels/linux-libre-pae/config
+++ b/kernels/linux-libre-pae/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.4-1 Kernel Configuration
+# Linux/x86 3.12.0-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -76,12 +76,10 @@ 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
@@ -165,8 +163,10 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -288,6 +288,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
@@ -312,6 +313,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
#
# IO Schedulers
@@ -349,6 +351,7 @@ CONFIG_PARAVIRT=y
# CONFIG_XEN is not set
# CONFIG_XEN_PRIVILEGED_GUEST is not set
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
CONFIG_LGUEST_GUEST=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
@@ -464,6 +467,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
CONFIG_ZBUD=y
CONFIG_ZSWAP=y
# CONFIG_HIGHPTE is not set
@@ -531,14 +535,12 @@ 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
@@ -615,6 +617,10 @@ CONFIG_X86_E_POWERSAVER=m
#
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -647,7 +653,6 @@ 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
@@ -721,6 +726,7 @@ CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -734,7 +740,6 @@ 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
#
@@ -771,7 +776,6 @@ 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
@@ -879,7 +883,7 @@ 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_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -1031,6 +1035,7 @@ 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_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1068,6 +1073,7 @@ 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_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
@@ -1191,6 +1197,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1232,6 +1239,7 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
CONFIG_VSOCKETS=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
@@ -1337,9 +1345,9 @@ 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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1445,7 +1453,7 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
@@ -1457,7 +1465,6 @@ CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
#
# Bus devices
@@ -1584,7 +1591,6 @@ CONFIG_PROC_DEVICETREE=y
CONFIG_OF_PROMTREE=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
-CONFIG_OF_I2C=m
CONFIG_OF_NET=y
CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
@@ -1736,7 +1742,7 @@ 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=y
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1791,6 +1797,7 @@ CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_IN2000=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -2239,6 +2246,7 @@ CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_IP1000=m
CONFIG_JME=m
@@ -2411,6 +2419,7 @@ 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_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2471,6 +2480,7 @@ CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2542,7 +2552,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# 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
@@ -2587,6 +2596,7 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
@@ -3002,6 +3012,7 @@ CONFIG_INPUT_ADXL34X_SPI=m
# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -3095,6 +3106,7 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3230,6 +3242,7 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@@ -3283,6 +3296,7 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
@@ -3326,6 +3340,10 @@ CONFIG_GPIO_AMD8111=m
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
@@ -3352,8 +3370,8 @@ CONFIG_BATTERY_OLPC=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 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
@@ -3402,6 +3420,7 @@ CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3610,6 +3629,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
@@ -3775,6 +3795,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3804,8 +3825,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
# Analog/digital TV USB devices
@@ -3914,6 +3936,7 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_BT848=m
@@ -3948,6 +3971,7 @@ CONFIG_DVB_DDBRIDGE=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_V4L_TEST_DRIVERS is not set
#
@@ -3960,6 +3984,7 @@ CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_PMS=m
CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -4002,7 +4027,6 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -4285,6 +4309,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4407,6 +4432,9 @@ CONFIG_BACKLIGHT_PCF50633=m
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4507,7 +4535,6 @@ 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
@@ -4711,6 +4738,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
@@ -4727,6 +4755,7 @@ CONFIG_USB_HIDDEV=y
# I2C HID support
#
CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4750,7 +4779,6 @@ CONFIG_USB_WUSB_CBAF=m
#
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
@@ -4761,13 +4789,11 @@ CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_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
@@ -4779,6 +4805,7 @@ 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_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
# CONFIG_USB_MUSB_HOST is not set
# CONFIG_USB_MUSB_GADGET is not set
@@ -4786,6 +4813,7 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_UX500=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
CONFIG_USB_RENESAS_USBHS=m
@@ -4836,6 +4864,7 @@ CONFIG_USB_MICROTEK=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4846,7 +4875,6 @@ 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
@@ -4877,17 +4905,14 @@ 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
@@ -4897,15 +4922,11 @@ 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_WISHBONE=m
CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4930,6 +4951,7 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
@@ -4939,10 +4961,13 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
+# CONFIG_AM335X_PHY_USB is not set
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -5054,6 +5079,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -5079,9 +5105,10 @@ CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_BD2802=m
@@ -5215,6 +5242,7 @@ CONFIG_RTC_DRV_PCF50633=m
#
CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_SNVS=m
+# CONFIG_RTC_DRV_MOXART is not set
#
# HID Sensor RTC drivers
@@ -5252,13 +5280,13 @@ 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_UIO_MF624 is not set
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
@@ -5301,6 +5329,7 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_ISA_DRIVERS=y
CONFIG_COMEDI_PCL711=m
CONFIG_COMEDI_PCL724=m
@@ -5328,9 +5357,11 @@ CONFIG_COMEDI_DT2815=m
CONFIG_COMEDI_DT2817=m
CONFIG_COMEDI_DT282X=m
CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_FL512=m
CONFIG_COMEDI_AIO_AIO12_8=m
CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_C6XDIGIO=m
CONFIG_COMEDI_MPC624=m
CONFIG_COMEDI_ADQ12B=m
@@ -5378,10 +5409,8 @@ 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
@@ -5401,7 +5430,6 @@ CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_PCMCIA_DRIVERS=y
@@ -5424,9 +5452,9 @@ CONFIG_COMEDI_AMPLC_DIO200=m
CONFIG_COMEDI_AMPLC_PC236=m
CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=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
@@ -5436,6 +5464,9 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
@@ -5492,6 +5523,7 @@ CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5516,16 +5548,25 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
+# CONFIG_LTE_GDM724X is not set
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5610,9 +5651,11 @@ CONFIG_EXTCON=m
#
# Extcon Device Drivers
#
+CONFIG_OF_EXTCON=m
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=y
CONFIG_PWM_SYSFS=y
@@ -5691,6 +5734,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5767,6 +5811,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5856,6 +5901,7 @@ CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -6168,6 +6214,7 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_YAMA=y
CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
@@ -6193,7 +6240,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -6246,6 +6293,7 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -6254,7 +6302,7 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@@ -6360,7 +6408,7 @@ CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
diff --git a/kernels/linux-libre-rt/3.10.6-logitech-dj.patch b/kernels/linux-libre-rt/3.10.6-logitech-dj.patch
deleted file mode 100644
index 1c112ccde..000000000
--- a/kernels/linux-libre-rt/3.10.6-logitech-dj.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From c63e0e370028d7e4033bd40165f18499872b5183 Mon Sep 17 00:00:00 2001
-From: Nestor Lopez Casado <nlopezcasad@logitech.com>
-Date: Thu, 18 Jul 2013 13:21:30 +0000
-Subject: HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""
-
-This reverts commit 8af6c08830b1ae114d1a8b548b1f8b056e068887.
-
-This patch re-adds the workaround introduced by 596264082f10dd4
-which was reverted by 8af6c08830b1ae114.
-
-The original patch 596264 was needed to overcome a situation where
-the hid-core would drop incoming reports while probe() was being
-executed.
-
-This issue was solved by c849a6143bec520af which added
-hid_device_io_start() and hid_device_io_stop() that enable a specific
-hid driver to opt-in for input reports while its probe() is being
-executed.
-
-Commit a9dd22b730857347 modified hid-logitech-dj so as to use the
-functionality added to hid-core. Having done that, workaround 596264
-was no longer necessary and was reverted by 8af6c08.
-
-We now encounter a different problem that ends up 'again' thwarting
-the Unifying receiver enumeration. The problem is time and usb controller
-dependent. Ocasionally the reports sent to the usb receiver to start
-the paired devices enumeration fail with -EPIPE and the receiver never
-gets to enumerate the paired devices.
-
-With dcd9006b1b053c7b1c the problem was "hidden" as the call to the usb
-driver became asynchronous and none was catching the error from the
-failing URB.
-
-As the root cause for this failing SET_REPORT is not understood yet,
--possibly a race on the usb controller drivers or a problem with the
-Unifying receiver- reintroducing this workaround solves the problem.
-
-Overall what this workaround does is: If an input report from an
-unknown device is received, then a (re)enumeration is performed.
-
-related bug:
-https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1194649
-
-Signed-off-by: Nestor Lopez Casado <nlopezcasad@logitech.com>
-Signed-off-by: Jiri Kosina <jkosina@suse.cz>
----
-diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
-index 5207591a..cd33084 100644
---- a/drivers/hid/hid-logitech-dj.c
-+++ b/drivers/hid/hid-logitech-dj.c
-@@ -192,6 +192,7 @@ static struct hid_ll_driver logi_dj_ll_driver;
- static int logi_dj_output_hidraw_report(struct hid_device *hid, u8 * buf,
- size_t count,
- unsigned char report_type);
-+static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev);
-
- static void logi_dj_recv_destroy_djhid_device(struct dj_receiver_dev *djrcv_dev,
- struct dj_report *dj_report)
-@@ -232,6 +233,7 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
- if (dj_report->report_params[DEVICE_PAIRED_PARAM_SPFUNCTION] &
- SPFUNCTION_DEVICE_LIST_EMPTY) {
- dbg_hid("%s: device list is empty\n", __func__);
-+ djrcv_dev->querying_devices = false;
- return;
- }
-
-@@ -242,6 +244,12 @@ static void logi_dj_recv_add_djhid_device(struct dj_receiver_dev *djrcv_dev,
- return;
- }
-
-+ if (djrcv_dev->paired_dj_devices[dj_report->device_index]) {
-+ /* The device is already known. No need to reallocate it. */
-+ dbg_hid("%s: device is already known\n", __func__);
-+ return;
-+ }
-+
- dj_hiddev = hid_allocate_device();
- if (IS_ERR(dj_hiddev)) {
- dev_err(&djrcv_hdev->dev, "%s: hid_allocate_device failed\n",
-@@ -305,6 +313,7 @@ static void delayedwork_callback(struct work_struct *work)
- struct dj_report dj_report;
- unsigned long flags;
- int count;
-+ int retval;
-
- dbg_hid("%s\n", __func__);
-
-@@ -337,6 +346,25 @@ static void delayedwork_callback(struct work_struct *work)
- logi_dj_recv_destroy_djhid_device(djrcv_dev, &dj_report);
- break;
- default:
-+ /* A normal report (i. e. not belonging to a pair/unpair notification)
-+ * arriving here, means that the report arrived but we did not have a
-+ * paired dj_device associated to the report's device_index, this
-+ * means that the original "device paired" notification corresponding
-+ * to this dj_device never arrived to this driver. The reason is that
-+ * hid-core discards all packets coming from a device while probe() is
-+ * executing. */
-+ if (!djrcv_dev->paired_dj_devices[dj_report.device_index]) {
-+ /* ok, we don't know the device, just re-ask the
-+ * receiver for the list of connected devices. */
-+ retval = logi_dj_recv_query_paired_devices(djrcv_dev);
-+ if (!retval) {
-+ /* everything went fine, so just leave */
-+ break;
-+ }
-+ dev_err(&djrcv_dev->hdev->dev,
-+ "%s:logi_dj_recv_query_paired_devices "
-+ "error:%d\n", __func__, retval);
-+ }
- dbg_hid("%s: unexpected report type\n", __func__);
- }
- }
-@@ -367,6 +395,12 @@ static void logi_dj_recv_forward_null_report(struct dj_receiver_dev *djrcv_dev,
- if (!djdev) {
- dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]"
- " is NULL, index %d\n", dj_report->device_index);
-+ kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report));
-+
-+ if (schedule_work(&djrcv_dev->work) == 0) {
-+ dbg_hid("%s: did not schedule the work item, was already "
-+ "queued\n", __func__);
-+ }
- return;
- }
-
-@@ -397,6 +431,12 @@ static void logi_dj_recv_forward_report(struct dj_receiver_dev *djrcv_dev,
- if (dj_device == NULL) {
- dbg_hid("djrcv_dev->paired_dj_devices[dj_report->device_index]"
- " is NULL, index %d\n", dj_report->device_index);
-+ kfifo_in(&djrcv_dev->notif_fifo, dj_report, sizeof(struct dj_report));
-+
-+ if (schedule_work(&djrcv_dev->work) == 0) {
-+ dbg_hid("%s: did not schedule the work item, was already "
-+ "queued\n", __func__);
-+ }
- return;
- }
-
-@@ -444,6 +484,10 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
- struct dj_report *dj_report;
- int retval;
-
-+ /* no need to protect djrcv_dev->querying_devices */
-+ if (djrcv_dev->querying_devices)
-+ return 0;
-+
- dj_report = kzalloc(sizeof(struct dj_report), GFP_KERNEL);
- if (!dj_report)
- return -ENOMEM;
-@@ -455,6 +499,7 @@ static int logi_dj_recv_query_paired_devices(struct dj_receiver_dev *djrcv_dev)
- return retval;
- }
-
-+
- static int logi_dj_recv_switch_to_dj_mode(struct dj_receiver_dev *djrcv_dev,
- unsigned timeout)
- {
-diff --git a/drivers/hid/hid-logitech-dj.h b/drivers/hid/hid-logitech-dj.h
-index fd28a5e..4a40003 100644
---- a/drivers/hid/hid-logitech-dj.h
-+++ b/drivers/hid/hid-logitech-dj.h
-@@ -101,6 +101,7 @@ struct dj_receiver_dev {
- struct work_struct work;
- struct kfifo notif_fifo;
- spinlock_t lock;
-+ bool querying_devices;
- };
-
- struct dj_device {
---
-cgit v0.9.2
diff --git a/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch b/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch
deleted file mode 100644
index 0415b8a1e..000000000
--- a/kernels/linux-libre-rt/3.10.6-reset-superseed-xhci-hcd.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-[PATCH] SCSI: Don't attempt to send extended INQUIRY command if skip_vpd_pages is set
-
-If a device has the skip_vpd_pages flag set we should simply fail the
-scsi_get_vpd_page() call.
-
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-Acked-by: Alan Stern <stern@rowland.harvard.edu>
-Tested-by: Stuart Foster <smf.linux@ntlworld.com>
-Cc: stable@vger.kernel.org
-
-diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
-index 3b1ea34..eaa808e 100644
---- a/drivers/scsi/scsi.c
-+++ b/drivers/scsi/scsi.c
-@@ -1031,6 +1031,9 @@ int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
- {
- int i, result;
-
-+ if (sdev->skip_vpd_pages)
-+ goto fail;
-+
- /* Ask for all the pages supported by this device */
- result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
- if (result)
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index cd9ddeb34..de65bc557 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -4,17 +4,17 @@
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.10
-_releasever=15
-_rtpatchver=rt11
+_basekernel=3.12
+_releasever=6
+_rtpatchver=rt9
_pkgver=${_basekernel}.${_releasever}
pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
pkgrel=1
-_lxopkgver=${_basekernel}.15 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -32,21 +32,19 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '3.10.6-logitech-dj.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '9d85508aaa75442ec6e480a248102c5a'
- 'b3aafcfa4c1613460b2bd29a2c1c3421'
- 'aee046ea7320dce066bb180facd7262a'
- 'c21fb94a198752879b059a08d73cd3a6'
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+ '4b18ce60daff87504e6740670edf6b50'
+ 'b6b66c250459a63664e23235153f587c'
+ '1f8c7bda0a089cfc717535c404342be1'
+ '0c3c36bfbdffff9262cb3aedff8f65be'
'82496e68851d1960543a07ba51cdb44a'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
- '04b21c79df0a952c22d681dd4f4562df'
- 'f3def2cefdcbb954c21d8505d23cc83c'
+ '44260d2cb1a8b51c119d2ce1f83e457a'
+ '98beb36f9b8cf16e58de2483ea9985e3'
'd50c1ac47394e9aec637002ef3392bd1'
- '3ff40ca684cfe719723e627e2cef7cea'
- '8aab6ab727f49dffcae5fd1c3c7c5bdb')
+ '71bbddd5f9799aa045660d92baa05845')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -69,6 +67,9 @@ prepare() {
# add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
+ # fix issue on Hal8188EFWImg_CE.c deblobbed file
+ sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+
# 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)
@@ -77,9 +78,6 @@ prepare() {
# allow criu without expert option set
# patch from fedora
patch -Np1 -i "${srcdir}/criu-no-expert.patch"
-
- # fix https://bugs.archlinux.org/task/35991 - [linux] 3.10.x renders Logitech Unified Receivers useless
- patch -Np1 -i "${srcdir}/3.10.6-logitech-dj.patch"
if [ "$CARCH" == "mips64el" ]; then
sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-rt|" Makefile
diff --git a/kernels/linux-libre-rt/boot-logo.patch b/kernels/linux-libre-rt/boot-logo.patch
index c392928a5..3f4e0dea4 100644
--- a/kernels/linux-libre-rt/boot-logo.patch
+++ b/kernels/linux-libre-rt/boot-logo.patch
@@ -1,6 +1,7 @@
-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
+diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
+index 3c14e43..c9d8373 100644
+--- a/drivers/video/logo/logo_linux_clut224.ppm
++++ b/drivers/video/logo/logo_linux_clut224.ppm
@@ -1,1604 +1,861 @@
P3
-# Standard 224-color Linux logo
@@ -2465,9 +2466,10 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_clut224.ppm linux-2.6.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
+
-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
+diff --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
+index 2f14d9f..3d3c358 100644
+--- a/drivers/video/logo/logo_linux_mono.pbm
++++ b/drivers/video/logo/logo_linux_mono.pbm
@@ -1,203 +1,159 @@
-P1
-# Standard black and white Linux logo
@@ -2831,16 +2833,15 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_mono.pbm linux-2.6.39-LIB
+0 0 0 0 0 0 0 0 0 0
+0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
+diff --git a/drivers/video/logo/logo_linux_vga16.ppm b/drivers/video/logo/logo_linux_vga16.ppm
+index 1850c15..f279f97 100644
+--- a/drivers/video/logo/logo_linux_vga16.ppm
++++ b/drivers/video/logo/logo_linux_vga16.ppm
@@ -1,1604 +1,18724 @@
P3
-# Standard 16-color Linux logo
-80 80
-+# CREATOR: GIMP PNM Filter Version 1.1
-+80 78
- 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
@@ -4441,6 +4442,9 @@ diff -Nur linux-2.6.39.1/drivers/video/logo/logo_linux_vga16.ppm linux-2.6.39-LI
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0
++# CREATOR: GIMP PNM Filter Version 1.1
++80 78
++255
+0
+0
+0
diff --git a/kernels/linux-libre-rt/change-default-console-loglevel.patch b/kernels/linux-libre-rt/change-default-console-loglevel.patch
index 2685d4d23..22cd69a09 100644
--- a/kernels/linux-libre-rt/change-default-console-loglevel.patch
+++ b/kernels/linux-libre-rt/change-default-console-loglevel.patch
@@ -1,6 +1,6 @@
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
+--- linux-3.0.orig/kernel/printk/printk.c 2011-07-22 05:17:23.000000000 +0300
++++ linux-3.0/kernel/printk/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.. */
diff --git a/kernels/linux-libre-rt/config.i686 b/kernels/linux-libre-rt/config.i686
index 80fc256ef..82b46d523 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/x86 3.10.4 Kernel Configuration
+# Linux/x86 3.12.1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -29,6 +29,8 @@ 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_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
# CONFIG_ZONE_DMA32 is not set
# CONFIG_AUDIT_ARCH is not set
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -48,6 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-LIBRE-RT"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
@@ -55,11 +58,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=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_KERNEL_LZ4 is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
@@ -72,12 +77,10 @@ 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
@@ -159,8 +162,10 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -172,17 +177,18 @@ CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
# CONFIG_EXPERT is not set
CONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not set
CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
@@ -203,10 +209,12 @@ 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_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_HAVE_OPROFILE=y
@@ -248,6 +256,7 @@ CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
CONFIG_MODULES_USE_ELF_REL=y
CONFIG_CLONE_BACKWARDS=y
CONFIG_OLD_SIGSUSPEND3=y
@@ -275,12 +284,14 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
@@ -298,6 +309,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
#
# IO Schedulers
@@ -323,16 +335,17 @@ 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_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
# CONFIG_PARAVIRT_SPINLOCKS is not set
# CONFIG_XEN_PRIVILEGED_GUEST is not set
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
CONFIG_LGUEST_GUEST=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
@@ -447,9 +460,13 @@ CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
+# CONFIG_HWPOISON_INJECT is not set
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@@ -509,19 +526,18 @@ CONFIG_PM_ADVANCED_DEBUG=y
CONFIG_PM_SLEEP_DEBUG=y
CONFIG_PM_TRACE=y
CONFIG_PM_TRACE_RTC=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=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
@@ -598,6 +614,10 @@ CONFIG_X86_E_POWERSAVER=m
#
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -620,7 +640,7 @@ CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_OLPC=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCIEAER_INJECT is not set
@@ -630,8 +650,8 @@ 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
@@ -641,6 +661,10 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_IOAPIC=y
CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
CONFIG_ISA_DMA_API=y
CONFIG_ISA=y
# CONFIG_EISA is not set
@@ -674,10 +698,12 @@ CONFIG_I82365=m
CONFIG_TCIC=m
CONFIG_PCMCIA_PROBE=y
CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
CONFIG_HOTPLUG_PCI_COMPAQ=m
# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
@@ -689,11 +715,15 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -707,7 +737,6 @@ 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
#
@@ -744,7 +773,6 @@ 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
@@ -756,8 +784,8 @@ 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_DIAG=m
+CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
@@ -852,7 +880,7 @@ 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_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -1004,6 +1032,7 @@ 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_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1041,6 +1070,7 @@ 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_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
@@ -1079,9 +1109,14 @@ CONFIG_INET_DCCP_DIAG=m
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 is not set
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
@@ -1159,6 +1194,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1199,15 +1235,20 @@ CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
CONFIG_VSOCKETS=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
+CONFIG_NET_FLOW_LIMIT=y
#
# Network testing
@@ -1301,9 +1342,9 @@ 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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1380,6 +1421,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
CONFIG_NFC_HCI=m
# CONFIG_NFC_SHDLC is not set
@@ -1389,6 +1431,7 @@ CONFIG_NFC_HCI=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
CONFIG_NFC_PN544=m
CONFIG_NFC_PN544_MEI=m
CONFIG_NFC_MICROREAD=m
@@ -1407,9 +1450,11 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
+# 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
@@ -1417,7 +1462,6 @@ CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
#
# Bus devices
@@ -1521,24 +1565,7 @@ CONFIG_MTD_BLOCK2MTD=m
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_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_NAND is not set
# CONFIG_MTD_ONENAND is not set
#
@@ -1561,8 +1588,6 @@ CONFIG_PROC_DEVICETREE=y
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
@@ -1630,7 +1655,6 @@ CONFIG_AD525X_DPOT_I2C=m
# CONFIG_IBM_ASM is not set
CONFIG_HWLAT_DETECTOR=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -1716,7 +1740,7 @@ CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1771,6 +1795,7 @@ CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_IN2000=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1896,6 +1921,7 @@ CONFIG_SATA_HIGHBANK=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
CONFIG_SATA_SVW=m
@@ -1975,7 +2001,6 @@ CONFIG_MD_RAID10=m
CONFIG_MD_RAID456=m
CONFIG_MD_MULTIPATH=m
CONFIG_MD_FAULTY=m
-# CONFIG_BCACHE is not set
CONFIG_BLK_DEV_DM=m
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=m
@@ -1999,6 +2024,7 @@ CONFIG_DM_DELAY=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
@@ -2035,12 +2061,12 @@ CONFIG_I2O_PROC=m
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
+CONFIG_MII=m
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
@@ -2059,6 +2085,7 @@ CONFIG_RIONET_RX_SIZE=128
CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
CONFIG_SUNGEM_PHY=m
# CONFIG_ARCNET is not set
CONFIG_ATM_DRIVERS=y
@@ -2103,6 +2130,7 @@ CONFIG_CAIF_VIRTIO=m
CONFIG_VHOST_NET=m
CONFIG_VHOST_SCSI=m
CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
#
# Distributed Switch Architecture drivers
@@ -2132,6 +2160,8 @@ CONFIG_LANCE=m
CONFIG_PCNET32=m
CONFIG_PCMCIA_NMCLAN=m
CONFIG_NI65=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_ARC_EMAC=m
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_ATL2=m
CONFIG_ATL1=m
@@ -2206,6 +2236,7 @@ CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_IP1000=m
CONFIG_JME=m
@@ -2220,6 +2251,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
CONFIG_MLX4_EN=m
CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
# CONFIG_KS8851 is not set
@@ -2264,6 +2296,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
CONFIG_R8169=m
+CONFIG_SH_ETH=m
CONFIG_NET_VENDOR_RDC=y
CONFIG_R6040=m
CONFIG_NET_VENDOR_SEEQ=y
@@ -2280,6 +2313,8 @@ CONFIG_NET_VENDOR_SMSC=y
CONFIG_SMC9194=m
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
@@ -2333,7 +2368,8 @@ CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
CONFIG_MDIO_BUS_MUX=m
CONFIG_MDIO_BUS_MUX_GPIO=m
CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -2373,6 +2409,7 @@ 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_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2433,6 +2470,7 @@ CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2447,9 +2485,14 @@ CONFIG_ATH6KL_USB=m
CONFIG_AR5523=m
CONFIG_WIL6210=m
CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
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
@@ -2499,7 +2542,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# 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
@@ -2544,6 +2586,7 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
@@ -2556,14 +2599,17 @@ 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_RTL_CARDS=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
CONFIG_RTL8723AE=m
CONFIG_RTL8188EE=m
CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
CONFIG_WL_TI=y
CONFIG_WL1251=m
@@ -2581,6 +2627,9 @@ CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
#
# WiMAX Wireless Broadband devices
@@ -2863,6 +2912,9 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
CONFIG_TOUCHSCREEN_DYNAPRO=m
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EETI=m
@@ -2942,7 +2994,7 @@ 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_PWM_BEEPER is not set
CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
CONFIG_INPUT_ADXL34X=m
CONFIG_INPUT_ADXL34X_I2C=m
@@ -2950,6 +3002,7 @@ CONFIG_INPUT_ADXL34X_SPI=m
# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -2966,6 +3019,7 @@ CONFIG_SERIO_ALTERA_PS2=m
CONFIG_SERIO_PS2MULT=m
CONFIG_SERIO_ARC_PS2=m
CONFIG_SERIO_APBPS2=m
+CONFIG_SERIO_OLPC_APSP=m
CONFIG_GAMEPORT=m
CONFIG_GAMEPORT_NS558=m
CONFIG_GAMEPORT_L4=m
@@ -3001,7 +3055,6 @@ CONFIG_N_GSM=m
CONFIG_TRACE_ROUTER=m
CONFIG_TRACE_SINK=m
# CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
#
# Serial drivers
@@ -3042,6 +3095,8 @@ CONFIG_SERIAL_ARC=m
CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3138,7 +3193,6 @@ 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
@@ -3166,6 +3220,7 @@ CONFIG_SCx200_ACB=m
# 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
#
@@ -3177,6 +3232,7 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@@ -3191,11 +3247,6 @@ CONFIG_SPI_MASTER=y
#
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-# CONFIG_SSBI is not set
# CONFIG_HSI is not set
#
@@ -3227,6 +3278,7 @@ 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
#
@@ -3234,6 +3286,7 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
@@ -3277,6 +3330,10 @@ CONFIG_GPIO_AMD8111=m
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
@@ -3303,8 +3360,8 @@ CONFIG_BATTERY_OLPC=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 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
@@ -3348,10 +3405,12 @@ CONFIG_SENSORS_F71882FG=m
CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3456,10 +3515,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# 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_THERMAL_GOV_USER_SPACE=y
# CONFIG_CPU_THERMAL is not set
# CONFIG_THERMAL_EMULATION is not set
CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3507,6 +3571,7 @@ CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
#
# ISA-based Watchdog Cards
@@ -3553,6 +3618,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
@@ -3572,6 +3638,7 @@ CONFIG_HTC_PASIC3=m
CONFIG_LPC_ICH=m
CONFIG_LPC_SCH=m
# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
# CONFIG_EZX_PCAP is not set
CONFIG_MFD_VIPERBOARD=m
CONFIG_MFD_RETU=m
@@ -3604,6 +3671,7 @@ CONFIG_MFD_ARIZONA_I2C=m
# CONFIG_MFD_ARIZONA_SPI is not set
CONFIG_MFD_WM5102=y
CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -3716,6 +3784,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3733,6 +3802,7 @@ CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
CONFIG_USB_S2255=m
CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
#
# Analog TV USB devices
@@ -3744,8 +3814,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
# Analog/digital TV USB devices
@@ -3854,6 +3925,7 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_BT848=m
@@ -3888,6 +3960,7 @@ CONFIG_DVB_DDBRIDGE=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_V4L_TEST_DRIVERS is not set
#
@@ -3900,6 +3973,7 @@ CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_PMS=m
CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3942,7 +4016,6 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -4225,6 +4298,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4336,7 +4410,7 @@ CONFIG_LCD_PLATFORM=m
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
CONFIG_BACKLIGHT_LM3533=m
-CONFIG_BACKLIGHT_PWM=m
+# CONFIG_BACKLIGHT_PWM is not set
CONFIG_BACKLIGHT_APPLE=m
# CONFIG_BACKLIGHT_SAHARA is not set
# CONFIG_BACKLIGHT_ADP8860 is not set
@@ -4347,6 +4421,9 @@ CONFIG_BACKLIGHT_PCF50633=m
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4358,18 +4435,6 @@ 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
@@ -4391,6 +4456,7 @@ CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4458,7 +4524,6 @@ 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
@@ -4522,6 +4587,7 @@ 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_I915=y
CONFIG_SND_HDA_CODEC_CIRRUS=y
CONFIG_SND_HDA_CODEC_CONEXANT=y
CONFIG_SND_HDA_CODEC_CA0110=y
@@ -4566,6 +4632,7 @@ CONFIG_SND_USB_CAIAQ=m
CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_USB_US122L=m
CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
@@ -4604,9 +4671,11 @@ CONFIG_HID_DRAGONRISE=m
CONFIG_DRAGONRISE_FF=y
CONFIG_HID_EMS_FF=m
CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
CONFIG_HID_EZKEY=m
CONFIG_HID_HOLTEK=m
CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_KYE=m
CONFIG_HID_UCLOGIC=m
@@ -4639,7 +4708,6 @@ 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
@@ -4659,7 +4727,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
@@ -4676,9 +4744,7 @@ 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_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4702,7 +4768,6 @@ CONFIG_USB_WUSB_CBAF=m
#
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
@@ -4712,12 +4777,12 @@ CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_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
@@ -4729,10 +4794,15 @@ 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_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_UX500=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
CONFIG_USB_RENESAS_USBHS=m
@@ -4775,9 +4845,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
# CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_CHIPIDEA is not set
#
# USB port drivers
@@ -4785,6 +4853,7 @@ CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4795,7 +4864,6 @@ 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
@@ -4826,17 +4894,14 @@ 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
@@ -4846,9 +4911,7 @@ 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_WISHBONE=m
CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
@@ -4877,6 +4940,7 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
@@ -4886,10 +4950,13 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
+# CONFIG_AM335X_PHY_USB is not set
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -4897,6 +4964,7 @@ CONFIG_SAMSUNG_USB3PHY=m
CONFIG_USB_ISP1301=m
CONFIG_USB_RCAR_PHY=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
@@ -4906,12 +4974,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
# USB Peripheral Controller
#
CONFIG_USB_FUSB300=m
+CONFIG_USB_FOTG210_UDC=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
CONFIG_USB_PXA27X=m
CONFIG_USB_MV_UDC=m
CONFIG_USB_MV_U3D=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
@@ -4923,8 +4991,15 @@ CONFIG_USB_DUMMY_HCD=m
CONFIG_USB_LIBCOMPOSITE=m
CONFIG_USB_F_ACM=m
CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
CONFIG_USB_F_SERIAL=m
CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
# CONFIG_GADGET_UAC1 is not set
@@ -4993,6 +5068,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -5018,9 +5094,10 @@ CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_BD2802=m
@@ -5102,6 +5179,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
CONFIG_RTC_DRV_PCF8523=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
@@ -5153,6 +5231,7 @@ CONFIG_RTC_DRV_PCF50633=m
#
CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_SNVS=m
+# CONFIG_RTC_DRV_MOXART is not set
#
# HID Sensor RTC drivers
@@ -5166,8 +5245,9 @@ CONFIG_DMADEVICES=y
#
CONFIG_INTEL_MID_DMAC=m
CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_DW_DMAC_PCI=m
CONFIG_TIMB_DMA=m
CONFIG_PCH_DMA=m
CONFIG_DMA_ENGINE=y
@@ -5189,13 +5269,13 @@ 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_UIO_MF624 is not set
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
@@ -5238,18 +5318,16 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_SSV_DNP=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
@@ -5268,9 +5346,11 @@ CONFIG_COMEDI_DT2815=m
CONFIG_COMEDI_DT2817=m
CONFIG_COMEDI_DT282X=m
CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_FL512=m
CONFIG_COMEDI_AIO_AIO12_8=m
CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_C6XDIGIO=m
CONFIG_COMEDI_MPC624=m
CONFIG_COMEDI_ADQ12B=m
@@ -5285,6 +5365,7 @@ CONFIG_COMEDI_PCMMIO=m
CONFIG_COMEDI_PCMUIO=m
CONFIG_COMEDI_MULTIQ3=m
CONFIG_COMEDI_POC=m
+CONFIG_COMEDI_S526=m
CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_WATCHDOG=m
@@ -5317,10 +5398,8 @@ 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
@@ -5339,9 +5418,7 @@ CONFIG_COMEDI_NI_LABPC_PCI=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
@@ -5364,9 +5441,9 @@ CONFIG_COMEDI_AMPLC_DIO200=m
CONFIG_COMEDI_AMPLC_PC236=m
CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=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
@@ -5376,6 +5453,9 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
@@ -5432,6 +5512,7 @@ CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5456,16 +5537,25 @@ 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_LTE_GDM724X is not set
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
+CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5515,6 +5605,8 @@ CONFIG_MXM_WMI=m
CONFIG_INTEL_OAKTRAIL=m
CONFIG_SAMSUNG_Q10=m
CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=y
+CONFIG_INTEL_SMARTCONNECT=y
CONFIG_PVPANIC=m
#
@@ -5548,16 +5640,25 @@ CONFIG_EXTCON=m
#
# Extcon Device Drivers
#
+CONFIG_OF_EXTCON=m
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=y
+CONFIG_PWM_SYSFS=y
+# CONFIG_PWM_PCA9685 is not set
CONFIG_IRQCHIP=y
CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
# CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
#
# Firmware Drivers
@@ -5576,9 +5677,7 @@ CONFIG_ISCSI_IBFT=m
#
# EFI (Extensible Firmware Interface) Support
#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
#
# File systems
@@ -5624,6 +5723,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5700,6 +5800,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5750,6 +5851,7 @@ CONFIG_F2FS_FS=m
CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
@@ -5760,10 +5862,12 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y
CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=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_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5773,6 +5877,8 @@ CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_ACL_SUPPORT=m
@@ -5784,6 +5890,7 @@ CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -5812,6 +5919,7 @@ CONFIG_AFS_FSCACHE=y
CONFIG_9P_FS=m
CONFIG_9P_FSCACHE=y
CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=m
@@ -5870,38 +5978,103 @@ CONFIG_DLM=m
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
CONFIG_PRINTK_TIME=y
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
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 is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# 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_TRACE_IRQFLAGS=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+
+#
+# Debug Lockups and Hangs
+#
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+# CONFIG_TIMER_STATS is not set
+CONFIG_DEBUG_PREEMPT=y
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# 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_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS 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_LKDTM=m
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_LATENCYTOP=y
CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
@@ -5918,23 +6091,20 @@ 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=y
-CONFIG_INTERRUPT_OFF_HIST=y
-CONFIG_PREEMPT_TRACER=y
-# CONFIG_PREEMPT_OFF_HIST is not set
+# CONFIG_IRQSOFF_TRACER is not set
+# CONFIG_PREEMPT_TRACER is not set
CONFIG_SCHED_TRACER=y
-CONFIG_WAKEUP_LATENCY_HIST=y
-CONFIG_MISSED_TIMER_OFFSETS_HIST=y
+# CONFIG_WAKEUP_LATENCY_HIST is not set
+# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set
CONFIG_FTRACE_SYSCALLS=y
CONFIG_TRACER_SNAPSHOT=y
-CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5952,25 +6122,40 @@ CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
# 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_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
+# CONFIG_KGDB is not set
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH 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
@@ -5980,7 +6165,11 @@ CONFIG_IO_DELAY_0X80=y
# 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_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
#
# Security options
@@ -6006,10 +6195,13 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/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_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m
@@ -6029,7 +6221,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -6082,6 +6274,7 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -6090,7 +6283,7 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@@ -6129,6 +6322,8 @@ CONFIG_CRYPTO_TWOFISH_586=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
#
# Random Number Generation
@@ -6173,6 +6368,7 @@ CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
CONFIG_GENERIC_FIND_FIRST_BIT=y
CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
@@ -6193,9 +6389,12 @@ CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_X86=y
CONFIG_XZ_DEC_POWERPC=y
@@ -6210,11 +6409,11 @@ CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=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
@@ -6238,3 +6437,16 @@ CONFIG_DDR=y
CONFIG_MPILIB=m
CONFIG_OID_REGISTRY=m
CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=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
diff --git a/kernels/linux-libre-rt/config.x86_64 b/kernels/linux-libre-rt/config.x86_64
index d12fc66ab..9f641e359 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 3.10.10 Kernel Configuration
+# Linux/x86 3.12.1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -30,6 +30,8 @@ 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_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_ZONE_DMA32=y
CONFIG_AUDIT_ARCH=y
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -49,6 +51,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
#
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
+# CONFIG_COMPILE_TEST is not set
CONFIG_LOCALVERSION="-LIBRE-RT"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
@@ -56,11 +59,13 @@ CONFIG_HAVE_KERNEL_BZIP2=y
CONFIG_HAVE_KERNEL_LZMA=y
CONFIG_HAVE_KERNEL_XZ=y
CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=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_KERNEL_LZ4 is not set
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_SWAP=y
CONFIG_SYSVIPC=y
@@ -73,12 +78,10 @@ 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
@@ -101,17 +104,18 @@ CONFIG_GENERIC_CMOS_UPDATE=y
CONFIG_TICK_ONESHOT=y
CONFIG_NO_HZ_COMMON=y
# CONFIG_HZ_PERIODIC is not set
-CONFIG_NO_HZ_IDLE=y
-# CONFIG_NO_HZ_FULL is not set
+# CONFIG_NO_HZ_IDLE is not set
+CONFIG_NO_HZ_FULL=y
+CONFIG_NO_HZ_FULL_ALL=y
+# CONFIG_NO_HZ_FULL_SYSIDLE is not set
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_VIRT_CPU_ACCOUNTING=y
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
CONFIG_BSD_PROCESS_ACCT=y
CONFIG_BSD_PROCESS_ACCT_V3=y
CONFIG_TASKSTATS=y
@@ -125,16 +129,16 @@ CONFIG_TASK_IO_ACCOUNTING=y
CONFIG_TREE_PREEMPT_RCU=y
CONFIG_PREEMPT_RCU=y
CONFIG_RCU_STALL_COMMON=y
-# CONFIG_RCU_USER_QS is not set
+CONFIG_CONTEXT_TRACKING=y
+CONFIG_RCU_USER_QS=y
+# CONFIG_CONTEXT_TRACKING_FORCE is not set
CONFIG_RCU_FANOUT=64
CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_BOOST is not set
CONFIG_RCU_NOCB_CPU=y
-CONFIG_RCU_NOCB_CPU_NONE=y
-# CONFIG_RCU_NOCB_CPU_ZERO is not set
-# CONFIG_RCU_NOCB_CPU_ALL is not set
+CONFIG_RCU_NOCB_CPU_ALL=y
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=19
@@ -163,12 +167,14 @@ CONFIG_FAIR_GROUP_SCHED=y
CONFIG_CFS_BANDWIDTH=y
CONFIG_BLK_CGROUP=y
# CONFIG_DEBUG_BLK_CGROUP is not set
-# CONFIG_CHECKPOINT_RESTORE is not set
+CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -180,17 +186,18 @@ CONFIG_RD_BZIP2=y
CONFIG_RD_LZMA=y
CONFIG_RD_XZ=y
CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_SYSCTL=y
CONFIG_ANON_INODES=y
CONFIG_HAVE_UID16=y
CONFIG_SYSCTL_EXCEPTION_TRACE=y
-CONFIG_HOTPLUG=y
CONFIG_HAVE_PCSPKR_PLATFORM=y
# CONFIG_EXPERT is not set
CONFIG_UID16=y
# CONFIG_SYSCTL_SYSCALL is not set
CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
@@ -211,10 +218,12 @@ 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_SLUB_DEBUG=y
# CONFIG_COMPAT_BRK is not set
CONFIG_SLUB=y
+CONFIG_SLUB_CPU_PARTIAL=y
CONFIG_PROFILING=y
CONFIG_TRACEPOINTS=y
CONFIG_HAVE_OPROFILE=y
@@ -257,6 +266,7 @@ CONFIG_SECCOMP_FILTER=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
CONFIG_MODULES_USE_ELF_RELA=y
CONFIG_OLD_SIGSUSPEND3=y
CONFIG_COMPAT_OLD_SIGACTION=y
@@ -282,12 +292,14 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
#
CONFIG_PARTITION_ADVANCED=y
# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
# CONFIG_OSF_PARTITION is not set
# CONFIG_AMIGA_PARTITION is not set
# CONFIG_ATARI_PARTITION is not set
@@ -305,6 +317,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
CONFIG_BLOCK_COMPAT=y
#
@@ -336,6 +349,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_HYPERVISOR_GUEST=y
CONFIG_PARAVIRT=y
+# CONFIG_PARAVIRT_DEBUG is not set
# CONFIG_PARAVIRT_SPINLOCKS is not set
CONFIG_XEN=y
CONFIG_XEN_DOM0=y
@@ -345,6 +359,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
CONFIG_NO_BOOTMEM=y
@@ -372,7 +387,8 @@ CONFIG_CALGARY_IOMMU=y
CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
CONFIG_SWIOTLB=y
CONFIG_IOMMU_HELPER=y
-CONFIG_NR_CPUS=64
+# CONFIG_MAXSMP is not set
+CONFIG_NR_CPUS=128
CONFIG_SCHED_SMT=y
CONFIG_SCHED_MC=y
CONFIG_PREEMPT=y
@@ -448,9 +464,14 @@ CONFIG_KSM=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
CONFIG_MEMORY_FAILURE=y
+# CONFIG_HWPOISON_INJECT is not set
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+CONFIG_ZBUD=y
+CONFIG_ZSWAP=y
+CONFIG_MEM_SOFT_DIRTY=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
CONFIG_X86_RESERVE_LOW=64
@@ -510,19 +531,18 @@ CONFIG_PM_ADVANCED_DEBUG=y
CONFIG_PM_SLEEP_DEBUG=y
CONFIG_PM_TRACE=y
CONFIG_PM_TRACE_RTC=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
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
@@ -583,6 +603,10 @@ CONFIG_X86_P4_CLOCKMOD=m
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=m
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -605,7 +629,7 @@ CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_XEN=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
+CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCIEAER=y
# CONFIG_PCIE_ECRC is not set
# CONFIG_PCIEAER_INJECT is not set
@@ -615,8 +639,8 @@ 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
@@ -627,6 +651,10 @@ CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_IOAPIC=y
CONFIG_PCI_LABEL=y
+
+#
+# PCI host controller drivers
+#
CONFIG_ISA_DMA_API=y
CONFIG_AMD_NB=y
CONFIG_PCCARD=m
@@ -646,7 +674,9 @@ CONFIG_YENTA_TOSHIBA=y
CONFIG_PD6729=m
CONFIG_I82092=m
CONFIG_PCCARD_NONSTATIC=y
-CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
CONFIG_HOTPLUG_PCI_CPCI=y
CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
@@ -658,11 +688,15 @@ CONFIG_RAPIDIO_DISC_TIMEOUT=30
CONFIG_RAPIDIO_DMA_ENGINE=y
CONFIG_RAPIDIO_DEBUG=y
CONFIG_RAPIDIO_ENUM_BASIC=m
+
+#
+# RapidIO Switch drivers
+#
CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
-CONFIG_RAPIDIO_TSI500=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -682,7 +716,6 @@ 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
@@ -721,7 +754,6 @@ 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
@@ -733,8 +765,8 @@ 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_DIAG=m
+CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
@@ -829,7 +861,7 @@ 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_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -981,6 +1013,7 @@ 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_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1018,6 +1051,7 @@ 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_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
@@ -1056,9 +1090,14 @@ CONFIG_INET_DCCP_DIAG=m
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 is not set
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
@@ -1132,6 +1171,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1172,16 +1212,21 @@ CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
CONFIG_VSOCKETS=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
+CONFIG_NET_MPLS_GSO=m
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
CONFIG_NETPRIO_CGROUP=m
+CONFIG_NET_RX_BUSY_POLL=y
CONFIG_BQL=y
CONFIG_BPF_JIT=y
+CONFIG_NET_FLOW_LIMIT=y
#
# Network testing
@@ -1270,9 +1315,9 @@ 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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1349,6 +1394,7 @@ CONFIG_CEPH_LIB=m
# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
CONFIG_NFC=m
CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
CONFIG_NFC_HCI=m
# CONFIG_NFC_SHDLC is not set
@@ -1358,6 +1404,7 @@ CONFIG_NFC_HCI=m
CONFIG_NFC_PN533=m
CONFIG_NFC_WILINK=m
CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
CONFIG_NFC_PN544=m
CONFIG_NFC_PN544_MEI=m
CONFIG_NFC_MICROREAD=m
@@ -1377,9 +1424,11 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_FW_LOADER_USER_HELPER is not set
+CONFIG_FW_LOADER_USER_HELPER=y
+# 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
@@ -1488,23 +1537,7 @@ CONFIG_MTD_BLOCK2MTD=m
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_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_NAND is not set
# CONFIG_MTD_ONENAND is not set
#
@@ -1579,7 +1612,6 @@ CONFIG_AD525X_DPOT_I2C=m
# CONFIG_IBM_ASM is not set
CONFIG_HWLAT_DETECTOR=m
CONFIG_PHANTOM=m
-CONFIG_INTEL_MID_PTI=m
CONFIG_SGI_IOC4=m
CONFIG_TIFM_CORE=m
CONFIG_TIFM_7XX1=m
@@ -1665,7 +1697,7 @@ CONFIG_SCSI_ENCLOSURE=m
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_CONSTANTS is not set
# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1716,6 +1748,7 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -1732,6 +1765,7 @@ CONFIG_SCSI_UFSHCD_PCI=m
CONFIG_SCSI_UFSHCD_PLATFORM=m
CONFIG_SCSI_HPTIOP=m
CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
CONFIG_VMWARE_PVSCSI=m
CONFIG_HYPERV_STORAGE=m
CONFIG_LIBFC=m
@@ -1824,6 +1858,7 @@ CONFIG_SATA_HIGHBANK=m
CONFIG_SATA_MV=m
CONFIG_SATA_NV=m
CONFIG_SATA_PROMISE=m
+CONFIG_SATA_RCAR=m
CONFIG_SATA_SIL=m
CONFIG_SATA_SIS=m
CONFIG_SATA_SVW=m
@@ -1922,6 +1957,7 @@ CONFIG_DM_DELAY=m
CONFIG_DM_UEVENT=y
CONFIG_DM_FLAKEY=m
CONFIG_DM_VERITY=m
+CONFIG_DM_SWITCH=m
CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m
@@ -1959,12 +1995,12 @@ CONFIG_I2O_PROC=m
CONFIG_MACINTOSH_DRIVERS=y
CONFIG_MAC_EMUMOUSEBTN=y
CONFIG_NETDEVICES=y
+CONFIG_MII=m
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
@@ -1983,6 +2019,7 @@ CONFIG_RIONET_RX_SIZE=128
CONFIG_TUN=m
CONFIG_VETH=m
CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
CONFIG_SUNGEM_PHY=m
# CONFIG_ARCNET is not set
CONFIG_ATM_DRIVERS=y
@@ -2027,6 +2064,7 @@ CONFIG_CAIF_VIRTIO=m
CONFIG_VHOST_NET=m
CONFIG_VHOST_SCSI=m
CONFIG_VHOST_RING=m
+CONFIG_VHOST=m
#
# Distributed Switch Architecture drivers
@@ -2052,6 +2090,7 @@ CONFIG_NET_VENDOR_AMD=y
CONFIG_AMD8111_ETH=m
CONFIG_PCNET32=m
CONFIG_PCMCIA_NMCLAN=m
+CONFIG_NET_VENDOR_ARC=y
CONFIG_NET_VENDOR_ATHEROS=y
CONFIG_ATL2=m
CONFIG_ATL1=m
@@ -2123,6 +2162,7 @@ CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_IP1000=m
CONFIG_JME=m
@@ -2137,6 +2177,7 @@ CONFIG_NET_VENDOR_MELLANOX=y
CONFIG_MLX4_EN=m
CONFIG_MLX4_CORE=m
CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX5_CORE is not set
CONFIG_NET_VENDOR_MICREL=y
CONFIG_KS8842=m
# CONFIG_KS8851 is not set
@@ -2178,6 +2219,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
CONFIG_8139TOO_8129=y
# CONFIG_8139_OLD_RX_RESET is not set
CONFIG_R8169=m
+CONFIG_SH_ETH=m
CONFIG_NET_VENDOR_RDC=y
CONFIG_R6040=m
CONFIG_NET_VENDOR_SEEQ=y
@@ -2193,6 +2235,8 @@ CONFIG_SFC_SRIOV=y
CONFIG_NET_VENDOR_SMSC=y
CONFIG_PCMCIA_SMC91C92=m
CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
CONFIG_SMSC9420=m
CONFIG_NET_VENDOR_STMICRO=y
CONFIG_STMMAC_ETH=m
@@ -2246,7 +2290,8 @@ CONFIG_NATIONAL_PHY=m
CONFIG_STE10XP=m
CONFIG_LSI_ET1011C_PHY=m
CONFIG_MICREL_PHY=m
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=m
+# CONFIG_MDIO_GPIO is not set
# CONFIG_MICREL_KS8995MA is not set
CONFIG_PLIP=m
CONFIG_PPP=m
@@ -2283,6 +2328,7 @@ 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_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2343,6 +2389,7 @@ CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2357,9 +2404,14 @@ CONFIG_ATH6KL_USB=m
CONFIG_AR5523=m
CONFIG_WIL6210=m
CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_TRACING is not set
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
@@ -2409,7 +2461,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# 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
@@ -2454,6 +2505,7 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
@@ -2466,14 +2518,17 @@ 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_RTL_CARDS=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
CONFIG_RTL8192DE=m
CONFIG_RTL8723AE=m
CONFIG_RTL8188EE=m
CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
CONFIG_RTL8192C_COMMON=m
CONFIG_WL_TI=y
CONFIG_WL1251=m
@@ -2491,6 +2546,9 @@ CONFIG_MWIFIEX=m
CONFIG_MWIFIEX_SDIO=m
CONFIG_MWIFIEX_PCIE=m
CONFIG_MWIFIEX_USB=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
#
# WiMAX Wireless Broadband devices
@@ -2754,6 +2812,9 @@ CONFIG_TOUCHSCREEN_CY8CTMG110=m
CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
# CONFIG_TOUCHSCREEN_CYTTSP_SPI is not set
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
CONFIG_TOUCHSCREEN_DYNAPRO=m
CONFIG_TOUCHSCREEN_HAMPSHIRE=m
CONFIG_TOUCHSCREEN_EETI=m
@@ -2838,6 +2899,7 @@ CONFIG_INPUT_ADXL34X_SPI=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -2888,7 +2950,6 @@ CONFIG_N_GSM=m
CONFIG_TRACE_ROUTER=m
CONFIG_TRACE_SINK=m
# CONFIG_DEVKMEM is not set
-# CONFIG_STALDRV is not set
#
# Serial drivers
@@ -2927,6 +2988,8 @@ CONFIG_SERIAL_ARC=m
CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -2971,6 +3034,7 @@ CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_ST33_I2C=m
+# CONFIG_TCG_XEN is not set
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
CONFIG_I2C=m
@@ -3021,7 +3085,6 @@ 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
@@ -3046,6 +3109,7 @@ CONFIG_I2C_VIPERBOARD=m
# 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
#
@@ -3056,6 +3120,7 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_PXA2XX_DMA=y
CONFIG_SPI_PXA2XX=m
@@ -3071,11 +3136,6 @@ CONFIG_SPI_PXA2XX_PCI=m
#
# CONFIG_SPI_SPIDEV is not set
# CONFIG_SPI_TLE62X0 is not set
-
-#
-# Qualcomm MSM SSBI bus support
-#
-CONFIG_SSBI=m
# CONFIG_HSI is not set
#
@@ -3106,6 +3166,7 @@ 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
#
@@ -3113,6 +3174,7 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
@@ -3153,6 +3215,10 @@ CONFIG_GPIO_LANGWELL=y
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
@@ -3178,8 +3244,8 @@ CONFIG_TEST_POWER=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 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
@@ -3222,10 +3288,12 @@ CONFIG_SENSORS_F71882FG=m
CONFIG_SENSORS_F75375S=m
CONFIG_SENSORS_FSCHMD=m
CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3331,10 +3399,15 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
# 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_THERMAL_GOV_USER_SPACE=y
# CONFIG_CPU_THERMAL is not set
# CONFIG_THERMAL_EMULATION is not set
CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+
+#
+# Texas Instruments thermal drivers
+#
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -3381,6 +3454,7 @@ CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_MEN_A21_WDT=m
CONFIG_XEN_WDT=m
#
@@ -3421,6 +3495,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
@@ -3440,6 +3515,7 @@ CONFIG_HTC_PASIC3=m
CONFIG_LPC_ICH=m
CONFIG_LPC_SCH=m
# CONFIG_MFD_JANZ_CMODIO is not set
+# CONFIG_MFD_KEMPLD is not set
# CONFIG_EZX_PCAP is not set
CONFIG_MFD_VIPERBOARD=m
CONFIG_MFD_RETU=m
@@ -3472,6 +3548,7 @@ CONFIG_MFD_ARIZONA_I2C=m
# CONFIG_MFD_ARIZONA_SPI is not set
CONFIG_MFD_WM5102=y
CONFIG_MFD_WM5110=y
+# CONFIG_MFD_WM8997 is not set
# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_REGULATOR is not set
CONFIG_MEDIA_SUPPORT=m
@@ -3584,6 +3661,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3601,6 +3679,7 @@ CONFIG_USB_ZR364XX=m
CONFIG_USB_STKWEBCAM=m
CONFIG_USB_S2255=m
CONFIG_USB_SN9C102=m
+CONFIG_VIDEO_USBTV=m
#
# Analog TV USB devices
@@ -3612,8 +3691,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
# Analog/digital TV USB devices
@@ -3722,6 +3802,7 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_BT848=m
@@ -3756,6 +3837,7 @@ CONFIG_DVB_DDBRIDGE=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_V4L_TEST_DRIVERS is not set
#
@@ -3767,6 +3849,7 @@ CONFIG_VIDEO_BWQCAM=m
CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3808,7 +3891,6 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -4085,6 +4167,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4161,7 +4244,6 @@ CONFIG_FB_VT8623=m
# 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
@@ -4174,6 +4256,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
@@ -4203,6 +4286,9 @@ CONFIG_BACKLIGHT_PCF50633=m
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4213,18 +4299,6 @@ 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
@@ -4245,6 +4319,7 @@ CONFIG_SND_SEQUENCER_OSS=y
CONFIG_SND_HRTIMER=m
CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
CONFIG_SND_SUPPORT_OLD_API=y
CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SND_VERBOSE_PRINTK is not set
@@ -4275,7 +4350,6 @@ 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
@@ -4339,6 +4413,7 @@ 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_I915=y
CONFIG_SND_HDA_CODEC_CIRRUS=y
CONFIG_SND_HDA_CODEC_CONEXANT=y
CONFIG_SND_HDA_CODEC_CA0110=y
@@ -4382,6 +4457,7 @@ CONFIG_SND_USB_CAIAQ=m
CONFIG_SND_USB_CAIAQ_INPUT=y
CONFIG_SND_USB_US122L=m
CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
CONFIG_SND_FIREWIRE=y
CONFIG_SND_FIREWIRE_LIB=m
CONFIG_SND_FIREWIRE_SPEAKERS=m
@@ -4420,9 +4496,11 @@ CONFIG_HID_DRAGONRISE=m
CONFIG_DRAGONRISE_FF=y
CONFIG_HID_EMS_FF=m
CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
CONFIG_HID_EZKEY=m
CONFIG_HID_HOLTEK=m
CONFIG_HOLTEK_FF=y
+CONFIG_HID_HUION=m
CONFIG_HID_KEYTOUCH=m
CONFIG_HID_KYE=m
CONFIG_HID_UCLOGIC=m
@@ -4455,7 +4533,6 @@ 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
@@ -4475,7 +4552,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
-CONFIG_HID_WIIMOTE_EXT=y
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
@@ -4492,9 +4569,7 @@ 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_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4518,7 +4593,6 @@ CONFIG_USB_WUSB_CBAF=m
#
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
@@ -4528,12 +4602,12 @@ CONFIG_USB_OXU210HP_HCD=m
CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
+CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_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
@@ -4545,9 +4619,12 @@ 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_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_UX500=m
# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
@@ -4591,9 +4668,7 @@ CONFIG_USB_STORAGE_ENE_UB6250=m
CONFIG_USB_MDC800=m
CONFIG_USB_MICROTEK=m
# CONFIG_USB_DWC3 is not set
-CONFIG_USB_CHIPIDEA=m
-CONFIG_USB_CHIPIDEA_UDC=y
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
+# CONFIG_USB_CHIPIDEA is not set
#
# USB port drivers
@@ -4601,6 +4676,7 @@ CONFIG_USB_CHIPIDEA_UDC=y
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4611,7 +4687,6 @@ 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
@@ -4642,17 +4717,14 @@ 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
@@ -4662,9 +4734,7 @@ 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_WISHBONE=m
CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
@@ -4693,6 +4763,7 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
@@ -4702,10 +4773,13 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
+# CONFIG_AM335X_PHY_USB is not set
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -4713,6 +4787,7 @@ CONFIG_SAMSUNG_USB3PHY=m
CONFIG_USB_ISP1301=m
CONFIG_USB_RCAR_PHY=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
@@ -4721,12 +4796,12 @@ CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
#
# USB Peripheral Controller
#
+CONFIG_USB_FOTG210_UDC=m
CONFIG_USB_R8A66597=m
CONFIG_USB_RENESAS_USBHS_UDC=m
CONFIG_USB_PXA27X=m
CONFIG_USB_MV_UDC=m
CONFIG_USB_MV_U3D=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
CONFIG_USB_M66592=m
CONFIG_USB_AMD5536UDC=m
CONFIG_USB_NET2272=m
@@ -4738,8 +4813,15 @@ CONFIG_USB_DUMMY_HCD=m
CONFIG_USB_LIBCOMPOSITE=m
CONFIG_USB_F_ACM=m
CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_RNDIS=m
CONFIG_USB_F_SERIAL=m
CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+# CONFIG_USB_CONFIGFS is not set
# CONFIG_USB_ZERO is not set
CONFIG_USB_AUDIO=m
# CONFIG_GADGET_UAC1 is not set
@@ -4809,6 +4891,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -4834,9 +4917,10 @@ CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_DAC124S085 is not set
CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
@@ -4915,6 +4999,7 @@ CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF2127=m
CONFIG_RTC_DRV_PCF8523=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
@@ -4965,6 +5050,7 @@ CONFIG_RTC_DRV_PCF50633=m
# on-CPU RTC drivers
#
CONFIG_RTC_DRV_MC13XXX=m
+# CONFIG_RTC_DRV_MOXART is not set
#
# HID Sensor RTC drivers
@@ -4978,8 +5064,9 @@ CONFIG_DMADEVICES=y
#
CONFIG_INTEL_MID_DMAC=m
CONFIG_INTEL_IOATDMA=m
+CONFIG_DW_DMAC_CORE=m
CONFIG_DW_DMAC=m
-# CONFIG_DW_DMAC_BIG_ENDIAN_IO is not set
+CONFIG_DW_DMAC_PCI=m
CONFIG_TIMB_DMA=m
CONFIG_PCH_DMA=m
CONFIG_DMA_ENGINE=y
@@ -5000,13 +5087,13 @@ 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_UIO_MF624 is not set
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
@@ -5072,6 +5159,7 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_WATCHDOG=m
@@ -5104,10 +5192,8 @@ 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
@@ -5126,9 +5212,7 @@ CONFIG_COMEDI_NI_LABPC_PCI=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
@@ -5152,7 +5236,6 @@ CONFIG_COMEDI_AMPLC_PC236=m
CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_TIO=m
-CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
CONFIG_RTL8192U=m
@@ -5162,6 +5245,9 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
@@ -5218,6 +5304,7 @@ CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5242,18 +5329,25 @@ 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_LTE_GDM724X is not set
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
-CONFIG_RAMSTER=m
-# CONFIG_RAMSTER_DEBUG is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
+CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5301,6 +5395,8 @@ CONFIG_MXM_WMI=m
CONFIG_INTEL_OAKTRAIL=m
CONFIG_SAMSUNG_Q10=m
CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=y
CONFIG_PVPANIC=m
#
@@ -5346,6 +5442,11 @@ CONFIG_IPACK_BUS=m
CONFIG_BOARD_TPCI200=m
CONFIG_SERIAL_IPOCTAL=m
# CONFIG_RESET_CONTROLLER is not set
+CONFIG_FMC=m
+CONFIG_FMC_FAKEDEV=m
+CONFIG_FMC_TRIVIAL=m
+CONFIG_FMC_WRITE_EEPROM=m
+CONFIG_FMC_CHARDEV=m
#
# Firmware Drivers
@@ -5364,9 +5465,7 @@ CONFIG_ISCSI_IBFT=m
#
# EFI (Extensible Firmware Interface) Support
#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_VARS_PSTORE=m
-CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+# CONFIG_EFI_VARS is not set
#
# File systems
@@ -5412,6 +5511,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5489,6 +5589,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5539,6 +5640,7 @@ CONFIG_F2FS_FS=m
CONFIG_F2FS_STAT_FS=y
CONFIG_F2FS_FS_XATTR=y
CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
CONFIG_EFIVAR_FS=y
CONFIG_ORE=m
CONFIG_NETWORK_FILESYSTEMS=y
@@ -5549,10 +5651,12 @@ CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=m
CONFIG_NFS_SWAP=y
CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=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_V4_SECURITY_LABEL=y
CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
@@ -5562,6 +5666,8 @@ CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_LOCKD=m
CONFIG_LOCKD_V4=y
CONFIG_NFS_ACL_SUPPORT=m
@@ -5573,6 +5679,7 @@ CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -5601,6 +5708,7 @@ CONFIG_AFS_FSCACHE=y
CONFIG_9P_FS=m
CONFIG_9P_FSCACHE=y
CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="utf8"
CONFIG_NLS_CODEPAGE_437=m
@@ -5659,37 +5767,102 @@ CONFIG_DLM=m
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+
+#
+# printk and dmesg options
+#
CONFIG_PRINTK_TIME=y
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
+# CONFIG_BOOT_PRINTK_DELAY is not set
+CONFIG_DYNAMIC_DEBUG=y
+
+#
+# Compile-time checks and compiler options
+#
+# CONFIG_DEBUG_INFO is not set
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 is not set
-# CONFIG_PANIC_ON_OOPS is not set
-CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_ARCH_WANT_FRAME_POINTERS=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_KERNEL=y
+
+#
+# Memory Debugging
+#
+# CONFIG_DEBUG_PAGEALLOC is not set
+# 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_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+CONFIG_HAVE_ARCH_KMEMCHECK=y
+
+#
+# Debug Lockups and Hangs
+#
+# CONFIG_LOCKUP_DETECTOR is not set
+# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHEDSTATS=y
+# CONFIG_TIMER_STATS is not set
+CONFIG_DEBUG_PREEMPT=y
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# 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_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
-CONFIG_DEBUG_MEMORY_INIT=y
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS 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_LKDTM=m
+# CONFIG_RCU_CPU_STALL_INFO is not set
+# CONFIG_RCU_TRACE is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+# CONFIG_FAULT_INJECTION is not set
+CONFIG_LATENCYTOP=y
CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
+# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
@@ -5707,7 +5880,6 @@ 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
@@ -5721,7 +5893,7 @@ CONFIG_WAKEUP_LATENCY_HIST=y
CONFIG_MISSED_TIMER_OFFSETS_HIST=y
CONFIG_FTRACE_SYSCALLS=y
CONFIG_TRACER_SNAPSHOT=y
-CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
CONFIG_BRANCH_PROFILE_NONE=y
# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
# CONFIG_PROFILE_ALL_BRANCHES is not set
@@ -5739,24 +5911,41 @@ CONFIG_MMIOTRACE=y
# CONFIG_MMIOTRACE_TEST is not set
CONFIG_RING_BUFFER_BENCHMARK=m
# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+
+#
+# Runtime Testing
+#
+CONFIG_LKDTM=m
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+CONFIG_ASYNC_RAID6_TEST=m
+# CONFIG_TEST_STRING_HELPERS is not set
+CONFIG_TEST_KSTRTOX=m
# 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_HAVE_ARCH_KMEMCHECK=y
-# CONFIG_TEST_STRING_HELPERS is not set
-CONFIG_TEST_KSTRTOX=m
+# CONFIG_KGDB is not set
CONFIG_STRICT_DEVMEM=y
CONFIG_X86_VERBOSE_BOOTUP=y
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
+# CONFIG_X86_PTDUMP is not set
+CONFIG_DEBUG_RODATA=y
+CONFIG_DEBUG_RODATA_TEST=y
# CONFIG_DEBUG_SET_MODULE_RONX is not set
+# CONFIG_DEBUG_NX_TEST is not set
+CONFIG_DOUBLEFAULT=y
+# 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
@@ -5766,7 +5955,11 @@ CONFIG_IO_DELAY_0X80=y
# 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_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
#
# Security options
@@ -5792,10 +5985,13 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/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_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
# CONFIG_DEFAULT_SECURITY_APPARMOR is not set
+# CONFIG_DEFAULT_SECURITY_YAMA is not set
CONFIG_DEFAULT_SECURITY_DAC=y
CONFIG_DEFAULT_SECURITY=""
CONFIG_XOR_BLOCKS=m
@@ -5815,7 +6011,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -5868,6 +6064,8 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -5876,7 +6074,7 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA1_SSSE3=m
CONFIG_CRYPTO_SHA256_SSSE3=m
CONFIG_CRYPTO_SHA512_SSSE3=m
@@ -5929,6 +6127,8 @@ CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
CONFIG_CRYPTO_DEFLATE=m
CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
#
# Random Number Generation
@@ -5969,11 +6169,13 @@ CONFIG_RAID6_PQ=m
CONFIG_BITREVERSE=y
CONFIG_GENERIC_STRNCPY_FROM_USER=y
CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=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_ARCH_USE_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
@@ -5988,9 +6190,12 @@ CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
CONFIG_XZ_DEC=y
CONFIG_XZ_DEC_X86=y
CONFIG_XZ_DEC_POWERPC=y
@@ -6005,11 +6210,11 @@ CONFIG_DECOMPRESS_BZIP2=y
CONFIG_DECOMPRESS_LZMA=y
CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=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
@@ -6033,3 +6238,16 @@ CONFIG_DDR=y
CONFIG_MPILIB=m
CONFIG_OID_REGISTRY=m
CONFIG_UCS2_STRING=y
+CONFIG_FONT_SUPPORT=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
diff --git a/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch b/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch
deleted file mode 100644
index 1f376b518..000000000
--- a/kernels/linux-libre-xen/3.11-haswell-intel_pstate.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001
-From: Nell Hardcastle <nell@spicious.com>
-Date: Sun, 30 Jun 2013 22:58:57 +0000
-Subject: intel_pstate: Add Haswell CPU models
-
-Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge
-model (0x3E) is also included. Models referenced from
-tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit
-
-Signed-off-by: Nell Hardcastle <nell@spicious.com>
-Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
-Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
----
-diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 6efd96c..9733f29 100644
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
- ICPU(0x2a, default_policy),
- ICPU(0x2d, default_policy),
- ICPU(0x3a, default_policy),
-+ ICPU(0x3c, default_policy),
-+ ICPU(0x3e, default_policy),
-+ ICPU(0x3f, default_policy),
-+ ICPU(0x45, default_policy),
-+ ICPU(0x46, default_policy),
- {}
- };
- MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
---
-cgit v0.9.2
diff --git a/kernels/linux-libre-xen/3.12-btrfs-relocate-csums.patch b/kernels/linux-libre-xen/3.12-btrfs-relocate-csums.patch
new file mode 100644
index 000000000..7209276ef
--- /dev/null
+++ b/kernels/linux-libre-xen/3.12-btrfs-relocate-csums.patch
@@ -0,0 +1,63 @@
+From 4577b014d1bc3db386da3246f625888fc48083a9 Mon Sep 17 00:00:00 2001
+From: Josef Bacik <jbacik@fusionio.com>
+Date: Fri, 27 Sep 2013 13:33:09 +0000
+Subject: Btrfs: relocate csums properly with prealloc extents
+
+A user reported a problem where they were getting csum errors when running a
+balance and running systemd's journal. This is because systemd is awesome and
+fallocate()'s its log space and writes into it. Unfortunately we assume that
+when we read in all the csums for an extent that they are sequential starting at
+the bytenr we care about. This obviously isn't the case for prealloc extents,
+where we could have written to the middle of the prealloc extent only, which
+means the csum would be for the bytenr in the middle of our range and not the
+front of our range. Fix this by offsetting the new bytenr we are logging to
+based on the original bytenr the csum was for. With this patch I no longer see
+the csum errors I was seeing. Thanks,
+
+Cc: stable@vger.kernel.org
+Reported-by: Chris Murphy <lists@colorremedies.com>
+Signed-off-by: Josef Bacik <jbacik@fusionio.com>
+Signed-off-by: Chris Mason <chris.mason@fusionio.com>
+---
+diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c
+index dec4f5a..0359eec 100644
+--- a/fs/btrfs/relocation.c
++++ b/fs/btrfs/relocation.c
+@@ -4472,6 +4472,7 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
+ struct btrfs_root *root = BTRFS_I(inode)->root;
+ int ret;
+ u64 disk_bytenr;
++ u64 new_bytenr;
+ LIST_HEAD(list);
+
+ ordered = btrfs_lookup_ordered_extent(inode, file_pos);
+@@ -4483,13 +4484,24 @@ int btrfs_reloc_clone_csums(struct inode *inode, u64 file_pos, u64 len)
+ if (ret)
+ goto out;
+
+- disk_bytenr = ordered->start;
+ while (!list_empty(&list)) {
+ sums = list_entry(list.next, struct btrfs_ordered_sum, list);
+ list_del_init(&sums->list);
+
+- sums->bytenr = disk_bytenr;
+- disk_bytenr += sums->len;
++ /*
++ * We need to offset the new_bytenr based on where the csum is.
++ * We need to do this because we will read in entire prealloc
++ * extents but we may have written to say the middle of the
++ * prealloc extent, so we need to make sure the csum goes with
++ * the right disk offset.
++ *
++ * We can do this because the data reloc inode refers strictly
++ * to the on disk bytes, so we don't have to worry about
++ * disk_len vs real len like with real inodes since it's all
++ * disk length.
++ */
++ new_bytenr = ordered->start + (sums->bytenr - disk_bytenr);
++ sums->bytenr = new_bytenr;
+
+ btrfs_add_ordered_sum(inode, ordered, sums);
+ }
+--
+cgit v0.9.2
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 8c3d6c88d..e97f554c3 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 196455 2013-10-14 06:53:31Z tpowa $
+# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.11
-pkgver=${_basekernel}.5
+_basekernel=3.12
+pkgver=${_basekernel}.6
pkgrel=1
arch=('i686')
url="http://linux-libre.fsfla.org/"
@@ -21,16 +21,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
"${pkgbase}.preset"
'boot-logo.patch'
'change-default-console-loglevel.patch'
- 'criu-no-expert.patch'
- '3.11-haswell-intel_pstate.patch')
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
- 'bcd700aa1ae7f13107a14885923358eb'
- 'e97b1c54a6ebeb8647b49a4abda64072'
+ 'criu-no-expert.patch')
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+ '4b18ce60daff87504e6740670edf6b50'
+ '7fce4cb7fd646d3efe0fc151ae6aca21'
'b7c2805bb287a644c0a303bf7721e534'
- '36e90334b12b2e9d53fd92129ee98f5b'
+ '44260d2cb1a8b51c119d2ce1f83e457a'
'98beb36f9b8cf16e58de2483ea9985e3'
- 'd50c1ac47394e9aec637002ef3392bd1'
- '1040ae6c10d4a68f89899f94a2318a17')
+ 'd50c1ac47394e9aec637002ef3392bd1')
_kernelname=${pkgbase#linux-libre}
_localversionname=-LIBRE-XEN
@@ -45,16 +43,14 @@ prepare() {
# add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
+ # fix issue on Hal8188EFWImg_CE.c deblobbed file
+ sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+
# 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"
- # add intel haswell support to intel_pstate
- # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
- # will be in 3.12
- patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch"
-
# allow criu without expert option set
# patch from fedora
patch -Np1 -i "${srcdir}/criu-no-expert.patch"
diff --git a/kernels/linux-libre-xen/boot-logo.patch b/kernels/linux-libre-xen/boot-logo.patch
index cbd52ea22..3f4e0dea4 100644
--- a/kernels/linux-libre-xen/boot-logo.patch
+++ b/kernels/linux-libre-xen/boot-logo.patch
@@ -1,891 +1,1613 @@
diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 285d552..c9d8373 100644
+index 3c14e43..c9d8373 100644
--- a/drivers/video/logo/logo_linux_clut224.ppm
+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,883 +1,861 @@
+@@ -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 11 15 17 33 49 54 59 85 92 73 97 106
--83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 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 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106
--105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0
--0 0 0 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 1 1 1 1 1 1 0 0 0
--0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83
--108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0
--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 1 1 1 0 0 0 0 0 0 0 0 0
--11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133
--108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 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 1 1 1 7 12 13 21 31 35 42 59 64
--53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116
--132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13
--1 1 1 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 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92
--59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104
--117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60
--7 12 13 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 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35
--6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104
--108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129
--36 50 56 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
--
--27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39
--12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110
--117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152
--68 78 128 15 22 25 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
--
--36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64
--57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104
--152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152
--95 131 149 53 75 83 11 15 17 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
--
--17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83
--86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104
--137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157
--95 131 149 83 116 129 40 48 73 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
--
--1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79
--152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86
--94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152
--95 131 149 91 118 149 78 102 129 27 40 45 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
--
--4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79
--174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86
--79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152
--91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 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
--
--19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79
--174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32
--21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152
--91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 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
--
--34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79
--174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35
--12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157
--93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 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
--
--40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55
--123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69
--60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162
--91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 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 124 131 137 170 170 170 151 151 151 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
--
--34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18
--48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54
--68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149
--91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14
--124 131 137 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 124 131 137 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
--
--19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0
--6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8
--34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149
--73 97 106 36 50 56 33 49 54 18 18 18 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 170 170 170 124 127 131 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
--
--4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3
--13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35
--26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103
--53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106
--170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 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 151 151 151 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
--
--1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20
--18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79
--17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20
--42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116
--106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 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
--
--11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69
--63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128
--24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49
--29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101
--124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6
--170 170 170 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
--
--26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80
--133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128
--51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64
--18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58
--210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11
--220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 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
--
--27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80
--175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52
--20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56
--6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10
--195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25
--237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 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
--
--15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80
--175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0
--1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8
--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 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50
--237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 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
--
--1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80
--175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17
--21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 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 62 42 6
--180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50
--239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 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 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80
--175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39
--17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 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 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50
--241 208 19 241 208 19 241 208 19 204 160 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 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48
--149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17
--3 5 6 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 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22
--137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19
--241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 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 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12
--56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 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 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6
--88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13
--171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 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 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3
--8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 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
--124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11
--206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 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 11 15 17 31 45 49 26 35 39 3 5 6
--0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 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
--124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9
--180 123 7 185 146 40 198 179 130 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 1 1 1 15 22 25 36 54 60 18 25 28
--0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 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
--151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40
--168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180
--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 1 1 1 27 40 45 35 52 58
--18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 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 7 12 13 33 49 54
--52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--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 180 180 180
--253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190
--202 202 202 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 12 17 20
--36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
--21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 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 180 180 180 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
--12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 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 106 106 106 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 21 30 33 35 52 58 6 8 12 0 0 0 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 12 17 20 36 54 60 29 43 47 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 21 30 33 35 52 58 6 8 12 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 202 202 202 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 202 202 202 202 202 202 202 202 202
--198 198 198 202 202 202 180 180 180 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 12 17 20 36 54 60 29 43 47 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 180 180 180 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 151 151 151 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 21 30 33 35 52 58 6 8 12 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 170 170 170 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 202 202 202 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 6 8 8 33 49 54 29 43 47 6 8 12
--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 12 17 20 33 49 54 17 23 26
--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 15 22 25 36 54 60
--0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26
--22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 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 21 30 33
--36 54 60 0 0 0 0 0 0 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
--36 54 60 0 0 0 0 0 0 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 36 54 60 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 151 151 151 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 36 54 60 21 30 33 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 180 180 180 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 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6
--151 151 151 253 253 253 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 202 202 202 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 36 54 60 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 202 202 202 2 2 6
--22 22 22 34 34 34 20 16 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 63 55 20 184 138 11 204 160 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 151 151 151 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 138 132 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 214 187 87 214 187 87 185 146 40 35 31 12
--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 185 146 40 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 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26
--204 160 10 165 152 80 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 124 127 131
--174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10
--98 70 6 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 214 187 87 242 186 14 241 196 14 204 160 10 20 16 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 148 132 55 185 146 40 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
--220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 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 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15
--237 188 10 237 188 10 113 101 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 6 6 6
--22 22 22 54 54 54 148 132 55 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 138 11 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 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6
--20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 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 169 125 40 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 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9
--163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13
--242 186 14 242 186 14 165 152 80 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 185 146 40 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 204 160 10 20 16 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 202 202 202 198 198 198 213 164 39 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 220 174 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 140 55 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 185 146 40 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 213 164 39 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 140 55 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 230 187 11 62 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 169 125 40 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 213 164 39 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 149 139 69 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 20 16 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 220 174 15 149 139 69 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 149 139 69 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 20 16 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 149 139 69
--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 149 139 69 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 220 174 15 198 179 130 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 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 20 16 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 185 146 40
--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 169 125 40 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 35 31 12 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 149 139 69
--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 113 101 86 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 230 187 11 204 160 10 133 118 54
--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 62 42 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 148 132 55 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 148 132 55 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 204 160 10 163 110 8
--62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6
--2 2 6 2 2 6 62 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 185 146 40 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 169 125 40 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 171 120 8
--85 57 6 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 85 57 6 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 140 55 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 169 125 40 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 85 57 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
--169 125 40 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 133 118 54 169 125 40 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 184 138 11 152 99 6
--104 69 6 20 16 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 85 57 6 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 148 132 55
--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 133 118 54 156 107 11
--163 110 8 167 114 7 171 120 8 180 123 7 184 138 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 134 84 6
--85 57 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 62 42 6 137 92 6 171 120 8 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 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7
--184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6
--62 42 6 54 54 54 106 106 106 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 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11
--206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 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 113 101 86 121 92 8 120 80 7
--137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22
--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 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8
--171 120 8 167 114 7 152 99 6 121 92 8 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
--94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 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 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6
--134 84 6 120 80 7 94 86 71 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 71 94 86 71 94 86 71 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 94 86 71 94 86 71 94 86 71
--94 86 71 94 86 71 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 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 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
@@ -1743,7 +2465,7 @@ index 285d552..c9d8373 100644
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0
+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 --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
index 2f14d9f..3d3c358 100644
--- a/drivers/video/logo/logo_linux_mono.pbm
diff --git a/kernels/linux-libre-xen/config b/kernels/linux-libre-xen/config
index 7160191c1..56e58eb2d 100644
--- a/kernels/linux-libre-xen/config
+++ b/kernels/linux-libre-xen/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.4-1 Kernel Configuration
+# Linux/x86 3.12.0-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -76,12 +76,10 @@ 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
@@ -165,8 +163,10 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -288,6 +288,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
@@ -312,6 +313,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
#
# IO Schedulers
@@ -354,6 +356,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
CONFIG_LGUEST_GUEST=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
@@ -469,6 +472,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
CONFIG_ZBUD=y
CONFIG_ZSWAP=y
# CONFIG_HIGHPTE is not set
@@ -536,14 +540,12 @@ 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
@@ -620,6 +622,10 @@ CONFIG_X86_E_POWERSAVER=m
#
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -653,7 +659,6 @@ 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
@@ -728,6 +733,7 @@ CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -741,7 +747,6 @@ 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
#
@@ -778,7 +783,6 @@ 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
@@ -886,7 +890,7 @@ 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_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -1038,6 +1042,7 @@ 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_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1075,6 +1080,7 @@ 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_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
@@ -1198,6 +1204,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1239,6 +1246,7 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
CONFIG_VSOCKETS=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
@@ -1344,9 +1352,9 @@ 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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1452,7 +1460,7 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
@@ -1464,7 +1472,6 @@ CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
#
# Bus devices
@@ -1591,7 +1598,6 @@ CONFIG_PROC_DEVICETREE=y
CONFIG_OF_PROMTREE=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
-CONFIG_OF_I2C=m
CONFIG_OF_NET=y
CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
@@ -1745,7 +1751,7 @@ 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=y
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1800,6 +1806,7 @@ CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_IN2000=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -2247,6 +2254,7 @@ CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_IP1000=m
CONFIG_JME=m
@@ -2419,6 +2427,7 @@ 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_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2479,6 +2488,7 @@ CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2550,7 +2560,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# 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
@@ -2595,6 +2604,7 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
@@ -3012,6 +3022,7 @@ CONFIG_INPUT_ADXL34X_SPI=m
# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
#
@@ -3106,6 +3117,7 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3243,6 +3255,7 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@@ -3296,6 +3309,7 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
@@ -3339,6 +3353,10 @@ CONFIG_GPIO_AMD8111=m
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
@@ -3365,8 +3383,8 @@ CONFIG_BATTERY_OLPC=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 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
@@ -3415,6 +3433,7 @@ CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3623,6 +3642,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
@@ -3788,6 +3808,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3817,8 +3838,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
# Analog/digital TV USB devices
@@ -3927,6 +3949,7 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_BT848=m
@@ -3961,6 +3984,7 @@ CONFIG_DVB_DDBRIDGE=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_V4L_TEST_DRIVERS is not set
#
@@ -3973,6 +3997,7 @@ CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_PMS=m
CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -4015,7 +4040,6 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -4298,6 +4322,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4421,6 +4446,9 @@ CONFIG_BACKLIGHT_PCF50633=m
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4521,7 +4549,6 @@ 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
@@ -4725,6 +4752,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
@@ -4741,6 +4769,7 @@ CONFIG_USB_HIDDEV=y
# I2C HID support
#
CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4764,7 +4793,6 @@ CONFIG_USB_WUSB_CBAF=m
#
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
@@ -4775,13 +4803,11 @@ CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_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
@@ -4793,6 +4819,7 @@ 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_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
# CONFIG_USB_MUSB_HOST is not set
# CONFIG_USB_MUSB_GADGET is not set
@@ -4800,6 +4827,7 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_UX500=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
CONFIG_USB_RENESAS_USBHS=m
@@ -4850,6 +4878,7 @@ CONFIG_USB_MICROTEK=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4860,7 +4889,6 @@ 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
@@ -4891,17 +4919,14 @@ 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
@@ -4911,15 +4936,11 @@ 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_WISHBONE=m
CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4944,6 +4965,7 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
@@ -4953,10 +4975,13 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
+# CONFIG_AM335X_PHY_USB is not set
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -5068,6 +5093,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -5093,9 +5119,10 @@ CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_BD2802=m
@@ -5229,6 +5256,7 @@ CONFIG_RTC_DRV_PCF50633=m
#
CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_SNVS=m
+# CONFIG_RTC_DRV_MOXART is not set
#
# HID Sensor RTC drivers
@@ -5266,13 +5294,13 @@ 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_UIO_MF624 is not set
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
@@ -5338,6 +5366,7 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_ISA_DRIVERS=y
CONFIG_COMEDI_PCL711=m
CONFIG_COMEDI_PCL724=m
@@ -5365,9 +5394,11 @@ CONFIG_COMEDI_DT2815=m
CONFIG_COMEDI_DT2817=m
CONFIG_COMEDI_DT282X=m
CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_FL512=m
CONFIG_COMEDI_AIO_AIO12_8=m
CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_C6XDIGIO=m
CONFIG_COMEDI_MPC624=m
CONFIG_COMEDI_ADQ12B=m
@@ -5415,10 +5446,8 @@ 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
@@ -5438,7 +5467,6 @@ CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_PCMCIA_DRIVERS=y
@@ -5461,9 +5489,9 @@ CONFIG_COMEDI_AMPLC_DIO200=m
CONFIG_COMEDI_AMPLC_PC236=m
CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=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
@@ -5473,6 +5501,9 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
@@ -5529,6 +5560,7 @@ CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5553,16 +5585,25 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
+# CONFIG_LTE_GDM724X is not set
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5647,9 +5688,11 @@ CONFIG_EXTCON=m
#
# Extcon Device Drivers
#
+CONFIG_OF_EXTCON=m
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=y
CONFIG_PWM_SYSFS=y
@@ -5728,6 +5771,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5804,6 +5848,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5893,6 +5938,7 @@ CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -6205,6 +6251,7 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_YAMA=y
CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
@@ -6230,7 +6277,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -6283,6 +6330,7 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -6291,7 +6339,7 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@@ -6397,7 +6445,7 @@ CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD
index 80a704ca8..e463637a8 100644
--- a/libre/angband-libre/PKGBUILD
+++ b/libre/angband-libre/PKGBUILD
@@ -1,32 +1,38 @@
-# Maintainer: Israfel <israfel@lavabit.com>
-# Original Maintainer: schuay <jakob.gruber@gmail.com>
-# Original Maintainer: Mike Sampson <mike at sambodata dot com>
+# Maintainer: schuay <jakob.gruber@gmail.com>
+# Contributor: Mike Sampson <mike at sambodata dot com>
# Contributor: Adrian Stratulat <adrian.stratulat at inboxcom>
# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
# Contributor: KillaB <xGenoBlast@gmail.com>
# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
# Contributor: Christian Schmidt <xmucknertx@googlemail.com>
# Contributor: Sebastian Sareyko <public@nooms.de>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=angband
pkgname=angband-libre
-pkgver=3.4.1
-pkgrel=1
-pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree sound effects"
+pkgver=3.5.0
+pkgrel=2
+pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien, without nonfree artwork and sound effects"
arch=('i686' 'x86_64' 'mips64el')
url="http://rephial.org/"
license=('GPL2' 'custom')
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libglade')
-source=("http://rephial.org/downloads/${pkgver:0:3}/angband-v${pkgver}.tar.gz" "sound.patch")
+depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses')
+source=("http://rephial.org/downloads/${pkgver:0:3}/${_pkgname}-v${pkgver}.tar.gz" 'libre.patch')
-build() {
+prepare() {
+ cd "${srcdir}/${_pkgname}-v${pkgver}"
+
+ # remove nonfree parts from source code
+ patch -Np1 -i ../libre.patch
+ rm -v lib/xtra/sound/*.mp3
+ rm -v lib/xtra/graf/64x64.png
+}
- cd "${srcdir}/angband-v${pkgver}"
-
- patch -Np1 -i ../sound.patch
+build() {
+ cd "${srcdir}/${_pkgname}-v${pkgver}"
./configure \
--prefix=/usr \
@@ -39,18 +45,16 @@ build() {
--enable-sdl-mixer
make
-
}
package() {
-
- cd "${srcdir}/angband-v${pkgver}"
+ cd "${srcdir}/${_pkgname}-v${pkgver}"
make DESTDIR="${pkgdir}" install
rm -f "${pkgdir}/usr/share/angband/*/delete.me"
- install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/angband/COPYING"
-
+ install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
}
-sha512sums=('76099c8fa999e88ea1324bb70b4dee5df1faccd1fa256cc0c460ce2c5ddae9634fdef876bd0d826e99e6dcc54a9f9cf619d82552dc658d0115b97e0e644c19d3'
- 'fb3795f7ef5a266e36ef51c9275e65613eeba04fc4283646f21e77ca571b1562c1ad9a11782fe8f1052cefc48b0f3fa1f162bfff88fe8cf62c39e142878d3251')
+
+md5sums=('4f6ee37abdb411285deb1685ddecba6a'
+ '3ac39f377bea2e208308d01f4213310f')
diff --git a/libre/angband-libre/libre.patch b/libre/angband-libre/libre.patch
new file mode 100644
index 000000000..a044bc6fe
--- /dev/null
+++ b/libre/angband-libre/libre.patch
@@ -0,0 +1,814 @@
+diff --git a/copying.txt b/copying.txt
+index fe1f289..82263b1 100644
+--- a/copying.txt
++++ b/copying.txt
+@@ -23,14 +23,6 @@ exceptions:
+ only under the terms of the Creative Commons Attribution 3.0 licence:
+ http://creativecommons.org/licenses/by/3.0/
+
+- * Shockbolt's (64x64) graphics are distributed under the licence at the end
+- of this file. Currently some of the tiles in the 64x64.png tilesheet were
+- resized from tiles made by David Gervais for the 32x32 set.
+-
+- * The sounds are licenced under the Creative Commons Attribution-NonCommercial-
+- Sharealike licence. They were created by Dubtrain <angband@dubtrain.com>.
+- You can find them in Wave format at http://www.dubtrain.com/angband/.
+-
+ * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick
+ McConnell, all of whom have agreed to their Angband work being released
+ under the GPL.
+@@ -393,25 +385,3 @@ proprietary programs. If your program is a subroutine library, you may
+ consider it more useful to permit linking proprietary applications with the
+ library. If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License.
+-
+-------------------------------------------------------------------------------
+-
+-The Shockbolt Angband 64x64/128x64 tileset is copyright (C) Raymond Gaustadnes
+-2012. It can be found in the file lib/xtra/graf/128x128.png.
+-
+-Permission is granted to:
+-* use the tileset with in-development and released versions of Angband
+-* distribute and make copies of the tileset with in-development and released
+- versions of Angband, as long as no fee is charged for it
+-* incorporate tiles designed by the author for variants of Angband and use and
+- distribute them with Angband under the terms above
+-
+-Permission is not granted to:
+-* modify the tileset without the author's permission.
+-* incorporate tiles designed for ToME that do not appear in the Angband tileset.
+-* use or distribute the tileset with other games or projects. If you want to
+- use and distribute the tileset with other games or projects, you must obtain
+- explicit permission from the author. Non-commercial games or projects may
+- be granted permission to use them, and if so, use will be allowed as long
+- as the game or project remains non-commercial. To use them in commercial
+- games, a non-exclusive licence must be acquired from the author.
+diff --git a/lib/xtra/graf/Makefile b/lib/xtra/graf/Makefile
+index e1e9111..ec54051 100644
+--- a/lib/xtra/graf/Makefile
++++ b/lib/xtra/graf/Makefile
+@@ -1,6 +1,6 @@
+ MKPATH=../../../mk/
+ include $(MKPATH)buildsys.mk
+
+-DATA = 8x8.png 8x16.png 16x16.png 32x32.png 64x64.png mr_att.png graphics.txt
++DATA = 8x8.png 8x16.png 16x16.png 32x32.png mr_att.png graphics.txt
+ PACKAGE = xtra/graf
+
+diff --git a/lib/xtra/graf/graphics.txt b/lib/xtra/graf/graphics.txt
+index 28078fc..02f32ab 100644
+--- a/lib/xtra/graf/graphics.txt
++++ b/lib/xtra/graf/graphics.txt
+@@ -47,8 +47,3 @@ N:4:Nomad's tiles
+ I:16:16:8x16.png
+ P:nomad
+ X:0:0:0
+-
+-N:5:Shockbolt's tiles
+-I:64:64:64x64.png
+-P:shock
+-X:1:29:31
+diff --git a/lib/xtra/sound/Makefile b/lib/xtra/sound/Makefile
+index 0fb522b..a4337fd 100644
+--- a/lib/xtra/sound/Makefile
++++ b/lib/xtra/sound/Makefile
+@@ -1,78 +1,7 @@
+ MKPATH=../../../mk/
+ include $(MKPATH)buildsys.mk
+
+-DATA = sound.cfg \
+- amb_bell_metal1.mp3 mco_scurry_dry.mp3 plm_drop_boot.mp3 \
+- amb_bell_metal2.mp3 mco_shake_roll.mp3 plm_eat_bite.mp3 \
+- amb_bell_tibet1.mp3 mco_snarl_short.mp3 plm_floor_creak.mp3 \
+- amb_bell_tibet2.mp3 mco_spray_long.mp3 plm_floor_creak2.mp3 \
+- amb_bell_tibet3.mp3 mco_squish_hit.mp3 plm_glass_break.mp3 \
+- amb_door_doom.mp3 mco_squish_snap.mp3 plm_glass_breaking.mp3 \
+- amb_door_iron.mp3 mco_strange_music.mp3 plm_glass_smashing.mp3 \
+- amb_dungeon_echo.mp3 mco_strange_thwoink.mp3 plm_jar_ding.mp3 \
+- amb_dungeon_echowet.mp3 mco_thoing_backwards.mp3 plm_levelup.mp3 \
+- amb_gong_chinese.mp3 mco_thoing_deep.mp3 plm_lock_case.mp3 \
+- amb_gong_low.mp3 mco_thud_crash.mp3 plm_lock_distant.mp3 \
+- amb_gong_strike.mp3 mco_tube_hit.mp3 plm_metal_clank.mp3 \
+- amb_gong_undertone.mp3 plc_bell_warn.mp3 plm_metal_sharpen.mp3 \
+- amb_guitar_chord.mp3 plc_die_laugh.mp3 plm_open_case.mp3 \
+- amb_pulse_low.mp3 plc_hit_anvil.mp3 plm_spell1.mp3 \
+- amb_thunder_rain.mp3 plc_hit_anvil2.mp3 plm_spell2.mp3 \
+- amb_thunder_roll.mp3 plc_hit_arrow.mp3 plm_spell3.mp3 \
+- id_bad_aww.mp3 plc_hit_body.mp3 plm_use_staff.mp3 \
+- id_bad_dang.mp3 plc_hit_groan.mp3 plm_wood_thud.mp3 \
+- id_bad_hmm.mp3 plc_hit_grunt.mp3 plm_zap_rod.mp3 \
+- id_bad_hmph.mp3 plc_hit_grunt2.mp3 pls_bell_bowl.mp3 \
+- id_bad_ohh.mp3 plc_hit_hay.mp3 pls_bell_chime_new.mp3 \
+- id_ego_whoa.mp3 plc_miss_arrow.mp3 pls_bell_glass.mp3 \
+- id_ego_woohoo.mp3 plc_miss_arrow2.mp3 pls_bell_hibell_soft.mp3 \
+- id_ego_yeah.mp3 plc_miss_swish.mp3 pls_bell_mute.mp3 \
+- id_ego_yeah2.mp3 plm_aim_wand.mp3 pls_bell_sustain.mp3 \
+- id_ego_yes.mp3 plm_bang_ceramic.mp3 pls_breathe_in.mp3 \
+- id_good_hey.mp3 plm_bang_dumpster.mp3 pls_man_argoh.mp3 \
+- id_good_hey2.mp3 plm_bang_metal.mp3 pls_man_gulp_new.mp3 \
+- id_good_hmm.mp3 plm_book_pageturn.mp3 pls_man_oooh.mp3 \
+- id_good_huh.mp3 plm_bottle_clinks.mp3 pls_man_scream2.mp3 \
+- id_good_ooh.mp3 plm_break_canister.mp3 pls_man_sigh.mp3 \
+- id_good_ooo.mp3 plm_break_glass.mp3 pls_man_sniff.mp3 \
+- id_good_wow.mp3 plm_break_glass2.mp3 pls_man_sob.mp3 \
+- mco_attack_breath.mp3 plm_break_plates.mp3 pls_man_spit.mp3 \
+- mco_attack_spray.mp3 plm_break_shatter.mp3 pls_man_ugh.mp3 \
+- mco_bite_chew.mp3 plm_break_smash.mp3 pls_man_yell.mp3 \
+- mco_bite_chomp.mp3 plm_break_wood.mp3 pls_tone_blurk.mp3 \
+- mco_bite_dainty.mp3 plm_cabinet_open.mp3 pls_tone_clave6.mp3 \
+- mco_bite_gnash.mp3 plm_cabinet_shut.mp3 pls_tone_clavelo8.mp3 \
+- mco_bite_hard.mp3 plm_chain_light.mp3 pls_tone_conk.mp3 \
+- mco_bite_long.mp3 plm_chest_latch.mp3 pls_tone_elec.mp3 \
+- mco_bite_munch.mp3 plm_chest_unlatch.mp3 pls_tone_goblet.mp3 \
+- mco_bite_regular.mp3 plm_chimes_jangle.mp3 pls_tone_guiro.mp3 \
+- mco_bite_short.mp3 plm_click_dry.mp3 pls_tone_headstock.mp3 \
+- mco_bite_small.mp3 plm_click_switch.mp3 pls_tone_scrape.mp3 \
+- mco_bite_soft.mp3 plm_click_switch2.mp3 pls_tone_stick.mp3 \
+- mco_card_shuffle.mp3 plm_click_switch3.mp3 sto_bell_desk.mp3 \
+- mco_castanet_trill.mp3 plm_click_wood.mp3 sto_bell_ding.mp3 \
+- mco_ceramic_trill.mp3 plm_close_hatch.mp3 sto_bell_dingaling.mp3 \
+- mco_click_vibra.mp3 plm_coins_dump.mp3 sto_bell_jingles.mp3 \
+- mco_creature_choking.mp3 plm_coins_light.mp3 sto_bell_register1.mp3 \
+- mco_creature_groan.mp3 plm_coins_pour.mp3 sto_bell_register2.mp3 \
+- mco_creature_yelp.mp3 plm_coins_shake.mp3 sto_bell_ringing.mp3 \
+- mco_cuica_rubbing.mp3 plm_cork_pop.mp3 sto_bell_shop.mp3 \
+- mco_dino_low.mp3 plm_cork_squeak.mp3 sto_coins_countertop.mp3 \
+- mco_dino_slur.mp3 plm_door_bolt.mp3 sto_man_haha.mp3 \
+- mco_dino_talk.mp3 plm_door_creak.mp3 sto_man_hey.mp3 \
+- mco_dino_yawn.mp3 plm_door_creakshut.mp3 sto_man_whoohaha.mp3 \
+- mco_dub_wobble.mp3 plm_door_dungeon.mp3 sum_angel_song.mp3 \
+- mco_frog_trill.mp3 plm_door_echolock.mp3 sum_bell_crystal.mp3 \
+- mco_hit_whip.mp3 plm_door_entrance.mp3 sum_bell_hand.mp3 \
+- mco_howl_croak.mp3 plm_door_knob.mp3 sum_bell_tone.mp3 \
+- mco_howl_deep.mp3 plm_door_latch.mp3 sum_chime_jangle.mp3 \
+- mco_howl_distressed.mp3 plm_door_open.mp3 sum_ghost_moan.mp3 \
+- mco_howl_high.mp3 plm_door_opening.mp3 sum_ghost_oooo.mp3 \
+- mco_howl_long.mp3 plm_door_rusty.mp3 sum_ghost_wail.mp3 \
+- mco_liquid_squirt.mp3 plm_door_shut.mp3 sum_gong_temple.mp3 \
+- mco_man_mumble.mp3 plm_door_slam.mp3 sum_laugh_evil2.mp3 \
+- mco_mouse_squeaks.mp3 plm_door_squeaky.mp3 sum_lion_growl.mp3 \
+- mco_rubber_thud.mp3 plm_door_wooden.mp3 sum_piano_scrape.mp3
++DATA = sound.cfg
+
+ PACKAGE = xtra/sound
+
+diff --git a/lib/xtra/sound/sound.cfg b/lib/xtra/sound/sound.cfg
+index a3f483f..41de805 100644
+--- a/lib/xtra/sound/sound.cfg
++++ b/lib/xtra/sound/sound.cfg
+@@ -9,21 +9,6 @@
+ # hit = hit.mp3 hit1.mp3
+ #
+
+-#
+-# This is the Dubtrain Angband Sound config list, v.3.1.0 - February 24th, 2009
+-#
+-# Licensed under a Creative Commons non-commercial agreement
+-#
+-# Inspired by the original Craig's Angband Sound Patch.
+-#
+-# But with all new sounds.
+-#
+-# contact angband@dubtrain.com
+-#
+-# download zipped archive at www.dubtrain.com/angband
+-#
+-#
+-
+ [Sound]
+
+ #
+@@ -31,484 +16,484 @@
+ #
+
+ # Town during the day.
+-ambient_day = amb_thunder_rain.mp3
++ambient_day =
+
+ # Town during the night.
+-ambient_nite = amb_guitar_chord.mp3 amb_thunder_roll.mp3
++ambient_nite =
+
+ # Dungeon levels 1-20 (50'-1000')
+-ambient_dng1 = amb_door_iron.mp3 amb_bell_metal1.mp3
++ambient_dng1 =
+
+ # Dungeon levels 21-40 (1050'-2000')
+-ambient_dng2 = amb_bell_tibet1.mp3 amb_bell_metal2.mp3 amb_gong_strike.mp3
++ambient_dng2 =
+
+ # Dungeon levels 41-60 (2050'-3000')
+-ambient_dng3 = amb_bell_tibet2.mp3 amb_dungeon_echo.mp3 amb_pulse_low.mp3
++ambient_dng3 =
+
+ # Dungeon levels 61-80 (3050'-4000')
+-ambient_dng4 = amb_bell_tibet3.mp3 amb_dungeon_echowet.mp3 amb_gong_undertone.mp3
++ambient_dng4 =
+
+ # Dungeon levels 81 and beyond (4050'-)
+-ambient_dng5 = amb_door_doom.mp3 amb_gong_chinese.mp3 amb_gong_low.mp3
++ambient_dng5 =
+
+ #
+ # Store sounds
+ #
+
+ # The shopkeep bought a worthless item.
+-store1 = sto_man_hey.mp3
++store1 =
+
+ # The shopkeep paid too much for an item.
+-store2 = id_bad_dang.mp3
++store2 =
+
+ # The shopkeep got away with a good bargain.
+-store3 = sto_man_haha.mp3
++store3 =
+
+ # The shopkeep got away with a great bargain.
+-store4 = sto_man_whoohaha.mp3
++store4 =
+
+ # You make a normal transaction (buying or selling).
+-store5 = sto_coins_countertop.mp3 sto_bell_register1.mp3 sto_bell_register2.mp3
++store5 =
+
+ # You enter a store.
+-store_enter = sto_bell_desk.mp3 sto_bell_ding.mp3 sto_bell_dingaling.mp3 sto_bell_jingles.mp3 sto_bell_ringing.mp3 sto_bell_shop.mp3
++store_enter =
+
+ # You enter your home.
+-store_home = plm_door_entrance.mp3
++store_home =
+
+ # You leave a store.
+-store_leave = plm_door_bolt.mp3
++store_leave =
+
+ #
+ # Player sounds - combat
+ #
+
+ # You succeed in a melee attack against a monster.
+-hit = plc_hit_hay.mp3 plc_hit_body.mp3
++hit =
+
+ # It was a good hit!
+-hit_good = plc_hit_anvil.mp3
++hit_good =
+
+ # It was a great hit!
+-hit_great = plc_hit_groan.mp3
++hit_great =
+
+ # It was a superb hit!
+-hit_superb = plc_hit_grunt.mp3
++hit_superb =
+
+ # It was a *GREAT* hit!
+-hit_hi_great = plc_hit_grunt2.mp3
++hit_hi_great =
+
+ # It was a *SUPERB* hit!
+-hit_hi_superb = plc_hit_anvil2.mp3
++hit_hi_superb =
+
+ # You miss a melee attack against a monster.
+-miss = plc_miss_arrow2.mp3
++miss =
+
+ # You fire a missile.
+-shoot = plc_miss_swish.mp3 plc_miss_arrow.mp3
++shoot =
+
+ # You hit something with a missile.
+-shoot_hit = plc_hit_arrow.mp3
++shoot_hit =
+
+ # You receive a hitpoint warning.
+-hitpoint_warn = plc_bell_warn.mp3
++hitpoint_warn =
+
+ # You die.
+-death = plc_die_laugh.mp3
++death =
+
+ #
+ # Player sounds - status changes
+ #
+
+ # You become blind.
+-blind = pls_tone_conk.mp3
++blind =
+
+ # You become confused.
+-confused = pls_man_ugh.mp3
++confused =
+
+ # You become poisoned.
+-poisoned = pls_tone_guiro.mp3
++poisoned =
+
+ # You become afraid.
+-afraid = pls_man_yell.mp3
++afraid =
+
+ # You become paralyzed.
+-paralyzed = pls_man_gulp_new.mp3
++paralyzed =
+
+ # You feel drugged (chaos effects).
+-drugged = pls_breathe_in.mp3
++drugged =
+
+ # You become slower.
+-slow = pls_man_sigh.mp3
++slow =
+
+ # You become stunned.
+-stun = pls_bell_mute.mp3
++stun =
+
+ # You suffer a cut.
+-cut = pls_man_argoh.mp3
++cut =
+
+ # A stat is drained
+-drain_stat = pls_tone_headstock.mp3
++drain_stat =
+
+ # You recover from a condition (blind, confused, etc.)
+-recover = pls_bell_chime_new.mp3
++recover =
+
+ # You become faster.
+-speed = pls_bell_sustain.mp3
++speed =
+
+ # You attain a mystic shield.
+-shield = pls_bell_bowl.mp3
++shield =
+
+ # You become blessed.
+-blessed = sum_angel_song.mp3
++blessed =
+
+ # You feel heroic.
+-hero = pls_tone_goblet.mp3
++hero =
+
+ # You are bold.
+-bold = pls_bell_hibell_soft.mp3
++bold =
+
+ # You become berserk.
+-berserk = pls_man_scream2.mp3
++berserk =
+
+ # You feel protected from evil.
+-prot_evil = pls_bell_glass.mp3
++prot_evil =
+
+ # You feel invulnerable. (does any item/spell do this anymore?)
+-invuln = pls_tone_blurk.mp3
++invuln =
+
+ # You can see invisible things.
+-see_invis = pls_tone_clave6.mp3
++see_invis =
+
+ # You can see the infrared spectrum
+-infrared = pls_tone_clavelo8.mp3
++infrared =
+
+ # You become resistant to acid.
+-res_acid = pls_man_sniff.mp3
++res_acid =
+
+ # You become resistant to electricity.
+-res_elec = pls_tone_elec.mp3
++res_elec =
+
+ # You become resistant to fire.
+-res_fire = pls_tone_scrape.mp3
++res_fire =
+
+ # You become resistant to cold.
+-res_cold = pls_tone_stick.mp3
++res_cold =
+
+ # You become resistant to poison.
+-res_pois = pls_man_spit.mp3
++res_pois =
+
+ # You become hungry.
+-hungry = pls_man_sob.mp3
++hungry =
+
+ #
+ # Player sounds - misc.
+ #
+
+ # You pick up money worth less than 200 au.
+-money1 = plm_coins_light.mp3 plm_coins_shake.mp3
++money1 =
+
+ # You pick up money worth between 200 and 600 au.
+-money2 = plm_chain_light.mp3 plm_coins_pour.mp3
++money2 =
+
+ # You pick up money worth 600 au or more.
+-money3 = plm_coins_dump.mp3
++money3 =
+
+ # You (or a monster) drop something on the ground.
+-drop = plm_drop_boot.mp3
++drop =
+
+ # You gain (or regain) a level.
+-level = plm_levelup.mp3
++level =
+
+ # You successfully study a spell or prayer.
+-study = plm_book_pageturn.mp3
++study =
+
+ # You teleport or phase door.
+-teleport = plm_chimes_jangle.mp3
++teleport =
+
+ # You quaff a potion.
+-quaff = plm_bottle_clinks.mp3 plm_cork_pop.mp3 plm_cork_squeak.mp3
++quaff =
+
+ # You zap a rod.
+-zap_rod = plm_zap_rod.mp3
++zap_rod =
+
+ # You take a step. (unimplemented)
+ walk =
+
+ # You teleport someone else away.
+-tpother = plm_chimes_jangle.mp3
++tpother =
+
+ # You bump into a wall or door.
+-hitwall = plm_wood_thud.mp3
++hitwall =
+
+ # You eat something.
+-eat = plm_eat_bite.mp3
++eat =
+
+ # You successfully dig through something.
+-dig = plm_metal_clank.mp3
++dig =
+
+ # You open a door.
+-opendoor = plm_door_bolt.mp3 plm_door_creak.mp3 plm_door_dungeon.mp3 plm_door_entrance.mp3 plm_door_open.mp3 plm_door_opening.mp3 plm_door_rusty.mp3 plm_door_squeaky.mp3
++opendoor =
+
+ # You shut a door.
+-shutdoor = plm_bang_dumpster.mp3 plm_cabinet_shut.mp3 plm_close_hatch.mp3 plm_door_creakshut.mp3 plm_door_latch.mp3 plm_door_shut.mp3 plm_door_slam.mp3
++shutdoor =
+
+ # You teleport from a level (including via recall).
+-tplevel = sum_bell_crystal.mp3
++tplevel =
+
+ # Default "bell" sound for system messages.
+-bell = plm_jar_ding.mp3
++bell =
+
+ # You try to open something that's not a door.
+-nothing_to_open = plm_click_switch2.mp3 plm_door_knob.mp3
++nothing_to_open =
+
+ # You fail to pick a lock.
+-lockpick_fail = plm_click_dry.mp3 plm_click_switch.mp3 plm_click_wood.mp3 plm_door_echolock.mp3 plm_door_wooden.mp3
++lockpick_fail =
+
+ # You pick a lock.
+-lockpick = plm_break_wood.mp3 plm_cabinet_open.mp3 plm_chest_unlatch.mp3 plm_lock_case.mp3 plm_lock_distant.mp3 plm_open_case.mp3
++lockpick =
+
+ # You disarm a trap.
+-disarm = plm_bang_ceramic.mp3 plm_chest_latch.mp3 plm_click_switch3.mp3
++disarm =
+
+ # You go up stairs.
+-stairs_up = plm_floor_creak2.mp3
++stairs_up =
+
+ # You go down stairs.
+-stairs_down = plm_floor_creak.mp3
++stairs_down =
+
+ # You activate an artifact.
+-act_artifact = plm_aim_wand.mp3
++act_artifact =
+
+ # You use a staff.
+-use_staff = plm_use_staff.mp3
++use_staff =
+
+ # An object is destroyed.
+-destroy = plm_bang_metal.mp3 plm_break_canister.mp3 plm_break_glass.mp3 plm_break_glass2.mp3 plm_break_plates.mp3 plm_break_shatter.mp3 plm_break_smash.mp3 plm_glass_breaking.mp3 plm_glass_break.mp3 plm_glass_smashing.mp3
++destroy =
+
+ # You wield or take off something.
+-wield = plm_metal_sharpen.mp3
++wield =
+
+ # You wield a cursed item.
+-cursed = pls_man_oooh.mp3
++cursed =
+
+ # You notice something (generic notice)
+-notice = id_bad_hmm.mp3
++notice =
+
+ # You notice something about your equipment or inventory.
+-pseudo_id = id_good_hmm.mp3
++pseudo_id =
+
+ # You successfully cast a spell.
+-cast_spell = plm_spell1.mp3 plm_spell2.mp3 plm_spell3.mp3
++cast_spell =
+
+ # You successfully pray a prayer.
+-pray_prayer = sum_angel_song.mp3
++pray_prayer =
+
+ #
+ # Monster Sounds - combat
+ #
+
+ # A monster flees in terror.
+-flee = mco_creature_yelp.mp3
++flee =
+
+ # A monster is killed.
+-kill = mco_howl_croak.mp3 mco_howl_deep.mp3 mco_howl_distressed.mp3 mco_howl_high.mp3 mco_howl_long.mp3
++kill =
+
+ # A unique is killed.
+-kill_unique = sum_ghost_wail.mp3
++kill_unique =
+
+ # Morgoth, Lord of Darkness is killed.
+-kill_king = amb_guitar_chord.mp3
++kill_king =
+
+ # Attack - hit
+-mon_hit = mco_hit_whip.mp3
++mon_hit =
+
+ # Attack - touch
+-mon_touch = mco_click_vibra.mp3
++mon_touch =
+
+ # Attack - punch
+-mon_punch = mco_squish_snap.mp3
++mon_punch =
+
+ # Attack - kick
+-mon_kick = mco_rubber_thud.mp3
++mon_kick =
+
+ # Attack - claw
+-mon_claw = mco_ceramic_trill.mp3 mco_scurry_dry.mp3
++mon_claw =
+
+ # Attack - bite
+-mon_bite = mco_snarl_short.mp3 mco_bite_soft.mp3 mco_bite_munch.mp3 mco_bite_long.mp3 mco_bite_short.mp3 mco_bite_gnash.mp3 mco_bite_chomp.mp3 mco_bite_regular.mp3 mco_bite_small.mp3 mco_bite_dainty.mp3 mco_bite_hard.mp3 mco_bite_chew.mp3
++mon_bite =
+
+ # Attack - sting
+-mon_sting = mco_castanet_trill.mp3 mco_tube_hit.mp3
++mon_sting =
+
+ # Attack - butt
+-mon_butt = mco_cuica_rubbing.mp3 mco_thud_crash.mp3
++mon_butt =
+
+ # Attack - crush
+-mon_crush = mco_dino_low.mp3 mco_squish_hit.mp3
++mon_crush =
+
+ # Attack - engulf
+-mon_engulf = mco_dino_talk.mp3 mco_dino_yawn.mp3
++mon_engulf =
+
+ # Attack - crawl
+-mon_crawl = mco_card_shuffle.mp3 mco_shake_roll.mp3
++mon_crawl =
+
+ # Attack - drool
+-mon_drool = mco_creature_choking.mp3 mco_liquid_squirt.mp3
++mon_drool =
+
+ # Attack - spit
+-mon_spit = mco_attack_spray.mp3
++mon_spit =
+
+ # Attack - gaze
+-mon_gaze = mco_thoing_backwards.mp3
++mon_gaze =
+
+ # Attack - wail
+-mon_wail = mco_dino_low.mp3
++mon_wail =
+
+ # Attack - release spores
+-mon_spore = mco_dub_wobble.mp3 mco_spray_long.mp3
++mon_spore =
+
+ # Attack - beg for money
+-mon_beg = mco_man_mumble.mp3
++mon_beg =
+
+ # Attack - insult
+-mon_insult = mco_strange_thwoink.mp3
++mon_insult =
+
+ # Attack - moan
+-mon_moan = mco_strange_music.mp3
++mon_moan =
+
+ # Attack - shriek
+-mon_shriek = mco_mouse_squeaks.mp3
++mon_shriek =
+
+ # Spell - create traps
+-mon_create_trap = mco_thoing_deep.mp3
++mon_create_trap =
+
+ # Spell - cause fear
+-mon_cast_fear = mco_creature_groan.mp3 mco_dino_slur.mp3
++mon_cast_fear =
+
+ # Multiply (breed explosively)
+-multiply = mco_frog_trill.mp3
++multiply =
+
+ #
+ # Summons
+ #
+
+ # Summon one or more monsters.
+-summon_monster = sum_chime_jangle.mp3
++summon_monster =
+
+ # Summon angels.
+-summon_ainu = sum_angel_song.mp3
++summon_ainu =
+
+ # Summon undead.
+-summon_undead = sum_ghost_oooo.mp3
++summon_undead =
+
+ # Summon animals.
+-summon_animal = sum_lion_growl.mp3
++summon_animal =
+
+ # Summon spiders.
+-summon_spider = sum_piano_scrape.mp3
++summon_spider =
+
+ # Summon hounds.
+-summon_hound = sum_lion_growl.mp3
++summon_hound =
+
+ # Summon hydras.
+-summon_hydra = sum_piano_scrape.mp3
++summon_hydra =
+
+ # Summon demons.
+-summon_demon = sum_ghost_wail.mp3 sum_laugh_evil2.mp3
++summon_demon =
+
+ # Summon dragon.
+-summon_dragon = sum_piano_scrape.mp3
++summon_dragon =
+
+ # Summon greater undead.
+-summon_gr_undead = sum_ghost_moan.mp3
++summon_gr_undead =
+
+ # Summon greater dragons.
+-summon_gr_dragon = sum_gong_temple.mp3
++summon_gr_dragon =
+
+ # Summon greater demons.
+-summon_gr_demon = sum_ghost_moan.mp3
++summon_gr_demon =
+
+ # Summon Ringwraiths.
+-summon_ringwraith = sum_bell_hand.mp3
++summon_ringwraith =
+
+ # Summon uniques.
+-summon_unique = sum_bell_tone.mp3
++summon_unique =
+
+ #
+ # Breath weapons
+ #
+
+ # Breathe frost.
+-breathe_frost = mco_attack_breath.mp3
++breathe_frost =
+
+ # Breathe electricity.
+-breathe_elec = mco_attack_breath.mp3
++breathe_elec =
+
+ # Breathe acid.
+-breathe_acid = mco_attack_breath.mp3
++breathe_acid =
+
+ # Breathe gas.
+-breathe_gas = mco_attack_breath.mp3
++breathe_gas =
+
+ # Breathe fire.
+-breathe_fire = mco_attack_breath.mp3
++breathe_fire =
+
+ # Breathe confusion.
+-breathe_confusion = mco_attack_breath.mp3
++breathe_confusion =
+
+ # Breathe disenchantment.
+-breathe_disenchant = mco_attack_breath.mp3
++breathe_disenchant =
+
+ # Breathe chaos.
+-breathe_chaos = mco_attack_breath.mp3
++breathe_chaos =
+
+ # Breathe shards.
+-breathe_shards = mco_attack_breath.mp3
++breathe_shards =
+
+ # Breathe sound.
+-breathe_sound = mco_attack_breath.mp3
++breathe_sound =
+
+ # Breathe light.
+-breathe_light = mco_attack_breath.mp3
++breathe_light =
+
+ # Breathe darkness.
+-breathe_dark = mco_attack_breath.mp3
++breathe_dark =
+
+ # Breathe nether.
+-breathe_nether = mco_attack_breath.mp3
++breathe_nether =
+
+ # Breathe nexus.
+-breathe_nexus = mco_attack_breath.mp3
++breathe_nexus =
+
+ # Breathe time.
+-breathe_time = mco_attack_breath.mp3
++breathe_time =
+
+ # Breathe inertia.
+-breathe_inertia = mco_attack_breath.mp3
++breathe_inertia =
+
+ # Breathe gravity.
+-breathe_gravity = mco_attack_breath.mp3
++breathe_gravity =
+
+ # Breathe plasma.
+-breathe_plasma = mco_attack_breath.mp3
++breathe_plasma =
+
+ # Breathe force.
+-breathe_force = mco_attack_breath.mp3
++breathe_force =
+
+ # Breathe the elements (power dragon scale mail).
+-breathe_elements = mco_attack_breath.mp3
++breathe_elements =
+
+ #
+ # Identifying Items
+ #
+
+ # Identify a bad item (including bad ego items and artifacts).
+-identify_bad = id_bad_aww.mp3 id_bad_dang.mp3 id_bad_hmm.mp3 id_bad_hmph.mp3 id_bad_ohh.mp3
++identify_bad =
+
+ # Identify a good ego item.
+-identify_ego = id_ego_whoa.mp3 id_ego_woohoo.mp3 id_ego_yeah.mp3 id_ego_yeah2.mp3 id_ego_yes.mp3
++identify_ego =
+
+ # Identify a good artifact.
+-identify_art = id_good_hey.mp3 id_good_hey2.mp3 id_good_hmm.mp3 id_good_huh.mp3 id_good_ooh.mp3 id_good_ooo.mp3 id_good_wow.mp3
++identify_art =
+
diff --git a/libre/angband-libre/sound.patch b/libre/angband-libre/sound.patch
deleted file mode 100644
index e70373b72..000000000
--- a/libre/angband-libre/sound.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-# Removes nonfree sounds
-# Made by Israfel <israfel@lavabit.com>
-diff -Nur angband-v3.4.1/copying.txt angband-v3.4.1-libre/copying.txt
---- angband-v3.4.1/copying.txt 2012-10-19 15:47:23.000000000 -0400
-+++ angband-v3.4.1-libre/copying.txt 2013-06-29 20:07:03.250510548 -0400
-@@ -27,8 +27,6 @@
- of this file. Currently some of the tiles in the 64x64.png tilesheet were
- resized from tiles made by David Gervais for the 32x32 set.
-
-- * the sounds are freeware, whatever that means.
--
- * The font files are all by Leon Marrick and/or Sheldon Simms III and/or Nick
- McConnell, all of whom have agreed to their Angband work being released
- under the GPL.
-Binary files angband-v3.4.1/lib/xtra/sound/breath.wav and angband-v3.4.1-libre/lib/xtra/sound/breath.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/clunk.wav and angband-v3.4.1-libre/lib/xtra/sound/clunk.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/death.wav and angband-v3.4.1-libre/lib/xtra/sound/death.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/destroy.wav and angband-v3.4.1-libre/lib/xtra/sound/destroy.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/drop.wav and angband-v3.4.1-libre/lib/xtra/sound/drop.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/eat.wav and angband-v3.4.1-libre/lib/xtra/sound/eat.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/flee.wav and angband-v3.4.1-libre/lib/xtra/sound/flee.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/hallu.wav and angband-v3.4.1-libre/lib/xtra/sound/hallu.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/hit1.wav and angband-v3.4.1-libre/lib/xtra/sound/hit1.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/hit.wav and angband-v3.4.1-libre/lib/xtra/sound/hit.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/kill1.wav and angband-v3.4.1-libre/lib/xtra/sound/kill1.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/kill.wav and angband-v3.4.1-libre/lib/xtra/sound/kill.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/level.wav and angband-v3.4.1-libre/lib/xtra/sound/level.wav differ
-diff -Nur angband-v3.4.1/lib/xtra/sound/Makefile angband-v3.4.1-libre/lib/xtra/sound/Makefile
---- angband-v3.4.1/lib/xtra/sound/Makefile 2012-10-19 15:47:23.000000000 -0400
-+++ angband-v3.4.1-libre/lib/xtra/sound/Makefile 2013-06-29 20:05:33.734131933 -0400
-@@ -1,9 +1,6 @@
- MKPATH=../../../mk/
- include $(MKPATH)buildsys.mk
-
--DATA = sound.cfg breath.wav clunk.wav death.wav destroy.wav drop.wav eat.wav \
-- flee.wav hallu.wav hit.wav hit1.wav kill.wav kill1.wav level.wav \
-- miss.wav miss1.wav money.wav opendoor.wav shutdoor.wav thump.wav \
-- vomit.wav
-+DATA = sound.cfg
- PACKAGE = xtra/sound
-
-Binary files angband-v3.4.1/lib/xtra/sound/miss1.wav and angband-v3.4.1-libre/lib/xtra/sound/miss1.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/miss.wav and angband-v3.4.1-libre/lib/xtra/sound/miss.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/money.wav and angband-v3.4.1-libre/lib/xtra/sound/money.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/opendoor.wav and angband-v3.4.1-libre/lib/xtra/sound/opendoor.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/shutdoor.wav and angband-v3.4.1-libre/lib/xtra/sound/shutdoor.wav differ
-diff -Nur angband-v3.4.1/lib/xtra/sound/sound.cfg angband-v3.4.1-libre/lib/xtra/sound/sound.cfg
---- angband-v3.4.1/lib/xtra/sound/sound.cfg 2012-10-19 15:47:23.000000000 -0400
-+++ angband-v3.4.1-libre/lib/xtra/sound/sound.cfg 2013-06-29 20:06:41.344730009 -0400
-@@ -41,19 +41,19 @@
- #
-
- # The shopkeep bought a worthless item.
--store1 = money.wav
-+store1 =
-
- # The shopkeep paid too much for an item.
--store2 = money.wav
-+store2 =
-
- # The shopkeep got away with a good bargain.
--store3 = money.wav
-+store3 =
-
- # The shopkeep got away with a great bargain.
--store4 = money.wav
-+store4 =
-
- # You make a normal transaction (buying or selling).
--store5 = money.wav
-+store5 =
-
- # You enter a store.
- store_enter =
-@@ -69,7 +69,7 @@
- #
-
- # You succeed in a melee attack against a monster.
--hit = hit.wav drop.wav hit1.wav
-+hit =
-
- # It was a good hit!
- hit_good =
-@@ -87,7 +87,7 @@
- hit_hi_superb =
-
- # You miss a melee attack against a monster.
--miss = miss.wav miss1.wav
-+miss =
-
- # You fire a missile.
- shoot =
-@@ -99,7 +99,7 @@
- hitpoint_warn =
-
- # You die.
--death = death.wav
-+death =
-
- #
- # Player sounds - status changes
-@@ -200,10 +200,10 @@
- money3 =
-
- # You (or a monster) drop something on the ground.
--drop = clunk.wav
-+drop =
-
- # You gain (or regain) a level.
--level = level.wav
-+level =
-
- # You successfully study a spell or prayer.
- study =
-@@ -227,19 +227,19 @@
- hitwall =
-
- # You eat something.
--eat = eat.wav
-+eat =
-
- # You successfully dig through something.
--dig = thump.wav
-+dig =
-
- # You open a door.
--opendoor = opendoor.wav
-+opendoor =
-
- # You shut a door.
--shutdoor = shutdoor.wav
-+shutdoor =
-
- # You teleport from a level (including via recall).
--tplevel = teleport.wav
-+tplevel =
-
- # Default "bell" sound for system messages.
- bell =
-@@ -294,10 +294,10 @@
- #
-
- # A monster flees in terror.
--flee = flee.wav
-+flee =
-
- # A monster is killed.
--kill = kill.wav destroy.wav kill1.wav
-+kill =
-
- # A unique is killed.
- kill_unique =
-Binary files angband-v3.4.1/lib/xtra/sound/thump.wav and angband-v3.4.1-libre/lib/xtra/sound/thump.wav differ
-Binary files angband-v3.4.1/lib/xtra/sound/vomit.wav and angband-v3.4.1-libre/lib/xtra/sound/vomit.wav differ
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD
index cbfdf1135..81585ce70 100644
--- a/libre/avidemux-libre/PKGBUILD
+++ b/libre/avidemux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 189962 2013-07-11 23:40:28Z eric $
+# $Id: PKGBUILD 198769 2013-11-03 19:15:23Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,19 +6,19 @@ _pkgbase=avidemux
pkgbase=avidemux-libre
pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
pkgver=2.5.6
-pkgrel=7
+pkgrel=8
arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
makedepends=('cmake' 'libxslt' 'gtk2' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
'alsa-lib' 'lame' 'xvidcore' 'faad2' 'x264' 'libsamplerate' \
'opencore-amr' 'yasm' 'mesa' 'libvpx' 'libpulse' 'libva')
-options=('!makeflags')
+options=('!makeflags' '!emptydirs')
source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
sha1sums=('47205c236bf6a4435b9d4dd944493c7b7e2752f5')
build() {
- cd "${srcdir}/${_pkgbase}_${pkgver}"
+ cd ${_pkgbase}_${pkgver}
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release \
@@ -28,7 +28,6 @@ build() {
# plugin build expects libraries to be already installed; we fake a prefix
# in build/ by symlinking all libraries to build/lib/
- mkdir -p lib
cd lib
find ../avidemux -name '*.so*' | xargs ln -sft .
cd ../../plugins
@@ -56,12 +55,13 @@ package_avidemux-libre-cli() {
conflicts=('avidemux' 'avidemux-cli')
replaces=('avidemux' "avidemux-cli=$pkgver")
- cd "${srcdir}/${_pkgbase}_${pkgver}/build"
+ cd ${_pkgbase}_${pkgver}/build
make DESTDIR="${pkgdir}" install
cd "${srcdir}/${_pkgbase}_${pkgver}/plugins/build"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}"/usr/share/avidemux
+ rm "${pkgdir}"/usr/share/ADM_addons/avsfilter/{avsload.exe,pipe_source.dll}
rm "${pkgdir}"/usr/bin/avidemux2_{gtk,qt4}
rm "${pkgdir}"/usr/lib/*{_gtk,_qt4,Gtk,QT4}.so
rm "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/x264/*{Gtk,Qt}.so
@@ -83,7 +83,7 @@ package_avidemux-libre-gtk() {
provides=("avidemux-gtk=$pkgver")
install=avidemux.install
- cd "${srcdir}/${_pkgbase}_${pkgver}"
+ cd ${_pkgbase}_${pkgver}
install -D -m755 build/avidemux/avidemux2_gtk "${pkgdir}/usr/bin/avidemux2_gtk"
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
@@ -99,14 +99,14 @@ package_avidemux-libre-gtk() {
}
package_avidemux-libre-qt() {
- pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support"
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support"
depends=("avidemux-libre-cli=${pkgver}" 'qt4')
replaces=('avidemux-qt')
conflicts=('avidemux-qt')
provides=("avidemux-qt=$pkgver")
install=avidemux.install
- cd "${srcdir}/${_pkgbase}_${pkgver}"
+ cd ${_pkgbase}_${pkgver}
install -D -m755 build/avidemux/avidemux2_qt4 "${pkgdir}/usr/bin/avidemux2_qt4"
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoEncoder/{x264,xvid}
install -d "${pkgdir}"/usr/lib/ADM_plugins/videoFilter
@@ -120,6 +120,6 @@ package_avidemux-libre-qt() {
install -D -m644 build/po/*.qm "${pkgdir}/usr/share/avidemux/i18n"
install -D -m644 avidemux2.desktop "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
- sed -i 's/Name=avidemux2/Name=avidemux (QT)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
+ sed -i 's/Name=avidemux2/Name=avidemux (Qt)/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
sed -i 's/avidemux2_gtk/avidemux2_qt4/' "${pkgdir}/usr/share/applications/avidemux-qt.desktop"
}
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
index a6dea6acb..5496ecffb 100644
--- a/libre/avidemux-libre/PKGBUILD.WIP
+++ b/libre/avidemux-libre/PKGBUILD.WIP
@@ -5,7 +5,7 @@
_pkgbase=avidemux
pkgbase=avidemux-libre
pkgname=('avidemux-libre-cli' 'avidemux-libre-gtk' 'avidemux-libre-qt')
-pkgver=2.6.4
+pkgver=2.6.6
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'libxslt' 'gtk3' 'qt4' 'jack' 'libvorbis' 'sdl' 'libxv' \
'libvdpau' 'libdca' 'fribidi' 'glu')
options=('!makeflags' '!emptydirs')
source=(http://downloads.sourceforge.net/avidemux/avidemux_${pkgver}.tar.gz)
-sha1sums=('7ed55fd5cfb6cfa73ebb9058af72fa2e3c9717c3')
+sha1sums=('83ebf551746aac251d6e69feac5858cd0a307743')
#source=(http://www.avidemux.org/nightly/snapshot/source_r8810.tar.gz)
#sha1sums=('8c27d54e2b0655a8b8a3adfde1c0308ffedfec0c')
@@ -78,7 +78,7 @@ package_avidemux-libre-gtk() {
}
package_avidemux-libre-qt() {
- pkgdesc="A graphical tool to edit video (filter/re-encode/split) - QT GUI, without nonfree faac support"
+ pkgdesc="A graphical tool to edit video (filter/re-encode/split) - Qt GUI, without nonfree faac support"
depends=("avidemux-libre-cli=${pkgver}" 'qt4' 'x264' 'glu')
replaces=('avidemux-qt')
conflicts=('avidemux-qt')
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 60009bbe6..f4342a06d 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 102833 2013-12-21 18:31:51Z tpowa $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: M0Rf30
# Contributor: Samsagax <samsagax@gmail.com>
@@ -5,21 +6,21 @@
_pkgname=bbswitch
pkgname=bbswitch-libre
-pkgver=0.7
-_extramodules=extramodules-3.11-LIBRE # Don't forget to update bbswitch.install
-pkgrel=17
+pkgver=0.8
+_extramodules=extramodules-3.12-LIBRE # Don't forget to update bbswitch.install
+pkgrel=3
pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url=("http://github.com/Bumblebee-Project/bbswitch")
license=('GPL')
-depends=('linux-libre>=3.11' 'linux-libre<3.12')
-makedepends=('linux-libre-headers>=3.11' 'linux-libre-headers<3.12')
+depends=('linux-libre>=3.12' 'linux-libre<3.13')
+makedepends=('linux-libre-headers>=3.12' 'linux-libre-headers<3.13')
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
install=bbswitch.install
source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz")
-md5sums=('b9df5ea40109ef9766448a0577c798e6')
+md5sums=('5b116b31ace3604ddf9d1fc1f4bc5807')
build() {
cd ${srcdir}/${_pkgname}-${pkgver}
diff --git a/libre/bbswitch-libre/bbswitch.install b/libre/bbswitch-libre/bbswitch.install
index 089d52715..02ea911ab 100644
--- a/libre/bbswitch-libre/bbswitch.install
+++ b/libre/bbswitch-libre/bbswitch.install
@@ -1,5 +1,5 @@
post_install() {
- EXTRAMODULES='extramodules-3.11-LIBRE'
+ EXTRAMODULES='extramodules-3.12-LIBRE'
depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index 3559adcf4..eb98f4aa9 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99405 2013-10-28 11:43:52Z tredaelli $
+# $Id: PKGBUILD 103233 2013-12-30 17:04:09Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Andy Weidenbaum <archbaum@gmail.com>
_pkgname=bfgminer
pkgname=bfgminer-libre
-pkgver=3.4.0
+pkgver=3.9.0
pkgrel=1
pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, without nonfree OpenCL recommendation."
arch=('i686' 'x86_64' 'mips64el')
@@ -15,10 +15,9 @@ conflicts=$_pkgname
provides=$_pkgname=$pkgver
url='https://bitcointalk.org/index.php?topic=168174.0'
license=('GPL3')
-options=(!libtool)
source=(http://luke.dashjr.org/programs/bitcoin/files/$_pkgname/$pkgver/$_pkgname-$pkgver.tbz2
remove-dangerous-rpath.patch)
-sha256sums=('5367802f303917810236be092a09400c6e105efc348eadcf27bdcea526728d67'
+sha256sums=('4250ec5ccb0fd9bd8c6d35608b13b3e2f07857e46abc09b94514a2fd2af80f40'
'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
prepare() {
@@ -35,7 +34,9 @@ build() {
--enable-cpumining \
--enable-bfsb \
--enable-metabank \
- --enable-scrypt
+ --enable-scrypt \
+ --enable-opencl \
+ --with-udevrulesdir=/usr/lib/udev/rules.d
# --enable-knc (FS#33640)
make
}
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD
index 7e53ce898..74e81a52c 100644
--- a/libre/bitlbee-libre/PKGBUILD
+++ b/libre/bitlbee-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 200603 2013-11-29 19:17:58Z dreisner $
# Contributor: FUBAR <mrfubar@gmail.com>
# Contributor: simo <simo@archlinux.org>
@@ -10,8 +10,8 @@
_pkgname=bitlbee
pkgname=bitlbee-libre
-pkgver=3.2
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without Skype support'
url='http://www.bitlbee.org/'
license=('GPL')
@@ -22,12 +22,12 @@ optdepends=('libotr3: for OTR encryption support'
'xinetd: to run bitlbee through xinetd')
provides=$_pkgname=$pkgver
conflicts=$_pkgname
-replaces=("$_pkgname")
+replaces=$_pkgname
source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
'xinetd'
'bitlbee.tmpfiles')
-sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
- 'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5'
+ '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
'3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
backup=('etc/bitlbee/bitlbee.conf'
'etc/bitlbee/motd.txt'
diff --git a/libre/bitlbee-libre/bitlbee.install b/libre/bitlbee-libre/bitlbee.install
index aa5a81a70..c8a8f93a1 100644
--- a/libre/bitlbee-libre/bitlbee.install
+++ b/libre/bitlbee-libre/bitlbee.install
@@ -1,15 +1,22 @@
post_install() {
- getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
- getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
- systemd-tmpfiles --create bitlbee.conf
+ if ! getent group bitlbee &>/dev/null; then
+ groupadd -r -g 65 bitlbee >/dev/null
+ fi
+ if ! getent passwd bitlbee &>/dev/null; then
+ useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
+ fi
+ systemd-tmpfiles --create bitlbee.conf
}
post_upgrade() {
- post_install
+ post_install
}
post_remove() {
- getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
- getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
- true
+ if getent passwd bitlbee &>/dev/null; then
+ userdel bitlbee >/dev/null
+ fi
+ if getent group bitlbee &>/dev/null; then
+ groupdel bitlbee >/dev/null
+ fi
}
diff --git a/libre/bitlbee-libre/xinetd b/libre/bitlbee-libre/xinetd
index 68d5663b3..d671a8cfc 100644
--- a/libre/bitlbee-libre/xinetd
+++ b/libre/bitlbee-libre/xinetd
@@ -6,7 +6,7 @@ service bitlbee
wait = no
user = bitlbee
group = bitlbee
- server = /usr/bin/bitlbee
+ server = /usr/sbin/bitlbee
port = 6667
disable = yes
}
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD
index 337cabcda..9638a6135 100644
--- a/libre/blender-addon-luxrender/PKGBUILD
+++ b/libre/blender-addon-luxrender/PKGBUILD
@@ -1,16 +1,16 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
_srcname=luxrender
-_pkgver=1.3
+_pkgver=1.3.1
_bldname=blender
_bldver=2.69
_bldep=10
_pkgname=${_srcname::3}${_bldname::5}25
-_srcver=c9deae0646d0
+_srcver=ad6536b0dda8
pkgname=$_bldname-addon-$_srcname
pkgver=$_pkgver.v$_bldver
-pkgrel=1
+pkgrel=2
pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)"
arch=any
url=http://www.$_srcname.net/
@@ -24,7 +24,13 @@ provides=($_pkgname=$_pkgver)
conflicts=$_pkgname
replaces=$_pkgname
source=http://src.$_srcname.net/$_pkgname/archive/$_srcver.tar.bz2
-sha512sums=e8d93d5d9d73c1cd4f2008697bd9a8a125d08910aed3f4d3e4bcd290810d673aa663c327fc2cb7ac983cb3439a6996431c39bc3a2f0b6ed05ce5d0b8398ece92
+sha512sums=7bfd64abde07d9ad90d5e80a95f6fe5478ff65a8ff6965bd3a6c9671907a9a940affa5fb1a593884dc9eb6a5c967eaa1386a3225edc9cbbbb4c20c5d26198aa1
+
+prepare() {
+ sed -i "\|def find_luxrender_path[(][)]|,+9 d
+ s|find_luxrender_path[(][)]|'/usr/bin'|
+ " $srcdir/$_pkgname-$_srcver/src/$_srcname/__init__.py
+}
package() {
a=$srcdir/$_pkgname-$_srcver/src/$_srcname
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 359f2a6cf..fffb0926b 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=blender
epoch=10
_pkgver=2.69
-pkgrel=1
+pkgrel=3
_jpgver=1.5
_pyver=3.3
@@ -15,7 +15,7 @@ _spn=false
pkgname=$_pkgname$_spnname-libre
pkgver=$_pkgver
-pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_spndesc
+pkgdesc='Fully integrated 3D graphics creation suite, without nonfree cuda support'$_spndesc
arch=(
mips64el
x86_64
@@ -46,6 +46,11 @@ depends=(
optdepends=(
'bullet: for Rigid Bodies and Physics Simulation'
'xcftools: for import GIMP images to scene (pcr repo)'
+ 'povray-libre: for optional renderer with POV-Ray'
+ 'blender-addon-luxrender: for optional renderer and exporter with LuxRender'
+ 'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)'
+ 'blender-addon-ogre: for export to Ogre3D formats (pcr repo)'
+ 'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)'
)
makedepends=(
boost
@@ -87,10 +92,12 @@ prepare() {
s|open-source and free|free|
' release/text/readme.html
- mkdir -v build
+ msg 'fixing povray-libre path and desc'
+ sed -i "s|FILE_PATH',|FILE_PATH',\n default='/usr/bin/povray',|
+ s|both POV-Ray 3[.]7 and this script are beta|this script is beta|
+ " release/scripts/addons/render_povray/__init__.py
- msg 'Remove nonfree povray render support'
- rm -vr release/scripts/addons/render_povray
+ mkdir -v build
}
build() {
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 52fd8b73d..7c4e50950 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100069 2013-11-01 09:01:32Z jelle $
+# $Id: PKGBUILD 103187 2013-12-29 13:15:31Z jelle $
# Maintainer: jelle van der Waa <jelle@vdwaa.nl>
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -9,7 +9,7 @@
_pkgname=calibre
pkgname=calibre-libre
-pkgver=1.9.0
+pkgver=1.17.0
pkgrel=1
pkgdesc="Ebook management application, with unar support"
arch=('i686' 'x86_64' 'mips64el')
@@ -30,18 +30,18 @@ install=calibre.install
source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
'desktop_integration.patch'
'calibre-mount-helper')
-md5sums=('69e0262f0e06b7d6384c3a183a44d02f'
- '8353d1878c5a498b3e49eddef473605f'
+md5sums=('f154d941683e45c93c3f3b15570c0b30'
+ '95ca4eb3afa7c737c8371708a23bdad9'
'675cd87d41342119827ef706055491e7')
prepare(){
- cd "${srcdir}/${_pkgname}"
- #rm -rf src/{cherrypy,pyPdf}
- rm -rf src/cherrypy
- rm -rf resources/${pkgname}-portable.*
- sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
+cd "${srcdir}/${_pkgname}"
+#rm -rf src/{cherrypy,pyPdf}
+rm -rf src/cherrypy
+rm -rf resources/${pkgname}-portable.*
+sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py
- # Fix for calibre-0.8.58
+# Fix for calibre-0.8.58
sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py
sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \
@@ -55,7 +55,7 @@ build() {
# LANG='en_US.UTF-8' python2 setup.py resources
# Don't build translations since building them is broken badly
-#LANG='en_US.UTF-8' python2 setup.py translations
+ #LANG='en_US.UTF-8' python2 setup.py translations
}
package() {
diff --git a/libre/calibre-libre/desktop_integration.patch b/libre/calibre-libre/desktop_integration.patch
index 2c6f07672..9b20820e6 100644
--- a/libre/calibre-libre/desktop_integration.patch
+++ b/libre/calibre-libre/desktop_integration.patch
@@ -1,6 +1,7 @@
---- a/src/calibre/linux.py 2013-03-01 05:49:28.000000000 +0100
-+++ b/src/calibre/linux.py 2013-03-03 14:53:05.000000000 +0100
-@@ -447,19 +447,6 @@
+diff -aur calibre/src/calibre/linux.py calibre.new/src/calibre/linux.py
+--- calibre/src/calibre/linux.py 2013-12-13 03:47:23.000000000 +0100
++++ calibre.new/src/calibre/linux.py 2013-12-17 20:11:58.319040313 +0100
+@@ -451,18 +451,6 @@
self.setup_completion()
if islinux or isbsd:
self.setup_desktop_integration()
@@ -16,11 +17,10 @@
- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
- if os.stat(config_dir).st_uid == 0:
- os.rmdir(config_dir)
--
+
if warn is None and self.warnings:
self.info('There were %d warnings'%len(self.warnings))
- for args, kwargs in self.warnings:
-@@ -508,7 +495,7 @@
+@@ -513,7 +501,7 @@
if isnetbsd:
f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
else:
@@ -29,7 +29,7 @@
if not os.path.exists(os.path.dirname(f)):
os.makedirs(os.path.dirname(f))
if zsh.dest:
-@@ -651,63 +638,39 @@
+@@ -657,71 +645,45 @@
with TemporaryDirectory() as tdir, CurrentDir(tdir), \
PreserveMIMEDefaults():
@@ -57,11 +57,15 @@
- render_img('viewer.png', 'calibre-viewer.png')
- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
- self.icon_resources.append(('apps', 'calibre-viewer', '128'))
+- render_img('tweak.png', 'calibre-ebook-edit.png')
+- cc('xdg-icon-resource install --size 128 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
+- self.icon_resources.append(('apps', 'calibre-ebook-edit', '128'))
+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
+ os.mkdir(dir)
+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
++ render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png'))
mimetypes = set([])
for x in all_input_formats():
@@ -73,6 +77,7 @@
def write_mimetypes(f):
f.write('MimeType=%s;\n'%';'.join(mimetypes))
+ from calibre.ebooks.oeb.polish.main import SUPPORTED
- f = open('calibre-lrfviewer.desktop', 'wb')
+ dir = os.path.join(self.opts.staging_sharedir,'../applications')
+ os.mkdir(dir)
@@ -83,6 +88,11 @@
+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
f.write(EVIEWER)
write_mimetypes(f)
+- f = open('calibre-ebook-edit.desktop', 'wb')
++ f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
+ f.write(ETWEAK)
+ mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
+ f.write('MimeType=%s;\n'%';'.join(mt))
f.close()
- f = open('calibre-gui.desktop', 'wb')
+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
@@ -90,7 +100,7 @@
write_mimetypes(f)
f.close()
- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
-- 'calibre-ebook-viewer.desktop')
+- 'calibre-ebook-viewer.desktop', 'calibre-ebook-edit.desktop')
- for x in des:
- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
- cc(' '.join(cmd), shell=True)
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index 75cf2c1bd..1f8992289 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -5,8 +5,8 @@
_pkgname=cdrkit
pkgname=cdrkit-libre
pkgver=1.1.11
-pkgrel=3
-pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction (without nonfree apple_driver utility)"
+pkgrel=3.2
+pkgdesc="Suite of programs for CD/DVD recording, ISO image creation, and audio CD extraction, without nonfree apple_driver utility"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdrkit.org/"
license=('GPL2')
@@ -24,7 +24,7 @@ prepare() {
sed -i "s#sbin#bin#" netscsid/CMakeLists.txt
# Remove nonfree apple_driver utility
- rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{c,8}}
+ rm -rvf {doc/genisoimage/README.hfs_boot,genisoimage/apple_driver.{8,c}}
}
build() {
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 22a92003d..82baa8f5d 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98608 2013-10-15 14:50:08Z alucryd $
+# $Id: PKGBUILD 101521 2013-11-26 23:05:03Z alucryd $
# Maintainer: Maxime Gauduin <alucryd@gmail.com>
# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: BlackEagle <ike.devolder@gmail.com>
@@ -9,7 +9,7 @@
_pkgname=clementine
pkgname=clementine-libre
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=1
pkgdesc="A music player and library organizer, without nonfree artwork and spotify support"
url="http://www.clementine-player.org/"
@@ -29,8 +29,8 @@ install=clementine.install
source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
'remove-nonfree-artwork-and-spotify.patch'
'moognu.png')
-sha256sums=('563d00da4e893f7b1966ed137bcab28042151e31ea561cb7076047d3cad96f72'
- 'e3b0ba3649d6c66ef002ce281949ab6febf2481893245b4e30c6f11ae6f5b463'
+sha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e'
+ '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db'
'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
prepare() {
diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
index 957ddc7e7..38bac21bf 100644
--- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
+++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch
@@ -11,7 +11,7 @@ index a349f59..c418e0b 100644
@"com.apple.QuickTimePlayerX",
@"com.apple.quicktimeplayer",
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ba5a8a..986351b 100644
+index 47f1693..986351b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,6 @@ include(cmake/Summary.cmake)
@@ -60,7 +60,7 @@ index 8ba5a8a..986351b 100644
-if(NOT HAVE_SPOTIFY_BLOB AND NOT QCA_FOUND)
- message(FATAL_ERROR "Either QCA must be available or the non-GPL Spotify "
- "code must be compiled in")
--elif(QCA_FOUND)
+-elseif(QCA_FOUND)
- set(HAVE_SPOTIFY_DOWNLOADER ON)
-endif()
-
@@ -158,7 +158,7 @@ index e054619..3568a6f 100755
for plugin in QT_PLUGINS:
FixPlugin(FindQtPlugin(plugin), os.path.dirname(plugin))
diff --git a/dist/windows/clementine.nsi b/dist/windows/clementine.nsi
-index 82c0fc1..086bdc7 100644
+index 038a60b..1d29a9e 100644
--- a/dist/windows/clementine.nsi
+++ b/dist/windows/clementine.nsi
@@ -97,9 +97,6 @@ Section "Delete old files" oldfiles
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index b95e820b7..22835bff0 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198470 2013-10-30 15:04:07Z andyrtr $
+# $Id: PKGBUILD 202372 2013-12-21 13:31:03Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters-libre
_pkgname=cups-filters
-pkgver=1.0.41
+pkgver=1.0.43
pkgrel=1
pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,10 +17,10 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv
backup=(etc/fonts/conf.d/99pdftoopvp.conf
etc/cups/cups-browsed.conf)
source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz)
-md5sums=('9065084c7601ce1721cd6f34ca0a4337')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
+provides=("${_pkgname}=${pkgver}" 'foomatic-filters')
+replaces=("${_pkgname}" 'foomatic-filters')
+conflicts=("${_pkgname}" 'foomatic-filters')
+md5sums=('d1dbd200845db729bf18817f3a49c2c1')
build() {
cd $_pkgname-$pkgver
@@ -36,7 +36,6 @@ build() {
check() {
cd $_pkgname-$pkgver
- #make -j1 -k check
make check
}
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
index 522204000..c08273344 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,14 +1,14 @@
# vim:set ft=sh:
-# $Id: PKGBUILD 99027 2013-10-22 19:14:23Z idevolder $
+# $Id: PKGBUILD 103163 2013-12-28 11:01:37Z idevolder $
# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
# Contributor: (sirocco AT ngs.ru)
_pkgbase=doublecmd
pkgbase=doublecmd-libre
pkgname=('doublecmd-libre-gtk2' 'doublecmd-libre-qt')
-pkgver=0.5.7
+pkgver=0.5.8
_helpver=0.5.5
-pkgrel=2
+pkgrel=1
url="http://doublecmd.sourceforge.net/"
arch=('i686' 'x86_64')
license=('GPL')
@@ -24,8 +24,6 @@ source=(
"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-$pkgver-src.tar.gz"
"http://downloads.sourceforge.net/project/$_pkgbase/Double%20Commander%20Source/$_pkgbase-help-$_helpver-src.tar.gz"
)
-sha256sums=('8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343'
- '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
build() {
cp -a $_pkgbase-$pkgver $_pkgbase-gtk
@@ -76,3 +74,6 @@ package_doublecmd-libre-qt() {
cd "$srcdir/$_pkgbase-help-$_helpver"
cp -a * "$pkgdir/usr/share/$_pkgbase/doc/"
}
+
+sha256sums=('bfa85693b6cc06b7fd28ec8bd443ad9fb9d79d27a541e4f4d54bb9da2fb052ea'
+ '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf')
diff --git a/libre/dvdrtools-libre/PKGBUILD b/libre/dvdrtools-libre/PKGBUILD
new file mode 100644
index 000000000..cf5ce1f4d
--- /dev/null
+++ b/libre/dvdrtools-libre/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
+# Maintainer: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: dorphell <dorphell@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=dvdrtools
+pkgname=dvdrtools-libre
+pkgver=0.3.1
+pkgrel=3.2
+pkgdesc="A fork of cdrtools, with the primary goal of supporting writable DVD drives, without nonfree apple_driver utility"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://savannah.nongnu.org/projects/dvdrtools/"
+license=('GPL2')
+depends=('file' 'bash')
+makedepends=('transcode')
+optdepends=('transcode: video/DVD ripper and encoder for the terminal/console')
+provides=("$_pkgname=$pkgver" 'cdrkit')
+conflicts=("$_pkgname" 'cdrkit')
+replaces=("$_pkgname")
+source=(ftp://ftp.archlinux.org/other/dvdrtools/$_pkgname-$pkgver.tar.gz)
+md5sums=('5707b7e877b853e258cd738938833006')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ # Remove nonfree apple_driver utility
+ rm -rvf {mkisofs/README.hfs_boot,apple_driver{.8,.c,.mk,_man.mk}}
+}
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ ./configure --prefix=/usr --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # Make symlinks for cdrtools compatibility
+ ln -s dvdrecord $pkgdir/usr/bin/cdrecord
+ ln -s dvdrecord $pkgdir/usr/bin/wodim
+ ln -s mkisofs $pkgdir/usr/bin/genisoimage
+ ln -s mkisofs $pkgdir/usr/bin/mkhybrid
+ ln -s readcd $pkgdir/usr/bin/readom
+
+ ln -s dvdrecord.1.gz $pkgdir/usr/share/man/man1/cdrecord.1.gz
+ ln -s dvdrecord.1.gz $pkgdir/usr/share/man/man1/wodim.1.gz
+ ln -s mkisofs.8.gz $pkgdir/usr/share/man/man8/genisoimage.8.gz
+ ln -s mkisofs.8.gz $pkgdir/usr/share/man/man8/mkhybrid.8.gz
+ ln -s readcd.1.gz $pkgdir/usr/share/man/man1/readom.1.gz
+}
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 51e87b705..e16fda010 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180827 2013-03-26 13:29:04Z schiv $
+# $Id: PKGBUILD 199462 2013-11-13 08:34:51Z schiv $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -7,7 +7,7 @@
_pkgname=ecasound
pkgname=ecasound-libre
pkgver=2.9.0
-pkgrel=3
+pkgrel=4
pkgdesc="A software package designed for multitrack audio processing, without nonfree faac recommendation"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.eca.cx/ecasound/"
@@ -25,7 +25,6 @@ optdepends=('python2: ecamonitor, ECI API'
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-options=('!libtool')
source=("http://ecasound.seul.org/download/$_pkgname-$pkgver.tar.gz"
'ruby2.patch')
md5sums=('05e7d4664cdf4c7a138c098e9506a551'
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
index b33bb486f..8f1c2a8b6 100644
--- a/libre/epiphany-libre/PKGBUILD
+++ b/libre/epiphany-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196579 2013-10-15 14:29:30Z jgc $
+# $Id: PKGBUILD 201443 2013-12-11 19:00:11Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=epiphany
pkgname=epiphany-libre
-pkgver=3.10.1
+pkgver=3.10.3
pkgrel=1
install=epiphany.install
pkgdesc="A GNOME web browser based on the WebKit rendering engine, with DuckDuckGo HTML support"
@@ -16,11 +16,11 @@ makedepends=('intltool' 'itstool' 'docbook-xml' 'startup-notification' 'gobject-
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
groups=('gnome')
url="http://www.gnome.org/projects/epiphany/"
source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('86c680b4b12432b18cbb8e7dec25b26586a536cb5842027db2e6986f416ddfad')
+sha256sums=('c18235ecceaa9c76e7d90d370861cb2bba45019e1e14391a00dac3d2e94a0db7')
prepare() {
cd $_pkgname-$pkgver
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index 893b75e02..ba9f537a6 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 196556 2013-10-15 13:44:19Z heftig $
+# $Id: PKGBUILD 199384 2013-11-11 21:55:12Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
_pkgname=file-roller
pkgname=file-roller-libre
-pkgver=3.10.1
+pkgver=3.10.2.1
pkgrel=1
pkgdesc="Create and modify archives, with unar support included and nonfree unace recommendation removed"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,11 +16,11 @@ groups=('gnome-extra')
provides=("$_pkgname=$pkgver")
replaces=("$_pkgname")
conflicts=("$_pkgname")
-options=('!libtool' '!emptydirs')
+options=('!emptydirs')
install=file-roller.install
url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('7b180bcf98eaf19835926c694ec5262a421f3a0271f030ca338ccf7f6846a80f')
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790')
prepare() {
cd $_pkgname-$pkgver
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index de9ebb452..a4a17b4c8 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,19 +1,22 @@
# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
# Maintainer : Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
-_GRUB_BZR_REV="5086"
+_pkgver="2.00"
+_GRUB_GIT_COMMIT="5ae5c54c7e5cb048cdd78a53181cee0da698a953"
-## grub-extras lua and gpxe fail to build with grub bzr rev 5043
+## grub-extras gpxe is not needed
[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
-pkgname=grub
+pkgname="grub"
pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
-pkgver=2.00.${_GRUB_BZR_REV}
-pkgrel=1
+pkgver=2.00.1282.g5ae5c54
+pkgrel=1.3
+epoch="1"
url="https://www.gnu.org/software/grub/"
arch=('x86_64' 'i686')
license=('GPL3')
@@ -25,8 +28,9 @@ conflicts=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}" 'grub-legacy')
replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
-makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
- 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr' 'rsync')
+makedepends=('git' 'bzr' 'rsync' 'xz' 'freetype2' 'ttf-dejavu'
+ 'python2' 'autogen' 'texinfo' 'help2man'
+ 'gettext' 'device-mapper' 'fuse')
depends=('sh' 'xz' 'gettext' 'device-mapper')
optdepends=('freetype2: For grub-mkfont usage'
'fuse: For grub-mount usage'
@@ -37,52 +41,94 @@ optdepends=('freetype2: For grub-mkfont usage'
'mtools: For grub-mkrescue FAT FS support')
# source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
-source=("grub-${pkgver}::bzr+bzr://bzr.savannah.gnu.org/grub/trunk/grub/#revision=${_GRUB_BZR_REV}"
+source=("grub-${_pkgver}::git+git://git.sv.gnu.org/grub.git#commit=${_GRUB_GIT_COMMIT}"
+ 'http://unifoundry.com/unifont-5.1.20080820.bdf.gz'
'parabola_grub_mkconfig_fixes.patch'
'60_memtest86+'
- 'grub.default'
- 'grub-2.00-mkinitcpio-0.15.patch'
- 'grub-2.00.5086-fix-lvm-parsing.patch')
+ 'grub.default')
+
md5sums=('SKIP'
- 'b3068b52b6f1dcd2850b5c7585bb185f'
+ '6b8263ceccef33bd633aa019d74b7943'
+ 'aec37e36ba7806217be33d12a7eed062'
'be55eabc102f2c60b38ed35c203686d6'
- '52d374e0194e3f2e39ff7c92ecd58a6c'
- 'd25d2dcf8ba708dcf768fcaea799f59c'
- 'b2bafd4aeb098580754e71991ab7eed8'
+ 'a9ef0067f6824944fa1ae22a5162d7d4'
+ 'SKIP'
'SKIP'
'SKIP')
-for _DIR_ in 915resolution ntldr-img ; do
+for _DIR_ in 915resolution lua ntldr-img ; do
source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=")
done
+pkgver() {
+ cd "${srcdir}/grub-${_pkgver}/"
+ echo "$(git describe --tags)" | sed -e 's|-|\.|g'
+}
+
+prepare() {
+
+ cd "${srcdir}/grub-${_pkgver}/"
+
+ msg "Patch to enable grub-mkconfig detect Parabola kernels and initramfs"
+ patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
+
+ msg "Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme"
+ sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${_pkgver}/configure.ac"
+
+ msg "Fix mkinitcpio 'rw' FS#36275"
+ sed 's| ro | rw |g' -i "${srcdir}/grub-${_pkgver}/util/grub.d/10_linux.in"
+
+ msg "autogen.sh requires python (2/3). since bzr is in makedepends, use python2 and no need to pull python3"
+ sed 's|python |python2 |g' -i "${srcdir}/grub-${_pkgver}/autogen.sh"
+
+ msg "Pull in latest language files"
+ ./linguas.sh
+ echo
+
+ msg "Remove non working langs which need LC_ALL=C.UTF-8"
+ sed -e 's#en@cyrillic en@greek##g' -i "${srcdir}/grub-${_pkgver}/po/LINGUAS"
+
+ msg "Avoid problem with unifont during compile of grub, http://savannah.gnu.org/bugs/?40330 and https://bugs.archlinux.org/task/37847"
+ cp "${srcdir}/unifont-5.1.20080820.bdf" "${srcdir}/grub-${_pkgver}/unifont.bdf"
+
+ msg "Fix freetype header path file"
+ sed 's|freetype/ftsynth[.]h|freetype2/ftsynth.h|g' -i "${srcdir}/grub-${_pkgver}/util/grub-"{gen-{asciih,widthspec},mkfont}.c
+}
_build_grub-common_and_bios() {
- ## Copy the source for building the common/bios package
- cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios"
- cd "${srcdir}/grub-${pkgver}-bios/"
+ msg "Set ARCH dependent variables for bios build"
+ if [[ "${CARCH}" == 'x86_64' ]]; then
+ _EFIEMU="--enable-efiemu"
+ else
+ _EFIEMU="--disable-efiemu"
+ fi
- ## Add the grub-extra sources
- export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/"
+ msg "Copy the source for building the bios package"
+ cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-bios"
+ cd "${srcdir}/grub-${_pkgver}-bios/"
- install -d "${srcdir}/grub-${pkgver}-bios/grub-extras"
+ msg "Add the grub-extra sources for bios build"
+ install -d "${srcdir}/grub-${_pkgver}-bios/grub-extras"
for _DIR_ in 915resolution ntldr-img ; do
- cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}"
+ cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-bios/grub-extras/${_DIR_}"
done
+ export GRUB_CONTRIB="${srcdir}/grub-bios/grub-extras/"
- ## Unset all compiler FLAGS for bios build
+ msg "Unset all compiler FLAGS for bios build"
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- ## Start the actual build process
- cd "${srcdir}/grub-${pkgver}-bios/"
+ cd "${srcdir}/grub-${_pkgver}-bios/"
+
+ msg "Run autogen.sh for bios build"
./autogen.sh
echo
+ msg "Run ./configure for bios build"
./configure \
--with-platform="pc" \
--target="i386" \
@@ -91,6 +137,7 @@ _build_grub-common_and_bios() {
--enable-nls \
--enable-device-mapper \
--enable-cache-stats \
+ --enable-boot-time \
--enable-grub-mkfont \
--enable-grub-mount \
--prefix="/usr" \
@@ -103,37 +150,42 @@ _build_grub-common_and_bios() {
--program-prefix="" \
--with-bootdir="/boot" \
--with-grubdir="grub" \
+ --disable-silent-rules \
--disable-werror
echo
+ msg "Run make for bios build"
make
echo
}
_build_grub-efi() {
- ## Copy the source for building the efi package
- cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi"
- cd "${srcdir}/grub-${pkgver}-efi/"
-
- # export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/grub-extras/"
+ msg "Copy the source for building the efi package"
+ cp -r "${srcdir}/grub-${_pkgver}" "${srcdir}/grub-${_pkgver}-efi"
+ cd "${srcdir}/grub-${_pkgver}-efi/"
- # install -d "${srcdir}/grub-${pkgver}-efi/grub-extras/"
- # for _DIR_ in lua gpxe ; do
- # cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${pkgver}-bios/grub-extras/${_DIR_}"
- # done
+ msg "Add the grub-extra sources for efi build"
+ install -d "${srcdir}/grub-${_pkgver}-efi/grub-extras/"
+ for _DIR_ in lua ; do
+ cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-${_pkgver}-efi/grub-extras/${_DIR_}"
+ done
+ # export GRUB_CONTRIB="${srcdir}/grub-efi/grub-extras/"
- ## Unset all compiler FLAGS for efi build
+ msg "Unset all compiler FLAGS for efi build"
unset CFLAGS
unset CPPFLAGS
unset CXXFLAGS
unset LDFLAGS
unset MAKEFLAGS
- cd "${srcdir}/grub-${pkgver}-efi/"
+ cd "${srcdir}/grub-${_pkgver}-efi/"
+
+ msg "Run autogen.sh for efi build"
./autogen.sh
echo
+ msg "Run ./configure for efi build"
./configure \
--with-platform="efi" \
--target="${_EFI_ARCH}" \
@@ -142,6 +194,7 @@ _build_grub-efi() {
--enable-nls \
--enable-device-mapper \
--enable-cache-stats \
+ --enable-boot-time \
--enable-grub-mkfont \
--enable-grub-mount \
--prefix="/usr" \
@@ -154,97 +207,78 @@ _build_grub-efi() {
--program-prefix="" \
--with-bootdir="/boot" \
--with-grubdir="grub" \
+ --disable-silent-rules \
--disable-werror
echo
+ msg "Run make for efi build"
make
echo
}
-prepare() {
-
- ## Set ARCH dependent variables
- if [[ "${CARCH}" == 'x86_64' ]]; then
- _EFIEMU="--enable-efiemu"
- else
- _EFIEMU="--disable-efiemu"
- fi
-
- cd "${srcdir}/grub-${pkgver}/"
-
- ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
- patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
- echo
-
- ## fix 10_linux
- patch -Np0 -i "${srcdir}/grub-2.00-mkinitcpio-0.15.patch"
- patch -Np1 -i "${srcdir}/grub-2.00.5086-fix-lvm-parsing.patch"
-
- ## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
- sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
+build() {
- ## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme
- sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
+ cd "${srcdir}/grub-${_pkgver}/"
- ## Requires python2
- # sed 's|python |python2 |g' -i "${srcdir}/grub-${pkgver}/autogen.sh"
-
- ## pull in language files
- ./linguas.sh
-
-}
-
-build() {
-
- cd "${srcdir}/grub-${pkgver}/"
-
- # remove not working langs which need LC_ALL=C.UTF-8
- sed -i -e 's#en@cyrillic en@greek##g' po/LINGUAS
+ msg "Build grub bios stuff"
_build_grub-common_and_bios
echo
+ msg "Build grub efi stuff"
_build_grub-efi
echo
-
+
}
_package_grub-common_and_bios() {
- cd "${srcdir}/grub-${pkgver}-bios/"
+ cd "${srcdir}/grub-${_pkgver}-bios/"
+
+ msg "Run make install for bios build"
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
echo
- ## remove gdb debugging related files
+ msg "Remove gdb debugging related files for bios build"
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
- ## Install extra /etc/grub.d/ files
+ msg "Install extra /etc/grub.d/ files"
install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
- ## Install /etc/default/grub (used by grub-mkconfig)
+ msg "Install /etc/default/grub (used by grub-mkconfig)"
install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+ msg "Add msdos.mod symlink"
+ ln -s "msdospart.mod" "${pkgdir}/usr/lib/grub/i386-pc/msdos.mod" || true
+
}
_package_grub-efi() {
- cd "${srcdir}/grub-${pkgver}-efi/"
+ cd "${srcdir}/grub-${_pkgver}-efi/"
+
+ msg "Run make install for efi build"
make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
echo
- ## remove gdb debugging related files
+ msg "Remove gdb debugging related files for efi build"
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+ msg "Add msdos.mod symlink"
+ ln -s "msdospart.mod" "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi/msdos.mod" || true
+
}
package() {
+ msg "Package grub efi stuff"
_package_grub-efi
+ msg "Package grub bios stuff"
_package_grub-common_and_bios
}
diff --git a/libre/grub/grub.cfg b/libre/grub/grub.cfg
deleted file mode 100644
index 0d91ff6bc..000000000
--- a/libre/grub/grub.cfg
+++ /dev/null
@@ -1,139 +0,0 @@
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by grub-mkconfig using templates
-# from /etc/grub.d and settings from /etc/default/grub
-#
-
-### BEGIN /etc/grub.d/00_header ###
-insmod part_gpt
-insmod part_msdos
-if [ -s $prefix/grubenv ]; then
- load_env
-fi
-set default="0"
-
-if [ x"${feature_menuentry_id}" = xy ]; then
- menuentry_id_option="--id"
-else
- menuentry_id_option=""
-fi
-
-export menuentry_id_option
-
-if [ "${prev_saved_entry}" ]; then
- set saved_entry="${prev_saved_entry}"
- save_env saved_entry
- set prev_saved_entry=
- save_env prev_saved_entry
- set boot_once=true
-fi
-
-function savedefault {
- if [ -z "${boot_once}" ]; then
- saved_entry="${chosen}"
- save_env saved_entry
- fi
-}
-
-function load_video {
- if [ x$feature_all_video_module = xy ]; then
- insmod all_video
- else
- insmod efi_gop
- insmod efi_uga
- insmod ieee1275_fb
- insmod vbe
- insmod vga
- insmod video_bochs
- insmod video_cirrus
- fi
-}
-
-if [ x$feature_default_font_path = xy ] ; then
- font=unicode
-else
-insmod part_msdos
-insmod ext2
-set root='hd0,msdos5'
-if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
-else
- search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
-fi
- font="/usr/share/grub/unicode.pf2"
-fi
-
-if loadfont $font ; then
- set gfxmode=auto
- load_video
- insmod gfxterm
- set locale_dir=$prefix/locale
- set lang=en_US
- insmod gettext
-fi
-terminal_input console
-terminal_output gfxterm
-set timeout=5
-### END /etc/grub.d/00_header ###
-
-### BEGIN /etc/grub.d/10_linux ###
-menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-true-ad4103fa-d940-47ca-8506-301d8071d467' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos5'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
- else
- search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
- fi
- echo 'Loading Linux libre core repo kernel ...'
- linux /boot/vmlinuz-linux-libre root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet
- echo 'Loading initial ramdisk ...'
- initrd /boot/initramfs-linux-libre.img
-}
-menuentry 'Parabola GNU/Linux-libre, with Linux libre kernel (Fallback initramfs)' --class parabola --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-core repo kernel-fallback-ad4103fa-d940-47ca-8506-301d8071d467' {
- load_video
- set gfxpayload=keep
- insmod gzio
- insmod part_msdos
- insmod ext2
- set root='hd0,msdos5'
- if [ x$feature_platform_search_hint = xy ]; then
- search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos5 --hint-efi=hd0,msdos5 --hint-baremetal=ahci0,msdos5 ad4103fa-d940-47ca-8506-301d8071d467
- else
- search --no-floppy --fs-uuid --set=root ad4103fa-d940-47ca-8506-301d8071d467
- fi
- echo 'Loading Linux libre core repo kernel ...'
- linux /boot/vmlinuz-linux-libre root=UUID=ad4103fa-d940-47ca-8506-301d8071d467 ro quiet
- echo 'Loading initial ramdisk ...'
- initrd /boot/initramfs-linux-libre-fallback.img
-}
-
-### END /etc/grub.d/10_linux ###
-
-### BEGIN /etc/grub.d/20_linux_xen ###
-### END /etc/grub.d/20_linux_xen ###
-
-### BEGIN /etc/grub.d/20_memtest86+ ###
-### END /etc/grub.d/20_memtest86+ ###
-
-### BEGIN /etc/grub.d/30_os-prober ###
-### END /etc/grub.d/30_os-prober ###
-
-### BEGIN /etc/grub.d/40_custom ###
-# This file provides an easy way to add custom menu entries. Simply type the
-# menu entries you want to add after this comment. Be careful not to change
-# the 'exec tail' line above.
-### END /etc/grub.d/40_custom ###
-
-### BEGIN /etc/grub.d/41_custom ###
-if [ -f ${config_directory}/custom.cfg ]; then
- source ${config_directory}/custom.cfg
-elif [ -z "${config_directory}" -a -f $prefix/custom.cfg ]; then
- source $prefix/custom.cfg;
-fi
-### END /etc/grub.d/41_custom ###
diff --git a/libre/grub/grub.default b/libre/grub/grub.default
index 8455b67dd..38bb4a57f 100644
--- a/libre/grub/grub.default
+++ b/libre/grub/grub.default
@@ -45,3 +45,6 @@ GRUB_COLOR_HIGHLIGHT="white/magenta"
#GRUB_INIT_TUNE="480 440 1"
#GRUB_SAVEDEFAULT="true"
+
+# Disable advanced submenu, due 10_linux script file generates submenu without closing bracket with grub-mkconfig
+GRUB_DISABLE_SUBMENU="y"
diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch
index fbcca19ec..6e3a524f0 100644
--- a/libre/grub/parabola_grub_mkconfig_fixes.patch
+++ b/libre/grub/parabola_grub_mkconfig_fixes.patch
@@ -1,8 +1,8 @@
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 8decc1d..170047f 100644
+index 016ee82..2cdbdd8 100644
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
-@@ -212,6 +212,8 @@ export GRUB_DEFAULT \
+@@ -214,6 +214,8 @@ export GRUB_DEFAULT \
GRUB_THEME \
GRUB_GFXPAYLOAD_LINUX \
GRUB_DISABLE_OS_PROBER \
@@ -12,7 +12,7 @@ index 8decc1d..170047f 100644
GRUB_SAVEDEFAULT \
GRUB_ENABLE_CRYPTODISK \
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 2c4bb0a..c7120d2 100644
+index d2e7252..8259f45 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -125,6 +125,14 @@ cat <<EOF
@@ -31,10 +31,10 @@ index 2c4bb0a..c7120d2 100644
gfxterm=0;
for x in ${GRUB_TERMINAL_INPUT} ${GRUB_TERMINAL_OUTPUT}; do
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 14402e8..e85f7d6 100644
+index e27d6f7..a946e71 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,13 @@ CLASS="--class gnu-linux --class gnu --class os"
+@@ -31,7 +31,25 @@ CLASS="--class gnu-linux --class gnu --class os"
if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
OS=GNU/Linux
else
@@ -43,13 +43,25 @@ index 14402e8..e85f7d6 100644
+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
+ elif [ "${GRUB_DISTRIBUTOR}" = "parabola" ] ; then
+ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++ elif [ "${GRUB_DISTRIBUTOR}" = "Blag" ] ; then
++ OS="${GRUB_DISTRIBUTOR} Linux and GNU"
++ elif [ "${GRUB_DISTRIBUTOR}" = "blag" ] ; then
++ OS="${GRUB_DISTRIBUTOR} Linux and GNU"
++ elif [ "${GRUB_DISTRIBUTOR}" = "Musix" ] ; then
++ OS="${GRUB_DISTRIBUTOR} GNU+Linux"
++ elif [ "${GRUB_DISTRIBUTOR}" = "musix" ] ; then
++ OS="${GRUB_DISTRIBUTOR} GNU+Linux"
++ elif [ "${GRUB_DISTRIBUTOR}" = "Dragora" ] ; then
++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
++ elif [ "${GRUB_DISTRIBUTOR}" = "dragora" ] ; then
++ OS="${GRUB_DISTRIBUTOR} GNU/Linux-libre"
+ else
+ OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+ fi
- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+ CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
fi
-@@ -87,6 +93,8 @@ linux_entry ()
+@@ -87,6 +105,8 @@ linux_entry ()
case $type in
recovery)
title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
@@ -58,7 +70,7 @@ index 14402e8..e85f7d6 100644
*)
title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
esac
-@@ -100,7 +108,7 @@ linux_entry ()
+@@ -100,7 +120,7 @@ linux_entry ()
else
echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
fi
@@ -67,7 +79,7 @@ index 14402e8..e85f7d6 100644
save_default_entry | grub_add_tab
fi
-@@ -132,7 +140,8 @@ linux_entry ()
+@@ -132,7 +152,8 @@ linux_entry ()
fi
printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
fi
@@ -77,30 +89,30 @@ index 14402e8..e85f7d6 100644
sed "s/^/$submenu_indentation/" << EOF
echo '$(echo "$message" | grub_quote)'
linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-@@ -190,7 +199,22 @@ while [ "x$list" != "x" ] ; do
+@@ -190,7 +211,22 @@ while [ "x$list" != "x" ] ; do
alt_version=`echo $version | sed -e "s,\.old$,,g"`
linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-+ if test -e "/etc/arch-release" ; then
-+ if echo "${basename}" | grep -q 'vmlinuz-linux' ; then
-+ version="`echo "${basename}" | sed -e 's,vmlinuz-linux,,g'`"
++ if test -e "/etc/parabola-release" ; then
++ if echo "${basename}" | grep -q 'vmlinuz-linux-libre' ; then
++ version="`echo "${basename}" | sed -e 's,vmlinuz-linux-libre,,g'`"
+
+ if [ "x${version}" = "x" ] ; then
-+ version="core repo kernel"
++ version="libre kernel"
+ else
+ version="`echo "${version}" | sed -e 's,-,,g'`"
-+ version="${version} kernel"
++ version="libre ${version} kernel"
+ fi
+ fi
+ fi
-+
++
initrd=
+ initrd_arch="`echo "${basename}" | sed -e 's,vmlinuz,initramfs,g'`"
+
for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \
"initrd-${version}" "initramfs-${version}.img" \
"initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-@@ -198,7 +222,8 @@ while [ "x$list" != "x" ] ; do
+@@ -198,7 +234,8 @@ while [ "x$list" != "x" ] ; do
"initramfs-genkernel-${version}" \
"initramfs-genkernel-${alt_version}" \
"initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
@@ -110,11 +122,11 @@ index 14402e8..e85f7d6 100644
if test -e "${dirname}/${i}" ; then
initrd="$i"
break
-@@ -226,6 +251,22 @@ while [ "x$list" != "x" ] ; do
+@@ -226,6 +263,22 @@ while [ "x$list" != "x" ] ; do
linux_root_device_thisversion=${GRUB_DEVICE}
fi
-+ if test -e "/etc/arch-release" ; then
++ if test -e "/etc/parabola-release" ; then
+ is_first_entry="false"
+
+ linux_entry "${OS}" "${version}" true \
@@ -130,14 +142,14 @@ index 14402e8..e85f7d6 100644
+ done
+ fi
+
- if [ "x$is_first_entry" = xtrue ]; then
+ if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
linux_entry "${OS}" "${version}" simple \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-@@ -239,8 +280,11 @@ while [ "x$list" != "x" ] ; do
- echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
+@@ -240,8 +293,11 @@ while [ "x$list" != "x" ] ; do
+ is_top_level=false
fi
-+ if ! test -e "/etc/arch-release" ; then
++ if ! test -e "/etc/parabola-release" ; then
linux_entry "${OS}" "${version}" advanced \
"${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
+ fi
@@ -145,12 +157,12 @@ index 14402e8..e85f7d6 100644
if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
linux_entry "${OS}" "${version}" recovery \
"single ${GRUB_CMDLINE_LINUX}"
-@@ -252,8 +296,10 @@ done
+@@ -252,8 +308,10 @@ done
# If at least one kernel was found, then we need to
# add a closing '}' for the submenu command.
-+if ! test -e "/etc/arch-release" ; then
- if [ x"$is_first_entry" != xtrue ]; then
++if ! test -e "/etc/parabola-release" ; then
+ if [ x"$is_top_level" != xtrue ]; then
echo '}'
fi
+fi
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 465072d3a..2b10f2b54 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 197399 2013-10-25 12:22:28Z heftig $
+# $Id: PKGBUILD 202893 2013-12-28 22:45:58Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=gst-plugins-bad
pkgname=$_pkgname-libre
-pkgver=1.2.0
+pkgver=1.2.1
pkgrel=2
pkgdesc="GStreamer Multimedia Framework Bad Plugins, without nonfree faac support"
arch=('i686' 'x86_64' 'mips64el')
license=('LGPL')
url="http://gstreamer.freedesktop.org/"
-depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls')
+depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg' 'libwebp' 'libsrtp' 'gnutls' 'wildmidi')
makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2' 'python' 'valgrind' 'wildmidi'
'gobject-introspection')
provides=($_pkgname=$pkgver)
conflicts=$_pkgname
replaces=$_pkgname
-options=(!libtool !emptydirs)
+options=(!emptydirs)
source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
-sha256sums=('a12fac6c106a7e4ae8bb2c7da508688d7db532b818319df2202f497cbd930afa')
+sha256sums=('f33e7c81fcb742fe50b73ad87ef8a4baa7d6b59c5002a10bf63c8dee22404929')
build() {
cd $_pkgname-$pkgver
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index 593042e3e..2958425b2 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197398 2013-10-25 12:22:00Z heftig $
+# $Id: PKGBUILD 202895 2013-12-28 22:46:10Z bpiotrowski $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,19 +6,31 @@
pkgbase=gstreamer0.10-bad-libre
pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
pkgver=0.10.23
-pkgrel=5
+pkgrel=7
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')
+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' 'git' 'spandsp' 'celt')
url="http://gstreamer.freedesktop.org/"
-options=(!libtool !emptydirs)
-source=(${url}/src/gst-plugins-bad/gst-plugins-bad-${pkgver}.tar.xz)
-md5sums=('e4822fa2cc933768e2998311a1565979')
+options=(!emptydirs)
+source=("git://anongit.freedesktop.org/gstreamer-sdk/gst-plugins-bad#commit=57569a4854a0f2d14ef19a8264a4ae9a7a1d1125"
+ disable-assrender-test.patch
+ disable-camerabin-test.patch)
+sha256sums=('SKIP'
+ 'e66642affa6c0e69837d37615010e67e59ef3d672663303d46c1e2591e2ddfc6'
+ '01e780ddf1f8161a6115dded9dc5bf4bdd4d09a9eee00fa423b1330e90e76c68')
+
+prepare() {
+ cd gst-plugins-bad
+ sed -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.ac
+ patch -Np1 -i ../disable-assrender-test.patch
+ patch -Np1 -i ../disable-camerabin-test.patch
+}
build() {
- cd "${srcdir}/gst-plugins-bad-${pkgver}"
+ cd gst-plugins-bad
+ NOCONFIGURE=1 ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --enable-experimental \
+ --disable-static --enable-experimental --disable-gtk-doc \
--with-package-name="GStreamer Bad Plugins (Parabola GNU/Linux-libre)" \
--with-package-origin="https://parabolagnulinux.org/"
@@ -26,11 +38,10 @@ build() {
sed -e 's/gst sys ext/gst/' -i Makefile
}
-# Disable for now: 2 tests fail, one of them is because of not having a camera during build.
-#check() {
-# cd "${srcdir}/gst-plugins-bad-${pkgver}"
-# make check
-#}
+check() {
+ cd gst-plugins-bad
+ make check
+}
package_gstreamer0.10-bad-libre() {
pkgdesc="GStreamer Multimedia Framework Bad Plugin libraries (gst-plugins-bad), without nonfree faac support"
@@ -39,20 +50,20 @@ package_gstreamer0.10-bad-libre() {
conflicts=('gstreamer0.10-bad')
replaces=('gstreamer0.10-bad')
- cd "${srcdir}/gst-plugins-bad-${pkgver}"
+ cd gst-plugins-bad
make DESTDIR="${pkgdir}" install
}
package_gstreamer0.10-bad-libre-plugins() {
pkgdesc="GStreamer Multimedia Framework Bad Plugins (gst-plugins-bad), without nonfree faac support"
- 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')
+ 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' 'celt' 'spandsp')
groups=('gstreamer0.10-plugins')
install=gstreamer0.10-bad-plugins.install
provides=("gstreamer0.10-bad-plugins=$pkgver")
conflicts=('gstreamer0.10-bad-plugins')
replaces=('gstreamer0.10-bad-plugins')
- cd "${srcdir}/gst-plugins-bad-${pkgver}"
+ cd gst-plugins-bad
make -C gst-libs DESTDIR="${pkgdir}" install
make -C ext DESTDIR="${pkgdir}" install
make -C sys DESTDIR="${pkgdir}" install
diff --git a/libre/gstreamer0.10-bad-libre/disable-assrender-test.patch b/libre/gstreamer0.10-bad-libre/disable-assrender-test.patch
new file mode 100644
index 000000000..07ce4f1bb
--- /dev/null
+++ b/libre/gstreamer0.10-bad-libre/disable-assrender-test.patch
@@ -0,0 +1,11 @@
+--- a/tests/check/elements/assrender.c
++++ b/tests/check/elements/assrender.c
+@@ -289,8 +289,6 @@ assrender_suite (void)
+ tcase_set_timeout (tc_chain, 120);
+
+ suite_add_tcase (s, tc_chain);
+- tcase_add_test (tc_chain, test_assrender_basic_xRGB);
+- tcase_add_test (tc_chain, test_assrender_basic_I420);
+
+ return s;
+ }
diff --git a/libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch b/libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch
new file mode 100644
index 000000000..964351ae6
--- /dev/null
+++ b/libre/gstreamer0.10-bad-libre/disable-camerabin-test.patch
@@ -0,0 +1,10 @@
+--- gst-plugins-bad/tests/check/Makefile.am.orig 2013-12-10 22:01:50.504567189 +0000
++++ gst-plugins-bad/tests/check/Makefile.am 2013-12-10 22:02:17.081058500 +0000
+@@ -181,7 +181,6 @@
+ elements/autovideoconvert \
+ elements/asfmux \
+ elements/baseaudiovisualizer \
+- elements/camerabin \
+ elements/camerabin2 \
+ elements/dataurisrc \
+ elements/legacyresample \
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index 9fbfa235b..bd697b3f6 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 194708 2013-09-23 00:31:07Z tomegun $
+# $Id: PKGBUILD 202399 2013-12-21 16:55:19Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
@@ -6,7 +6,7 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname="gummiboot"
-pkgver="38"
+pkgver="41"
pkgrel="1"
pkgdesc="Simple text-mode UEFI Boot Manager (Parabola rebranded)"
url="http://freedesktop.org/wiki/Software/gummiboot"
@@ -17,11 +17,16 @@ depends=('util-linux')
conflicts=('gummiboot-efi')
provides=('gummiboot-efi')
replaces=('gummiboot-efi')
-options=('!strip')
-source=("git://anongit.freedesktop.org/${pkgname}#tag=${pkgver}"
+options=('!strip' '!makeflags')
+source=("git://anongit.freedesktop.org/${pkgname}#commit=ba731cee"
'loader.conf'
- 'parabola.conf')
+ 'parabola.conf'
+ 'splash-parabola.bmp')
install="gummiboot.install"
+md5sums=('SKIP'
+ '3d700d13aec5ab1b78a921eaf22e5bfa'
+ '36ee74767ac8734dede1cbd0f4f275d7'
+ 'c146ea0e16fff867164e113c48c91fff')
build() {
cd ${srcdir}/${pkgname}
@@ -37,10 +42,10 @@ package() {
install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf"
install -D -m0644 "${srcdir}/parabola.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/parabola.conf"
+ ## ship an Parabola GNU/Linux-libre boot splash (still has to be dropped in manually to take effect)
+ install -D -m0644 "${srcdir}/splash-parabola.bmp" "${pkgdir}/usr/lib/gummiboot/splash-parabola.bmp"
+
cd ${srcdir}/${pkgname}
make DESTDIR="${pkgdir}" install
}
-md5sums=('SKIP'
- '3d700d13aec5ab1b78a921eaf22e5bfa'
- '36ee74767ac8734dede1cbd0f4f275d7')
diff --git a/libre/gummiboot/splash-parabola.bmp b/libre/gummiboot/splash-parabola.bmp
new file mode 100644
index 000000000..11ceeff28
--- /dev/null
+++ b/libre/gummiboot/splash-parabola.bmp
Binary files differ
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index e312adc11..18351214e 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196769 2013-10-18 13:50:49Z andyrtr $
+# $Id: PKGBUILD 201437 2013-12-11 16:52:25Z andyrtr $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor : Rémy Oudompheng <remy@archlinux.org>
# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
@@ -6,9 +6,9 @@
_pkgname=hplip
pkgname=hplip-libre
-pkgver=3.13.10
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation"
+pkgver=3.13.11
+pkgrel=2.1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation (Parabola rebranded)"
arch=('i686' 'x86_64' 'mips64el')
url="http://hplipopensource.com"
license=('GPL')
@@ -28,11 +28,12 @@ optdepends=('cups: for printing support'
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-options=('!libtool')
install=hplip.install
-source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('ba729c514a2dc95390b99e9a9d452999'
- 'SKIP')
+source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}
+ disable_upgrade.patch)
+md5sums=('8ee362d9bc45fd4eddd3c9d9e583d728'
+ 'SKIP'
+ 'a853ba0eb0883f4bcee00b4277128b29')
prepare() {
cd $_pkgname-$pkgver
@@ -48,6 +49,9 @@ prepare() {
sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+ # disable insecure update - https://bugs.archlinux.org/task/38083
+ patch -Np0 -i ${srcdir}/disable_upgrade.patch
+
# https://bugs.archlinux.org/task/30085 - hack found in Gentoo
# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
# The hpcups driver does not use foomatic-rip
diff --git a/libre/hplip-libre/disable_upgrade.patch b/libre/hplip-libre/disable_upgrade.patch
new file mode 100644
index 000000000..600d6ccc7
--- /dev/null
+++ b/libre/hplip-libre/disable_upgrade.patch
@@ -0,0 +1,14 @@
+--- upgrade.py.orig 2013-10-31 12:46:54.000000000 +0100
++++ upgrade.py 2013-12-04 14:58:03.000000000 +0100
+@@ -134,6 +134,11 @@ except getopt.GetoptError, e:
+ if os.getenv("HPLIP_DEBUG"):
+ log.set_level('debug')
+
++
++log.error("HPLIP upgrade is disabled by Parabola for security reasons, see https://bugs.archlinux.org/task/38083 - if you like to upgrade HPLIP, use the Parabola software package manager pacman.")
++clean_exit(1)
++
++
+ for o, a in opts:
+ if o in ('-h', '--help'):
+ usage()
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 0ed0ed507..8e8908ce6 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99237 2013-10-26 10:36:31Z spupykin $
+# $Id: PKGBUILD 102928 2013-12-24 09:48:04Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=icecat-noscript
-pkgver=2.6.8.4
+pkgver=2.6.8.8
pkgrel=1
pkgdesc="plugin for icecat which disables script"
arch=('any')
@@ -14,7 +14,7 @@ depends=()
provides=$_pkgname=$pkgver
makedepends=('unzip')
source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('3096cfcd43988c7a2f0caa031dc74d51')
+md5sums=('55c2fe321a121b9708afb147d655adeb')
package() {
# _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 0721a71f2..17a9da2b9 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,4 +1,4 @@
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
@@ -14,7 +14,7 @@ _pgo=false
pkgname=icecat
pkgver=24.0
-pkgrel=3
+pkgrel=5
pkgdesc='GNU IceCat, the standalone web browser based on Mozilla Firefox.'
arch=(i686 x86_64 mips64el)
license=(MPL GPL LGPL)
@@ -27,9 +27,10 @@ if $_pgo; then
fi
optdepends=('networkmanager: Location detection via available WiFi networks'
'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
- 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
'gstreamer0.10-good-plugins: webm and mp4 demuxing'
- 'gstreamer0.10-ugly-plugins: h.264 decoding'
+ 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
+ 'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding'
+ 'gstreamer0.10-ffmpeg: more decoders'
'libpulse: PulseAudio audio driver')
url=http://www.gnu.org/software/gnuzilla/
install=$pkgname.install
@@ -43,20 +44,18 @@ source=(
$pkgname-install-dir.patch
vendor.js
icecat-20.0.1-fixed-loading-icon.png
- #cairo.patch
)
md5sums=(
0d3fdcec3f5fde494dedb595387e8f21
71dce16848bc51503a154841ce99427b
df08eaa1ac3bc6c2356be4fbf8ec8932
- b5198ac730fc09e3d0297523b28289c4
+ 21b5014c55aa97983f833886e047f55c
b41f82994fa056ffa5f8e6d99570e27a
b30ba2b5562558d510fdd09d626d0faa
64826fcf48816b13090042eefddbaa58
1dfa11e781950a969205e83840e9741e
6e335a517c68488941340ee1c23f97b0
- #c8552d030494443218d88792f4dbbd0f
)
prepare() {
@@ -70,8 +69,15 @@ prepare() {
fi
patch -Np1 -i $srcdir/$pkgname-install-dir.patch # install to /usr/lib/$pkgname
- patch -Np1 -i $srcdir/libre.patch # Remove Google+Mozilla stuff
- #patch -Np1 -i $srcdir/cairo.patch # fix cairo
+
+ # Patch and remove anything that's left
+ patch -Np1 -i $srcdir/libre.patch
+ sed -i 's|Adobe Flash|SWF Player|g;
+ ' browser/base/content/pageinfo/permissions.js \
+ browser/base/content/browser-plugins.js
+ sed -i '\|URL of the GeoLocation backend|d;
+ \|geo[.]wifi[.]uri|d;
+ ' browser/app/profile/firefox.js
# Fix for use nspr, sqlite and nss external
sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch
deleted file mode 100644
index a1fabee90..000000000
--- a/libre/icecat/cairo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/gfx/thebes/gfxPlatform.cpp
-+++ b/gfx/thebes/gfxPlatform.cpp
-@@ -459,11 +459,9 @@ void SourceBufferDestroy(void *srcBuffer)
- static_cast<SourceSurface*>(srcBuffer)->Release();
- }
-
--void SourceSnapshotDetached(cairo_surface_t *nullSurf)
-+void SourceSnapshotDetached(void *nullSurf)
- {
-- gfxImageSurface* origSurf =
-- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
--
-+ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
- origSurf->SetData(&kSourceSurface, NULL, NULL);
- }
-
-@@ -535,14 +533,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
- imgSurface->Stride(),
- format);
-
-- cairo_surface_t *nullSurf =
-- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
-- cairo_surface_set_user_data(nullSurf,
-- &kSourceSurface,
-- imgSurface,
-- NULL);
-- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
-- cairo_surface_destroy(nullSurf);
-+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
-+ (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
- }
-
- srcBuffer->AddRef();
diff --git a/libre/icecat/libre.patch b/libre/icecat/libre.patch
index 244592db8..c8a0a5f0d 100644
--- a/libre/icecat/libre.patch
+++ b/libre/icecat/libre.patch
@@ -80,27 +80,3 @@ index e925c1e..5101035 100644
+ <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
</DL><p>
</DL><p>
-diff --git a/dom/ipc/test.xul b/dom/ipc/test.xul
-index 25efdb6..8162c73 100644
---- a/dom/ipc/test.xul
-+++ b/dom/ipc/test.xul
-@@ -299,6 +299,6 @@
- oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
- </toolbar>
-
-- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
- <label id="messageLog" value="" crop="center"/>
- </window>
-diff --git a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
-index 237ba61..7603d7d 100644
---- a/layout/ipc/test-ipcbrowser.xul
-+++ b/layout/ipc/test-ipcbrowser.xul
-@@ -73,6 +73,6 @@
- label="setViewportScale"/>
- </toolbar>
-
-- <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
- remote="true"/>
- </window>
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD
index 58645651d..423b11d2a 100644
--- a/libre/icedove-l10n/PKGBUILD
+++ b/libre/icedove-l10n/PKGBUILD
@@ -3,8 +3,8 @@
pkgbase=icedove-l10n
epoch=1
-_pkgver=24.0
-pkgver=24.0.deb1
+_pkgver=24.1.1
+pkgver=24.1.1.deb1
_langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
@@ -65,58 +65,58 @@ done
md5sums=('d5b2567a8cc8f64591f313a6efdaaffc'
'f3719964e893c1002b7a923e8f95f923'
- '00e5745138bd36a6dda6996ca82bb458'
- '2681d2dd9cba526734ac85a07bd72dff'
- 'cd10d510639d2b4c524cd3a8fed30845'
- 'b5d4c6176cb3d9181bc4958a59955371'
- 'ec714abc51563df68c0e767499eb131b'
- 'b3958d9eb8ff1074524c913eea9d4531'
- '6cd59396e969a9fe0c9c4494b05e0d70'
- 'a9cb42920b2dc0a07df802f9720e2976'
- 'ca88f9d29b53c5249e04007b27e6b6f1'
- '7800c97656d7c969d7d99efaf5449547'
- '52c26e8e74d054a9b0e8b785d05a1219'
- 'da4d4b0a905905a6befdacfc93ce11ec'
- '7a1b3a80c2451cf388b1f394843d4d6e'
- 'c9e1bb783a81d0a2cebe1ddec3a29c2b'
- 'f586ca445a5e9cdb0cd8e5da5e301f75'
- 'cda87ee3de3712dd7d98a31205cd0d78'
- '97dfd7b9bdd3ffc451874a7c918747a8'
- '3cf977ccd8b1f4b5215c7bec4e795063'
- 'ce4b74e192d97b37b29bf725884bab77'
- '0e131941c0cb0e7c2ecac70092c931a5'
- '2140ad226acf709cbdf0a8323c704d97'
- 'e539e40b18fb35398e88eadda0751256'
- 'f7e0ff5bc085fa947d56677732ad40df'
- 'e031bcb2d0df57a79d39aa8555e918ba'
- '87f1310bff7b978a8015362dc95dfeba'
- '2d3e0e115d0b9b1cd061beeb7cfb1039'
- 'da16f65cb7095bf7ab50334d5310b46b'
- 'b0ef1e6b1289376c25dfad11fd3b5825'
- 'b33c0fc1a1b6d6f1b61e33e16a68c3aa'
- '91d710244168d0c1c769435a60b64f3c'
- '8debe2067c3ffdd910cfa0ad99ed62dd'
- '7b639bf8009edb028538722812d29c1f'
- '6ab044113bb056df256112716c4d7bc6'
- '1f1cfc93ae9c04d6062d824fdf89ef0a'
- 'c13d3d3653cbb530aafd82ea3a455b31'
- '4f0acf27aa26483e161ad74c0bde0a0d'
- '0b19f435b174941580e423586330af30'
- '2c377b2b3dcbe5869c2db0dda2de06ed'
- 'a7a04da21888fd15b755529b5bf2e36f'
- '9309c021fc49d3a0aee8df25d41f525a'
- '297f79f74a807063de05ed34159d7524'
- '35d94ffaa43bd3dc451723b392b2bd2a'
- '6028467f08ef13bd6b6a1de7348e06d3'
- 'b2903194003960ed7189ce6834abfb07'
- '3841804189ed1a6bbf1a4845b5fdf53f'
- '58245e37b544aa0dd0ce79e383a6aa23'
- '5ee4beab35fd0adb3b250fb80a9b82a8'
- '3d702ac32f8184038d38b2dbc7e7c886'
- '27c5580bd0f7d45362e367c8b1675190'
- 'a70ab64d7bc529083bfe5ae4be9a4c0c'
- 'd7ca7f6c776958b22f97f59d7e28c647'
- '4beb1c99e43c4ea2fea8d9d877bcfe06'
- '67098d273f37d70f59f04b8be7a96595'
- '69dd513b2ea4472b5b651faf278ba836'
- 'a62005875fba96de365a1432e6616842')
+ '71b52e9b2ea4b2813579151107b26d7c'
+ '0001f92a0a732b2d8d4abe5b73739871'
+ '0ca3fd860debb0f4bea75c295cd794bf'
+ '3fa1b7e34efb29fcf12ff84c9b7cfb99'
+ '0d412e040d7db1bff6ba7a5901c194a3'
+ '196390a5683708ea9d1dff08d5da4969'
+ '1b580efd13589da4a7c700ce675b4de8'
+ '3f0b570ace30f4b8439328f63424914a'
+ '5d7890dce639c703319185dcca099c19'
+ '02352099e2bb79b9ed57b8b735d1b662'
+ '1b463b18db5640f9fb1fbb82f9862d51'
+ 'f8053c0d509c95643be7c993f79469e8'
+ 'c7286e9fb549480c7565947162473eb3'
+ 'a180d36ebe0e04a452c452d8ca249936'
+ 'faa9054e681927eec112b989b9b9f916'
+ 'd5b4bbe5cd18b72b7d8c649b68a095bb'
+ '5fd037b2d60ff663eccbf0788a52cce7'
+ '824805de27a69e5323c6e547974c6c02'
+ '6a3e55d20d4945ead133054127b1ba17'
+ '81db405732d6b5e6fd057505be5b03c1'
+ '25338963e6cbf51ea9c18bc7bd786a44'
+ 'bfc2a548805ba54bb81d8deaa5fcf406'
+ 'da5d4edacaf56bbb015987b334c49a46'
+ '264aa5440cd50dd1d09b1f6c682dde95'
+ '1a671a227b2713f0d7ede3b8c547e003'
+ '4dfce580e8d6f889ef868cf1a85ddd89'
+ 'cded11a2ee85f1bfa704a8bcfd7063ac'
+ 'ca08979c98adc6b1c1086c1bf037d64a'
+ '6d433d1b6395957c9c16eb9efe79c461'
+ '412186cd09492af191ef5b8e5523997b'
+ '9f5f15ba89ed4a7dd82b973616a84fb1'
+ 'ff817ed985260ba5b2284d70ede97cfc'
+ 'c6474a9d0a49b177b8d1daca5e3faf54'
+ '81f1379b774a9762918b5bb6fd613a94'
+ 'dfb5c1393033518e12ae9ff91afeed97'
+ '24383d610a424cc71c44b9fa923b9743'
+ 'c5918f13d25dd124ed8050b7177a6adf'
+ '76ec5c28687220f39bac18fd2381ab29'
+ '03263f5ebc6e38022c808689ff0f848c'
+ 'aaa66545fb46d23ea0b5537495b0c08e'
+ '5e105d2fd7ad811f3afbe375ab8ef293'
+ '955a91d8b73bd14f12afa4be13a45bca'
+ 'dbd1a1b2ea0777d1df361f973d53c27e'
+ '03f0558bcbc1dafa4b29bcf1a69ca170'
+ 'd1a58f928165c099c01b8687e92889af'
+ 'a8b3385d0c7679b871cf9bcaf406ca26'
+ '2fbeac1775ab8ce9096ee14d628c68e8'
+ '450ac4b6e744b7ed8cd92e9852d0e80f'
+ '31c56ec4e6de175c75b60e421f1381fc'
+ '43d1335568bc7b6806ed5151e7b38243'
+ 'eaece7103da2f8b19967d5f4b5e7befc'
+ '9b3abcfb1ccac0b863dcde99ab487d71'
+ '343fcfdec8f55f2e227bb5e1a5804907'
+ 'ee9931bb007f935c0aaa16031c4319e7'
+ 'ee92083eea883b10946cee46ac529d21')
diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD
index 20dbea731..b21733dd6 100644
--- a/libre/icedove-libre/PKGBUILD
+++ b/libre/icedove-libre/PKGBUILD
@@ -3,7 +3,7 @@
# We're getting this from Debian Experimental
_debname=icedove
-_debver=24.0
+_debver=24.1.1
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -30,8 +30,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
vendor.js
${_pkgname}.desktop)
options=(!emptydirs)
-md5sums=('c69b05c9a1c28d455964aed4927ef916'
- 'c67dc2f46f0e4d463ebe1ccdbfae6392'
+md5sums=('91ddfb44481e6cb456d835a832d885c1'
+ '9f060324dbed3f8d27c896703bda6078'
'c46cf2a671c8fdefcabd4c87e38f3d40'
'5a53179d14ae9631b7afe5e4d0fc0b25'
'e785e0c267f4435ae1a9aa0b03bcacfb')
diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt
deleted file mode 100644
index 9cc6d0933..000000000
--- a/libre/icedove-libre/replace-urls.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# These are replaced in order, so if one is a subset of another, the smaller one should be last
-# These are whitespace-separated EREs, comments are lines starting with '#'
-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? http://directory.fsf.org/wiki/Icedove
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" http://directory.fsf.org/wiki/Icedove"
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ http://directory.fsf.org/wiki/Icedove
-
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ http://directory.fsf.org/wiki/Icedove
-
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ http://directory.fsf.org/wiki/Icedove.\2/
-
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://directory.fsf.org/wiki/Icedove
-#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
-#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
-
-"https?://addons\.mozilla\.org/" "http://directory.fsf.org/wiki/Icedove"
-
-# hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1directory.fsf.org/wiki/Icedove
diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD
index c032a2b70..0f3cb050a 100644
--- a/libre/iceweasel-l10n/PKGBUILD
+++ b/libre/iceweasel-l10n/PKGBUILD
@@ -11,7 +11,7 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=25.0
+_debver=26.0
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -76,91 +76,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() {
done
md5sums=('a4593936bf1c7a9ec9368ff249f9cc56'
- '72891c593c993c5474abff8b4e72d543'
- '675ce7d5e3d7a2899db8be29a3f8482a'
- 'ed754b10fb8e687dab42ccb50f31649c'
- 'e3ca6f8116a0d9b2cada9fa88b66e237'
- '3324458a1907de5c95ed6d02601e2753'
- '5ea65765bb6fb9ba8aac3e36ed66c1b8'
- 'c22ae0fcc64c979cf87aec4b191353fb'
- 'c33058a022beb01abad48d543d4621bc'
- 'f7cb06c3847748fcd01aa6c7e07bab09'
- 'b2c9f2768a5f364c64e38d76323aa1b7'
- 'cf5a47e0ce43bcbe9601401e3adcf87b'
- 'c42200f23f5ced9395ae8a1dff2e824f'
- '487dd4ace0ed32330b4dcbf1c6d39758'
- '5ad617928cf23d8e97916cf16d417635'
- '6dd585cf48ac920dfb2ba2966ccc1a7b'
- '399e6f69ea89436c3cb2d6c17b9415f5'
- '726eb9a1368f01b01cb11f78c1fe91b1'
- '19152bb2705946c16f7f10140128635b'
- '34a8fd695d3ac20bf733c4c5fd9c733e'
- 'e13963f59dbec91fa9318fcfb19570c5'
- '9ef86e7b69f7de49e321ef7dc7dc0b75'
- 'bb74f5cb87e6218820e7c9a2bddc2021'
- 'fa34dfaed15fa16814ac2d629971141f'
- 'a124544d82417a7a1341c37c80b18f68'
- '6936b981c79fbffbd514dcbd281c26b8'
- '0b59289da31c29844db8c688770a474a'
- '8bd21818ca2216e65f160eb7a9ca072b'
- '20ad27abc7c254a9960682f7afda1e5f'
- 'e8bd8488274796668e5b7a4e4dba5949'
- '991f8d1e1faae1a6a22113f4f3f6d90e'
- 'bb0f98dcd2b87510d09216d9a36ef686'
- '87fa30b76eafab63b28ee53943435e43'
- '3cbafc8cdff119b73fcbd2bac8ffadea'
- '25b4ee89d58b2edf937515a1f8309768'
- 'ea5b9b47bd4a24a80058509ba2126041'
- '97be59190157410b37a56cbec1d95c78'
- '575a68f6bc5ace8fc212a9a7d759291b'
- 'f57bea11b0f49cf2e4023008ffcdc87d'
- 'c1130d88b73db6a474d1df5ed00d0427'
- 'd0fd4480ab9fd6d20e2ea3c23a94ae14'
- '4b7f19fd35a68990d114e0f7c265b7b2'
- '77ed20f961742c3b8eb7a8cfdc24df25'
- '9c3ed09220442dc602be0fd130475349'
- 'c7b7cd5971d07052c983e6d2047a3154'
- '6e7b9ac0906938a0ba4296e99a03779c'
- '39b1121cb719123596c3b1ef48d82b94'
- 'ae71cd7232645c49b1d9f970a6f824e0'
- '25b322a7fa03c620747d72587e594173'
- '4b5fefdfdba63243507ac623644912ca'
- 'ae02bb179460d0a1ad2c88ed063c1222'
- '2eb0dd6b6540f11b1e3ea7cfb6a8f414'
- '1a04b8c9fddcdbc96e52d2a6b5ccaae9'
- '8fa2584f770ca97eb7a46826f027aa63'
- '083f0e2bdc94f668b0aa10a7ebe65e78'
- '091c223464fb65ed7e771fa0abda5db6'
- '53bc7c5f16a4c1e9d5315ae44bfbc1ab'
- '5cfc5a27b72a432da7267fcc87fab40a'
- 'a4467ea38382fd2c0aa22fdf1aab41b1'
- '2ae42108358fe38e2efbe70e26f82f3c'
- 'dcba6a97010bb9504e9778bfc5aee54b'
- '4b8dd9e54b79d133884d29b6a6b78d1f'
- '0c364c911b310d5656652faced437ec4'
- '60856a5d67e13bc3ecb2edd6f90ce328'
- '1685cea5a1094769a0a2f7fa3e248482'
- '6d3218c1a6c45206c71477f3403b3bf9'
- 'a75749039cca538ba22bb7007b8358e9'
- 'c795a1eb2f467a1fe6c7821af6dd9d05'
- 'b1e16275ee6b874e4f39579126cb8c94'
- '159145964d7c3e6faa1416a2ebc96e84'
- 'bf6efa5437f4dbd6549e27b00523e10e'
- 'ab9d9d2568d3be83038973c7b1077c6a'
- 'd6ad3b4a84ca1a35ef46a6a7053de37c'
- '285f62d8782aa73860a2187b0a4027cf'
- 'd107b587a939124df3c8a233e75d3ca3'
- '968bd91d21c52095f08f9a55d20ba6a4'
- '0f29172e2aa3edf11a1c705ce945f036'
- '78ce26aa5e6fedff75cae9aa24d8d8e9'
- 'a8d0606d5d79f1e4f08908f67b0336ab'
- '21d6c6af9ae10aa4d392a1f949a76462'
- 'bf1fb5267204996373ff541558d7b286'
- 'c3561aa5796054b0377eaab17017b341'
- '2a2c08f36efd1b4455194abd67268c34'
- '4cfe3e0dca2d7e26effb3fdda7bb2af7'
- 'a1eb070b498fd9324a7c5c3563f7d29e'
- '1fad104a69ed3150d3d8ca1b79181d03'
- '2e099ca02f1269f25627616cb7df3d12'
- '852e3415f008110d23ed1ed9bdba2d35'
- 'e8f40197b8026e641b4836de6864045a')
+ '1034ab86bc45115f9ef614b85cfcdc19'
+ '4c34d69b741bf1f33648b77c3322b2da'
+ 'aacb59b72dd27ed06881cd01d81fa3a6'
+ 'e64213a5fb34e8d53f13200f7b729c82'
+ '0a92bec210e3f8aff64a81fda8780cf3'
+ 'd0f290128bbf2a4383e982bf4e686b96'
+ '3f008ae077bc54cb948cc6a08a78a0f6'
+ '84fde08dd4da53def0491960a908f9ff'
+ '2494d4cba834bf49d2e8f0ac6e86dec0'
+ '328c526e9c41f32c5df0916d8633b8e7'
+ '6bbd86c0180764b59e9762f7b33d5db3'
+ 'd4c2de19670d608f16158908ae980e0d'
+ '36c76ce311208ad2fcc19a06f02c4d52'
+ '1de6bdd14302fff21d62472bf172e5bf'
+ '8aceec26df106e67c4f19589fcef7588'
+ 'edd2c8f8c3f6df1cc819cf8542b76196'
+ '89b3ab8adace5efd25a92a091e3f6bac'
+ 'fefbecae93e912447a8119115930f7d5'
+ '236f1fc25ff6e104ca61bcb48342710f'
+ '7a839afc851fcb2e3e630090586245ca'
+ '12fea0abba7caf75da8ba7bcab99728a'
+ '4779ce690c5f45c138ec36fff6360bed'
+ 'e3b767cfb3318fc85b96d894ed4cdec5'
+ '2a2d96b793f652520de146f9dc24755c'
+ '17120e297fc252e97e0abd3ff1c2a10b'
+ '2259d8189d34915f32ab31b4d53d6e87'
+ 'b7aa28e93264aea26595fd98d7982abe'
+ '01873dd70986ca857cf5e00b85a22adf'
+ '2f88825d3925eb1bb21a0ad092308edd'
+ '485e799de41f283c937cf6055e2f5523'
+ 'f19e860a2d5435ee61d48ed328494212'
+ 'd64ac8e776f808d61d2c2c4678124294'
+ '74b6666fabaa8e270356eaa7a78b371c'
+ '36304846e8a1ae604b29bdfb6b0c12ba'
+ '0cdfde7a083cca4308bd23f7203bbe7b'
+ '74a2103823f0f9a6b0bc614bd46272ca'
+ 'e088239e0f15ad5d23099ab2cad19d92'
+ '16b9e9814f154ffddd8d9612bdf9f8d8'
+ '6a2aca46eabd374d80106328fea6e340'
+ 'f680470cc3d6fc87276a9b17d6841ae2'
+ '6964eef1fd96fa810de34f32844f31fc'
+ '223e82aa9efb2376f44b7601e3ddbeae'
+ 'd821062dd74179309981c18542412e2e'
+ '7128e964f3d01da8967c5e57b2d76b93'
+ '2cc4b1a603c29450d19dd98c15093fec'
+ '595e155b3d15432d5de2c5962feea581'
+ '9110dc57eff2d7cab6d7eeeb11f8e98c'
+ '0503d87f660e9e86be6a3c32ed73e65c'
+ 'e19e8f1702232f5d77ec0624071ccd7d'
+ '5618dcfcc50831b8efccd0c0c093dfc2'
+ '1020905e47d89bf40545a3bbdf52951b'
+ '6d187dc8a4ac042e7c871134ca86b2c0'
+ '36d5a7066f518c7db7464320e2b86fc8'
+ '9654556b5c1a74a4ffe21091edbe26df'
+ 'd5e6d93aa7f35e052a24b612730a70ba'
+ 'b5f0df97c10290c555f3002655f5bfe6'
+ 'f1f4d8897422ed5328e1b2325a1f1198'
+ '3bfa9cbe5abd0ea40c70e16cd2f5c24c'
+ 'f27983d5cf79aa478409c33dae988ce2'
+ 'cbf40cf391dd5bbac1665a8180f81620'
+ '69ffe26a603ddc25bc7d9e56a70b6399'
+ '90d6449031ae5e06acd8cffdb0d01e05'
+ '326ad24d994971a2405dcb1532cce6bf'
+ '5ced14adbdddd81bda4a9cd2ddd92ee4'
+ 'b86565c39ef253d51a39bc851e7b354d'
+ '915f6058a855a59cddeb027d2a518dce'
+ '58f8bfcd609626a2a76ff22206e2033f'
+ '9b0be982d506f060319bd3c41aee0896'
+ '65cd9c3cf11f1937be0a1dc0802f3d1a'
+ '454413e97a0d19ba018ebc60e2502d2b'
+ '45b8f8cdb117eca4eaaa1d6b449569f5'
+ 'f10ef03517f558c15fca7db4d9e50ad1'
+ '5a3465027d47bd30da6a77f92e94fd08'
+ '56ecb69e73f7d3447019e6f3b23aebba'
+ 'c02e08ff0732233738fe3af877513a34'
+ '3a4fbbfeb24cff45933c53dac27d6fdc'
+ 'a2245eca0bca1d615e031e82734b8e43'
+ '62f4ea1010191b721aa8b2d6130a3c1e'
+ '45bd1ab2f164630366ce6004d0070f55'
+ '1cce5000ad1146b1cfc5ff9cd5db175b'
+ 'b9283671cf87329296b62f529e8e7709'
+ '17fa69f4617ce5706fe11c54d5a737a8'
+ 'cfd0b7b1215f13cfcd8eb1d0ab335aa4'
+ '6ec5cd2855ae69f8998de2305109bd91'
+ '4b121cb7694f5962c99c479a26442905'
+ '6aa873082d24918f489431be9be7300a'
+ 'f36aafb79f6120698f9b890c52dbd301'
+ 'ff581801e9a9663e4562a5d28d4cbe2d')
diff --git a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
index d2716aed3..c9df18dc4 100644
--- a/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ b/libre/iceweasel-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
@@ -273,10 +273,10 @@ index f35c227..7062886 100644
%{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 5f989ea..e7e21bd 100644
+index 42fbd15..6c3dbfe 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3733,7 +3733,7 @@ XREMain::XRE_mainRun()
+@@ -3737,7 +3737,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch b/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch
new file mode 100644
index 000000000..c7c4c355b
--- /dev/null
+++ b/libre/iceweasel-libre/Fixup-Reset-Firefox-after-bad-merge.patch
@@ -0,0 +1,108 @@
+From: Mike Hommey <mh@glandium.org>
+Date: Sat, 16 Nov 2013 13:01:17 +0900
+Subject: Fixup "Reset Firefox" after bad merge
+
+---
+ toolkit/content/resetProfile.js | 52 ----------------------------------------
+ toolkit/modules/ResetProfile.jsm | 11 +++++----
+ 2 files changed, 6 insertions(+), 57 deletions(-)
+
+diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
+index 2253994..d46b43b 100644
+--- a/toolkit/content/resetProfile.js
++++ b/toolkit/content/resetProfile.js
+@@ -28,58 +28,6 @@ function onResetProfileLoad() {
+ populateResetPane("migratedItems");
+ }
+
+-<<<<<<< HEAD
+-=======
+-/**
+- * Check if reset is supported for the currently running profile.
+- *
+- * @return boolean whether reset is supported.
+- */
+-function resetSupported() {
+- let profileService = Cc["@mozilla.org/toolkit/profile-service;1"].
+- getService(Ci.nsIToolkitProfileService);
+- let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
+-
+- // Reset is only supported for the default profile if the self-migrator used for reset exists.
+- try {
+- if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
+- "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
+- let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
+- return ("canMigrate" in pm) && pm.canMigrate("self");
+- }
+- } catch (e) {
+- // Catch exception when there is no selected profile.
+- Cu.reportError(e);
+- }
+- return false;
+-}
+-
+-function getMigratedData() {
+- Components.utils.import("resource:///modules/MigrationUtils.jsm");
+-
+- // From migration.properties
+- const MIGRATED_TYPES = [
+- 4, // History and Bookmarks
+- 16, // Passwords
+- 8, // Form History
+- 2, // Cookies
+- ];
+-
+- // Loop over possible data to migrate to give the user a list of what will be preserved.
+- let dataTypes = [];
+- for (let itemID of MIGRATED_TYPES) {
+- try {
+- let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
+- dataTypes.push(typeName);
+- } catch (x) {
+- // Catch exceptions when the string for a data type doesn't exist.
+- Components.utils.reportError(x);
+- }
+- }
+- return dataTypes;
+-}
+-
+->>>>>>> Bug 756390 - Make the "Reset Firefox" feature more generic
+ function onResetProfileAccepted() {
+ let retVals = window.arguments[0];
+ retVals.reset = true;
+diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm
+index db57f2a..d618d08 100644
+--- a/toolkit/modules/ResetProfile.jsm
++++ b/toolkit/modules/ResetProfile.jsm
+@@ -7,8 +7,6 @@
+ this.EXPORTED_SYMBOLS = ["ResetProfile"];
+
+ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
+-#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
+-#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
+
+ Cu.import("resource://gre/modules/Services.jsm");
+
+@@ -25,8 +23,11 @@ this.ResetProfile = {
+
+ // Reset is only supported for the default profile if the self-migrator used for reset exists.
+ try {
+- return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
+- ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
++ if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
++ "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
++ let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
++ return ("canMigrate" in pm) && pm.canMigrate("self");
++ }
+ } catch (e) {
+ // Catch exception when there is no selected profile.
+ Cu.reportError(e);
+@@ -50,7 +51,7 @@ this.ResetProfile = {
+ let dataTypes = [];
+ for (let itemID of MIGRATED_TYPES) {
+ try {
+- let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
++ let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
+ dataTypes.push(typeName);
+ } catch (x) {
+ // Catch exceptions when the string for a data type doesn't exist.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 9285849c3..ad6233f39 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=true
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=25.0
+_debver=26.0
_debrel=deb1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -23,7 +23,7 @@ _pkgname=iceweasel
pkgname=iceweasel-libre
epoch=1
pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=2
pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
arch=(i686 x86_64 mips64el)
@@ -38,9 +38,10 @@ if $_pgo; then
fi
optdepends=('networkmanager: Location detection via available WiFi networks'
'gstreamer0.10-base-plugins: vorbis decoding, ogg demuxing'
- 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
'gstreamer0.10-good-plugins: webm and mp4 demuxing'
- 'gstreamer0.10-ugly-plugins: h.264 decoding'
+ 'gstreamer0.10-bad-libre-plugins: aac, vp8 and opus decoding'
+ 'gstreamer0.10-ugly-plugins: h.264 and mp3 decoding'
+ 'gstreamer0.10-ffmpeg: more decoders'
'libpulse: PulseAudio audio driver')
url="http://packages.debian.org/experimental/${_pkgname}"
install=iceweasel.install
@@ -52,21 +53,25 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
mozconfig
mozconfig.pgo
libre.patch
+ gnu_headshadow.png
iceweasel.desktop
iceweasel-install-dir.patch
vendor.js
iceweasel-20.0.1-fixed-loading-icon.png
- Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-md5sums=('dd1462b582747210cc6c2ac1d01c4c17'
- '4f4cde44b6e83cf78ff5d6e757d1913c'
- '350feec44d359c31679dbec3de6685df'
+ Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+ Fixup-Reset-Firefox-after-bad-merge.patch)
+md5sums=('219cf21e0642e8a364365286f23d0624'
+ '2001d0477bcefd0eeaab584402133691'
+ '023120a970670dc85cea19393f0b94b6'
'df08eaa1ac3bc6c2356be4fbf8ec8932'
- '8c11b80574b11e96c2ef44fa16f4b844'
+ 'fea121a94737ec8641b39e7120a048d3'
+ 'b03a979a78484503ba8dddad4f2c96d1'
'7b9e5996dd9fe0b186a43a297db1c6b5'
- 'abf5ecb74caa857abb42bcfbb3442d9c'
+ '6620e724ec9a1be74e65089d81d802f7'
'816013881cfc9a1f4f0ede72b014f8b3'
'6e335a517c68488941340ee1c23f97b0'
- 'ee3279c706c3a69e6f8eda415c4d35b0')
+ 'dbf1c021e5f7ac323197b219bf213c50'
+ '8e165ef85ddd72491f0b48f8954afca6')
prepare() {
export DEBIAN_BUILD="mozilla-release"
@@ -81,16 +86,29 @@ prepare() {
# Doesn't apply and seems unimportant
rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
- # This patch doesn't works in some parts due that has patches for others locales languages, source code hasn't it
+ # Doesn't works in some parts due it has patches for others locales languages, source code hasn't it
rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
+ # It needs to be patched after Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+ rm -v debian/patches/debian-hacks/Fixup-Reset-Firefox-after-bad-merge.patch || true
+
quilt push -av
+ install -m644 "$srcdir/gnu_headshadow.png" browser/base/content/abouthome # Put gnu_headshadow.png on the source code
+
patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch" # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+ patch -Np1 -i "$srcdir/Fixup-Reset-Firefox-after-bad-merge.patch"
patch -Np1 -i "$srcdir/iceweasel-install-dir.patch" # install to /usr/lib/$_pkgname
# Patch and remove anything that's left
patch -Np1 -i "$srcdir/libre.patch"
+ sed -i 's|Adobe Flash|SWF Player|g;
+ ' browser/base/content/pageinfo/permissions.js \
+ browser/base/content/browser-plugins.js
+ sed -i '\|URL of the GeoLocation backend|d;
+ \|geo[.]wifi[.]uri|d;
+ ' browser/app/profile/firefox.js \
+ browser/metro/profile/metro.js
rm -v browser/base/content/abouthome/snippet*.png || true
sed -i "\|abouthome/snippet|d" browser/base/jar.mn
@@ -170,20 +188,16 @@ build() {
fi
if $_pgo; then
- if [[ $CARCH != i686 ]]; then
- # Set up PGO
- export DISPLAY=:99
- Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-
- if ! make -f client.mk build MOZ_PGO=1; then
- kill $!
- return 1
- fi
-
- kill $! || true
- else
- make -f client.mk build
+ # Set up PGO
+ export DISPLAY=:99
+ Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
+
+ if ! make -f client.mk build MOZ_PGO=1; then
+ kill $!
+ return 1
fi
+
+ kill $! || true
else
make -f client.mk build
fi
diff --git a/libre/iceweasel-libre/gnu_headshadow.png b/libre/iceweasel-libre/gnu_headshadow.png
new file mode 100644
index 000000000..e0f73a3bf
--- /dev/null
+++ b/libre/iceweasel-libre/gnu_headshadow.png
Binary files differ
diff --git a/libre/iceweasel-libre/iceweasel-install-dir.patch b/libre/iceweasel-libre/iceweasel-install-dir.patch
index a44aef496..3938c0b3e 100644
--- a/libre/iceweasel-libre/iceweasel-install-dir.patch
+++ b/libre/iceweasel-libre/iceweasel-install-dir.patch
@@ -1,9 +1,8 @@
-diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/baseconfig.mk
---- iceweasel-16.0.1.orig/config/baseconfig.mk 2012-10-10 19:42:45.000000000 -0200
-+++ iceweasel-16.0.1/config/baseconfig.mk 2012-10-12 05:40:32.346949927 -0200
-@@ -1,10 +1,10 @@
- INCLUDED_AUTOCONF_MK = 1
-
+diff --git a/config/baseconfig.mk b/config/baseconfig.mk
+index 9c70e24..eff0fd2 100644
+--- a/config/baseconfig.mk
++++ b/config/baseconfig.mk
+@@ -1,8 +1,8 @@
MOZ_APP_BASE_VERSION = $(firstword $(subst ., ,$(MOZ_APP_VERSION))).$(word 2,$(subst ., ,$(MOZ_APP_VERSION)))
-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_BASE_VERSION)
@@ -16,12 +15,11 @@ diff -Nur iceweasel-16.0.1.orig/config/baseconfig.mk iceweasel-16.0.1/config/bas
DIST = $(DEPTH)/dist
# We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur iceweasel-16.0.1.orig/js/src/config/baseconfig.mk iceweasel-16.0.1/js/src/config/baseconfig.mk
---- iceweasel-16.0.1.orig/js/src/config/baseconfig.mk 2012-10-10 19:43:05.000000000 -0200
-+++ iceweasel-16.0.1/js/src/config/baseconfig.mk 2012-10-12 05:08:23.064066227 -0200
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
-
+diff --git a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk
+index 1ff076c..5386569 100644
+--- a/js/src/config/baseconfig.mk
++++ b/js/src/config/baseconfig.mk
+@@ -1,5 +1,5 @@
-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+installdir = $(libdir)/$(MOZ_APP_NAME)
diff --git a/libre/iceweasel-libre/iceweasel.install b/libre/iceweasel-libre/iceweasel.install
index c1fe8284a..1a1f4b16b 100644
--- a/libre/iceweasel-libre/iceweasel.install
+++ b/libre/iceweasel-libre/iceweasel.install
@@ -4,10 +4,10 @@ post_install() {
}
post_upgrade() {
- post_install $1
+ post_install
}
post_remove() {
- post_install $1
+ post_install
}
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index e5632c667..2384818b4 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -1,7 +1,20 @@
-diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js
---- mozilla-release.orig/browser/app/profile/firefox.js 2013-11-05 03:52:59.229583495 -0200
-+++ mozilla-release/browser/app/profile/firefox.js 2013-11-05 03:57:12.955661016 -0200
-@@ -1269,14 +1269,6 @@
+diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
+index 331edc8..226508d 100644
+--- a/browser/app/profile/firefox.js
++++ b/browser/app/profile/firefox.js
+@@ -242,11 +242,6 @@ pref("browser.slowStartup.notificationDisabled", false);
+ pref("browser.slowStartup.timeThreshold", 60000);
+ pref("browser.slowStartup.maxSamples", 5);
+
+-// This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
+-// this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
+-// repackager of this code using an alternate snippet url, please keep your users safe
+-pref("browser.aboutHomeSnippets.updateUrl", "https://snippets.mozilla.com/%STARTPAGE_VERSION%/%NAME%/%VERSION%/%APPBUILDID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/");
+-
+ pref("browser.enable_automatic_image_resizing", true);
+ pref("browser.chrome.site_icons", true);
+ pref("browser.chrome.favicons", true);
+@@ -1283,11 +1278,7 @@ pref("pdfjs.previousHandler.alwaysAskBeforeHandling", false);
// (This is intentionally on the high side; see bug 746055.)
pref("image.mem.max_decoded_image_kb", 256000);
@@ -10,16 +23,15 @@ diff -Nur mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br
-
-pref("social.sidebar.open", true);
-pref("social.sidebar.unload_timeout_ms", 10000);
--
--pref("dom.identity.enabled", false);
--
- // Turn on the CSP 1.0 parser for Content Security Policy headers
- pref("security.csp.speccompliant", true);
++// removed facebook sidebar with Iceweasel.
+
+ pref("dom.identity.enabled", false);
-diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozilla-release/browser/base/content/abouthome/aboutHome.css
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.css 2013-10-25 20:27:08.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.css 2013-11-05 03:57:12.958994121 -0200
-@@ -49,11 +49,6 @@
+diff --git a/browser/base/content/abouthome/aboutHome.css b/browser/base/content/abouthome/aboutHome.css
+index c270318..049fe6e 100644
+--- a/browser/base/content/abouthome/aboutHome.css
++++ b/browser/base/content/abouthome/aboutHome.css
+@@ -49,11 +49,6 @@ a {
background-repeat: no-repeat;
}
@@ -31,7 +43,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
#searchForm {
display: -moz-box;
}
-@@ -72,8 +67,7 @@
+@@ -72,8 +67,7 @@ a {
#searchEngineLogo {
display: inline-block;
height: 28px;
@@ -41,7 +53,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
}
#searchText {
-@@ -145,48 +139,6 @@
+@@ -145,48 +139,6 @@ a {
transition-duration: 0ms;
}
@@ -90,7 +102,40 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
#launcher {
display: -moz-box;
-moz-box-align: center;
-@@ -366,20 +318,6 @@
+@@ -335,26 +287,25 @@ body[narrow] #restorePreviousSession::before {
+ width: 32px;
+ }
+
+-#aboutMozilla {
++#aboutGNU {
+ display: block;
+- position: relative; /* pin wordmark to edge of document, not of viewport */
+ -moz-box-ordinal-group: 0;
+ opacity: .5;
+ transition: opacity 150ms;
+ }
+
+-#aboutMozilla:hover {
++#aboutGNU:hover {
+ opacity: 1;
+ }
+
+-#aboutMozilla::before {
+- content: url("chrome://browser/content/abouthome/mozilla.png");
++#aboutGNU::before {
++ content: url("chrome://browser/content/abouthome/gnu_headshadow.png");
+ display: block;
+ position: absolute;
+ top: 12px;
+ right: 12px;
+- width: 69px;
+- height: 19px;
++ width: 200px;
++ height: 110px;
+ }
+
+ /* [HiDPI]
+@@ -366,26 +317,6 @@ body[narrow] #restorePreviousSession::before {
background-image: url("chrome://branding/content/about-logo@2x.png");
}
@@ -108,13 +153,30 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi
- background-image: url("chrome://browser/content/abouthome/snippet2@2x.png");
- }
-
- .launchButton::before,
- #aboutMozilla::before {
- transform: scale(.5);
-diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozilla-release/browser/base/content/abouthome/aboutHome.js
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-10-25 20:27:08.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-11-05 04:10:11.565757913 -0200
-@@ -3,152 +3,44 @@
+- .launchButton::before,
+- #aboutMozilla::before {
+- transform: scale(.5);
+- transform-origin: 0 0;
+- }
+-
+ #downloads::before {
+ content: url("chrome://browser/content/abouthome/downloads@2x.png");
+ }
+@@ -421,9 +352,5 @@ body[narrow] #restorePreviousSession::before {
+ body[narrow] #restorePreviousSession::before {
+ content: url("chrome://browser/content/abouthome/restore@2x.png");
+ }
+-
+- #aboutMozilla::before {
+- content: url("chrome://browser/content/abouthome/mozilla@2x.png");
+- }
+ }
+
+diff --git a/browser/base/content/abouthome/aboutHome.js b/browser/base/content/abouthome/aboutHome.js
+index 432fcdc..8e85f1f 100644
+--- a/browser/base/content/abouthome/aboutHome.js
++++ b/browser/base/content/abouthome/aboutHome.js
+@@ -3,317 +3,99 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
const SEARCH_ENGINES = {
@@ -290,35 +352,59 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
- "https://www.mozilla.org/firefox/features/?utm_source=snippet&utm_medium=snippet&utm_campaign=default+feature+snippet"
-, "https://addons.mozilla.org/firefox/?utm_source=snippet&utm_medium=snippet&utm_campaign=addons"
-];
--
+
-const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
--
++// Bug with dom.storage.enabled set as false
++// We are using DDG as a default in this case.
++let gSearchEngine = {"name": "DuckDuckGo HTML", "searchUrl": "https://duckduckgo.com/html/?t=iceweasel&q=_searchTerms_"};
+
-// IndexedDB storage constants.
-const DATABASE_NAME = "abouthome";
-const DATABASE_VERSION = 1;
-const SNIPPETS_OBJECTSTORE_NAME = "snippets";
-
- // This global tracks if the page has been set up before, to prevent double inits
- let gInitialized = false;
- let gObserver = new MutationObserver(function (mutations) {
-@@ -156,7 +48,6 @@
- if (mutation.attributeName == "searchEngineURL") {
- setupSearchEngine();
- if (!gInitialized) {
+-// This global tracks if the page has been set up before, to prevent double inits
+-let gInitialized = false;
+-let gObserver = new MutationObserver(function (mutations) {
+- for (let mutation of mutations) {
+- if (mutation.attributeName == "searchEngineName") {
+- setupSearchEngine();
+- if (!gInitialized) {
- ensureSnippetsMapThen(loadSnippets);
- gInitialized = true;
- }
- return;
-@@ -177,117 +68,6 @@
- window.removeEventListener("resize", fitToWidth);
+- gInitialized = true;
+- }
+- return;
+- }
+- }
+-});
+-
+-window.addEventListener("pageshow", function () {
+- // Delay search engine setup, cause browser.js::BrowserOnAboutPageLoad runs
+- // later and may use asynchronous getters.
+- window.gObserver.observe(document.documentElement, { attributes: true });
+- fitToWidth();
+- window.addEventListener("resize", fitToWidth);
+-
+- // Ask chrome to update snippets.
+- var event = new CustomEvent("AboutHomeLoad", {bubbles:true});
+- document.dispatchEvent(event);
+-});
+-
+-window.addEventListener("pagehide", function() {
+- window.gObserver.disconnect();
+- window.removeEventListener("resize", fitToWidth);
++document.addEventListener("DOMContentLoaded", function init() {
++ setupSearchEngine();
});
++window.addEventListener("load", fitToWidth);
++window.addEventListener("resize", fitToWidth);
-// This object has the same interface as Map and is used to store and retrieve
-// the snippets data. It is lazily initialized by ensureSnippetsMapThen(), so
-// be sure its callback returned before trying to use it.
-let gSnippetsMap;
-let gSnippetsMapCallbacks = [];
--
+
-/**
- * Ensure the snippets map is properly initialized.
- *
@@ -328,7 +414,8 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
- * it may change inadvertently.
- */
-function ensureSnippetsMapThen(aCallback)
--{
++function onSearchSubmit(aEvent)
+ {
- if (gSnippetsMap) {
- aCallback(gSnippetsMap);
- return;
@@ -344,30 +431,44 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
- let invokeCallbacks = function () {
- if (!gSnippetsMap) {
- gSnippetsMap = Object.freeze(new Map());
-- }
++ let searchTerms = document.getElementById("searchText").value;
++ if (gSearchEngine && searchTerms.length > 0) {
++ const SEARCH_TOKENS = {
++ "_searchTerms_": encodeURIComponent(searchTerms)
+ }
-
- for (let callback of gSnippetsMapCallbacks) {
- callback(gSnippetsMap);
-- }
++ let url = gSearchEngine.searchUrl;
++ for (let key in SEARCH_TOKENS) {
++ url = url.replace(key, SEARCH_TOKENS[key]);
+ }
- gSnippetsMapCallbacks.length = 0;
-- }
--
++ window.location.href = url;
+ }
+
- let openRequest = indexedDB.open(DATABASE_NAME, DATABASE_VERSION);
--
++ aEvent.preventDefault();
++}
+
- openRequest.onerror = function (event) {
- // Try to delete the old database so that we can start this process over
- // next time.
- indexedDB.deleteDatabase(DATABASE_NAME);
- invokeCallbacks();
- };
--
+
- openRequest.onupgradeneeded = function (event) {
- let db = event.target.result;
- if (!db.objectStoreNames.contains(SNIPPETS_OBJECTSTORE_NAME)) {
- db.createObjectStore(SNIPPETS_OBJECTSTORE_NAME);
- }
-- }
--
++function setupSearchEngine()
++{
++ if (localStorage && localStorage["search-engine"]) {
++ gSearchEngine = JSON.parse(localStorage["search-engine"]);
+ }
+
- openRequest.onsuccess = function (event) {
- let db = event.target.result;
-
@@ -421,16 +522,80 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
-
- setTimeout(invokeCallbacks, 0);
- }
-- }
++
++ // Look for extended information, like logo and links.
++ var searchEngineInfo = SEARCH_ENGINES[gSearchEngine.name];
++ if (searchEngineInfo) {
++ for (let prop in searchEngineInfo)
++ gSearchEngine[prop] = searchEngineInfo[prop];
+ }
-}
--
- function onSearchSubmit(aEvent)
- {
- let searchTerms = document.getElementById("searchText").value;
-@@ -372,140 +152,6 @@
- }
+-function onSearchSubmit(aEvent)
+-{
+- let searchTerms = document.getElementById("searchText").value;
+- let engineName = document.documentElement.getAttribute("searchEngineName");
++ // Enqueue additional params if required by the engine definition.
++ if (gSearchEngine.params)
++ gSearchEngine.searchUrl += "&" + gSearchEngine.params;
+
+- if (engineName && searchTerms.length > 0) {
+- // Send an event that will perform a search and Firefox Health Report will
+- // record that a search from about:home has occurred.
+- let eventData = JSON.stringify({
+- engineName: engineName,
+- searchTerms: searchTerms
+- });
+- let event = new CustomEvent("AboutHomeSearchEvent", {detail: eventData});
+- document.dispatchEvent(event);
++ // Add search engine logo.
++ if (gSearchEngine.image) {
++ let logoElt = document.getElementById("searchEngineLogo");
++ logoElt.src = gSearchEngine.image;
++ logoElt.alt = gSearchEngine.name;
+ }
+- aEvent.preventDefault();
+-}
+-
+-
+-function setupSearchEngine()
+-{
+ // The "autofocus" attribute doesn't focus the form element
+ // immediately when the element is first drawn, so the
+ // attribute is also used for styling when the page first loads.
+@@ -322,173 +104,6 @@ function setupSearchEngine()
+ searchText.removeEventListener("blur", searchText_onBlur);
+ searchText.removeAttribute("autofocus");
+ });
+-
+- let searchEngineName = document.documentElement.getAttribute("searchEngineName");
+- let searchEngineInfo = SEARCH_ENGINES[searchEngineName];
+- let logoElt = document.getElementById("searchEngineLogo");
+-
+- // Add search engine logo.
+- if (searchEngineInfo && searchEngineInfo.image) {
+- logoElt.parentNode.hidden = false;
+- logoElt.src = searchEngineInfo.image;
+- logoElt.alt = searchEngineName;
+- searchText.placeholder = "";
+- }
+- else {
+- logoElt.parentNode.hidden = true;
+- searchText.placeholder = searchEngineName;
+- }
+-
+-}
+-
+-/**
+- * Inform the test harness that we're done loading the page.
+- */
+-function loadSucceeded()
+-{
+- var event = new CustomEvent("AboutHomeLoadSnippetsSucceeded", {bubbles:true});
+- document.dispatchEvent(event);
+-}
+-
-/**
- * Update the local snippets from the remote storage, then show them through
- * showSnippets.
@@ -440,6 +605,10 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
- if (!gSnippetsMap)
- throw new Error("Snippets map has not properly been initialized");
-
+- // Allow tests to modify the snippets map before using it.
+- var event = new CustomEvent("AboutHomeLoadSnippets", {bubbles:true});
+- document.dispatchEvent(event);
+-
- // Check cached snippets version.
- let cachedVersion = gSnippetsMap.get("snippets-cached-version") || 0;
- let currentVersion = document.documentElement.getAttribute("snippetsVersion");
@@ -460,6 +629,7 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
- xhr.open("GET", updateURL, true);
- } catch (ex) {
- showSnippets();
+- loadSucceeded();
- return;
- }
- // Even if fetching should fail we don't want to spam the server, thus
@@ -475,10 +645,12 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
- gSnippetsMap.set("snippets-cached-version", currentVersion);
- }
- showSnippets();
+- loadSucceeded();
- };
- xhr.send(null);
- } else {
- showSnippets();
+- loadSucceeded();
- }
-}
-
@@ -563,15 +735,14 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil
- }
- // Move the default snippet to the snippets element.
- snippetsElt.appendChild(entry);
--}
--
+ }
+
function fitToWidth() {
- if (window.scrollMaxX) {
- document.body.setAttribute("narrow", "true");
-diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mozilla-release/browser/base/content/abouthome/aboutHome.xhtml
---- mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml 2013-10-25 20:27:08.000000000 -0200
-+++ mozilla-release/browser/base/content/abouthome/aboutHome.xhtml 2013-11-05 03:57:12.962327229 -0200
-@@ -43,15 +43,6 @@
+diff --git a/browser/base/content/abouthome/aboutHome.xhtml b/browser/base/content/abouthome/aboutHome.xhtml
+index 1d03d38..fda3095 100644
+--- a/browser/base/content/abouthome/aboutHome.xhtml
++++ b/browser/base/content/abouthome/aboutHome.xhtml
+@@ -43,30 +43,9 @@
<input id="searchSubmit" type="submit" value="&abouthome.searchEngineButton.label;"/>
</form>
</div>
@@ -587,9 +758,290 @@ diff -Nur mozilla-release.orig/browser/base/content/abouthome/aboutHome.xhtml mo
</div>
<div class="spacer"/>
-diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties
---- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-10-25 20:27:09.000000000 -0200
-+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-11-05 04:16:11.884325686 -0200
+- <div id="launcher">
+- <button class="launchButton" id="downloads">&abouthome.downloadsButton.label;</button>
+- <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button>
+- <button class="launchButton" id="history">&abouthome.historyButton.label;</button>
+- <button class="launchButton" id="apps" hidden="true">&abouthome.appsButton.label;</button>
+- <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button>
+- <button class="launchButton" id="sync">&abouthome.syncButton.label;</button>
+- <button class="launchButton" id="settings">&abouthome.settingsButton.label;</button>
+- <div id="restorePreviousSessionSeparator"/>
+- <button class="launchButton" id="restorePreviousSession">&historyRestoreLastSession.label;</button>
+- </div>
+-
+- <a id="aboutMozilla" href="https://www.mozilla.org/about/?utm_source=about-home&amp;utm_medium=Referral"/>
++ <a id="aboutGNU" href="http://gnu.org"></a>
+ </body>
+ </html>
+diff --git a/browser/base/content/content.js b/browser/base/content/content.js
+index 9428613..fc3c00a 100644
+--- a/browser/base/content/content.js
++++ b/browser/base/content/content.js
+@@ -50,216 +50,3 @@ if (Services.prefs.getBoolPref("browser.tabs.remote")) {
+ LoginManagerContent.onUsernameInput(event);
+ });
+ }
+-
+-let AboutHomeListener = {
+- init: function(chromeGlobal) {
+- chromeGlobal.addEventListener('AboutHomeLoad', () => this.onPageLoad(), false, true);
+- },
+-
+- handleEvent: function(aEvent) {
+- switch (aEvent.type) {
+- case "AboutHomeLoad":
+- this.onPageLoad();
+- break;
+- }
+- },
+-
+- receiveMessage: function(aMessage) {
+- switch (aMessage.name) {
+- case "AboutHome:Update":
+- this.onUpdate(aMessage.data);
+- break;
+- }
+- },
+-
+- onUpdate: function(aData) {
+- let doc = content.document;
+- if (doc.documentURI.toLowerCase() != "about:home")
+- return;
+-
+- if (aData.showRestoreLastSession && !PrivateBrowsingUtils.isWindowPrivate(content))
+- doc.getElementById("launcher").setAttribute("session", "true");
+-
+- // Inject search engine and snippets URL.
+- let docElt = doc.documentElement;
+- // set the following attributes BEFORE searchEngineName, which triggers to
+- // show the snippets when it's set.
+- docElt.setAttribute("snippetsURL", aData.snippetsURL);
+- if (aData.showKnowYourRights)
+- docElt.setAttribute("showKnowYourRights", "true");
+- docElt.setAttribute("snippetsVersion", aData.snippetsVersion);
+- docElt.setAttribute("searchEngineName", Services.search.defaultEngine.name);
+- },
+-
+- onPageLoad: function() {
+- let doc = content.document;
+- if (doc.documentURI.toLowerCase() != "about:home" ||
+- doc.documentElement.hasAttribute("hasBrowserHandlers")) {
+- return;
+- }
+-
+- doc.documentElement.setAttribute("hasBrowserHandlers", "true");
+- let updateListener = this;
+- addMessageListener("AboutHome:Update", updateListener);
+- addEventListener("click", this.onClick, true);
+- addEventListener("pagehide", function onPageHide(event) {
+- if (event.target.defaultView.frameElement)
+- return;
+- removeMessageListener("AboutHome:Update", updateListener);
+- removeEventListener("click", this.onClick, true);
+- removeEventListener("pagehide", onPageHide, true);
+- if (event.target.documentElement)
+- event.target.documentElement.removeAttribute("hasBrowserHandlers");
+- }, true);
+-
+- // XXX bug 738646 - when Marketplace is launched, remove this statement and
+- // the hidden attribute set on the apps button in aboutHome.xhtml
+- if (Services.prefs.getPrefType("browser.aboutHome.apps") == Services.prefs.PREF_BOOL &&
+- Services.prefs.getBoolPref("browser.aboutHome.apps"))
+- doc.getElementById("apps").removeAttribute("hidden");
+-
+- sendAsyncMessage("AboutHome:RequestUpdate");
+-
+- doc.addEventListener("AboutHomeSearchEvent", function onSearch(e) {
+- sendAsyncMessage("AboutHome:Search", { searchData: e.detail });
+- }, true, true);
+- },
+-
+- onClick: function(aEvent) {
+- if (!aEvent.isTrusted || // Don't trust synthetic events
+- aEvent.button == 2 || aEvent.target.localName != "button") {
+- return;
+- }
+-
+- let originalTarget = aEvent.originalTarget;
+- let ownerDoc = originalTarget.ownerDocument;
+- let elmId = originalTarget.getAttribute("id");
+-
+- switch (elmId) {
+- case "restorePreviousSession":
+- sendAsyncMessage("AboutHome:RestorePreviousSession");
+- ownerDoc.getElementById("launcher").removeAttribute("session");
+- break;
+-
+- case "downloads":
+- sendAsyncMessage("AboutHome:Downloads");
+- break;
+-
+- case "bookmarks":
+- sendAsyncMessage("AboutHome:Bookmarks");
+- break;
+-
+- case "history":
+- sendAsyncMessage("AboutHome:History");
+- break;
+-
+- case "apps":
+- sendAsyncMessage("AboutHome:Apps");
+- break;
+-
+- case "addons":
+- sendAsyncMessage("AboutHome:Addons");
+- break;
+-
+- case "sync":
+- sendAsyncMessage("AboutHome:Sync");
+- break;
+-
+- case "settings":
+- sendAsyncMessage("AboutHome:Settings");
+- break;
+- }
+- },
+-};
+-AboutHomeListener.init(this);
+-
+-
+-var global = this;
+-
+-let ClickEventHandler = {
+- init: function init() {
+- Cc["@mozilla.org/eventlistenerservice;1"]
+- .getService(Ci.nsIEventListenerService)
+- .addSystemEventListener(global, "click", this, true);
+- },
+-
+- handleEvent: function(event) {
+- // Bug 903016: Most of this code is an unfortunate duplication from
+- // contentAreaClick in browser.js.
+- if (!event.isTrusted || event.defaultPrevented || event.button == 2)
+- return;
+-
+- let [href, node] = this._hrefAndLinkNodeForClickEvent(event);
+-
+- let json = { button: event.button, shiftKey: event.shiftKey,
+- ctrlKey: event.ctrlKey, metaKey: event.metaKey,
+- altKey: event.altKey, href: null, title: null,
+- bookmark: false };
+-
+- if (href) {
+- json.href = href;
+- if (node) {
+- json.title = node.getAttribute("title");
+-
+- if (event.button == 0 && !event.ctrlKey && !event.shiftKey &&
+- !event.altKey && !event.metaKey) {
+- json.bookmark = node.getAttribute("rel") == "sidebar";
+- if (json.bookmark)
+- event.preventDefault(); // Need to prevent the pageload.
+- }
+- }
+-
+- sendAsyncMessage("Content:Click", json);
+- return;
+- }
+-
+- // This might be middle mouse navigation.
+- if (event.button == 1)
+- sendAsyncMessage("Content:Click", json);
+- },
+-
+- /**
+- * Extracts linkNode and href for the current click target.
+- *
+- * @param event
+- * The click event.
+- * @return [href, linkNode].
+- *
+- * @note linkNode will be null if the click wasn't on an anchor
+- * element (or XLink).
+- */
+- _hrefAndLinkNodeForClickEvent: function(event) {
+- function isHTMLLink(aNode) {
+- // Be consistent with what nsContextMenu.js does.
+- return ((aNode instanceof content.HTMLAnchorElement && aNode.href) ||
+- (aNode instanceof content.HTMLAreaElement && aNode.href) ||
+- aNode instanceof content.HTMLLinkElement);
+- }
+-
+- let node = event.target;
+- while (node && !isHTMLLink(node)) {
+- node = node.parentNode;
+- }
+-
+- if (node)
+- return [node.href, node];
+-
+- // If there is no linkNode, try simple XLink.
+- let href, baseURI;
+- node = event.target;
+- while (node && !href) {
+- if (node.nodeType == content.Node.ELEMENT_NODE) {
+- href = node.getAttributeNS("http://www.w3.org/1999/xlink", "href");
+- if (href)
+- baseURI = node.ownerDocument.baseURIObject;
+- }
+- node = node.parentNode;
+- }
+-
+- // In case of XLink, we don't return the node we got href from since
+- // callers expect <a>-like elements.
+- // Note: makeURI() will throw if aUri is not a valid URI.
+- return [href ? makeURI(href, null, baseURI).spec : null, null];
+- }
+-};
+-ClickEventHandler.init();
+diff --git a/browser/base/jar.mn b/browser/base/jar.mn
+index f2a820c..9478039 100644
+--- a/browser/base/jar.mn
++++ b/browser/base/jar.mn
+@@ -33,7 +33,7 @@ browser.jar:
+ content/browser/abouthome/settings.png (content/abouthome/settings.png)
+ content/browser/abouthome/restore.png (content/abouthome/restore.png)
+ content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png)
+- content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png)
++ content/browser/abouthome/gnu_headshadow.png (content/abouthome/gnu_headshadow.png)
+ content/browser/abouthome/snippet1@2x.png (content/abouthome/snippet1@2x.png)
+ content/browser/abouthome/snippet2@2x.png (content/abouthome/snippet2@2x.png)
+ content/browser/abouthome/downloads@2x.png (content/abouthome/downloads@2x.png)
+@@ -45,7 +45,6 @@ browser.jar:
+ content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png)
+ content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png)
+ content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png)
+- content/browser/abouthome/mozilla@2x.png (content/abouthome/mozilla@2x.png)
+ #ifdef MOZ_SERVICES_HEALTHREPORT
+ content/browser/abouthealthreport/abouthealth.xhtml (content/abouthealthreport/abouthealth.xhtml)
+ content/browser/abouthealthreport/abouthealth.js (content/abouthealthreport/abouthealth.js)
+diff --git a/browser/locales/en-US/chrome/browser/aboutHome.dtd b/browser/locales/en-US/chrome/browser/aboutHome.dtd
+index e84341f..5476d32 100644
+--- a/browser/locales/en-US/chrome/browser/aboutHome.dtd
++++ b/browser/locales/en-US/chrome/browser/aboutHome.dtd
+@@ -13,17 +13,6 @@
+
+ <!ENTITY abouthome.searchEngineButton.label "Search">
+
+-<!-- LOCALIZATION NOTE (abouthome.defaultSnippet1.v1):
+- text in <a/> will be linked to the Firefox features page on mozilla.com
+--->
+-<!ENTITY abouthome.defaultSnippet1.v1 "Thanks for choosing Firefox! To get the most out of your browser, learn more about the <a>latest features</a>.">
+-<!-- LOCALIZATION NOTE (abouthome.defaultSnippet2.v1):
+- text in <a/> will be linked to the featured add-ons on addons.mozilla.org
+--->
+-<!ENTITY abouthome.defaultSnippet2.v1 "It's easy to customize your Firefox exactly the way you want it. <a>Choose from thousands of add-ons</a>.">
+-<!-- LOCALIZATION NOTE (abouthome.rightsSnippet): text in <a/> will be linked to about:rights -->
+-<!ENTITY abouthome.rightsSnippet "&brandFullName; is free and open source software from the non-profit Mozilla Foundation. <a>Know your rights…</a>">
+-
+ <!ENTITY abouthome.bookmarksButton.label "Bookmarks">
+ <!ENTITY abouthome.historyButton.label "History">
+ <!ENTITY abouthome.settingsButton.label "Settings">
+diff --git a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
+index 087cc50..5654eb9 100644
+--- a/browser/locales/en-US/chrome/browser-region/region.properties
++++ b/browser/locales/en-US/chrome/browser-region/region.properties
@@ -3,17 +3,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -612,7 +1064,7 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
# increment this number when anything gets changed in the list below. This will
# cause Firefox to re-read these prefs and inject any new handlers into the
-@@ -22,20 +17,10 @@
+@@ -22,20 +17,10 @@ browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s
# don't make any spelling errors here.
gecko.handlerService.defaultHandlersVersion=4
@@ -637,9 +1089,10 @@ diff -Nur mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio
-gecko.handlerService.schemes.ircs.0.uriTemplate=https://www.mibbit.com/?url=%s
+gecko.handlerService.schemes.ircs.0.name=Freenode Web IRC
+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net
-diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in mozilla-release/browser/locales/generic/profile/bookmarks.html.in
---- mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in 2013-10-25 20:27:09.000000000 -0200
-+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in 2013-11-05 03:57:12.972326552 -0200
+diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
+index e925c1e..5101035 100644
+--- a/browser/locales/generic/profile/bookmarks.html.in
++++ b/browser/locales/generic/profile/bookmarks.html.in
@@ -15,13 +15,20 @@
<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
<DD>@bookmarks_toolbarfolder_description@
@@ -657,7 +1110,7 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
+ <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre</A>
+ <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Packages</A>
+ <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Wiki</A>
-+ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAA/klEQVQ4jWP4TyFgGAYGLN25iDID+pd0UGbAxMUTUQT+fP36/9+/f2A2jMZrwKyNEC/8+P71/6/ijP9/fv/+/23Hzv+fly/9/7m7+//XkuL/7yvL/j+PCf3/qrn+/+ed2/7/evocZPr/b3fu/Ge4cuf6/2/fPv5PnaD9f720wP9lyir/F0kI/V8myv9/jbjA/w3i/P+XC/H8n8Uv8H+6kOj/JZIS/2eqaP2/umPP/88/fv5nADnz+cuX/x0S9f8n6Kv/jxGQ+R8vJPu/x9D+/2wrz//9hnb/mzVM/5fKav4vMbL835OZ+//ty9dw7zFcuPuYKL/iDAOydY4aAAcA33O6tzziloYAAAAASUVORK5CYII=">Parabola GNU/Linux-libre Labs</A>
++ <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABL0lEQVQ4jWNgoCcoq16VU1GzygnEBtEVDWuV8GooKFuhWVG3uiM3d5UokG4qr1szAaa5vGbVt4ralacwNDU0rGIrr10VBVG0+lxhwyqVsqqVtRW1q6eD5IvL19oB2V+B+D9QzQu4xtDQVZylVavygRKHqurWOlbUrknKK12qWlCwWLK8elUFA8N/xvLy5VYVtas+gzWDDVi9E2QjT1XdcufymjWpQJt1cXmnvHwVP1DzR7hmIC6vW+kOtpnYQKysW30arrlm9RVi9cFBRfXKJTADympWJZNsQFnN6rUQA1adAQU2SZqBXmUGBtozUDiU1qxQJtl2oCY3kO2l1avCSdYMAsBAWwyM2plkaS4p6eYGOv1YQ0MDB1kGlFWuDChuWKZBlmYQqK5eJU22ZkIAAEIlnQZQkzITAAAAAElFTkSuQmCC">Parabola GNU/Linux-libre Labs</A>
+ </DL><p>
+ <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
+ <DL><p>
@@ -667,49 +1120,101 @@ diff -Nur mozilla-release.orig/browser/locales/generic/profile/bookmarks.html.in
+ <DT><A HREF="http://www.h-node.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABgElEQVQ4jaXRz2uSARzHcb0vlRGEzTVWISU1BVkFYTIyjNK1pKcxHA+yhWMWIamHYikFgpoLIi9jwegi3QbL9SzdLmMbM9J+DkJBgm5RDvEPeHeQHOyQz0OH9+V7ePGBr0pqpPmfVPsP8a0AR4MnMEwf48x9K0s/E8oAY9iEMOvD+8yP2qVjrhhRBnSN61n5sIpULqC+pGHh8wNlgEY8jPQXcGh4VXukDND5evYAl46odIuXtYdKAANSudAChO52/XeMZMohecCbcoGdH99Y+7LO72adT9+/4nh8nYOjBl7/SsoB8gBkpHk8T0S2K++pN3fRin3cfnFDHvCuWkI9rEMvHGEo5gbAHnXhnLF1BpZLeRaLOVT2A8Q3A5wMngXgWtKLxX9KPqC+rCWQvYkpeK4NWKcGOgO50ts2MJJ0cPreeQDciTHMchZYIhcwh2wcuqjn+ccwGm9v6wsTxxn0dVgQXZ7Ek3Agpq6QrcaQGmmebtxFSDkRU1fJVmL/BpT2ByV/3eDMhinRAAAAAElFTkSuQmCC">h-node</A>
</DL><p>
</DL><p>
-diff -Nur mozilla-release.orig/dom/ipc/test.xul mozilla-release/dom/ipc/test.xul
---- mozilla-release.orig/dom/ipc/test.xul 2013-10-25 20:27:14.000000000 -0200
-+++ mozilla-release/dom/ipc/test.xul 2013-11-05 03:57:12.982325866 -0200
-@@ -302,6 +302,6 @@
- oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
- </toolbar>
-
-- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
- <label id="messageLog" value="" crop="center"/>
- </window>
-diff -Nur mozilla-release.orig/layout/ipc/test-ipcbrowser.xul mozilla-release/layout/ipc/test-ipcbrowser.xul
---- mozilla-release.orig/layout/ipc/test-ipcbrowser.xul 2013-10-25 20:27:28.000000000 -0200
-+++ mozilla-release/layout/ipc/test-ipcbrowser.xul 2013-11-05 03:57:12.982325866 -0200
-@@ -73,6 +73,6 @@
- label="setViewportScale"/>
- </toolbar>
-
-- <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+ <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
- remote="true"/>
- </window>
-diff -Nur mozilla-release.orig/modules/libpref/src/init/all.js mozilla-release/modules/libpref/src/init/all.js
---- mozilla-release.orig/modules/libpref/src/init/all.js 2013-11-05 03:52:59.219584174 -0200
-+++ mozilla-release/modules/libpref/src/init/all.js 2013-11-05 03:57:12.985658973 -0200
-@@ -4255,20 +4255,6 @@
- // Disable freeing dirty pages when minimizing memory.
- pref("memory.free_dirty_pages", false);
-
--pref("social.enabled", false);
--// comma separated list of domain origins (e.g. https://domain.com) for
--// providers that can install from their own website without user warnings.
--// entries are
--pref("social.whitelist", "https://mozsocial.cliqz.com,https://now.msn.com,https://mixi.jp");
--// omma separated list of domain origins (e.g. https://domain.com) for directory
--// websites (e.g. AMO) that can install providers for other sites
--pref("social.directories", "https://addons.mozilla.org");
--// remote-install allows any website to activate a provider, with extended UI
--// notifying user of installation. we can later pref off remote install if
--// necessary. This does not affect whitelisted and directory installs.
--pref("social.remote-install.enabled", true);
--pref("social.toast-notifications.enabled", true);
--
- // Disable idle observer fuzz, because only privileged content can access idle
- // observers (bug 780507).
- pref("dom.idle-observers-api.fuzz_time.disabled", true);
+diff --git a/browser/modules/AboutHome.jsm b/browser/modules/AboutHome.jsm
+index 98c443d..0173762 100644
+--- a/browser/modules/AboutHome.jsm
++++ b/browser/modules/AboutHome.jsm
+@@ -8,7 +8,7 @@ let Cc = Components.classes;
+ let Ci = Components.interfaces;
+ let Cu = Components.utils;
+
+-this.EXPORTED_SYMBOLS = [ "AboutHomeUtils", "AboutHome" ];
++this.EXPORTED_SYMBOLS = [ "AboutHome" ];
+
+ Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
+ Components.utils.import("resource://gre/modules/Services.jsm");
+@@ -16,66 +16,6 @@ Components.utils.import("resource://gre/modules/Services.jsm");
+ XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils",
+ "resource://gre/modules/PrivateBrowsingUtils.jsm");
+
+-// Url to fetch snippets, in the urlFormatter service format.
+-const SNIPPETS_URL_PREF = "browser.aboutHomeSnippets.updateUrl";
+-
+-// Should be bumped up if the snippets content format changes.
+-const STARTPAGE_VERSION = 4;
+-
+-this.AboutHomeUtils = {
+- get snippetsVersion() STARTPAGE_VERSION,
+-
+- /*
+- * showKnowYourRights - Determines if the user should be shown the
+- * about:rights notification. The notification should *not* be shown if
+- * we've already shown the current version, or if the override pref says to
+- * never show it. The notification *should* be shown if it's never been seen
+- * before, if a newer version is available, or if the override pref says to
+- * always show it.
+- */
+- get showKnowYourRights() {
+- // Look for an unconditional override pref. If set, do what it says.
+- // (true --> never show, false --> always show)
+- try {
+- return !Services.prefs.getBoolPref("browser.rights.override");
+- } catch (e) { }
+- // Ditto, for the legacy EULA pref.
+- try {
+- return !Services.prefs.getBoolPref("browser.EULA.override");
+- } catch (e) { }
+-
+-#ifndef MOZILLA_OFFICIAL
+- // Non-official builds shouldn't show the notification.
+- return false;
+-#endif
+-
+- // Look to see if the user has seen the current version or not.
+- var currentVersion = Services.prefs.getIntPref("browser.rights.version");
+- try {
+- return !Services.prefs.getBoolPref("browser.rights." + currentVersion + ".shown");
+- } catch (e) { }
+-
+- // Legacy: If the user accepted a EULA, we won't annoy them with the
+- // equivalent about:rights page until the version changes.
+- try {
+- return !Services.prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted");
+- } catch (e) { }
+-
+- // We haven't shown the notification before, so do so now.
+- return true;
+- }
+-};
+-
+-/**
+- * Returns the URL to fetch snippets from, in the urlFormatter service format.
+- */
+-XPCOMUtils.defineLazyGetter(AboutHomeUtils, "snippetsURL", function() {
+- let updateURL = Services.prefs
+- .getCharPref(SNIPPETS_URL_PREF)
+- .replace("%STARTPAGE_VERSION%", STARTPAGE_VERSION);
+- return Services.urlFormatter.formatURL(updateURL);
+-});
+-
+ /**
+ * This code provides services to the about:home page. Whenever
+ * about:home needs to do something chrome-privileged, it sends a
+@@ -185,17 +125,8 @@ let AboutHome = {
+ ss.promiseInitialized.then(function() {
+ let data = {
+ showRestoreLastSession: ss.canRestoreLastSession,
+- snippetsURL: AboutHomeUtils.snippetsURL,
+- showKnowYourRights: AboutHomeUtils.showKnowYourRights,
+- snippetsVersion: AboutHomeUtils.snippetsVersion
+ };
+
+- if (AboutHomeUtils.showKnowYourRights) {
+- // Set pref to indicate we've shown the notification.
+- let currentVersion = Services.prefs.getIntPref("browser.rights.version");
+- Services.prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true);
+- }
+-
+ if (target) {
+ target.messageManager.sendAsyncMessage("AboutHome:Update", data);
+ } else {
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index d2ea098d2..957ea0dbf 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -29,6 +29,7 @@ ac_add_options --enable-pulseaudio
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-installer
+ac_add_options --disable-debug-symbols
# Parabola features
ac_add_options --disable-safe-browsing
diff --git a/libre/iceweasel-libre/replace-urls.txt b/libre/iceweasel-libre/replace-urls.txt
deleted file mode 100644
index 278dd1a74..000000000
--- a/libre/iceweasel-libre/replace-urls.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-# These are replaced in order, so if one is a subset of another, the smaller one should be last
-# These are whitespace-separated EREs, comments are lines starting with '#'
-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell-
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? http://directory.fsf.org/wiki/GNU_IceCat
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" http://directory.fsf.org/wiki/GNU_IceCat"
-https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ http://directory.fsf.org/wiki/GNU_IceCat
-
-https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ http://directory.fsf.org/wiki/GNU_IceCat
-
-https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ http://directory.fsf.org/wiki/GNU_IceCat.\2/
-
-https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php http://directory.fsf.org/wiki/GNU_IceCat
-#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php
-#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php
-
-"https?://addons\.mozilla\.org/" "http://directory.fsf.org/wiki/GNU_IceCat"
-
-# hack: these aren't URLs, per se
-(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1directory.fsf.org/wiki/GNU_IceCat
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index 7ff26b3b0..9cd3b1a43 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 99237 2013-10-26 10:36:31Z spupykin $
+# $Id: PKGBUILD 102928 2013-12-24 09:48:04Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=iceweasel-noscript
-pkgver=2.6.8.4
+pkgver=2.6.8.8
pkgrel=1
pkgdesc="plugin for iceweasel which disables script"
arch=('any')
@@ -14,7 +14,7 @@ depends=()
provides=$_pkgname=$pkgver
makedepends=('unzip')
source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi)
-md5sums=('3096cfcd43988c7a2f0caa031dc74d51')
+md5sums=('55c2fe321a121b9708afb147d655adeb')
package() {
# _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-`
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 880197912..93d55bbac 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198792 2013-11-04 15:15:20Z andrea $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,7 +6,7 @@
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml' 'nepomuk-widgets')
source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
'konq-about-fsdg.diff')
-sha1sums=('f2a6f4220efe395c124d8981edaaca0a462640b5'
+sha1sums=('e85b5445380e44894efcaa21f4c95fad1ed4c4f6'
'd6cbb53c04179b8180f9439eca156b7ff2e76b3a')
pkgdesc='KDE File Manager & Web Browser, without Google and nonfree software recommendation'
depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index 581317fff..5be70de9c 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198793 2013-11-04 15:15:34Z andrea $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers"
arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ provides=("${_pkgname}=${pkgver}")
depends=("kdelibs>=${pkgver}" 'kactivities' 'smbclient' 'libssh' 'libcanberra'
'oxygen-icons' 'xorg-xauth' 'libwebp')
makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
- 'networkmanager')
+ 'networkmanager' 'boost')
optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org'
'gdb: needed by DrKonqi to generate backtrace'
'htdig: to build the search index in the KHelpCenter'
@@ -26,7 +26,7 @@ install="${_pkgname}.install"
source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
'duckduckgo_html.desktop'
'duckduckgo_lite.desktop')
-sha1sums=('c9af4e5e52018caf26113075f7ec5903122e43d5'
+sha1sums=('7c077b5ff2839fee1cc55016cd6711da1abb584c'
'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd'
'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b')
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 6cee072a4..5929de23d 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 198988 2013-11-05 20:44:40Z andrea $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdelibs
pkgname=kdelibs-libre
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
-pkgdesc="KDE Core Libraries"
+pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
arch=('i686' 'x86_64' 'mips64el')
url='https://projects.kde.org/projects/kde/kdelibs'
license=('GPL' 'LGPL' 'FDL')
@@ -24,7 +24,7 @@ install=${_pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
'kde-applications-menu.patch' 'qt4.patch'
'khtml-fsdg.diff')
-sha1sums=('42bda7ca352b3f700af91262636380aa71d07519'
+sha1sums=('a510f9dc2675c5656af00a92f81b747129ff70d1'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'ed1f57ee661e5c7440efcaba7e51d2554709701c'
'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 31ccd5275..46e2732a5 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,42 +1,37 @@
-# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Instant Messenger, without skype support'
url='http://kde.org/applications/internet/kopete/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn'
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' 'libidn'
'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp')
makedepends=('cmake' 'automoc4' 'boost')
install=${_pkgname}.install
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
- 'libotr3.patch'
- 'mediastreamer29.patch')
-sha1sums=('70fd03fb955574f4eba733d590ce15c841fd8805'
- '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
- '317683a5c2acd0a0058c5ab42f6006e9db511ef3')
+source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz")
+sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875')
prepare() {
cd kopete-${pkgver}
- patch -p2 -i "${srcdir}"/libotr3.patch
- patch -p1 -i "${srcdir}"/mediastreamer29.patch
# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
rm -rf protocols/skype
sed 's/, Skype//' -i doc/index.docbook
+ cd ..
+ mkdir build
}
build() {
- mkdir build
cd build
cmake ../kopete-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/libre/kdenetwork-kopete-libre/libotr3.patch b/libre/kdenetwork-kopete-libre/libotr3.patch
deleted file mode 100644
index 1e96c98d6..000000000
--- a/libre/kdenetwork-kopete-libre/libotr3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
---- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600
-+++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700
-@@ -13,13 +13,13 @@
- SET(LIBOTR_FIND_QUIETLY TRUE)
- ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
-
--FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
-+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
-
--FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
-+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
-
--# Determine version information from libotr/version.h
-+# Determine version information from libotr3/version.h
- IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
-- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
-+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
- STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
- STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
- # Check if version is at least 3.2.0
-diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
---- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700
-@@ -26,7 +26,7 @@
- */
-
- extern "C"{
--#include "libotr/proto.h"
-+#include "libotr3/proto.h"
- }
-
- #include "kopetechatsession.h"
-diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
---- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700
-@@ -36,10 +36,10 @@
- #include "authenticationwizard.h"
-
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
- }
-
-
-diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
---- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700
-@@ -32,11 +32,11 @@
- #include <kopetechatsession.h>
-
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
--#include <libotr/context.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
-+#include <libotr3/context.h>
- }
-
- class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/libre/kdenetwork-kopete-libre/mediastreamer29.patch b/libre/kdenetwork-kopete-libre/mediastreamer29.patch
deleted file mode 100644
index eb0b2297e..000000000
--- a/libre/kdenetwork-kopete-libre/mediastreamer29.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-index 88fdbd1..57c6c05 100644
---- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
- LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
- pt_ = i->id;
- audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
-- port2 = rtp_session_get_local_port(audio_stream_->session);
-+ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
- first = false;
- }
- }
-@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
- // working with a buggy client; let's try PCMU.
- LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
- audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
-- port2 = rtp_session_get_local_port(audio_stream_->session);
-+ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
- }
-
- return true;
diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD
index 3d06c6054..96dca0a5d 100644
--- a/libre/kdepim-libre/PKGBUILD
+++ b/libre/kdepim-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre'
'kdepim-ktimetracker-libre'
'kdepim-ktnef-libre'
'kdepim-libkdepim-libre')
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
url='http://pim.kde.org'
@@ -31,7 +31,7 @@ groups=('kde' 'kdepim-libre')
makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
'kde-agent' 'nepomuk-widgets' 'link-grammar')
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz")
-sha1sums=('627b027bb276c41ac8a1face093e777bfafcabf0')
+sha1sums=('1ca184dc89f8c8395ffe4ec62a3fdcd0a7397ac4')
build() {
mkdir build
@@ -67,8 +67,6 @@ package_kdepim-akregator-libre() {
install='kdepim-akregator.install'
cd "${srcdir}"/build/akregator
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/akregator
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/akregator
make DESTDIR="${pkgdir}" install
}
@@ -83,15 +81,13 @@ package_kdepim-blogilo-libre() {
install='kdepim.install'
cd "${srcdir}"/build/blogilo
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/blogilo
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/composereditor-ng
make DESTDIR="${pkgdir}" install
}
package_kdepim-console-libre() {
pkgdesc='Command line tool for accessing calendar files, without nonfree pilot-link support'
- depends=('kdepim-runtime')
+ depends=('kdepim-libkdepim')
url='http://pim.kde.org'
replaces=('kdepim-console')
conflicts=('kdepim-console')
@@ -99,10 +95,6 @@ package_kdepim-console-libre() {
install='kdepim.install'
cd "${srcdir}"/build/console
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kabcclient
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/konsolekalendar
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kaddressbook-libre() {
@@ -113,12 +105,11 @@ package_kdepim-kaddressbook-libre() {
conflicts=('kdepim-kaddressbook')
provides=("kdepim-kaddressbook=${pkgver}")
install='kdepim.install'
- cd "${srcdir}"/build/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
+ for i in kaddressbook kontact/plugins/kaddressbook \
+ plugins/kaddressbook contactthemeeditor; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
}
package_kdepim-kalarm-libre() {
@@ -131,8 +122,6 @@ package_kdepim-kalarm-libre() {
install='kdepim.install'
cd "${srcdir}"/build/kalarm
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kalarm
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kjots-libre() {
@@ -145,8 +134,6 @@ package_kdepim-kjots-libre() {
install='kdepim.install'
cd "${srcdir}"/build/kjots
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kjots
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/kjots
make DESTDIR="${pkgdir}" install
}
@@ -161,10 +148,6 @@ package_kdepim-kleopatra-libre() {
provides=("kdepim-kleopatra=${pkgver}")
cd "${srcdir}"/build/kleopatra
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kleopatra
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kwatchgnupg
- make DESTDIR="${pkgdir}" install
}
package_kdepim-kmail-libre() {
@@ -177,12 +160,12 @@ package_kdepim-kmail-libre() {
replaces=('kdepim-kmail' 'kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
'kdepim-mimelib' 'kdepim-plugins')
provides=("kdepim-kmail=${pkgver}")
- for i in kmail doc/kmail kmailcvt archivemailagent \
- importwizard ksendemail libksieve messagelist mailfilteragent \
- ontologies kontact/plugins/kmail headerthemeeditor; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
+ for i in kmail kmailcvt agents/archivemailagent agents/folderarchiveagent\
+ agents/mailfilteragent importwizard ksendemail libksieve messagelist \
+ ontologies kontact/plugins/kmail headerthemeeditor mboximporter; do
+ cd "${srcdir}"/build/${i}
+ make DESTDIR="${pkgdir}" install
+ done
}
package_kdepim-knode-libre() {
@@ -195,10 +178,6 @@ package_kdepim-knode-libre() {
install='kdepim-knode.install'
cd "${srcdir}"/build/knode
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kioslave/news
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/knode
make DESTDIR="${pkgdir}" install
}
@@ -213,8 +192,6 @@ package_kdepim-knotes-libre() {
install='kdepim.install'
cd "${srcdir}"/build/knotes
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knotes
- make DESTDIR="${pkgdir}" install
cd "${srcdir}"/build/kontact/plugins/knotes
make DESTDIR="${pkgdir}" install
}
@@ -227,8 +204,8 @@ package_kdepim-kontact-libre() {
conflicts=('kdepim-kontact' 'kdepim-kontactinterfaces')
replaces=('kdepim-kontact' 'kdepim-kontactinterfaces')
provides=("kdepim-kontact=${pkgver}")
- for i in kontact/src doc/kontact kontact/plugins/summary \
- kontact/plugins/specialdates doc/kontact-admin; do
+ for i in kontact/src kontact/plugins/summary \
+ kontact/plugins/specialdates; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
@@ -242,9 +219,8 @@ package_kdepim-korganizer-libre() {
conflicts=('kdepim-korganizer')
provides=("kdepim-korganizer=${pkgver}")
install='kdepim-korganizer.install'
- for i in korganizer doc/korganizer kontact/plugins/korganizer \
- calendarviews; do
- cd "${srcdir}"/build/${i}
+ for i in korganizer korgac kontact/plugins/korganizer calendarviews; do
+ cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
}
@@ -270,22 +246,18 @@ package_kdepim-ktimetracker-libre() {
install='kdepim.install'
cd "${srcdir}"/build/ktimetracker
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktimetracker
- make DESTDIR="${pkgdir}" install
}
package_kdepim-ktnef-libre() {
pkgdesc='A viewer/extractor for TNEF files, without nonfree pilot-link support'
depends=('kdebase-runtime' 'kdepimlibs')
url="https://projects.kde.org/projects/kde/kdepim/ktnef"
+ install=kdepim-ktnef.install
replaces=('kdepim-ktnef')
conflicts=('kdepim-ktnef')
provides=("kdepim-ktnef=${pkgver}")
- install=kdepim-ktnef.install
cd "${srcdir}"/build/ktnef
make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktnef
- make DESTDIR="${pkgdir}" install
}
package_kdepim-libkdepim-libre() {
@@ -298,11 +270,12 @@ package_kdepim-libkdepim-libre() {
replaces=('kdepim-libkdepim' 'kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
'kdepim-akonadi')
provides=("kdepim-libkdepim=${pkgver}")
- for i in akonadi_next calendarsupport incidenceeditor-ng \
- kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
- mailcommon mailimporter messagecomposer messagecore messageviewer \
- icons templateparser plugins/messageviewer grammar sendlateragent \
- plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
+ for i in agents/sendlateragent akonadi_next calendarsupport \
+ incidenceeditor-ng kaddressbookgrantlee kdgantt2 libkdepim \
+ libkdepimdbusinterfaces libkleo libkpgp mailcommon mailimporter \
+ messagecomposer messagecore messageviewer icons templateparser \
+ plugins/messageviewer grammar grantleetheme grantleethemeeditor \
+ plugins/ktexteditor pimactivity pimcommon pimsettingexporter; do
cd "${srcdir}"/build/${i}
make DESTDIR="${pkgdir}" install
done
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 434dc57a9..84aaaad77 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Archiving Tool, with unar support'
url='http://kde.org/applications/utilities/ark/'
@@ -20,7 +20,7 @@ replaces=('kdeutils-ark')
conflicts=('kdeutils-ark')
source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz"
'ark-unar-06.patch')
-sha1sums=('02488f636275729980f6d15cbab7c79cecf219c8'
+sha1sums=('d7b9fbf595b7fc7a67e52a8ad1f0977b07abd274'
'a0a836950f185d9b2245204579f969203036fdec')
build() {
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index 68412355b..c616282ec 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94168 2013-07-15 13:24:41Z bpiotrowski $
+# $Id: PKGBUILD 100489 2013-11-05 09:06:26Z bpiotrowski $
# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
# Maintainer: Mateusz Herych <heniekk@gmail.com>
# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
@@ -6,14 +6,13 @@
pkgname=libquicktime-libre
_pkgname=libquicktime
pkgver=1.2.4
-pkgrel=7
+pkgrel=8
pkgdesc="A library for reading and writing quicktime files, without nonfree faac support"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://libquicktime.sourceforge.net/"
depends=('gtk2' 'ffmpeg' 'libxv' 'libxaw' 'faad2')
makedepends=('mesa-libgl')
-options=('!libtool')
source=("http://downloads.sourceforge.net/sourceforge/$_pkgname/$_pkgname-$pkgver.tar.gz"
ffmpeg2.0.patch)
sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368'
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index a371f7733..569706f80 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,13 +4,13 @@
# Contributor: Márcio Silva <coadde@lavabit.com>
pkgbase=libretools
-pkgname=(libretools libretools-mips64el librelib libregit)
+pkgname=(libretools libretools-mips64el librelib gitget)
pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20131027
-_libretools_commit=11ca293c188ad394e2383381a4bce152cc7f0723
+pkgver=20131112
+_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0
_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390
_packages_url=https://projects.parabolagnulinux.org/packages
@@ -45,11 +45,15 @@ package_librelib() {
make install-librelib DESTDIR="$pkgdir"
}
-package_libregit() {
+package_gitget() {
depends=("librelib=$pkgver" git)
+ provides=("libregit=$pkgver")
+ conflicts=("libregit")
+ replaces=("libregit")
+
cd "$srcdir/$pkgbase-$_libretools_commit"
- make install-libregit DESTDIR="$pkgdir"
+ make install-gitget DESTDIR="$pkgdir"
}
package_libretools() {
@@ -83,5 +87,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('455f0ac438436b3580eb79dd9eb5a9e2'
+md5sums=('81e6d3d6fe1964a407a4520ce0916c0d'
'656008e8e35e6adba527b7bfc367b9f7')
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 0c4aa24af..0517b685e 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 192503 2013-08-13 10:47:26Z allan $
+# $Id: PKGBUILD 201421 2013-12-11 13:48:25Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=linux-libre-api-headers
-_basekernel=3.10
-_sublevel=6
+_basekernel=3.12
+_sublevel=4
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
pkgdesc="Kernel headers sanitized for use in userspace"
@@ -18,8 +18,8 @@ conflicts=('linux-api-headers')
replaces=('linux-api-headers')
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")
-md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '63a1c2aba22871f8e8dacdb4968d9a1f')
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+ 'ba123db2fbc72133d6292ca9aba51dd4')
build() {
cd ${srcdir}/linux-${_basekernel}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index 67c853582..a4e4f03ea 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -2,15 +2,14 @@
# Contributor: Márcio Silva <coadde@lavabit.com>
pkgname=linux-libre-firmware
-pkgver=3.11
+pkgver=3.12
pkgrel=1
pkgdesc='Free firmware files for Linux-libre'
arch=('any')
url=('http://linux-libre.fsfla.org/')
license=('GPL2')
depends=('ath9k-htc-firmware')
-provides=('linux-firmware'
- 'kernel26-firmware=2.6.34.99')
+provides=('linux-firmware')
conflicts=('linux-firmware'
'linux-firmware-git'
'kernel26-firmware'
@@ -23,8 +22,10 @@ conflicts=('linux-firmware'
'iwlwifi-6000-ucode'
'rt2870usb-fw'
'rt2x00-rt61-fw'
- 'rt2x00-rt71w-fw')
+ 'rt2x00-rt71w-fw'
+ 'amd-ucode')
replaces=('linux-firmware'
+ 'linux-firmware-git'
'kernel26-firmware'
'ar9170-fw'
'iwlwifi-1000-ucode'
@@ -35,9 +36,10 @@ replaces=('linux-firmware'
'iwlwifi-6000-ucode'
'rt2870usb-fw'
'rt2x00-rt61-fw'
- 'rt2x00-rt71w-fw')
+ 'rt2x00-rt71w-fw'
+ 'amd-ucode')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7')
+md5sums=('254f59707b6676b59ce5ca5c3c698319')
package() {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 8e8070111..8205a1b43 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 196788 2013-10-19 07:01:13Z andyrtr $
+# $Id: PKGBUILD 202368 2013-12-21 13:18:01Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.10
-_sublevel=17
+_sublevel=25
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.16 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.25 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,9 +33,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'3.10.6-logitech-dj.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
- '9a4ad6408ff3a2def1735f24b5ff02c5'
- '59a0759df09a59d48d0c470895c50cbb'
- 'ad7f5988deb617e3789f95d7e675860d'
+ '2b357d6f2048c46ed2f4ecee1b539fd8'
+ '85ce008eaacbb2fc54b81116d35cf946'
+ '16867e648e4b9f89bec949cb643888c2'
'c072b17032e80debc6a8626299245d46'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
@@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c'
'f3def2cefdcbb954c21d8505d23cc83c'
'd50c1ac47394e9aec637002ef3392bd1'
'3ff40ca684cfe719723e627e2cef7cea'
- '3b9f1cce64377f70eb8bf5978db629d5')
+ 'a294af0fcd2398c39d3d3b6dd2961323')
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-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 00d4f295b..942c1a052 100644
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -1425,7 +1425,7 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
# CONFIG_FW_LOADER_USER_HELPER is not set
# CONFIG_DEBUG_DRIVER is not set
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index 8dc57a685..b798887e7 100644
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -1396,7 +1396,7 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
# CONFIG_FW_LOADER_USER_HELPER is not set
# CONFIG_DEBUG_DRIVER is not set
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index 125d2ac50..877805172 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 185172 2013-05-11 17:49:25Z thomas $
+# $Id: PKGBUILD 199517 2013-11-13 23:06:20Z thomas $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=linux-libre-manpages
-pkgver=3.9
-pkgrel=1.1
+pkgver=3.12
+pkgrel=1
pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel"
arch=('any')
url="http://linux-libre.fsfla.org/"
@@ -15,7 +15,7 @@ replaces=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
conflicts=('kernel26-manpages' 'kernel26-libre-manpages' 'linux-manpages')
provides=('kernel26-manpages' 'linux-manpages')
source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/linux-libre-${pkgver}-gnu.tar.xz")
-md5sums=('120df29f88622dabf7015a22c7cc8e25')
+md5sums=('254f59707b6676b59ce5ca5c3c698319')
build() {
cd "${srcdir}/linux-$pkgver"
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 9a48c4dc4..700f45bc6 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98971 2013-10-21 20:21:06Z seblu $
+# $Id: PKGBUILD 102149 2013-12-05 21:51:01Z seblu $
# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -8,9 +8,9 @@ pkgname=('linux-libre-tools-meta'
'perf-libre'
'cpupower-libre'
'usbip-libre')
-_basekernel=3.11
-#_sublevel=6
-#_pkgver=$_basekernel.$_sublevel
+_basekernel=3.12
+_sublevel=3
+_pkgver=$_basekernel.$_sublevel
pkgver=$_basekernel
pkgrel=2
license=('GPL2')
@@ -28,13 +28,13 @@ makedepends+=('pciutils')
makedepends+=('glib2' 'sysfsutils')
groups=("$pkgbase")
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"
+ "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
'cpupower.default'
'cpupower.systemd'
'cpupower.service'
'usbipd.service')
-sha256sums=('f4ea56c7bc8b6c497562e7c36de9c7c1e67142aba694ff139bc1fb3d3b0193ee'
- #'a1ed93ea50bd6e19d2834556900c6ca3af37632b1eda3bde50ec9c305b7640fc'
+sha256sums=('66c1fa816cb4a3b2f6078e1f6256133697ca4cc4186758c58c2b4d0153ed3237'
+ '561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
'4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
diff --git a/libre/linux-libre/3.11-haswell-intel_pstate.patch b/libre/linux-libre/3.11-haswell-intel_pstate.patch
deleted file mode 100644
index 1f376b518..000000000
--- a/libre/linux-libre/3.11-haswell-intel_pstate.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6cdcdb793791f776ea9408581b1242b636d43b37 Mon Sep 17 00:00:00 2001
-From: Nell Hardcastle <nell@spicious.com>
-Date: Sun, 30 Jun 2013 22:58:57 +0000
-Subject: intel_pstate: Add Haswell CPU models
-
-Enable the intel_pstate driver for Haswell CPUs. One missing Ivy Bridge
-model (0x3E) is also included. Models referenced from
-tools/power/x86/turbostat/turbostat.c:has_nehalem_turbo_ratio_limit
-
-Signed-off-by: Nell Hardcastle <nell@spicious.com>
-Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
-Acked-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
----
-diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index 6efd96c..9733f29 100644
---- a/drivers/cpufreq/intel_pstate.c
-+++ b/drivers/cpufreq/intel_pstate.c
-@@ -522,6 +522,11 @@ static const struct x86_cpu_id intel_pstate_cpu_ids[] = {
- ICPU(0x2a, default_policy),
- ICPU(0x2d, default_policy),
- ICPU(0x3a, default_policy),
-+ ICPU(0x3c, default_policy),
-+ ICPU(0x3e, default_policy),
-+ ICPU(0x3f, default_policy),
-+ ICPU(0x45, default_policy),
-+ ICPU(0x46, default_policy),
- {}
- };
- MODULE_DEVICE_TABLE(x86cpu, intel_pstate_cpu_ids);
---
-cgit v0.9.2
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 46c34e0e3..6a8de151b 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 196776 2013-10-18 23:07:51Z thomas $
+# $Id: PKGBUILD 202239 2013-12-20 19:15:03Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.11
+_basekernel=3.12
_sublevel=6
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
@@ -30,20 +30,18 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'boot-logo.patch'
'change-default-console-loglevel.patch'
'criu-no-expert.patch'
- '3.11-haswell-intel_pstate.patch'
- "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.xz")
-md5sums=('7ec84223c7adcf01a5287eb7af96b7e7'
- '15dc0cd2ab1348d1af3475e7c539deb2'
- '0084545e67de0e321d90b11405ab3988'
- '615084511f033782ca7d29ab6165e5a1'
+ "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
+md5sums=('254f59707b6676b59ce5ca5c3c698319'
+ '4b18ce60daff87504e6740670edf6b50'
+ 'aa6614d1dbf46ab7d317bcde1e58f80c'
+ '3ecb40ee3bdd78e4d310c2afc1ccf209'
'e49ac236dfeef709f91a3d993ea7b62c'
'2967cecc3af9f954ccc822fd63dca6ff'
'8267264d9a8966e57fdacd1fa1fc65c4'
- '36e90334b12b2e9d53fd92129ee98f5b'
+ '44260d2cb1a8b51c119d2ce1f83e457a'
'98beb36f9b8cf16e58de2483ea9985e3'
'd50c1ac47394e9aec637002ef3392bd1'
- '1040ae6c10d4a68f89899f94a2318a17'
- '9ddc5a221ab7cd26bc27aab164a6f843')
+ '71bbddd5f9799aa045660d92baa05845')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
@@ -63,16 +61,14 @@ prepare() {
# add freedo as boot logo
patch -Np1 -i "${srcdir}/boot-logo.patch"
+ # fix issue on Hal8188EFWImg_CE.c deblobbed file
+ sed -i "\|DEBLOBBED| s|,||" drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+
# 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"
- # add intel haswell support to intel_pstate
- # https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6cdcdb793791f776ea9408581b1242b636d43b37
- # will be in 3.12
- patch -Np1 -i "${srcdir}/3.11-haswell-intel_pstate.patch"
-
# allow criu without expert option set
# patch from fedora
patch -Np1 -i "${srcdir}/criu-no-expert.patch"
diff --git a/libre/linux-libre/boot-logo.patch b/libre/linux-libre/boot-logo.patch
index cbd52ea22..3f4e0dea4 100644
--- a/libre/linux-libre/boot-logo.patch
+++ b/libre/linux-libre/boot-logo.patch
@@ -1,891 +1,1613 @@
diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
-index 285d552..c9d8373 100644
+index 3c14e43..c9d8373 100644
--- a/drivers/video/logo/logo_linux_clut224.ppm
+++ b/drivers/video/logo/logo_linux_clut224.ppm
-@@ -1,883 +1,861 @@
+@@ -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 11 15 17 33 49 54 59 85 92 73 97 106
--83 116 129 105 131 142 115 114 122 74 88 93 20 29 31 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 0 0 0 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 2 3 3 17 23 26 50 67 72 73 97 106 59 85 92 73 97 106
--105 131 142 124 127 131 105 131 142 105 131 142 53 75 83 6 8 8 0 0 0 0 0 0
--0 0 0 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 1 1 1 1 1 1 0 0 0
--0 0 0 1 1 1 26 35 39 59 85 92 59 85 92 59 85 92 29 43 47 53 75 83
--108 122 132 132 98 104 108 122 132 105 131 142 101 101 101 43 45 48 6 8 8 0 0 0
--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 1 1 1 0 0 0 0 0 0 0 0 0
--11 15 17 27 40 45 59 85 92 59 85 92 27 40 45 31 45 49 73 97 106 93 121 133
--108 122 132 108 122 132 105 131 142 108 122 132 105 131 142 73 97 106 26 35 39 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 1 1 1 7 12 13 21 31 35 42 59 64
--53 75 83 53 75 83 50 67 72 42 59 64 32 40 45 42 59 64 73 97 106 116 116 116
--132 98 104 116 116 116 108 122 132 117 104 110 105 131 142 83 116 129 50 67 72 7 12 13
--1 1 1 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 1 1 1 6 8 8 15 22 25 26 35 39 36 54 60 53 75 83 59 85 92
--59 85 92 48 63 69 15 22 25 12 17 20 52 67 79 94 94 94 132 98 104 132 98 104
--117 104 110 108 122 132 108 122 132 115 114 122 105 131 142 77 105 114 59 85 92 36 54 60
--7 12 13 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 15 22 25 29 43 47 36 54 60 42 59 64 42 59 64 48 63 69 21 31 35
--6 8 8 29 43 47 36 50 56 43 45 48 79 78 84 132 98 104 165 78 79 132 98 104
--108 122 132 117 104 110 117 104 110 108 122 132 77 105 114 73 97 106 95 131 149 78 102 129
--36 50 56 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
--
--27 40 45 53 75 83 48 63 69 24 31 37 6 8 12 0 0 0 18 25 28 26 35 39
--12 17 20 26 35 39 65 78 84 112 81 86 152 81 83 137 83 86 132 98 104 117 104 110
--117 104 110 132 98 104 132 98 104 115 114 122 73 97 106 53 75 83 95 131 149 93 124 152
--68 78 128 15 22 25 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
--
--36 50 56 21 30 33 4 7 7 0 0 0 1 1 1 17 12 12 69 31 31 68 59 64
--57 59 63 21 31 35 32 40 45 86 73 69 152 81 83 152 81 83 117 104 110 132 98 104
--152 81 83 132 98 104 108 122 132 77 105 114 77 105 114 93 121 133 95 131 149 93 124 152
--95 131 149 53 75 83 11 15 17 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
--
--17 23 26 2 3 3 0 0 0 17 12 12 69 31 31 123 55 55 123 55 55 152 81 83
--86 73 69 17 23 26 7 12 13 45 54 57 101 101 101 137 83 86 132 98 104 132 98 104
--137 83 86 117 104 110 77 105 114 42 59 64 50 67 72 78 102 129 91 117 157 91 117 157
--95 131 149 83 116 129 40 48 73 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
--
--1 1 1 1 2 2 2 3 3 28 12 12 123 55 55 174 79 79 174 79 79 174 79 79
--152 81 83 68 59 64 26 35 39 27 40 45 79 78 84 137 83 86 165 78 79 137 83 86
--94 94 94 48 63 69 36 50 56 50 67 72 73 97 106 93 121 133 93 124 152 93 124 152
--95 131 149 91 118 149 78 102 129 27 40 45 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
--
--4 5 3 24 53 24 19 31 15 8 7 3 90 61 47 165 78 79 174 79 79 174 79 79
--174 79 79 137 83 86 60 52 57 7 12 13 17 23 26 70 70 70 132 98 104 112 81 86
--79 78 84 31 45 49 15 22 25 53 75 83 91 118 149 86 106 160 91 117 157 93 124 152
--91 117 157 93 124 152 95 131 149 53 75 83 50 50 50 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
--
--19 31 15 34 76 34 34 76 34 19 31 15 28 12 12 123 55 55 174 79 79 174 79 79
--174 79 79 165 78 79 112 81 86 32 40 45 15 22 25 38 53 58 65 78 84 29 31 32
--21 30 33 42 59 64 60 80 103 78 102 129 87 112 149 84 96 162 91 117 157 93 124 152
--91 117 157 93 124 152 93 121 133 59 85 92 57 68 71 82 85 86 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
--
--34 76 34 40 89 40 40 89 40 34 76 34 8 15 6 48 26 18 123 55 55 174 79 79
--174 79 79 174 79 79 137 83 86 68 59 64 32 40 45 21 30 33 31 45 49 21 31 35
--12 17 20 48 63 69 78 102 129 81 88 166 84 96 162 91 117 157 93 124 152 91 117 157
--93 124 152 95 131 149 83 116 129 59 85 92 57 68 71 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
--
--40 89 40 40 89 40 40 89 40 40 89 40 24 53 24 6 6 6 69 31 31 123 55 55
--123 55 55 90 61 47 69 31 31 36 32 33 21 31 35 7 12 13 18 25 28 48 63 69
--60 80 103 68 78 128 84 101 153 84 96 162 84 96 162 91 117 157 91 117 157 84 96 162
--91 117 157 73 97 106 48 63 69 50 67 72 57 59 63 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 124 131 137 170 170 170 151 151 151 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
--
--34 76 34 40 89 40 40 89 40 40 89 40 34 76 34 19 31 15 17 12 12 48 26 18
--48 26 18 8 7 3 10 10 22 23 29 47 51 61 92 42 59 64 21 30 33 34 45 54
--68 78 128 81 88 166 81 82 173 86 106 160 86 106 160 84 96 162 86 106 160 87 112 149
--91 118 149 77 105 114 52 67 79 32 40 45 50 50 50 86 86 86 2 2 6 14 14 14
--124 131 137 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 124 131 137 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
--
--19 31 15 34 76 34 40 89 40 40 89 40 40 89 40 24 53 24 8 7 3 0 0 0
--6 8 12 28 32 52 51 61 92 54 54 122 74 77 160 68 78 128 26 35 39 6 8 8
--34 45 54 68 78 128 84 96 162 86 106 160 86 106 160 81 88 166 84 96 162 87 112 149
--73 97 106 36 50 56 33 49 54 18 18 18 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 170 170 170 124 127 131 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
--
--4 5 3 24 53 24 40 89 40 40 89 40 34 76 34 12 22 15 4 5 3 4 5 3
--13 17 26 54 54 122 78 78 174 78 78 174 78 78 174 74 77 160 51 61 92 21 31 35
--26 35 39 53 75 83 84 101 153 81 82 173 81 88 166 84 101 153 60 80 103 60 80 103
--53 75 83 38 53 58 42 59 64 22 22 22 46 46 46 82 82 82 2 2 6 106 106 106
--170 170 170 26 26 26 86 86 86 226 226 226 124 127 131 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 151 151 151 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
--
--1 2 2 8 15 6 24 53 24 34 76 34 19 31 15 8 15 6 63 55 20 63 55 20
--18 18 18 40 48 73 74 77 160 78 78 174 78 78 174 81 82 173 74 77 160 52 67 79
--17 23 26 21 31 35 60 80 103 81 88 166 74 77 160 78 102 129 36 54 60 12 17 20
--42 59 64 48 63 69 21 31 35 18 18 18 42 42 42 86 86 86 6 6 6 116 116 116
--106 106 106 6 6 6 70 70 70 151 151 151 124 127 131 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
--
--11 15 17 0 0 0 12 22 15 19 31 15 8 15 6 63 55 20 149 139 69 149 139 69
--63 55 20 10 10 22 54 54 122 78 78 174 78 78 174 78 78 174 81 82 173 68 78 128
--24 31 37 6 6 6 36 50 56 60 80 103 51 61 92 42 59 64 36 50 56 31 45 49
--29 43 47 27 40 45 6 8 8 14 14 14 42 42 42 94 94 94 14 14 14 101 101 101
--124 127 131 2 2 6 18 18 18 116 116 116 106 107 48 121 92 8 121 92 8 98 70 6
--170 170 170 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
--
--26 35 39 3 5 6 1 1 1 2 3 3 35 31 12 133 118 54 175 176 80 175 176 80
--133 118 54 35 31 12 23 29 47 54 54 122 78 78 174 78 78 174 74 77 160 68 78 128
--51 61 92 31 45 49 26 35 39 36 50 56 29 43 47 7 12 13 21 30 33 42 59 64
--18 25 28 7 12 13 1 1 1 10 10 10 38 38 38 90 90 90 14 14 14 58 58 58
--210 210 210 26 26 26 62 42 6 154 114 10 226 170 11 237 188 10 220 174 15 184 138 11
--220 174 15 174 140 55 35 31 12 2 2 6 70 70 70 246 246 246 124 131 137 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
--
--27 40 45 17 23 26 2 3 3 1 1 1 56 77 35 165 152 80 175 176 80 175 176 80
--175 176 80 106 107 48 22 22 22 28 32 52 54 54 122 54 54 122 51 61 92 28 32 52
--20 27 34 31 45 49 11 15 17 7 12 13 36 50 56 31 45 49 29 43 47 36 50 56
--6 8 8 0 0 0 0 0 0 10 10 10 38 38 38 86 86 86 14 14 14 10 10 10
--195 195 195 198 179 130 192 133 9 220 174 15 239 182 13 237 188 10 232 195 16 239 207 25
--237 201 50 241 208 19 232 195 16 184 138 11 198 179 130 208 206 196 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
--
--15 22 25 26 35 39 15 22 25 0 0 0 35 31 12 133 118 54 175 176 80 175 176 80
--175 176 80 165 152 80 56 77 35 6 8 12 23 29 47 13 17 26 2 2 6 0 0 0
--1 2 2 26 35 39 26 35 39 26 35 39 42 59 64 42 59 64 20 29 31 6 8 8
--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 92 8 192 133 9 219 162 10 239 182 13 237 188 10 232 195 16 241 208 19 237 201 50
--237 201 50 239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 121 92 8 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
--
--1 2 2 15 22 25 31 45 49 6 8 12 4 5 3 63 55 20 149 139 69 175 176 80
--175 176 80 175 176 80 106 107 48 20 16 6 1 1 1 0 0 0 2 3 3 11 15 17
--21 30 33 36 50 56 36 50 56 24 31 37 15 22 25 6 8 8 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 62 42 6
--180 123 7 206 145 10 230 174 11 239 182 13 237 188 10 238 202 15 241 208 19 237 201 50
--239 207 25 241 208 19 241 208 19 241 208 19 230 187 11 220 174 15 184 138 11 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 1 2 2 29 43 47 26 35 39 3 5 6 8 7 3 106 107 48 165 152 80
--175 176 80 149 139 69 63 55 20 4 5 3 2 3 3 12 17 20 26 35 39 26 35 39
--17 23 26 7 12 13 6 8 8 3 5 6 1 2 2 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 237 188 10 232 195 16 241 208 19 237 201 50 237 201 50
--241 208 19 241 208 19 241 208 19 204 160 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 12 17 20 27 40 45 18 25 28 1 1 1 35 31 12 106 107 48
--149 139 69 56 77 35 8 7 3 1 2 2 12 17 20 26 35 39 21 31 35 11 15 17
--3 5 6 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 10 10 10 30 30 30 78 78 78 46 46 46 22 22 22
--137 92 6 204 160 10 239 182 13 237 188 10 238 202 15 241 208 19 241 208 19 241 208 19
--241 208 19 204 160 10 184 138 11 210 150 10 216 158 10 210 150 10 98 70 6 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 1 1 1 15 22 25 33 49 54 12 17 20 2 3 3 35 31 12
--56 77 35 20 16 6 1 1 1 18 25 28 21 31 35 11 15 17 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 0 0 0 0 0 0 10 10 10 34 34 34 78 78 78 50 50 50 6 6 6
--88 55 22 139 102 15 190 146 13 230 187 11 239 207 25 232 195 16 220 174 15 190 146 13
--171 120 8 192 133 9 210 150 10 213 154 11 185 146 40 165 152 80 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 1 1 1 27 40 45 29 43 47 3 5 6 2 3 3
--8 7 3 1 1 1 17 23 26 31 45 49 15 22 25 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 0 0 0 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
--124 127 131 168 158 138 156 107 11 171 120 8 204 160 10 184 138 11 197 138 11 200 144 11
--206 145 10 206 145 10 197 138 11 198 179 130 195 195 195 198 198 198 170 170 170 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 11 15 17 31 45 49 26 35 39 3 5 6
--0 0 0 7 12 13 27 40 45 18 25 28 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 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
--124 131 137 190 190 190 168 158 138 156 107 11 197 138 11 200 144 11 197 138 11 192 133 9
--180 123 7 185 146 40 198 179 130 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 1 1 1 15 22 25 36 54 60 18 25 28
--0 0 0 21 30 33 27 40 45 2 3 3 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 0 0 0 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
--151 151 151 198 198 198 190 190 190 168 158 138 148 132 55 156 107 11 156 107 11 169 125 40
--168 158 138 187 187 187 190 190 190 210 210 210 246 246 246 253 253 253 253 253 253 180 180 180
--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 1 1 1 27 40 45 35 52 58
--18 25 28 35 52 58 17 23 26 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--0 0 0 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 7 12 13 33 49 54
--52 72 81 36 54 60 6 8 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
--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 180 180 180
--253 253 253 246 246 246 202 202 202 190 190 190 190 190 190 190 190 190 190 190 190 190 190 190
--202 202 202 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 12 17 20
--36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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
--21 30 33 35 52 58 6 8 12 0 0 0 0 0 0 0 0 0 0 0 0 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 180 180 180 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
--12 17 20 36 54 60 29 43 47 0 0 0 0 0 0 0 0 0 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 106 106 106 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 21 30 33 35 52 58 6 8 12 0 0 0 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 12 17 20 36 54 60 29 43 47 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 21 30 33 35 52 58 6 8 12 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 202 202 202 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 202 202 202 202 202 202 202 202 202
--198 198 198 202 202 202 180 180 180 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 12 17 20 36 54 60 29 43 47 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 180 180 180 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 151 151 151 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 21 30 33 35 52 58 6 8 12 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 170 170 170 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 202 202 202 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 6 8 8 33 49 54 29 43 47 6 8 12
--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 12 17 20 33 49 54 17 23 26
--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 15 22 25 36 54 60
--0 0 0 0 0 0 0 0 0 18 18 18 54 54 54 82 82 82 2 2 6 26 26 26
--22 22 22 2 2 6 124 127 131 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253
--253 253 253 253 253 253 253 253 253 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 21 30 33
--36 54 60 0 0 0 0 0 0 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
--36 54 60 0 0 0 0 0 0 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 36 54 60 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 151 151 151 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 36 54 60 21 30 33 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 180 180 180 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 36 54 60 82 82 82 2 2 6 22 22 22 18 18 18 2 2 6
--151 151 151 253 253 253 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 202 202 202 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 36 54 60 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 202 202 202 2 2 6
--22 22 22 34 34 34 20 16 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 63 55 20 184 138 11 204 160 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 151 151 151 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 138 132 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 214 187 87 214 187 87 185 146 40 35 31 12
--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 185 146 40 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 237 201 50 241 196 14 241 208 19 232 195 16 35 31 12
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 6 6 6 30 30 30 26 26 26
--204 160 10 165 152 80 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 124 127 131
--174 140 55 210 150 10 234 174 13 246 186 14 246 190 14 246 190 14 246 190 14 237 188 10
--98 70 6 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 214 187 87 242 186 14 241 196 14 204 160 10 20 16 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 148 132 55 185 146 40 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
--220 174 15 35 31 12 2 2 6 22 22 22 151 151 151 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 214 187 87 239 182 13 237 188 10 213 154 11 35 31 12
--2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 2 2 6 62 42 6 220 174 15
--237 188 10 237 188 10 113 101 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 6 6 6
--22 22 22 54 54 54 148 132 55 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 138 11 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 213 164 39 236 178 12 236 178 12 210 150 10 137 92 6
--20 16 6 2 2 6 2 2 6 2 2 6 6 6 6 62 42 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 169 125 40 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 202 202 202 198 198 198 213 164 39 230 174 11 230 174 11 216 158 10 192 133 9
--163 110 8 120 80 7 98 70 6 120 80 7 167 114 7 197 138 11 226 170 11 239 182 13
--242 186 14 242 186 14 165 152 80 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 185 146 40 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 204 160 10 20 16 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 202 202 202 198 198 198 213 164 39 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 220 174 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 140 55 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 185 146 40 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 213 164 39 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 140 55 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 230 187 11 62 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 169 125 40 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 213 164 39 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 149 139 69 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 20 16 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 220 174 15 149 139 69 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 149 139 69 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 20 16 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 149 139 69
--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 149 139 69 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 220 174 15 198 179 130 253 253 253
--253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 253 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 20 16 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 185 146 40
--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 169 125 40 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 35 31 12 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 149 139 69
--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 113 101 86 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 230 187 11 204 160 10 133 118 54
--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 62 42 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 148 132 55 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 148 132 55 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 204 160 10 163 110 8
--62 42 6 124 131 137 218 218 218 250 250 250 253 253 253 253 253 253 253 253 253 250 250 250
--242 242 242 210 210 210 151 151 151 66 66 66 6 6 6 2 2 6 2 2 6 2 2 6
--2 2 6 2 2 6 62 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 185 146 40 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 169 125 40 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 171 120 8
--85 57 6 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 85 57 6 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 140 55 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 169 125 40 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 85 57 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
--169 125 40 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 133 118 54 169 125 40 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 184 138 11 152 99 6
--104 69 6 20 16 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 85 57 6 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 148 132 55
--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 133 118 54 156 107 11
--163 110 8 167 114 7 171 120 8 180 123 7 184 138 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 134 84 6
--85 57 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 62 42 6 137 92 6 171 120 8 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 113 101 86 133 118 54 121 92 8 137 92 6 152 99 6 163 110 8 180 123 7
--184 138 11 197 138 11 206 145 10 200 144 11 180 123 7 156 107 11 134 84 6 104 69 6
--62 42 6 54 54 54 106 106 106 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 90 61 47 120 80 7 156 107 11 180 123 7 192 133 9 200 144 11
--206 145 10 200 144 11 192 133 9 171 120 8 139 102 15 113 101 86 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 113 101 86 121 92 8 120 80 7
--137 92 6 152 99 6 152 99 6 152 99 6 134 84 6 120 80 7 98 70 6 88 55 22
--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 71 85 57 6 134 84 6 156 107 11 167 114 7 171 120 8
--171 120 8 167 114 7 152 99 6 121 92 8 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
--94 86 71 98 70 6 104 69 6 104 69 6 104 69 6 85 57 6 88 55 22 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 94 86 71 85 57 6 104 69 6 120 80 7 137 92 6
--134 84 6 120 80 7 94 86 71 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 71 94 86 71 94 86 71 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 94 86 71 94 86 71 94 86 71
--94 86 71 94 86 71 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 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 0 0 0 0 0 0 0 0 0 0 0 0
+- 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
@@ -1743,7 +2465,7 @@ index 285d552..c9d8373 100644
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0
+0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0 0 2 0
+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 --git a/drivers/video/logo/logo_linux_mono.pbm b/drivers/video/logo/logo_linux_mono.pbm
index 2f14d9f..3d3c358 100644
--- a/drivers/video/logo/logo_linux_mono.pbm
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index e52e8c0be..db2b3fdb7 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.4-1 Kernel Configuration
+# Linux/x86 3.12.0-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -76,12 +76,10 @@ 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
@@ -165,8 +163,10 @@ CONFIG_BLK_CGROUP=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -288,6 +288,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
@@ -312,6 +313,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
#
# IO Schedulers
@@ -348,6 +350,7 @@ CONFIG_PARAVIRT=y
# CONFIG_PARAVIRT_SPINLOCKS is not set
# CONFIG_XEN_PRIVILEGED_GUEST is not set
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
CONFIG_LGUEST_GUEST=y
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
@@ -463,6 +466,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
CONFIG_ZBUD=y
CONFIG_ZSWAP=y
# CONFIG_HIGHPTE is not set
@@ -530,14 +534,12 @@ 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
@@ -614,6 +616,10 @@ CONFIG_X86_E_POWERSAVER=m
#
CONFIG_X86_SPEEDSTEP_LIB=m
CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -646,7 +652,6 @@ 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
@@ -720,6 +725,7 @@ CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -733,7 +739,6 @@ 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
#
@@ -770,7 +775,6 @@ 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
@@ -878,7 +882,7 @@ 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_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -1030,6 +1034,7 @@ 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_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1067,6 +1072,7 @@ 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_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
@@ -1190,6 +1196,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1231,6 +1238,7 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
CONFIG_VSOCKETS=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
@@ -1336,9 +1344,9 @@ 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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1444,7 +1452,7 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
@@ -1456,7 +1464,6 @@ CONFIG_REGMAP_I2C=m
CONFIG_REGMAP_MMIO=m
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
-# CONFIG_CMA is not set
#
# Bus devices
@@ -1583,7 +1590,6 @@ CONFIG_PROC_DEVICETREE=y
CONFIG_OF_PROMTREE=y
CONFIG_OF_ADDRESS=y
CONFIG_OF_IRQ=y
-CONFIG_OF_I2C=m
CONFIG_OF_NET=y
CONFIG_OF_MDIO=m
CONFIG_OF_PCI=y
@@ -1735,7 +1741,7 @@ 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=y
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1790,6 +1796,7 @@ CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_IN2000=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -2237,6 +2244,7 @@ CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_IP1000=m
CONFIG_JME=m
@@ -2409,6 +2417,7 @@ 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_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2469,6 +2478,7 @@ CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2540,7 +2550,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# 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
@@ -2585,6 +2594,7 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
@@ -3000,6 +3010,7 @@ CONFIG_INPUT_ADXL34X_SPI=m
# CONFIG_INPUT_IMS_PCU is not set
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -3093,6 +3104,7 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3228,6 +3240,7 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
# CONFIG_SPI_FSL_SPI is not set
+# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
# CONFIG_SPI_PXA2XX is not set
# CONFIG_SPI_PXA2XX_PCI is not set
@@ -3281,6 +3294,7 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
@@ -3324,6 +3338,10 @@ CONFIG_GPIO_AMD8111=m
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
@@ -3350,8 +3368,8 @@ CONFIG_BATTERY_OLPC=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 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
@@ -3400,6 +3418,7 @@ CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3607,6 +3626,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
@@ -3772,6 +3792,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3801,8 +3822,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
# Analog/digital TV USB devices
@@ -3911,6 +3933,7 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_BT848=m
@@ -3945,6 +3968,7 @@ CONFIG_DVB_DDBRIDGE=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_V4L_TEST_DRIVERS is not set
#
@@ -3957,6 +3981,7 @@ CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_PMS=m
CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3999,7 +4024,6 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -4282,6 +4306,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4404,6 +4429,9 @@ CONFIG_BACKLIGHT_PCF50633=m
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4504,7 +4532,6 @@ 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
@@ -4708,6 +4735,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
@@ -4724,6 +4752,7 @@ CONFIG_USB_HIDDEV=y
# I2C HID support
#
CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4747,7 +4776,6 @@ CONFIG_USB_WUSB_CBAF=m
#
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
@@ -4758,13 +4786,11 @@ CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_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
@@ -4776,6 +4802,7 @@ 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_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
# CONFIG_USB_MUSB_HOST is not set
# CONFIG_USB_MUSB_GADGET is not set
@@ -4783,6 +4810,7 @@ CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_UX500=m
+CONFIG_USB_MUSB_AM335X_CHILD=m
# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
CONFIG_USB_RENESAS_USBHS=m
@@ -4833,6 +4861,7 @@ CONFIG_USB_MICROTEK=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4843,7 +4872,6 @@ 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
@@ -4874,17 +4902,14 @@ 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
@@ -4894,15 +4919,11 @@ 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_WISHBONE=m
CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4927,6 +4948,7 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
@@ -4936,10 +4958,13 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
+# CONFIG_AM335X_PHY_USB is not set
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -5051,6 +5076,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -5076,9 +5102,10 @@ CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_DAC124S085 is not set
# CONFIG_LEDS_PWM is not set
CONFIG_LEDS_BD2802=m
@@ -5212,6 +5239,7 @@ CONFIG_RTC_DRV_PCF50633=m
#
CONFIG_RTC_DRV_MC13XXX=m
CONFIG_RTC_DRV_SNVS=m
+# CONFIG_RTC_DRV_MOXART is not set
#
# HID Sensor RTC drivers
@@ -5249,13 +5277,13 @@ 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_UIO_MF624 is not set
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
@@ -5298,6 +5326,7 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_ISA_DRIVERS=y
CONFIG_COMEDI_PCL711=m
CONFIG_COMEDI_PCL724=m
@@ -5325,9 +5354,11 @@ CONFIG_COMEDI_DT2815=m
CONFIG_COMEDI_DT2817=m
CONFIG_COMEDI_DT282X=m
CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_UNIOXX5=m
CONFIG_COMEDI_FL512=m
CONFIG_COMEDI_AIO_AIO12_8=m
CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
CONFIG_COMEDI_C6XDIGIO=m
CONFIG_COMEDI_MPC624=m
CONFIG_COMEDI_ADQ12B=m
@@ -5375,10 +5406,8 @@ 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
@@ -5398,7 +5427,6 @@ CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_PCMCIA_DRIVERS=y
@@ -5421,9 +5449,9 @@ CONFIG_COMEDI_AMPLC_DIO200=m
CONFIG_COMEDI_AMPLC_PC236=m
CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=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
@@ -5433,6 +5461,9 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
@@ -5489,6 +5520,7 @@ CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5513,16 +5545,25 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
+# CONFIG_LTE_GDM724X is not set
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5607,9 +5648,11 @@ CONFIG_EXTCON=m
#
# Extcon Device Drivers
#
+CONFIG_OF_EXTCON=m
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=y
CONFIG_PWM_SYSFS=y
@@ -5688,6 +5731,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5764,6 +5808,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5853,6 +5898,7 @@ CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -6165,6 +6211,7 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_YAMA=y
CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
@@ -6190,7 +6237,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -6243,6 +6290,7 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -6251,7 +6299,7 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256=m
CONFIG_CRYPTO_SHA512=m
CONFIG_CRYPTO_TGR192=m
@@ -6357,7 +6405,7 @@ CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_AUDIT_GENERIC=y
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index fdad1a009..e092582a4 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 3.11.4-1 Kernel Configuration
+# Linux/x86 3.12.1-3 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -77,12 +77,10 @@ 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
@@ -173,8 +171,10 @@ CONFIG_CHECKPOINT_RESTORE=y
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
CONFIG_IPC_NS=y
+# CONFIG_USER_NS is not set
CONFIG_PID_NS=y
CONFIG_NET_NS=y
+# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
CONFIG_SCHED_AUTOGROUP=y
CONFIG_MM_OWNER=y
# CONFIG_SYSFS_DEPRECATED is not set
@@ -295,6 +295,7 @@ CONFIG_BLK_DEV_BSG=y
CONFIG_BLK_DEV_BSGLIB=y
# CONFIG_BLK_DEV_INTEGRITY is not set
CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_CMDLINE_PARSER is not set
#
# Partition Types
@@ -319,6 +320,7 @@ CONFIG_LDM_PARTITION=y
CONFIG_KARMA_PARTITION=y
CONFIG_EFI_PARTITION=y
# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
CONFIG_BLOCK_COMPAT=y
#
@@ -361,6 +363,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
CONFIG_KVM_GUEST=y
+# CONFIG_KVM_DEBUG_FS is not set
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
CONFIG_PARAVIRT_CLOCK=y
CONFIG_NO_BOOTMEM=y
@@ -466,6 +469,7 @@ CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
CONFIG_ZBUD=y
CONFIG_ZSWAP=y
CONFIG_MEM_SOFT_DIRTY=y
@@ -534,14 +538,12 @@ 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
@@ -602,6 +604,10 @@ CONFIG_X86_P4_CLOCKMOD=m
# shared options
#
CONFIG_X86_SPEEDSTEP_LIB=m
+
+#
+# CPU Idle
+#
CONFIG_CPU_IDLE=y
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
CONFIG_CPU_IDLE_GOV_LADDER=y
@@ -634,7 +640,6 @@ 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
@@ -692,6 +697,7 @@ CONFIG_RAPIDIO_TSI57X=y
CONFIG_RAPIDIO_CPS_XX=y
CONFIG_RAPIDIO_TSI568=y
CONFIG_RAPIDIO_CPS_GEN2=y
+# CONFIG_X86_SYSFB is not set
#
# Executable file formats / Emulations
@@ -711,7 +717,6 @@ 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
@@ -750,7 +755,6 @@ 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
@@ -858,7 +862,7 @@ 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_SYNPROXY=m
CONFIG_NETFILTER_XTABLES=m
#
@@ -1010,6 +1014,7 @@ 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_SYNPROXY=m
CONFIG_IP_NF_TARGET_ULOG=m
CONFIG_NF_NAT_IPV4=m
CONFIG_IP_NF_TARGET_MASQUERADE=m
@@ -1047,6 +1052,7 @@ 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_TARGET_SYNPROXY=m
CONFIG_IP6_NF_MANGLE=m
CONFIG_IP6_NF_RAW=m
CONFIG_IP6_NF_SECURITY=m
@@ -1166,6 +1172,7 @@ CONFIG_NET_SCH_CHOKE=m
CONFIG_NET_SCH_QFQ=m
CONFIG_NET_SCH_CODEL=m
CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_INGRESS=m
CONFIG_NET_SCH_PLUG=m
@@ -1207,6 +1214,7 @@ CONFIG_BATMAN_ADV_NC=y
# CONFIG_BATMAN_ADV_DEBUG is not set
CONFIG_OPENVSWITCH=m
CONFIG_OPENVSWITCH_GRE=y
+CONFIG_OPENVSWITCH_VXLAN=y
CONFIG_VSOCKETS=m
CONFIG_VMWARE_VMCI_VSOCKETS=m
CONFIG_NETLINK_MMAP=y
@@ -1308,9 +1316,9 @@ 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_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
#
@@ -1417,7 +1425,7 @@ CONFIG_DEVTMPFS=y
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
+# CONFIG_FIRMWARE_IN_KERNEL is not set
CONFIG_EXTRA_FIRMWARE=""
CONFIG_FW_LOADER_USER_HELPER=y
# CONFIG_DEBUG_DRIVER is not set
@@ -1689,7 +1697,7 @@ 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=y
+CONFIG_SCSI_SCAN_ASYNC=y
#
# SCSI Transports
@@ -1740,6 +1748,7 @@ CONFIG_SCSI_MVUMI=m
CONFIG_SCSI_DPT_I2O=m
CONFIG_SCSI_ADVANSYS=m
CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_MM=m
CONFIG_MEGARAID_MAILBOX=m
@@ -2160,6 +2169,7 @@ CONFIG_IXGBE=m
CONFIG_IXGBE_HWMON=y
CONFIG_IXGBE_DCA=y
CONFIG_IXGBEVF=m
+CONFIG_I40E=m
CONFIG_NET_VENDOR_I825XX=y
CONFIG_IP1000=m
CONFIG_JME=m
@@ -2325,6 +2335,7 @@ 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_SR9700=m
CONFIG_USB_NET_SMSC75XX=m
CONFIG_USB_NET_SMSC95XX=m
CONFIG_USB_NET_GL620A=m
@@ -2385,6 +2396,7 @@ CONFIG_ATH9K_PCI=y
CONFIG_ATH9K_AHB=y
# CONFIG_ATH9K_DEBUGFS is not set
# CONFIG_ATH9K_LEGACY_RATE_CONTROL is not set
+CONFIG_ATH9K_RFKILL=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
CONFIG_CARL9170=m
@@ -2456,7 +2468,6 @@ CONFIG_IWLWIFI_OPMODE_MODULAR=y
#
# 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
@@ -2501,6 +2512,7 @@ CONFIG_RT73USB=m
CONFIG_RT2800USB=m
CONFIG_RT2800USB_RT33XX=y
CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
CONFIG_RT2800USB_RT53XX=y
CONFIG_RT2800USB_RT55XX=y
CONFIG_RT2800USB_UNKNOWN=y
@@ -2894,6 +2906,7 @@ CONFIG_INPUT_ADXL34X_SPI=m
CONFIG_INPUT_CMA3000=m
CONFIG_INPUT_CMA3000_I2C=m
CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
#
# Hardware I/O ports
@@ -2983,6 +2996,7 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_ST_ASC=m
CONFIG_PRINTER=m
# CONFIG_LP_CONSOLE is not set
CONFIG_PPDEV=m
@@ -3027,6 +3041,7 @@ CONFIG_TCG_NSC=m
CONFIG_TCG_ATMEL=m
CONFIG_TCG_INFINEON=m
CONFIG_TCG_ST33_I2C=m
+# CONFIG_TCG_XEN is not set
CONFIG_TELCLOCK=m
CONFIG_DEVPORT=y
CONFIG_I2C=m
@@ -3112,6 +3127,7 @@ CONFIG_SPI_MASTER=y
# CONFIG_SPI_BUTTERFLY is not set
# CONFIG_SPI_GPIO is not set
# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_FSL_DSPI is not set
# CONFIG_SPI_OC_TINY is not set
CONFIG_SPI_PXA2XX_DMA=y
CONFIG_SPI_PXA2XX=m
@@ -3165,6 +3181,7 @@ CONFIG_GPIO_SYSFS=y
#
# CONFIG_GPIO_GENERIC_PLATFORM is not set
# CONFIG_GPIO_IT8761E is not set
+# CONFIG_GPIO_F7188X is not set
# CONFIG_GPIO_TS5500 is not set
CONFIG_GPIO_SCH=m
CONFIG_GPIO_ICH=m
@@ -3205,6 +3222,10 @@ CONFIG_GPIO_LANGWELL=y
CONFIG_GPIO_UCB1400=y
#
+# LPC GPIO expanders:
+#
+
+#
# MODULbus GPIO expanders:
#
@@ -3230,8 +3251,8 @@ CONFIG_TEST_POWER=m
# CONFIG_CHARGER_LP8727 is not set
# CONFIG_CHARGER_GPIO is not set
# CONFIG_CHARGER_BQ2415X is not set
+# CONFIG_CHARGER_BQ24190 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
@@ -3279,6 +3300,7 @@ CONFIG_SENSORS_GL518SM=m
CONFIG_SENSORS_GL520SM=m
# CONFIG_SENSORS_GPIO_FAN is not set
CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_CORETEMP=m
CONFIG_SENSORS_IBMAEM=m
CONFIG_SENSORS_IBMPEX=m
@@ -3480,6 +3502,7 @@ CONFIG_BCMA=m
CONFIG_BCMA_BLOCKIO=y
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_BCMA_DRIVER_GPIO=y
# CONFIG_BCMA_DEBUG is not set
@@ -3645,6 +3668,7 @@ CONFIG_USB_GSPCA_SQ905=m
CONFIG_USB_GSPCA_SQ905C=m
CONFIG_USB_GSPCA_SQ930X=m
CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
CONFIG_USB_GSPCA_STV0680=m
CONFIG_USB_GSPCA_SUNPLUS=m
CONFIG_USB_GSPCA_T613=m
@@ -3674,8 +3698,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_TLG2300=m
CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_STK1160_COMMON=m
CONFIG_VIDEO_STK1160_AC97=y
+CONFIG_VIDEO_STK1160=m
#
# Analog/digital TV USB devices
@@ -3784,6 +3809,7 @@ CONFIG_VIDEO_CX88=m
CONFIG_VIDEO_CX88_ALSA=m
CONFIG_VIDEO_CX88_BLACKBIRD=m
CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
CONFIG_VIDEO_CX88_VP3054=m
CONFIG_VIDEO_CX88_MPEG=m
CONFIG_VIDEO_BT848=m
@@ -3818,6 +3844,7 @@ CONFIG_DVB_DDBRIDGE=m
CONFIG_V4L_MEM2MEM_DRIVERS=y
CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
CONFIG_VIDEO_SH_VEU=m
+CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_V4L_TEST_DRIVERS is not set
#
@@ -3829,6 +3856,7 @@ CONFIG_VIDEO_BWQCAM=m
CONFIG_VIDEO_CQCAM=m
CONFIG_VIDEO_W9966=m
CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
CONFIG_RADIO_SI470X=y
CONFIG_USB_SI470X=m
CONFIG_I2C_SI470X=m
@@ -3870,7 +3898,6 @@ CONFIG_VIDEO_SAA7146=m
CONFIG_VIDEO_SAA7146_VV=m
CONFIG_SMS_SIANO_MDTV=m
CONFIG_SMS_SIANO_RC=y
-# CONFIG_SMS_SIANO_DEBUGFS is not set
#
# Media ancillary drivers (tuners, sensors, i2c, frontends)
@@ -4147,6 +4174,7 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
CONFIG_DRM_NOUVEAU_BACKLIGHT=y
CONFIG_DRM_I915=m
CONFIG_DRM_I915_KMS=y
+# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
CONFIG_DRM_MGA=m
CONFIG_DRM_SIS=m
CONFIG_DRM_VIA=m
@@ -4235,6 +4263,7 @@ CONFIG_XEN_FBDEV_FRONTEND=m
# CONFIG_FB_BROADSHEET is not set
# CONFIG_FB_AUO_K190X is not set
CONFIG_FB_HYPERV=m
+# CONFIG_FB_SIMPLE is not set
# CONFIG_EXYNOS_VIDEO is not set
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=m
@@ -4264,6 +4293,9 @@ CONFIG_BACKLIGHT_PCF50633=m
# CONFIG_BACKLIGHT_LP855X is not set
# CONFIG_BACKLIGHT_OT200 is not set
# CONFIG_BACKLIGHT_TPS65217 is not set
+# CONFIG_BACKLIGHT_GPIO is not set
+# CONFIG_BACKLIGHT_LV5207LP is not set
+# CONFIG_BACKLIGHT_BD6107 is not set
#
# Console display driver support
@@ -4325,7 +4357,6 @@ 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
@@ -4528,6 +4559,7 @@ CONFIG_HID_THRUSTMASTER=m
CONFIG_THRUSTMASTER_FF=y
CONFIG_HID_WACOM=m
CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
CONFIG_HID_ZEROPLUS=m
CONFIG_ZEROPLUS_FF=y
CONFIG_HID_ZYDACRON=m
@@ -4544,6 +4576,7 @@ CONFIG_USB_HIDDEV=y
# I2C HID support
#
CONFIG_I2C_HID=m
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=m
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4567,7 +4600,6 @@ CONFIG_USB_WUSB_CBAF=m
#
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
@@ -4578,13 +4610,11 @@ CONFIG_USB_ISP116X_HCD=m
CONFIG_USB_ISP1760_HCD=m
CONFIG_USB_ISP1362_HCD=m
CONFIG_USB_FUSBH200_HCD=m
+CONFIG_USB_FOTG210_HCD=m
CONFIG_USB_OHCI_HCD=m
CONFIG_USB_OHCI_HCD_PCI=m
# CONFIG_USB_OHCI_HCD_SSB is not set
# CONFIG_USB_OHCI_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
@@ -4596,12 +4626,12 @@ 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_HCD_TEST_MODE is not set
CONFIG_USB_MUSB_HDRC=m
# CONFIG_USB_MUSB_HOST is not set
# CONFIG_USB_MUSB_GADGET is not set
CONFIG_USB_MUSB_DUAL_ROLE=y
CONFIG_USB_MUSB_TUSB6010=m
-CONFIG_USB_MUSB_DSPS=m
CONFIG_USB_MUSB_UX500=m
# CONFIG_USB_UX500_DMA is not set
CONFIG_MUSB_PIO_ONLY=y
@@ -4653,6 +4683,7 @@ CONFIG_USB_MICROTEK=m
CONFIG_USB_USS720=m
CONFIG_USB_SERIAL=m
CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
CONFIG_USB_SERIAL_AIRCABLE=m
CONFIG_USB_SERIAL_ARK3116=m
CONFIG_USB_SERIAL_BELKIN=m
@@ -4663,7 +4694,6 @@ 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
@@ -4694,17 +4724,14 @@ 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
@@ -4714,15 +4741,11 @@ 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_WISHBONE=m
CONFIG_USB_SERIAL_ZTE=m
CONFIG_USB_SERIAL_SSU100=m
CONFIG_USB_SERIAL_QT2=m
-CONFIG_USB_SERIAL_FLASHLOADER=m
-CONFIG_USB_SERIAL_SUUNTO=m
# CONFIG_USB_SERIAL_DEBUG is not set
#
@@ -4747,6 +4770,7 @@ CONFIG_USB_LD=m
CONFIG_USB_TRANCEVIBRATOR=m
CONFIG_USB_IOWARRIOR=m
CONFIG_USB_TEST=m
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
CONFIG_USB_ISIGHTFW=m
CONFIG_USB_YUREX=m
CONFIG_USB_EZUSB_FX2=m
@@ -4756,10 +4780,13 @@ CONFIG_USB_SPEEDTOUCH=m
CONFIG_USB_CXACRU=m
CONFIG_USB_UEAGLEATM=m
CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
CONFIG_USB_PHY=y
CONFIG_NOP_USB_XCEIV=m
-# CONFIG_OMAP_CONTROL_USB is not set
-# CONFIG_OMAP_USB3 is not set
+# CONFIG_AM335X_PHY_USB is not set
CONFIG_SAMSUNG_USBPHY=m
CONFIG_SAMSUNG_USB2PHY=m
CONFIG_SAMSUNG_USB3PHY=m
@@ -4871,6 +4898,7 @@ CONFIG_MEMSTICK=m
#
# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
#
# MemoryStick Host Controller Drivers
@@ -4896,9 +4924,10 @@ CONFIG_LEDS_LP55XX_COMMON=m
CONFIG_LEDS_LP5521=m
CONFIG_LEDS_LP5523=m
CONFIG_LEDS_LP5562=m
+# CONFIG_LEDS_LP8501 is not set
CONFIG_LEDS_CLEVO_MAIL=m
CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_PCA9633=m
+# CONFIG_LEDS_PCA963X is not set
# CONFIG_LEDS_DAC124S085 is not set
CONFIG_LEDS_BD2802=m
CONFIG_LEDS_INTEL_SS4200=m
@@ -5028,6 +5057,7 @@ CONFIG_RTC_DRV_PCF50633=m
# on-CPU RTC drivers
#
CONFIG_RTC_DRV_MC13XXX=m
+# CONFIG_RTC_DRV_MOXART is not set
#
# HID Sensor RTC drivers
@@ -5064,13 +5094,13 @@ 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_UIO_MF624 is not set
CONFIG_VFIO_IOMMU_TYPE1=m
CONFIG_VFIO=m
CONFIG_VFIO_PCI=m
@@ -5136,6 +5166,7 @@ CONFIG_COMEDI_TEST=m
CONFIG_COMEDI_PARPORT=m
CONFIG_COMEDI_SERIAL2002=m
CONFIG_COMEDI_SKEL=m
+# CONFIG_COMEDI_ISA_DRIVERS is not set
CONFIG_COMEDI_PCI_DRIVERS=y
CONFIG_COMEDI_8255_PCI=m
CONFIG_COMEDI_ADDI_WATCHDOG=m
@@ -5168,10 +5199,8 @@ 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
@@ -5191,7 +5220,6 @@ CONFIG_COMEDI_NI_PCIDIO=m
CONFIG_COMEDI_NI_PCIMIO=m
CONFIG_COMEDI_RTD520=m
CONFIG_COMEDI_S626=m
-CONFIG_COMEDI_SSV_DNP=m
CONFIG_COMEDI_MITE=m
CONFIG_COMEDI_NI_TIOCMD=m
CONFIG_COMEDI_PCMCIA_DRIVERS=y
@@ -5215,7 +5243,6 @@ CONFIG_COMEDI_AMPLC_PC236=m
CONFIG_COMEDI_DAS08=m
CONFIG_COMEDI_NI_LABPC=m
CONFIG_COMEDI_NI_TIO=m
-CONFIG_ASUS_OLED=m
# CONFIG_PANEL is not set
CONFIG_R8187SE=m
CONFIG_RTL8192U=m
@@ -5225,6 +5252,9 @@ CONFIG_RTLLIB_CRYPTO_TKIP=m
CONFIG_RTLLIB_CRYPTO_WEP=m
CONFIG_RTL8192E=m
CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_88EU_P2P=y
CONFIG_RTS5139=m
# CONFIG_RTS5139_DEBUG is not set
# CONFIG_TRANZPORT is not set
@@ -5281,6 +5311,7 @@ CONFIG_VIDEO_GO7007=m
CONFIG_VIDEO_GO7007_USB=m
CONFIG_VIDEO_GO7007_LOADER=m
# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
+# CONFIG_USB_MSI3101 is not set
CONFIG_SOLO6X10=m
CONFIG_LIRC_STAGING=y
CONFIG_LIRC_BT829=m
@@ -5305,18 +5336,25 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
CONFIG_WIMAX_GDM72XX_USB=y
# CONFIG_WIMAX_GDM72XX_SDIO is not set
CONFIG_WIMAX_GDM72XX_USB_PM=y
+# CONFIG_LTE_GDM724X is not set
CONFIG_NET_VENDOR_SILICOM=y
CONFIG_SBYPASS=m
CONFIG_BPCTL=m
CONFIG_CED1401=m
CONFIG_DGRP=m
CONFIG_FIREWIRE_SERIAL=m
-CONFIG_ZCACHE=m
-# CONFIG_ZCACHE_DEBUG is not set
-CONFIG_RAMSTER=m
-# CONFIG_RAMSTER_DEBUG is not set
# CONFIG_USB_DWC2 is not set
+CONFIG_LUSTRE_FS=m
+CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192
+# CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set
+CONFIG_LUSTRE_LLITE_LLOOP=y
+CONFIG_LNET=m
+CONFIG_LNET_MAX_PAYLOAD=1048576
+CONFIG_LNET_SELFTEST=m
CONFIG_USB_BTMTK=m
+# CONFIG_XILLYBUS is not set
+CONFIG_DGNC=m
+CONFIG_DGAP=m
CONFIG_X86_PLATFORM_DEVICES=y
CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
@@ -5480,6 +5518,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
CONFIG_NILFS2_FS=m
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
@@ -5557,6 +5596,7 @@ CONFIG_ECRYPT_FS=m
# CONFIG_ECRYPT_FS_MESSAGING is not set
CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m
+CONFIG_HFSPLUS_FS_POSIX_ACL=y
CONFIG_BEFS_FS=m
# CONFIG_BEFS_DEBUG is not set
# CONFIG_BFS_FS is not set
@@ -5646,6 +5686,7 @@ CONFIG_SUNRPC_SWAP=y
CONFIG_RPCSEC_GSS_KRB5=m
CONFIG_SUNRPC_DEBUG=y
CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
CONFIG_CIFS=m
CONFIG_CIFS_STATS=y
# CONFIG_CIFS_STATS2 is not set
@@ -5959,6 +6000,7 @@ CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init"
CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/lib/systemd/systemd"
CONFIG_SECURITY_APPARMOR=y
CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=0
+CONFIG_SECURITY_APPARMOR_HASH=y
CONFIG_SECURITY_YAMA=y
CONFIG_SECURITY_YAMA_STACKED=y
# CONFIG_IMA is not set
@@ -5984,7 +6026,7 @@ CONFIG_CRYPTO_AEAD=m
CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=m
CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH=y
CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=m
CONFIG_CRYPTO_RNG2=y
@@ -6037,6 +6079,8 @@ CONFIG_CRYPTO_CRC32C=m
CONFIG_CRYPTO_CRC32C_INTEL=m
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_CRCT10DIF=m
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_MD4=m
CONFIG_CRYPTO_MD5=m
@@ -6045,7 +6089,7 @@ CONFIG_CRYPTO_RMD128=m
CONFIG_CRYPTO_RMD160=m
CONFIG_CRYPTO_RMD256=m
CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA1_SSSE3=m
CONFIG_CRYPTO_SHA256_SSSE3=m
CONFIG_CRYPTO_SHA512_SSSE3=m
@@ -6146,6 +6190,8 @@ CONFIG_GENERIC_PCI_IOMAP=y
CONFIG_GENERIC_IOMAP=y
CONFIG_GENERIC_IO=y
CONFIG_PERCPU_RWSEM=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_CMPXCHG_LOCKREF=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=m
@@ -6160,7 +6206,7 @@ CONFIG_CRC7=m
CONFIG_LIBCRC32C=m
CONFIG_CRC8=m
CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
+CONFIG_ZLIB_DEFLATE=y
CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_LZ4_COMPRESS=m
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 47c271c60..aaeebc1c1 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 196465 2013-10-14 07:07:38Z tpowa $
+# $Id: PKGBUILD 202421 2013-12-21 18:29:42Z tpowa $
# Maintainer: Paul Mattal <paul@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgbase=lirc
pkgbase=lirc-libre
-pkgname=('lirc-libre' 'lirc-utils-libre')
+pkgname=('lirc-libre' 'lirc-libre-utils')
pkgver=0.9.0
-pkgrel=64
+pkgrel=67
epoch=1
-_extramodules=extramodules-3.11-LIBRE
+_extramodules=extramodules-3.12-LIBRE
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lirc.org/"
license=('GPL')
### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre>=3.11' 'linux-libre<3.12' 'linux-libre-headers>=3.11' 'linux-libre-headers<3.12' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre>=3.12' 'linux-libre<3.13' 'linux-libre-headers>=3.12' 'linux-libre-headers<3.13' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
options=('!makeflags' '!strip')
source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
lirc_wpc8769l.patch
@@ -26,9 +26,19 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar
lircm.service
irexec.service
lirc.tmpfiles)
+md5sums=('b232aef26f23fe33ea8305d276637086'
+ '1cce37e18e3f6f46044abab29016d18f'
+ 'b70cc9640505205446ec47b7d4779f38'
+ '1f8b104a2365d9f93404b143f499059b'
+ '087a7d102e1c96bf1179f38db2b0b237'
+ '9ee196bd03ea44af5a752fb0cc6ca96a'
+ '3deb02604b37811d41816e9b4385fcc3'
+ 'a9ab637e7207472e61e55a2fa75dc555'
+ '1847b9997685bc3ad2cf11bea4590a92'
+ '07131d117fcfe9dcd50c453c3a5e9531'
+ 'febf25c154a7d36f01159e84f26c2d9a')
-build() {
- _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+prepare() {
cd "${srcdir}/lirc-${pkgver}"
patch -Np1 -i "${srcdir}/lirc_wpc8769l.patch"
patch -Np1 -i "${srcdir}/lircd-handle-large-config.patch"
@@ -47,10 +57,16 @@ build() {
-e 's/@X_LIBS@//g' \
-e 's/@X_PRE_LIBS@//g' \
-e 's/@X_EXTRA_LIBS@//g' -i Makefile.am tools/Makefile.am
+
# fix for new automake #33497
sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADER/' configure.ac
libtoolize
autoreconf
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+ cd "${srcdir}/lirc-${pkgver}"
PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \
--with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \
@@ -61,13 +77,14 @@ build() {
sed -e "s:lirc_dev::" -e "s:lirc_bt829::" -e "s:lirc_igorplugusb::" \
-e "s:lirc_imon::" -e "s:lirc_parallel::" -e "s:lirc_sasem::" \
-e "s:lirc_serial::" -e "s:lirc_sir::" -e "s:lirc_ttusbir::" \
- -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
+ -e "s:lirc_atiusb::" -e "s:lirc_i2c::" \
+ -i Makefile drivers/Makefile drivers/*/Makefile tools/Makefile
make
}
package_lirc-libre() {
pkgdesc="Linux Infrared Remote Control kernel modules for stock kernel (built for the linux-libre kernel package)"
- depends=('lirc-utils-libre' 'linux-libre>=3.11' 'linux-libre<3.12')
+ depends=('lirc-utils-libre' 'linux-libre>=3.12' 'linux-libre<3.13')
replaces=('lirc' 'lirc+pctv')
conflicts=('lirc')
provides=("lirc=$pkgver")
@@ -82,14 +99,14 @@ package_lirc-libre() {
find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
}
-package_lirc-utils-libre() {
+package_lirc-libre-utils() {
pkgdesc="Linux Infrared Remote Control utils"
- depends=('alsa-lib' 'libx11' 'libftdi' 'libirman')
+ depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman')
optdepends=('python2: pronto2lirc utility')
- options=('strip' '!libtool')
- replaces=('lirc-utils')
- conflicts=('lirc-utils')
- provides=("lirc-utils=$pkgver")
+ options=('strip')
+ replaces=('lirc-utils' 'lirc-utils-libre')
+ conflicts=('lirc-utils' 'lirc-utils-libre')
+ provides=("lirc-utils=$pkgver" 'lirc-utils-libre')
install=lirc-utils.install
cd "${srcdir}/lirc-${pkgver}"
@@ -109,14 +126,3 @@ package_lirc-utils-libre() {
# remove built modules
rm -r "${pkgdir}/usr/lib/modules"
}
-md5sums=('b232aef26f23fe33ea8305d276637086'
- '1cce37e18e3f6f46044abab29016d18f'
- 'b70cc9640505205446ec47b7d4779f38'
- '1f8b104a2365d9f93404b143f499059b'
- '087a7d102e1c96bf1179f38db2b0b237'
- '9ee196bd03ea44af5a752fb0cc6ca96a'
- '3deb02604b37811d41816e9b4385fcc3'
- 'a9ab637e7207472e61e55a2fa75dc555'
- '1847b9997685bc3ad2cf11bea4590a92'
- '07131d117fcfe9dcd50c453c3a5e9531'
- 'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index 2f46d837b..50e7566f9 100644
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.11-LIBRE
+EXTRAMODULES=extramodules-3.12-LIBRE
post_install() {
# updating module dependencies
diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD
index 1d073c356..6f761a81f 100644
--- a/libre/lsb-release/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79819 2012-11-13 13:12:30Z svenstaro $
+# $Id: PKGBUILD 101477 2013-11-26 10:23:04Z svenstaro $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Malte Rabenseifner <malte@zearan.de>
# Contributor: John Gerritse <reaphsharc@gmail.com>
@@ -7,7 +7,7 @@
pkgname=lsb-release
pkgver=1.4
-pkgrel=13
+pkgrel=14
pkgdesc="LSB version query program (Parabola rebranded)"
arch=('any')
url="http://www.linuxbase.org/"
@@ -17,12 +17,16 @@ provides=('lsb-release-libre')
conflicts=('lsb-release-libre')
replaces=('lsb-release-libre')
install=lsb-release.install
-source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz)
-md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4')
+source=(http://downloads.sourceforge.net/lsb/$pkgname-$pkgver.tar.gz
+ lsb_release_description.patch)
+md5sums=('30537ef5a01e0ca94b7b8eb6a36bb1e4'
+ '72f562d8eaa8915ab85fba13e68c8d68')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ patch -Np0 < "$srcdir/lsb_release_description.patch"
+
make
}
@@ -31,7 +35,7 @@ package() {
install -dm755 "$pkgdir/etc"
echo "LSB_VERSION=$pkgver" >> "$pkgdir/etc/lsb-release"
- echo "DISTRIB_ID=parabola" > "$pkgdir/etc/lsb-release"
+ echo "DISTRIB_ID=Parabola" > "$pkgdir/etc/lsb-release"
echo "DISTRIB_RELEASE=rolling" >> "$pkgdir/etc/lsb-release"
echo "DISTRIB_DESCRIPTION=\"Parabola GNU/Linux-libre\"" >> "$pkgdir/etc/lsb-release"
diff --git a/libre/lsb-release/lsb_release_description.patch b/libre/lsb-release/lsb_release_description.patch
new file mode 100644
index 000000000..d46835b97
--- /dev/null
+++ b/libre/lsb-release/lsb_release_description.patch
@@ -0,0 +1,11 @@
+--- lsb_release.orig 2012-11-13 05:12:02.000000000 -0800
++++ lsb_release 2013-11-24 17:13:55.943608718 -0800
+@@ -216,7 +216,7 @@
+ TMP_DISTRIB_DESC=$DISTRIB_DESCRIPTION
+ fi
+
+- if [ -z "$TMP_DISTRIB_DESC" ] # head or lsb-release init
++ if [ -z "$DISTRIB_DESCRIPTION" ] # head or lsb-release init
+ then # file contains no data
+ DISTRIB_DESCRIPTION=$MSG_NONE
+ NO="y"
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 89119a29b..86f9c296c 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -5,9 +5,9 @@
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=luxrender
pkgname=$_pkgname-libre
-pkgver=1.3
-_pkgver=523432614aa5
-pkgrel=1.1
+pkgver=1.3.1
+_pkgver=d0b0e20c47cc
+pkgrel=3
pkgdesc="Rendering system for physically correct, unbiased image synthesis, without nonfree OpenCL recommendation"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.$_pkgname.net/"
@@ -15,17 +15,27 @@ license=('GPL')
depends=('boost-libs' 'freeimage' 'openexr' 'mesa-libcl' 'mesa-libgl' 'fftw')
optdepends=('blender-addon-luxrender: Blender for renderer and exporter' 'qt4: Qt GUI' \
'python: Python interface (pylux)')
-makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers')
-makedepends+=('gcc-lts')
+makedepends=('cmake' 'boost' 'mesa' 'qt4' "luxrays=$pkgver" 'python' 'opencl-headers' \
+ 'clang')
provides=($_pkgname=$pkgver)
conflicts=$_pkgname
replaces=$_pkgname
-source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2)
-md5sums=('fad0fae0866e578ca6f5b3f3903d0c9f')
+source=(https://bitbucket.org/$_pkgname/lux/get/$_pkgver.tar.bz2 \
+ force_python3.diff)
+md5sums=('cbe749f56a1e1976745f5458100efa8a'
+ '42692e65eabc5828693e2682e94b7c64')
+
+prepare() {
+ cd "$srcdir"/$_pkgname-lux-$_pkgver
+
+ patch -Np1 < "$srcdir/force_python3.diff" || true
+}
build() {
cd "$srcdir"/$_pkgname-lux-$_pkgver
+ export CC=clang
+ export CXX=clang++
export CXXFLAGS="$CXXFLAGS -lpthread"
cmake . -DCMAKE_INSTALL_PREFIX=/usr \
-DLUXRAYS_DISABLE_OPENCL=OFF \
diff --git a/libre/luxrender-libre/force_python3.diff b/libre/luxrender-libre/force_python3.diff
new file mode 100644
index 000000000..1ee61e872
--- /dev/null
+++ b/libre/luxrender-libre/force_python3.diff
@@ -0,0 +1,12 @@
+diff -rup luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake
+--- luxrender-lux-d0b0e20c47cc/cmake/Dependencies.cmake 2013-11-04 22:25:45.000000000 +0100
++++ luxrender-lux-d0b0e20c47cc.new/cmake/Dependencies.cmake 2013-12-05 19:43:23.414625854 +0100
+@@ -156,7 +156,7 @@ IF(MSVC AND BOOST_python_LIBRARYDIR)
+ SET(BOOST_LIBRARYDIR "${BOOST_python_LIBRARYDIR}")
+ ENDIF(MSVC AND BOOST_python_LIBRARYDIR)
+
+-FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python REQUIRED)
++FIND_PACKAGE(Boost ${Boost_MINIMUM_VERSION} COMPONENTS python3 REQUIRED)
+
+ IF(MSVC AND BOOST_python_LIBRARYDIR)
+ SET(BOOST_LIBRARYDIR "${_boost_libdir}")
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
index 70ccf5b93..a0acf9b81 100644
--- a/libre/mc-libre/PKGBUILD
+++ b/libre/mc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 97329 2013-09-18 07:33:03Z schuay $
+# $Id: PKGBUILD 101948 2013-12-02 21:12:10Z schuay $
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Maintainer: schuay <jakob.gruber@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -6,9 +6,9 @@
_pkgname=mc
pkgname=mc-libre
-pkgver=4.8.10
-pkgrel=2.1
-pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with unar support and arj recommendation included and nonfree unace recommendation removed"
+pkgver=4.8.11
+pkgrel=1
+pkgdesc="Midnight Commander is a text based filemanager/shell that emulates Norton Commander, with arj recommendation included and nonfree unace and unrar recommendation removed"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.ibiblio.org/mc/"
license=('GPL')
@@ -32,7 +32,6 @@ optdepends=(
'python2-pytz: s3+ extfs'
'smb: VFS support'
'arj: uarj extfs'
- 'unar: urar extfs'
'zip: uzip extfs'
'p7zip: support for 7zip archives')
conflicts=('mc')
@@ -46,30 +45,11 @@ backup=('etc/mc/edit.indent.rc'
'etc/mc/mc.keymap'
'etc/mc/mc.menu'
'etc/mc/sfs.ini')
-source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2"
- "fs36962.diff"
- "unar.in")
-
-prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
-
- ## add unar support removing nonfree urar on the source
- rm -v src/vfs/extfs/helpers/urar.in
- install -m644 $srcdir/unar.in src/vfs/extfs/helpers
- sed -i '\|rar v -c- "${MC_EXT_FILENAME}" 2>/dev/null|d
- s| unrar v -c-|unar|
- ' misc/ext.d/archive.sh
- sed -i 's|urar.in|unar.in|g' $(grep -rlI 'urar.in')
- sed -i '\|src/vfs/extfs/helpers/urar| s|urar|unar|g
- ' configure{,.ac}
- sed -i 's|urar|unar|g' src/vfs/extfs/helpers/Makefile.{am,in}
-}
+source=("http://www.midnight-commander.org/downloads/${_pkgname}-${pkgver}.tar.bz2")
build() {
cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -Np1 < "${srcdir}/fs36962.diff"
-
./configure --prefix=/usr --sysconfdir=/etc --enable-vfs-smb \
--with-x --libexecdir=/usr/lib
@@ -89,6 +69,4 @@ package() {
-i "${pkgdir}/usr/lib/mc/extfs.d/s3+"
}
-md5sums=('eb4bdc23abd4fdfa14911d53d65c8186'
- '7f7cf5388a5390c2ed49965492f490aa'
- 'f549a6c13ac0c3052986fcdc945648a9')
+md5sums=('7262788c0e799393cd37318b43a14adc')
diff --git a/libre/mc-libre/fs36962.diff b/libre/mc-libre/fs36962.diff
deleted file mode 100644
index 0db5ed42b..000000000
--- a/libre/mc-libre/fs36962.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-diff -ur mc-4.8.10-orig/src/filemanager/file.c mc-4.8.10/src/filemanager/file.c
---- mc-4.8.10-orig/src/filemanager/file.c 2013-08-02 22:02:40.000000000 +0400
-+++ mc-4.8.10/src/filemanager/file.c 2013-09-17 09:59:30.699635407 +0400
-@@ -1272,8 +1272,8 @@
-
- /** Initialize variables for progress bars */
- static FileProgressStatus
--panel_operate_init_totals (FileOperation operation, const WPanel * panel, const char *source,
-- FileOpContext * ctx, filegui_dialog_type_t dialog_type)
-+panel_operate_init_totals (const WPanel * panel, const char *source, FileOpContext * ctx,
-+ filegui_dialog_type_t dialog_type)
- {
- FileProgressStatus status;
-
-@@ -1282,7 +1282,7 @@
- return FILE_CONT;
- #endif
-
-- if (operation != OP_MOVE && verbose && file_op_compute_totals)
-+ if (verbose && file_op_compute_totals)
- {
- ComputeDirSizeUI *ui;
-
-@@ -2378,13 +2378,6 @@
- mc_refresh ();
- if (ctx->erase_at_end)
- {
-- /* remove files after move */
-- if (erase_list != NULL)
-- {
-- file_op_context_destroy_ui (ctx);
-- file_op_context_create_ui (ctx, FALSE, FILEGUI_DIALOG_DELETE_ITEM);
-- }
--
- while (erase_list != NULL && return_status != FILE_ABORT)
- {
- struct link *lp = (struct link *) erase_list->data;
-@@ -2792,14 +2785,12 @@
- {
- if (operation == OP_DELETE)
- dialog_type = FILEGUI_DIALOG_DELETE_ITEM;
-+ else if (single_entry && S_ISDIR (selection (panel)->st.st_mode))
-+ dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
-+ else if (single_entry || force_single)
-+ dialog_type = FILEGUI_DIALOG_ONE_ITEM;
- else
-- {
-- dialog_type = ((operation != OP_COPY) || single_entry || force_single)
-- ? FILEGUI_DIALOG_ONE_ITEM : FILEGUI_DIALOG_MULTI_ITEM;
--
-- if (single_entry && (operation == OP_COPY) && S_ISDIR (selection (panel)->st.st_mode))
-- dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
-- }
-+ dialog_type = FILEGUI_DIALOG_MULTI_ITEM;
- }
-
- /* Initialize things */
-@@ -2844,8 +2835,8 @@
- else
- source_with_vpath = vfs_path_append_new (panel->cwd_vpath, source, (char *) NULL);
- #endif /* WITH_FULL_PATHS */
-- if (panel_operate_init_totals
-- (operation, panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type) == FILE_CONT)
-+ if (panel_operate_init_totals (panel, vfs_path_as_str (source_with_vpath), ctx, dialog_type)
-+ == FILE_CONT)
- {
- if (operation == OP_DELETE)
- {
-@@ -2936,7 +2927,7 @@
- goto clean_up;
- }
-
-- if (panel_operate_init_totals (operation, panel, NULL, ctx, dialog_type) == FILE_CONT)
-+ if (panel_operate_init_totals (panel, NULL, ctx, dialog_type) == FILE_CONT)
- {
- /* Loop for every file, perform the actual copy operation */
- for (i = 0; i < panel->count; i++)
diff --git a/libre/mc-libre/unar.in b/libre/mc-libre/unar.in
deleted file mode 100644
index 3ba37b019..000000000
--- a/libre/mc-libre/unar.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#! /bin/sh
-
-UNAR=`which unar 2>/dev/null`
-
-# Define $UNAR version
-UNAR_VERSION=`$UNAR -v`
-
-mcunar4fs_list ()
-{
- $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` '
-BEGIN { flag=0 }
-/^-------/ { flag++; if (flag > 1) exit 0; next }
-flag==1 {
- str = substr($0, 2)
- getline
- split($4, a, "-")
- if (index($6, "D") != 0)
- $6="drwxr-xr-x"
- else
- if (index($6, ".") != 0)
- $6="-rw-r--r--"
- printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str
-}'
-}
-
-mcunarfs_list ()
-{
- $UNAR -q "$1" | @AWK@ -v uid=`id -u` -v gid=`id -g` '
-BEGIN { flag=0 }
-/^-----------/ { flag++; if (flag > 1) exit 0; next }
-flag==1 {
- split($5, a, "-")
- if (index($1, "D") != 0)
- $1="drwxr-xr-x"
- else
- if (index($1, ".") != 0)
- $1="-rw-r--r--"
- printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $1, uid, gid, $2, a[2], a[1], a[3], $6, $8
-}'
-}
-
-mcunarfs_list ()
-{
- mcunarfs_list "$@"
-}
-
-mcunarfs_copyout ()
-{
- $UNAR -q "$1" "$2" > "$3"
-}
-
-umask 077
-
-cmd="$1"
-shift
-
-case "$cmd" in
- # Workaround for a bug in mc - directories must precede files to
- # avoid duplicate entries, so we sort output by filenames
- list) mcunarfs_list "$@" | sort -k 8 ;;
- copyout) mcunarfs_copyout "$@" ;;
- *) exit 1 ;;
-esac
-exit 0
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index d55f4c329..78104354f 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -6,15 +6,14 @@
_pkgname=mcomix
pkgname=mcomix-libre
pkgver=1.00
-pkgrel=5
-pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, with unar recommendation"
+pkgrel=5.1
+pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar recommendation"
arch=('any')
url="http://sourceforge.net/projects/mcomix/"
license=('GPL')
depends=('pygtk' 'python2-pillow' 'xdg-utils' 'python2' \
'desktop-file-utils' 'hicolor-icon-theme' 'python2-setuptools')
makedepends=('gettext' 'intltool')
-optdepends=('unar: for rar compressed comics')
conflicts=('mcomix' 'comix')
replaces=('mcomix' 'comix')
provides=("mcomix=${pkgver}")
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index 411834c5d..232805e89 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=mesa
_pkgname=libcl
pkgname=$pkgbase-$_pkgname
_pkgflag=libre
-pkgver=9.2.2
+pkgver=10.0.1
pkgrel=1
pkgdesc='Mesa 3-D OpenCL library'
url=http://${pkgbase}3d.sourceforge.net
@@ -26,9 +26,8 @@ makedepends=(
provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx)
-options=(!libtool)
source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
-sha512sums=6b1ac41f28a81bf920fd4ea80586192f6465863992ec13b718c61fb7d4a41ac3bbb146bfa4a81c48189092e7b59a9452d11d675d628a6098dd8fc48a5aa304ca
+sha512sums=7abdc38cb5b8b09bd586e6045b1d67cb809951f467d67a95e866d49b972c0c56d6a5b8612c411580bf59759a7ce49992eaf4dcc1c16aa1d67513f16b869bdfc1
build() {
cd $srcdir/${pkgbase^}-$pkgver
diff --git a/libre/midori-gtk3-libre/PKGBUILD b/libre/midori-gtk3-libre/PKGBUILD
index 868c578ab..66083d847 100644
--- a/libre/midori-gtk3-libre/PKGBUILD
+++ b/libre/midori-gtk3-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95784 2013-08-16 19:36:19Z arodseth $
+# $Id: PKGBUILD 101601 2013-11-28 22:21:02Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -9,8 +9,8 @@
_pkgname=midori-gtk3
pkgname=midori-gtk3-libre
-pkgver=0.5.5
-pkgrel=1
+pkgver=0.5.6
+pkgrel=2
pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers'
arch=('x86_64' 'i686')
url='http://www.midori-browser.org/'
@@ -19,18 +19,18 @@ install='midori.install'
replaces=$_pkgname
conflicts=('midori' "$_pkgname")
provides=('midori' "$_pkgname=$pkgver")
-depends=('libzeitgeist' 'webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr')
-makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg')
+depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr')
+makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake')
optdepends=('gst-plugins-base: HTML5 OGG videos support'
'gst-plugins-good: HTML5 H264 and WebM videos support'
'gst-libav: HTML5 H264 videos support'
'aria2: download utility')
options=('!emptydirs')
source=("http://www.midori-browser.org/downloads/${_pkgname/-gtk3}_${pkgver}_all_.tar.bz2")
-sha256sums=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62')
+sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a')
prepare() {
- cd "$srcdir/${_pkgname/-gtk3}-${pkgver}"
+ cd "${_pkgname/-gtk3}-$pkgver"
# remove non-privacy search providers
sed -i 's|Duck Duck Go|DuckDuckGo HTML|
@@ -51,19 +51,16 @@ prepare() {
}
build() {
- cd "$srcdir/${_pkgname/-gtk3}-${pkgver}"
+ cd "${_pkgname/-gtk3}-$pkgver"
- ./configure \
- --prefix=/usr \
- --enable-gtk3 \
- --disable-granite
+ mkdir -p build
+ cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DUSE_GTK3=1
make
}
package() {
- cd "$srcdir/${_pkgname/-gtk3}-${pkgver}"
-
- make DESTDIR="$pkgdir" install
+ make -C "${_pkgname/-gtk3}-$pkgver/build" DESTDIR="$pkgdir" install
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/midori-libre/PKGBUILD b/libre/midori-libre/PKGBUILD
index c417c84b0..c0cd14422 100644
--- a/libre/midori-libre/PKGBUILD
+++ b/libre/midori-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 95661 2013-08-15 11:42:31Z arodseth $
+# $Id: PKGBUILD 101597 2013-11-28 20:54:40Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Andreas Radke <andyrtr@archlinux.org>
@@ -9,8 +9,8 @@
_pkgname=midori
pkgname=midori-libre
-pkgver=0.5.5
-pkgrel=1
+pkgver=0.5.6
+pkgrel=2
pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers'
arch=('x86_64' 'i686' 'mips64el')
url='http://www.midori-browser.org/'
@@ -20,17 +20,17 @@ replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique')
-makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg')
+makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake')
optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support'
'gstreamer0.10-bad-plugins: HTML5 WebM videos support'
'gstreamer0.10-ffmpeg: HTML5 H264 videos support'
'aria2: download utility')
options=('!emptydirs')
source=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2")
-sha256sums=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62')
+sha256sums=('c5be1b5d9933776f09c5cab7945a073a820d65555e51fda9ff55fd063843f24a')
prepare() {
- cd "$srcdir/${_pkgname/-gtk3}-${pkgver}"
+ cd "$_pkgname-$pkgver"
# remove non-privacy search providers
sed -i 's|Duck Duck Go|DuckDuckGo HTML|
@@ -51,16 +51,16 @@ prepare() {
}
build() {
- cd "$srcdir/$_pkgname-${pkgver}"
+ cd "$_pkgname-$pkgver"
- ./configure --prefix=/usr
+ mkdir -p build
+ cd build
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib
make
}
package() {
- cd "$srcdir/$_pkgname-${pkgver}"
-
- make DESTDIR="$pkgdir" install
+ make -C "$_pkgname-$pkgver/build" DESTDIR="$pkgdir" install
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 3f8b45dfe..75a1fefd2 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 198698 2013-11-02 08:09:59Z bpiotrowski $
+# $Id: PKGBUILD 200344 2013-11-26 19:19:01Z bpiotrowski $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -8,7 +8,7 @@ _pkgbase=mplayer
pkgbase=mplayer-libre
pkgname=('mplayer-libre' 'mencoder-libre')
pkgver=36498
-pkgrel=2
+pkgrel=4
arch=('i686' 'x86_64')
makedepends=(
'libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora'
@@ -72,7 +72,7 @@ package_mplayer-libre() {
install=mplayer.install
backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
depends=(
- 'desktop-file-utils' 'ttf-dejavu' 'enca' 'libxss' 'a52dec' 'libvpx'
+ 'desktop-file-utils' 'ttf-font' 'enca' 'libxss' 'a52dec' 'libvpx'
'lirc-utils' 'x264' 'libmng' 'libdca' 'aalib' 'lame' 'fontconfig'
'libgl' 'libxinerama' 'libvdpau' 'libpulse' 'smbclient' 'xvidcore'
'opencore-amr' 'jack' 'libmad' 'sdl' 'libtheora' 'libcaca' 'libxxf86dga'
@@ -89,12 +89,7 @@ package_mplayer-libre() {
install -Dm644 etc/{codecs.conf,input.conf,example.conf} \
"$pkgdir/etc/mplayer/"
- install -dm755 "$pkgdir/usr/share/mplayer/"
- ln -s /usr/share/fonts/TTF/DejaVuSans.ttf \
- "$pkgdir/usr/share/mplayer/subfont.ttf"
- rm -rf "$pkgdir/usr/share/mplayer/font"
-
- #desktop file FS#14770
+ # desktop file FS#14770
install -Dm644 "$srcdir/mplayer.desktop" \
"$pkgdir/usr/share/applications/mplayer.desktop"
install -Dm644 etc/mplayer256x256.png \
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index a298033c4..b5bf62590 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 99192 2013-10-25 12:40:52Z giovanni $
+# $Id: PKGBUILD 103207 2013-12-30 05:16:47Z bpiotrowski $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
@@ -9,7 +9,7 @@
_pkgname=mplayer-vaapi
pkgname=mplayer-vaapi-libre
pkgver=36265
-pkgrel=5
+pkgrel=7
pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support"
arch=('i686' 'x86_64')
url="http://gitorious.org/vaapi/mplayer"
diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
index a14f8d877..ef0fc1202 100644
--- a/libre/ogmrip-libre/PKGBUILD
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 89460 2013-04-29 13:17:27Z jelle $
+# $Id: PKGBUILD 103017 2013-12-25 16:56:14Z jlichtblau $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Daenyth
# Contributor: Allan McRae <allan@archlinux.org>
@@ -8,7 +8,7 @@
_pkgname=ogmrip
pkgname=ogmrip-libre
pkgver=1.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="Libraries and GTK2 interface for DVD ripping using mencoder, without nonfree faac support"
arch=('i686' 'x86_64')
url="http://ogmrip.sourceforge.net/"
@@ -27,7 +27,7 @@ optdepends=('lame: support for the MP3 audio codec'
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-options=('!libtool' '!makeflags')
+options=('!makeflags')
changelog=$_pkgname.changelog
install=$_pkgname.install
source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
diff --git a/libre/ogmrip-libre/ogmrip.changelog b/libre/ogmrip-libre/ogmrip.changelog
index 27114b508..f1927f864 100644
--- a/libre/ogmrip-libre/ogmrip.changelog
+++ b/libre/ogmrip-libre/ogmrip.changelog
@@ -1,3 +1,6 @@
+2013-12-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+ * ogmrip 1.0.0-3 static libraries removed
+
2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
* ogmrip 1.0.0-1
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
index f0ff93a83..57c001e61 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre-libre/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
_bldname=blender
-_bldver=2.68
+_bldver=2.69
_bldep=10
-# ($srcdir/Tools/${_bldname^}2.5Export/__init__.py:bl_info>version)
-_addver=2.0.1
+# ($srcdir/Tools/${_bldname^}2.6Export/__init__.py:bl_info>version)
+_addver=2.0.3
_addrel=1
pkgbase=ogre
@@ -13,8 +13,8 @@ pkgname=(
$pkgbase-libre
#$_bldname-addon-$pkgbase # package unstable
)
-pkgver=1.8.1
-pkgrel=5
+pkgver=1.9.0
+pkgrel=4
pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files'
arch=(
mips64el
@@ -31,6 +31,7 @@ depends=(
libxaw
libxrandr
ois
+ tinyxml
zziplib
)
makedepends=(
@@ -39,13 +40,18 @@ makedepends=(
doxygen
graphviz
mesa
+ mercurial
ttf-dejavu
)
-source=https://downloads.sourceforge.net/$pkgbase/${pkgbase}_src_v${pkgver//./-}.tar.bz2
-sha512sums=0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2
+source=(
+ ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-}
+)
+sha512sums=(
+ SKIP
+)
build() {
- cd $srcdir/${pkgbase}_src_v${pkgver//./-}
+ cd ${pkgbase}
# get a clean build dir
[[ -d build ]] && rm -vrf build
@@ -100,7 +106,7 @@ package_ogre-libre() {
conflicts=$pkgbase
replaces=$pkgbase
- cd $srcdir/${pkgbase}_src_v${pkgver//./-}/build
+ cd ${pkgbase}/build
make DESTDIR=$pkgdir install
@@ -123,9 +129,9 @@ package_blender-addon-ogre() {
pkgver=$_addver.v$_bldver
pkgrel=$_addrel
- cd $srcdir/${pkgbase}_src_v${_pkgver//./-}
+ cd ${pkgbase}
a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons
- install -vd $a && cp -va Tools/${_bldname^}2.5Export $a/$pkgbase
+ install -vd $a && cp -va Tools/${_bldname^}2.6Export $a/$pkgbase
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index b2507af21..0b1ed8fad 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 88892 2010-08-26 04:28:34Z dan $
+# $Id: PKGBUILD 193769 2013-08-30 15:44:51Z dan $
# Maintainer: Dan McGee <dan@archlinux.org>
# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=pacman-mirrorlist-libre
-pkgver=$(date +%Y%m%d)
+pkgver=$(LC_ALL=C date -u +%Y%m%d)
pkgrel=1
pkgdesc="Parabola GNU/Linux-libre mirror list for use by pacman"
arch=('any')
@@ -11,16 +12,14 @@ url="https://repo.parabolagnulinux.org/mirrorlist.txt"
license=('GPL')
groups=('base')
backup=(etc/pacman.d/mirrorlist)
-source=(mirrorlist::${url})
+source=(mirrorlist-${pkgver}.txt::${url})
conflicts=(pacman-mirrorlist)
replaces=(pacman-mirrorlist)
provides=(pacman-mirrorlist)
-md5sums=('16ae993e6145aeaa435318386a057482')
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
+package() {
mkdir -p $pkgdir/etc/pacman.d
- install -m644 $srcdir/mirrorlist $pkgdir/etc/pacman.d/
+ install -m644 $srcdir/mirrorlist-${pkgver}.txt $pkgdir/etc/pacman.d/mirrorlist
}
+
+md5sums=('d9611e055969ee109b56026ed06e4919')
diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD
index e70c71b9b..b3085f9c3 100644
--- a/libre/parabola-xdg-menu/PKGBUILD
+++ b/libre/parabola-xdg-menu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 91138 2013-05-20 09:52:33Z spupykin $
+# $Id: PKGBUILD 101138 2013-11-18 10:37:13Z spupykin $
# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=parabola-xdg-menu
-pkgver=0.7.6.1
+pkgver=0.7.6.2
pkgrel=1
pkgdesc="automatic generate WM menu from xdg files (Parabola rebranded)"
arch=('any')
@@ -18,7 +18,7 @@ source=("http://archlinux-stuff.googlecode.com/files/arch-xdg-menu-$pkgver.tar.g
replaces=('archlinux-xdg-menu')
conflicts=('archlinux-xdg-menu')
provides=("archlinux-xdg-menu=$pkgver")
-md5sums=('faa2077140c3d5bacc1de974a9eb3384')
+md5sums=('e4aadc2a05a8e8330c95c22548a4fcfb')
package() {
cd $srcdir
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 0a49ce048..185274efc 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,23 +1,26 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
pkgname=(parabolaweb-utils parabolaweb-dev)
-pkgver=20130717
+pkgver=20131128
pkgdesc="Utilities for managing the parabolaweb website application"
url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
license=('GPL2')
-pkgrel=1
+# The commit to get dependency info for
+_parabolaweb_commit=86f1ed1ecc94a6a298eb3f690155b03bf013ca78
+
+pkgrel=2
epoch=1
arch=('any')
source=(
"https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
- "https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt"
+ "requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}"
)
build() {
cd "$srcdir/$pkgname-$pkgver"
- prod_file="file://${srcdir}/requirements_prod.txt" make
+ prod_file="file://${srcdir}/requirements_prod-${_parabolaweb_commit}.txt" make
}
package_parabolaweb-utils() {
@@ -33,5 +36,5 @@ package_parabolaweb-dev() {
depends=($(sed -r -e 's/\s*#.*//' depends_make.txt))
}
-md5sums=('a6734335001c7695d5a57fb509f8a745'
- 'c84e52d81683cb3d572571ac19be89ac')
+md5sums=('e83933afda290bfc1fe0e51828c7ad41'
+ '4ed35e37e52f6b8607733c692702d319')
diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD
new file mode 100644
index 000000000..70cb073a9
--- /dev/null
+++ b/libre/povray-libre/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 101605 2013-11-29 04:23:22Z eric $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor: tobias <tobias@archlinux.org>
+# Contributor: red_over_blue
+# Contributor: neri
+
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Don't build povray before 3.7 version (it's nonfree software)
+
+_pkgname=povray
+pkgname=$_pkgname-libre
+pkgver=3.7
+pkgrel=4
+epoch=1
+pkgdesc='Script based raytracer for creating 3D graphics, without nonfree documentation'
+arch=('x86_64' 'i686' 'mips64el')
+license=('AGPL3')
+url='http://povray.org/'
+depends=('libtiff' 'libpng' 'boost-libs')
+makedepends=('boost')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+backup=("etc/povray/$pkgver/povray.conf"
+ "etc/povray/$pkgver/povray.ini")
+source=("https://github.com/POV-Ray/$_pkgname/archive/$pkgver-stable.zip"
+ 'povray3.7.0_rc3-user-conf.patch')
+sha256sums=('1261d963327a4b04c09d56bbd7436d0062e6bf8363674e3fb4e240beefb5b5cb'
+ '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0')
+
+prepare() {
+ cd "$_pkgname-$pkgver-stable"
+
+ cd unix
+ sed 's/automake --w/automake --add-missing --w/g' -i prebuild.sh
+ sed 's/dist-bzip2/dist-bzip2 subdir-objects/g' -i configure.ac
+ ./prebuild.sh
+ cd ..
+ ./bootstrap
+ patch -p1 < "$srcdir/povray3.7.0_rc3-user-conf.patch"
+}
+
+build() {
+ cd "$_pkgname-$pkgver-stable"
+
+ ./configure LIBS="-lboost_system -lboost_thread" COMPILED_BY='Parabola GNU/Linux-libre' \
+ --prefix=/usr --sysconfdir=/etc
+ make CXXFLAGS+="-w -lboost_system -lboost_thread"
+ gzip -f povray.1
+}
+
+package() {
+ cd "$_pkgname-$pkgver-stable"
+
+ install -d "$pkgdir/usr/share/$_pkgname-$pkgver"
+ cp -r icons include ini scenes scripts "$pkgdir/usr/share/$_pkgname-$pkgver"
+ install -Dm755 unix/povray "$pkgdir/usr/bin/povray"
+ install -Dm644 povray.conf "$pkgdir/etc/povray/$pkgver/povray.conf"
+ install -Dm644 povray.ini "$pkgdir/etc/povray/$pkgver/povray.ini"
+ install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/povray-libre/povray3.7.0_rc3-user-conf.patch b/libre/povray-libre/povray3.7.0_rc3-user-conf.patch
new file mode 100644
index 000000000..f20d9b506
--- /dev/null
+++ b/libre/povray-libre/povray3.7.0_rc3-user-conf.patch
@@ -0,0 +1,27 @@
+ Makefile.am | 13 -------------
+ 1 files changed, 0 insertions(+), 13 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 76b394c..9822c52 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -107,19 +107,6 @@ install-data-local:
+ for f in $$filelist ; do \
+ $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \
+ done
+- @echo "Creating user directories..."; \
+- for p in $(povuser) $(povconfuser) ; do \
+- $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \
+- done
+- @echo "Copying user configuration and INI files..."; \
+- for f in povray.conf povray.ini ; do \
+- if test -f $(povconfuser)/$$f; then \
+- echo "Creating backup of $(povconfuser)/$$f"; \
+- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \
+- fi; \
+- done; \
+- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >> $(povinstall); \
+- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall)
+
+ # Remove data, config, and empty folders for 'make uninstall'.
+ # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts).
diff --git a/libre/python2-jsmin/PKGBUILD b/libre/python2-jsmin/PKGBUILD
index 5c7646ec2..00c158324 100644
--- a/libre/python2-jsmin/PKGBUILD
+++ b/libre/python2-jsmin/PKGBUILD
@@ -2,7 +2,7 @@
_pkgname=jsmin
pkgname=python2-jsmin
-pkgver=2.0.3
+pkgver=2.0.8
pkgdesc="JavaScript minifier"
url="https://bitbucket.org/dcs/jsmin"
license=('MIT')
@@ -24,4 +24,4 @@ package() {
install -Dm644 license.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
}
-md5sums=('6bdce452c7508d9bd11b133e965fb64e')
+md5sums=('d830a979d63bfa0bc23e11fdbc816e7d')
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
index ba0a64ed1..bf945b53f 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -1,57 +1,88 @@
-# $Id: PKGBUILD 96569 2013-09-01 16:36:10Z speps $
+# $Id: PKGBUILD 102853 2013-12-22 11:43:13Z speps $
# Maintainer: speps <speps at aur dot archlinux dot org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-_name=QupZilla
-_pkgname=qupzilla
-pkgname=qupzilla-libre
+_pkgbase=qupzilla
+pkgbase=qupzilla-libre
+pkgname=(qupzilla-libre qupzilla-libre-qt5)
pkgver=1.4.4
-pkgrel=1.1
-pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers"
+pkgrel=2
arch=(i686 x86_64 mips64el)
url="http://www.qupzilla.com/"
license=('GPL3')
-depends=('qtwebkit' 'hunspell')
+makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell')
optdepends=('bash-completion: bash completion support')
-install="$_pkgname.install"
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("$_pkgname-$pkgver.tar.gz::https://github.com/$_name/$_pkgname/tarball/v$pkgver"
+source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/$_pkgbase/tarball/v$pkgver"
'searchenginesmanager.cpp.sed'
'speeddial.cpp.sed'
'start.html.sed')
+noextract=("$_pkgbase-$pkgver.tar.gz")
+install="$_pkgbase.install"
md5sums=('cfbf5cd23d184275c389c79a39a28631'
'1d926e97a5b287d40fb695f6516f2a06'
'0f166fa102af975b3b8ac030d477e9b8'
'77120a0c39ba8254e5b2c273910f029a')
prepare() {
- cd "$srcdir/$_name-$_pkgname-"*
+ # extract
+ mkdir -p qt{4,5}
+ bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt4
+ bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt5
+
+ # configure
+ export USE_WEBGL=true \
+ QUPZILLA_PREFIX=/usr/
# remove Google and Youtube support, replaces it to DDG HTML
+ cd qt4
+ sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp
+ sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp
+ sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html
+
+ cd ../qt5
sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp
sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp
sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html
}
build() {
- cd "$srcdir/$_name-$_pkgname-"*
-
- # enable webgl support
- export USE_WEBGL=true
+ cd qt4
+ qmake-qt4
+ make
- qmake-qt4 QUPZILLA_PREFIX=/usr/
+ cd ../qt5
+ qmake
make
}
-package() {
- cd "$srcdir/$_name-$_pkgname-"*
+package_qupzilla-libre() {
+ pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers"
+ depends=('qtwebkit' 'hunspell')
+ provides=qupzilla=$pkgver
+ conflicts=qupzilla
+ replaces=qupzilla
+
+ cd qt4
+ make INSTALL_ROOT="$pkgdir/" install
+
+ # zsh completion
+ install -Dm644 linux/completion/zsh_completion.sh \
+ "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase"
+}
+
+package_qupzilla-libre-qt5() {
+ pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers"
+ depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme')
+ provides=("qupzilla-qt5=$pkgver" 'qupzilla-libre')
+ conflicts=('qupzilla-qt5' 'qupzilla-libre')
+ replaces=qupzilla-qt5
+
+ cd qt5
make INSTALL_ROOT="$pkgdir/" install
# zsh completion
install -Dm644 linux/completion/zsh_completion.sh \
- "$pkgdir/usr/share/zsh/site-functions/_$_pkgname"
+ "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase"
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
new file mode 100644
index 000000000..d3b64fd8e
--- /dev/null
+++ b/libre/reflector/PKGBUILD
@@ -0,0 +1,42 @@
+#Maintainer: Xyne <ac xunilhcra enyx, backwards>
+#Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+pkgname=reflector
+pkgver=2013.12.15.1
+pkgrel=1
+pkgdesc='A Python 3 module and script to retrieve and filter the latest Pacman mirror list (Parabola rebranded)'
+arch=(any)
+license=(GPL)
+url="http://xyne.archlinux.ca/projects/reflector"
+depends=(python3)
+source=(
+ http://xyne.archlinux.ca/projects/reflector/src/reflector-2013.12.15.1.tar.xz
+ http://xyne.archlinux.ca/projects/reflector/src/reflector-2013.12.15.1.tar.xz.sig
+ rebranding.patch
+)
+sha512sums=(
+ ac8a23fb6746d85ee4e4d707659da07f5a7b6c18cadba03c8b03430cae70f444e6b35404342da2f9c0ea490e8c4c0f408657880de00a57d9f94d4ab335aa7c55
+ SKIP
+ 83609177f88c0412f1a543f0431ecfb8be229bfef76d7087c35e9273988faedaf24a98ca45d98248eb5dfaa9a27e321dea99a256c68c5bc86a8a0ba53ed56d02
+)
+md5sums=(
+ ccb315013442b7c8aa42c1d017835d38
+ SKIP
+ 24c2a21bc1ac0d3758d8043f36d95add
+)
+
+prepare ()
+{
+ cd "$srcdir/$pkgname-$pkgver"
+ # Rebranding for Parabola
+ patch -Np1 -i "$srcdir/rebranding.patch"
+}
+
+package ()
+{
+ cd "$srcdir/$pkgname-$pkgver"
+ python3 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
+ install -Dm755 "$srcdir/$pkgname-$pkgver/$pkgname" "$pkgdir/usr/bin/$pkgname"
+}
+
+
+# vim: set ts=2 sw=2 et:
diff --git a/libre/reflector/rebranding.patch b/libre/reflector/rebranding.patch
new file mode 100644
index 000000000..d78462b06
--- /dev/null
+++ b/libre/reflector/rebranding.patch
@@ -0,0 +1,63 @@
+diff --git a/Reflector.py b/Reflector.py
+index c046d23..ddf3ac8 100644
+--- a/Reflector.py
++++ b/Reflector.py
+@@ -63,7 +63,7 @@ def get_cache_file():
+
+ class MirrorStatus():
+ # JSON URI
+- URL = 'https://www.archlinux.org/mirrors/status/json/'
++ URL = 'https://parabolagnulinux.org/mirrors/status/json/'
+ # Mirror URL format. Accepts server base URL, repository, and architecture.
+ MIRROR_URL_FORMAT = '{0}{1}/os/{2}'
+ MIRRORLIST_ENTRY_FORMAT = "Server = " + MIRROR_URL_FORMAT + "\n"
+@@ -92,8 +92,12 @@ class MirrorStatus():
+ 'extra',
+ 'gnome-unstable',
+ 'kde-unstable',
++ 'libre',
++ 'libre-testing',
+ 'multilib',
+- 'multilib-testing'
++ 'multilib-testing',
++ 'nonprism',
++ 'pcr',
+ 'staging',
+ 'testing'
+ )
+@@ -449,7 +453,7 @@ class MirrorStatus():
+
+ width = 80
+ colw = 11
+- header = '# Arch Linux mirrorlist generated by Reflector #'.center(width, '#')
++ header = '# Parabola GNU/Linux-libre mirrorlist generated by Reflector #'.center(width, '#')
+ border = '#' * len(header)
+ mirrorlist = '{}\n{}\n{}\n'.format(border, header, border) + \
+ '\n' + \
+@@ -516,7 +520,7 @@ def add_arguments(parser):
+ '''
+ Add reflector arguments to the argument parser.
+ '''
+- parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Arch Linux mirrors')
++ parser = argparse.ArgumentParser(description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors')
+
+ parser.add_argument(
+ '--connection-timeout', dest='connection_timeout', type=int, metavar='n', default=5,
+@@ -535,7 +539,7 @@ def add_arguments(parser):
+
+ parser.add_argument(
+ '--cache-timeout', dest='cache_timeout', type=int, metavar='n', default=300,
+- help='The cache timeout in seconds for the data retrieved from the Arch Linux Mirror Status API. The default is 300 (5 minutes).'
++ help='The cache timeout in seconds for the data retrieved from the Parabola GNU/Linux-libre Mirror Status API. The default is 300 (5 minutes).'
+ )
+
+ parser.add_argument(
+@@ -615,7 +619,7 @@ def parse_args(args=None):
+ Parse command-line arguments.
+ '''
+ parser = argparse.ArgumentParser(
+- description='retrieve and filter a list of the latest Arch Linux mirrors'
++ description='retrieve and filter a list of the latest Parabola GNU/Linux-libre mirrors'
+ )
+ parser = add_arguments(parser)
+ options = parser.parse_args(args)
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
index 27758d8a0..854b9f409 100644
--- a/libre/spectrwm-libre/PKGBUILD
+++ b/libre/spectrwm-libre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 92647 2013-06-10 15:12:25Z bpiotrowski $
+# $Id: PKGBUILD 101697 2013-11-30 11:24:42Z bpiotrowski $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
_pkgname=spectrwm
pkgname=spectrwm-libre
-pkgver=2.3.0
+pkgver=2.4.0
pkgrel=1
pkgdesc="A minimalistic automatic tiling window manager that tries to stay out of the way, without nonfree profont support"
arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +21,7 @@ backup=(etc/spectrwm.conf)
source=(http://opensource.conformal.com/snapshots/$_pkgname/$_pkgname-$pkgver.tgz \
LICENSE \
baraction.sh)
-md5sums=('7698a5b219fdabad07a76ef45b1360d1'
+md5sums=('23e32c1e292f2fc94ed88195ffe60023'
'a67cfe51079481e5b0eab1ad371379e3'
'950d663692e1da56e0ac864c6c3ed80e')
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
index 31830f197..338fc5d7a 100644
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=stuntrally-data-libre
_pkgname=stuntrally-data
-pkgver=2.1
+pkgver=2.2.1
pkgrel=1
pkgdesc="Stunt Rally game with track editor, based on VDrift (data files), without nonfree data files"
arch=('any')
@@ -16,9 +16,9 @@ source=("$_pkgname-$pkgver.tar.gz::https://github.com/stuntrally/stuntrally/arch
replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
-sha256sums=('d987e8c05ed1f3f54468e75e2c1f68a9a4c59ceefa7429130d4f800b28821ae0'
- 'a1ab9b11d9f5b6c4aa8e5a9028f5994e21446d96fda5762e427365e21cfe3d0e'
- '8cf24da76bed18fd03a3166ba8b8da93be87a7e49b8aebe4135b8e0b1a36eb8a')
+sha256sums=('305b5f498ab150e4cf1fd1d47410ea04ad3cf439b60278ea2b73a01278d9ca51'
+ '45e9c976964e22348530a99a99c0dac30bc766d2f9edbe1a83a7b6791850d565'
+ '89eed28f625758a22460f2cea67547d2ea6cffa2bef8133083077b1753cf2b64')
prepare() {
# patch some data files and remove nonfree data files
cd "${srcdir}/stuntrally-${pkgver}/"
@@ -56,7 +56,7 @@ build() {
}
package() {
- #install the sources
+ # install the sources
cd "${srcdir}/stuntrally-${pkgver}/build/"
make DESTDIR="${pkgdir}" install
diff --git a/libre/stuntrally-data-libre/libre.patch b/libre/stuntrally-data-libre/libre.patch
index f7f176a77..d55a4e54a 100644
--- a/libre/stuntrally-data-libre/libre.patch
+++ b/libre/stuntrally-data-libre/libre.patch
@@ -1,13 +1,13 @@
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
-index eb7fc89..d1b670f 100644
+index c43ef18..aa6373e 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
# Install data files
# TODO: make this use all data/* subdirs without tracks, not entered by hand ..
--foreach(datadir cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain terrain2 trees-old trees trees2)
-+foreach(datadir cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s RTShaderLib skies skies_s sounds terrain2 trees-old trees)
+-foreach(datadir cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s skies skies_s sounds terrain terrain2 trees-old trees trees2)
++foreach(datadir cars carsim compositor editor fonts ghosts grass gui hud loading materials materials2 objects particles road road_s skies skies_s sounds terrain2 trees-old trees)
install(DIRECTORY ${datadir} DESTINATION ${SHARE_INSTALL})
endforeach()
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index ad30022df..234f7a43f 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname="syslinux"
pkgver="6.02"
-pkgrel="4"
+pkgrel="8"
arch=('x86_64' 'i686')
pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE (Parabola rebranded)"
url="http://syslinux.zytor.com/"
@@ -27,12 +27,45 @@ source=("https://www.kernel.org/pub/linux/utils/boot/syslinux/${pkgname}-${pkgve
'syslinux.cfg'
'syslinux-install_update'
'syslinux-6.02-fix-chainloading.patch'
+ 'syslinux-6.02-fix-bios-isolinux.patch'
+ 'syslinux-6.02-fix-efi-ovmf.patch'
'splash.png')
md5sums=('6f275813a1b08cf852e55c0a3f8fbc78'
'f048880b57e2c5a7017ff8804bfda327'
- '9da2b8b25ea8d628887f11749dc3fffa'
+ '9376f18fa3e42fc36cffa4cff0a84c09'
'9dbede6b71a4de9e46aac4aad65334d7'
+ 'adf71eceb4fccecd9a7efe1ab3d54918'
+ '62d22b101ef2ef53e25b4f86d9f41cb5'
'cb46ca47c6b6323127d908440057d98f')
+prepare() {
+
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+
+ ## Do not try to build the Windows or DOS installers and DIAG files
+ sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+ sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
+
+ ## Fix FHS manpage path
+ sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
+
+ # fix chainloading
+ # http://bugzilla.syslinux.org/show_bug.cgi?id=31
+ # http://www.syslinux.org/archives/2013-October/020971.html
+ patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch"
+
+ # fix bios booting from isohybrid
+ # http://www.syslinux.org/archives/2013-November/021189.html
+ patch -Np1 -i "${srcdir}/syslinux-6.02-fix-bios-isolinux.patch"
+
+ # fix efi booting in qemu/ovmf
+ # http://bugzilla.syslinux.org/show_bug.cgi?id=23
+ patch -Np1 -i "${srcdir}/syslinux-6.02-fix-efi-ovmf.patch"
+
+}
_build_syslinux_bios() {
@@ -43,7 +76,8 @@ _build_syslinux_bios() {
## Do not try to build syslinux with our default LDFLAGS, it will fail
unset LDFLAGS
make PYTHON="python2" bios
- make PYTHON="python2" bios installer
+ make PYTHON="python2" bios installer
+
}
_build_syslinux_efi64() {
@@ -60,7 +94,8 @@ _build_syslinux_efi64() {
unset MAKEFLAGS
make PYTHON="python2" efi64
- make PYTHON="python2" efi64 installer
+ make PYTHON="python2" efi64 installer
+
}
_build_syslinux_efi32() {
@@ -77,29 +112,14 @@ _build_syslinux_efi32() {
unset MAKEFLAGS
make PYTHON="python2" efi32
- make PYTHON="python2" efi32 installer
+ make PYTHON="python2" efi32 installer
+
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}/"
- ## Do not try to build the Windows or DOS installers and DIAG files
- sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
- sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
- sed 's|dosutil/*.com dosutil/*.sys||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
- sed 's|dos/syslinux.com||g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
- sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
- sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i "${srcdir}/${pkgname}-${pkgver}/Makefile" || true
-
- ## Fix FHS manpage path
- sed 's|/usr/man|/usr/share/man|g' -i "${srcdir}/${pkgname}-${pkgver}/mk/syslinux.mk" || true
-
- # fix chainloading
- # http://bugzilla.syslinux.org/show_bug.cgi?id=31
- # http://www.syslinux.org/archives/2013-October/020971.html
- patch -Np1 -i "${srcdir}/syslinux-6.02-fix-chainloading.patch"
-
## Build syslinux-efi
if [[ "${CARCH}" == "x86_64" ]]; then
_build_syslinux_efi64
@@ -151,7 +171,7 @@ _package_syslinux_bios() {
install -D -m644 "${srcdir}/splash.png" "${pkgdir}/boot/syslinux/splash.png"
}
-package() {
+_package_syslinux_efi() {
cd "${srcdir}/${pkgname}-${pkgver}/"
@@ -165,6 +185,15 @@ package() {
make INSTALLROOT="${pkgdir}/" AUXDIR="/usr/lib/syslinux/" efi32 install
fi
+}
+
+package() {
+
+ cd "${srcdir}/${pkgname}-${pkgver}/"
+
+ _package_syslinux_efi
+
_package_syslinux_bios
}
+
diff --git a/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch b/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch
new file mode 100644
index 000000000..48df46f12
--- /dev/null
+++ b/libre/syslinux/syslinux-6.02-fix-bios-isolinux.patch
@@ -0,0 +1,12 @@
+diff --git a/core/isolinux.asm b/core/isolinux.asm
+index bd4e9556922d..c4db4133e274 100644
+--- a/core/isolinux.asm
++++ b/core/isolinux.asm
+@@ -420,7 +420,7 @@ MaxLMA equ 384*1024 ; Reasonable limit (384K)
+ call getlinsec
+ pop eax
+ pop cx
+- mov dx,cx
++ movzx edx,cx
+ pop bp
+ pop bx
diff --git a/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch b/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch
new file mode 100644
index 000000000..f33f4c1de
--- /dev/null
+++ b/libre/syslinux/syslinux-6.02-fix-efi-ovmf.patch
@@ -0,0 +1,621 @@
+The value of the field rva_and_sizes_nr is used by OVMF to check the
+consistency of the PE file with respect to the field optional_hdr_sz. It
+now have the right value.
+
+Signed-off-by: Celelibi <celelibi at gmail.com>
+---
+ efi/wrapper.c | 6 +++---
+ efi/wrapper.h | 28 ++++++++++++++++------------
+ 2 files changed, 19 insertions(+), 15 deletions(-)
+
+diff --git a/efi/wrapper.c b/efi/wrapper.c
+index 04c895f..ec77271 100644
+--- a/efi/wrapper.c
++++ b/efi/wrapper.c
+@@ -102,7 +102,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ e_hdr.image_sz = total_sz;
+ e_hdr.headers_sz = 512;
+ e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+- e_hdr.rva_and_sizes_nr = 1;
++ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
+ fwrite(&e_hdr, sizeof(e_hdr), 1, f);
+ }
+ else if (class == ELFCLASS64) {
+@@ -130,7 +130,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ e_hdr_pe32p.image_sz = total_sz;
+ e_hdr_pe32p.headers_sz = 512;
+ e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+- e_hdr_pe32p.rva_and_sizes_nr = 1;
++ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
+ fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f);
+ }
+
+@@ -237,7 +237,7 @@ int main(int argc, char **argv)
+ fprintf(stderr, "Unsupported architecture\n");
+ exit(EXIT_FAILURE);
+ }
+-
++
+ if (id[EI_MAG0] != ELFMAG0 ||
+ id[EI_MAG1] != ELFMAG1 ||
+ id[EI_MAG2] != ELFMAG2 ||
+diff --git a/efi/wrapper.h b/efi/wrapper.h
+index 4f76991..0e6b38e 100644
+--- a/efi/wrapper.h
++++ b/efi/wrapper.h
+@@ -102,12 +102,14 @@ struct extra_hdr {
+ __uint32_t heap_commit_sz;
+ __uint32_t loader_flags;
+ __uint32_t rva_and_sizes_nr;
+- __uint64_t export_table;
+- __uint64_t import_table;
+- __uint64_t resource_table;
+- __uint64_t exception_table;
+- __uint64_t certification_table;
+- __uint64_t base_relocation_table;
++ struct {
++ __uint64_t export_table;
++ __uint64_t import_table;
++ __uint64_t resource_table;
++ __uint64_t exception_table;
++ __uint64_t certification_table;
++ __uint64_t base_relocation_table;
++ } data_directory;
+ } __packed;
+
+ /* Extra header for PE32+ format
+@@ -136,12 +138,14 @@ struct extra_hdr_pe32p {
+ __uint64_t heap_commit_sz;
+ __uint32_t loader_flags;
+ __uint32_t rva_and_sizes_nr;
+- __uint64_t export_table;
+- __uint64_t import_table;
+- __uint64_t resource_table;
+- __uint64_t exception_table;
+- __uint64_t certification_table;
+- __uint64_t base_relocation_table;
++ struct {
++ __uint64_t export_table;
++ __uint64_t import_table;
++ __uint64_t resource_table;
++ __uint64_t exception_table;
++ __uint64_t certification_table;
++ __uint64_t base_relocation_table;
++ } data_directory;
+ } __packed;
+
+ struct section {
+In the generated PE file, the section header for the .text section used
+to address more than the whole file. Starting at offset 0 (before the
+end of the headers) is illegal and is rejected by OVMF. Giving a size
+greater than the actual file size is also illegal and rejected.
+
+Moreover, the actual data inside the PE file have to be aligned to at
+least 512 bytes. Hence, .text need to be aligned as well.
+
+Signed-off-by: Celelibi <celelibi at gmail.com>
+---
+ efi/wrapper.c | 44 +++++++++++++++++++++++++-------------------
+ 1 file changed, 25 insertions(+), 19 deletions(-)
+
+diff --git a/efi/wrapper.c b/efi/wrapper.c
+index ec77271..bd2c175 100644
+--- a/efi/wrapper.c
++++ b/efi/wrapper.c
+@@ -54,11 +54,15 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ struct coff_hdr c_hdr;
+ struct header hdr;
+ struct coff_reloc c_rel;
+- __uint32_t total_sz = so_size;
++ __uint32_t total_sz = data_size;
+ __uint32_t dummy = 0;
+ __uint32_t hdr_sz;
+ __uint32_t reloc_start, reloc_end;
+
++ hdr_sz = 512;
++ total_sz += hdr_sz;
++ entry += hdr_sz;
++
+ memset(&hdr, 0, sizeof(hdr));
+ hdr.msdos_signature = MSDOS_SIGNATURE;
+
+@@ -77,11 +81,6 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ c_hdr.nr_sections = 2;
+ c_hdr.nr_syms = 1;
+ if (class == ELFCLASS32) {
+- hdr_sz = sizeof(o_hdr) + sizeof(t_sec) + sizeof(e_hdr) +
+- sizeof(r_sec) + sizeof(c_hdr) + sizeof(hdr) + sizeof(c_rel)
+- + sizeof(dummy);
+- total_sz += hdr_sz;
+- entry += hdr_sz;
+ c_hdr.arch = IMAGE_FILE_MACHINE_I386;
+ c_hdr.characteristics = IMAGE_FILE_32BIT_MACHINE |
+ IMAGE_FILE_DEBUG_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE |
+@@ -92,25 +91,20 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ o_hdr.format = PE32_FORMAT;
+ o_hdr.major_linker_version = 0x02;
+ o_hdr.minor_linker_version = 0x14;
+- o_hdr.code_sz = total_sz;
++ o_hdr.code_sz = data_size;
+ o_hdr.entry_point = entry;
+ o_hdr.initialized_data_sz = data_size;
+ fwrite(&o_hdr, sizeof(o_hdr), 1, f);
+ memset(&e_hdr, 0, sizeof(e_hdr));
+ e_hdr.section_align = 4096;
+ e_hdr.file_align = 512;
+- e_hdr.image_sz = total_sz;
+- e_hdr.headers_sz = 512;
++ e_hdr.image_sz = hdr_sz + so_size;
++ e_hdr.headers_sz = hdr_sz;
+ e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
+ fwrite(&e_hdr, sizeof(e_hdr), 1, f);
+ }
+ else if (class == ELFCLASS64) {
+- hdr_sz = sizeof(o_hdr_pe32p) + sizeof(t_sec) + sizeof(e_hdr_pe32p) +
+- sizeof(r_sec) + sizeof(c_hdr) + sizeof(hdr) + sizeof(c_rel)
+- + sizeof(dummy);
+- total_sz += hdr_sz;
+- entry += hdr_sz;
+ c_hdr.arch = IMAGE_FILE_MACHINE_X86_64;
+ c_hdr.characteristics = IMAGE_FILE_DEBUG_STRIPPED | IMAGE_FILE_EXECUTABLE_IMAGE |
+ IMAGE_FILE_LINE_NUMBERS_STRIPPED;
+@@ -120,15 +114,15 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ o_hdr_pe32p.format = PE32P_FORMAT;
+ o_hdr_pe32p.major_linker_version = 0x02;
+ o_hdr_pe32p.minor_linker_version = 0x14;
+- o_hdr_pe32p.code_sz = total_sz;
++ o_hdr_pe32p.code_sz = data_size;
+ o_hdr_pe32p.entry_point = entry;
+ o_hdr.initialized_data_sz = data_size;
+ fwrite(&o_hdr_pe32p, sizeof(o_hdr_pe32p), 1, f);
+ memset(&e_hdr_pe32p, 0, sizeof(e_hdr));
+ e_hdr_pe32p.section_align = 4096;
+ e_hdr_pe32p.file_align = 512;
+- e_hdr_pe32p.image_sz = total_sz;
+- e_hdr_pe32p.headers_sz = 512;
++ e_hdr_pe32p.image_sz = hdr_sz + so_size;
++ e_hdr_pe32p.headers_sz = hdr_sz;
+ e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
+ fwrite(&e_hdr_pe32p, sizeof(e_hdr_pe32p), 1, f);
+@@ -136,8 +130,10 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+
+ memset(&t_sec, 0, sizeof(t_sec));
+ strcpy((char *)t_sec.name, ".text");
+- t_sec.virtual_sz = total_sz;
+- t_sec.raw_data_sz = total_sz;
++ t_sec.virtual_sz = data_size;
++ t_sec.virtual_address = hdr_sz;
++ t_sec.raw_data_sz = t_sec.virtual_sz;
++ t_sec.raw_data = t_sec.virtual_address;
+ t_sec.characteristics = IMAGE_SCN_CNT_CODE |
+ IMAGE_SCN_ALIGN_16BYTES | IMAGE_SCN_MEM_EXECUTE |
+ IMAGE_SCN_MEM_READ;
+@@ -163,6 +159,16 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ fwrite(&c_rel, sizeof(c_rel), 1, f);
+ fwrite(&dummy, sizeof(dummy), 1, f);
+
++ /*
++ * Add some padding to align the ELF as needed
++ */
++ if (ftell(f) > t_sec.virtual_address) {
++ // A fseek that rewind would be a bug hard to track
++ fprintf(stderr, "PE+ headers are too large.\n");
++ exit(EXIT_FAILURE);
++ }
++
++ fseek(f, t_sec.virtual_address, SEEK_SET);
+ }
+
+ static void usage(char *progname)
+There is no need to have a relocation section that nothing points at.
+The image is still seen as relocatable as long as the Characteristics of
+the FileHeader do not say otherwise.
+
+Moreover, the field base_relocation_table wasn't initialized properly
+leading to unpredictable bugs.
+
+Signed-off-by: Celelibi <celelibi at gmail.com>
+---
+
+I'm not 100% positive about the uselessness of the relocation section. However:
+1) it works on my real hardware;
+2) OVMF doesn't check the section headers at all;
+3) all the docs I could find say that the section names are arbitrary;
+4) the only way to make the relocation actually happen is by setting the
+base_relocation_table field of the extra headers to point to this section;
+5) The right way to indicate the image is not relocatable would be by setting
+the characteristics IMAGE_FILE_RELOCS_STRIPPED in the coff header.
+
+Moreover, the relocation entry cannot be inserted before the end of the headers
+(512 bytes), this mean we would have to push everything a few bytes further.
+And I think it's better if it can be avoided. :)
+
+ efi/wrapper.c | 28 +++-------------------------
+ 1 file changed, 3 insertions(+), 25 deletions(-)
+
+diff --git a/efi/wrapper.c b/efi/wrapper.c
+index bd2c175..9652368 100644
+--- a/efi/wrapper.c
++++ b/efi/wrapper.c
+@@ -48,14 +48,12 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ {
+ struct optional_hdr o_hdr;
+ struct optional_hdr_pe32p o_hdr_pe32p;
+- struct section t_sec, r_sec;
++ struct section t_sec;
+ struct extra_hdr e_hdr;
+ struct extra_hdr_pe32p e_hdr_pe32p;
+ struct coff_hdr c_hdr;
+ struct header hdr;
+- struct coff_reloc c_rel;
+ __uint32_t total_sz = data_size;
+- __uint32_t dummy = 0;
+ __uint32_t hdr_sz;
+ __uint32_t reloc_start, reloc_end;
+
+@@ -78,7 +76,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ fwrite(&hdr, sizeof(hdr), 1, f);
+
+ memset(&c_hdr, 0, sizeof(c_hdr));
+- c_hdr.nr_sections = 2;
++ c_hdr.nr_sections = 1;
+ c_hdr.nr_syms = 1;
+ if (class == ELFCLASS32) {
+ c_hdr.arch = IMAGE_FILE_MACHINE_I386;
+@@ -118,7 +116,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ o_hdr_pe32p.entry_point = entry;
+ o_hdr.initialized_data_sz = data_size;
+ fwrite(&o_hdr_pe32p, sizeof(o_hdr_pe32p), 1, f);
+- memset(&e_hdr_pe32p, 0, sizeof(e_hdr));
++ memset(&e_hdr_pe32p, 0, sizeof(e_hdr_pe32p));
+ e_hdr_pe32p.section_align = 4096;
+ e_hdr_pe32p.file_align = 512;
+ e_hdr_pe32p.image_sz = hdr_sz + so_size;
+@@ -140,26 +138,6 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ fwrite(&t_sec, sizeof(t_sec), 1, f);
+
+ /*
+- * Write our dummy relocation and reloc section.
+- */
+- memset(&r_sec, 0, sizeof(r_sec));
+- strcpy((char *)r_sec.name, ".reloc");
+- r_sec.virtual_sz = sizeof(c_rel);
+- r_sec.virtual_address = ftell(f) + sizeof(r_sec);
+- r_sec.raw_data_sz = r_sec.virtual_sz;
+- r_sec.raw_data = r_sec.virtual_address;
+- r_sec.characteristics = IMAGE_SCN_CNT_INITIALIZED_DATA |
+- IMAGE_SCN_ALIGN_1BYTES | IMAGE_SCN_MEM_DISCARDABLE |
+- IMAGE_SCN_MEM_READ;
+- fwrite(&r_sec, sizeof(r_sec), 1, f);
+-
+- memset(&c_rel, 0, sizeof(c_rel));
+- c_rel.virtual_address = ftell(f) + sizeof(c_rel);
+- c_rel.symtab_index = 10;
+- fwrite(&c_rel, sizeof(c_rel), 1, f);
+- fwrite(&dummy, sizeof(dummy), 1, f);
+-
+- /*
+ * Add some padding to align the ELF as needed
+ */
+ if (ftell(f) > t_sec.virtual_address) {
+PE headers code_sz and image_sz indicate more or less, the size of the
+file and the size of the in-memory image. They are now given the right
+value.
+
+In the ELF format, only the program headers are reliable to determine
+the actually needed part of the file and the in-memory size.
+
+The .bss section should always be marked as NOLOAD for ld since its
+content shouldn't be included into the binary file.
+
+Signed-off-by: Celelibi <celelibi at gmail.com>
+---
+
+Again, I'm not 100% positive about the semantics of NOLOAD in a linker script.
+However I found this make things work better.
+Actually the file core/fs/fs.o have a .bss16 section that is not empty. If I
+understood correctly, only .bss can be empty in a .o. Thus ld generates the
+zeros that belong to that section in the .o. Then, when merging the section
+.bss16 into the .bss of syslinux.so, ld is forced to generate ALL the zeros
+that belong to the .bss section. Marking this section as NOLOAD make ld to
+ignore its content but still produce a PT_LOAD program header with the right
+memory size, as needed for the bss.
+
+ efi/i386/syslinux.ld | 4 +-
+ efi/wrapper.c | 138 +++++++++++++++----------------------------------
+ efi/x86_64/syslinux.ld | 4 +-
+ 3 files changed, 45 insertions(+), 101 deletions(-)
+
+diff --git a/efi/i386/syslinux.ld b/efi/i386/syslinux.ld
+index 523a9b9..bab3fc7 100644
+--- a/efi/i386/syslinux.ld
++++ b/efi/i386/syslinux.ld
+@@ -136,7 +136,7 @@ SECTIONS
+ *(.strtab)
+ }
+
+- .bss : {
++ .bss (NOLOAD) : {
+ /* the EFI loader doesn't seem to like a .bss section,
+ so we stick it all into .data: */
+ __bss_start = .;
+@@ -153,7 +153,7 @@ SECTIONS
+ __bss_dwords = (__bss_len + 3) >> 2;
+
+ . = ALIGN(128);
+-
++
+ /* Very large objects which don't need to be zeroed */
+
+ .hugebss : {
+diff --git a/efi/wrapper.c b/efi/wrapper.c
+index 9652368..a5247ae 100644
+--- a/efi/wrapper.c
++++ b/efi/wrapper.c
+@@ -35,7 +35,7 @@ typedef Elf64_Addr Elf_Addr;
+ #endif
+
+ /*
+- * 'so_size' is the file size of the ELF shared object.
++ * 'so_memsz' is the size of the ELF shared object once loaded.
+ * 'data_size' is the size of initialised data in the shared object.
+ * 'class' dictates how the header is written
+ * For 32bit machines (class == ELFCLASS32), the optional
+@@ -44,7 +44,7 @@ typedef Elf64_Addr Elf_Addr;
+ * header includes PE32+header fields
+ */
+ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+- __uint32_t so_size, __uint8_t class)
++ __uint32_t so_memsz, __uint8_t class)
+ {
+ struct optional_hdr o_hdr;
+ struct optional_hdr_pe32p o_hdr_pe32p;
+@@ -96,7 +96,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ memset(&e_hdr, 0, sizeof(e_hdr));
+ e_hdr.section_align = 4096;
+ e_hdr.file_align = 512;
+- e_hdr.image_sz = hdr_sz + so_size;
++ e_hdr.image_sz = hdr_sz + so_memsz;
+ e_hdr.headers_sz = hdr_sz;
+ e_hdr.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+ e_hdr.rva_and_sizes_nr = sizeof(e_hdr.data_directory) / sizeof(__uint64_t);
+@@ -119,7 +119,7 @@ static void write_header(FILE *f, __uint32_t entry, size_t data_size,
+ memset(&e_hdr_pe32p, 0, sizeof(e_hdr_pe32p));
+ e_hdr_pe32p.section_align = 4096;
+ e_hdr_pe32p.file_align = 512;
+- e_hdr_pe32p.image_sz = hdr_sz + so_size;
++ e_hdr_pe32p.image_sz = hdr_sz + so_memsz;
+ e_hdr_pe32p.headers_sz = hdr_sz;
+ e_hdr_pe32p.subsystem = IMAGE_SUBSYSTEM_EFI_APPLICATION;
+ e_hdr_pe32p.rva_and_sizes_nr = sizeof(e_hdr_pe32p.data_directory) / sizeof(__uint64_t);
+@@ -157,17 +157,16 @@ static void usage(char *progname)
+
+ int main(int argc, char **argv)
+ {
+- struct stat st;
+ Elf32_Ehdr e32_hdr;
+ Elf64_Ehdr e64_hdr;
+ __uint32_t entry;
+ __uint8_t class;
+- __uint64_t shoff;
+- __uint16_t shnum, shentsize, shstrndx;
++ __uint64_t phoff = 0;
++ __uint16_t phnum = 0, phentsize = 0;
+ unsigned char *id;
+ FILE *f_in, *f_out;
+ void *buf;
+- size_t datasz, rv;
++ size_t datasz, memsz, rv;
+
+ if (argc < 3) {
+ usage(argv[0]);
+@@ -180,11 +179,6 @@ int main(int argc, char **argv)
+ exit(EXIT_FAILURE);
+ }
+
+- if (stat(argv[1], &st) != 0) {
+- perror("stat");
+- exit(EXIT_FAILURE);
+- }
+-
+ f_out = fopen(argv[2], "w");
+ if (!f_out) {
+ perror("fopen");
+@@ -194,15 +188,14 @@ int main(int argc, char **argv)
+ /*
+ * Parse the ELF header and find the entry point.
+ */
+- fread((void *)&e32_hdr, sizeof(e32_hdr), 1, f_in);
++ fread((void *)&e32_hdr, sizeof(e32_hdr), 1, f_in);
+ if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS32) {
+ id = e32_hdr.e_ident;
+ class = ELFCLASS32;
+ entry = e32_hdr.e_entry;
+- shoff = e32_hdr.e_shoff;
+- shnum = e32_hdr.e_shnum;
+- shstrndx = e32_hdr.e_shstrndx;
+- shentsize = e32_hdr.e_shentsize;
++ phoff = e32_hdr.e_phoff;
++ phnum = e32_hdr.e_phnum;
++ phentsize = e32_hdr.e_phentsize;
+ }
+ else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
+ /* read the header again for x86_64
+@@ -213,10 +206,9 @@ int main(int argc, char **argv)
+ fread((void *)&e64_hdr, sizeof(e64_hdr), 1, f_in);
+ id = e64_hdr.e_ident;
+ entry = e64_hdr.e_entry;
+- shoff = e64_hdr.e_shoff;
+- shnum = e64_hdr.e_shnum;
+- shstrndx = e64_hdr.e_shstrndx;
+- shentsize = e64_hdr.e_shentsize;
++ phoff = e64_hdr.e_phoff;
++ phnum = e64_hdr.e_phnum;
++ phentsize = e64_hdr.e_phentsize;
+ } else {
+ fprintf(stderr, "Unsupported architecture\n");
+ exit(EXIT_FAILURE);
+@@ -230,98 +222,47 @@ int main(int argc, char **argv)
+ exit(EXIT_FAILURE);
+ }
+
+- if (!shoff || !shnum || (shstrndx == SHN_UNDEF)) {
+- fprintf(stderr, "Cannot find section table\n");
++ if (!phoff || !phnum) {
++ fprintf(stderr, "Cannot find segment table\n");
+ exit(EXIT_FAILURE);
+ }
+
+ /*
+- * Find the beginning of the .bss section. Everything preceding
+- * it is copied verbatim to the output file.
++ * Find the LOAD program header. Everything in this segment
++ * is copied verbatim to the output file.
++ * Although there may be several LOAD program headers, only
++ * one is currently copied.
+ */
+ if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS32) {
+- const char *shstrtab, *name;
+- Elf32_Shdr shdr;
++ Elf32_Phdr phdr;
+ int i;
+- void *strtab;
+-
+- fseek(f_in, shoff, SEEK_SET);
+-
+- /* First find the strtab section */
+- fseek(f_in, shstrndx * shentsize, SEEK_CUR);
+- fread(&shdr, sizeof(shdr), 1, f_in);
+
+- strtab = malloc(shdr.sh_size);
+- if (!strtab) {
+- fprintf(stderr, "Failed to malloc strtab\n");
+- exit(EXIT_FAILURE);
+- }
+-
+- fseek(f_in, shdr.sh_offset, SEEK_SET);
+- fread(strtab, shdr.sh_size, 1, f_in);
+-
+- /* Now search for the .bss section */
+- fseek(f_in, shoff, SEEK_SET);
+- for (i = 0; i < shnum; i++) {
+- rv = fread(&shdr, sizeof(shdr), 1, f_in);
+- if (!rv) {
+- fprintf(stderr, "Failed to read section table\n");
+- exit(EXIT_FAILURE);
+- }
++ /* Find the first LOAD program header */
++ for (i = 0; i < phnum; i++) {
++ fseek(f_in, phoff + i * phentsize, SEEK_SET);
++ fread(&phdr, sizeof(phdr), 1, f_in);
+
+- name = strtab + shdr.sh_name;
+- if (!strcmp(name, ".bss"))
++ if (phdr.p_type == PT_LOAD)
+ break;
+ }
+
+- if (i == shnum) {
+- fprintf(stderr, "Failed to find .bss section\n");
+- exit(EXIT_FAILURE);
+- }
+-
+- datasz = shdr.sh_offset;
+- }
+- else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
+- const char *shstrtab, *name;
+- Elf64_Shdr shdr;
++ datasz = phdr.p_filesz;
++ memsz = phdr.p_memsz;
++ } else if (e32_hdr.e_ident[EI_CLASS] == ELFCLASS64) {
++ Elf64_Phdr phdr;
+ int i;
+- void *strtab;
+-
+- fseek(f_in, shoff, SEEK_SET);
+
+- /* First find the strtab section */
+- fseek(f_in, shstrndx * shentsize, SEEK_CUR);
+- fread(&shdr, sizeof(shdr), 1, f_in);
+-
+- strtab = malloc(shdr.sh_size);
+- if (!strtab) {
+- fprintf(stderr, "Failed to malloc strtab\n");
+- exit(EXIT_FAILURE);
+- }
++ /* Find the first LOAD program header */
++ for (i = 0; i < phnum; i++) {
++ fseek(f_in, phoff + i * phentsize, SEEK_SET);
++ fread(&phdr, sizeof(phdr), 1, f_in);
+
+- fseek(f_in, shdr.sh_offset, SEEK_SET);
+- fread(strtab, shdr.sh_size, 1, f_in);
+-
+- /* Now search for the .bss section */
+- fseek(f_in, shoff, SEEK_SET);
+- for (i = 0; i < shnum; i++) {
+- rv = fread(&shdr, sizeof(shdr), 1, f_in);
+- if (!rv) {
+- fprintf(stderr, "Failed to read section table\n");
+- exit(EXIT_FAILURE);
+- }
+-
+- name = strtab + shdr.sh_name;
+- if (!strcmp(name, ".bss"))
++ if (phdr.p_type == PT_LOAD)
+ break;
+ }
+
+- if (i == shnum) {
+- fprintf(stderr, "Failed to find .bss section\n");
+- exit(EXIT_FAILURE);
+- }
+-
+- datasz = shdr.sh_offset;
++ datasz = phdr.p_filesz;
++ memsz = phdr.p_memsz;
+ }
+
+ buf = malloc(datasz);
+@@ -330,7 +271,7 @@ int main(int argc, char **argv)
+ exit(EXIT_FAILURE);
+ }
+
+- write_header(f_out, entry, datasz, st.st_size, class);
++ write_header(f_out, entry, datasz, memsz, class);
+
+ /* Write out the entire ELF shared object */
+ rewind(f_in);
+@@ -341,5 +282,8 @@ int main(int argc, char **argv)
+ }
+
+ fwrite(buf, datasz, rv, f_out);
++ free(buf);
++ fclose(f_out);
++ fclose(f_in);
+ return 0;
+ }
+diff --git a/efi/x86_64/syslinux.ld b/efi/x86_64/syslinux.ld
+index 95160bd..450641c 100644
+--- a/efi/x86_64/syslinux.ld
++++ b/efi/x86_64/syslinux.ld
+@@ -136,7 +136,7 @@ SECTIONS
+ *(.strtab)
+ }
+
+- .bss : {
++ .bss (NOLOAD) : {
+ /* the EFI loader doesn't seem to like a .bss section,
+ so we stick it all into .data: */
+ __bss_start = .;
+@@ -153,7 +153,7 @@ SECTIONS
+ __bss_dwords = (__bss_len + 3) >> 2;
+
+ . = ALIGN(128);
+-
++
+ /* Very large objects which don't need to be zeroed */
+
+ .hugebss : {
diff --git a/libre/syslinux/syslinux-install_update b/libre/syslinux/syslinux-install_update
index 251b9c482..3843b5fed 100644
--- a/libre/syslinux/syslinux-install_update
+++ b/libre/syslinux/syslinux-install_update
@@ -20,8 +20,7 @@
#
#-----------------
# ChangeLog:
-# 2013-10-23 : Keshav Padram Amburay : Updated script to work with Syslinux 6.02 Parabola GNU/Linux-libre pkg
-# 2013-10-30 : André Silva : Rebranded script for Parabola
+# 2013-10-23 : Keshav Padram Amburay : Updated script to work with Syslinux 6.02 Arch Linux pkg
#-----------------
# Exit Codes:
# 1 - get_boot_device or other function failed
@@ -334,7 +333,7 @@ update() {
install_modules
if device_is_raid "$bootpart" ; then
- echo "Detected RAID on /boot - installing Syslinux with --raid"
+ echo "Detected RAID on /boot - updating Syslinux with --raid"
"$EXTLINUX" --update "$bios_bootpath" --raid &> /dev/null
else
"$EXTLINUX" --update "$bios_bootpath" &> /dev/null
diff --git a/libre/syslinux/syslinux.install b/libre/syslinux/syslinux.install
index 7dc7a43c1..ed8387773 100644
--- a/libre/syslinux/syslinux.install
+++ b/libre/syslinux/syslinux.install
@@ -1,36 +1,43 @@
post_install() {
- echo "==> If you want to use syslinux as your BIOS bootloader"
- echo "==> edit /boot/syslinux/syslinux.cfg and run"
- echo "==> # /usr/bin/syslinux-install_update -i -a -m"
- echo "==> to install it."
cat << EOF
-Syslinux efi64 and efi32 files have been installed at
-/usr/lib/syslinux/{efi64,efi32}/ respectively.
-To install, copy /usr/lib/syslinux/efi64 to (ESP)/EFI/syslinux and
-syslinux.cfg to (ESP)/EFI/syslinux/syslinux.cfg and add a boot entry
-using efibootmgr for (ESP)/EFI/syslinux/syslinux.efi
+==> For setting up Syslinux BIOS using the syslinux-install_update script follow
+ https://wiki.parabolagnulinux.org/index.php/Syslinux#Automatic_Install
EOF
+
+ ## Message specific to Syslinux 4.xx (or 5.xx) to 6.xx upgrade
+ if [ "$(vercmp $2 6.00)" -lt 0 ]; then
+
+ cat << EOF
+
+==> If you are upgrading from Syslinux 4.xx or 5.xx, please re-install
+ (not update) Syslinux BIOS manually (not using the install script) once
+ by following https://wiki.parabolagnulinux.org/index.php/Syslinux#Manual_install
+
+==> The install script may not properly upgrade Syslinux to 6.xx version
+EOF
+
+ fi
+
+ cat << EOF
+
+==> For setting up Syslinux EFI follow
+ https://wiki.parabolagnulinux.org/index.php/Syslinux#UEFI_Systems
+==> The syslinux-install_update script does not currently support EFI install
+
+EOF
+
}
post_upgrade() {
- # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
+
+ ## auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
/usr/bin/syslinux-install_update -s
- # update to 5.01 message
- if [ "$(vercmp $2 5.01)" -lt 0 ]; then
- echo "If you used syslinux-install_update to install syslinux:"
- echo "==> If you want to use syslinux with menu and all modules please rerun"
- echo "==> # /usr/bin/syslinux-install_update -i -a -m"
- echo ""
- echo "If you manually installed syslinux:"
- echo "==> Please copy or symlink all .c32 modules to your /boot/syslinux directory."
- echo "==> If (/ and /boot on separate fs):"
- echo "==> # cp /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
- echo "==> If (/ and /boot on same fs):"
- echo "==> # ln -s /usr/lib/syslinux/bios/*.c32 /boot/syslinux"
- fi
+
+ post_install
+
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index e43f8e70f..ce3b3789e 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197649 2013-10-27 17:39:24Z remy $
+# $Id: PKGBUILD 200613 2013-11-29 21:10:52Z andyrtr $
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: francois <francois.archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,19 +6,19 @@
pkgname=texlive-bin-libre
pkgver=2013.30973
-pkgrel=6
+pkgrel=7
pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
-depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.0'
+depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.4'
'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
'icu' 'harfbuzz' 'harfbuzz-icu')
makedepends=('perl' 'clisp' 'ffcall')
optdepends=('ed: for texconfig')
-provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
-conflicts=('pdfjam' 'texlive-bin')
+provides=('texlive-bin' 'lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam')
+conflicts=('texlive-bin' 'pdfjam')
replaces=('texlive-bin')
-options=('!libtool' '!strip')
+options=('!strip')
url='http://tug.org/texlive/'
install="texlive.install"
source=('fix-fontforge-encoding.patch'
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 4c0dd0dd4..b5639d522 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 102970 2013-12-25 07:48:12Z bpiotrowski $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -12,7 +13,7 @@ pkgname=tp_smapi-libre-lts
_pkgname=tp_smapi
_extramodules=/usr/lib/modules/extramodules-3.10-LIBRE-LTS
pkgver=0.41
-pkgrel=17
+pkgrel=21
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre-lts kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 05deae4a7..ba5a3747f 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98569 2013-10-14 07:06:56Z tpowa $
+# $Id: PKGBUILD 102837 2013-12-21 18:35:00Z tpowa $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: xduugu
# Contributor: nh2
@@ -12,13 +12,13 @@
_pkgname=tp_smapi
pkgname=tp_smapi-libre
pkgver=0.41
-pkgrel=38
+pkgrel=41
pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url='https://github.com/evgeni/tp_smapi'
license=('GPL')
-depends=('linux-libre>=3.11' 'linux-libre<3.12')
-makedepends=('linux-libre-headers>=3.11' 'linux-libre-headers<3.12')
+depends=('linux-libre>=3.12' 'linux-libre<3.13')
+makedepends=('linux-libre-headers>=3.12' 'linux-libre-headers<3.13')
replaces=("${_pkgname}")
conflicts=("${_pkgname}")
provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index e145576ad..2f81a4e15 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.11-LIBRE
+extramodules=/usr/lib/modules/extramodules-3.12-LIBRE
post_install() {
depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index c400fc16b..e7f632461 100755
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -3,8 +3,8 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=unar
-pkgver=1.8
-pkgrel=3
+pkgver=1.8.1
+pkgrel=1
pkgdesc="An Objective-C application for uncompressing archive files"
arch=('x86_64' 'i686' 'mips64el')
url="http://unarchiver.c3.cx/"
@@ -39,5 +39,5 @@ package() {
}
# vim:set ts=2 sw=2 et:
-md5sums=('1b1d769855605a1687f13d0241e02821'
+md5sums=('4f952153fa849093efe2238498350fbe'
'4fa4ecc6e4ba14d3b6952d064e728511')
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 01b8878d7..31ec4c26e 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 98572 2013-10-14 07:17:54Z tpowa $
+# $Id: PKGBUILD 102839 2013-12-21 18:35:50Z tpowa $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -7,13 +7,13 @@
_pkgname=vhba-module
pkgname=vhba-module-libre
pkgver=20130607
-_extramodules=extramodules-3.11-LIBRE
-pkgrel=17
+_extramodules=extramodules-3.12-LIBRE
+pkgrel=21
pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
arch=('i686' 'x86_64' 'mips64el')
url="http://cdemu.sourceforge.net/"
license=('GPL')
-depends=('linux-libre>=3.11' 'linux-libre<3.12')
+depends=('linux-libre>=3.12' 'linux-libre<3.13')
makedepends=('linux-libre-headers')
options=(!makeflags)
install=$_pkgname.install
@@ -22,7 +22,7 @@ conflicts=('vhba-module')
provides=("vhba-module=$pkgver")
source=("http://downloads.sourceforge.net/cdemu/$_pkgname-$pkgver.tar.bz2"
'60-vhba.rules')
-md5sums=('92a681e4665aa85a8335d00395a61697'
+md5sums=('660df41d08b1fd86baad1f16a0264438'
'4dc37dc348b5a2c83585829bde790dcc')
build() {
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
index 93ac38edd..20cccfb53 100644
--- a/libre/vim-runtime/PKGBUILD
+++ b/libre/vim-runtime/PKGBUILD
@@ -3,15 +3,16 @@
# Contributor: tobias [ tobias at archlinux org ]
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
pkgbase=vim
pkgname=vim-runtime
_topver=7.4
-_patchlevel=16
-__hgrev=d17ef148ada4
+_patchlevel=86
+__hgrev=f6940759212d
_versiondir="vim${_topver//./}"
pkgver=${_topver}.${_patchlevel}
-pkgrel=2
+pkgrel=1
arch=('i686' 'x86_64' 'mips64el')
license=('custom:vim')
url="http://www.vim.org"
@@ -20,7 +21,7 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
"ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
'vimrc'
'parabola.vim')
-md5sums=('733cce44a08ea953ad0e1f9d574670e0'
+md5sums=('436d4d3c6402ce20309bf2cdedce63c0'
'SKIP'
'27820c2bdc34624674c561ae6476bc6a'
'a8c21928eefd766e211f987879a9199c')
diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD
new file mode 100644
index 000000000..dfbd783c7
--- /dev/null
+++ b/libre/wings3d-libre/PKGBUILD
@@ -0,0 +1,65 @@
+# $Id: PKGBUILD 95697 2013-08-15 18:20:27Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: kappa <kappacurve@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+
+_name=wings
+_pkgname=${_name}3d
+pkgname=$_pkgname-libre
+pkgver=1.5.2
+pkgrel=1
+pkgdesc='3D modeling program, without nonfree kerkythea render support'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.wings3d.com/'
+license=('GPL')
+depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils' 'erlang')
+makedepends=('gendesk')
+optdepends=('povray-libre: rendering support via POV-Ray')
+provides=("$_pkgname")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+install=$_pkgname.install
+source=("$_pkgname-$pkgver.tar.gz::https://github.com/dgud/wings/archive/v$pkgver.tar.gz"
+ "$_pkgname.sh"
+ "$_pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
+sha256sums=('d86980e4fa91a04ca96b989b0dcba53a37c8cfda4e6d98accb8e7bd9a289094b'
+ '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
+ '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a')
+
+prepare() {
+ gendesk --pkgname "$_pkgname" --pkgdesc "$pkgdesc" \
+ --genericname '3D Modeler' --categories 'Graphics;3DGraphics'
+
+ cd "$_name-$pkgver"
+ sed -i "s|v1[.]2[.]x[.]y[.]WINGS|v$pkgver.$pkgrel.PARABOLA|" WINGS-VERSION-GEN
+}
+
+build() {
+ cd "$_name-$pkgver"
+
+ export ESDL_PATH=$(echo /usr/lib/erlang/lib/esdl-*)
+ make
+ make lang
+}
+
+package() {
+ cd "$_name-$pkgver"
+
+ mkdir -p "$pkgdir/usr/lib/$_pkgname"
+ for subdir in ebin fonts patches plugins shaders textures; do
+ cp -r "$srcdir/$_name-$pkgver/$subdir/" "$pkgdir/usr/lib/$_pkgname"
+ done
+ cd "$srcdir"
+ install -Dm755 "$_pkgname.sh" "$pkgdir/usr/bin/$_pkgname"
+ install -Dm644 "$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+ install -Dm644 "$_pkgname.desktop" \
+ "$pkgdir/usr/share/applications/$_pkgname.desktop"
+
+ msg 'remove nonfree kerkythea render support plugin'
+ rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_kerky.beam
+
+ msg 'remove obsolete yafray render support plugin'
+ rm -v $pkgdir/usr/lib/wings3d/plugins/import_export/wpc_yafray{.beam,_{de,en,fr,ko}.lang}
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/wings3d/wings3d.install b/libre/wings3d-libre/wings3d.install
index 98f3ea190..98f3ea190 100644
--- a/community/wings3d/wings3d.install
+++ b/libre/wings3d-libre/wings3d.install
diff --git a/libre/wings3d-libre/wings3d.png b/libre/wings3d-libre/wings3d.png
new file mode 100644
index 000000000..1fe6579dc
--- /dev/null
+++ b/libre/wings3d-libre/wings3d.png
Binary files differ
diff --git a/community/wings3d/wings3d.sh b/libre/wings3d-libre/wings3d.sh
index c0fd3b2fb..c0fd3b2fb 100644
--- a/community/wings3d/wings3d.sh
+++ b/libre/wings3d-libre/wings3d.sh
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 23d389d52..2809f8248 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100487 2013-11-05 08:57:03Z bpiotrowski $
+# $Id: PKGBUILD 103051 2013-12-25 20:34:37Z idevolder $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -9,13 +9,14 @@ _prefix=/usr
_pkgname=xbmc
pkgname=xbmc-libre
-pkgver=12.2
-pkgrel=6
+pkgver=12.3
+_codename=Frodo
+pkgrel=1
pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
arch=('i686' 'x86_64')
url="http://xbmc.org"
license=('GPL' 'custom')
-depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
+depends=('hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva'
'libpng' 'libcdio' 'yajl' 'libmariadbclient' 'libjpeg-turbo' 'libsamplerate'
'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2'
'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos'
@@ -24,7 +25,6 @@ depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff'
makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libcec'
'udisks' 'upower' 'mesa' 'doxygen' 'swig' 'java-environment')
optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
- 'pulseaudio: pulseaudio support'
'lirc-libre: remote controller support'
'udisks: automount external drives'
'upower: used to trigger suspend functionality'
@@ -35,16 +35,26 @@ replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
- "xbmc.service")
-md5sums=('489f3877decae4e265ece54f9eaef0ba'
- '76fae229ebc3bcfaab7e7f27e4fb51f5')
+ "xbmc.service"
+ "polkit.rules"
+ "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
+md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
+ '8312d6d4ac5d7c3d9eed40ab08a17d3b'
+ 'd4cbb6609c8e7b713c714241f529000e'
+ '7fd6399d2ffbdf06b724f0cc2efa0784')
-build() {
- cd "${srcdir}/xbmc-$pkgver"
+prepare() {
+ cd "${srcdir}/xbmc-$pkgver-$_codename"
+
+ patch -p0 <$srcdir/libass.patch
# fix lsb_release dependency
sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
sed -i -e 's:#include <libsmbclient.h>:#include <samba-4.0/libsmbclient.h>:' xbmc/filesystem/{SmbFile,SMBDirectory}.cpp
+}
+
+build() {
+ cd "${srcdir}/xbmc-$pkgver-$_codename"
# Bootstrapping XBMC
./bootstrap
@@ -64,7 +74,6 @@ build() {
--enable-rsxs \
--enable-projectm \
--enable-x11 \
- --enable-pulse \
--enable-rtmp \
--enable-samba \
--enable-nfs \
@@ -89,7 +98,7 @@ build() {
}
package() {
- cd "${srcdir}/xbmc-$pkgver"
+ cd "${srcdir}/xbmc-$pkgver-$_codename"
# Running make install
make DESTDIR="${pkgdir}" install
@@ -101,8 +110,8 @@ package() {
sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
# Tools
- install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
- install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
+ install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
+ install -D -m 0755 "${srcdir}/xbmc-$pkgver-$_codename/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
# Licenses
install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}"
@@ -110,7 +119,8 @@ package() {
mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}"
done
- # systemd stuff
install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
+ install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
+ chmod 0700 $pkgdir/etc/polkit-1/rules.d/
}
# vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/polkit.rules b/libre/xbmc-libre/polkit.rules
new file mode 100644
index 000000000..5bc7e69f5
--- /dev/null
+++ b/libre/xbmc-libre/polkit.rules
@@ -0,0 +1,11 @@
+polkit.addRule(function(action, subject) {
+ if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) {
+ return polkit.Result.YES;
+ }
+});
+
+polkit.addRule(function(action, subject) {
+ if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) {
+ return polkit.Result.YES;
+ }
+});
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
index 431582f1b..b6430e255 100644
--- a/libre/xbmc-libre/xbmc.service
+++ b/libre/xbmc-libre/xbmc.service
@@ -6,8 +6,8 @@ After = remote-fs.target
User = xbmc
Group = xbmc
Type = simple
-ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0 -nolisten tcp
-Restart = always
+ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -l /run/lirc/lircd -- :0 -nolisten tcp
+Restart = on-abort
[Install]
WantedBy = multi-user.target
diff --git a/libre/xscreensaver-libre/LICENSE b/libre/xscreensaver-libre/LICENSE
index 4f587b5a3..406467cd4 100644
--- a/libre/xscreensaver-libre/LICENSE
+++ b/libre/xscreensaver-libre/LICENSE
@@ -1,4 +1,5 @@
-/* xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 1991-2013 Jamie Zawinski <jwz@jwz.org>
+ *
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index 2e10b72b2..c2eddaafc 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 190799 2013-07-16 22:56:09Z eric $
+# $Id: PKGBUILD 201451 2013-12-12 05:18:26Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=xscreensaver
pkgname=xscreensaver-libre
-pkgver=5.22
+pkgver=5.26
pkgrel=1
pkgdesc="Screen saver and locker for the X Window System, without nonfree asm files"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.jwz.org/xscreensaver/"
license=('BSD')
-depends=('libglade' 'xorg-appres' 'perl-libwww')
+depends=('libglade' 'libxmu' 'glu' 'xorg-appres' 'perl-libwww')
makedepends=('bc' 'libxpm' 'gdm')
optdepends=('gdm: for login manager support')
replaces=("${_pkgname}")
@@ -19,9 +19,9 @@ provides=("${_pkgname}=${pkgver}")
backup=('etc/pam.d/xscreensaver')
source=(http://www.jwz.org/xscreensaver/${_pkgname}-${pkgver}.tar.gz \
xscreensaver-add-electricsheep.diff LICENSE)
-sha1sums=('b1d7f97d9b60d9c68c0f3e019cad885f5c7bd6ec'
+sha1sums=('8055822b661733e68550872a4ae6b6129c0b73fc'
'e8dc57b6471fb3867ee099304ac6bf628351cb98'
- '4209ea586b204fd1d81c382a0522c654f9fd9134')
+ '3eedb8b91b13c29df9b1fe5cbb027e1470b802d2')
prepare() {
cd ${_pkgname}-${pkgver}
diff --git a/nonprism/bitlbee-libre-nonprism/PKGBUILD b/nonprism/bitlbee-libre-nonprism/PKGBUILD
index e48667d52..02418359a 100644
--- a/nonprism/bitlbee-libre-nonprism/PKGBUILD
+++ b/nonprism/bitlbee-libre-nonprism/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 200603 2013-11-29 19:17:58Z dreisner $
# Contributor: FUBAR <mrfubar@gmail.com>
# Contributor: simo <simo@archlinux.org>
@@ -10,8 +10,8 @@
_pkgname=bitlbee
pkgname=bitlbee-libre-nonprism
-pkgver=3.2
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
pkgdesc='Brings XMPP to IRC, without support for unsafe and dangerous for privacy protocols'
url='http://www.bitlbee.org/'
license=('GPL')
@@ -26,8 +26,8 @@ replaces=("$_pkgname" "$_pkgname-libre" "$_pkgname-coherence")
source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
'xinetd'
'bitlbee.tmpfiles')
-sha1sums=('21e17f082c776566429603b1e8c966983a75ac9e'
- 'ec1a3efff09b9fc3d3e52560d8cdbe23186c819f'
+sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5'
+ '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
'3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
backup=('etc/bitlbee/bitlbee.conf'
'etc/bitlbee/motd.txt'
@@ -49,7 +49,6 @@ build() {
--oscar=0 \
--yahoo=0 \
--twitter=0 \
- --purple=0 \
--ssl=gnutls \
--strip=0 \
--otr=plugin \
diff --git a/nonprism/bitlbee-libre-nonprism/bitlbee.install b/nonprism/bitlbee-libre-nonprism/bitlbee.install
index aa5a81a70..c8a8f93a1 100644
--- a/nonprism/bitlbee-libre-nonprism/bitlbee.install
+++ b/nonprism/bitlbee-libre-nonprism/bitlbee.install
@@ -1,15 +1,22 @@
post_install() {
- getent group bitlbee &>/dev/null || groupadd -r -g 65 bitlbee >/dev/null
- getent passwd bitlbee &>/dev/null || useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
- systemd-tmpfiles --create bitlbee.conf
+ if ! getent group bitlbee &>/dev/null; then
+ groupadd -r -g 65 bitlbee >/dev/null
+ fi
+ if ! getent passwd bitlbee &>/dev/null; then
+ useradd -r -u 65 -g bitlbee -d /var/lib/bitlbee -s /bin/false -c bitlbee bitlbee >/dev/null
+ fi
+ systemd-tmpfiles --create bitlbee.conf
}
post_upgrade() {
- post_install
+ post_install
}
post_remove() {
- getent passwd bitlbee &>/dev/null && userdel bitlbee >/dev/null
- getent group bitlbee &>/dev/null && groupdel bitlbee >/dev/null
- true
+ if getent passwd bitlbee &>/dev/null; then
+ userdel bitlbee >/dev/null
+ fi
+ if getent group bitlbee &>/dev/null; then
+ groupdel bitlbee >/dev/null
+ fi
}
diff --git a/nonprism/bitlbee-libre-nonprism/xinetd b/nonprism/bitlbee-libre-nonprism/xinetd
index 68d5663b3..d671a8cfc 100644
--- a/nonprism/bitlbee-libre-nonprism/xinetd
+++ b/nonprism/bitlbee-libre-nonprism/xinetd
@@ -6,7 +6,7 @@ service bitlbee
wait = no
user = bitlbee
group = bitlbee
- server = /usr/bin/bitlbee
+ server = /usr/sbin/bitlbee
port = 6667
disable = yes
}
diff --git a/nonprism/claws-mail-nonprism/PKGBUILD b/nonprism/claws-mail-nonprism/PKGBUILD
index 4df1a5e5f..1e48c65bd 100644
--- a/nonprism/claws-mail-nonprism/PKGBUILD
+++ b/nonprism/claws-mail-nonprism/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 196415 2013-10-13 09:17:50Z andyrtr $
+# $Id: PKGBUILD 201547 2013-12-14 21:56:36Z andyrtr $
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=claws-mail
pkgname=$_pkgname-nonprism
-pkgver=3.9.2
-pkgrel=4
+pkgver=3.9.3
+pkgrel=1
pkgdesc="A GTK+ based e-mail client, without libgdata support"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
url="http://www.$_pkgname.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4'
+depends=('gtk2' 'gnutls' 'startup-notification' 'enchant' 'gpgme' 'libetpan>=1.1-4' 'compface'
'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind'
+makedepends=('spamassassin' 'bogofilter' 'valgrind'
# dependencies for plugins
'libsoup' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk')
#'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
@@ -34,10 +34,9 @@ optdepends=('python2: needed for some tools and python plugin'
replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins" "$_pkgname-libre" "$_pkgname-libre-nonprism")
conflicts=("$_pkgname" "$_pkgname-extra-plugins")
provides=("$_pkgname=$pkgver" 'claws')
-options=(!libtool)
install=$_pkgname.install
source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
+md5sums=('0158b5e6b6d6866f9a75fd288a4edf04'
'SKIP')
build() {
diff --git a/nonprism/evolution-data-server-nonprism/PKGBUILD b/nonprism/evolution-data-server-nonprism/PKGBUILD
index a84fbf135..f8e78ee1a 100644
--- a/nonprism/evolution-data-server-nonprism/PKGBUILD
+++ b/nonprism/evolution-data-server-nonprism/PKGBUILD
@@ -1,15 +1,14 @@
-# $Id: PKGBUILD 196433 2013-10-13 19:19:09Z heftig $
+# $Id: PKGBUILD 201344 2013-12-09 08:01:08Z heftig $
# Maintainer: Jan de Groot <jgc@archlinux.org>
_pkgname=evolution-data-server
pkgname=evolution-data-server-nonprism
-pkgver=3.10.1
+pkgver=3.10.3
pkgrel=1
pkgdesc="Centralized access to appointments and contacts, without libgdata support"
arch=(i686 x86_64)
-depends=(gnome-online-accounts nss krb5 libgweather libical db gcr libsoup)
+depends=(gnome-online-accounts nss krb5 libgweather libical db)
makedepends=(intltool gperf gobject-introspection vala python2)
-options=('!libtool')
install=$_pkgname.install
url="http://www.gnome.org"
license=(GPL)
@@ -17,7 +16,7 @@ replaces=("$_pkgname" 'evolution-data-server-coherence')
conflicts=$_pkgname
provides=$_pkgname=$pkgver
source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('a6b5acbd21767b685d58ebfd4c152baa693387f5654fb738b3645ee39e82f9f5')
+sha256sums=('41af5c658255230de47423fad73f19bfab15b9e0df80141b13f66b55bf295bd2')
build() {
cd "$_pkgname-$pkgver"
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
index e9c333171..db313b925 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 196736 2013-10-17 12:37:48Z heftig $
+# $Id: PKGBUILD 199427 2013-11-12 16:52:35Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=gnome-online-accounts
pkgname=gnome-online-accounts-nonprism
-pkgver=3.10.1
-pkgrel=2
+pkgver=3.10.2
+pkgrel=1
pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
arch=(i686 x86_64 mips64el)
url="http://www.gnome.org"
@@ -16,10 +16,9 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl')
provides=("$_pkgname=$pkgver")
conflicts=$_pkgname
replaces=($_pkgname $pkgname-coherence)
-options=(!libtool)
install=$_pkgname.install
source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('d925841a4c1c7a46a0837fc7e219891a46431e089847fa248e3f691c23ff7d9b')
+sha256sums=('0b2418c1845337b6574a12d2075d319d8aaa5bbc4b0d1d123108c5da00e11b97')
build() {
cd $_pkgname-$pkgver
diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD
new file mode 100644
index 000000000..36d5497dd
--- /dev/null
+++ b/nonprism/icedove-libre-nonprism/PKGBUILD
@@ -0,0 +1,146 @@
+# Maintainer : Márcio Silva <coadde@lavabit.com>
+# Maintainer : André Silva <emulatorman@parabola.nu>
+
+# We're getting this from Debian Experimental
+_debname=icedove
+_debver=24.1.1
+_debrel=deb1
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_pkgname=${_debname}
+pkgname=${_debname}-libre-nonprism
+epoch=1
+pkgver=${_debver}.${_debrel}
+pkgrel=1
+pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
+arch=('i686' 'x86_64' 'mips64el')
+license=('MPL' 'GPL' 'LGPL')
+url="http://packages.debian.org/experimental/${_pkgname}"
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification')
+makedepends=('unzip-libre' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
+optdepends=('libcanberra: for sound support')
+replaces=('thunderbird' "${pkgname%-nonprism}")
+conflicts=('thunderbird' "${pkgname%-nonprism}")
+provides=('thunderbird' "${pkgname%-nonprism}=$epoch:$pkgver")
+install=${_pkgname}.install
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
+ "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.gz"
+ mozconfig
+ vendor.js
+ ${_pkgname}.desktop)
+options=(!emptydirs)
+md5sums=('91ddfb44481e6cb456d835a832d885c1'
+ '9f060324dbed3f8d27c896703bda6078'
+ 'c46cf2a671c8fdefcabd4c87e38f3d40'
+ '5a53179d14ae9631b7afe5e4d0fc0b25'
+ 'e785e0c267f4435ae1a9aa0b03bcacfb')
+
+prepare() {
+ export DEBIAN_BUILD="comm-esr24"
+
+ export QUILT_PATCHES=debian/patches
+ export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+ export QUILT_DIFF_ARGS='--no-timestamps'
+
+ mv debian "${srcdir}/${DEBIAN_BUILD}"
+ cd "${srcdir}/${DEBIAN_BUILD}"
+
+ mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}"
+
+ cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg
+ for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+ install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png"
+ done
+ for i in 48x48 64x64; do
+ install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png"
+ done
+
+ # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh.
+ sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch
+
+ quilt push -av
+
+ # Fix paths on makefile
+ sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|;
+ s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
+ s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
+ ' mail/branding/icedove/Makefile.in
+
+ sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|;
+ s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|;
+ s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|;
+ ' mail/branding/icedove/locales/Makefile.in
+
+ # Fix package-manifest.in
+ sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|;
+ \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif|
+ ' mail/installer/package-manifest.in
+
+ # Fix branding
+ sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties}
+
+ # Replace common URLs
+ sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+ \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+ \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+ \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g;
+ ' mail/app/profile/all-thunderbird.js
+
+ # Remove support for unsafe and dangerous for privacy protocols
+ sed -i '\|facebook|d
+ \|gtalk|d
+ \|twitter|d
+ ' chat/moz.build
+ sed -i '\|facebook[.]js|d
+ \|facebook[.]manifest|d
+ \|gtalk[.]js|d
+ \|gtalk[.]manifest|d
+ \|twitter[.]js|d
+ \|twitter[.]manifest|d
+ ' mail/installer/package-manifest.in
+ rm -r chat/protocols/{facebook,gtalk,twitter}
+
+ cp "${srcdir}/mozconfig" .mozconfig
+
+ # configure script misdetects the preprocessor without an optimization level
+ # https://bugs.archlinux.org/task/34644
+ sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
+}
+
+build() {
+ export DEBIAN_BUILD="comm-esr24"
+
+ cd "${srcdir}/${DEBIAN_BUILD}"
+
+ export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}"
+ export PYTHON="/usr/bin/python2"
+
+ make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+}
+
+package() {
+ export DEBIAN_BUILD="comm-esr24"
+
+ cd "${srcdir}/${DEBIAN_BUILD}"
+
+ make -j1 -f client.mk DESTDIR="${pkgdir}" install
+
+ install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js"
+
+ for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do
+ install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png"
+ done
+ install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg"
+
+ install -Dm644 "${srcdir}/${_pkgname}.desktop" \
+ "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+
+ rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins}
+ ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries"
+ ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${_pkgname}/hyphenation"
+ ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins"
+
+ # We don't want the development stuff
+ rm -r "${pkgdir}"/usr/{include,lib/${_pkgname}-devel,share/idl}
+}
diff --git a/nonprism/icedove-libre-nonprism/icedove.desktop b/nonprism/icedove-libre-nonprism/icedove.desktop
new file mode 100644
index 000000000..ef2cd76e9
--- /dev/null
+++ b/nonprism/icedove-libre-nonprism/icedove.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Icedove
+Comment=Mail & News Reader
+GenericName=Mail Client & News Reader
+Exec=icedove %u
+TryExec=icedove
+Icon=icedove
+Terminal=false
+Type=Application
+Categories=Network;Email;
+MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true
diff --git a/community/blueman/blueman.install b/nonprism/icedove-libre-nonprism/icedove.install
index 8bf021487..4d4a283db 100644
--- a/community/blueman/blueman.install
+++ b/nonprism/icedove-libre-nonprism/icedove.install
@@ -1,11 +1,12 @@
post_install() {
+ update-desktop-database -q
gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
post_upgrade() {
- post_install $1
+ post_install
}
post_remove() {
- post_install $1
+ post_install
}
diff --git a/nonprism/icedove-libre-nonprism/mozconfig b/nonprism/icedove-libre-nonprism/mozconfig
new file mode 100644
index 000000000..57c02368a
--- /dev/null
+++ b/nonprism/icedove-libre-nonprism/mozconfig
@@ -0,0 +1,46 @@
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# Icedove
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=mail/branding/icedove
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gstreamer
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# Parabola features
+ac_add_options --disable-safe-browsing
diff --git a/nonprism/icedove-libre-nonprism/vendor.js b/nonprism/icedove-libre-nonprism/vendor.js
new file mode 100644
index 000000000..170b505a8
--- /dev/null
+++ b/nonprism/icedove-libre-nonprism/vendor.js
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
index a5f4e9807..86a91508f 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre-nonprism
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Instant Messenger, without skype and support for unsafe and dangerous for privacy protocols'
url='http://kde.org/applications/internet/kopete/'
arch=('i686' 'x86_64' 'mips64el')
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdenetwork')
-depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libidn'
+depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libidn'
'qimageblitz' 'mediastreamer' 'jsoncpp')
makedepends=('cmake' 'automoc4' 'boost')
install=${_pkgname}.install
@@ -19,18 +19,12 @@ replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz"
- 'libotr3.patch'
- 'mediastreamer29.patch'
'libre-nonprism.patch')
-sha1sums=('70fd03fb955574f4eba733d590ce15c841fd8805'
- '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
- '317683a5c2acd0a0058c5ab42f6006e9db511ef3'
- '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208')
+sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875'
+ 'ddde6ed0b6f281512dc12cb80f712f33c6932c92')
prepare() {
cd kopete-${pkgver}
- patch -p2 -i "${srcdir}"/libotr3.patch
- patch -p1 -i "${srcdir}"/mediastreamer29.patch
# Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34.
sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt
rm -rf protocols/skype
@@ -52,10 +46,11 @@ prepare() {
sed -i 's/meanwhile protocol" ON/meanwhile protocol" OFF/g' protocols/CMakeLists.txt
rm -rf protocols/meanwhile
patch -p1 -i "${srcdir}"/libre-nonprism.patch
+ cd ..
+ mkdir build
}
build() {
- mkdir build
cd build
cmake ../kopete-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
deleted file mode 100644
index 1e96c98d6..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
---- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600
-+++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700
-@@ -13,13 +13,13 @@
- SET(LIBOTR_FIND_QUIETLY TRUE)
- ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
-
--FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
-+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
-
--FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
-+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
-
--# Determine version information from libotr/version.h
-+# Determine version information from libotr3/version.h
- IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
-- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
-+ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
- STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
- STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
- # Check if version is at least 3.2.0
-diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
---- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700
-@@ -26,7 +26,7 @@
- */
-
- extern "C"{
--#include "libotr/proto.h"
-+#include "libotr3/proto.h"
- }
-
- #include "kopetechatsession.h"
-diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
---- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700
-@@ -36,10 +36,10 @@
- #include "authenticationwizard.h"
-
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
- }
-
-
-diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
---- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700
-@@ -32,11 +32,11 @@
- #include <kopetechatsession.h>
-
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
--#include <libotr/context.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
-+#include <libotr3/context.h>
- }
-
- class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
index b6915cbb5..6d73766cc 100644
--- a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
+++ b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch
@@ -1,8 +1,8 @@
diff --git a/doc/index.docbook b/doc/index.docbook
-index 1576dc9..daf7170 100644
+index b55fd88..416de49 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
-@@ -20,7 +20,6 @@
+@@ -24,7 +24,6 @@
<!ENTITY kopete-chatstyle SYSTEM "chatstyle.docbook">
<!ENTITY kopete-pipes SYSTEM "pipes.docbook">
<!ENTITY kopete-jabber SYSTEM "jabber.docbook">
@@ -10,7 +10,7 @@ index 1576dc9..daf7170 100644
]>
<!--
Intro (1st draft, Will)
-@@ -112,15 +111,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+@@ -116,15 +115,7 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
<keyword>Messaging</keyword>
<keyword>Jabber</keyword>
<keyword>IRC</keyword>
@@ -26,7 +26,7 @@ index 1576dc9..daf7170 100644
</keywordset>
</bookinfo>
-@@ -174,13 +165,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
+@@ -178,13 +169,13 @@ Appendix: Chat Window Style Guide (1st draft, Michaël)
<para>To use &kopete; you need to set up one or more accounts for the instant messaging services you wish to use.</para>
<para>You've probably already chosen a messaging service, either because you already use &im;, or you need to use the same service as your friends. If you don't fit into either of these categories, please consider using a messaging service based on open standards, because these are designed for use by Free Software. Other messaging services are prone to changing the underlying technology without making the details freely available, making them harder for Free Software developers to support.</para>
<para>The messaging services that &kopete; supports that are based on open standards are Jabber and IRC.</para>
@@ -35,14 +35,14 @@ index 1576dc9..daf7170 100644
<sect1 id="creating-accounts">
<title>Creating Accounts</title>
<para>To create an account, use <menuchoice><guimenu>Settings</guimenu> <guimenuitem>Configure...</guimenuitem> </menuchoice> to display the Configure window.</para>
- <para>The Configure window is the main way to set up and customize &kopete;. On the left a column of icons control which aspect of &kopete; is being configured. Click the <guiicon>Accounts</guiicon> icon. The main pane will change to display the account management pane. This is currently empty, but will soon list your &im; accounts. Click <guibutton>New</guibutton> to display the <interface>Account Wizard</interface>.</para>
- <para>The <interface>Account Wizard</interface> helps you create an &im; account. After the <guilabel>Introduction</guilabel> page, you are asked to select the messaging service that you'd like to use. Click one of the services shown and then click <guibutton>Next</guibutton>. On the following page, you should enter your registration details for that instant messaging service.</para>
+ <para>The Configure window is the main way to set up and customize &kopete;. On the left a column of icons control which aspect of &kopete; is being configured. Click the <guiicon>Accounts</guiicon> icon. The main pane will change to display the account management pane. This is currently empty, but will soon list your &im; accounts. Click <guibutton>Add Account</guibutton> to display the <interface>Account Wizard</interface>.</para>
+ <para>The <interface>Account Wizard</interface> helps you create an &im; account. On the first page, you are asked to select the messaging service that you'd like to use. Click one of the services shown and then click <guibutton>Next</guibutton>. On the following page, you should enter your registration details for that instant messaging service.</para>
-<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password. The special purpose services Winpopup and <acronym>SMS</acronym> work slightly differently, so please see their specific sections. There are a couple of other options that apply to most services that you should look at:</para>
+<para>Most services just require you to enter a username or unique identifying number (<acronym>UIN</acronym>) and password. The special purpose services Winpopup work slightly differently, so please see their specific sections. There are a couple of other options that apply to most services that you should look at:</para>
<variablelist>
<varlistentry><term>Remember password</term><listitem><para>When this is checked, &kopete; will store the password for you, so you don't have to enter it every time you connect to the &im; service. If you are security-conscious or want to limit access to the &im; account you can leave this unchecked.</para></listitem></varlistentry>
<varlistentry><term>Connect at startup</term><listitem><para>When this is checked, &kopete; will try to connect to the &im; service as when it starts. If you use a <acronym>LAN</acronym>, <acronym>DSL</acronym> or other <quote>always-on</quote> connection, this is appropriate; dial-up modem users should turn this off and connect manually when you have dialed up.</para></listitem></varlistentry>
-@@ -256,7 +247,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+@@ -260,7 +251,7 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
<listitem><para>Select Display Name and Group. Here you can enter a Display Name (the name used for this person inside &kopete;), and choose the <link linkend="organise-contacts-grouping">groups</link> they are a member of.</para></listitem>
<listitem><para>Select &im; Accounts. Here you can choose which accounts you want to use to chat to the new contact. If you only have one &im; account, you won't see this screen.</para></listitem>
<listitem><para>Account-specific Add Contact Pages. For each account, you'll get one page where you can enter the <acronym>UIN</acronym>, buddy name or Email address, depending on the &im; system in use.</para></listitem>
@@ -51,7 +51,7 @@ index 1576dc9..daf7170 100644
</orderedlist>
<para>You can add contacts to an existing Metacontact using its context menu.</para>
-@@ -699,47 +690,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
+@@ -705,47 +696,17 @@ Shortcuts...</guimenuitem></menuchoice>.</para></tip>
<para>&kopete; calls different &im; systems 'Protocols'. When you add an account, it is specific to a single protocol. Although &kopete; tries to make instant messaging appear the same, no matter what protocol you use, there are some differences in the level of support for advanced features such as file transfer and multimedia.</para>
<sect1 id="protocols-list">
<title>Protocols</title>
@@ -100,7 +100,7 @@ index 1576dc9..daf7170 100644
</sect2>
</sect1>
</chapter>
-@@ -1120,7 +1081,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
+@@ -1180,7 +1141,6 @@ Documentation copyright 2003,2004,2005 &Will.Stephenson; (lists at stevello free
&kopete-chatstyle;
&kopete-pipes;
&kopete-jabber;
diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch b/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
deleted file mode 100644
index eb0b2297e..000000000
--- a/nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-index 88fdbd1..57c6c05 100644
---- a/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-+++ b/protocols/jabber/googletalk/libjingle/talk/session/phone/linphonemediaengine.cc
-@@ -200,7 +200,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
- LOG(LS_INFO) << "Using " << i->name << "/" << i->clockrate;
- pt_ = i->id;
- audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, i->id, 250, 0); /* -1 means that function will choose some free port */
-- port2 = rtp_session_get_local_port(audio_stream_->session);
-+ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
- first = false;
- }
- }
-@@ -211,7 +211,7 @@ bool LinphoneVoiceChannel::SetSendCodecs(const std::vector<AudioCodec>& codecs)
- // working with a buggy client; let's try PCMU.
- LOG(LS_WARNING) << "Received empty list of codces; using PCMU/8000";
- audio_stream_ = audio_stream_start(&av_profile, -1, "localhost", port1, 0, 250, 0); /* -1 means that function will choose some free port */
-- port2 = rtp_session_get_local_port(audio_stream_->session);
-+ port2 = rtp_session_get_local_port(audio_stream_->ms.session);
- }
-
- return true;
diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD
index 771a3e045..0e899459f 100644
--- a/nonprism/kdepim-runtime-nonprism/PKGBUILD
+++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 198789 2013-11-04 15:13:00Z andrea $
+# $Id: PKGBUILD 201659 2013-12-17 13:52:43Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_pkgname=kdepim-runtime
pkgname=kdepim-runtime-nonprism
-pkgver=4.11.3
+pkgver=4.12.0
pkgrel=1
pkgdesc='Extends the functionality of kdepim, without libkgapi and libkfbapi support'
arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ replaces=('kdepim-runtime' 'kdepim-runtime-coherence')
conflicts=kdepim-runtime
provides=kdepim-runtime=$pkgver
source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz")
-sha1sums=('168455654655bd302c668ca91f18fab47fa6cd3c')
+sha1sums=('fe988ea74cf83f1dae99f81bc02eefaa834c664c')
prepare() {
mkdir build
diff --git a/nonprism/sylpheed-nonprism/PKGBUILD b/nonprism/sylpheed-nonprism/PKGBUILD
index 34d15ce73..08b0b3c13 100644
--- a/nonprism/sylpheed-nonprism/PKGBUILD
+++ b/nonprism/sylpheed-nonprism/PKGBUILD
@@ -8,13 +8,13 @@
_pkgname=sylpheed
pkgname=sylpheed-nonprism
pkgver=3.3.0
-pkgrel=1
+pkgrel=1.1
pkgdesc="Lightweight and user-friendly e-mail client, without Gmail support"
arch=('i686' 'x86_64')
url="http://sylpheed.sraoss.jp/en/"
license=('GPL')
-depends=('gpgme' 'gtkspell' 'desktop-file-utils')
-makedepends=('compface' 'openssl')
+depends=('gpgme' 'gtkspell' 'desktop-file-utils' 'compface')
+makedepends=('openssl')
options=('!libtool')
replaces=$_pkgname
conflicts=$_pkgname
diff --git a/~lukeshu/9mount/PKGBUILD b/pcr/9mount/PKGBUILD
index c0052731d..3de06c084 100644
--- a/~lukeshu/9mount/PKGBUILD
+++ b/pcr/9mount/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
# Maintainer (AUR): Fazlul Shahriar <fshahriar@gmail.com>
pkgname=9mount
@@ -8,7 +8,7 @@ url="http://sqweek.net/code/9mount/"
license=('custom:ISC')
source=("http://sqweek.net/9p/$pkgname-$pkgver.tar.gz" fix-checks.patch)
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
build() {
diff --git a/~lukeshu/9mount/fix-checks.patch b/pcr/9mount/fix-checks.patch
index 9af711ba5..9af711ba5 100644
--- a/~lukeshu/9mount/fix-checks.patch
+++ b/pcr/9mount/fix-checks.patch
diff --git a/pcr/aseprite/PKGBUILD b/pcr/aseprite/PKGBUILD
new file mode 100644
index 000000000..bf0052363
--- /dev/null
+++ b/pcr/aseprite/PKGBUILD
@@ -0,0 +1,33 @@
+# Maintainer: Benoit Favre <benoit.favre@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=aseprite
+pkgver=0.9.5
+pkgrel=3
+pkgdesc='Create animated sprites and pixel art'
+arch=('x86_64' 'i686')
+url='http://www.aseprite.org/'
+license=('GPL')
+depends=('allegro')
+makedepends=('cmake')
+source=("http://aseprite.googlecode.com/files/$pkgname-$pkgver.zip" aseprite.desktop)
+sha256sums=('ce4f1e011744f9a5927a5341fccc3938b67f15f6a66d5df6b4282c5498fb8fd5' 'c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ cmake -DCMAKE_INSTALL_PREFIX:STRING=/usr .
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+ install -Dm644 "$srcdir/$pkgname.desktop" \
+ "$pkgdir/usr/share/applications/$pkgname.desktop"
+ install -Dm644 "data/icons/ase48.png" \
+ "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/aseprite/aseprite.desktop b/pcr/aseprite/aseprite.desktop
new file mode 100644
index 000000000..b000fa018
--- /dev/null
+++ b/pcr/aseprite/aseprite.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Aseprite
+Comment=Pixel-art paint program
+Exec=aseprite
+Terminal=false
+Categories=Graphics;2DGraphics;RasterGraphics
+Icon=aseprite
diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD
index 4baf8ca39..5fd846220 100644
--- a/pcr/blender-addon-ogre/PKGBUILD
+++ b/pcr/blender-addon-ogre/PKGBUILD
@@ -1,13 +1,13 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
_bldname=blender
-_bldver=2.68
-_bldep=9
+_bldver=2.69
+_bldep=10
_pkgname=ogre
pkgname=$_bldname-addon-$_pkgname
pkgver=0.6.0
-pkgrel=2
+pkgrel=3
pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)"
arch=any
url=https://code.google.com/p/${_bldname}2$_pkgname
diff --git a/pcr/cherokee/PKGBUILD b/pcr/cherokee/PKGBUILD
new file mode 100644
index 000000000..1d3b3d941
--- /dev/null
+++ b/pcr/cherokee/PKGBUILD
@@ -0,0 +1,100 @@
+# $Id: PKGBUILD 63849 2012-02-06 06:17:28Z foutrelis $
+# Maintainer: Fernando Jiménez Solano <fjim@sdfeu.org>
+# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor: Link Dupont <link@subpop.net>
+# Contributor: Pierre Bourdin <pierre@pi3rrot.net>
+
+pkgname=cherokee
+pkgver=1.2.103
+pkgrel=1
+pkgdesc="A very fast, flexible and easy to configure Web Server (Parabola rebranded)"
+arch=('i686' 'x86_64')
+url="http://www.cherokee-project.com/"
+license=('GPL2')
+depends=('openssl' 'pcre')
+makedepends=('python2' 'gettext' 'libldap' 'pam' 'libmysqlclient'
+ 'ffmpeg' 'geoip')
+optdepends=('python2: cherokee-admin (administrative web interface)'
+ 'libldap: ldap validator'
+ 'pam: pam validator'
+ 'libmysqlclient: mysql validator'
+ 'ffmpeg: Audio/Video streaming handler'
+ 'geoip: GeoIP rule module'
+ 'rrdtool: RRDtool based information collector')
+backup=('etc/cherokee/cherokee.conf'
+ 'etc/logrotate.d/cherokee'
+ 'etc/pam.d/cherokee')
+options=('!libtool')
+source=(https://github.com/cherokee/webserver/archive/v1.2.103.zip
+ cherokee.rc
+ cherokee.logrotate
+# fix-ctk-path-handler-match.patch
+# cherokee-1.2.101-ffmpeg0.11.patch
+ cherokee.service)
+
+sha256sums=('0e125cba2ad2d0dc48ecca3af4894b92ec5fab422a9d7d27fd0c7a74751e5f35'
+ '4c06cebfab8b68edd4967c020bfb41b077cfff10d76596d1ed192d0b6cedbd86'
+ '20e26d633f8c1cd90eb21f41dd163b73a83846e405b1ce995e072c4efefc522e'
+# '2bd05e0181024c9bd02d828e8329d4d96a779e4870b1fc4f18aa8667d8c6a630'
+# '6bcdcb8eaccb5516478a0c36960fbacc3d68f8bc326b9b526c388e0607a65116'
+ '415a2e4cd7d04afe21e502dd0ad76301f85a7087cadbfdab5566bec469679a68')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Fix path matching bug in CTK apps (e.g. market)
+# patch -Np1 -i "$srcdir/fix-ctk-path-handler-match.patch"
+ # Fix this bug : https://bugs.mageia.org/show_bug.cgi?id=6145
+# patch -Np1 -i "$srcdir/cherokee-1.2.101-ffmpeg0.11.patch"
+
+ # Use subdirectory for logs
+ sed -i -r 's|(%localstatedir%/log)|\1/cherokee|' cherokee.conf.sample.pre
+
+ # Use Python 2 in cherokee-admin
+ sed -i 's/"python"/"python2"/' cherokee/main_admin.c
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-static \
+ --with-wwwroot=/srv/http \
+ --with-wwwuser=http \
+ --with-wwwgroup=http \
+ --with-python=python2 \
+ --enable-os-string="Parabola GNU/Linux-libre"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make -j1 DESTDIR="$pkgdir" install
+
+ # PAM configuration file for cherokee
+ install -D -m644 pam.d_cherokee "$pkgdir/etc/pam.d/$pkgname"
+
+ # Fix ownership of /var/lib/cherokee/graphs
+ chown -R http:http "$pkgdir/var/lib/$pkgname/graphs"
+
+ # Use Python 2
+ sed -i 's/env python$/&2/' \
+ "$pkgdir/usr/share/cherokee/admin/"{server,upgrade_config}.py \
+ "$pkgdir/usr/bin/"{CTK-run,cherokee-{admin-launcher,tweak}}
+ sed -i -r "s/['\"]python/&2/g" \
+ "$pkgdir/usr/share/cherokee/admin/wizards/django.py"
+
+ # Compile Python scripts
+ python2 -m compileall "$pkgdir"
+ python2 -O -m compileall "$pkgdir"
+
+ install -d -o http -g http "$pkgdir/var/log/$pkgname"
+ install -D "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
+ install -Dm644 "$srcdir/$pkgname.logrotate" "$pkgdir/etc/logrotate.d/$pkgname"
+ install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+
+ # Cleanup
+ rm -rf "$pkgdir/srv"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/cherokee/cherokee.logrotate b/pcr/cherokee/cherokee.logrotate
new file mode 100644
index 000000000..19207fd02
--- /dev/null
+++ b/pcr/cherokee/cherokee.logrotate
@@ -0,0 +1,9 @@
+/var/log/cherokee/*.error /var/log/cherokee/*.access {
+ daily
+ rotate 14
+ compress
+ sharedscripts
+ postrotate
+ /bin/kill -HUP `cat /var/run/cherokee.pid 2>/dev/null` 2>/dev/null || true
+ endscript
+}
diff --git a/pcr/cherokee/cherokee.rc b/pcr/cherokee/cherokee.rc
new file mode 100644
index 000000000..2d413dc13
--- /dev/null
+++ b/pcr/cherokee/cherokee.rc
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+daemon_name=cherokee
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+ start)
+ stat_busy "Starting $daemon_name daemon"
+ if [ ! -f /var/run/$daemon_name.pid ] && $daemon_name -d &>/dev/null; then
+ add_daemon $daemon_name
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ stop)
+ stat_busy "Stopping $daemon_name daemon"
+ [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
+ if kill $PID &>/dev/null; then
+ rm_daemon $daemon_name
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ reload)
+ stat_busy "Reloading $daemon_name daemon"
+ [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
+ if kill -HUP $PID &>/dev/null; then
+ add_daemon $daemon_name
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ restart)
+ stat_busy "Restarting $daemon_name daemon"
+ [ -f /var/run/$daemon_name.pid ] && read PID </var/run/$daemon_name.pid
+ if kill -USR1 $PID &>/dev/null; then
+ add_daemon $daemon_name
+ stat_done
+ else
+ stat_fail
+ exit 1
+ fi
+ ;;
+
+ status)
+ stat_busy "Checking $daemon_name status";
+ ck_status $daemon_name
+ ;;
+
+ *)
+ echo "usage: $0 {start|stop|reload|restart|status}"
+esac
+
+exit 0
diff --git a/pcr/cherokee/cherokee.service b/pcr/cherokee/cherokee.service
new file mode 100644
index 000000000..7a5b95e43
--- /dev/null
+++ b/pcr/cherokee/cherokee.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Cherokee web server
+After=network.target
+
+[Service]
+ExecStart=/usr/sbin/cherokee
+
+[Install]
+WantedBy=multi-user.target
diff --git a/~lukeshu/cinclude2dot/PKGBUILD b/pcr/cinclude2dot/PKGBUILD
index 2eb43bac2..bab8804d1 100644
--- a/~lukeshu/cinclude2dot/PKGBUILD
+++ b/pcr/cinclude2dot/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=cinclude2dot
pkgver=1.1
-pkgrel=1
+pkgrel=2
pkgdesc="A Perl script which analyses C/C++ code and produces a #include dependency graph."
arch=('any')
url="http://flourish.org/cinclude2dot/"
diff --git a/pcr/cpuminer/PKGBUILD b/pcr/cpuminer/PKGBUILD
new file mode 100644
index 000000000..be6cd1678
--- /dev/null
+++ b/pcr/cpuminer/PKGBUILD
@@ -0,0 +1,32 @@
+## Maintainer : gee
+
+name=cpuminer
+pkgname=$name
+pkgver=2.3.2
+pkgrel=5
+pkgdesc="pooler's Litecoin cpuminer."
+arch=('i686' 'x86_64')
+url="https://github.com/pooler/cpuminer"
+depends=('curl' 'jansson')
+license=('GPL2')
+source=("${pkgname}-${pkgver}.zip::https://github.com/pooler/cpuminer/zipball/v${pkgver}"
+ "libcurl.m4")
+
+build() {
+ cpuminer_srcdir=${srcdir}/pooler-cpuminer-*
+ cd ${cpuminer_srcdir}
+ autoreconf -fi -I ..
+ ./configure
+ make ${MAKEFLAGS} CXXFLAGS="-O3 -march=native"
+}
+
+
+package() {
+ cpuminer_srcdir=${srcdir}/pooler-cpuminer-*
+ mkdir -p $pkgdir/usr/bin
+
+ # get compiled binaries
+ install -D -m755 ${cpuminer_srcdir}/minerd $pkgdir/usr/bin/
+}
+md5sums=('ca3200d6574fb6463640e8891555cd12'
+ '5e22a13d29fa628c83c267cf9b4f3218')
diff --git a/pcr/cpuminer/libcurl.m4 b/pcr/cpuminer/libcurl.m4
new file mode 100644
index 000000000..d7d5a5259
--- /dev/null
+++ b/pcr/cpuminer/libcurl.m4
@@ -0,0 +1,251 @@
+# LIBCURL_CHECK_CONFIG ([DEFAULT-ACTION], [MINIMUM-VERSION],
+# [ACTION-IF-YES], [ACTION-IF-NO])
+# ----------------------------------------------------------
+# David Shaw <dshaw@jabberwocky.com> May-09-2006
+#
+# Checks for libcurl. DEFAULT-ACTION is the string yes or no to
+# specify whether to default to --with-libcurl or --without-libcurl.
+# If not supplied, DEFAULT-ACTION is yes. MINIMUM-VERSION is the
+# minimum version of libcurl to accept. Pass the version as a regular
+# version number like 7.10.1. If not supplied, any version is
+# accepted. ACTION-IF-YES is a list of shell commands to run if
+# libcurl was successfully found and passed the various tests.
+# ACTION-IF-NO is a list of shell commands that are run otherwise.
+# Note that using --without-libcurl does run ACTION-IF-NO.
+#
+# This macro #defines HAVE_LIBCURL if a working libcurl setup is
+# found, and sets @LIBCURL@ and @LIBCURL_CPPFLAGS@ to the necessary
+# values. Other useful defines are LIBCURL_FEATURE_xxx where xxx are
+# the various features supported by libcurl, and LIBCURL_PROTOCOL_yyy
+# where yyy are the various protocols supported by libcurl. Both xxx
+# and yyy are capitalized. See the list of AH_TEMPLATEs at the top of
+# the macro for the complete list of possible defines. Shell
+# variables $libcurl_feature_xxx and $libcurl_protocol_yyy are also
+# defined to 'yes' for those features and protocols that were found.
+# Note that xxx and yyy keep the same capitalization as in the
+# curl-config list (e.g. it's "HTTP" and not "http").
+#
+# Users may override the detected values by doing something like:
+# LIBCURL="-lcurl" LIBCURL_CPPFLAGS="-I/usr/myinclude" ./configure
+#
+# For the sake of sanity, this macro assumes that any libcurl that is
+# found is after version 7.7.2, the first version that included the
+# curl-config script. Note that it is very important for people
+# packaging binary versions of libcurl to include this script!
+# Without curl-config, we can only guess what protocols are available,
+# or use curl_version_info to figure it out at runtime.
+
+AC_DEFUN([LIBCURL_CHECK_CONFIG],
+[
+ AH_TEMPLATE([LIBCURL_FEATURE_SSL],[Defined if libcurl supports SSL])
+ AH_TEMPLATE([LIBCURL_FEATURE_KRB4],[Defined if libcurl supports KRB4])
+ AH_TEMPLATE([LIBCURL_FEATURE_IPV6],[Defined if libcurl supports IPv6])
+ AH_TEMPLATE([LIBCURL_FEATURE_LIBZ],[Defined if libcurl supports libz])
+ AH_TEMPLATE([LIBCURL_FEATURE_ASYNCHDNS],[Defined if libcurl supports AsynchDNS])
+ AH_TEMPLATE([LIBCURL_FEATURE_IDN],[Defined if libcurl supports IDN])
+ AH_TEMPLATE([LIBCURL_FEATURE_SSPI],[Defined if libcurl supports SSPI])
+ AH_TEMPLATE([LIBCURL_FEATURE_NTLM],[Defined if libcurl supports NTLM])
+
+ AH_TEMPLATE([LIBCURL_PROTOCOL_HTTP],[Defined if libcurl supports HTTP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_HTTPS],[Defined if libcurl supports HTTPS])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_FTP],[Defined if libcurl supports FTP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_FTPS],[Defined if libcurl supports FTPS])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_FILE],[Defined if libcurl supports FILE])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_TELNET],[Defined if libcurl supports TELNET])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_LDAP],[Defined if libcurl supports LDAP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_DICT],[Defined if libcurl supports DICT])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_TFTP],[Defined if libcurl supports TFTP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_RTSP],[Defined if libcurl supports RTSP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_POP3],[Defined if libcurl supports POP3])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_IMAP],[Defined if libcurl supports IMAP])
+ AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
+
+ AC_ARG_WITH(libcurl,
+ AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]),
+ [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
+
+ if test "$_libcurl_with" != "no" ; then
+
+ AC_PROG_AWK
+
+ _libcurl_version_parse="eval $AWK '{split(\$NF,A,\".\"); X=256*256*A[[1]]+256*A[[2]]+A[[3]]; print X;}'"
+
+ _libcurl_try_link=yes
+
+ if test -d "$_libcurl_with" ; then
+ LIBCURL_CPPFLAGS="-I$withval/include"
+ _libcurl_ldflags="-L$withval/lib"
+ AC_PATH_PROG([_libcurl_config],[curl-config],[],
+ ["$withval/bin"])
+ else
+ AC_PATH_PROG([_libcurl_config],[curl-config],[],[$PATH])
+ fi
+
+ if test x$_libcurl_config != "x" ; then
+ AC_CACHE_CHECK([for the version of libcurl],
+ [libcurl_cv_lib_curl_version],
+ [libcurl_cv_lib_curl_version=`$_libcurl_config --version | $AWK '{print $[]2}'`])
+
+ _libcurl_version=`echo $libcurl_cv_lib_curl_version | $_libcurl_version_parse`
+ _libcurl_wanted=`echo ifelse([$2],,[0],[$2]) | $_libcurl_version_parse`
+
+ if test $_libcurl_wanted -gt 0 ; then
+ AC_CACHE_CHECK([for libcurl >= version $2],
+ [libcurl_cv_lib_version_ok],
+ [
+ if test $_libcurl_version -ge $_libcurl_wanted ; then
+ libcurl_cv_lib_version_ok=yes
+ else
+ libcurl_cv_lib_version_ok=no
+ fi
+ ])
+ fi
+
+ if test $_libcurl_wanted -eq 0 || test x$libcurl_cv_lib_version_ok = xyes ; then
+ if test x"$LIBCURL_CPPFLAGS" = "x" ; then
+ LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
+ fi
+ if test x"$LIBCURL" = "x" ; then
+ LIBCURL=`$_libcurl_config --libs`
+
+ # This is so silly, but Apple actually has a bug in their
+ # curl-config script. Fixed in Tiger, but there are still
+ # lots of Panther installs around.
+ case "${host}" in
+ powerpc-apple-darwin7*)
+ LIBCURL=`echo $LIBCURL | sed -e 's|-arch i386||g'`
+ ;;
+ esac
+ fi
+
+ # All curl-config scripts support --feature
+ _libcurl_features=`$_libcurl_config --feature`
+
+ # Is it modern enough to have --protocols? (7.12.4)
+ if test $_libcurl_version -ge 461828 ; then
+ _libcurl_protocols=`$_libcurl_config --protocols`
+ fi
+ else
+ _libcurl_try_link=no
+ fi
+
+ unset _libcurl_wanted
+ fi
+
+ if test $_libcurl_try_link = yes ; then
+
+ # we didn't find curl-config, so let's see if the user-supplied
+ # link line (or failing that, "-lcurl") is enough.
+ LIBCURL=${LIBCURL-"$_libcurl_ldflags -lcurl"}
+
+ AC_CACHE_CHECK([whether libcurl is usable],
+ [libcurl_cv_lib_curl_usable],
+ [
+ _libcurl_save_cppflags=$CPPFLAGS
+ CPPFLAGS="$LIBCURL_CPPFLAGS $CPPFLAGS"
+ _libcurl_save_libs=$LIBS
+ LIBS="$LIBCURL $LIBS"
+
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <curl/curl.h>]],[[
+/* Try and use a few common options to force a failure if we are
+ missing symbols or can't link. */
+int x;
+curl_easy_setopt(NULL,CURLOPT_URL,NULL);
+x=CURL_ERROR_SIZE;
+x=CURLOPT_WRITEFUNCTION;
+x=CURLOPT_FILE;
+x=CURLOPT_ERRORBUFFER;
+x=CURLOPT_STDERR;
+x=CURLOPT_VERBOSE;
+if (x) ;
+]])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
+
+ CPPFLAGS=$_libcurl_save_cppflags
+ LIBS=$_libcurl_save_libs
+ unset _libcurl_save_cppflags
+ unset _libcurl_save_libs
+ ])
+
+ if test $libcurl_cv_lib_curl_usable = yes ; then
+
+ # Does curl_free() exist in this version of libcurl?
+ # If not, fake it with free()
+
+ _libcurl_save_cppflags=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $LIBCURL_CPPFLAGS"
+ _libcurl_save_libs=$LIBS
+ LIBS="$LIBS $LIBCURL"
+
+ AC_CHECK_FUNC(curl_free,,
+ AC_DEFINE(curl_free,free,
+ [Define curl_free() as free() if our version of curl lacks curl_free.]))
+
+ CPPFLAGS=$_libcurl_save_cppflags
+ LIBS=$_libcurl_save_libs
+ unset _libcurl_save_cppflags
+ unset _libcurl_save_libs
+
+ AC_DEFINE(HAVE_LIBCURL,1,
+ [Define to 1 if you have a functional curl library.])
+ AC_SUBST(LIBCURL_CPPFLAGS)
+ AC_SUBST(LIBCURL)
+
+ for _libcurl_feature in $_libcurl_features ; do
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_feature_$_libcurl_feature),[1])
+ eval AS_TR_SH(libcurl_feature_$_libcurl_feature)=yes
+ done
+
+ if test "x$_libcurl_protocols" = "x" ; then
+
+ # We don't have --protocols, so just assume that all
+ # protocols are available
+ _libcurl_protocols="HTTP FTP FILE TELNET LDAP DICT TFTP"
+
+ if test x$libcurl_feature_SSL = xyes ; then
+ _libcurl_protocols="$_libcurl_protocols HTTPS"
+
+ # FTPS wasn't standards-compliant until version
+ # 7.11.0 (0x070b00 == 461568)
+ if test $_libcurl_version -ge 461568; then
+ _libcurl_protocols="$_libcurl_protocols FTPS"
+ fi
+ fi
+
+ # RTSP, IMAP, POP3 and SMTP were added in
+ # 7.20.0 (0x071400 == 463872)
+ if test $_libcurl_version -ge 463872; then
+ _libcurl_protocols="$_libcurl_protocols RTSP IMAP POP3 SMTP"
+ fi
+ fi
+
+ for _libcurl_protocol in $_libcurl_protocols ; do
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(libcurl_protocol_$_libcurl_protocol),[1])
+ eval AS_TR_SH(libcurl_protocol_$_libcurl_protocol)=yes
+ done
+ else
+ unset LIBCURL
+ unset LIBCURL_CPPFLAGS
+ fi
+ fi
+
+ unset _libcurl_try_link
+ unset _libcurl_version_parse
+ unset _libcurl_config
+ unset _libcurl_feature
+ unset _libcurl_features
+ unset _libcurl_protocol
+ unset _libcurl_protocols
+ unset _libcurl_version
+ unset _libcurl_ldflags
+ fi
+
+ if test x$_libcurl_with = xno || test x$libcurl_cv_lib_curl_usable != xyes ; then
+ # This is the IF-NO path
+ ifelse([$4],,:,[$4])
+ else
+ # This is the IF-YES path
+ ifelse([$3],,:,[$3])
+ fi
+
+ unset _libcurl_with
+])dnl
diff --git a/pcr/galera/PKGBUILD b/pcr/galera/PKGBUILD
new file mode 100644
index 000000000..b6ba8890c
--- /dev/null
+++ b/pcr/galera/PKGBUILD
@@ -0,0 +1,29 @@
+# Maintainer: Rustam Tsurik <rustam.tsurik@gmail.com>
+# Contributor: Nico Suarez <nicodoggie@gmail.com>
+
+pkgname=galera
+pkgver=25.3.2
+pkgrel=1
+pkgdesc='Galera WSREP provider'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('boost>=1.41' 'openssl')
+makedepends=('check' 'scons' 'patch')
+url='http://www.codership.com'
+options=('!libtool')
+source=(https://launchpad.net/galera/3.x/$pkgver/+download/galera-$pkgver-src.tar.gz)
+sha256sums=('5dd54364720f8854088590bdfea1e3a7f3e37fda3dfe8a5f58ebcc987cc6788d')
+
+build(){
+ cd "$srcdir"
+ cd "$pkgname-$pkgver-src"
+ scons
+}
+
+package(){
+ install -Dm0644 "$srcdir"/$pkgname-$pkgver-src/libgalera_smm.so "$pkgdir"/usr/lib/libgalera_smm.so
+ install -Dm0755 "$srcdir"/$pkgname-$pkgver-src/garb/garbd "$pkgdir"/usr/bin/garbd
+ install -Dm0644 "$srcdir"/$pkgname-$pkgver-src/scripts/packages/README "$pkgdir"/usr/share/doc/galera/README
+ install -m0644 "$srcdir"/$pkgname-$pkgver-src/scripts/packages/README-MySQL "$pkgdir"/usr/share/doc/galera/README-MySQL
+ install -m0644 "$srcdir"/$pkgname-$pkgver-src/COPYING "$pkgdir"/usr/share/doc/galera/COPYING
+}
diff --git a/pcr/gimp-pcr/PKGBUILD b/pcr/gimp-pcr/PKGBUILD
new file mode 100644
index 000000000..75b54f27a
--- /dev/null
+++ b/pcr/gimp-pcr/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: PKGBUILD 198811 2013-11-05 16:40:29Z bpiotrowski $
+# Maintainer: Daniel Isenmann <daniel@archlinux.org>
+
+_pkgname=gimp
+pkgname=$_pkgname-pcr
+pkgver=2.8.10
+pkgrel=1
+pkgdesc="GNU Image Manipulation Program"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gimp.org/"
+license=('GPL' 'LGPL')
+depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
+ 'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl')
+makedepends=('intltool' 'webkitgtk2' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
+optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
+ 'webkitgtk2: for the help browser'
+ 'poppler-glib: for pdf support'
+ 'alsa-lib: for MIDI event controller module'
+ 'curl: for URI support'
+ 'ghostscript: for postscript support')
+options=('!makeflags')
+provides=("$_pkgname")
+conflicts=('gimp-devel' "$_pkgname")
+install=gimp.install
+source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${_pkgname}-${pkgver}.tar.bz2 gnu.gpl
+ uri-backend-libcurl.patch)
+md5sums=('84c964aab7044489af69f7319bb59b47'
+ '2d823a7e7cd7f99b681943e42bfb7d40'
+ 'e894f4b2ffa92c71448fdd350e9b78c6')
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+
+ # fixing freetype header path file
+ sed -i "s|freetype/tttables[.]h|freetype2/tttables.h|" app/text/${_pkgname}font.c
+}
+
+build() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ #patch -p1 < ../uri-backend-libcurl.patch
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
+ --enable-mp --enable-gimp-console --enable-gimp-remote \
+ --enable-python --with-gif-compression=lzw --with-libcurl \
+ --without-aa --without-hal --without-gvfs --without-gnomevfs
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+ sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/lib/gimp/2.0/plug-ins/*.py
+ install -D -m644 "${srcdir}/gnu.gpl" "${pkgdir}/usr/share/gimp/2.0/palettes/GNU.gpl"
+
+ rm "${pkgdir}/usr/share/man/man1/gimp-console.1"
+ ln -s gimp-console-${pkgver%.*}.1.gz "${pkgdir}/usr/share/man/man1/gimp-console.1.gz"
+ ln -s gimptool-2.0 "${pkgdir}/usr/bin/gimptool"
+ ln -sf gimptool-2.0.1.gz "${pkgdir}/usr/share/man/man1/gimptool.1.gz"
+}
diff --git a/pcr/gnome-boxes/gnome-boxes.install b/pcr/gimp-pcr/gimp.install
index 2b172e29c..c317fbaca 100644
--- a/pcr/gnome-boxes/gnome-boxes.install
+++ b/pcr/gimp-pcr/gimp.install
@@ -1,5 +1,4 @@
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
}
diff --git a/pcr/gimp-pcr/gnu.gpl b/pcr/gimp-pcr/gnu.gpl
new file mode 100644
index 000000000..e7ce2b288
--- /dev/null
+++ b/pcr/gimp-pcr/gnu.gpl
@@ -0,0 +1,19 @@
+GIMP Palette
+Name: gnu
+#
+ 0 0 0
+ 0 0 170
+ 0 170 0
+ 0 170 170
+170 0 0
+170 0 170
+170 85 0
+170 170 170
+ 85 85 85
+ 85 85 255
+ 85 255 85
+ 85 255 255
+255 85 85
+255 85 255
+255 255 85
+255 255 255
diff --git a/pcr/gimp-pcr/uri-backend-libcurl.patch b/pcr/gimp-pcr/uri-backend-libcurl.patch
new file mode 100644
index 000000000..85da2fc7f
--- /dev/null
+++ b/pcr/gimp-pcr/uri-backend-libcurl.patch
@@ -0,0 +1,77 @@
+diff -aur gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c
+--- gimp-2.6.11/plug-ins/file-uri/uri-backend-libcurl.c 2010-07-03 00:51:59.000000000 +0200
++++ gimp-2.6.11.patched/plug-ins/file-uri/uri-backend-libcurl.c 2011-06-23 19:15:30.000000000 +0200
+@@ -4,9 +4,9 @@
+ * libcurl backend for the URI plug-in
+ * Copyright (C) 2006 Mukund Sivaraman <muks@mukund.org>
+ *
+- * This program is free software; you can redistribute it and/or modify
++ * 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
++ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+@@ -15,8 +15,7 @@
+ * 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.
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ #include "config.h"
+@@ -24,7 +23,6 @@
+ #include <errno.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+ #include <glib/gstdio.h>
+@@ -63,7 +61,7 @@
+
+ vinfo = curl_version_info (CURLVERSION_NOW);
+
+- protocols = g_string_new ("http:,ftp:");
++ protocols = g_string_new ("http:,ftp:,gopher:");
+
+ if (vinfo->features & CURL_VERSION_SSL)
+ {
+@@ -153,7 +151,7 @@
+ FILE *out_file;
+ CURL *curl_handle;
+ CURLcode result;
+- gint response_code;
++ glong response_code;
+
+ gimp_progress_init (_("Connecting to server"));
+
+@@ -195,12 +193,12 @@
+
+ curl_easy_getinfo (curl_handle, CURLINFO_RESPONSE_CODE, &response_code);
+
+- if (response_code != 200)
++ if (response_code != 200 && response_code != 226 && response_code != 0)
+ {
+ fclose (out_file);
+ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+ _("Opening '%s' for reading resulted in HTTP "
+- "response code: %d"),
++ "response code: %ld"),
+ uri, response_code);
+ curl_easy_cleanup (curl_handle);
+ return FALSE;
+@@ -224,3 +222,10 @@
+
+ return FALSE;
+ }
++
++gchar *
++uri_backend_map_image (const gchar *uri,
++ GimpRunMode run_mode)
++{
++ return NULL;
++}
diff --git a/pcr/git-remote-mediawiki/PKGBUILD b/pcr/git-remote-mediawiki/PKGBUILD
new file mode 100644
index 000000000..8fb47724a
--- /dev/null
+++ b/pcr/git-remote-mediawiki/PKGBUILD
@@ -0,0 +1,31 @@
+pkgname=git-remote-mediawiki
+url=https://github.com/moy/Git-Mediawiki/wiki
+license=('GPL') # GPLv2+
+pkgdesc="Support for MediaWiki remotes in git"
+
+pkgver=1.8.5.1
+pkgrel=2
+arch=('any')
+depends=(
+ git
+ perl-datetime-format-iso8601
+ perl-html-tree
+ perl-lwp-protocol-https
+ perl-mediawiki-api
+)
+
+_symlink() {
+ local src=$1
+ local dst=$2
+ mkdir -p "${pkgdir}/${dst%/*}"
+ ln -s "$(realpath "$src" --relative-to="${dst%/*}")" "${pkgdir}/${dst}"
+}
+
+package() {
+ _mwdir=/usr/share/git/mw-to-git
+ _perldir=/usr/share/perl5/vendor_perl
+ _gitdir=/usr/lib/git-core
+ _symlink ${_mwdir}/Git/Mediawiki.pm ${_perldir}/Git/Mediawiki.pm
+ _symlink ${_mwdir}/git-mw.perl ${_gitdir}/git-mw
+ _symlink ${_mwdir}/git-remote-mediawiki.perl ${_gitdir}/git-remote-mediawiki
+}
diff --git a/pcr/gnome-boxes-libre/PKGBUILD b/pcr/gnome-boxes-libre/PKGBUILD
new file mode 100644
index 000000000..91a3b41be
--- /dev/null
+++ b/pcr/gnome-boxes-libre/PKGBUILD
@@ -0,0 +1,44 @@
+# Contributor: Daniel Milewski <niitotantei@gmail.com>
+
+_pkgname='gnome-boxes'
+pkgname="$_pkgname-libre"
+pkgver='3.10.2'
+pkgrel='1'
+pkgdesc='A simple GNOME 3 application to access remote or virtual systems, without nonfree system logos'
+arch=('i686' 'x86_64')
+url='https://wiki.gnome.org/Apps/Boxes'
+license=('LGPL')
+depends=('clutter-gtk' 'desktop-file-utils' 'gtk-vnc' 'libosinfo' 'libsoup' 'libtracker-sparql' 'libvirt-glib'
+ 'spice-gtk3')
+makedepends=('gobject-introspection' 'intltool' 'itstool' 'spice-protocol' 'vala')
+optdepends=('qemu-usbredir: virtual machines support')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+install='gnome-boxes.install'
+source=("http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz" 'logos.patch'
+ 'free-distros.patch')
+sha256sums=('9e055627cff5f59323bc95ad65ab361fc26328854d5a421bd09c899c466f2ec4'
+ '63d8a7fb5e0d6260d56bd92e9d11f39e9f37c323a261bc822a589b85f760b254'
+ '025e56fff5ae3659abc867ef1b5739a4632c91fa7f10d54d0853e9905355a15f')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ patch -Np1 -i "$srcdir/logos.patch"
+
+ patch -Np1 -i "$srcdir/free-distros.patch"
+}
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/gnome-boxes-libre/free-distros.patch b/pcr/gnome-boxes-libre/free-distros.patch
new file mode 100644
index 000000000..d83d2ca4b
--- /dev/null
+++ b/pcr/gnome-boxes-libre/free-distros.patch
@@ -0,0 +1,11 @@
+--- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original 2013-11-23 13:26:20.013010981 +0100
++++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml 2013-11-23 14:29:33.237567173 +0100
+@@ -2,4 +2,8 @@
+
+ <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
+
++ <os id="https://parabolagnulinux.org">
++ <logo>https://projects.parabolagnulinux.org/artwork.git/plain/official-2013/optimized-text/logo.svg</logo>
++ </os>
++
+ </libosinfo>
diff --git a/pcr/gnome-boxes-libre/gnome-boxes.install b/pcr/gnome-boxes-libre/gnome-boxes.install
new file mode 100644
index 000000000..2ceb2ac08
--- /dev/null
+++ b/pcr/gnome-boxes-libre/gnome-boxes.install
@@ -0,0 +1,17 @@
+update() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -f -q -t /usr/share/icons/hicolor
+}
+
+post_install() {
+ update
+}
+
+post_upgrade() {
+ update
+}
+
+post_remove() {
+ update
+}
diff --git a/pcr/gnome-boxes-libre/logos.patch b/pcr/gnome-boxes-libre/logos.patch
new file mode 100644
index 000000000..6fe80a2eb
--- /dev/null
+++ b/pcr/gnome-boxes-libre/logos.patch
@@ -0,0 +1,39 @@
+--- gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml.original 2013-11-16 22:30:08.198540527 +0100
++++ gnome-boxes-3.10.0/data/gnome-boxes-logos-db.xml 2013-11-16 22:30:12.135269885 +0100
+@@ -2,36 +2,4 @@
+
+ <!-- Please read README.logos for any questions about usage of product logos in Boxes. !-->
+
+- <os id="http://debian.org/debian/1.0">
+- <logo>http://www.debian.org/logos/openlogo-nd.svg</logo>
+- </os>
+-
+- <os id="http://fedoraproject.org/fedora/1">
+- <logo>http://people.gnome.org/~zeeshanak/logos/fedora.svg</logo>
+- </os>
+-
+- <os id="http://opensuse.org/opensuse/10.2">
+- <logo>http://people.gnome.org/~zeeshanak/logos/opensuse.svg</logo>
+- </os>
+-
+- <os id="http://ubuntu.com/ubuntu/4.10">
+- <logo>http://people.gnome.org/~zeeshanak/logos/ubuntu.svg</logo>
+- </os>
+-
+- <os id="http://gnome.org/3.6">
+- <logo>http://people.gnome.org/~zeeshanak/logos/gnome-logo.svg</logo>
+- </os>
+-
+- <os id="http://redhat.com/rhel/4.0">
+- <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
+- </os>
+-
+- <os id="http://redhat.com/rhel/5.0">
+- <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
+- </os>
+-
+- <os id="http://redhat.com/rhel/6.0">
+- <logo>http://people.gnome.org/~zeeshanak/logos/shadownman-pill.svg</logo>
+- </os>
+-
+ </libosinfo>
diff --git a/pcr/gnome-boxes/PKGBUILD b/pcr/gnome-boxes/PKGBUILD
deleted file mode 100644
index 0ac23a06b..000000000
--- a/pcr/gnome-boxes/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Stefano Facchini <stefano.facchini@gmail.com>
-# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
-
-pkgname=gnome-boxes
-pkgver=3.6.1
-pkgrel=2
-pkgdesc="A simple GNOME 3 application to access remote or virtual systems"
-arch=('i686' 'x86_64')
-url="http://live.gnome.org/Boxes"
-license=('LGPL2.1')
-depends=('gtk3' 'clutter-gtk' 'spice-gtk3' 'libvirt-glib' 'tracker'
- 'gtk-vnc' 'udev' 'libosinfo' 'dconf' 'hicolor-icon-theme'
- 'desktop-file-utils' 'shared-mime-info')
-optdepends=('qemu-kvm-spice: to create new VMs')
-makedepends=('intltool')
-install=gnome-boxes.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('fc6ffd0b3886e2da917abdb63470ab9869eef168c002461b9f02ce5aec5383ba')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --libexec=/usr/lib/gnome-boxes
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-}
-
-# vim:set ts=2 sw=2 et:
-sha256sums=('fc6ffd0b3886e2da917abdb63470ab9869eef168c002461b9f02ce5aec5383ba')
diff --git a/pcr/gnuhealth/PKGBUILD b/pcr/gnuhealth/PKGBUILD
index 2293b6375..ba7639b90 100644
--- a/pcr/gnuhealth/PKGBUILD
+++ b/pcr/gnuhealth/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: SpepS <dreamspepser at yahoo dot it>
pkgname=gnuhealth
-pkgver=2.2.1
+pkgver=2.2.2
pkgrel=1
pkgdesc="A free Health and Hospital Information System"
arch=any
@@ -20,25 +20,26 @@ depends=(
python2-pywebdav
python2-qrcode
python2-vobject
- trytond
- trytond-account-invoice
- trytond-calendar
- trytond-country
- trytond-stock-lot
+ "trytond>=3.0"
+ "trytond-account-invoice>=3.0"
+ "trytond-calendar>=3.0"
+ "trytond-country>=3.0"
+ "trytond-stock-lot>=3.0"
)
source=http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz
-sha512sums=9a7ccc71b5cba8e71adaea1d811ef4d68d72a1b3d7493721d68b2bb04f5eb808c659bf74e4f5859c9509be4843b4cae3cc4511422fb3cdc64b5a903507ca364a
+sha512sums=45e6965b583c08c3a457dc733274253f5ff66fa5760509d42291271e4b6237f1b34829f0403235d8a457d1236c8ffec3f22b7495859cbe399abc8f3f71556c0e
package() {
MODULES=(
- health
- health_calendar
+ health
+ health_calendar
health_genetics
health_gyneco
- health_history
+ health_history
health_icd10
health_icd10pcs
health_icu
+ health_imaging
health_inpatient
health_inpatient_calendar
health_lab
@@ -46,6 +47,7 @@ package() {
health_mdg6
health_ntd
health_ntd_chagas
+ health_ntd_dengue
health_nursing
health_pediatrics
health_profile
diff --git a/pcr/hunspell-pt-br/PKGBUILD b/pcr/hunspell-pt-br/PKGBUILD
index a15ddda78..0ae4e4e76 100644
--- a/pcr/hunspell-pt-br/PKGBUILD
+++ b/pcr/hunspell-pt-br/PKGBUILD
@@ -4,15 +4,15 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=hunspell-pt-br
-pkgver=3.0
-pkgrel=3
+pkgver=3.2
+pkgrel=1
pkgdesc="Portuguese (Brazil) dictionary"
arch=(any)
url="http://pt-br.libreoffice.org/projetos/projeto-vero-verificador-ortografico"
-license=('LGPLv3')
+license=('LGPLv3' 'MPL')
optdepends=('hunspell: the spell checking libraries and apps')
-source=(http://pt-br.libreoffice.org/assets/VeroptBRV300AOG.oxt)
-md5sums=('96e05c7b7df97e2d1ce57ff736063bdf')
+source=(http://pt-br.libreoffice.org/assets/VeroptBRV320AOG.oxt)
+md5sums=('3b2f7291d486435cf6706b55e02da5b6')
package() {
install -D -m644 ${srcdir}/pt_BR.dic ${pkgdir}/usr/share/hunspell/pt_BR.dic
diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD
index c0fb9e062..2d5c09ec0 100644
--- a/pcr/libav/PKGBUILD
+++ b/pcr/libav/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Márcio Silva <coadde@lavabit.com>
pkgname=libav
-pkgver=9.8
-pkgrel=3
+pkgver=9.10
+pkgrel=1
pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux"
arch=(
mips64el
@@ -15,6 +15,7 @@ depends=(
alsa-lib
bzip2
freetype2
+ gnutls
gsm
lame
libpulse
@@ -38,7 +39,7 @@ makedepends=(
libvdpau
)
source=http://$pkgname.org/releases/$pkgname-$pkgver.tar.gz
-sha512sums=ef7c164fb29d365a236ead927e6355ca9191203dce86f0d0d8251f275ed5be4ab5e3f56a0c51384d7b9e83c3c3ef7ebdee95c9a7ac7b6520eaf25973a2bd20ae
+sha512sums=88bbe82fc3edfde17339cbd5fbae5ab074e750ad750fafcabc2c1fa408f352e38f32d8c0df0ff6c926d449bff29c725fc2c219d8b6e0398e3b93d43f086c9f10
build() {
cd $pkgname-$pkgver
@@ -53,9 +54,8 @@ build() {
else
_asm='--disable-asm'
fi
- [[ $_static == false ]] && _stf='--disable-static'
./configure\
- $_asm $_stf\
+ $_asm\
--prefix=/usr\
--bindir=/opt/$pkgname/bin\
--incdir=/opt/$pkgname/include\
@@ -63,14 +63,16 @@ build() {
--shlibdir=/opt/$pkgname/lib\
--disable-avserver\
--disable-debug\
+ --disable-static\
--enable-avresample\
--enable-dxva2\
+ --enable-gnutls\
--enable-gpl\
--enable-libfreetype\
--enable-libgsm\
--enable-libmp3lame\
- --enable-libopencore_amrnb\
- --enable-libopencore_amrwb\
+ --enable-libopencore-amrnb\
+ --enable-libopencore-amrwb\
--disable-libopenjpeg\
--enable-libopus\
--enable-libpulse\
@@ -90,7 +92,7 @@ build() {
--enable-x11grab
make
make tools/qt-faststart
- make doc/av{conv,play}.1 # doc/avserver.1
+ make doc/av{conv,play}.1
}
package() {
diff --git a/pcr/libixp-hg/PKGBUILD b/pcr/libixp-hg/PKGBUILD
new file mode 100644
index 000000000..3642535d1
--- /dev/null
+++ b/pcr/libixp-hg/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+pkgname="libixp-hg"
+pkgver=148
+pkgdesc="A 9p client/server library"
+url="http://libs.suckless.org/libixp"
+license=("MIT")
+
+provides=("libixp")
+conflicts=("libixp")
+
+pkgrel=1
+arch=("i686" "x86_64")
+makedepends=("txt2tags")
+options=(staticlibs)
+
+source=("libre://${pkgname}-${pkgver}.tar.gz")
+md5sums=('5a2fd075108558b39988610d2bb184d9')
+
+mkdepends=("mercurial")
+mksource=("$pkgname-$pkgver::hg+https://code.google.com/p/libixp/#revision=${pkgver}")
+mkmd5sums=('SKIP')
+mksource() {
+ # don't include this precompiled binary (probably included by accident)
+ rm "${srcdir}/${pkgname}-${pkgver}/test/o.client"
+}
+
+_makeflags=("PREFIX=/usr" "ETC=/etc")
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make "${_makeflags[@]}"
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make "${_makeflags[@]}" DESTDIR="$pkgdir" install
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/pcr/libosinfo-libre/PKGBUILD b/pcr/libosinfo-libre/PKGBUILD
new file mode 100644
index 000000000..8400558c0
--- /dev/null
+++ b/pcr/libosinfo-libre/PKGBUILD
@@ -0,0 +1,63 @@
+# Contributor: Daniel Milewski <niitotantei@gmail.com>
+
+_pkgname='libosinfo'
+pkgname="$_pkgname-libre"
+pkgver='0.2.8'
+pkgrel='1'
+pkgdesc='A GObject based library API for managing information about operating systems, hypervisors and the (virtual) hardware devices they can support, without support for nonfree systems'
+arch=('i686' 'x86_64')
+url='http://libosinfo.org'
+license=('LGPL')
+depends=('glib2' 'libxslt')
+makedepends=('intltool' 'libsoup')
+checkdepends=('check')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=("$_pkgname")
+source=("https://fedorahosted.org/releases/l/i/$_pkgname/$_pkgname-$pkgver.tar.gz" 'data.patch' 'po.patch' 'test.patch'
+ 'free-distros.patch')
+sha256sums=('50cbfcff4548f37b5b7d3328cbc6e96fe6c2a48696e31eec0c819d161e38c643'
+ 'fdfb0753a7cf7865ac2ea5b17145f90d27d70e18c69fba0d60dfb43629ea0dac'
+ 'aab885d2b3a7f91a79efd7ab6f12fe1d4b264afa0fbc200268838b353600b338'
+ 'c4b328f36973931abd71a10a62ec590ef3ba1177486179bc96aa47a22a6d0a42'
+ 'f4b79c44ae4a39325480c2b0af4aa7ed086cc1cab7c9ba1119f50967a9a5f4ca')
+
+prepare() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ rm data/datamaps/windows-lang.xml \
+ data/hypervisors/rhel-xen.xml{,.in} \
+ data/install-scripts/*.xml \
+ data/oses/*.xml{,.in}
+ rm -r test/isodata/*
+
+ patch -Np1 -i "$srcdir/data.patch"
+ patch -Np1 -i "$srcdir/po.patch"
+ patch -Np1 -i "$srcdir/test.patch"
+
+ cd "$srcdir/$_pkgname-$pkgver/po"
+ intltool-update pl
+ intltool-update uk
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ patch -Np1 -i "$srcdir/free-distros.patch"
+}
+
+build() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ make -k check
+}
+
+package() {
+ cd "$srcdir/$_pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir/" install
+}
diff --git a/pcr/libosinfo-libre/data.patch b/pcr/libosinfo-libre/data.patch
new file mode 100644
index 000000000..d37d30671
--- /dev/null
+++ b/pcr/libosinfo-libre/data.patch
@@ -0,0 +1,137 @@
+diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.am libosinfo-0.2.8-libre/data/datamaps/Makefile.am
+--- libosinfo-0.2.8/data/datamaps/Makefile.am 2013-01-09 00:01:25.000000000 +0100
++++ libosinfo-0.2.8-libre/data/datamaps/Makefile.am 2013-12-01 12:15:00.261131308 +0100
+@@ -1,7 +1,6 @@
+
+ datamapdir = $(pkgdatadir)/db/datamaps/
+ datamap_DATA = \
+- windows-lang.xml \
+ x11-keyboard.xml \
+ $(NULL)
+
+diff -ruN libosinfo-0.2.8/data/datamaps/Makefile.in libosinfo-0.2.8-libre/data/datamaps/Makefile.in
+--- libosinfo-0.2.8/data/datamaps/Makefile.in 2013-09-16 18:45:26.000000000 +0200
++++ libosinfo-0.2.8-libre/data/datamaps/Makefile.in 2013-12-01 12:15:07.561496625 +0100
+@@ -326,7 +326,6 @@
+ top_srcdir = @top_srcdir@
+ datamapdir = $(pkgdatadir)/db/datamaps/
+ datamap_DATA = \
+- windows-lang.xml \
+ x11-keyboard.xml \
+ $(NULL)
+
+diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.am libosinfo-0.2.8-libre/data/hypervisors/Makefile.am
+--- libosinfo-0.2.8/data/hypervisors/Makefile.am 2013-02-14 02:39:37.000000000 +0100
++++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.am 2013-12-01 12:18:54.718635301 +0100
+@@ -1,6 +1,6 @@
+
+ databasedir = $(pkgdatadir)/db/hypervisors/
+-database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
++database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
+
+ database_DATA = $(database_in_files:.xml.in=.xml)
+
+diff -ruN libosinfo-0.2.8/data/hypervisors/Makefile.in libosinfo-0.2.8-libre/data/hypervisors/Makefile.in
+--- libosinfo-0.2.8/data/hypervisors/Makefile.in 2013-09-16 18:45:26.000000000 +0200
++++ libosinfo-0.2.8-libre/data/hypervisors/Makefile.in 2013-12-01 12:20:01.822560286 +0100
+@@ -325,7 +325,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ databasedir = $(pkgdatadir)/db/hypervisors/
+-database_in_files = kvm.xml.in qemu.xml.in rhel-xen.xml.in xen.xml.in
++database_in_files = kvm.xml.in qemu.xml.in xen.xml.in
+ database_DATA = $(database_in_files:.xml.in=.xml)
+ EXTRA_DIST = $(database_in_files) $(database_DATA)
+ all: all-am
+diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.am libosinfo-0.2.8-libre/data/install-scripts/Makefile.am
+--- libosinfo-0.2.8/data/install-scripts/Makefile.am 2013-03-27 23:03:14.000000000 +0100
++++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.am 2013-12-01 12:24:10.160616083 +0100
+@@ -1,12 +1,6 @@
+
+ databasedir = $(pkgdatadir)/db/install-scripts/
+ database_DATA = \
+- fedora.xml \
+- rhel.xml \
+- windows-sif.xml \
+- windows-cmd.xml \
+- windows-reg.xml \
+- windows-unattend.xml \
+ $(NULL)
+
+ EXTRA_DIST = $(database_DATA)
+diff -ruN libosinfo-0.2.8/data/install-scripts/Makefile.in libosinfo-0.2.8-libre/data/install-scripts/Makefile.in
+--- libosinfo-0.2.8/data/install-scripts/Makefile.in 2013-09-16 18:45:26.000000000 +0200
++++ libosinfo-0.2.8-libre/data/install-scripts/Makefile.in 2013-12-01 12:24:20.500882542 +0100
+@@ -326,12 +326,6 @@
+ top_srcdir = @top_srcdir@
+ databasedir = $(pkgdatadir)/db/install-scripts/
+ database_DATA = \
+- fedora.xml \
+- rhel.xml \
+- windows-sif.xml \
+- windows-cmd.xml \
+- windows-reg.xml \
+- windows-unattend.xml \
+ $(NULL)
+
+ EXTRA_DIST = $(database_DATA)
+diff -ruN libosinfo-0.2.8/data/oses/Makefile.am libosinfo-0.2.8-libre/data/oses/Makefile.am
+--- libosinfo-0.2.8/data/oses/Makefile.am 2013-09-10 15:22:50.000000000 +0200
++++ libosinfo-0.2.8-libre/data/oses/Makefile.am 2013-12-01 12:26:24.797757509 +0100
+@@ -1,26 +1,6 @@
+
+ databasedir = $(pkgdatadir)/db/oses/
+ database_in_files = \
+- altlinux.xml.in \
+- centos.xml.in \
+- debian.xml.in \
+- dos.xml.in \
+- fedora.xml.in \
+- freebsd.xml.in \
+- gnome.xml.in \
+- mandriva.xml.in \
+- mandrake.xml.in \
+- netbsd.xml.in \
+- netware.xml.in \
+- macos.xml.in \
+- openbsd.xml.in \
+- opensuse.xml.in \
+- rhl.xml.in \
+- rhel.xml.in \
+- solaris.xml.in \
+- suse.xml.in \
+- ubuntu.xml.in \
+- windows.xml.in \
+ $(NULL)
+
+ database_DATA = $(database_in_files:.xml.in=.xml)
+diff -ruN libosinfo-0.2.8/data/oses/Makefile.in libosinfo-0.2.8-libre/data/oses/Makefile.in
+--- libosinfo-0.2.8/data/oses/Makefile.in 2013-09-16 18:45:26.000000000 +0200
++++ libosinfo-0.2.8-libre/data/oses/Makefile.in 2013-12-01 12:26:32.557686417 +0100
+@@ -326,26 +326,6 @@
+ top_srcdir = @top_srcdir@
+ databasedir = $(pkgdatadir)/db/oses/
+ database_in_files = \
+- altlinux.xml.in \
+- centos.xml.in \
+- debian.xml.in \
+- dos.xml.in \
+- fedora.xml.in \
+- freebsd.xml.in \
+- gnome.xml.in \
+- mandriva.xml.in \
+- mandrake.xml.in \
+- netbsd.xml.in \
+- netware.xml.in \
+- macos.xml.in \
+- openbsd.xml.in \
+- opensuse.xml.in \
+- rhl.xml.in \
+- rhel.xml.in \
+- solaris.xml.in \
+- suse.xml.in \
+- ubuntu.xml.in \
+- windows.xml.in \
+ $(NULL)
+
+ database_DATA = $(database_in_files:.xml.in=.xml)
diff --git a/pcr/libosinfo-libre/free-distros.patch b/pcr/libosinfo-libre/free-distros.patch
new file mode 100644
index 000000000..c69cd3fed
--- /dev/null
+++ b/pcr/libosinfo-libre/free-distros.patch
@@ -0,0 +1,123 @@
+diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.am libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am
+--- libosinfo-0.2.8-libre/data/oses/Makefile.am 2013-12-01 13:14:07.267023100 +0100
++++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.am 2013-12-01 13:18:29.183029813 +0100
+@@ -1,6 +1,7 @@
+
+ databasedir = $(pkgdatadir)/db/oses/
+ database_in_files = \
++ parabola.xml.in \
+ $(NULL)
+
+ database_DATA = $(database_in_files:.xml.in=.xml)
+diff -ruN libosinfo-0.2.8-libre/data/oses/Makefile.in libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in
+--- libosinfo-0.2.8-libre/data/oses/Makefile.in 2013-12-01 13:14:07.267023100 +0100
++++ libosinfo-0.2.8-libre-free-distros/data/oses/Makefile.in 2013-12-01 13:18:48.053708302 +0100
+@@ -326,6 +326,7 @@
+ top_srcdir = @top_srcdir@
+ databasedir = $(pkgdatadir)/db/oses/
+ database_in_files = \
++ parabola.xml.in \
+ $(NULL)
+
+ database_DATA = $(database_in_files:.xml.in=.xml)
+diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml
+--- libosinfo-0.2.8-libre/data/oses/parabola.xml 1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml 2013-12-01 13:26:26.128660679 +0100
+@@ -0,0 +1,42 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++ <os id="https://parabolagnulinux.org">
++ <short-id>parabola</short-id>
++ <name>Parabola GNU/Linux-libre</name>
++ <vendor>Parabola Project</vendor>
++ <family>gnu/linux</family>
++
++ <resources arch="all">
++ <minimum>
++ <cpu>1000000000</cpu>
++ <n-cpus>1</n-cpus>
++ <ram>67108864</ram>
++ <storage>524288000</storage>
++ </minimum>
++ <recommended>
++ <cpu>1000000000</cpu>
++ <ram>67108864</ram>
++ <storage>524288000</storage>
++ </recommended>
++ </resources>
++
++ <media arch="x86_64">
++ <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
++ <iso>
++ <volume-id>PARA_201309</volume-id>
++ </iso>
++ <kernel>parabola/boot/x86_64/vmlinuz</kernel>
++ <initrd>parabola/boot/x86_64/parabolaiso.img</initrd>
++ </media>
++ <media arch="i686">
++ <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
++ <iso>
++ <volume-id>PARA_201309</volume-id>
++ </iso>
++ <kernel>parabola/boot/i686/vmlinuz</kernel>
++ <initrd>parabola/boot/i686/parabolaiso.img</initrd>
++ </media>
++ </os>
++
++</libosinfo>
+\ No newline at end of file
+diff -ruN libosinfo-0.2.8-libre/data/oses/parabola.xml.in libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in
+--- libosinfo-0.2.8-libre/data/oses/parabola.xml.in 1970-01-01 01:00:00.000000000 +0100
++++ libosinfo-0.2.8-libre-free-distros/data/oses/parabola.xml.in 2013-12-01 13:17:12.086931332 +0100
+@@ -0,0 +1,42 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<libosinfo version="0.0.1">
++
++ <os id="https://parabolagnulinux.org">
++ <short-id>parabola</short-id>
++ <_name>Parabola GNU/Linux-libre</_name>
++ <_vendor>Parabola Project</_vendor>
++ <family>gnu/linux</family>
++
++ <resources arch="all">
++ <minimum>
++ <cpu>1000000000</cpu>
++ <n-cpus>1</n-cpus>
++ <ram>67108864</ram>
++ <storage>524288000</storage>
++ </minimum>
++ <recommended>
++ <cpu>1000000000</cpu>
++ <ram>67108864</ram>
++ <storage>524288000</storage>
++ </recommended>
++ </resources>
++
++ <media arch="x86_64">
++ <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
++ <iso>
++ <volume-id>PARA_201309</volume-id>
++ </iso>
++ <kernel>parabola/boot/x86_64/vmlinuz</kernel>
++ <initrd>parabola/boot/x86_64/parabolaiso.img</initrd>
++ </media>
++ <media arch="i686">
++ <url>https://repo.parabolagnulinux.org/iso/2013.09.01/parabola-2013.09.01-dual.iso</url>
++ <iso>
++ <volume-id>PARA_201309</volume-id>
++ </iso>
++ <kernel>parabola/boot/i686/vmlinuz</kernel>
++ <initrd>parabola/boot/i686/parabolaiso.img</initrd>
++ </media>
++ </os>
++
++</libosinfo>
+diff -ruN libosinfo-0.2.8-libre/po/POTFILES.in libosinfo-0.2.8-libre-free-distros/po/POTFILES.in
+--- libosinfo-0.2.8-libre/po/POTFILES.in 2013-12-01 13:14:10.297130169 +0100
++++ libosinfo-0.2.8-libre-free-distros/po/POTFILES.in 2013-12-01 13:23:01.616209485 +0100
+@@ -1,3 +1,4 @@
++data/oses/parabola.xml.in
+ data/devices/qemu-ps2.xml.in
+ data/devices/qemu-pci.xml.in
+ data/devices/virtio-pci.xml.in
diff --git a/pcr/libosinfo-libre/po.patch b/pcr/libosinfo-libre/po.patch
new file mode 100644
index 000000000..abd11cb71
--- /dev/null
+++ b/pcr/libosinfo-libre/po.patch
@@ -0,0 +1,34 @@
+diff -ruN libosinfo-0.2.8/po/POTFILES.in libosinfo-0.2.8-libre/po/POTFILES.in
+--- libosinfo-0.2.8/po/POTFILES.in 2013-09-10 15:22:50.000000000 +0200
++++ libosinfo-0.2.8-libre/po/POTFILES.in 2013-12-01 11:54:50.441912252 +0100
+@@ -1,30 +1,9 @@
+-data/oses/netware.xml.in
+-data/oses/solaris.xml.in
+-data/oses/dos.xml.in
+-data/oses/mandrake.xml.in
+-data/oses/mandriva.xml.in
+-data/oses/suse.xml.in
+-data/oses/gnome.xml.in
+-data/oses/rhel.xml.in
+-data/oses/fedora.xml.in
+-data/oses/windows.xml.in
+-data/oses/opensuse.xml.in
+-data/oses/macos.xml.in
+-data/oses/debian.xml.in
+-data/oses/ubuntu.xml.in
+-data/oses/centos.xml.in
+-data/oses/openbsd.xml.in
+-data/oses/freebsd.xml.in
+-data/oses/rhl.xml.in
+-data/oses/netbsd.xml.in
+-data/oses/altlinux.xml.in
+ data/devices/qemu-ps2.xml.in
+ data/devices/qemu-pci.xml.in
+ data/devices/virtio-pci.xml.in
+ data/devices/qemu-usb.xml.in
+ data/hypervisors/kvm.xml.in
+ data/hypervisors/qemu.xml.in
+-data/hypervisors/rhel-xen.xml.in
+ data/hypervisors/xen.xml.in
+ osinfo/osinfo_avatar_format.c
+ osinfo/osinfo_deployment.c
diff --git a/pcr/libosinfo-libre/test.patch b/pcr/libosinfo-libre/test.patch
new file mode 100644
index 000000000..413deb1c0
--- /dev/null
+++ b/pcr/libosinfo-libre/test.patch
@@ -0,0 +1,87 @@
+diff -ruN libosinfo-0.2.8/test/test-isodetect.c libosinfo-0.2.8-libre/test/test-isodetect.c
+--- libosinfo-0.2.8/test/test-isodetect.c 2013-09-10 15:22:50.000000000 +0200
++++ libosinfo-0.2.8-libre/test/test-isodetect.c 2013-12-01 11:44:32.830411240 +0100
+@@ -342,66 +342,6 @@
+ g_object_unref(loader);
+ }
+
+-START_TEST(test_fedora)
+-{
+- test_one("fedora");
+-}
+-END_TEST
+-
+-START_TEST(test_rhel)
+-{
+- test_one("rhel");
+-}
+-END_TEST
+-
+-START_TEST(test_ubuntu)
+-{
+- test_one("ubuntu");
+-}
+-END_TEST
+-
+-START_TEST(test_debian)
+-{
+- test_one("debian");
+-}
+-END_TEST
+-
+-START_TEST(test_windows)
+-{
+- test_one("windows");
+-}
+-END_TEST
+-
+-START_TEST(test_openbsd)
+-{
+- test_one("openbsd");
+-}
+-END_TEST
+-
+-START_TEST(test_opensuse)
+-{
+- test_one("opensuse");
+-}
+-END_TEST
+-
+-START_TEST(test_centos)
+-{
+- test_one("centos");
+-}
+-END_TEST
+-
+-START_TEST(test_gnome)
+-{
+- test_one("gnome");
+-}
+-END_TEST
+-
+-START_TEST(test_altlinux)
+-{
+- test_one("altlinux");
+-}
+-END_TEST
+-
+ static Suite *
+ list_suite(void)
+ {
+@@ -409,16 +349,6 @@
+ TCase *tc = tcase_create("Core");
+ tcase_set_timeout(tc, 20);
+
+- tcase_add_test(tc, test_fedora);
+- tcase_add_test(tc, test_rhel);
+- tcase_add_test(tc, test_ubuntu);
+- tcase_add_test(tc, test_debian);
+- tcase_add_test(tc, test_windows);
+- tcase_add_test(tc, test_openbsd);
+- tcase_add_test(tc, test_opensuse);
+- tcase_add_test(tc, test_centos);
+- tcase_add_test(tc, test_gnome);
+- tcase_add_test(tc, test_altlinux);
+ suite_add_tcase(s, tc);
+ return s;
+ }
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
index 851470439..b03b2935e 100644
--- a/pcr/libquvi-scripts-current/PKGBUILD
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=libquvi-scripts-current
_pkgname=libquvi-scripts
provides=(libquvi-scripts)
-pkgver=0.9.20131104
+pkgver=0.9.20131130
pkgrel=1
pkgdesc='Library for parsing video download links.'
arch=('any')
@@ -24,5 +24,5 @@ package() {
cd "${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('0ddb9e392b46cee0e7a4af260bc1a1a3'
+md5sums=('46ddfd887260a515199c2e1ba8c46d8a'
'SKIP')
diff --git a/pcr/litecoin-qt/PKGBUILD b/pcr/litecoin-qt/PKGBUILD
new file mode 100644
index 000000000..28aaf2c0c
--- /dev/null
+++ b/pcr/litecoin-qt/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer: Loïc Guitaut <flink at belfalas dot eu>
+
+pkgname='litecoin-qt'
+pkgver=0.8.6.1
+pkgrel=2
+arch=('i686' 'x86_64')
+url="http://www.litecoin.org/"
+makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
+license=('MIT')
+pkgdesc="Peer-to-peer network based digital currency (QT)"
+depends=(boost-libs qt4 miniupnpc qrencode)
+conflicts=(litecoin)
+install=litecoin-qt.install
+source=("https://github.com/litecoin-project/litecoin/archive/v$pkgver.tar.gz"
+ "$pkgname.desktop")
+sha256sums=('8aef9e936b57b90d506c5dd2e350c3d0673640b69beb9975d172136eec1d8b34'
+ 'cfc53dc9028745358235698ddd562d3e6b4a3ea9f896f5efc1aa8cd81f595559')
+
+build() {
+ cd "$srcdir/litecoin-$pkgver"
+
+ # and make qt gui
+ qmake-qt4 USE_QRCODE=1 USE_UPNP=1
+ make
+}
+
+
+package() {
+ install -Dm644 litecoin-qt.desktop "$pkgdir"/usr/share/applications/litecoin.desktop
+ cd "$srcdir/litecoin-$pkgver"
+ install -Dm755 litecoin-qt "$pkgdir"/usr/bin/litecoin-qt
+ install -Dm644 share/pixmaps/bitcoin128.png "$pkgdir"/usr/share/pixmaps/litecoin128.png
+
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
diff --git a/pcr/litecoin-qt/litecoin-qt.desktop b/pcr/litecoin-qt/litecoin-qt.desktop
new file mode 100644
index 000000000..d3b9b365f
--- /dev/null
+++ b/pcr/litecoin-qt/litecoin-qt.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Litecoin
+Comment=Litecoin P2P Cryptocurrency
+Comment[fr]=Litecoin, monnaie virtuelle cryptographique pair à pair
+Comment[tr]=Litecoin, eşten eşe kriptografik sanal para birimi
+Exec=/usr/bin/litecoin-qt
+Terminal=false
+Type=Application
+Icon=/usr/share/pixmaps/litecoin128.png
+MimeType=x-scheme-handler/litecoin;
+Categories=Office;
diff --git a/pcr/litecoin-qt/litecoin-qt.install b/pcr/litecoin-qt/litecoin-qt.install
new file mode 100644
index 000000000..f98ba7338
--- /dev/null
+++ b/pcr/litecoin-qt/litecoin-qt.install
@@ -0,0 +1,11 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
diff --git a/pcr/lostfiles/PKGBUILD b/pcr/lostfiles/PKGBUILD
new file mode 100644
index 000000000..acc8ddd64
--- /dev/null
+++ b/pcr/lostfiles/PKGBUILD
@@ -0,0 +1,17 @@
+# Contributor: graysky <graysky AT archlinux dot us>
+
+pkgname=lostfiles
+pkgver=3.07
+pkgrel=1
+pkgdesc='Find orphan files - those not owned by any Arch packages.'
+arch=('any')
+license=('GPL2')
+depends=('bash')
+url="https://github.com/graysky2/lostfiles"
+source=("https://github.com/graysky2/$pkgname/archive/v$pkgver.tar.gz")
+sha256sums=('970d35a619043471067d58a6702443d5e7b9ab9ead96c37ae0811ecb11d2424d')
+
+package() {
+ cd "$pkgname-$pkgver"
+ install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname"
+}
diff --git a/pcr/lprof/PKGBUILD b/pcr/lprof/PKGBUILD
new file mode 100644
index 000000000..b25927937
--- /dev/null
+++ b/pcr/lprof/PKGBUILD
@@ -0,0 +1,44 @@
+# Contributor: Branko Vukelic <bg.branko@gmail.com>
+# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+pkgname=lprof
+pkgver=1.11.4.1
+pkgrel=3
+arch=(i686 x86_64 mips64el)
+pkgdesc="Imaging device calibration tool"
+url="http://lprof.sourceforge.net/"
+license="GPL"
+depends=('qt3' 'lcms>=1.12' 'vigra>=1.3')
+makedepends=('python>=1.53' 'scons')
+source=(http://downloads.sourceforge.net/lprof/${pkgname}-${pkgver}.tar.gz
+ lcms-117.patch)
+md5sums=('2177c77c24aa10db9b7681d264735ea9'
+ '5ce946c711462428a10116065647c823')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -p0<../lcms-117.patch
+ sed -i "s/'tiff'/'tiff','png'/" SConstruct || return 1
+ sed -i "s|'moc'|'moc-qt3'|" SConstruct || return 1
+ sed -i "s|'uic'|'uic-qt3'|" SConstruct || return 1
+ sed -i "s|qtdir, 'lib'|qtdir, 'lib', 'qt3'|
+ s|qtdir, 'include'|qtdir, 'include', 'qt3'|
+ " SConstruct || return 1
+ sed -i "s|qmake|qmake-qt3|
+ s|lrelease|lrelease-qt3|
+ s|lupdate|lupdate-qt3|
+ " {createtrans,comptrans}.sh
+ rm -rf scons*
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ scons PREFIX=/usr qt_directory=/usr || return 1
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ install -d ${pkgdir}/usr
+ scons PREFIX=${pkgdir}/usr install
+}
diff --git a/pcr/lprof/lcms-117.patch b/pcr/lprof/lcms-117.patch
new file mode 100644
index 000000000..55afdfbb8
--- /dev/null
+++ b/pcr/lprof/lcms-117.patch
@@ -0,0 +1,12 @@
+--- src/liblprof/lcmsprf.h.bak 2007-08-31 15:36:20.000000000 -0700
++++ src/liblprof/lcmsprf.h 2007-08-31 15:37:39.000000000 -0700
+@@ -67,6 +67,9 @@
+ #define mmax(a,b) ((a) > (b)?(a):(b))
+ #endif
+
++#if LCMS_VERSION > 116
++typedef int BOOL;
++#endif
+
+ /* Misc operations ------------------------------------------------------------------------ */
+
diff --git a/pcr/mariadb-galera/PKGBUILD b/pcr/mariadb-galera/PKGBUILD
new file mode 100644
index 000000000..920137305
--- /dev/null
+++ b/pcr/mariadb-galera/PKGBUILD
@@ -0,0 +1,107 @@
+# $Id$
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+
+pkgname=mariadb-galera
+pkgbase=mariadb-galera
+pkgver=5.5.33a
+_pkgver=${pkgver/.a/a}
+pkgrel=1
+arch=('i686' 'x86_64')
+license=('GPL')
+url='https://mariadb.com/kb/en/galera/'
+pkgdesc='Fast SQL database server, drop-in replacement for MySQL with Galera Cluster'
+backup=('etc/mysql/my.cnf')
+install=mariadb.install
+depends=('mariadb-clients' 'inetutils' 'libaio' 'galera')
+conflicts=('mysql')
+provides=("mysql=$pkgver" "mariadb")
+options=('emptydirs')
+makedepends=('cmake' 'openssl' 'zlib' 'libaio')
+source=(http://ftp.wa.co.za/pub/mariadb/${pkgname}-${pkgver}/kvm-tarbake-jaunty-x86/${pkgname}-${pkgver}.tar.gz
+ mariadb.service
+ mariadb-post.sh
+ mariadb-tmpfile.conf)
+sha256sums=('1b49e41e677d95f7a5b548771a81c6430ec6f0ee16e7ee624fb2fe2b278183b8'
+ 'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
+ '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+ '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
+
+prepare() {
+ mkdir build
+}
+
+build() {
+ cd build
+
+ cmake ../mariadb-$pkgver \
+ -DBUILD_CONFIG=mysql_release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/var/lib/mysql \
+ -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+ -DDEFAULT_CHARSET=utf8 \
+ -DDEFAULT_COLLATION=utf8_general_ci \
+ -DENABLED_LOCAL_INFILE=ON \
+ -DINSTALL_INFODIR=share/mysql/docs \
+ -DINSTALL_MANDIR=share/man \
+ -DINSTALL_PLUGINDIR=lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_INCLUDEDIR=include/mysql \
+ -DINSTALL_DOCREADMEDIR=share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_DOCDIR=share/mysql/docs \
+ -DINSTALL_SHAREDIR=share/mysql \
+ -DWITH_READLINE=ON \
+ -DWITH_ZLIB=system \
+ -DWITH_SSL=system \
+ -DWITH_LIBWRAP=OFF \
+ -DWITH_EXTRA_CHARSETS=complex \
+ -DWITH_EMBEDDED_SERVER=ON \
+ -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+ -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PARTITION_STORAGE_ENGINE=1 \
+ -DWITH_TOKUDB_STORAGE_ENGINE=1 \
+ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+ -DWITHOUT_OQGRAPH_STORAGE_ENGINE=1 \
+ -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+ -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+ -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+ -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+ -DWITH_WSREP=ON \
+ -DWITH_INNODB_DISALLOW_WRITES=1
+
+
+ make
+}
+
+package() {
+
+ cd build
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+ install -Dm755 ../mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+ install -Dm644 ../mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+ install -Dm644 ../mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+
+ # provided by libmariadbclient
+ cd "$pkgdir"
+ rm -f usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+ rm -f usr/lib/libmysql*
+ rm -rf usr/include/
+ rm -f usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+
+ # provided by mariadb-clients
+ rm -f usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+ rm -f usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+ # provided by mytop
+ rm -f usr/bin/mytop
+
+ # not needed
+ rm -rf usr/{data,mysql-test,sql-bench}
+ rm -f usr/share/man/man1/mysql-test-run.pl.1
+}
diff --git a/pcr/mariadb-galera/mariadb-post.sh b/pcr/mariadb-galera/mariadb-post.sh
new file mode 100644
index 000000000..c4ac18171
--- /dev/null
+++ b/pcr/mariadb-galera/mariadb-post.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+ response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
+ echo "$response" | grep -q "mysqld is alive" && break
+ echo "$response" | grep -q "Access denied for user" && break
+ sleep 1
+done
diff --git a/pcr/mariadb-galera/mariadb-tmpfile.conf b/pcr/mariadb-galera/mariadb-tmpfile.conf
new file mode 100644
index 000000000..6883dc798
--- /dev/null
+++ b/pcr/mariadb-galera/mariadb-tmpfile.conf
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -
diff --git a/pcr/mariadb-galera/mariadb.install b/pcr/mariadb-galera/mariadb.install
new file mode 100644
index 000000000..7d3c2ce5c
--- /dev/null
+++ b/pcr/mariadb-galera/mariadb.install
@@ -0,0 +1,47 @@
+if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
+ datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+fi
+[[ -z $datadir ]] && datadir=/var/lib/mysql
+
+post_install(){
+ groupadd -g 89 mysql &>/dev/null
+ useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+ if [[ ! -e $datadir ]]; then
+ install -dm700 $datadir
+ usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
+ chown -R mysql:mysql var/lib/mysql &>/dev/null
+ fi
+
+ usr/bin/systemd-tmpfiles --create mysql.conf
+
+ echo ">> If you are migrating from MySQL, don't forget to run 'mysql_upgrade'"
+ echo " after mysqld.service restart."
+}
+
+post_upgrade(){
+ getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+ getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+ if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+ for x in data/*; do
+ cp -r $x $datadir/
+ done
+ rm -rf data
+ fi
+
+ if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
+ echo ">> mysql.service has been renamed to mysqld.service to keep"
+ echo " consistency with MySQL package."
+ fi
+}
+
+post_remove(){
+ if getent passwd mysql >/dev/null 2>&1; then
+ userdel mysql
+
+ fi
+ if getent group mysql >/dev/null 2>&1; then
+ groupdel mysql
+ fi
+}
diff --git a/pcr/mariadb-galera/mariadb.service b/pcr/mariadb-galera/mariadb.service
new file mode 100644
index 000000000..dd65511d7
--- /dev/null
+++ b/pcr/mariadb-galera/mariadb.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/mathjax/PKGBUILD b/pcr/mathjax/PKGBUILD
index 779aa5a74..2bdc6ec67 100644
--- a/pcr/mathjax/PKGBUILD
+++ b/pcr/mathjax/PKGBUILD
@@ -1,19 +1,20 @@
-# Maintainer (Arch): Tianjiao Yin <ytj000@gmail.com>
-# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
-#taken from https://aur.archlinux.org/packages/mathjax/
+# Maintainer: Kevin Dodd <jesin00@gmail.com>
+# Contributor: Tianjiao Yin <ytj000@gmail.com>
pkgname=mathjax
-pkgver=2.2
+pkgver=2.3
pkgrel=2
pkgdesc='An open source JavaScript display engine for mathematics that works in all modern browsers'
url='http://www.mathjax.org/'
arch=('any')
-license=('apache')
-options=('!strip')
-source=('https://github.com/mathjax/MathJax/archive/v2.2.tar.gz')
+license=('Apache')
+options=(!strip libtool staticlibs)
+source=("https://github.com/mathjax/MathJax/archive/v${pkgver}.tar.gz")
+sha256sums=('0cd8f6de29b6c686550098119ab5301bdf60b03aeb8f9f2058e2832a0662687b')
-build() {
- mkdir -p $pkgdir/usr/share
- mv $srcdir/MathJax-* $pkgdir/usr/share/mathjax
+package() {
+ mkdir -p "$pkgdir/usr/share/fonts"
+ mv "$srcdir/MathJax-$pkgver" "$pkgdir/usr/share/mathjax"
+ ln -s '../mathjax/fonts' "$pkgdir/usr/share/fonts/mathjax"
}
-md5sums=('9e3ace5d926be939befb9bc79138a6f8')
+
diff --git a/pcr/md5deep/PKGBUILD b/pcr/md5deep/PKGBUILD
new file mode 100755
index 000000000..fe1acb7bd
--- /dev/null
+++ b/pcr/md5deep/PKGBUILD
@@ -0,0 +1,45 @@
+# Contributor: billycongo <billycongo@gmail.com>
+# Maintainer: dkaylor <dpkaylor@gmail.com>
+
+pkgname=md5deep
+pkgver=4.3
+pkgrel=2
+arch=('i686' 'x86_64')
+pkgdesc="Advanced checksum hashing tool"
+url="http://md5deep.sourceforge.net"
+license=('Public Domain')
+
+# Copyright and license stuff:
+#
+# This program is a work of the US Government.
+# In accordance with 17 USC 105, copyright protection is not available for any work of the US Government.
+# This program is PUBLIC DOMAIN. Portions of this program contain code that is licensed under the terms of the General Public License (GPL).
+# Those portions retain their original copyright and license. See the file COPYING for more details.
+# There is NO warranty for this program; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+# md5deep was originally developed by Jesse Kornblum <research (a t) jessekornblum ,,dot. com> during his service as a
+# Special Agent with the United States Air Force Office of Special Investigations (AFOSI).
+# As such, md5deep exists in the public domain under 17 USC 105.
+
+depends=('glibc')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
+
+md5sums=('f172e686ca1df83a53308ad90f7f706d')
+sha1sums=('b9dd6444f07c9fc344ebef201baebdf71bda337f')
+sha256sums=('905bcf8bddf0e7e2650b280d5e7af8cb8cd41dad4f299751dfec397dcb4f8d54')
+sha512sums=('fe1240e6ae039b18d35a9de0cf15fb77eaac9d5505b6b550eb32858bf6d603f8186de06114d40325d5071640f46cec70795e9c192fa7b6ca9022a12c212a9b14')
+
+
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ make DESTDIR=$pkgdir install
+}
diff --git a/pcr/ocsync/PKGBUILD b/pcr/ocsync/PKGBUILD
index cde26af30..8da91f41d 100644
--- a/pcr/ocsync/PKGBUILD
+++ b/pcr/ocsync/PKGBUILD
@@ -15,20 +15,19 @@ _buildtype="Release"
##############################################################
pkgname=ocsync
-pkgver=0.90.0
+pkgver=0.90.4
pkgrel=1
pkgdesc="A file synchronizer especially designed for you, the normal user. Dependency of owncloud-client."
arch=("i686" "x86_64")
url="http://www.csync.org"
license=('GPL2')
-depends=('sqlite3' 'iniparser' 'neon')
+depends=('sqlite3' 'iniparser' 'neon' 'libssh')
makedepends=('cmake')
-optdepends=('libssh: sftp support')
provides=('csync' 'csync-owncloud')
conflicts=('csync' 'csync-owncloud')
backup=('etc/ocsync/ocsync.conf' 'etc/ocsync/ocsync_exclude.conf')
source=("http://download.owncloud.com/download/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('db46cdb4c710a607dfc062ed0a413b35')
+md5sums=('4724730cf7376983c06bc83133c06a3f')
if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
options=(!strip)
@@ -52,4 +51,3 @@ package() {
cd ${srcdir}/${pkgname}-${pkgver}-build
make DESTDIR=${pkgdir} install
}
-md5sums=('6f1cfe47d6a7741c6e8df8642de52c0f')
diff --git a/pcr/openicc/PKGBUILD b/pcr/openicc/PKGBUILD
new file mode 100644
index 000000000..8db1cf82d
--- /dev/null
+++ b/pcr/openicc/PKGBUILD
@@ -0,0 +1,23 @@
+#Maintainer: M0Rf30
+
+pkgname=openicc
+pkgver=1.3.1
+pkgrel=1
+pkgdesc="Colour management projects to share ICC related implementation details"
+url="http://www.freedesktop.org/wiki/OpenIcc"
+arch=('i686' 'x86_64')
+depends=('xorg-server')
+source=("http://downloads.sourceforge.net/project/openicc/OpenICC-Profiles/icc-profiles-$pkgname-$pkgver.tar.bz2")
+license=('GPL')
+
+build() {
+ cd $srcdir/icc-profiles-$pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+package() {
+ cd $srcdir/icc-profiles-$pkgname-$pkgver
+ make DESTDIR=$pkgdir install
+}
+
+md5sums=('d18ed8dc5e3f6792d445af67d5f3b0d6')
diff --git a/pcr/owncloud-client/PKGBUILD b/pcr/owncloud-client/PKGBUILD
index ea808c1ef..a28aae986 100644
--- a/pcr/owncloud-client/PKGBUILD
+++ b/pcr/owncloud-client/PKGBUILD
@@ -16,7 +16,7 @@ _buildtype="Release"
_name=mirall
pkgname=owncloud-client
-pkgver=1.4.0
+pkgver=1.4.2
pkgrel=1
pkgdesc="ownCloud client based on mirall"
arch=('i686' 'x86_64')
@@ -24,13 +24,12 @@ url="http://owncloud.org/"
license=('GPL2')
depends=('qt4' 'ocsync' 'qtkeychain' 'qtwebkit')
makedepends=('cmake')
-optdepends=('qtkeychain: safe password storage')
provides=('mirall' 'owncloud-client')
conflicts=('mirall-git')
install=owncloud-client.install
-backup=('etc/owncloud-client/sync-exclude.lst')
+backup=('etc/ownCloud/sync-exclude.lst')
source=("http://download.owncloud.com/download/${_name}-${pkgver}.tar.bz2")
-md5sums=('05a69082b4e940b4282c2b05344c143a')
+md5sums=('089a9df66f31d6915a60e48ca4a027a8')
if [[ ! ${_buildtype} == "Release" ]] && [[ ! ${_buildtype} == "release" ]]; then
diff --git a/pcr/perl-mediawiki-api/PKGBUILD b/pcr/perl-mediawiki-api/PKGBUILD
new file mode 100644
index 000000000..7aa1fb64b
--- /dev/null
+++ b/pcr/perl-mediawiki-api/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor (AUR): ryooichi <ryooichi+arch AT gmail DOT com>
+# Contributor (AUR): Uwe <keksvernichter AT gmail DOT com>
+
+_author=EXOBUZZ
+_perlmod=MediaWiki-API
+pkgname=perl-mediawiki-api
+pkgver=0.39
+pkgdesc="Perl interface to the MediaWiki API"
+license=('GPL3') # GPLv3+
+url="http://search.cpan.org/perldoc?MediaWiki::API"
+
+pkgrel=1
+
+depends=('perl-json-xs' 'perl-json')
+arch=('any')
+options=('!emptydirs')
+source=(http://search.cpan.org/CPAN/authors/id/${_author:0:1}/${_author:0:2}/${_author}/${_perlmod}-${pkgver}.tar.gz)
+md5sums=('266b8f336241fd608b7094c830a30a55')
+
+build() {
+ cd "$srcdir/$_perlmod-$pkgver"
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
+}
+
+package() {
+ cd "$srcdir/$_perlmod-$pkgver"
+ make install DESTDIR="$pkgdir/"
+}
diff --git a/pcr/plowshare/PKGBUILD b/pcr/plowshare/PKGBUILD
index 608e13ccf..11291ef4a 100644
--- a/pcr/plowshare/PKGBUILD
+++ b/pcr/plowshare/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: breakdown <breakdown(at)archlinux(dot)us>
pkgname=plowshare
-pkgver=snapshot_git20131009.5e55a9b
+pkgver=snapshot_git20131130.3c63b19
pkgrel=1
pkgdesc="Command-line downloader and uploader for Rapidshare, Mediafire and other file sharing websites."
arch=('any')
@@ -31,4 +31,4 @@ package() {
}
# vim:set ts=2 sw=2 et:
-md5sums=('cfecd42bf22712f4c410d88c9aa9cf0c')
+md5sums=('1e2468cad043a7225c3092290d844163')
diff --git a/pcr/python2-pywebdav/PKGBUILD b/pcr/python2-pywebdav/PKGBUILD
index c5c72b22a..994bd4c4f 100644
--- a/pcr/python2-pywebdav/PKGBUILD
+++ b/pcr/python2-pywebdav/PKGBUILD
@@ -3,12 +3,12 @@
pkgname=python2-pywebdav
pkgver=0.9.8
-pkgrel=1
+pkgrel=2
pkgdesc="A standards compliant WebDAV server and library written in Python"
arch=('any')
url="http://code.google.com/p/pywebdav/"
license=('GPLv2')
-depends=('python2' 'pyxml')
+depends=('python2')
conflicts=('python-pywebdav')
makedepends=('python2-distribute')
source=(http://pywebdav.googlecode.com/files/PyWebDAV-$pkgver.tar.gz)
diff --git a/pcr/python2-renpy/PKGBUILD b/pcr/python2-renpy/PKGBUILD
index ee91bafb8..db2a94428 100644
--- a/pcr/python2-renpy/PKGBUILD
+++ b/pcr/python2-renpy/PKGBUILD
@@ -3,8 +3,8 @@
_pkgname=renpy
pkgname=python2-renpy
-pkgver=6.15.7
-pkgrel=2
+pkgver=6.16.2
+pkgrel=1
pkgdesc="Platform-dependant Ren'Py libraries."
arch=(
mips64el
@@ -29,7 +29,7 @@ conflicts=(
)
renplaces=python-$_pkgname
source=http://www.$_pkgname.org/dl/$pkgver/$_pkgname-$pkgver-source.tar.bz2
-sha512sums=d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
+sha512sums=fc3b40f01f2d1e820a05f90a2d85e42986aaa4840e506d18ea76a78527d2f98ca6cf832ebde3e1f996b94f4ce4b175856da913f3de7f1a9db48aba0eea84b52d
build() {
cd $srcdir/$_pkgname-$pkgver-source
diff --git a/pcr/qemu-usbredir/65-kvm.rules b/pcr/qemu-usbredir/65-kvm.rules
new file mode 100644
index 000000000..569ded9f9
--- /dev/null
+++ b/pcr/qemu-usbredir/65-kvm.rules
@@ -0,0 +1,2 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
diff --git a/pcr/qemu-usbredir/PKGBUILD b/pcr/qemu-usbredir/PKGBUILD
new file mode 100644
index 000000000..35f945d0e
--- /dev/null
+++ b/pcr/qemu-usbredir/PKGBUILD
@@ -0,0 +1,77 @@
+# $Id$
+# Maintainer (Arch GNU/Linux): Tobias Powalowski <tpowa@archlinux.org>
+_pkgname=qemu
+pkgname=qemu-usbredir
+pkgver=1.7.0
+pkgrel=1
+pkgdesc="A generic and open source processor emulator which achieves a good emulation speed by using dynamic translation."
+arch=('i686' 'x86_64')
+license=('GPL2' 'LGPL2.1')
+url="http://wiki.qemu.org/Index.html"
+makedepends=('texi2html' 'perl' 'python2' 'spice-protocol')
+depends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard' 'spice' 'usbredir')
+backup=('etc/qemu/target-x86_64.conf')
+install=qemu.install
+source=(http://wiki.qemu.org/download/${_pkgname}-${pkgver}.tar.bz2
+ 65-kvm.rules)
+makedepends=('pixman' 'libjpeg' 'libpng' 'sdl' 'alsa-lib' 'nss' 'glib2'
+ 'gnutls>=2.4.1' 'bluez-libs' 'vde2' 'util-linux' 'curl' 'libsasl'
+ 'libgl' 'libpulse' 'seabios' 'libcap-ng' 'libaio' 'libseccomp'
+ 'libiscsi' 'libcacard' 'spice' 'spice-protocol' 'python2'
+ 'usbredir')
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+replaces=('qemu-kvm')
+options=(!strip)
+
+build ()
+{
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ # qemu vs. make 4 == bad
+ export ARFLAGS="rv"
+ # http://permalink.gmane.org/gmane.comp.emulators.qemu/238740
+ # gtk gui breaks keymappings at the moment
+ ./configure --prefix=/usr --sysconfdir=/etc --audio-drv-list='pa alsa sdl' \
+ --python=/usr/bin/python2 --smbd=/usr/bin/smbd \
+ --enable-docs --libexecdir=/usr/lib/qemu \
+ --disable-gtk --enable-linux-aio --enable-seccomp \
+ --enable-spice --localstatedir=/var --enable-usb-redir
+ make V=99
+}
+
+package ()
+{
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" libexecdir="/usr/lib/qemu" install
+ # provided by seabios package
+ rm "${pkgdir}/usr/share/qemu/bios.bin"
+ rm "${pkgdir}/usr/share/qemu/acpi-dsdt.aml"
+ rm "${pkgdir}/usr/share/qemu/q35-acpi-dsdt.aml"
+ # remove conflicting /var/run directory
+ rm -r "${pkgdir}/var"
+ install -D -m644 "${srcdir}/65-kvm.rules" \
+ "${pkgdir}/usr/lib/udev/rules.d/65-kvm.rules"
+ # bridge_helper needs suid
+ # https://bugs.archlinux.org/task/32565
+ chmod u+s "${pkgdir}/usr/lib/qemu/qemu-bridge-helper"
+ # add sample config
+ echo "allow br0" > ${pkgdir}/etc/qemu/bridge.conf.sample
+ # 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-executable*) # Binaries
+ /usr/bin/strip $STRIP_BINARIES "$binary";;
+ esac
+ done
+ # remove libcacard files
+ rm -rf ${pkgdir}/usr/include/cacard
+ rm -rf ${pkgdir}/usr/lib/libcacard*
+ rm -rf ${pkgdir}/usr/lib/pkgconfig/libcacard.pc
+ rm -rf ${pkgdir}/usr/bin/vscclient
+}
+
+md5sums=('32893941d40d052a5e649efcf06aca06'
+ '33ab286a20242dda7743a900f369d68a')
diff --git a/pcr/qemu-usbredir/qemu.install b/pcr/qemu-usbredir/qemu.install
new file mode 100644
index 000000000..79ee83536
--- /dev/null
+++ b/pcr/qemu-usbredir/qemu.install
@@ -0,0 +1,23 @@
+# kvm: the new package version
+post_install() {
+ #
+ groupadd kvm -f -g 78
+}
+
+post_upgrade() {
+ if [ "$(vercmp $2 0.11)" -lt 0 ]; then
+ echo "With the release of qemu and qemu-kvm 0.12.X, the kqemu kernel module"
+ echo "is no longer supported and will be removed from the repositories. You"
+ echo "can safely uninstall it from your system."
+ fi
+ if [ "$(vercmp $2 1.3.1)" -lt 0 ]; then
+ echo "With the release of qemu 1.3.0, qemu-kvm binary is removed."
+ echo "You need to change the emulator path, if you use libvirt by using:"
+ echo "'virsh edit <vm-name>'"
+ fi
+}
+
+post_remove() {
+ #
+ groupdel kvm
+}
diff --git a/pcr/quvi-current/PKGBUILD b/pcr/quvi-current/PKGBUILD
index 231e79658..8acfc507f 100644
--- a/pcr/quvi-current/PKGBUILD
+++ b/pcr/quvi-current/PKGBUILD
@@ -5,8 +5,8 @@
pkgname=quvi-current
_pkgname=quvi
provides=(quvi)
-pkgver=0.9.4
-pkgrel=2
+pkgver=0.9.5
+pkgrel=1
pkgdesc='Command-line tool for parsing video download links.'
arch=('i686' 'x86_64')
url='http://quvi.sourceforge.net/'
@@ -26,5 +26,5 @@ package() {
cd "${_pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('36ba58e00d10b38797c39c0c9e2ef663'
+md5sums=('baa1d7b25e9fd173e952e27d4aa4b933'
'SKIP')
diff --git a/pcr/radicale/radicale.install b/pcr/radicale/radicale.install
new file mode 100644
index 000000000..2bd33ed49
--- /dev/null
+++ b/pcr/radicale/radicale.install
@@ -0,0 +1,10 @@
+post_install() {
+ useradd --create-home \
+ --home-dir /srv/cal \
+ --user-group \
+ --system \
+ --comment "Radicale" \
+ --skel /dev/null \
+ --shell /usr/bin/nologin \
+ cal
+}
diff --git a/pcr/renpy/PKGBUILD b/pcr/renpy/PKGBUILD
index a9f2475db..61874b5ba 100644
--- a/pcr/renpy/PKGBUILD
+++ b/pcr/renpy/PKGBUILD
@@ -2,7 +2,7 @@
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgname=renpy
-pkgver=6.15.7
+pkgver=6.16.2
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
@@ -25,7 +25,7 @@ source=(
$pkgname-launcher.sh
)
sha512sums=(
- d79b1d6b931f281ff208b8ece3889c116ceb05c58fe115e9f7f470788e74e63cfeb3df4f804b4a37a4f1da6ba194c883023808fafc8e8beddf864424958204e6
+ fc3b40f01f2d1e820a05f90a2d85e42986aaa4840e506d18ea76a78527d2f98ca6cf832ebde3e1f996b94f4ce4b175856da913f3de7f1a9db48aba0eea84b52d
1af85c7a0c10662bfa4c03611fed695325f5953ac0f2c913f5342b1dca22b22115f07e69d646d92a3b95f5b896283e9b1bc7fe3e0a338536b5d9d48beedae8d5
2a9302adbc6ff45e048d42487ac86e7501f90b2d393933af5d39d663a0b3707f795a04f65598e356a64809dfa0175a4ad860b355e5337ee149692c21caf339df
bcb3152a88d5f913a99855e9d6fa5d0019e310ba9d55a6288d2d8b60cb6c9ab3ddf8c772dfd23a2851d52479adc2a16bd3ffe25ff7fb50d222ec1f55eaa48b09
@@ -50,7 +50,7 @@ package(){
install -vDm755 $srcdir/$pkgname-launcher.sh $pkgdir/usr/bin/$pkgname
install -vDm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
- cp -va launcher $pkgname{,.py} template the_question tutorial $pkgdir/usr/share/$pkgname
+ cp -va launcher $pkgname{,.py} templates the_question tutorial $pkgdir/usr/share/$pkgname
ln -vs $pkgname/common $pkgdir/usr/share/$pkgname/common
cp -va doc/* $pkgdir/usr/share/doc/$pkgname
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 0951e474d..2aa501159 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -2,16 +2,16 @@
# Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
pkgname='ryzom-hg'
-_hgver=ce26956d3a4a
-pkgver=20130727
-pkgrel=7
+_hgver=923522b
+pkgver=20131215
+pkgrel=3
pkgdesc="An awesome free software 3D MMORPG game"
arch=('i686' 'x86_64')
url="http://www.ryzom.com/"
license=('AGPL3')
depends=('curl' 'hicolor-icon-theme' 'libvorbis' 'libjpeg' 'libwww-hg' 'luabind' 'ryzom-data')
conflicts=('ryzom')
-makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost')
+makedepends=('mercurial' 'cpptest' 'cmake' 'bison' 'freealut' 'rrdtool' 'boost' 'freetype2')
source=("libre://$pkgname-$pkgver.tar.gz")
mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=${_hgver}")
@@ -19,12 +19,14 @@ mksource=(".$pkgname-$pkgver::hg+https://bitbucket.org/ryzom/ryzomcore#revision=
mksource() {
rm -rf "$srcdir/$pkgname-$pkgver"
cp -a "$srcdir/.$pkgname-$pkgver/code" "${srcdir}/${pkgname}-${pkgver}"
+ # some patching required...
+ sed -i 's|<freetype/|<freetype2/|g' "${srcdir}/${pkgname}-${pkgver}/nel/src/3d/font_generator.cpp"
}
build() {
mkdir -p "$srcdir/build"
cd "$srcdir/build"
- cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -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
+ cmake -Wno-dev "$srcdir/${pkgname}-${pkgver}" -DFINAL_VERSION=ON -DWITH_STATIC=OFF -DWITH_NEL_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_LUA51=ON -DWITH_NEL_SAMPLES=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_CLIENT=ON -DWITH_NEL=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON -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 -DFREETYPE_INCLUDE_DIRS="/usr/include;/usr/include/freetype2"
make all
}
@@ -47,4 +49,4 @@ package() {
}
mksha256sums=('SKIP')
-sha256sums=('a8c90f3f41fb3d497022a2d14a9aa39352557f5745f97b93d0bed61cebf85402')
+sha256sums=('187e9a508be4c3c07f768fc98497941ac4946caf2202d24311aac81d73cff5a5')
diff --git a/~lukeshu/stow/PKGBUILD b/pcr/stow/PKGBUILD
index 24a2dcb1c..a3024b7e9 100644
--- a/~lukeshu/stow/PKGBUILD
+++ b/pcr/stow/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
pkgname=stow
-pkgver=2.1.2
+pkgver=2.2.0
pkgrel=1
pkgdesc="A program for managing the installation of software packages, keeping them separate while making them appear to be installed in the same place."
arch=(any)
url="https://www.gnu.org/software/$pkgname/"
license=('GPL2')
depends=('perl>=5.6.1')
-source=(http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
+source=(https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
build() {
cd "$srcdir/$pkgname-$pkgver"
@@ -21,4 +21,4 @@ package() {
make DESTDIR="$pkgdir/" install
}
-md5sums=('82857e43531cf6936aed99ef3b86b446')
+md5sums=('902564d502975f353d3b0514a21863b1')
diff --git a/pcr/trytond-account-invoice/PKGBUILD b/pcr/trytond-account-invoice/PKGBUILD
index 0813dd78d..c1f3a4636 100644
--- a/pcr/trytond-account-invoice/PKGBUILD
+++ b/pcr/trytond-account-invoice/PKGBUILD
@@ -2,18 +2,23 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-account-invoice
_pkgname=trytond_account_invoice
-pkgver=2.8.3
-_pkgdir=2.8
-pkgrel=1
+pkgver=3.0.0
+_pkgdir=3.0
+pkgrel=2
pkgdesc="The account_invoice module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8' 'trytond-account>=2.8' 'trytond-account-product>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8' 'trytond-product>=2.8')
+depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-account-product>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("5c3dda771139e55d1f445f07922028a3")
+md5sums=("d225505a8ba66bfd95f22a454951dd15")
+
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-account-product/PKGBUILD b/pcr/trytond-account-product/PKGBUILD
index 2d196b1fd..5a780d1dd 100644
--- a/pcr/trytond-account-product/PKGBUILD
+++ b/pcr/trytond-account-product/PKGBUILD
@@ -2,18 +2,23 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-account-product
_pkgname=trytond_account_product
-pkgver=2.8.0
-_pkgdir=2.8
-pkgrel=1
+pkgver=3.0.0
+_pkgdir=3.0
+pkgrel=2
pkgdesc="The account_product module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8' 'trytond-account>=2.8' 'trytond-company>=2.8' 'trytond-product>=2.8')
+depends=('trytond>=3.0' 'trytond-account>=3.0' 'trytond-company>=3.0' 'trytond-product>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("431a2bdb15e8f84af7de42e571f1c4e5")
+md5sums=("16b9dee1238310a9809fcdef64cbf8a8")
+
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-account/PKGBUILD b/pcr/trytond-account/PKGBUILD
index 31f3c3c14..319f7c872 100644
--- a/pcr/trytond-account/PKGBUILD
+++ b/pcr/trytond-account/PKGBUILD
@@ -2,18 +2,24 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-account
_pkgname=trytond_account
-pkgver=2.8.1
-_pkgdir=2.8
-pkgrel=1
+pkgver=3.0.0
+_pkgdir=3.0
+pkgrel=2
pkgdesc="The account module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8')
+depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0'
+ 'trytond-party>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("2cdb5b5e8a3984315d410b550b7ffc1b")
+md5sums=("33e28b72249e97891e00fccb5a588ea8")
+
+build() {
+ cd $srcdir/$_pkgname-$pkgver
+ python2 setup.py build
+}
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-calendar/PKGBUILD b/pcr/trytond-calendar/PKGBUILD
index bae7cdb5f..67db70dfa 100644
--- a/pcr/trytond-calendar/PKGBUILD
+++ b/pcr/trytond-calendar/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-calendar
_pkgname=trytond_calendar
-pkgver=2.8.0
-_pkgdir=2.8
+pkgver=3.0.0
+_pkgdir=3.0
pkgrel=1
pkgdesc="The calendar module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8')
+depends=('trytond>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("0ea2e2c2d31b44e0072591a42cf63b1a")
+md5sums=("fad4dee756bbf97ce9aef47bed185704")
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-company/PKGBUILD b/pcr/trytond-company/PKGBUILD
index 7455afcc2..8c9b4dd47 100644
--- a/pcr/trytond-company/PKGBUILD
+++ b/pcr/trytond-company/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-company
_pkgname=trytond_company
-pkgver=2.8.0
-_pkgdir=2.8
+pkgver=3.0.0
+_pkgdir=3.0
pkgrel=1
pkgdesc="The company module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8')
+depends=('trytond>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("6fc6ef3ec24cbe4a486f7b492e67268f")
+md5sums=("87623bc65e2c629c0c5541877bfec8cb")
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-country/PKGBUILD b/pcr/trytond-country/PKGBUILD
index 802064c3f..7a0108996 100644
--- a/pcr/trytond-country/PKGBUILD
+++ b/pcr/trytond-country/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-country
_pkgname=trytond_country
-pkgver=2.8.0
-_pkgdir=2.8
+pkgver=3.0.0
+_pkgdir=3.0
pkgrel=1
pkgdesc="The country module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8')
+depends=('trytond>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("b4947b2ab766e7ef2626ed105d9422e8")
+md5sums=("c365bd0ac6e04a88427cb5366c1ce493")
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-currency/PKGBUILD b/pcr/trytond-currency/PKGBUILD
index 3f1e364ad..21386024b 100644
--- a/pcr/trytond-currency/PKGBUILD
+++ b/pcr/trytond-currency/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-currency
_pkgname=trytond_currency
-pkgver=2.8.0
-_pkgdir=2.8
+pkgver=3.0.0
+_pkgdir=3.0
pkgrel=1
pkgdesc="The currency module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8')
+depends=('trytond>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("10d98fbf34c90f5d1544f3d28170eefc")
+md5sums=("5507619d11d186fc041d1de7c0eea012")
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-party/PKGBUILD b/pcr/trytond-party/PKGBUILD
index c21e2b44f..61de6605b 100644
--- a/pcr/trytond-party/PKGBUILD
+++ b/pcr/trytond-party/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-party
_pkgname=trytond_party
-pkgver=2.8.0
-_pkgdir=2.8
+pkgver=3.0.0
+_pkgdir=3.0
pkgrel=1
pkgdesc="The party module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8' 'trytond-country>=2.8')
+depends=('trytond>=3.0' 'trytond-country>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("2fbf811a9d82f68889dc0350441423d4")
+md5sums=("43c6d17fbe723beec0339da27f3e188e")
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-product/PKGBUILD b/pcr/trytond-product/PKGBUILD
index 210a6b023..4dc09354d 100644
--- a/pcr/trytond-product/PKGBUILD
+++ b/pcr/trytond-product/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-product
_pkgname=trytond_product
-pkgver=2.8.0
-_pkgdir=2.8
+pkgver=3.0.0
+_pkgdir=3.0
pkgrel=1
pkgdesc="The product module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8')
+depends=('trytond>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("67cf95a0d68e47365bbdef02b344a5a8")
+md5sums=("756dabade95f67f49a253af1bd5513a6")
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-stock-lot/PKGBUILD b/pcr/trytond-stock-lot/PKGBUILD
index 08e022e21..ae39373f7 100644
--- a/pcr/trytond-stock-lot/PKGBUILD
+++ b/pcr/trytond-stock-lot/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-stock-lot
_pkgname=trytond_stock_lot
-pkgver=2.8.0
-_pkgdir=2.8
+pkgver=3.0.0
+_pkgdir=3.0
pkgrel=1
pkgdesc="The stock_lot module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8' 'trytond-product>=2.8' 'trytond-stock>=2.8')
+depends=('trytond>=3.0' 'trytond-product>=3.0' 'trytond-stock>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("a4c3379462de7c7af8bb342aedff6360")
+md5sums=("b8424f738dc5e98d0a1de8643315e605")
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond-stock/PKGBUILD b/pcr/trytond-stock/PKGBUILD
index d84eda26c..31f1fc9e9 100644
--- a/pcr/trytond-stock/PKGBUILD
+++ b/pcr/trytond-stock/PKGBUILD
@@ -2,18 +2,18 @@
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond-stock
_pkgname=trytond_stock
-pkgver=2.8.1
-_pkgdir=2.8
+pkgver=3.0.0
+_pkgdir=3.0
pkgrel=1
pkgdesc="The stock module of the Tryton application platform"
arch=('any')
url='http://www.tryton.org/'
license=('GPL3')
groups=('trytond-modules')
-depends=('trytond>=2.8' 'trytond-company>=2.8' 'trytond-currency>=2.8' 'trytond-party>=2.8' 'trytond-product>=2.8')
+depends=('trytond>=3.0' 'trytond-company>=3.0' 'trytond-currency>=3.0' 'trytond-party>=3.0' 'trytond-product>=3.0')
makedepends=('python2-distribute')
source=("http://downloads.tryton.org/$_pkgdir/$_pkgname-$pkgver.tar.gz")
-md5sums=("5b28b2ec424a0915578d420d0479bd49")
+md5sums=("ec0d35080f68f7fa3218d8a30729ed22")
package() {
cd $srcdir/$_pkgname-$pkgver
diff --git a/pcr/trytond/PKGBUILD b/pcr/trytond/PKGBUILD
index 286cff50d..eaa9d6f7b 100644
--- a/pcr/trytond/PKGBUILD
+++ b/pcr/trytond/PKGBUILD
@@ -2,9 +2,9 @@
# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
pkgname=trytond
-pkgver=2.8.3
-_pkgdir=2.8
-pkgrel=1
+pkgver=3.0.0
+_pkgdir=3.0
+pkgrel=2
pkgdesc="A three-tiers high-level general purpose application platform (server application)"
arch=('any')
url="http://www.tryton.org/"
@@ -18,10 +18,8 @@ optdepends=('python2-psycopg2: support for PostgreSQL database'
makedepends=('python2-distribute')
install="trytond.install"
source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz"
- 'trytond.install'
'trytond.service')
-md5sums=('db714e83e4b09213a6027911af0ad75e'
- '768e68c01cb5913e36ea89c67fc98038'
+md5sums=('812daa29409881adc4001c1c810bc8e8'
'b1535a8528dfd8f655624bf6faea6985')
package() {
diff --git a/pcr/twinkle/PKGBUILD b/pcr/twinkle/PKGBUILD
new file mode 100644
index 000000000..b9e8fc537
--- /dev/null
+++ b/pcr/twinkle/PKGBUILD
@@ -0,0 +1,50 @@
+# $Id: PKGBUILD 68598 2012-03-29 08:03:13Z arodseth $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Jeff Mickey <jeff@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
+# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
+
+pkgname=twinkle
+pkgver=1.4.2
+pkgrel=20
+pkgdesc="Softphone for voice over IP and IM communication using SIP"
+arch=('x86_64' 'i686')
+url="http://www.twinklephone.com/"
+license=('GPL')
+depends=('file' 'speex' 'boost-libs' 'libsndfile' 'qt3' 'libzrtpcpp'
+'commoncpp2' 'libxml2')
+makedepends=('pkg-config' 'boost')
+source=("http://www.xs4all.nl/~mfnboer/$pkgname/download/$pkgname-$pkgver.tar.gz"
+ twinkle-1.4.2-ccrtp.patch)
+md5sums=('d70c8972f296ffd998c7fb698774705b'
+ '934f59ff60a8ae29a152feb8bf131ae2')
+
+build() {
+ cd "$srcdir"
+ patch -p0 < ./twinkle-1.4.2-ccrtp.patch || return 1
+
+ cd "$pkgname-$pkgver"
+ aclocal
+ autoconf
+ automake -a
+ export QTDIR=/usr/lib/qt3
+ export PATH=$QTDIR/bin:$PATH
+ CPPFLAGS="$CPPFLAGS -I/usr/include/qt3" \
+ ./configure --prefix=/usr \
+ --without-kde \
+ --with-speex \
+ --without-ilbc \
+ --mandir=/usr/share/man
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+ install -Dm644 "$pkgdir/usr/share/twinkle/twinkle48.png" \
+ "$pkgdir/usr/share/pixmaps/twinkle.png"
+ install -Dm644 twinkle.desktop \
+ "$pkgdir/usr/share/applications/twinkle.desktop"
+}
diff --git a/pcr/twinkle/twinkle-1.4.2-ccrtp.patch b/pcr/twinkle/twinkle-1.4.2-ccrtp.patch
new file mode 100644
index 000000000..fdb5f6260
--- /dev/null
+++ b/pcr/twinkle/twinkle-1.4.2-ccrtp.patch
@@ -0,0 +1,24 @@
+diff -pruN twinkle-1.4.2-o/configure.in twinkle-1.4.2/configure.in
+--- twinkle-1.4.2-o/configure.in 2009-02-24 11:49:20.000000000 -0800
++++ twinkle-1.4.2/configure.in 2012-05-19 09:20:51.151778516 -0700
+@@ -66,7 +66,7 @@ fi
+
+ export PKG_CONFIG_PATH
+
+-PKG_CHECK_MODULES(CCRTP, libccrtp1 >= 1.6.0)
++PKG_CHECK_MODULES(CCRTP, libccrtp >= 2.0.0)
+
+ PKG_CHECK_MODULES(XML2, libxml-2.0)
+ # AC_CHECK_HEADER(libxml/tree.h, [],
+diff -pruN twinkle-1.4.2-o/src/log.cpp twinkle-1.4.2/src/log.cpp
+--- twinkle-1.4.2-o/src/log.cpp 2009-01-18 06:35:28.000000000 -0800
++++ twinkle-1.4.2/src/log.cpp 2012-05-19 09:21:11.071594114 -0700
+@@ -161,7 +161,7 @@ void t_log::write_header(const string &f
+
+ gettimeofday(&t, NULL);
+ date = t.tv_sec;
+- localtime_r(&date, &tm);
++ ::localtime_r(&date, &tm);
+
+ *log_stream << "+++ ";
+ *log_stream << tm.tm_mday;
diff --git a/pcr/unittestpp/PKGBUILD b/pcr/unittestpp/PKGBUILD
new file mode 100644
index 000000000..3918f98a2
--- /dev/null
+++ b/pcr/unittestpp/PKGBUILD
@@ -0,0 +1,37 @@
+# Maintainer: Jorge Araya Navarro <elcorreo@deshackra.com>
+# Contributor: Piotr Beling <qwak@w8.pl>
+# Contributor: Vianney le Clément <vleclement AT gmail · com>
+pkgname=unittestpp
+pkgver=1.4
+pkgrel=3
+pkgdesc="A lightweight unit testing framework for C++"
+arch=('i686' 'x86_64')
+url="http://unittest-cpp.sourceforge.net/"
+depends=('gcc-libs')
+source=("http://downloads.sourceforge.net/project/unittest-cpp/UnitTest%2B%2B/$pkgver/unittest-cpp-${pkgver}.zip")
+sha1sums=('dad944159e2e135aea74039987490eaaee00f2ad')
+license=('MIT')
+
+build() {
+ cd "$srcdir/UnitTest++"
+ make all
+}
+
+package() {
+ cd "$srcdir/UnitTest++"
+
+ install -dm755 "$pkgdir/usr/include/unittest++/Posix"
+ install -m644 src/*.h "$pkgdir/usr/include/unittest++"
+ install -m644 src/Posix/*.h "$pkgdir/usr/include/unittest++/Posix"
+
+ install -dm755 "$pkgdir/usr/lib"
+ install -m644 libUnitTest++.a "$pkgdir/usr/lib"
+
+ install -dm755 "$pkgdir/usr/share/licenses/unittest++"
+ install -m644 COPYING "$pkgdir/usr/share/licenses/unittest++/LICENSE"
+ install -dm755 "$pkgdir/usr/share/doc/unittest++"
+ install -m644 README "$pkgdir/usr/share/doc/unittest++/README"
+ install -m644 docs/UnitTest++.html "$pkgdir/usr/share/doc/unittest++/UnitTest++.html"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/~lukeshu/wdiff/PKGBUILD b/pcr/wdiff/PKGBUILD
index 41bee9679..41bee9679 100644
--- a/~lukeshu/wdiff/PKGBUILD
+++ b/pcr/wdiff/PKGBUILD
diff --git a/pcr/wmii-hg/PKGBUILD b/pcr/wmii-hg/PKGBUILD
new file mode 100644
index 000000000..c556a1b88
--- /dev/null
+++ b/pcr/wmii-hg/PKGBUILD
@@ -0,0 +1,56 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+# Maintainer (AUR): N30N <archlinux@alunamation.com>
+# Contributor: Anthony Martin <ality@pbrane.org>
+# Contributer: thomasd <thdahms@gmx.de>
+# Contributer: karnath <karnath@pop3.ru>
+# Contributer: MrBougo <bougospam@gmail.com>
+# Contributor: Wolf Ramovsky <wolf.ramovsky@gmail.com>
+
+pkgname=wmii-hg
+pkgver=2813
+pkgdesc="A small, dynamic window manager for X11"
+url="https://code.google.com/p/wmii/"
+license=("MIT")
+
+provides=("wmii")
+conflicts=("wmii")
+
+pkgrel=1
+arch=("i686" "x86_64")
+depends=('libxft' 'libxrandr' 'libxinerama')
+makedepends=('txt2tags' 'libixp') # libixp is statically linked
+
+source=("libre://${pkgname}-${pkgver}.tar.gz")
+md5sums=('74eb9f91000321b587e7826be999d4de')
+
+mkdepends=('mercurial')
+mksource=("$pkgname-$pkgver::hg+https://code.google.com/p/wmii/#revision=${pkgver}")
+mkmd5sums=('SKIP')
+mksource() {
+ # don't include this precompiled binary (probably included by accident)
+ rm "${srcdir}/${pkgname}-${pkgver}/lib/libutf/libutf.a"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ export LDFLAGS+=',--no-as-needed'
+ sed -i 's|PREFIX = /usr/local|PREFIX = /usr|' config.mk
+ sed -i 's|ETC = $(PREFIX)/etc|ETC = /etc|' config.mk
+ sed -i 's|PYTHON = .*|PYTHON = python2|' config.mk
+ echo 'CFLAGS += -O2' >> config.mk
+ sed -i 's# !=#!=#' mk/hdr.mk
+
+ export MAKEFLAGS="-j1"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 img/wmii.png "${pkgdir}"/usr/share/pixmaps/wmii.png
+ install -Dm644 debian/file/wmii.desktop "${pkgdir}"/usr/share/xsessions/wmii.desktop
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/pcr/xrdp/PKGBUILD b/pcr/xrdp/PKGBUILD
new file mode 100644
index 000000000..1cf561115
--- /dev/null
+++ b/pcr/xrdp/PKGBUILD
@@ -0,0 +1,41 @@
+# Maintainer: Tomasz Zok <tomasz.zok [at] gmail.com>
+# Maintainer: techryda <techryda at silentdome dot com>
+# Contributor: Mathias R. <pu154r@overlinux.org>
+# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
+
+pkgname=xrdp
+pkgver=0.6.1
+pkgrel=1
+pkgdesc="An open source remote desktop protocol (RDP) server"
+url="http://xrdp.sourceforge.net/"
+arch=('i686' 'x86_64' 'armv6h')
+license=('GPL')
+depends=('tigervnc')
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-v$pkgver.tar.gz"
+ 'xrdp.service'
+ 'xrdp-sesman.service')
+md5sums=('26099c6588943262023607c1b4e774d8'
+ '0cb760b3e8a34f9bdf4daa871444d74c'
+ '58eb44bdc7ca5bb436d6fd66826f9b0f')
+
+prepare() {
+ cd "${pkgname}-v${pkgver}"
+ # Fix path in xrdp.sh file
+ sed -i 's|/usr/local/sbin|/usr/bin|' instfiles/xrdp.sh
+}
+
+build() {
+ cd "${pkgname}-v${pkgver}"
+ ./bootstrap
+ ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin
+ make
+}
+
+package() {
+ cd "${pkgname}-v${pkgver}"
+ make DESTDIR="$pkgdir" install
+ cd ${pkgdir}
+ # Install systemd service files
+ mkdir -p usr/lib/systemd/system
+ cp ${srcdir}/*.service usr/lib/systemd/system
+}
diff --git a/pcr/xrdp/xrdp-sesman.service b/pcr/xrdp/xrdp-sesman.service
new file mode 100644
index 000000000..8222069b9
--- /dev/null
+++ b/pcr/xrdp/xrdp-sesman.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=xrdp session manager
+After=syslog.target network.target
+StopWhenUnneeded=true
+
+[Service]
+Type=forking
+PIDFile=/var/run/xrdp-sesman.pid
+EnvironmentFile=/etc/xrdp/xrdp.ini
+ExecStart=/usr/bin/xrdp-sesman $SESMAN_OPTIONS
+ExecStop=/usr/bin/xrdp-sesman $SESMAN_OPTIONS --kill
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/pcr/xrdp/xrdp.service b/pcr/xrdp/xrdp.service
new file mode 100644
index 000000000..269dff87b
--- /dev/null
+++ b/pcr/xrdp/xrdp.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=xrdp daemon
+Requires=xrdp-sesman.service
+After=syslog.target network.target xrdp-sesman.service
+
+[Service]
+Type=forking
+PIDFile=/var/run/xrdp.pid
+EnvironmentFile=/etc/xrdp/xrdp.ini
+ExecStart=/usr/bin/xrdp $XRDP_OPTIONS
+ExecStop=/usr/bin/xrdp $XRDP_OPTIONS --kill
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index f6aeb166c..96a493b25 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,13 +5,14 @@
pkgname=youtube-dl-current
_pkgname=youtube-dl
provides=(youtube-dl)
-pkgver=2013.11.03
+pkgver=2013.12.26
pkgrel=1
pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
arch=('any')
url="http://rg3.github.io/youtube-dl/"
license=('custom')
-depends=('python')
+depends=('python' 'python-setuptools')
+optdepends=('ffmpeg: for video post-processing')
makedepends=('python-distribute')
source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
@@ -27,5 +28,5 @@ package() {
"${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
}
-md5sums=('62e49076cb5e67233b3a8a8df9c8c0e8'
+md5sums=('ae343ec6785e6bed333aa2fe2eaed31c'
'SKIP')
diff --git a/~drtan/parabola-artwork/PKGBUILD b/~drtan/parabola-artwork/PKGBUILD
new file mode 100644
index 000000000..bbb6337aa
--- /dev/null
+++ b/~drtan/parabola-artwork/PKGBUILD
@@ -0,0 +1,18 @@
+# Maintainer: Drtan Samos <lashdu@drtan.twilightparadox.com>
+
+pkgname=parabola-artwork
+pkgver=1.0
+pkgrel=2
+pkgdesc="The artwork for Parabola GNU/Linux-libre."
+arch=('any')
+url="https://parabolagnulinux.org"
+license=('CCPL:cc-by-sa-3.0')
+source=("http://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}-${pkgver}-${pkgrel}.tar.gz")
+sha256sums=('9a20cd3e725adc89dc9165452919316c69331d10e2f6a278a810075c9f006e31')
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}-${pkgrel}"
+ install -d "${pkgdir}/usr/share/parabola/artwork"
+ install -m644 *.bmp "${pkgdir}/usr/share/parabola/artwork/"
+ install -m644 *.png "${pkgdir}/usr/share/parabola/artwork/"
+}
diff --git a/~drtan/parabola-gnome/PKGBUILD b/~drtan/parabola-gnome/PKGBUILD
new file mode 100644
index 000000000..c0f9d3e97
--- /dev/null
+++ b/~drtan/parabola-gnome/PKGBUILD
@@ -0,0 +1,19 @@
+# Maintainer: Drtan Samos <lashdu@drtan.twilightparadox.com>
+
+pkgname=parabola-gnome
+pkgver=1.0
+pkgrel=4
+pkgdesc="The GNOME configuration for Parabola GNU/Linux-libre"
+arch=('any')
+url="https://parabolagnulinux.org"
+license=('GPL3')
+install=$pkgname.install
+depends=('dbus-glib' 'parabola-artwork>=1.0-2')
+source=('parabola.xml')
+sha256sums=('7d9e3d67663f5b8f1ce9edf47bd74e3ea70d3a33c37318d08f5939a75b9efb23')
+
+package() {
+ install -d "${pkgdir}/usr/share/gnome-background-properties"
+ install -m644 parabola.xml "${pkgdir}/usr/share/gnome-background-properties/"
+}
+
diff --git a/~drtan/parabola-gnome/parabola-gnome.install b/~drtan/parabola-gnome/parabola-gnome.install
new file mode 100644
index 000000000..8d87c609a
--- /dev/null
+++ b/~drtan/parabola-gnome/parabola-gnome.install
@@ -0,0 +1,29 @@
+post_install() {
+ # Change default wallpaper
+ dbus-launch gsettings set org.gnome.desktop.background picture-uri file:///usr/share/parabola/artwork/stripes.png
+ dbus-launch gsettings set org.gnome.desktop.background picture-options zoom
+
+ # Change default lock screen wallpaper.
+ dbus-launch gsettings set org.gnome.desktop.screensaver picture-uri file:///usr/share/parabola/artwork/stripes-desaturated.png
+ dbus-launch gsettings set org.gnome.desktop.screensaver picture-options zoom
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ # Reset default wallpaper to default for GNOME (if the user didn't choose some other).
+ if [ $(dbus-launch gsettings get org.gnome.desktop.background picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ]
+ then
+ dbus-launch gsettings reset org.gnome.desktop.background picture-uri
+ dbus-launch gsettings reset org.gnome.desktop.background picture-options
+ fi
+
+ # Reset default lock screen wallpaper to default for GNOME (if the user didn't choose some other).
+ if [ $(dbus-launch gsettings get org.gnome.desktop.screensaver picture-uri) == "file:///usr/share/parabola/artwork/stripes.png" ]
+ then
+ dbus-launch gsettings reset org.gnome.desktop.screensaver picture-uri
+ dbus-launch gsettings reset org.gnome.desktop.screensaver picture-options
+ fi
+}
diff --git a/~drtan/parabola-gnome/parabola.xml b/~drtan/parabola-gnome/parabola.xml
new file mode 100644
index 000000000..ca0b5f9ff
--- /dev/null
+++ b/~drtan/parabola-gnome/parabola.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+ <wallpaper deleted="false">
+ <name>Stripes</name>
+ <filename>/usr/share/parabola/wallpapers/stripes.png</filename>
+ <options>zoom</options>
+ <pcolor>#ffffff</pcolor>
+ <scolor>#ffffff</scolor>
+ <shade_type>solid</shade_type>
+ </wallpaper>
+ <wallpaper deleted="false">
+ <name>Stripes Desaturated</name>
+ <filename>/usr/share/parabola/wallpapers/stripes-desaturated.png</filename>
+ <options>zoom</options>
+ <pcolor>#ffffff</pcolor>
+ <scolor>#ffffff</scolor>
+ <shade_type>solid</shade_type>
+ </wallpaper>
+</wallpapers>
diff --git a/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch b/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch
deleted file mode 100644
index 8806fe849..000000000
--- a/~lukeshu/freeglut26/2.6.0-GFX_radeon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: src/freeglut_window.c
-===================================================================
---- src/freeglut_window.c (Revision 832)
-+++ src/freeglut_window.c (Arbeitskopie)
-@@ -594,10 +594,9 @@
- #if TARGET_HOST_POSIX_X11
- if ( window )
- {
-- glXMakeContextCurrent(
-+ glXMakeCurrent(
- fgDisplay.Display,
- window->Window.Handle,
-- window->Window.Handle,
- window->Window.Context
- );
-
-@@ -932,10 +932,9 @@
- XSetWMProtocols( fgDisplay.Display, window->Window.Handle,
- &fgDisplay.DeleteWindow, 1 );
-
-- glXMakeContextCurrent(
-+ glXMakeCurrent(
- fgDisplay.Display,
- window->Window.Handle,
-- window->Window.Handle,
- window->Window.Context
- );
-
diff --git a/~lukeshu/freeglut26/PKGBUILD b/~lukeshu/freeglut26/PKGBUILD
deleted file mode 100644
index 25569e60d..000000000
--- a/~lukeshu/freeglut26/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (Arch): Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-_pkgname=freeglut
-pkgname=freeglut26
-pkgver=2.6.0
-pkgrel=2
-pkgdesc="Provides functionality for small OpenGL programs"
-arch=('i686' 'x86_64')
-url="http://freeglut.sourceforge.net/"
-license=('MIT')
-depends=('libxxf86vm' 'mesa' 'libxi')
-replaces=('glut')
-provides=('glut')
-conflicts=('glut')
-provides+=("$_pkgname=$pkgver")
-options=('!libtool')
-source=(http://downloads.sourceforge.net/freeglut/${_pkgname}-${pkgver}.tar.gz \
- 2.6.0-GFX_radeon.patch)
-md5sums=('39f0f2de89f399529d2b981188082218' '6d0a018fe4f0bc9ace2b244ca59514d3')
-sha1sums=('68306c4486c13d005a4e4d54035e0c0b1bdc220b' '2e392c7d0b60016ec89e6a5edf504f5722351b95')
-
-build() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- # fixes an issue with the radeon[hd] ATI opensource drivers
- # ref: http://bugs.gentoo.org/show_bug.cgi?id=295163
- patch -p0 -i "${srcdir}/2.6.0-GFX_radeon.patch"
-
- ./autogen.sh
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-}
diff --git a/~lukeshu/kdeutils-ark-unarchiver/PKGBUILD b/~lukeshu/kdeutils-ark-unarchiver/PKGBUILD
deleted file mode 100644
index b016b15bf..000000000
--- a/~lukeshu/kdeutils-ark-unarchiver/PKGBUILD
+++ /dev/null
@@ -1,184 +0,0 @@
-# $Id: PKGBUILD 141878 2011-11-02 18:15:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname='kdeutils-ark-unarchiver'
-pkgver=4.7.3
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
- 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
- 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'add-ark-cliunarchiverplugin.patch')
-sha1sums=('23fc9823647152d5d8cc250a55402c8930db4059'
- '134c0ff9be6ffccd896bd590182c21d117f07991')
-
-build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
-
- patch -p0 -i "${srcdir}"/add-ark-cliunarchiverplugin.patch
-
- # Use Python2
- sed -i 's|/usr/bin/python|/usr/bin/python2|' \
- kcharselect/kcharselect-generate-datafile.py \
- superkaramba/examples/richtext/rtext.py
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
- printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package_kdeutils-ark-unarchiver() {
- pkgdesc='Archiving Tool'
- depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
- optdepends=('p7zip' 'zip' 'unzip' 'unrar' 'unarchiver')
- provides=('kdeutils-ark')
- url="http://kde.org/applications/utilities/ark/"
- cd $srcdir/build/ark
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ark/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
- pkgdesc='View disk usage information'
- depends=('kdebase-runtime' 'qimageblitz')
- replaces=('filelight')
- conflicts=('filelight')
- install='kdeutils.install'
- url="http://methylblue.com/filelight/"
- cd $srcdir/build/filelight
- make DESTDIR=$pkgdir install
- cd $srcdir/build/filelight/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
- pkgdesc='Scientific Calculator'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kcalc/"
- cd $srcdir/build/kcalc
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kcalc/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
- pkgdesc='Character Selector'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kcharselect/"
- cd $srcdir/build/kcharselect
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kcharselect/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
- pkgdesc='View Disk Usage'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/kdiskfree/"
- install='kdeutils.install'
- cd $srcdir/build/kdf
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kdf/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
- pkgdesc='Floppy Formatter'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kfloppy/"
- install='kdeutils.install'
- cd $srcdir/build/kfloppy
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kfloppy/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
- pkgdesc='A GnuPG frontend'
- depends=('kdepim-runtime' 'kde-agent')
- url="http://kde.org/applications/utilities/kgpg"
- install='kdeutils.install'
- cd $srcdir/build/kgpg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kgpg/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
- pkgdesc='Configure your remote controls for use with applications'
- replaces=('kdeutils-kdelirc')
- conflicts=('kdeutils-kdelirc')
- depends=('kdebase-workspace')
- url="http://kde.org/applications/utilities/kremotecontrol"
- install='kdeutils.install'
- cd $srcdir/build/kremotecontrol
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kremotecontrol/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
- pkgdesc='Countdown Launcher'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/ktimer"
- install='kdeutils.install'
- cd $srcdir/build/ktimer
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ktimer/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
- pkgdesc='Wallet Management Tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/kwalletmanager/"
- install='kdeutils.install'
- cd $srcdir/build/kwallet
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kwallet/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
- pkgdesc='System tray icon for managing print jobs'
- depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
- url="http://kde.org/applications/system/printerapplet/"
- cd $srcdir/build/printer-applet
- make DESTDIR=$pkgdir install
- cd $srcdir/build/printer-applet/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-superkaramba() {
- pkgdesc='An engine for cool desktop eyecandy'
- depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
- url="http://kde.org/applications/utilities/superkaramba"
- install='kdeutils.install'
- cd $srcdir/build/superkaramba
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
- pkgdesc='System Cleaner'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/sweeper/"
- cd $srcdir/build/sweeper
- make DESTDIR=$pkgdir install
- cd $srcdir/build/sweeper/doc
- make DESTDIR=$pkgdir install
-}
diff --git a/~lukeshu/kdeutils-ark-unarchiver/add-ark-cliunarchiverplugin.patch b/~lukeshu/kdeutils-ark-unarchiver/add-ark-cliunarchiverplugin.patch
deleted file mode 100644
index 039d725b4..000000000
--- a/~lukeshu/kdeutils-ark-unarchiver/add-ark-cliunarchiverplugin.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-Index: ark/plugins/CMakeLists.txt
-===================================================================
---- ark/plugins/CMakeLists.txt (revision 1237729)
-+++ ark/plugins/CMakeLists.txt (working copy)
-@@ -14,6 +14,7 @@
- endif (LIBARCHIVE_FOUND)
-
- add_subdirectory( clirarplugin )
-+add_subdirectory( cliunarchiverplugin )
- add_subdirectory( cli7zplugin )
- add_subdirectory( clizipplugin )
- add_subdirectory( libsinglefileplugin )
-Index: ark/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop
-===================================================================
---- ark/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop (revision 0)
-+++ ark/plugins/cliunarchiverplugin/kerfuffle_cliunarchiver.desktop (revision 0)
-@@ -0,0 +1,15 @@
-+[Desktop Entry]
-+Type=Service
-+X-KDE-ServiceTypes=Kerfuffle/Plugin
-+X-KDE-Library=kerfuffle_cliunarchiver
-+X-KDE-PluginInfo-Author=Luke Shumaker
-+X-KDE-PluginInfo-Email=lukeshu@sbcglobal.net
-+X-KDE-PluginInfo-Name= kerfuffle_cliunarchiver
-+X-KDE-PluginInfo-Version=0.0.1
-+X-KDE-PluginInfo-Website=http://www.kde.org
-+X-KDE-PluginInfo-License=GPLv2+
-+X-KDE-Priority=150
-+X-KDE-Kerfuffle-APIRevision=1
-+X-KDE-Kerfuffle-ReadWrite=true
-+Name=The Unarchiver plugin
-+MimeType=application/x-rar;
-Index: ark/plugins/cliunarchiverplugin/cliplugin.cpp
-===================================================================
---- ark/plugins/cliunarchiverplugin/cliplugin.cpp (revision 0)
-+++ ark/plugins/cliunarchiverplugin/cliplugin.cpp (revision 0)
-@@ -0,0 +1,172 @@
-+/*
-+ * ark -- archiver for the KDE project
-+ *
-+ * Copyright (C) 2011 Luke Shumaker <lukeshu@sbcglobal.net>
-+ *
-+ * 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, Fifth Floor, Boston, MA 02110-1301, USA.
-+ *
-+ */
-+
-+#include "kerfuffle/cliinterface.h"
-+#include "kerfuffle/kerfuffle_export.h"
-+
-+#include <KDebug>
-+
-+#include <QDateTime>
-+#include <QDir>
-+#include <QRegExp>
-+#include <QString>
-+#include <QStringList>
-+
-+using namespace Kerfuffle;
-+
-+class CliPlugin: public CliInterface
-+{
-+public:
-+ explicit CliPlugin(QObject *parent, const QVariantList & args)
-+ : CliInterface(parent, args) {
-+ m_indentLevel = 0;
-+ }
-+
-+ virtual ~CliPlugin() {
-+ }
-+
-+ virtual ParameterList parameterList() const {
-+ static ParameterList p;
-+ if (p.isEmpty()) {
-+ /* As I'm writing this, I'm noticing that unar is quite limited.
-+ * The following limitations are used to tag unused bits of code:
-+ * 01 - cannot extract just one file from the archive
-+ * 02 - overwrites existing files without prompt
-+ * 03 - cannot edit archives
-+ * 04 - if a wrong password is given, it fails (usually segfaults)
-+ * without telling what went wrong
-+ */
-+
-+ ///////////////[ COMMON ]/////////////
-+
-+ p[CaptureProgress] = false;
-+ //p[PasswordPromptPattern] =
-+
-+ ///////////////[ LIST ]/////////////
-+
-+ p[ListProgram] = "lsar";
-+ p[ListArgs] = QStringList() << "-json" << "$Archive";
-+
-+ ///////////////[ EXTRACT ]/////////////
-+
-+ p[ExtractProgram] = "unar";
-+ p[ExtractArgs] = QStringList() << "$PasswordSwitch" << "$Archive";
-+ //p[NoTrailingSlashes] = // limitation: 01
-+ //p[PreservePathSwitch] = // limitation: 01
-+ //p[NoTrailingSlashes] = // limitation: 01
-+ //p[RootNodeSwitch] = // limitation: 01
-+ p[PasswordSwitch] = QStringList() << "-p $Password";
-+ p[FileExistsExpression] = "some regexp that nothing will ever _ever_ match"; // limitation: 02
-+ //p[FileExistsMode] = // limitation: 02
-+ //p[FileExistsInput] = // limitation: 02
-+
-+ ///////////////[ DELETE ]/////////////
-+
-+ p[DeleteProgram] = "x-fakeprogram"; // limitation: 03
-+ //p[DeleteArgs] = // limitation: 03
-+
-+ ///////////////[ ADD ]/////////////
-+
-+ p[AddProgram] = "x-fakeprogram"; // limitation: 03
-+ //p[AddArgs] = // limitation: 03
-+
-+ ///////////////[ ERRORS ]/////////////
-+
-+ p[ExtractionFailedPatterns] = QStringList()
-+ << "Failed! \\((.+)\\)$"
-+ << "Segmentation fault$"; // Why is this so common!?
-+
-+ p[WrongPasswordPatterns] = QStringList()
-+ //<< "Failed!" // limitation: 04
-+ << "\\.\\.\\. This archive requires a password to unpack\\. Use the -p option to provide one\\.$";
-+ }
-+ return p;
-+ }
-+
-+ QString m_entryFilename, m_internalId;
-+ ArchiveEntry m_currentEntry;
-+ int m_indentLevel;
-+
-+ bool readListLine(const QString &line) {
-+ /* lsar will give us JSON output. However, we actually parse based on
-+ * the indentation. Ugly, I know, but
-+ * 1. It's easier
-+ * 2. lsar's JSON is invalid JSON, so actual parsers bork.
-+ */
-+
-+ int spaces;
-+ for(spaces=0;(spaces<line.size())&&(line[spaces]==QChar(' '));spaces++){}
-+ // Since this is so ugly anyway, I'm not even going to check to
-+ // make sure that spaces is even. I mean, what would I do about it?
-+ int m_newIndentLevel = spaces/2;
-+
-+ if (m_newIndentLevel>m_indentLevel) {
-+ if (m_newIndentLevel==3) {
-+ m_currentEntry.clear();
-+ m_currentEntry[IsDirectory] = false;
-+ }
-+ } else if (m_newIndentLevel<m_indentLevel) {
-+ if ( (m_newIndentLevel<3) && (m_indentLevel>=3) ) {
-+ EntryMetaDataType index = IsDirectory;
-+ if (m_currentEntry[index].toBool()) {
-+ m_currentEntry[FileName].toString().append(QString("/"));
-+ }
-+ kDebug() << "Added entry:" << m_currentEntry;
-+ entry(m_currentEntry);
-+ }
-+ }
-+ m_indentLevel = m_newIndentLevel;
-+
-+ QRegExp rx("^\\s*\"([^\"]*)\": (.*),$");
-+ if (rx.indexIn(line) >= 0) {
-+ QRegExp rx_unquote("^\"(.*)\"$");
-+ QString key = rx.cap(1);
-+ QString value = rx.cap(2);
-+
-+ if (false) {
-+ } else if (key=="XADFileName") {
-+ rx_unquote.indexIn(value);
-+ m_currentEntry[FileName] = m_currentEntry[InternalID] = rx_unquote.cap(1);
-+ } else if (key=="XADFileSize") {
-+ m_currentEntry[Size] = value.toInt();
-+ } else if (key=="XADCompressedSize") {
-+ m_currentEntry[CompressedSize] = value.toInt();
-+ } else if (key=="XADLastModificationDate") {
-+ QDateTime ts(QDate::fromString(value, "\"YYYY-MM-DD hh:mm:ss"));
-+ m_currentEntry[Timestamp] = ts;
-+ } else if (key=="XADIsDirectory") {
-+ m_currentEntry[IsDirectory] = (value=="1");
-+ } else if (key=="RARCRC32") {
-+ m_currentEntry[CRC] = value.toInt();
-+ } else if (key=="RARCompressionMethod") {
-+ m_currentEntry[Method] = value.toInt();
-+ } else if (key=="Encrypted") {
-+ m_currentEntry[IsPasswordProtected] = (value.toInt() != 0);
-+ }
-+ // TODO: add RAR version. ([Version])
-+ }
-+
-+ return true;
-+ }
-+};
-+
-+KERFUFFLE_EXPORT_PLUGIN(CliPlugin)
-+
-Index: ark/plugins/cliunarchiverplugin/CMakeLists.txt
-===================================================================
---- ark/plugins/cliunarchiverplugin/CMakeLists.txt (revision 0)
-+++ ark/plugins/cliunarchiverplugin/CMakeLists.txt (revision 0)
-@@ -0,0 +1,21 @@
-+
-+include_directories(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/../..
-+ ${CMAKE_CURRENT_BINARY_DIR}/../..
-+ )
-+
-+########### next target ###############
-+
-+set(kerfuffle_cliunarchiver_SRCS cliplugin.cpp)
-+
-+kde4_add_plugin(kerfuffle_cliunarchiver ${kerfuffle_cliunarchiver_SRCS})
-+
-+target_link_libraries(kerfuffle_cliunarchiver ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} kerfuffle )
-+
-+
-+
-+########### install files ###############
-+
-+install(TARGETS kerfuffle_cliunarchiver DESTINATION ${PLUGIN_INSTALL_DIR} )
-+install( FILES kerfuffle_cliunarchiver.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-+
diff --git a/~lukeshu/kdeutils-ark-unarchiver/kdeutils.install b/~lukeshu/kdeutils-ark-unarchiver/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/~lukeshu/kdeutils-ark-unarchiver/kdeutils.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/~lukeshu/libdwarf/PKGBUILD b/~lukeshu/libdwarf/PKGBUILD
deleted file mode 100644
index 591b92633..000000000
--- a/~lukeshu/libdwarf/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# Maintainer: Marti Raudsepp <marti@juffo.org>
-
-pkgname=libdwarf
-pkgver=20111214
-pkgrel=1
-pkgdesc="Static library for handling DWARF Debugging Information Format"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-url="http://reality.sgiweb.org/davea/dwarf.html"
-depends=('elfutils' 'gcc-libs')
-makedepends=('libelf')
-source=(http://reality.sgiweb.org/davea/$pkgname-$pkgver.tar.gz)
-
-build() {
- cd $srcdir/dwarf-$pkgver/libdwarf
- ./configure
- make
-
- # dwarfdump
- cd $srcdir/dwarf-$pkgver/dwarfdump2
- ./configure --prefix=/usr CFLAGS=-I../libdwarf CXXFLAGS=-I../libdwarf LDFLAGS=-L../libdwarf
- # disable parallelization; -j5 build fails ~20% of the time on my machine
- make -j1
-}
-
-package() {
- cd $srcdir/dwarf-$pkgver/libdwarf
-
- install -d $pkgdir/usr/lib
- install -m 644 libdwarf.a $pkgdir/usr/lib
-
- install -d $pkgdir/usr/include/libdwarf
- install dwarf.h libdwarf.h $pkgdir/usr/include/libdwarf
-
- install -dm 755 $pkgdir/usr/share/doc/$pkgname
- install README NEWS *.pdf $pkgdir/usr/share/doc/$pkgname
-
- # dwarfdump
- cd $srcdir/dwarf-$pkgver/dwarfdump2
- install -Dm755 dwarfdump $pkgdir/usr/bin/dwarfdump
- install -Dm644 dwarfdump.1 $pkgdir/usr/share/man/man1/dwarfdump.1
- install -Dm644 dwarfdump.conf $pkgdir/usr/lib/dwarfdump.conf
-}
-md5sums=('573b49b94e38a0e65ff337768f003d33')
diff --git a/~lukeshu/md/PKGBUILD b/~lukeshu/md/PKGBUILD
deleted file mode 100644
index 7f74aaa2c..000000000
--- a/~lukeshu/md/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=("md" "emacs-mdmua")
-pkgver=0.81
-pkgrel=4
-arch=('any')
-url="https://github.com/nicferrier/$_pkgname"
-license=('GPL3')
-
-makedepends=(python-distribute)
-
-#__gitbranch=1d69744 # This is the commit that is 0.81
-__gitbranch=455b6b4 # this is currently HEAD (has bugfixes)
-source=("nicferrier-md-${__gitbranch}.tar.gz::https://github.com/nicferrier/$pkgname/tarball/${__gitbranch}")
-
-build() {
- cd "${srcdir}/nicferrier-md-${__gitbranch}"
-
- # fix typo
- sed -i 's/pyprofyfs/pyproxyfs/' setup.py
-}
-
-package_md() {
- pkgdesc="A maildir client and library."
- depends=('python' 'python-pyproxyfs')
-
- cd "${srcdir}/nicferrier-md-${__gitbranch}"
- python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-package_emacs-mdmua() {
- pkgdesc="An Emacs mail user agent (MUA) build around md."
- pkgver='0.72'
- depends=("md=0.81" 'emacs>=24')
-
- cd "${srcdir}/nicferrier-md-${__gitbranch}"
- cd useragents/emacs
- install -d ${pkgdir}/usr/share/emacs/site-lisp
- install -m 644 *.el ${pkgdir}/usr/share/emacs/site-lisp
-}
-
-md5sums=('452727348df2f51d7eddade709aceb1c')
diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD
deleted file mode 100644
index 885e06f0e..000000000
--- a/~lukeshu/not-working/codeanalyst/PKGBUILD
+++ /dev/null
@@ -1,91 +0,0 @@
-# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Maintainer (AUR): Felipe Bugno <capent@yahoo.com>
-
-# A note about the oprofile fork:
-# The docs claim that the fork is just for adding support for
-# processors that aren't upstream yet (at the time, they are now that
-# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well:
-# * AMD also added a bunch of CodeAnalyst-specific code.
-# * Several external variables/types have different names; the API is
-# incompatible.
-# * [extra]/oprofile-0.9.7-3 only includes about half of the headers.
-
-pkgbase=CodeAnalyst
-pkgname=(codeanalyst codeanalyst-cakm)
-pkgver=3.3.18.0361
-_pkgver="${pkgver//./_}"
-pkgrel=4.1
-pkgdesc="AMD performance profiler. Includes a fork of oprofile."
-url="http://developer.amd.com/tools/${pkgbase}/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gcc' 'qt>=4.1' 'libdwarf')
-makedepends=('linux-headers' 'elfutils' 'findutils' 'file')
-options=('!strip')
-install=codeanalyst.install
-source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz"
- 'gcc47.patch'
- 'skipSetup.patch'
- 'kernel3.4.patch'
- 'codeanalyst.sudo'
- 'codeanalyst.desktop'
- 'codeanalyst.svg')
-
-build() {
- build_codeanalyst
- build_codeanalyst-cakm
-}
-
-build_codeanalyst() {
- cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
- patch -Np1 -i "${srcdir}/gcc47.patch"
- patch -Np1 -i "${srcdir}/skipSetup.patch"
- rm -rf src/dwarf-* # easiest way to ensure using the system install
-
- ./autogen.sh
- ./configure --prefix=/usr \
- --with-libdwarf-includes=/usr/include/libdwarf \
- --with-libdwarf-libraries=/usr/lib
- make
-}
-
-build_codeanalyst-cakm() {
- cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm
- cp -r kernel2.6.38 kernel3.4
- cd kernel3.4
- patch -Np1 -i "${srcdir}/kernel3.4.patch"
- make
-}
-
-package_codeanalyst() {
- provides=('oprofile=0.9.6cvs')
- conflicts=('oprofile')
-
- cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
- make DESTDIR="${pkgdir}" install
- rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial
-
- find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip
-
- cd "${srcdir}"
- install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst"
- install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg"
- install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop"
-}
-
-package_codeanalyst-cakm() {
- pkgdesc="CodeAnalyst kernel module, oprofile-ca.ko, a replacement for oprofile.ko"
- depends=(codeanalyst)
- provides=()
-
- cd "${srcdir}/${pkgbase}-${_pkgver}-Public"/src/cakm/kernel3.4
- install -D -m644 oprofile.ko "${pkgdir}/lib/modules/`uname -r`/kernel/arch/x86/oprofile/oprofile-ca.ko"
-}
-
-md5sums=('f1e29bc7c7da259df228ce59281ee1d7'
- '063d0fc9680641a92ce5e310ffe1c9c0'
- 'ce549e59c4a5916fd19e8d085e863627'
- '3a5d820a43a0360d561bb0c4d67d9735'
- '3cc8f64fe84c5a886d0172ee8d99f690'
- '3a18d3f7fb01f199a8ed5ae2908c18e4'
- '1822a4157b82904b82e72fc1e9bcbd42')
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop b/~lukeshu/not-working/codeanalyst/codeanalyst.desktop
deleted file mode 100644
index 56d54f884..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=AMD CodeAnalyst
-Comment=AMD profiler and performance analyzer
-Exec=/usr/bin/CodeAnalyst
-Icon=codeanalyst
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Development;
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.install b/~lukeshu/not-working/codeanalyst/codeanalyst.install
deleted file mode 100644
index 6ed1ac841..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.install
+++ /dev/null
@@ -1,29 +0,0 @@
-post_install() {
- getent group amdca &>/dev/null || groupadd amdca &>/dev/null
- echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group"
- echo " ie: gpasswd -a USERNAME amdca"
-
- chown root:amdca /usr/bin/calog_report
- chown root:amdca /usr/bin/capackage.sh
- chown root:amdca /usr/bin/careport.sh
- chown root:amdca /usr/bin/cgreport
- chown root:amdca /usr/bin/CodeAnalyst
- chown root:amdca /usr/bin/opannotate
- chown root:amdca /usr/bin/oparchive
- chown root:amdca /usr/bin/opcontrol
- chown root:amdca /usr/bin/opgprof
- chown root:amdca /usr/bin/ophelp
- chown root:amdca /usr/bin/opimport
- chown root:amdca /usr/bin/opjitconv
- chown root:amdca /usr/bin/opreport
- chown root:amdca /usr/bin/oprofiled
- chown root:amdca /usr/sbin/ca_oprofile_controller
- #chown root:amdca /usr/sbin/ca_user_manager
-
- update-desktop-database -q
-}
-
-post_remove() {
- getent group amdca &>/dev/null && groupdel amdca &>/dev/null
- update-desktop-database -q
-}
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo b/~lukeshu/not-working/codeanalyst/codeanalyst.sudo
deleted file mode 100644
index 1c3173bdb..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.sudo
+++ /dev/null
@@ -1 +0,0 @@
-%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller
diff --git a/~lukeshu/not-working/codeanalyst/codeanalyst.svg b/~lukeshu/not-working/codeanalyst/codeanalyst.svg
deleted file mode 100644
index 8febf725b..000000000
--- a/~lukeshu/not-working/codeanalyst/codeanalyst.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
-
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- version="1.1"
- id="Layer_1"
- width="286.95001"
- height="286.95001"
- viewBox="0 0 286.95063 286.95"
- overflow="visible"
- enable-background="new 0 0 1368.987 286.954"
- xml:space="preserve"
- inkscape:version="0.48.3.1 r9886"
- sodipodi:docname="AMD_Logo.svg"
- style="overflow:visible"><metadata
- id="metadata17"><rdf:RDF><cc:Work
- rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
- id="defs15" /><sodipodi:namedview
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="1028"
- id="namedview13"
- showgrid="false"
- inkscape:zoom="2.11"
- inkscape:cx="163.32315"
- inkscape:cy="145.21584"
- inkscape:window-x="-4"
- inkscape:window-y="-3"
- inkscape:window-maximized="1"
- inkscape:current-layer="Layer_1" />
-<polyline
- points="1165.47,92.779 1165.39,203.495 1281.63,203.513 1198.44,286.826 1081.79,286.954 1080.38,176.065 1165.47,92.779"
- id="polyline3"
- style="fill:#009a66"
- transform="translate(-1082.0371,1.8496035e-4)" />
-<polyline
- points="1165.39,84.082 1285.07,83.854 1284.83,202.972 1368.99,286.954 1368.75,0.12 1081.79,0 1165.39,84.082"
- id="polyline5"
- style="fill:#009a66"
- transform="translate(-1082.0371,1.8496035e-4)" />
-
-
-
-</svg> \ No newline at end of file
diff --git a/~lukeshu/not-working/codeanalyst/gcc47.patch b/~lukeshu/not-working/codeanalyst/gcc47.patch
deleted file mode 100644
index dfec4a0c4..000000000
--- a/~lukeshu/not-working/codeanalyst/gcc47.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am 2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am 2012-04-22 17:55:01.227439003 -0300
-***************
-*** 25,31 ****
- cgcvt.cpp
-
-
-! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@
-
- AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
- $(FLAG64) -Wno-unused -Wno-parentheses \
---- 25,31 ----
- cgcvt.cpp
-
-
-! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@
-
- AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
- $(FLAG64) -Wno-unused -Wno-parentheses \
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp 2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp 2012-04-22 17:38:14.884058192 -0300
-***************
-*** 17,22 ****
---- 17,23 ----
- */
-
- #include <qtooltip.h>
-+ #include <unistd.h>
-
- #include "MonitorDockView.h"
-
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp 2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp 2012-04-22 17:34:45.670714989 -0300
-***************
-*** 21,26 ****
---- 21,27 ----
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+ #include <unistd.h>
-
- #include "dwarfengine.h"
- #define DWARF_DEBUG 0
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp 2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp 2012-04-22 17:32:30.780708624 -0300
-***************
-*** 29,34 ****
---- 29,35 ----
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <time.h>
-+ #include <unistd.h>
-
- // CodeAnalyst headers
- #include "CaProfileWriter.h"
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp 2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp 2012-04-22 17:26:58.424026278 -0300
-***************
-*** 13,18 ****
---- 13,19 ----
- #include <sys/ipc.h>
- #include <sys/sem.h>
- #include <sys/stat.h>
-+ #include <unistd.h>
-
- #include "slock.h"
- #include "smm.h"
diff --git a/~lukeshu/not-working/codeanalyst/kernel3.4.patch b/~lukeshu/not-working/codeanalyst/kernel3.4.patch
deleted file mode 100644
index 589abc800..000000000
--- a/~lukeshu/not-working/codeanalyst/kernel3.4.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ru kernel2.6.38/Makefile kernel3.4/Makefile
---- kernel2.6.38/Makefile 2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/Makefile 2012-07-11 11:32:27.000000000 -0400
-@@ -1,6 +1,6 @@
- TARGET = oprofile.ko
-
--MDIR = $(if $(shell uname -m | grep x86_64),arch/x86/oprofile,arch/x86/oprofile)
-+MDIR = arch/x86/oprofile
-
- DRIVER_OBJS = oprof.o cpu_buffer.o buffer_sync.o \
- event_buffer.o oprofile_files.o \
-@@ -16,7 +16,8 @@
- CURRENT = $(shell uname -r)
- ARCH = $(if $(shell uname -m | grep x86_64),64,32)
- KERN_ARCH = $(if $(shell uname -m | grep x86_64),x86_64,i386)
--KDIR = /lib/modules/$(CURRENT)/build
-+SYS_KDIR = /lib/modules/$(CURRENT)/build
-+KDIR = $(PWD)/../build
- PWD = $(shell pwd)
- DEST = /lib/modules/$(CURRENT)/kernel/$(MDIR)
- USE_INTERNAL_ERRATA = $(if $(shell ls ../internal/errata.h 2> /dev/null),1,0)
-@@ -39,6 +40,8 @@
- all: default
-
- default:
-+ rm -rf $(KDIR)
-+ cp -r $(SYS_KDIR)/ $(KDIR)
- make -C $(KDIR) SUBDIRS=$(PWD) CFLAGS_MODULE+="-DMODULE -DUSE_INTERNAL_ERRATA=$(USE_INTERNAL_ERRATA)" modules ARCH=$(KERN_ARCH)
-
- install:
-@@ -52,13 +55,12 @@
-
- uninstall:
- @echo "... Restore original oprofile.ko."
-- @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET)
-+ @mv -v $(DEST)/$(TARGET).orig $(DEST)/$(TARGET)
-
- clean:
- rm -f *.o oprofile.ko .*.cmd .*.flags *.mod.c
-
- prebuild:
- cp $(TARGET) ../prebuilds/$(CURRENT)_$(ARCH).ko
--
-
---include $(KDIR)/Rules.make
-+-include $(SYS_KDIR)/Rules.make
-Only in kernel3.4/: modules.order
-Only in kernel3.4/: Module.symvers
-diff -ru kernel2.6.38/nmi_int.c kernel3.4/nmi_int.c
---- kernel2.6.38/nmi_int.c 2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/nmi_int.c 2012-07-11 11:32:27.000000000 -0400
-@@ -16,7 +16,6 @@
- #include <linux/notifier.h>
- #include <linux/smp.h>
- #include "oprofile.h"
--#include <linux/sysdev.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0)
- #include <linux/syscore_ops.h>
- #endif
-diff -ru kernel2.6.38/oprofilefs.c kernel3.4/oprofilefs.c
---- kernel2.6.38/oprofilefs.c 2012-04-13 01:41:43.000000000 -0400
-+++ kernel3.4/oprofilefs.c 2012-07-11 11:32:27.000000000 -0400
-@@ -244,7 +244,7 @@
- return -ENOMEM;
- root_inode->i_op = &simple_dir_inode_operations;
- root_inode->i_fop = &simple_dir_operations;
-- root_dentry = d_alloc_root(root_inode);
-+ root_dentry = d_make_root(root_inode);
- if (!root_dentry) {
- iput(root_inode);
- return -ENOMEM;
-Only in kernel3.4/: .tmp_versions
diff --git a/~lukeshu/not-working/codeanalyst/skipSetup.patch b/~lukeshu/not-working/codeanalyst/skipSetup.patch
deleted file mode 100644
index fdc9bf42f..000000000
--- a/~lukeshu/not-working/codeanalyst/skipSetup.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am 2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am 2012-04-22 20:44:07.437917684 -0300
-***************
-*** 8,19 ****
- # FIXME [3.0] diffgui \
- # $(CA_RELEASE_TYPE)
-
-! install-exec-hook:
-! @if test -e "scripts/Setup.sh"; then \
-! scripts/Setup.sh $(DESTDIR)$(prefix); \
-! fi
-
-! uninstall-hook:
-! @if test -e "scripts/Uninstall.sh"; then \
-! scripts/Uninstall.sh $(DESTDIR)$(prefix);\
-! fi
---- 8,19 ----
- # FIXME [3.0] diffgui \
- # $(CA_RELEASE_TYPE)
-
-! #install-exec-hook:
-! # @if test -e "scripts/Setup.sh"; then \
-! # scripts/Setup.sh $(DESTDIR)$(prefix); \
-! # fi
-
-! #uninstall-hook:
-! # @if test -e "scripts/Uninstall.sh"; then \
-! # scripts/Uninstall.sh $(DESTDIR)$(prefix);\
-! # fi
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am 2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am 2012-04-22 20:47:21.604593511 -0300
-***************
-*** 15,20 ****
- libCAJVMPIA_so_SOURCES = \
- jpa.cpp
-
-! install-exec-hook:
-! @/sbin/ldconfig
-
---- 15,20 ----
- libCAJVMPIA_so_SOURCES = \
- jpa.cpp
-
-! #install-exec-hook:
-! # @/sbin/ldconfig
-
-diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am
-*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am 2012-04-13 02:41:43.000000000 -0300
---- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am 2012-04-22 20:44:57.674586720 -0300
-***************
-*** 8,21 ****
- install-exec-hook:
- @if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
- install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
-- /sbin/ldconfig ;\
- fi
-
- uninstall-hook:
- @if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
- if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
- rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
-- /sbin/ldconfig ; \
- fi ; \
- fi
-
---- 8,19 ----
diff --git a/~lukeshu/pacman-vcsget/PKGBUILD b/~lukeshu/pacman-vcsget/PKGBUILD
deleted file mode 100644
index c23eabd3a..000000000
--- a/~lukeshu/pacman-vcsget/PKGBUILD
+++ /dev/null
@@ -1,100 +0,0 @@
-# vim: set ts=2 sw=2 et:
-# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Dave Reisner <dave@archlinux.org>
-
-_pkgname=pacman
-_basepath=parabola-pacman
-pkgname=$_pkgname-vcsget
-_relver=4.0.3
-#_gitver=f8fc16f
-_gitver=6082ed9d
-pkgver=${_relver}.git
-provides=($_pkgname=$pkgver)
-replaces=($_pkgname pacman-lukeshu)
-conflicts=($_pkgname pacman-lukeshu)
-
-pkgrel=1
-
-pkgdesc="A library-based package manager with dependency support (with vcsget)"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.archlinux.org/pacman/"
-license=('GPL')
-#groups=('base')
-depends=('bash' 'glibc>=2.15' 'libarchive>=3.0.2' 'curl>=7.19.4'
- 'gpgme' 'pacman-mirrorlist' 'archlinux-keyring' 'parabola-keyring')
-makedepends=('asciidoc')
-optdepends=('fakeroot: for makepkg usage as normal user')
-backup=(etc/pacman.conf etc/makepkg.conf)
-install=pacman.install
-options=(!libtool)
-source=(${_basepath}-${_gitver}.tar.gz::http://gitorious.org/parabola/pacman/archive-tarball/${_gitver}
- pacman.conf
- pacman.conf.x86_64
- pacman.conf.mips64el
- makepkg.conf)
-md5sums=('8c328c8f148f283656309fd4e2103178'
- '080d9f76f56e135cc62205874636aa0f'
- 'ce9943fc8086d491890565e91ea1a0d8'
- 'eb8dba9bd0b315230fbf0e5dc0a7335b'
- 'debc512689a1aa8c124fe0ccf27f5758')
-
-build() {
- cd $srcdir/$_basepath
-
- ./autogen.sh
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --enable-doc
- make
- make -C contrib
-}
-
-check() {
- make -C "$srcdir/$_basepath" check
-}
-
-package() {
- cd $srcdir/$_basepath
- make DESTDIR=$pkgdir install
-
- # install Arch specific stuff
- mkdir -p $pkgdir/etc
- case "$CARCH" in
- i686)
- install -m644 $srcdir/pacman.conf $pkgdir/etc/pacman.conf
- mycarch="i686"
- mychost="i686-pc-linux-gnu"
- myflags="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
- ;;
- x86_64)
- install -m644 $srcdir/pacman.conf.x86_64 $pkgdir/etc/pacman.conf
- mycarch="x86_64"
- mychost="x86_64-unknown-linux-gnu"
- myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu"
- ;;
- mips64el)
- install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf
- mycarch="mips64el"
- mychost="mips64el-unknown-linux-gnu"
- myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2"
- myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro"
- ;;
- esac
- install -m644 $srcdir/makepkg.conf $pkgdir/etc/
- # set things correctly in the default conf file
- sed -i $pkgdir/etc/makepkg.conf \
- -e "s|@CARCH[@]|$mycarch|g" \
- -e "s|@CHOST[@]|$mychost|g" \
- -e "s|@LDFLAGS[@]|$myldflags|g" \
- -e "s|@CARCHFLAGS[@]|$myflags|g"
-
- # install completion files
- install -Dm644 contrib/bash_completion "$pkgdir/usr/share/bash-completion/completions/pacman"
- for f in makepkg pacman-key; do
- ln -s pacman "$pkgdir/usr/share/bash-completion/completions/$f"
- done
-
- install -Dm644 contrib/zsh_completion $pkgdir/usr/share/zsh/site-functions/_pacman
-}
diff --git a/~lukeshu/python-pyproxyfs/PKGBUILD b/~lukeshu/python-pyproxyfs/PKGBUILD
deleted file mode 100644
index b24c5682a..000000000
--- a/~lukeshu/python-pyproxyfs/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=pyproxyfs
-pkgname=python-$_pkgname
-pkgver=0.8
-pkgrel=1
-pkgdesc="A proxy filesystem interface with a native filesystem implementation and a very simple test in-memory filesystem."
-arch=('any')
-url="https://github.com/nicferrier/$_pkgname"
-license=('GPL3')
-groups=()
-depends=('python')
-makedepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=(!emptydirs)
-install=
-source=("http://pypi.python.org/packages/source/P/PyProxyFS/PyProxyFS-0.8.tar.gz")
-
-package() {
- cd "${srcdir}/PyProxyFS-$pkgver"
- python setup.py install --root="$pkgdir/" --optimize=1
-}
-
-md5sums=('34f769e669877a9fdcfe5f8f93912b88')
diff --git a/~lukeshu/thingutils-git/PKGBUILD b/~lukeshu/thingutils-git/PKGBUILD
index d3d13925a..23683bc52 100644
--- a/~lukeshu/thingutils-git/PKGBUILD
+++ b/~lukeshu/thingutils-git/PKGBUILD
@@ -2,16 +2,20 @@
_pkgname=thingutils
pkgname=$_pkgname-git
+
+pkgver=20131203
+_gitver=aa2d5a3a4363ff4f4ca23f4c6716613c4be66ecd
+pkgdesc=""
+url="https://gitorious.org/thingutils"
+license=('MIT')
+
provides=($_pkgname)
conflicts=($_pkgname)
-pkgver=20120117
pkgrel=1
-pkgdesc=""
arch=('i686' 'x86_64')
-url="https://gitorious.org/thingutils"
-license=('MIT')
+
depends=(
- 'php' # roll, urldecode
+ 'php' # urldecode
'bash' # daemon, newegg, sysfiles
'emacs' # emacsmail, emacsterm, e
'wget' # whatismyip
@@ -21,36 +25,22 @@ depends=(
'wdiff' # chardiff
'acpi' # batterymon, tempmon
)
-makedepends=('git')
+makedepends=('go')
-_gitroot=https://git.gitorious.org/thingutils/thingutils.git
-_gitname=$_pkgname
+source=("libre://$pkgname-$pkgver.tar.gz")
+
+mkdepends=('git')
+mksource=("$pkgname-$pkgver::git://gitorious.org/$_pkgname/$_pkgname.git#commit=$_gitver")
+mkmd5sums=('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" "$_gitname"
- fi
-
- msg "GIT checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_gitname-build"
- git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
- cd "$srcdir/$_gitname-build"
-
- #
- # BUILD HERE
- #
+ cd "$srcdir/$pkgname-$pkgver"
make prefix=/usr
}
package() {
- cd "$srcdir/$_gitname-build"
+ cd "$srcdir/$pkgname-$pkgver"
make install prefix=/usr DESTDIR="$pkgdir"
}
+
+md5sums=('7991e689263698f3d9a6470184f97ed1')