diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-07-04 19:48:31 +0200 |
| commit | ee9c1a601c6ce156c295e4a4608ad50535192954 (patch) | |
| tree | 49757b312b758e793ffd8bfedd2d6665cd0b3e29 | |
| parent | 2690b2e42de85dbcbca602f3299ae4404918e94d (diff) | |
| parent | e9eb2503b10fe4c4aefbee39226c8962d72d58bd (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bitcoin/PKGBUILD
community/calc/PKGBUILD
community/fcitx/PKGBUILD
community/gloobus-preview/PKGBUILD
community/linux-tools/PKGBUILD
community/smc/PKGBUILD
extra/elfutils/PKGBUILD
extra/freenx/PKGBUILD
extra/gnome-alsamixer/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/kdepim/PKGBUILD
extra/kdesdk-kate/PKGBUILD
extra/lcms2/PKGBUILD
extra/libmspack/PKGBUILD
extra/libtheora/PKGBUILD
extra/mesa/PKGBUILD
extra/nx-common/PKGBUILD
extra/opennx/PKGBUILD
extra/perl-tk/PKGBUILD
extra/qt4/PKGBUILD
extra/soprano/PKGBUILD
extra/wireshark/PKGBUILD
extra/xmlsec/PKGBUILD
extra/xorg-server/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/ipsec-tools-libre/PKGBUILD
libre/tomoyo-tools-libre/PKGBUILD
pcr/amsynth/PKGBUILD
539 files changed, 6490 insertions, 16837 deletions
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index 6acc2ade7..9e57e3e2b 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 85317 2013-03-01 00:32:14Z alucryd $ +# $Id: PKGBUILD 93265 2013-06-30 19:01:59Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: kozec <kozec@kozec.com> # Contributor: Limao Luo <luolimao+AUR@gmail.com> pkgname=aegisub -pkgver=3.0.2 -pkgrel=6 +pkgver=3.0.3 +pkgrel=1 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64' 'mips64el') url="http://www.aegisub.org" @@ -13,28 +13,19 @@ license=('GPL' 'BSD') depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9' 'hicolor-icon-theme') makedepends=('mesa') install=aegisub.install -source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" 'crash-on-deatach.patch' 'lua51.patch') -sha256sums=('68ec20cf49f513608cec400bd462ebb762d6057109968fb01d842e10e6e7fb39' - '85e2c2a6bf091f5b4ca29a0149df8d8ca6219d98a4095f79809f2e698983bca4' - 'ce67b143cc2949fbbd7d72862c54005030339d1c364753335acec271ca9e179d') +source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz") +sha256sums=('9623e1967ae774d8a34fae531dcf76f15ae060f864cf941d34ba3d64e1986efc') build() { cd "${srcdir}"/${pkgname}/${pkgname} -# Patch - patch -Np1 -i "${srcdir}"/crash-on-deatach.patch - patch -Np1 -i "${srcdir}"/lua51.patch - -# Build - autoreconf -ivf - ./configure --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9 + ACLOCAL=aclocal AUTOMAKE=automake ./autogen.sh --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9 make } package() { cd "${srcdir}"/${pkgname}/${pkgname} -# Install make DESTDIR="$pkgdir" install # License diff --git a/community/aegisub/crash-on-deatach.patch b/community/aegisub/crash-on-deatach.patch deleted file mode 100755 index 1a1a3d007..000000000 --- a/community/aegisub/crash-on-deatach.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/video_display.cpp -+++ b/src/video_display.cpp -@@ -309,6 +309,7 @@ - } - - void VideoDisplay::UpdateSize() { -+ if (zoomValue<=0) zoomValue = 1; - if (!con->videoController->IsLoaded() || !IsShownOnScreen()) return; - - videoSize.Set(con->videoController->GetWidth(), con->videoController->GetHeight()); diff --git a/community/aegisub/lua51.patch b/community/aegisub/lua51.patch deleted file mode 100755 index f93fb02de..000000000 --- a/community/aegisub/lua51.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -371,9 +371,9 @@ - - AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [ - # First try pkg-config with several names -- PKG_CHECK_MODULES(LUA, lua >= 5.1, [with_auto4_lua="yes"], [ -- PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1, [with_auto4_lua="yes"], [ -- PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1, [with_auto4_lua="yes"], [ -+ PKG_CHECK_MODULES(LUA, lua5.1 >= 5.1 lua5.1 < 5.2, [with_auto4_lua="yes"], [ -+ PKG_CHECK_MODULES(LUA, lua-5.1 >= 5.1 lua-5.1 < 5.2, [with_auto4_lua="yes"], [ -+ PKG_CHECK_MODULES(LUA, lua >= 5.1 lua < 5.2, [with_auto4_lua="yes"], [ - # Still not found so try to autodetect - AS_IF([test -z "$LUA_CFLAGS"], - [AGI_FIND_HEADER([LUA], [lua.hpp], -@@ -393,7 +393,7 @@ - return !res; - }]) - AS_IF([test x$agi_cv_with_lua = xno && test x$with_lua = xyes], -- [AC_MSG_FAILURE([--with-lua was specified, but lua could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])]) -+ [AC_MSG_FAILURE([--with-lua was specified, but lua 5.1 could not be found. Try setting LUA_CLFAGS and LUA_LIBS manually])]) - with_auto4_lua=$agi_cv_with_lua - ])])]) - ]) diff --git a/community/allegro/PKGBUILD b/community/allegro/PKGBUILD index 2681b5db3..0288798e5 100644 --- a/community/allegro/PKGBUILD +++ b/community/allegro/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90003 2013-05-06 19:36:13Z foutrelis $ +# $Id: PKGBUILD 93187 2013-06-27 16:11:54Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: arjan <arjan@archlinux.org> pkgname=allegro -pkgver=5.0.9 -pkgrel=3 +pkgver=5.0.10 +pkgrel=1 pkgdesc='Portable library mainly aimed at video game and multimedia programming' arch=('x86_64' 'i686' 'mips64el') url='http://alleg.sourceforge.net/' @@ -14,7 +14,7 @@ license=('custom') makedepends=('cmake' 'mesa-libgl' 'glu') depends=('jack' 'libxpm' 'libxxf86dga' 'libgl' 'physfs' 'gtk2' 'libpulse') source=("http://downloads.sourceforge.net/alleg/$pkgname-$pkgver.tar.gz") -sha256sums=('ba28ac307023f1c756f1c421086f81d1e19ec5f09412d5848303c64177a20bd5') +sha256sums=('71b81080f34f6e485edd0c51f22923c18ff967d5db438e591e6f3885d5bdcda1') build() { cd "$srcdir" diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD index 70db053d9..572ddd10c 100644 --- a/community/bitcoin/PKGBUILD +++ b/community/bitcoin/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 92952 2013-06-20 11:00:24Z tredaelli $ +# $Id: PKGBUILD 93162 2013-06-26 14:39:47Z tredaelli $ # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> # Contributor: shahid <helllamer@gmail.com> pkgbase=bitcoin pkgname=('bitcoin-daemon' 'bitcoin-qt') -pkgver=0.8.2 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgver=0.8.3 +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=('e15d3134f4efd8d60e243c7177edba06ac471619674ca07a42a1dced5f498728') +sha256sums=('c6003a6af947e6978b13ab55d7bb7ec97aedc55022fb4924d08792a8d4f83a35') build() { cd "$srcdir/$pkgbase-$pkgver-linux/src" diff --git a/community/busybox/PKGBUILD b/community/busybox/PKGBUILD index f7ee72159..7b6ef15b7 100644 --- a/community/busybox/PKGBUILD +++ b/community/busybox/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91555 2013-05-23 15:08:13Z spupykin $ +# $Id: PKGBUILD 93409 2013-07-03 10:50:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Pranaitis <jens@jenux.homelinux.org> pkgname=busybox -pkgver=1.20.2 -pkgrel=5 +pkgver=1.21.1 +pkgrel=1 pkgdesc="Utilities for rescue and embedded systems" arch=("i686" "x86_64" 'mips64el') url="http://www.busybox.net" @@ -13,8 +13,8 @@ makedepends=("make" "gcc" "sed" "ncurses") source=($url/downloads/$pkgname-$pkgver.tar.bz2 config) install=busybox.install -md5sums=('e025414bc6cd79579cc7a32a45d3ae1c' - '09d4562ee4a9ab5415be44b945bfc7e2') +md5sums=('795394f83903b5eec6567d51eebb417e' + '3fbd88dc6327ff0455c17409efdbab79') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/busybox/busybox.install b/community/busybox/busybox.install index 7bf2a83ac..04beb0630 100644 --- a/community/busybox/busybox.install +++ b/community/busybox/busybox.install @@ -10,5 +10,5 @@ pre_upgrade() { post_upgrade() { [ -f tmp/busybox.upgrade.script ] && busybox chmod `busybox cat tmp/busybox.upgrade.script` usr/bin/busybox busybox rm -f tmp/busybox.upgrade.script - echo "busybox is un /usr/bin now. Readjust its mode if you modified it." + echo "busybox is in /usr/bin now. Readjust its mode if you modified it." } diff --git a/community/busybox/config b/community/busybox/config index 197f11f8b..b89c59b12 100644 --- a/community/busybox/config +++ b/community/busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.20.2 -# Sun Jul 8 21:35:17 2012 +# Busybox version: 1.21.1 +# Wed Jul 3 14:35:32 2013 # CONFIG_HAVE_DOT_CONFIG=y @@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y CONFIG_FEATURE_UTMP=y CONFIG_FEATURE_WTMP=y CONFIG_FEATURE_PIDFILE=y +CONFIG_PID_FILE_PATH="/run" CONFIG_FEATURE_SUID=y CONFIG_FEATURE_SUID_CONFIG=y CONFIG_FEATURE_SUID_CONFIG_QUIET=y @@ -49,7 +50,7 @@ CONFIG_FEATURE_SUID_CONFIG_QUIET=y CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" CONFIG_FEATURE_SYSLOG=y -CONFIG_FEATURE_HAVE_RPC=y +# CONFIG_FEATURE_HAVE_RPC is not set # # Build Options @@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install" CONFIG_FEATURE_RTMINMAX=y CONFIG_PASSWORD_MINLEN=6 CONFIG_MD5_SMALL=1 +CONFIG_SHA3_SMALL=1 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set CONFIG_FEATURE_USE_TERMIOS=y @@ -263,6 +265,7 @@ CONFIG_SEQ=y CONFIG_SHA1SUM=y CONFIG_SHA256SUM=y CONFIG_SHA512SUM=y +CONFIG_SHA3SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y CONFIG_FEATURE_HUMAN_READABLE=y # -# Common options for md5sum, sha1sum, sha256sum, sha512sum +# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum # CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y @@ -375,7 +378,6 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y # CONFIG_FEATURE_AWK_LIBM is not set CONFIG_CMP=y @@ -616,9 +618,11 @@ CONFIG_FEATURE_VOLUMEID_EXT=y CONFIG_FEATURE_VOLUMEID_BTRFS=y CONFIG_FEATURE_VOLUMEID_REISERFS=y CONFIG_FEATURE_VOLUMEID_FAT=y +CONFIG_FEATURE_VOLUMEID_EXFAT=y CONFIG_FEATURE_VOLUMEID_HFS=y CONFIG_FEATURE_VOLUMEID_JFS=y CONFIG_FEATURE_VOLUMEID_XFS=y +CONFIG_FEATURE_VOLUMEID_NILFS=y CONFIG_FEATURE_VOLUMEID_NTFS=y CONFIG_FEATURE_VOLUMEID_ISO9660=y CONFIG_FEATURE_VOLUMEID_UDF=y @@ -626,6 +630,7 @@ CONFIG_FEATURE_VOLUMEID_LUKS=y CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y CONFIG_FEATURE_VOLUMEID_CRAMFS=y CONFIG_FEATURE_VOLUMEID_ROMFS=y +CONFIG_FEATURE_VOLUMEID_SQUASHFS=y CONFIG_FEATURE_VOLUMEID_SYSV=y CONFIG_FEATURE_VOLUMEID_OCFS2=y CONFIG_FEATURE_VOLUMEID_LINUXRAID=y @@ -898,6 +903,13 @@ CONFIG_POWERTOP=y CONFIG_PSTREE=y CONFIG_PWDX=y CONFIG_SMEMCAP=y +CONFIG_TOP=y +CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y +CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y +# CONFIG_FEATURE_TOP_SMP_CPU is not set +# CONFIG_FEATURE_TOP_DECIMALS is not set +# CONFIG_FEATURE_TOP_SMP_PROCESS is not set +CONFIG_FEATURE_TOPMEM=y CONFIG_UPTIME=y CONFIG_FEATURE_UPTIME_UTMP_SUPPORT=y CONFIG_FREE=y @@ -918,13 +930,6 @@ CONFIG_FEATURE_PS_LONG=y # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set CONFIG_RENICE=y CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -CONFIG_FEATURE_TOPMEM=y # CONFIG_FEATURE_SHOW_THREADS is not set CONFIG_WATCH=y @@ -1019,6 +1024,11 @@ CONFIG_FEATURE_IPC_SYSLOG=y CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16 CONFIG_LOGREAD=y CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y +CONFIG_FEATURE_KMSG_SYSLOG=y CONFIG_KLOGD=y + +# +# klogd should not be used together with syslog to kernel printk buffer +# CONFIG_FEATURE_KLOGD_KLOGCTL=y CONFIG_LOGGER=y diff --git a/community/calc/PKGBUILD b/community/calc/PKGBUILD index d4ca01a96..9ca661ed0 100644 --- a/community/calc/PKGBUILD +++ b/community/calc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 61256 2011-12-26 12:59:57Z spupykin $ +# $Id: PKGBUILD 93457 2013-07-03 13:50:16Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=calc -pkgver=2.12.4.4 -pkgrel=1.1 +pkgver=2.12.4.8 +pkgrel=1 pkgdesc="console calculator" arch=(i686 x86_64 'mips64el') url="http://www.isthe.com/chongo/tech/comp/calc/" @@ -12,7 +12,7 @@ license=('GPL') depends=(glibc) #source=(http://switch.dl.sf.net/sourceforge/calc/calc-$pkgver.tar.bz2) source=(http://www.isthe.com/chongo/src/calc/calc-$pkgver.tar.bz2) -md5sums=('1ad16a9304df7137cd8626a1f50b6aae') +md5sums=('38694f375e172f0b830d4dbf9d6f2dcc') build() { cd $srcdir/calc-$pkgver @@ -53,6 +53,10 @@ build() { EOF make -j1 +} + +package() { + cd $srcdir/calc-$pkgver make T=$pkgdir install mv $pkgdir/usr/bin/cscript $pkgdir/usr/share/calc/ } diff --git a/community/celt0.5.1/PKGBUILD b/community/celt0.5.1/PKGBUILD new file mode 100644 index 000000000..f2a4fa2e5 --- /dev/null +++ b/community/celt0.5.1/PKGBUILD @@ -0,0 +1,29 @@ +# Contributor: Lauri Niskanen <ape@ape3000.com> +# Contributor: Ray Rashif <schivmeister@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> + +pkgname=celt0.5.1 +_basename=celt +pkgver=0.5.1.3 +pkgrel=1 +pkgdesc="Low-latency audio communication codec - SPICE version" +arch=(i686 x86_64) +url="http://www.celt-codec.org" +license=('BSD') +depends=('libogg') +provides=('celt=0.5.1') +options=('!libtool') +source=(http://downloads.us.xiph.org/releases/celt/celt-$pkgver.tar.gz) +md5sums=('67e7b5e45db57a6f1f0a6962f5ecb190') + +build() { + cd "$srcdir/celt-$pkgver" + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/celt-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/BSD" +} diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index 083c66c2b..d10d3b141 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,23 +1,23 @@ -# $Id: PKGBUILD 90845 2013-05-14 19:53:14Z lcarlier $ +# $Id: PKGBUILD 93170 2013-06-27 01:34:18Z foutrelis $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=2.0 -pkgrel=6 +pkgver=2.0.1 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>18.0' 'xulrunner<22.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>18.0' 'xulrunner<23.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') #source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver #source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip source=(https://chmsee.googlecode.com/files/${pkgname}-${pkgver}.tar.gz chmsee) install=chmsee.install -md5sums=('a9a1e79094e5a2674caa3b1f1e34f5e7' +md5sums=('08f813d65ed2a9e3af8ff1092650d0a5' '1787edd1de8aa75bd9fa75a5ab319e85') build() { @@ -25,7 +25,10 @@ build() { cp Makefile.arch Makefile sed -i -e 's/17.*/18.0/g' ../application.ini - sed -i -e 's/19.*/21.0/g' ../application.ini + sed -i -e 's/21.*/22.*/g' ../application.ini + + # xpcom has been merged into xul in xulrunner 22.0 + sed -i -e 's/-lxpcom/-lxul/' common.mk make -j1 } @@ -34,7 +37,7 @@ package() { cd ${srcdir}/chmsee-* install -d ${pkgdir}/usr/share/chmsee - cp -a * ${pkgdir}/usr/share/chmsee + cp -a * ${pkgdir}/usr/share/chmsee rm -r ${pkgdir}/usr/share/chmsee/src install -Dm644 data/chmsee.desktop.in \ ${pkgdir}/usr/share/applications/chmsee.desktop diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index a67918543..b8999bf80 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,37 +1,33 @@ -# $Id: PKGBUILD 93089 2013-06-24 09:55:10Z spupykin $ +# $Id: PKGBUILD 93137 2013-06-25 15:46:03Z 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.2.2 -pkgrel=4 +pkgver=1.4.0pre +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" license=('APACHE') -depends=('icu' 'erlang' 'js185' 'openssl' 'curl') +depends=('icu' 'erlang-nox' 'js185' 'openssl' 'curl') +makedepends=('autoconf-archive' 'git') install=couchdb.install options=('!libtool') backup=('etc/couchdb/local.ini' 'etc/conf.d/couchdb' 'etc/logrotate.d/couchdb') -source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} +#source=("http://www.sai.msu.su/apache/couchdb/source/$pkgver/apache-couchdb-$pkgver.tar.gz"{,.asc} +source=("git://github.com/apache/couchdb.git#commit=8d7ab8b18dd20f8785e69f4420c6f93a2edbfa60" "couchdb.service" - "couchdb.tmpfiles" - "build-fix.patch" - "erlang-r16b01.patch") -md5sums=('6cc49c22fadcf7d8cf8aa34dae71b203' - 'SKIP' + "couchdb.tmpfiles") +md5sums=('SKIP' '8914a7ffc6745f94106d96206709acb4' - '1e254ebe32eeb061be64193bafa35dbf' - '71afe48505dfc07ba2091786b4650fa2' - '5ee0105a72b841de4d9c19d0fd2508e0') + '1e254ebe32eeb061be64193bafa35dbf') build() { - cd "$srcdir/apache-$pkgname-$pkgver" - patch -p1 <$srcdir/build-fix.patch - patch -p1 <$srcdir/erlang-r16b01.patch + cd "$srcdir/couchdb" + ./bootstrap ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var @@ -39,7 +35,7 @@ build() { } package() { - cd "$srcdir/apache-$pkgname-$pkgver" + cd "$srcdir/couchdb" make DESTDIR="$pkgdir" install install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb diff --git a/community/couchdb/build-fix.patch b/community/couchdb/build-fix.patch deleted file mode 100644 index d847b3cf2..000000000 --- a/community/couchdb/build-fix.patch +++ /dev/null @@ -1,5568 +0,0 @@ -diff -wbBur apache-couchdb-1.2.1/src/Makefile.am apache-couchdb-1.2.1.q/src/Makefile.am ---- apache-couchdb-1.2.1/src/Makefile.am 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/Makefile.am 2013-03-22 15:28:06.836935634 +0400 -@@ -10,4 +10,4 @@ - ## License for the specific language governing permissions and limitations under - ## the License. - --SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy -+SUBDIRS = couchdb ejson erlang-oauth ibrowse mochiweb snappy -diff -wbBur apache-couchdb-1.2.1/src/Makefile.in apache-couchdb-1.2.1.q/src/Makefile.in ---- apache-couchdb-1.2.1/src/Makefile.in 2012-12-21 01:28:49.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/Makefile.in 2013-03-22 15:28:11.563602246 +0400 -@@ -267,7 +267,7 @@ - version_release = @version_release@ - version_revision = @version_revision@ - version_stage = @version_stage@ --SUBDIRS = couchdb ejson erlang-oauth etap ibrowse mochiweb snappy -+SUBDIRS = couchdb ejson erlang-oauth ibrowse mochiweb snappy - all: all-recursive - - .SUFFIXES: -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochifmt.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -369,8 +369,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - tokenize_test() -> - {?MODULE, [{raw, "ABC"}]} = tokenize("ABC"), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt_records.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_records.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochifmt_records.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_records.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -9,11 +9,15 @@ - %% M:format("{0.bar}", [#rec{bar=foo}]). - %% foo - ---module(mochifmt_records, [Recs]). -+-module(mochifmt_records). - -author('bob@mochimedia.com'). ---export([get_value/2]). -+-export([new/1, get_value/3]). - --get_value(Key, Rec) when is_tuple(Rec) and is_atom(element(1, Rec)) -> -+new([{_Rec, RecFields}]=Recs) when is_list(RecFields) -> -+ {?MODULE, Recs}. -+ -+get_value(Key, Rec, {?MODULE, Recs}) -+ when is_tuple(Rec) and is_atom(element(1, Rec)) -> - try begin - Atom = list_to_existing_atom(Key), - {_, Fields} = proplists:lookup(element(1, Rec), Recs), -@@ -21,7 +25,7 @@ - end - catch error:_ -> mochifmt:get_value(Key, Rec) - end; --get_value(Key, Args) -> -+get_value(Key, Args, {?MODULE, _Recs}) -> - mochifmt:get_value(Key, Args). - - get_rec_index(Atom, [Atom | _], Index) -> -@@ -33,6 +37,6 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochifmt_std.erl apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_std.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochifmt_std.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochifmt_std.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -3,28 +3,31 @@ - - %% @doc Template module for a mochifmt formatter. - ---module(mochifmt_std, []). -+-module(mochifmt_std). - -author('bob@mochimedia.com'). ---export([format/2, get_value/2, format_field/2, get_field/2, convert_field/2]). -+-export([new/0, format/3, get_value/3, format_field/3, get_field/3, convert_field/3]). - --format(Format, Args) -> -+new() -> -+ {?MODULE}. -+ -+format(Format, Args, {?MODULE}=THIS) -> - mochifmt:format(Format, Args, THIS). - --get_field(Key, Args) -> -+get_field(Key, Args, {?MODULE}=THIS) -> - mochifmt:get_field(Key, Args, THIS). - --convert_field(Key, Args) -> -+convert_field(Key, Args, {?MODULE}) -> - mochifmt:convert_field(Key, Args). - --get_value(Key, Args) -> -+get_value(Key, Args, {?MODULE}) -> - mochifmt:get_value(Key, Args). - --format_field(Arg, Format) -> -+format_field(Arg, Format, {?MODULE}=THIS) -> - mochifmt:format_field(Arg, Format, THIS). - - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiglobal.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiglobal.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiglobal.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiglobal.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -30,7 +30,7 @@ - put(_K, V, Mod) -> - Bin = compile(Mod, V), - code:purge(Mod), -- code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin), -+ {module, Mod} = code:load_binary(Mod, atom_to_list(Mod) ++ ".erl", Bin), - ok. - - -spec delete(atom()) -> boolean(). -@@ -77,8 +77,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - get_put_delete_test() -> - K = '$$test$$mochiglobal', - delete(K), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochihex.erl apache-couchdb-1.2.1.q/src/mochiweb/mochihex.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochihex.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochihex.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -8,9 +8,6 @@ - - -export([to_hex/1, to_bin/1, to_int/1, dehex/1, hexdigit/1]). - --%% @type iolist() = [char() | binary() | iolist()] --%% @type iodata() = iolist() | binary() -- - %% @spec to_hex(integer | iolist()) -> string() - %% @doc Convert an iolist to a hexadecimal string. - to_hex(0) -> -@@ -68,8 +65,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - to_hex_test() -> - "ff000ff1" = to_hex([255, 0, 15, 241]), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochijson2.erl apache-couchdb-1.2.1.q/src/mochiweb/mochijson2.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochijson2.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochijson2.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -40,9 +40,9 @@ - -module(mochijson2). - -author('bob@mochimedia.com'). - -export([encoder/1, encode/1]). ---export([decoder/1, decode/1]). -+-export([decoder/1, decode/1, decode/2]). - --% This is a macro to placate syntax highlighters.. -+%% This is a macro to placate syntax highlighters.. - -define(Q, $\"). - -define(ADV_COL(S, N), S#decoder{offset=N+S#decoder.offset, - column=N+S#decoder.column}). -@@ -64,15 +64,14 @@ - -define(IS_WHITESPACE(C), - (C =:= $\s orelse C =:= $\t orelse C =:= $\r orelse C =:= $\n)). - --%% @type iolist() = [char() | binary() | iolist()] --%% @type iodata() = iolist() | binary() - %% @type json_string() = atom | binary() - %% @type json_number() = integer() | float() - %% @type json_array() = [json_term()] - %% @type json_object() = {struct, [{json_string(), json_term()}]} -+%% @type json_eep18_object() = {[{json_string(), json_term()}]} - %% @type json_iolist() = {json, iolist()} - %% @type json_term() = json_string() | json_number() | json_array() | --%% json_object() | json_iolist() -+%% json_object() | json_eep18_object() | json_iolist() - - -record(encoder, {handler=null, - utf8=false}). -@@ -102,6 +101,14 @@ - State = parse_decoder_options(Options, #decoder{}), - fun (O) -> json_decode(O, State) end. - -+%% @spec decode(iolist(), [{format, proplist | eep18 | struct}]) -> json_term() -+%% @doc Decode the given iolist to Erlang terms using the given object format -+%% for decoding, where proplist returns JSON objects as [{binary(), json_term()}] -+%% proplists, eep18 returns JSON objects as {[binary(), json_term()]}, and struct -+%% returns them as-is. -+decode(S, Options) -> -+ json_decode(S, parse_decoder_options(Options, #decoder{})). -+ - %% @spec decode(iolist()) -> json_term() - %% @doc Decode the given iolist to Erlang terms. - decode(S) -> -@@ -119,7 +126,10 @@ - parse_decoder_options([], State) -> - State; - parse_decoder_options([{object_hook, Hook} | Rest], State) -> -- parse_decoder_options(Rest, State#decoder{object_hook=Hook}). -+ parse_decoder_options(Rest, State#decoder{object_hook=Hook}); -+parse_decoder_options([{format, Format} | Rest], State) -+ when Format =:= struct orelse Format =:= eep18 orelse Format =:= proplist -> -+ parse_decoder_options(Rest, State#decoder{object_hook=Format}). - - json_encode(true, _State) -> - <<"true">>; -@@ -139,6 +149,10 @@ - json_encode_proplist(Props, State); - json_encode({struct, Props}, State) when is_list(Props) -> - json_encode_proplist(Props, State); -+json_encode({Props}, State) when is_list(Props) -> -+ json_encode_proplist(Props, State); -+json_encode({}, State) -> -+ json_encode_proplist([], State); - json_encode(Array, State) when is_list(Array) -> - json_encode_array(Array, State); - json_encode({array, Array}, State) when is_list(Array) -> -@@ -318,8 +332,12 @@ - decode_object(B, S1) - end. - --make_object(V, #decoder{object_hook=null}) -> -+make_object(V, #decoder{object_hook=N}) when N =:= null orelse N =:= struct -> - V; -+make_object({struct, P}, #decoder{object_hook=eep18}) -> -+ {P}; -+make_object({struct, P}, #decoder{object_hook=proplist}) -> -+ P; - make_object(V, #decoder{object_hook=Hook}) -> - Hook(V). - -@@ -559,8 +577,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - - %% testing constructs borrowed from the Yaws JSON implementation. -@@ -838,12 +856,34 @@ - - handler_test() -> - ?assertEqual( -- {'EXIT',{json_encode,{bad_term,{}}}}, -- catch encode({})), -- F = fun ({}) -> [] end, -+ {'EXIT',{json_encode,{bad_term,{x,y}}}}, -+ catch encode({x,y})), -+ F = fun ({x,y}) -> [] end, - ?assertEqual( - <<"[]">>, -- iolist_to_binary((encoder([{handler, F}]))({}))), -+ iolist_to_binary((encoder([{handler, F}]))({x, y}))), - ok. - -+encode_empty_test_() -> -+ [{A, ?_assertEqual(<<"{}">>, iolist_to_binary(encode(B)))} -+ || {A, B} <- [{"eep18 {}", {}}, -+ {"eep18 {[]}", {[]}}, -+ {"{struct, []}", {struct, []}}]]. -+ -+encode_test_() -> -+ P = [{<<"k">>, <<"v">>}], -+ JSON = iolist_to_binary(encode({struct, P})), -+ [{atom_to_list(F), -+ ?_assertEqual(JSON, iolist_to_binary(encode(decode(JSON, [{format, F}]))))} -+ || F <- [struct, eep18, proplist]]. -+ -+format_test_() -> -+ P = [{<<"k">>, <<"v">>}], -+ JSON = iolist_to_binary(encode({struct, P})), -+ [{atom_to_list(F), -+ ?_assertEqual(A, decode(JSON, [{format, F}]))} -+ || {F, A} <- [{struct, {struct, P}}, -+ {eep18, {P}}, -+ {proplist, P}]]. -+ - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochijson.erl apache-couchdb-1.2.1.q/src/mochiweb/mochijson.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochijson.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochijson.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -15,8 +15,6 @@ - -define(INC_COL(S), S#decoder{column=1+S#decoder.column}). - -define(INC_LINE(S), S#decoder{column=1, line=1+S#decoder.line}). - --%% @type iolist() = [char() | binary() | iolist()] --%% @type iodata() = iolist() | binary() - %% @type json_string() = atom | string() | binary() - %% @type json_number() = integer() | float() - %% @type json_array() = {array, [json_term()]} -@@ -406,8 +404,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - %% testing constructs borrowed from the Yaws JSON implementation. - -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochilists.erl apache-couchdb-1.2.1.q/src/mochiweb/mochilists.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochilists.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochilists.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -55,8 +55,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - set_defaults_test() -> - ?assertEqual( -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochilogfile2.erl apache-couchdb-1.2.1.q/src/mochiweb/mochilogfile2.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochilogfile2.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochilogfile2.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -57,8 +57,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - name_test() -> - D = mochitemp:mkdtemp(), - FileName = filename:join(D, "open_close_test.log"), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochinum.erl apache-couchdb-1.2.1.q/src/mochiweb/mochinum.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochinum.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochinum.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -243,8 +243,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - int_ceil_test() -> - ?assertEqual(1, int_ceil(0.0001)), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochitemp.erl apache-couchdb-1.2.1.q/src/mochiweb/mochitemp.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochitemp.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochitemp.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -135,8 +135,9 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). -+ - pushenv(L) -> - [{K, os:getenv(K)} || K <- L]. - popenv(L) -> -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiutf8.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiutf8.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiutf8.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiutf8.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -5,8 +5,9 @@ - %% invalid bytes. - - -module(mochiutf8). ---export([valid_utf8_bytes/1, codepoint_to_bytes/1, bytes_to_codepoints/1]). ---export([bytes_foldl/3, codepoint_foldl/3, read_codepoint/1, len/1]). -+-export([valid_utf8_bytes/1, codepoint_to_bytes/1, codepoints_to_bytes/1]). -+-export([bytes_to_codepoints/1, bytes_foldl/3, codepoint_foldl/3]). -+-export([read_codepoint/1, len/1]). - - %% External API - -@@ -192,8 +193,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - binary_skip_bytes_test() -> - ?assertEqual(<<"foo">>, -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_acceptor.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_acceptor.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_acceptor.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_acceptor.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -14,10 +14,10 @@ - proc_lib:spawn_link(?MODULE, init, [Server, Listen, Loop]). - - init(Server, Listen, Loop) -> -- T1 = now(), -+ T1 = os:timestamp(), - case catch mochiweb_socket:accept(Listen) of - {ok, Socket} -> -- gen_server:cast(Server, {accepted, self(), timer:now_diff(now(), T1)}), -+ gen_server:cast(Server, {accepted, self(), timer:now_diff(os:timestamp(), T1)}), - call_loop(Loop, Socket); - {error, closed} -> - exit(normal); -@@ -35,6 +35,8 @@ - - call_loop({M, F}, Socket) -> - M:F(Socket); -+call_loop({M, F, [A1]}, Socket) -> -+ M:F(Socket, A1); - call_loop({M, F, A}, Socket) -> - erlang:apply(M, F, [Socket | A]); - call_loop(Loop, Socket) -> -@@ -43,6 +45,6 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb.app.src apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.app.src ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb.app.src 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.app.src 2013-03-22 15:26:58.000000000 +0400 -@@ -1,9 +1,9 @@ - %% This is generated from src/mochiweb.app.src - {application, mochiweb, - [{description, "MochiMedia Web Server"}, -- {vsn, "1.4.1"}, -+ {vsn, "2.5.0"}, - {modules, []}, - {registered, []}, -- {mod, {mochiweb_app, []}}, - {env, []}, -- {applications, [kernel, stdlib, crypto, inets]}]}. -+ {applications, [kernel, stdlib, crypto, inets, ssl, xmerl, -+ compiler, syntax_tools]}]}. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_charref.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_charref.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_charref.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_charref.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -1,17 +1,17 @@ - %% @author Bob Ippolito <bob@mochimedia.com> - %% @copyright 2007 Mochi Media, Inc. - --%% @doc Converts HTML 4 charrefs and entities to codepoints. -+%% @doc Converts HTML 5 charrefs and entities to codepoints (or lists of code points). - -module(mochiweb_charref). - -export([charref/1]). - - %% External API. - --%% @spec charref(S) -> integer() | undefined - %% @doc Convert a decimal charref, hex charref, or html entity to a unicode - %% codepoint, or return undefined on failure. - %% The input should not include an ampersand or semicolon. - %% charref("#38") = 38, charref("#x26") = 38, charref("amp") = 38. -+-spec charref(binary() | string()) -> integer() | [integer()] | undefined. - charref(B) when is_binary(B) -> - charref(binary_to_list(B)); - charref([$#, C | L]) when C =:= $x orelse C =:= $X -> -@@ -29,266 +29,2141 @@ - - %% Internal API. - --entity("nbsp") -> 160; --entity("iexcl") -> 161; --entity("cent") -> 162; --entity("pound") -> 163; --entity("curren") -> 164; --entity("yen") -> 165; --entity("brvbar") -> 166; --entity("sect") -> 167; --entity("uml") -> 168; --entity("copy") -> 169; --entity("ordf") -> 170; --entity("laquo") -> 171; --entity("not") -> 172; --entity("shy") -> 173; --entity("reg") -> 174; --entity("macr") -> 175; --entity("deg") -> 176; --entity("plusmn") -> 177; --entity("sup2") -> 178; --entity("sup3") -> 179; --entity("acute") -> 180; --entity("micro") -> 181; --entity("para") -> 182; --entity("middot") -> 183; --entity("cedil") -> 184; --entity("sup1") -> 185; --entity("ordm") -> 186; --entity("raquo") -> 187; --entity("frac14") -> 188; --entity("frac12") -> 189; --entity("frac34") -> 190; --entity("iquest") -> 191; --entity("Agrave") -> 192; --entity("Aacute") -> 193; --entity("Acirc") -> 194; --entity("Atilde") -> 195; --entity("Auml") -> 196; --entity("Aring") -> 197; --entity("AElig") -> 198; --entity("Ccedil") -> 199; --entity("Egrave") -> 200; --entity("Eacute") -> 201; --entity("Ecirc") -> 202; --entity("Euml") -> 203; --entity("Igrave") -> 204; --entity("Iacute") -> 205; --entity("Icirc") -> 206; --entity("Iuml") -> 207; --entity("ETH") -> 208; --entity("Ntilde") -> 209; --entity("Ograve") -> 210; --entity("Oacute") -> 211; --entity("Ocirc") -> 212; --entity("Otilde") -> 213; --entity("Ouml") -> 214; --entity("times") -> 215; --entity("Oslash") -> 216; --entity("Ugrave") -> 217; --entity("Uacute") -> 218; --entity("Ucirc") -> 219; --entity("Uuml") -> 220; --entity("Yacute") -> 221; --entity("THORN") -> 222; --entity("szlig") -> 223; --entity("agrave") -> 224; --entity("aacute") -> 225; --entity("acirc") -> 226; --entity("atilde") -> 227; --entity("auml") -> 228; --entity("aring") -> 229; --entity("aelig") -> 230; --entity("ccedil") -> 231; --entity("egrave") -> 232; --entity("eacute") -> 233; --entity("ecirc") -> 234; --entity("euml") -> 235; --entity("igrave") -> 236; --entity("iacute") -> 237; --entity("icirc") -> 238; --entity("iuml") -> 239; --entity("eth") -> 240; --entity("ntilde") -> 241; --entity("ograve") -> 242; --entity("oacute") -> 243; --entity("ocirc") -> 244; --entity("otilde") -> 245; --entity("ouml") -> 246; --entity("divide") -> 247; --entity("oslash") -> 248; --entity("ugrave") -> 249; --entity("uacute") -> 250; --entity("ucirc") -> 251; --entity("uuml") -> 252; --entity("yacute") -> 253; --entity("thorn") -> 254; --entity("yuml") -> 255; --entity("fnof") -> 402; --entity("Alpha") -> 913; --entity("Beta") -> 914; --entity("Gamma") -> 915; --entity("Delta") -> 916; --entity("Epsilon") -> 917; --entity("Zeta") -> 918; --entity("Eta") -> 919; --entity("Theta") -> 920; --entity("Iota") -> 921; --entity("Kappa") -> 922; --entity("Lambda") -> 923; --entity("Mu") -> 924; --entity("Nu") -> 925; --entity("Xi") -> 926; --entity("Omicron") -> 927; --entity("Pi") -> 928; --entity("Rho") -> 929; --entity("Sigma") -> 931; --entity("Tau") -> 932; --entity("Upsilon") -> 933; --entity("Phi") -> 934; --entity("Chi") -> 935; --entity("Psi") -> 936; --entity("Omega") -> 937; --entity("alpha") -> 945; --entity("beta") -> 946; --entity("gamma") -> 947; --entity("delta") -> 948; --entity("epsilon") -> 949; --entity("zeta") -> 950; --entity("eta") -> 951; --entity("theta") -> 952; --entity("iota") -> 953; --entity("kappa") -> 954; --entity("lambda") -> 955; --entity("mu") -> 956; --entity("nu") -> 957; --entity("xi") -> 958; --entity("omicron") -> 959; --entity("pi") -> 960; --entity("rho") -> 961; --entity("sigmaf") -> 962; --entity("sigma") -> 963; --entity("tau") -> 964; --entity("upsilon") -> 965; --entity("phi") -> 966; --entity("chi") -> 967; --entity("psi") -> 968; --entity("omega") -> 969; --entity("thetasym") -> 977; --entity("upsih") -> 978; --entity("piv") -> 982; --entity("bull") -> 8226; --entity("hellip") -> 8230; --entity("prime") -> 8242; --entity("Prime") -> 8243; --entity("oline") -> 8254; --entity("frasl") -> 8260; --entity("weierp") -> 8472; --entity("image") -> 8465; --entity("real") -> 8476; --entity("trade") -> 8482; --entity("alefsym") -> 8501; --entity("larr") -> 8592; --entity("uarr") -> 8593; --entity("rarr") -> 8594; --entity("darr") -> 8595; --entity("harr") -> 8596; --entity("crarr") -> 8629; --entity("lArr") -> 8656; --entity("uArr") -> 8657; --entity("rArr") -> 8658; --entity("dArr") -> 8659; --entity("hArr") -> 8660; --entity("forall") -> 8704; --entity("part") -> 8706; --entity("exist") -> 8707; --entity("empty") -> 8709; --entity("nabla") -> 8711; --entity("isin") -> 8712; --entity("notin") -> 8713; --entity("ni") -> 8715; --entity("prod") -> 8719; --entity("sum") -> 8721; --entity("minus") -> 8722; --entity("lowast") -> 8727; --entity("radic") -> 8730; --entity("prop") -> 8733; --entity("infin") -> 8734; --entity("ang") -> 8736; --entity("and") -> 8743; --entity("or") -> 8744; --entity("cap") -> 8745; --entity("cup") -> 8746; --entity("int") -> 8747; --entity("there4") -> 8756; --entity("sim") -> 8764; --entity("cong") -> 8773; --entity("asymp") -> 8776; --entity("ne") -> 8800; --entity("equiv") -> 8801; --entity("le") -> 8804; --entity("ge") -> 8805; --entity("sub") -> 8834; --entity("sup") -> 8835; --entity("nsub") -> 8836; --entity("sube") -> 8838; --entity("supe") -> 8839; --entity("oplus") -> 8853; --entity("otimes") -> 8855; --entity("perp") -> 8869; --entity("sdot") -> 8901; --entity("lceil") -> 8968; --entity("rceil") -> 8969; --entity("lfloor") -> 8970; --entity("rfloor") -> 8971; --entity("lang") -> 9001; --entity("rang") -> 9002; --entity("loz") -> 9674; --entity("spades") -> 9824; --entity("clubs") -> 9827; --entity("hearts") -> 9829; --entity("diams") -> 9830; --entity("quot") -> 34; --entity("amp") -> 38; --entity("lt") -> 60; --entity("gt") -> 62; --entity("OElig") -> 338; --entity("oelig") -> 339; --entity("Scaron") -> 352; --entity("scaron") -> 353; --entity("Yuml") -> 376; --entity("circ") -> 710; --entity("tilde") -> 732; --entity("ensp") -> 8194; --entity("emsp") -> 8195; --entity("thinsp") -> 8201; --entity("zwnj") -> 8204; --entity("zwj") -> 8205; --entity("lrm") -> 8206; --entity("rlm") -> 8207; --entity("ndash") -> 8211; --entity("mdash") -> 8212; --entity("lsquo") -> 8216; --entity("rsquo") -> 8217; --entity("sbquo") -> 8218; --entity("ldquo") -> 8220; --entity("rdquo") -> 8221; --entity("bdquo") -> 8222; --entity("dagger") -> 8224; --entity("Dagger") -> 8225; --entity("permil") -> 8240; --entity("lsaquo") -> 8249; --entity("rsaquo") -> 8250; --entity("euro") -> 8364; --entity(_) -> undefined. -+%% [2011-10-14] Generated from: -+%% http://www.w3.org/TR/html5/named-character-references.html - -+entity("AElig") -> 16#000C6; -+entity("AMP") -> 16#00026; -+entity("Aacute") -> 16#000C1; -+entity("Abreve") -> 16#00102; -+entity("Acirc") -> 16#000C2; -+entity("Acy") -> 16#00410; -+entity("Afr") -> 16#1D504; -+entity("Agrave") -> 16#000C0; -+entity("Alpha") -> 16#00391; -+entity("Amacr") -> 16#00100; -+entity("And") -> 16#02A53; -+entity("Aogon") -> 16#00104; -+entity("Aopf") -> 16#1D538; -+entity("ApplyFunction") -> 16#02061; -+entity("Aring") -> 16#000C5; -+entity("Ascr") -> 16#1D49C; -+entity("Assign") -> 16#02254; -+entity("Atilde") -> 16#000C3; -+entity("Auml") -> 16#000C4; -+entity("Backslash") -> 16#02216; -+entity("Barv") -> 16#02AE7; -+entity("Barwed") -> 16#02306; -+entity("Bcy") -> 16#00411; -+entity("Because") -> 16#02235; -+entity("Bernoullis") -> 16#0212C; -+entity("Beta") -> 16#00392; -+entity("Bfr") -> 16#1D505; -+entity("Bopf") -> 16#1D539; -+entity("Breve") -> 16#002D8; -+entity("Bscr") -> 16#0212C; -+entity("Bumpeq") -> 16#0224E; -+entity("CHcy") -> 16#00427; -+entity("COPY") -> 16#000A9; -+entity("Cacute") -> 16#00106; -+entity("Cap") -> 16#022D2; -+entity("CapitalDifferentialD") -> 16#02145; -+entity("Cayleys") -> 16#0212D; -+entity("Ccaron") -> 16#0010C; -+entity("Ccedil") -> 16#000C7; -+entity("Ccirc") -> 16#00108; -+entity("Cconint") -> 16#02230; -+entity("Cdot") -> 16#0010A; -+entity("Cedilla") -> 16#000B8; -+entity("CenterDot") -> 16#000B7; -+entity("Cfr") -> 16#0212D; -+entity("Chi") -> 16#003A7; -+entity("CircleDot") -> 16#02299; -+entity("CircleMinus") -> 16#02296; -+entity("CirclePlus") -> 16#02295; -+entity("CircleTimes") -> 16#02297; -+entity("ClockwiseContourIntegral") -> 16#02232; -+entity("CloseCurlyDoubleQuote") -> 16#0201D; -+entity("CloseCurlyQuote") -> 16#02019; -+entity("Colon") -> 16#02237; -+entity("Colone") -> 16#02A74; -+entity("Congruent") -> 16#02261; -+entity("Conint") -> 16#0222F; -+entity("ContourIntegral") -> 16#0222E; -+entity("Copf") -> 16#02102; -+entity("Coproduct") -> 16#02210; -+entity("CounterClockwiseContourIntegral") -> 16#02233; -+entity("Cross") -> 16#02A2F; -+entity("Cscr") -> 16#1D49E; -+entity("Cup") -> 16#022D3; -+entity("CupCap") -> 16#0224D; -+entity("DD") -> 16#02145; -+entity("DDotrahd") -> 16#02911; -+entity("DJcy") -> 16#00402; -+entity("DScy") -> 16#00405; -+entity("DZcy") -> 16#0040F; -+entity("Dagger") -> 16#02021; -+entity("Darr") -> 16#021A1; -+entity("Dashv") -> 16#02AE4; -+entity("Dcaron") -> 16#0010E; -+entity("Dcy") -> 16#00414; -+entity("Del") -> 16#02207; -+entity("Delta") -> 16#00394; -+entity("Dfr") -> 16#1D507; -+entity("DiacriticalAcute") -> 16#000B4; -+entity("DiacriticalDot") -> 16#002D9; -+entity("DiacriticalDoubleAcute") -> 16#002DD; -+entity("DiacriticalGrave") -> 16#00060; -+entity("DiacriticalTilde") -> 16#002DC; -+entity("Diamond") -> 16#022C4; -+entity("DifferentialD") -> 16#02146; -+entity("Dopf") -> 16#1D53B; -+entity("Dot") -> 16#000A8; -+entity("DotDot") -> 16#020DC; -+entity("DotEqual") -> 16#02250; -+entity("DoubleContourIntegral") -> 16#0222F; -+entity("DoubleDot") -> 16#000A8; -+entity("DoubleDownArrow") -> 16#021D3; -+entity("DoubleLeftArrow") -> 16#021D0; -+entity("DoubleLeftRightArrow") -> 16#021D4; -+entity("DoubleLeftTee") -> 16#02AE4; -+entity("DoubleLongLeftArrow") -> 16#027F8; -+entity("DoubleLongLeftRightArrow") -> 16#027FA; -+entity("DoubleLongRightArrow") -> 16#027F9; -+entity("DoubleRightArrow") -> 16#021D2; -+entity("DoubleRightTee") -> 16#022A8; -+entity("DoubleUpArrow") -> 16#021D1; -+entity("DoubleUpDownArrow") -> 16#021D5; -+entity("DoubleVerticalBar") -> 16#02225; -+entity("DownArrow") -> 16#02193; -+entity("DownArrowBar") -> 16#02913; -+entity("DownArrowUpArrow") -> 16#021F5; -+entity("DownBreve") -> 16#00311; -+entity("DownLeftRightVector") -> 16#02950; -+entity("DownLeftTeeVector") -> 16#0295E; -+entity("DownLeftVector") -> 16#021BD; -+entity("DownLeftVectorBar") -> 16#02956; -+entity("DownRightTeeVector") -> 16#0295F; -+entity("DownRightVector") -> 16#021C1; -+entity("DownRightVectorBar") -> 16#02957; -+entity("DownTee") -> 16#022A4; -+entity("DownTeeArrow") -> 16#021A7; -+entity("Downarrow") -> 16#021D3; -+entity("Dscr") -> 16#1D49F; -+entity("Dstrok") -> 16#00110; -+entity("ENG") -> 16#0014A; -+entity("ETH") -> 16#000D0; -+entity("Eacute") -> 16#000C9; -+entity("Ecaron") -> 16#0011A; -+entity("Ecirc") -> 16#000CA; -+entity("Ecy") -> 16#0042D; -+entity("Edot") -> 16#00116; -+entity("Efr") -> 16#1D508; -+entity("Egrave") -> 16#000C8; -+entity("Element") -> 16#02208; -+entity("Emacr") -> 16#00112; -+entity("EmptySmallSquare") -> 16#025FB; -+entity("EmptyVerySmallSquare") -> 16#025AB; -+entity("Eogon") -> 16#00118; -+entity("Eopf") -> 16#1D53C; -+entity("Epsilon") -> 16#00395; -+entity("Equal") -> 16#02A75; -+entity("EqualTilde") -> 16#02242; -+entity("Equilibrium") -> 16#021CC; -+entity("Escr") -> 16#02130; -+entity("Esim") -> 16#02A73; -+entity("Eta") -> 16#00397; -+entity("Euml") -> 16#000CB; -+entity("Exists") -> 16#02203; -+entity("ExponentialE") -> 16#02147; -+entity("Fcy") -> 16#00424; -+entity("Ffr") -> 16#1D509; -+entity("FilledSmallSquare") -> 16#025FC; -+entity("FilledVerySmallSquare") -> 16#025AA; -+entity("Fopf") -> 16#1D53D; -+entity("ForAll") -> 16#02200; -+entity("Fouriertrf") -> 16#02131; -+entity("Fscr") -> 16#02131; -+entity("GJcy") -> 16#00403; -+entity("GT") -> 16#0003E; -+entity("Gamma") -> 16#00393; -+entity("Gammad") -> 16#003DC; -+entity("Gbreve") -> 16#0011E; -+entity("Gcedil") -> 16#00122; -+entity("Gcirc") -> 16#0011C; -+entity("Gcy") -> 16#00413; -+entity("Gdot") -> 16#00120; -+entity("Gfr") -> 16#1D50A; -+entity("Gg") -> 16#022D9; -+entity("Gopf") -> 16#1D53E; -+entity("GreaterEqual") -> 16#02265; -+entity("GreaterEqualLess") -> 16#022DB; -+entity("GreaterFullEqual") -> 16#02267; -+entity("GreaterGreater") -> 16#02AA2; -+entity("GreaterLess") -> 16#02277; -+entity("GreaterSlantEqual") -> 16#02A7E; -+entity("GreaterTilde") -> 16#02273; -+entity("Gscr") -> 16#1D4A2; -+entity("Gt") -> 16#0226B; -+entity("HARDcy") -> 16#0042A; -+entity("Hacek") -> 16#002C7; -+entity("Hat") -> 16#0005E; -+entity("Hcirc") -> 16#00124; -+entity("Hfr") -> 16#0210C; -+entity("HilbertSpace") -> 16#0210B; -+entity("Hopf") -> 16#0210D; -+entity("HorizontalLine") -> 16#02500; -+entity("Hscr") -> 16#0210B; -+entity("Hstrok") -> 16#00126; -+entity("HumpDownHump") -> 16#0224E; -+entity("HumpEqual") -> 16#0224F; -+entity("IEcy") -> 16#00415; -+entity("IJlig") -> 16#00132; -+entity("IOcy") -> 16#00401; -+entity("Iacute") -> 16#000CD; -+entity("Icirc") -> 16#000CE; -+entity("Icy") -> 16#00418; -+entity("Idot") -> 16#00130; -+entity("Ifr") -> 16#02111; -+entity("Igrave") -> 16#000CC; -+entity("Im") -> 16#02111; -+entity("Imacr") -> 16#0012A; -+entity("ImaginaryI") -> 16#02148; -+entity("Implies") -> 16#021D2; -+entity("Int") -> 16#0222C; -+entity("Integral") -> 16#0222B; -+entity("Intersection") -> 16#022C2; -+entity("InvisibleComma") -> 16#02063; -+entity("InvisibleTimes") -> 16#02062; -+entity("Iogon") -> 16#0012E; -+entity("Iopf") -> 16#1D540; -+entity("Iota") -> 16#00399; -+entity("Iscr") -> 16#02110; -+entity("Itilde") -> 16#00128; -+entity("Iukcy") -> 16#00406; -+entity("Iuml") -> 16#000CF; -+entity("Jcirc") -> 16#00134; -+entity("Jcy") -> 16#00419; -+entity("Jfr") -> 16#1D50D; -+entity("Jopf") -> 16#1D541; -+entity("Jscr") -> 16#1D4A5; -+entity("Jsercy") -> 16#00408; -+entity("Jukcy") -> 16#00404; -+entity("KHcy") -> 16#00425; -+entity("KJcy") -> 16#0040C; -+entity("Kappa") -> 16#0039A; -+entity("Kcedil") -> 16#00136; -+entity("Kcy") -> 16#0041A; -+entity("Kfr") -> 16#1D50E; -+entity("Kopf") -> 16#1D542; -+entity("Kscr") -> 16#1D4A6; -+entity("LJcy") -> 16#00409; -+entity("LT") -> 16#0003C; -+entity("Lacute") -> 16#00139; -+entity("Lambda") -> 16#0039B; -+entity("Lang") -> 16#027EA; -+entity("Laplacetrf") -> 16#02112; -+entity("Larr") -> 16#0219E; -+entity("Lcaron") -> 16#0013D; -+entity("Lcedil") -> 16#0013B; -+entity("Lcy") -> 16#0041B; -+entity("LeftAngleBracket") -> 16#027E8; -+entity("LeftArrow") -> 16#02190; -+entity("LeftArrowBar") -> 16#021E4; -+entity("LeftArrowRightArrow") -> 16#021C6; -+entity("LeftCeiling") -> 16#02308; -+entity("LeftDoubleBracket") -> 16#027E6; -+entity("LeftDownTeeVector") -> 16#02961; -+entity("LeftDownVector") -> 16#021C3; -+entity("LeftDownVectorBar") -> 16#02959; -+entity("LeftFloor") -> 16#0230A; -+entity("LeftRightArrow") -> 16#02194; -+entity("LeftRightVector") -> 16#0294E; -+entity("LeftTee") -> 16#022A3; -+entity("LeftTeeArrow") -> 16#021A4; -+entity("LeftTeeVector") -> 16#0295A; -+entity("LeftTriangle") -> 16#022B2; -+entity("LeftTriangleBar") -> 16#029CF; -+entity("LeftTriangleEqual") -> 16#022B4; -+entity("LeftUpDownVector") -> 16#02951; -+entity("LeftUpTeeVector") -> 16#02960; -+entity("LeftUpVector") -> 16#021BF; -+entity("LeftUpVectorBar") -> 16#02958; -+entity("LeftVector") -> 16#021BC; -+entity("LeftVectorBar") -> 16#02952; -+entity("Leftarrow") -> 16#021D0; -+entity("Leftrightarrow") -> 16#021D4; -+entity("LessEqualGreater") -> 16#022DA; -+entity("LessFullEqual") -> 16#02266; -+entity("LessGreater") -> 16#02276; -+entity("LessLess") -> 16#02AA1; -+entity("LessSlantEqual") -> 16#02A7D; -+entity("LessTilde") -> 16#02272; -+entity("Lfr") -> 16#1D50F; -+entity("Ll") -> 16#022D8; -+entity("Lleftarrow") -> 16#021DA; -+entity("Lmidot") -> 16#0013F; -+entity("LongLeftArrow") -> 16#027F5; -+entity("LongLeftRightArrow") -> 16#027F7; -+entity("LongRightArrow") -> 16#027F6; -+entity("Longleftarrow") -> 16#027F8; -+entity("Longleftrightarrow") -> 16#027FA; -+entity("Longrightarrow") -> 16#027F9; -+entity("Lopf") -> 16#1D543; -+entity("LowerLeftArrow") -> 16#02199; -+entity("LowerRightArrow") -> 16#02198; -+entity("Lscr") -> 16#02112; -+entity("Lsh") -> 16#021B0; -+entity("Lstrok") -> 16#00141; -+entity("Lt") -> 16#0226A; -+entity("Map") -> 16#02905; -+entity("Mcy") -> 16#0041C; -+entity("MediumSpace") -> 16#0205F; -+entity("Mellintrf") -> 16#02133; -+entity("Mfr") -> 16#1D510; -+entity("MinusPlus") -> 16#02213; -+entity("Mopf") -> 16#1D544; -+entity("Mscr") -> 16#02133; -+entity("Mu") -> 16#0039C; -+entity("NJcy") -> 16#0040A; -+entity("Nacute") -> 16#00143; -+entity("Ncaron") -> 16#00147; -+entity("Ncedil") -> 16#00145; -+entity("Ncy") -> 16#0041D; -+entity("NegativeMediumSpace") -> 16#0200B; -+entity("NegativeThickSpace") -> 16#0200B; -+entity("NegativeThinSpace") -> 16#0200B; -+entity("NegativeVeryThinSpace") -> 16#0200B; -+entity("NestedGreaterGreater") -> 16#0226B; -+entity("NestedLessLess") -> 16#0226A; -+entity("NewLine") -> 16#0000A; -+entity("Nfr") -> 16#1D511; -+entity("NoBreak") -> 16#02060; -+entity("NonBreakingSpace") -> 16#000A0; -+entity("Nopf") -> 16#02115; -+entity("Not") -> 16#02AEC; -+entity("NotCongruent") -> 16#02262; -+entity("NotCupCap") -> 16#0226D; -+entity("NotDoubleVerticalBar") -> 16#02226; -+entity("NotElement") -> 16#02209; -+entity("NotEqual") -> 16#02260; -+entity("NotEqualTilde") -> [16#02242, 16#00338]; -+entity("NotExists") -> 16#02204; -+entity("NotGreater") -> 16#0226F; -+entity("NotGreaterEqual") -> 16#02271; -+entity("NotGreaterFullEqual") -> [16#02267, 16#00338]; -+entity("NotGreaterGreater") -> [16#0226B, 16#00338]; -+entity("NotGreaterLess") -> 16#02279; -+entity("NotGreaterSlantEqual") -> [16#02A7E, 16#00338]; -+entity("NotGreaterTilde") -> 16#02275; -+entity("NotHumpDownHump") -> [16#0224E, 16#00338]; -+entity("NotHumpEqual") -> [16#0224F, 16#00338]; -+entity("NotLeftTriangle") -> 16#022EA; -+entity("NotLeftTriangleBar") -> [16#029CF, 16#00338]; -+entity("NotLeftTriangleEqual") -> 16#022EC; -+entity("NotLess") -> 16#0226E; -+entity("NotLessEqual") -> 16#02270; -+entity("NotLessGreater") -> 16#02278; -+entity("NotLessLess") -> [16#0226A, 16#00338]; -+entity("NotLessSlantEqual") -> [16#02A7D, 16#00338]; -+entity("NotLessTilde") -> 16#02274; -+entity("NotNestedGreaterGreater") -> [16#02AA2, 16#00338]; -+entity("NotNestedLessLess") -> [16#02AA1, 16#00338]; -+entity("NotPrecedes") -> 16#02280; -+entity("NotPrecedesEqual") -> [16#02AAF, 16#00338]; -+entity("NotPrecedesSlantEqual") -> 16#022E0; -+entity("NotReverseElement") -> 16#0220C; -+entity("NotRightTriangle") -> 16#022EB; -+entity("NotRightTriangleBar") -> [16#029D0, 16#00338]; -+entity("NotRightTriangleEqual") -> 16#022ED; -+entity("NotSquareSubset") -> [16#0228F, 16#00338]; -+entity("NotSquareSubsetEqual") -> 16#022E2; -+entity("NotSquareSuperset") -> [16#02290, 16#00338]; -+entity("NotSquareSupersetEqual") -> 16#022E3; -+entity("NotSubset") -> [16#02282, 16#020D2]; -+entity("NotSubsetEqual") -> 16#02288; -+entity("NotSucceeds") -> 16#02281; -+entity("NotSucceedsEqual") -> [16#02AB0, 16#00338]; -+entity("NotSucceedsSlantEqual") -> 16#022E1; -+entity("NotSucceedsTilde") -> [16#0227F, 16#00338]; -+entity("NotSuperset") -> [16#02283, 16#020D2]; -+entity("NotSupersetEqual") -> 16#02289; -+entity("NotTilde") -> 16#02241; -+entity("NotTildeEqual") -> 16#02244; -+entity("NotTildeFullEqual") -> 16#02247; -+entity("NotTildeTilde") -> 16#02249; -+entity("NotVerticalBar") -> 16#02224; -+entity("Nscr") -> 16#1D4A9; -+entity("Ntilde") -> 16#000D1; -+entity("Nu") -> 16#0039D; -+entity("OElig") -> 16#00152; -+entity("Oacute") -> 16#000D3; -+entity("Ocirc") -> 16#000D4; -+entity("Ocy") -> 16#0041E; -+entity("Odblac") -> 16#00150; -+entity("Ofr") -> 16#1D512; -+entity("Ograve") -> 16#000D2; -+entity("Omacr") -> 16#0014C; -+entity("Omega") -> 16#003A9; -+entity("Omicron") -> 16#0039F; -+entity("Oopf") -> 16#1D546; -+entity("OpenCurlyDoubleQuote") -> 16#0201C; -+entity("OpenCurlyQuote") -> 16#02018; -+entity("Or") -> 16#02A54; -+entity("Oscr") -> 16#1D4AA; -+entity("Oslash") -> 16#000D8; -+entity("Otilde") -> 16#000D5; -+entity("Otimes") -> 16#02A37; -+entity("Ouml") -> 16#000D6; -+entity("OverBar") -> 16#0203E; -+entity("OverBrace") -> 16#023DE; -+entity("OverBracket") -> 16#023B4; -+entity("OverParenthesis") -> 16#023DC; -+entity("PartialD") -> 16#02202; -+entity("Pcy") -> 16#0041F; -+entity("Pfr") -> 16#1D513; -+entity("Phi") -> 16#003A6; -+entity("Pi") -> 16#003A0; -+entity("PlusMinus") -> 16#000B1; -+entity("Poincareplane") -> 16#0210C; -+entity("Popf") -> 16#02119; -+entity("Pr") -> 16#02ABB; -+entity("Precedes") -> 16#0227A; -+entity("PrecedesEqual") -> 16#02AAF; -+entity("PrecedesSlantEqual") -> 16#0227C; -+entity("PrecedesTilde") -> 16#0227E; -+entity("Prime") -> 16#02033; -+entity("Product") -> 16#0220F; -+entity("Proportion") -> 16#02237; -+entity("Proportional") -> 16#0221D; -+entity("Pscr") -> 16#1D4AB; -+entity("Psi") -> 16#003A8; -+entity("QUOT") -> 16#00022; -+entity("Qfr") -> 16#1D514; -+entity("Qopf") -> 16#0211A; -+entity("Qscr") -> 16#1D4AC; -+entity("RBarr") -> 16#02910; -+entity("REG") -> 16#000AE; -+entity("Racute") -> 16#00154; -+entity("Rang") -> 16#027EB; -+entity("Rarr") -> 16#021A0; -+entity("Rarrtl") -> 16#02916; -+entity("Rcaron") -> 16#00158; -+entity("Rcedil") -> 16#00156; -+entity("Rcy") -> 16#00420; -+entity("Re") -> 16#0211C; -+entity("ReverseElement") -> 16#0220B; -+entity("ReverseEquilibrium") -> 16#021CB; -+entity("ReverseUpEquilibrium") -> 16#0296F; -+entity("Rfr") -> 16#0211C; -+entity("Rho") -> 16#003A1; -+entity("RightAngleBracket") -> 16#027E9; -+entity("RightArrow") -> 16#02192; -+entity("RightArrowBar") -> 16#021E5; -+entity("RightArrowLeftArrow") -> 16#021C4; -+entity("RightCeiling") -> 16#02309; -+entity("RightDoubleBracket") -> 16#027E7; -+entity("RightDownTeeVector") -> 16#0295D; -+entity("RightDownVector") -> 16#021C2; -+entity("RightDownVectorBar") -> 16#02955; -+entity("RightFloor") -> 16#0230B; -+entity("RightTee") -> 16#022A2; -+entity("RightTeeArrow") -> 16#021A6; -+entity("RightTeeVector") -> 16#0295B; -+entity("RightTriangle") -> 16#022B3; -+entity("RightTriangleBar") -> 16#029D0; -+entity("RightTriangleEqual") -> 16#022B5; -+entity("RightUpDownVector") -> 16#0294F; -+entity("RightUpTeeVector") -> 16#0295C; -+entity("RightUpVector") -> 16#021BE; -+entity("RightUpVectorBar") -> 16#02954; -+entity("RightVector") -> 16#021C0; -+entity("RightVectorBar") -> 16#02953; -+entity("Rightarrow") -> 16#021D2; -+entity("Ropf") -> 16#0211D; -+entity("RoundImplies") -> 16#02970; -+entity("Rrightarrow") -> 16#021DB; -+entity("Rscr") -> 16#0211B; -+entity("Rsh") -> 16#021B1; -+entity("RuleDelayed") -> 16#029F4; -+entity("SHCHcy") -> 16#00429; -+entity("SHcy") -> 16#00428; -+entity("SOFTcy") -> 16#0042C; -+entity("Sacute") -> 16#0015A; -+entity("Sc") -> 16#02ABC; -+entity("Scaron") -> 16#00160; -+entity("Scedil") -> 16#0015E; -+entity("Scirc") -> 16#0015C; -+entity("Scy") -> 16#00421; -+entity("Sfr") -> 16#1D516; -+entity("ShortDownArrow") -> 16#02193; -+entity("ShortLeftArrow") -> 16#02190; -+entity("ShortRightArrow") -> 16#02192; -+entity("ShortUpArrow") -> 16#02191; -+entity("Sigma") -> 16#003A3; -+entity("SmallCircle") -> 16#02218; -+entity("Sopf") -> 16#1D54A; -+entity("Sqrt") -> 16#0221A; -+entity("Square") -> 16#025A1; -+entity("SquareIntersection") -> 16#02293; -+entity("SquareSubset") -> 16#0228F; -+entity("SquareSubsetEqual") -> 16#02291; -+entity("SquareSuperset") -> 16#02290; -+entity("SquareSupersetEqual") -> 16#02292; -+entity("SquareUnion") -> 16#02294; -+entity("Sscr") -> 16#1D4AE; -+entity("Star") -> 16#022C6; -+entity("Sub") -> 16#022D0; -+entity("Subset") -> 16#022D0; -+entity("SubsetEqual") -> 16#02286; -+entity("Succeeds") -> 16#0227B; -+entity("SucceedsEqual") -> 16#02AB0; -+entity("SucceedsSlantEqual") -> 16#0227D; -+entity("SucceedsTilde") -> 16#0227F; -+entity("SuchThat") -> 16#0220B; -+entity("Sum") -> 16#02211; -+entity("Sup") -> 16#022D1; -+entity("Superset") -> 16#02283; -+entity("SupersetEqual") -> 16#02287; -+entity("Supset") -> 16#022D1; -+entity("THORN") -> 16#000DE; -+entity("TRADE") -> 16#02122; -+entity("TSHcy") -> 16#0040B; -+entity("TScy") -> 16#00426; -+entity("Tab") -> 16#00009; -+entity("Tau") -> 16#003A4; -+entity("Tcaron") -> 16#00164; -+entity("Tcedil") -> 16#00162; -+entity("Tcy") -> 16#00422; -+entity("Tfr") -> 16#1D517; -+entity("Therefore") -> 16#02234; -+entity("Theta") -> 16#00398; -+entity("ThickSpace") -> [16#0205F, 16#0200A]; -+entity("ThinSpace") -> 16#02009; -+entity("Tilde") -> 16#0223C; -+entity("TildeEqual") -> 16#02243; -+entity("TildeFullEqual") -> 16#02245; -+entity("TildeTilde") -> 16#02248; -+entity("Topf") -> 16#1D54B; -+entity("TripleDot") -> 16#020DB; -+entity("Tscr") -> 16#1D4AF; -+entity("Tstrok") -> 16#00166; -+entity("Uacute") -> 16#000DA; -+entity("Uarr") -> 16#0219F; -+entity("Uarrocir") -> 16#02949; -+entity("Ubrcy") -> 16#0040E; -+entity("Ubreve") -> 16#0016C; -+entity("Ucirc") -> 16#000DB; -+entity("Ucy") -> 16#00423; -+entity("Udblac") -> 16#00170; -+entity("Ufr") -> 16#1D518; -+entity("Ugrave") -> 16#000D9; -+entity("Umacr") -> 16#0016A; -+entity("UnderBar") -> 16#0005F; -+entity("UnderBrace") -> 16#023DF; -+entity("UnderBracket") -> 16#023B5; -+entity("UnderParenthesis") -> 16#023DD; -+entity("Union") -> 16#022C3; -+entity("UnionPlus") -> 16#0228E; -+entity("Uogon") -> 16#00172; -+entity("Uopf") -> 16#1D54C; -+entity("UpArrow") -> 16#02191; -+entity("UpArrowBar") -> 16#02912; -+entity("UpArrowDownArrow") -> 16#021C5; -+entity("UpDownArrow") -> 16#02195; -+entity("UpEquilibrium") -> 16#0296E; -+entity("UpTee") -> 16#022A5; -+entity("UpTeeArrow") -> 16#021A5; -+entity("Uparrow") -> 16#021D1; -+entity("Updownarrow") -> 16#021D5; -+entity("UpperLeftArrow") -> 16#02196; -+entity("UpperRightArrow") -> 16#02197; -+entity("Upsi") -> 16#003D2; -+entity("Upsilon") -> 16#003A5; -+entity("Uring") -> 16#0016E; -+entity("Uscr") -> 16#1D4B0; -+entity("Utilde") -> 16#00168; -+entity("Uuml") -> 16#000DC; -+entity("VDash") -> 16#022AB; -+entity("Vbar") -> 16#02AEB; -+entity("Vcy") -> 16#00412; -+entity("Vdash") -> 16#022A9; -+entity("Vdashl") -> 16#02AE6; -+entity("Vee") -> 16#022C1; -+entity("Verbar") -> 16#02016; -+entity("Vert") -> 16#02016; -+entity("VerticalBar") -> 16#02223; -+entity("VerticalLine") -> 16#0007C; -+entity("VerticalSeparator") -> 16#02758; -+entity("VerticalTilde") -> 16#02240; -+entity("VeryThinSpace") -> 16#0200A; -+entity("Vfr") -> 16#1D519; -+entity("Vopf") -> 16#1D54D; -+entity("Vscr") -> 16#1D4B1; -+entity("Vvdash") -> 16#022AA; -+entity("Wcirc") -> 16#00174; -+entity("Wedge") -> 16#022C0; -+entity("Wfr") -> 16#1D51A; -+entity("Wopf") -> 16#1D54E; -+entity("Wscr") -> 16#1D4B2; -+entity("Xfr") -> 16#1D51B; -+entity("Xi") -> 16#0039E; -+entity("Xopf") -> 16#1D54F; -+entity("Xscr") -> 16#1D4B3; -+entity("YAcy") -> 16#0042F; -+entity("YIcy") -> 16#00407; -+entity("YUcy") -> 16#0042E; -+entity("Yacute") -> 16#000DD; -+entity("Ycirc") -> 16#00176; -+entity("Ycy") -> 16#0042B; -+entity("Yfr") -> 16#1D51C; -+entity("Yopf") -> 16#1D550; -+entity("Yscr") -> 16#1D4B4; -+entity("Yuml") -> 16#00178; -+entity("ZHcy") -> 16#00416; -+entity("Zacute") -> 16#00179; -+entity("Zcaron") -> 16#0017D; -+entity("Zcy") -> 16#00417; -+entity("Zdot") -> 16#0017B; -+entity("ZeroWidthSpace") -> 16#0200B; -+entity("Zeta") -> 16#00396; -+entity("Zfr") -> 16#02128; -+entity("Zopf") -> 16#02124; -+entity("Zscr") -> 16#1D4B5; -+entity("aacute") -> 16#000E1; -+entity("abreve") -> 16#00103; -+entity("ac") -> 16#0223E; -+entity("acE") -> [16#0223E, 16#00333]; -+entity("acd") -> 16#0223F; -+entity("acirc") -> 16#000E2; -+entity("acute") -> 16#000B4; -+entity("acy") -> 16#00430; -+entity("aelig") -> 16#000E6; -+entity("af") -> 16#02061; -+entity("afr") -> 16#1D51E; -+entity("agrave") -> 16#000E0; -+entity("alefsym") -> 16#02135; -+entity("aleph") -> 16#02135; -+entity("alpha") -> 16#003B1; -+entity("amacr") -> 16#00101; -+entity("amalg") -> 16#02A3F; -+entity("amp") -> 16#00026; -+entity("and") -> 16#02227; -+entity("andand") -> 16#02A55; -+entity("andd") -> 16#02A5C; -+entity("andslope") -> 16#02A58; -+entity("andv") -> 16#02A5A; -+entity("ang") -> 16#02220; -+entity("ange") -> 16#029A4; -+entity("angle") -> 16#02220; -+entity("angmsd") -> 16#02221; -+entity("angmsdaa") -> 16#029A8; -+entity("angmsdab") -> 16#029A9; -+entity("angmsdac") -> 16#029AA; -+entity("angmsdad") -> 16#029AB; -+entity("angmsdae") -> 16#029AC; -+entity("angmsdaf") -> 16#029AD; -+entity("angmsdag") -> 16#029AE; -+entity("angmsdah") -> 16#029AF; -+entity("angrt") -> 16#0221F; -+entity("angrtvb") -> 16#022BE; -+entity("angrtvbd") -> 16#0299D; -+entity("angsph") -> 16#02222; -+entity("angst") -> 16#000C5; -+entity("angzarr") -> 16#0237C; -+entity("aogon") -> 16#00105; -+entity("aopf") -> 16#1D552; -+entity("ap") -> 16#02248; -+entity("apE") -> 16#02A70; -+entity("apacir") -> 16#02A6F; -+entity("ape") -> 16#0224A; -+entity("apid") -> 16#0224B; -+entity("apos") -> 16#00027; -+entity("approx") -> 16#02248; -+entity("approxeq") -> 16#0224A; -+entity("aring") -> 16#000E5; -+entity("ascr") -> 16#1D4B6; -+entity("ast") -> 16#0002A; -+entity("asymp") -> 16#02248; -+entity("asympeq") -> 16#0224D; -+entity("atilde") -> 16#000E3; -+entity("auml") -> 16#000E4; -+entity("awconint") -> 16#02233; -+entity("awint") -> 16#02A11; -+entity("bNot") -> 16#02AED; -+entity("backcong") -> 16#0224C; -+entity("backepsilon") -> 16#003F6; -+entity("backprime") -> 16#02035; -+entity("backsim") -> 16#0223D; -+entity("backsimeq") -> 16#022CD; -+entity("barvee") -> 16#022BD; -+entity("barwed") -> 16#02305; -+entity("barwedge") -> 16#02305; -+entity("bbrk") -> 16#023B5; -+entity("bbrktbrk") -> 16#023B6; -+entity("bcong") -> 16#0224C; -+entity("bcy") -> 16#00431; -+entity("bdquo") -> 16#0201E; -+entity("becaus") -> 16#02235; -+entity("because") -> 16#02235; -+entity("bemptyv") -> 16#029B0; -+entity("bepsi") -> 16#003F6; -+entity("bernou") -> 16#0212C; -+entity("beta") -> 16#003B2; -+entity("beth") -> 16#02136; -+entity("between") -> 16#0226C; -+entity("bfr") -> 16#1D51F; -+entity("bigcap") -> 16#022C2; -+entity("bigcirc") -> 16#025EF; -+entity("bigcup") -> 16#022C3; -+entity("bigodot") -> 16#02A00; -+entity("bigoplus") -> 16#02A01; -+entity("bigotimes") -> 16#02A02; -+entity("bigsqcup") -> 16#02A06; -+entity("bigstar") -> 16#02605; -+entity("bigtriangledown") -> 16#025BD; -+entity("bigtriangleup") -> 16#025B3; -+entity("biguplus") -> 16#02A04; -+entity("bigvee") -> 16#022C1; -+entity("bigwedge") -> 16#022C0; -+entity("bkarow") -> 16#0290D; -+entity("blacklozenge") -> 16#029EB; -+entity("blacksquare") -> 16#025AA; -+entity("blacktriangle") -> 16#025B4; -+entity("blacktriangledown") -> 16#025BE; -+entity("blacktriangleleft") -> 16#025C2; -+entity("blacktriangleright") -> 16#025B8; -+entity("blank") -> 16#02423; -+entity("blk12") -> 16#02592; -+entity("blk14") -> 16#02591; -+entity("blk34") -> 16#02593; -+entity("block") -> 16#02588; -+entity("bne") -> [16#0003D, 16#020E5]; -+entity("bnequiv") -> [16#02261, 16#020E5]; -+entity("bnot") -> 16#02310; -+entity("bopf") -> 16#1D553; -+entity("bot") -> 16#022A5; -+entity("bottom") -> 16#022A5; -+entity("bowtie") -> 16#022C8; -+entity("boxDL") -> 16#02557; -+entity("boxDR") -> 16#02554; -+entity("boxDl") -> 16#02556; -+entity("boxDr") -> 16#02553; -+entity("boxH") -> 16#02550; -+entity("boxHD") -> 16#02566; -+entity("boxHU") -> 16#02569; -+entity("boxHd") -> 16#02564; -+entity("boxHu") -> 16#02567; -+entity("boxUL") -> 16#0255D; -+entity("boxUR") -> 16#0255A; -+entity("boxUl") -> 16#0255C; -+entity("boxUr") -> 16#02559; -+entity("boxV") -> 16#02551; -+entity("boxVH") -> 16#0256C; -+entity("boxVL") -> 16#02563; -+entity("boxVR") -> 16#02560; -+entity("boxVh") -> 16#0256B; -+entity("boxVl") -> 16#02562; -+entity("boxVr") -> 16#0255F; -+entity("boxbox") -> 16#029C9; -+entity("boxdL") -> 16#02555; -+entity("boxdR") -> 16#02552; -+entity("boxdl") -> 16#02510; -+entity("boxdr") -> 16#0250C; -+entity("boxh") -> 16#02500; -+entity("boxhD") -> 16#02565; -+entity("boxhU") -> 16#02568; -+entity("boxhd") -> 16#0252C; -+entity("boxhu") -> 16#02534; -+entity("boxminus") -> 16#0229F; -+entity("boxplus") -> 16#0229E; -+entity("boxtimes") -> 16#022A0; -+entity("boxuL") -> 16#0255B; -+entity("boxuR") -> 16#02558; -+entity("boxul") -> 16#02518; -+entity("boxur") -> 16#02514; -+entity("boxv") -> 16#02502; -+entity("boxvH") -> 16#0256A; -+entity("boxvL") -> 16#02561; -+entity("boxvR") -> 16#0255E; -+entity("boxvh") -> 16#0253C; -+entity("boxvl") -> 16#02524; -+entity("boxvr") -> 16#0251C; -+entity("bprime") -> 16#02035; -+entity("breve") -> 16#002D8; -+entity("brvbar") -> 16#000A6; -+entity("bscr") -> 16#1D4B7; -+entity("bsemi") -> 16#0204F; -+entity("bsim") -> 16#0223D; -+entity("bsime") -> 16#022CD; -+entity("bsol") -> 16#0005C; -+entity("bsolb") -> 16#029C5; -+entity("bsolhsub") -> 16#027C8; -+entity("bull") -> 16#02022; -+entity("bullet") -> 16#02022; -+entity("bump") -> 16#0224E; -+entity("bumpE") -> 16#02AAE; -+entity("bumpe") -> 16#0224F; -+entity("bumpeq") -> 16#0224F; -+entity("cacute") -> 16#00107; -+entity("cap") -> 16#02229; -+entity("capand") -> 16#02A44; -+entity("capbrcup") -> 16#02A49; -+entity("capcap") -> 16#02A4B; -+entity("capcup") -> 16#02A47; -+entity("capdot") -> 16#02A40; -+entity("caps") -> [16#02229, 16#0FE00]; -+entity("caret") -> 16#02041; -+entity("caron") -> 16#002C7; -+entity("ccaps") -> 16#02A4D; -+entity("ccaron") -> 16#0010D; -+entity("ccedil") -> 16#000E7; -+entity("ccirc") -> 16#00109; -+entity("ccups") -> 16#02A4C; -+entity("ccupssm") -> 16#02A50; -+entity("cdot") -> 16#0010B; -+entity("cedil") -> 16#000B8; -+entity("cemptyv") -> 16#029B2; -+entity("cent") -> 16#000A2; -+entity("centerdot") -> 16#000B7; -+entity("cfr") -> 16#1D520; -+entity("chcy") -> 16#00447; -+entity("check") -> 16#02713; -+entity("checkmark") -> 16#02713; -+entity("chi") -> 16#003C7; -+entity("cir") -> 16#025CB; -+entity("cirE") -> 16#029C3; -+entity("circ") -> 16#002C6; -+entity("circeq") -> 16#02257; -+entity("circlearrowleft") -> 16#021BA; -+entity("circlearrowright") -> 16#021BB; -+entity("circledR") -> 16#000AE; -+entity("circledS") -> 16#024C8; -+entity("circledast") -> 16#0229B; -+entity("circledcirc") -> 16#0229A; -+entity("circleddash") -> 16#0229D; -+entity("cire") -> 16#02257; -+entity("cirfnint") -> 16#02A10; -+entity("cirmid") -> 16#02AEF; -+entity("cirscir") -> 16#029C2; -+entity("clubs") -> 16#02663; -+entity("clubsuit") -> 16#02663; -+entity("colon") -> 16#0003A; -+entity("colone") -> 16#02254; -+entity("coloneq") -> 16#02254; -+entity("comma") -> 16#0002C; -+entity("commat") -> 16#00040; -+entity("comp") -> 16#02201; -+entity("compfn") -> 16#02218; -+entity("complement") -> 16#02201; -+entity("complexes") -> 16#02102; -+entity("cong") -> 16#02245; -+entity("congdot") -> 16#02A6D; -+entity("conint") -> 16#0222E; -+entity("copf") -> 16#1D554; -+entity("coprod") -> 16#02210; -+entity("copy") -> 16#000A9; -+entity("copysr") -> 16#02117; -+entity("crarr") -> 16#021B5; -+entity("cross") -> 16#02717; -+entity("cscr") -> 16#1D4B8; -+entity("csub") -> 16#02ACF; -+entity("csube") -> 16#02AD1; -+entity("csup") -> 16#02AD0; -+entity("csupe") -> 16#02AD2; -+entity("ctdot") -> 16#022EF; -+entity("cudarrl") -> 16#02938; -+entity("cudarrr") -> 16#02935; -+entity("cuepr") -> 16#022DE; -+entity("cuesc") -> 16#022DF; -+entity("cularr") -> 16#021B6; -+entity("cularrp") -> 16#0293D; -+entity("cup") -> 16#0222A; -+entity("cupbrcap") -> 16#02A48; -+entity("cupcap") -> 16#02A46; -+entity("cupcup") -> 16#02A4A; -+entity("cupdot") -> 16#0228D; -+entity("cupor") -> 16#02A45; -+entity("cups") -> [16#0222A, 16#0FE00]; -+entity("curarr") -> 16#021B7; -+entity("curarrm") -> 16#0293C; -+entity("curlyeqprec") -> 16#022DE; -+entity("curlyeqsucc") -> 16#022DF; -+entity("curlyvee") -> 16#022CE; -+entity("curlywedge") -> 16#022CF; -+entity("curren") -> 16#000A4; -+entity("curvearrowleft") -> 16#021B6; -+entity("curvearrowright") -> 16#021B7; -+entity("cuvee") -> 16#022CE; -+entity("cuwed") -> 16#022CF; -+entity("cwconint") -> 16#02232; -+entity("cwint") -> 16#02231; -+entity("cylcty") -> 16#0232D; -+entity("dArr") -> 16#021D3; -+entity("dHar") -> 16#02965; -+entity("dagger") -> 16#02020; -+entity("daleth") -> 16#02138; -+entity("darr") -> 16#02193; -+entity("dash") -> 16#02010; -+entity("dashv") -> 16#022A3; -+entity("dbkarow") -> 16#0290F; -+entity("dblac") -> 16#002DD; -+entity("dcaron") -> 16#0010F; -+entity("dcy") -> 16#00434; -+entity("dd") -> 16#02146; -+entity("ddagger") -> 16#02021; -+entity("ddarr") -> 16#021CA; -+entity("ddotseq") -> 16#02A77; -+entity("deg") -> 16#000B0; -+entity("delta") -> 16#003B4; -+entity("demptyv") -> 16#029B1; -+entity("dfisht") -> 16#0297F; -+entity("dfr") -> 16#1D521; -+entity("dharl") -> 16#021C3; -+entity("dharr") -> 16#021C2; -+entity("diam") -> 16#022C4; -+entity("diamond") -> 16#022C4; -+entity("diamondsuit") -> 16#02666; -+entity("diams") -> 16#02666; -+entity("die") -> 16#000A8; -+entity("digamma") -> 16#003DD; -+entity("disin") -> 16#022F2; -+entity("div") -> 16#000F7; -+entity("divide") -> 16#000F7; -+entity("divideontimes") -> 16#022C7; -+entity("divonx") -> 16#022C7; -+entity("djcy") -> 16#00452; -+entity("dlcorn") -> 16#0231E; -+entity("dlcrop") -> 16#0230D; -+entity("dollar") -> 16#00024; -+entity("dopf") -> 16#1D555; -+entity("dot") -> 16#002D9; -+entity("doteq") -> 16#02250; -+entity("doteqdot") -> 16#02251; -+entity("dotminus") -> 16#02238; -+entity("dotplus") -> 16#02214; -+entity("dotsquare") -> 16#022A1; -+entity("doublebarwedge") -> 16#02306; -+entity("downarrow") -> 16#02193; -+entity("downdownarrows") -> 16#021CA; -+entity("downharpoonleft") -> 16#021C3; -+entity("downharpoonright") -> 16#021C2; -+entity("drbkarow") -> 16#02910; -+entity("drcorn") -> 16#0231F; -+entity("drcrop") -> 16#0230C; -+entity("dscr") -> 16#1D4B9; -+entity("dscy") -> 16#00455; -+entity("dsol") -> 16#029F6; -+entity("dstrok") -> 16#00111; -+entity("dtdot") -> 16#022F1; -+entity("dtri") -> 16#025BF; -+entity("dtrif") -> 16#025BE; -+entity("duarr") -> 16#021F5; -+entity("duhar") -> 16#0296F; -+entity("dwangle") -> 16#029A6; -+entity("dzcy") -> 16#0045F; -+entity("dzigrarr") -> 16#027FF; -+entity("eDDot") -> 16#02A77; -+entity("eDot") -> 16#02251; -+entity("eacute") -> 16#000E9; -+entity("easter") -> 16#02A6E; -+entity("ecaron") -> 16#0011B; -+entity("ecir") -> 16#02256; -+entity("ecirc") -> 16#000EA; -+entity("ecolon") -> 16#02255; -+entity("ecy") -> 16#0044D; -+entity("edot") -> 16#00117; -+entity("ee") -> 16#02147; -+entity("efDot") -> 16#02252; -+entity("efr") -> 16#1D522; -+entity("eg") -> 16#02A9A; -+entity("egrave") -> 16#000E8; -+entity("egs") -> 16#02A96; -+entity("egsdot") -> 16#02A98; -+entity("el") -> 16#02A99; -+entity("elinters") -> 16#023E7; -+entity("ell") -> 16#02113; -+entity("els") -> 16#02A95; -+entity("elsdot") -> 16#02A97; -+entity("emacr") -> 16#00113; -+entity("empty") -> 16#02205; -+entity("emptyset") -> 16#02205; -+entity("emptyv") -> 16#02205; -+entity("emsp") -> 16#02003; -+entity("emsp13") -> 16#02004; -+entity("emsp14") -> 16#02005; -+entity("eng") -> 16#0014B; -+entity("ensp") -> 16#02002; -+entity("eogon") -> 16#00119; -+entity("eopf") -> 16#1D556; -+entity("epar") -> 16#022D5; -+entity("eparsl") -> 16#029E3; -+entity("eplus") -> 16#02A71; -+entity("epsi") -> 16#003B5; -+entity("epsilon") -> 16#003B5; -+entity("epsiv") -> 16#003F5; -+entity("eqcirc") -> 16#02256; -+entity("eqcolon") -> 16#02255; -+entity("eqsim") -> 16#02242; -+entity("eqslantgtr") -> 16#02A96; -+entity("eqslantless") -> 16#02A95; -+entity("equals") -> 16#0003D; -+entity("equest") -> 16#0225F; -+entity("equiv") -> 16#02261; -+entity("equivDD") -> 16#02A78; -+entity("eqvparsl") -> 16#029E5; -+entity("erDot") -> 16#02253; -+entity("erarr") -> 16#02971; -+entity("escr") -> 16#0212F; -+entity("esdot") -> 16#02250; -+entity("esim") -> 16#02242; -+entity("eta") -> 16#003B7; -+entity("eth") -> 16#000F0; -+entity("euml") -> 16#000EB; -+entity("euro") -> 16#020AC; -+entity("excl") -> 16#00021; -+entity("exist") -> 16#02203; -+entity("expectation") -> 16#02130; -+entity("exponentiale") -> 16#02147; -+entity("fallingdotseq") -> 16#02252; -+entity("fcy") -> 16#00444; -+entity("female") -> 16#02640; -+entity("ffilig") -> 16#0FB03; -+entity("fflig") -> 16#0FB00; -+entity("ffllig") -> 16#0FB04; -+entity("ffr") -> 16#1D523; -+entity("filig") -> 16#0FB01; -+entity("fjlig") -> [16#00066, 16#0006A]; -+entity("flat") -> 16#0266D; -+entity("fllig") -> 16#0FB02; -+entity("fltns") -> 16#025B1; -+entity("fnof") -> 16#00192; -+entity("fopf") -> 16#1D557; -+entity("forall") -> 16#02200; -+entity("fork") -> 16#022D4; -+entity("forkv") -> 16#02AD9; -+entity("fpartint") -> 16#02A0D; -+entity("frac12") -> 16#000BD; -+entity("frac13") -> 16#02153; -+entity("frac14") -> 16#000BC; -+entity("frac15") -> 16#02155; -+entity("frac16") -> 16#02159; -+entity("frac18") -> 16#0215B; -+entity("frac23") -> 16#02154; -+entity("frac25") -> 16#02156; -+entity("frac34") -> 16#000BE; -+entity("frac35") -> 16#02157; -+entity("frac38") -> 16#0215C; -+entity("frac45") -> 16#02158; -+entity("frac56") -> 16#0215A; -+entity("frac58") -> 16#0215D; -+entity("frac78") -> 16#0215E; -+entity("frasl") -> 16#02044; -+entity("frown") -> 16#02322; -+entity("fscr") -> 16#1D4BB; -+entity("gE") -> 16#02267; -+entity("gEl") -> 16#02A8C; -+entity("gacute") -> 16#001F5; -+entity("gamma") -> 16#003B3; -+entity("gammad") -> 16#003DD; -+entity("gap") -> 16#02A86; -+entity("gbreve") -> 16#0011F; -+entity("gcirc") -> 16#0011D; -+entity("gcy") -> 16#00433; -+entity("gdot") -> 16#00121; -+entity("ge") -> 16#02265; -+entity("gel") -> 16#022DB; -+entity("geq") -> 16#02265; -+entity("geqq") -> 16#02267; -+entity("geqslant") -> 16#02A7E; -+entity("ges") -> 16#02A7E; -+entity("gescc") -> 16#02AA9; -+entity("gesdot") -> 16#02A80; -+entity("gesdoto") -> 16#02A82; -+entity("gesdotol") -> 16#02A84; -+entity("gesl") -> [16#022DB, 16#0FE00]; -+entity("gesles") -> 16#02A94; -+entity("gfr") -> 16#1D524; -+entity("gg") -> 16#0226B; -+entity("ggg") -> 16#022D9; -+entity("gimel") -> 16#02137; -+entity("gjcy") -> 16#00453; -+entity("gl") -> 16#02277; -+entity("glE") -> 16#02A92; -+entity("gla") -> 16#02AA5; -+entity("glj") -> 16#02AA4; -+entity("gnE") -> 16#02269; -+entity("gnap") -> 16#02A8A; -+entity("gnapprox") -> 16#02A8A; -+entity("gne") -> 16#02A88; -+entity("gneq") -> 16#02A88; -+entity("gneqq") -> 16#02269; -+entity("gnsim") -> 16#022E7; -+entity("gopf") -> 16#1D558; -+entity("grave") -> 16#00060; -+entity("gscr") -> 16#0210A; -+entity("gsim") -> 16#02273; -+entity("gsime") -> 16#02A8E; -+entity("gsiml") -> 16#02A90; -+entity("gt") -> 16#0003E; -+entity("gtcc") -> 16#02AA7; -+entity("gtcir") -> 16#02A7A; -+entity("gtdot") -> 16#022D7; -+entity("gtlPar") -> 16#02995; -+entity("gtquest") -> 16#02A7C; -+entity("gtrapprox") -> 16#02A86; -+entity("gtrarr") -> 16#02978; -+entity("gtrdot") -> 16#022D7; -+entity("gtreqless") -> 16#022DB; -+entity("gtreqqless") -> 16#02A8C; -+entity("gtrless") -> 16#02277; -+entity("gtrsim") -> 16#02273; -+entity("gvertneqq") -> [16#02269, 16#0FE00]; -+entity("gvnE") -> [16#02269, 16#0FE00]; -+entity("hArr") -> 16#021D4; -+entity("hairsp") -> 16#0200A; -+entity("half") -> 16#000BD; -+entity("hamilt") -> 16#0210B; -+entity("hardcy") -> 16#0044A; -+entity("harr") -> 16#02194; -+entity("harrcir") -> 16#02948; -+entity("harrw") -> 16#021AD; -+entity("hbar") -> 16#0210F; -+entity("hcirc") -> 16#00125; -+entity("hearts") -> 16#02665; -+entity("heartsuit") -> 16#02665; -+entity("hellip") -> 16#02026; -+entity("hercon") -> 16#022B9; -+entity("hfr") -> 16#1D525; -+entity("hksearow") -> 16#02925; -+entity("hkswarow") -> 16#02926; -+entity("hoarr") -> 16#021FF; -+entity("homtht") -> 16#0223B; -+entity("hookleftarrow") -> 16#021A9; -+entity("hookrightarrow") -> 16#021AA; -+entity("hopf") -> 16#1D559; -+entity("horbar") -> 16#02015; -+entity("hscr") -> 16#1D4BD; -+entity("hslash") -> 16#0210F; -+entity("hstrok") -> 16#00127; -+entity("hybull") -> 16#02043; -+entity("hyphen") -> 16#02010; -+entity("iacute") -> 16#000ED; -+entity("ic") -> 16#02063; -+entity("icirc") -> 16#000EE; -+entity("icy") -> 16#00438; -+entity("iecy") -> 16#00435; -+entity("iexcl") -> 16#000A1; -+entity("iff") -> 16#021D4; -+entity("ifr") -> 16#1D526; -+entity("igrave") -> 16#000EC; -+entity("ii") -> 16#02148; -+entity("iiiint") -> 16#02A0C; -+entity("iiint") -> 16#0222D; -+entity("iinfin") -> 16#029DC; -+entity("iiota") -> 16#02129; -+entity("ijlig") -> 16#00133; -+entity("imacr") -> 16#0012B; -+entity("image") -> 16#02111; -+entity("imagline") -> 16#02110; -+entity("imagpart") -> 16#02111; -+entity("imath") -> 16#00131; -+entity("imof") -> 16#022B7; -+entity("imped") -> 16#001B5; -+entity("in") -> 16#02208; -+entity("incare") -> 16#02105; -+entity("infin") -> 16#0221E; -+entity("infintie") -> 16#029DD; -+entity("inodot") -> 16#00131; -+entity("int") -> 16#0222B; -+entity("intcal") -> 16#022BA; -+entity("integers") -> 16#02124; -+entity("intercal") -> 16#022BA; -+entity("intlarhk") -> 16#02A17; -+entity("intprod") -> 16#02A3C; -+entity("iocy") -> 16#00451; -+entity("iogon") -> 16#0012F; -+entity("iopf") -> 16#1D55A; -+entity("iota") -> 16#003B9; -+entity("iprod") -> 16#02A3C; -+entity("iquest") -> 16#000BF; -+entity("iscr") -> 16#1D4BE; -+entity("isin") -> 16#02208; -+entity("isinE") -> 16#022F9; -+entity("isindot") -> 16#022F5; -+entity("isins") -> 16#022F4; -+entity("isinsv") -> 16#022F3; -+entity("isinv") -> 16#02208; -+entity("it") -> 16#02062; -+entity("itilde") -> 16#00129; -+entity("iukcy") -> 16#00456; -+entity("iuml") -> 16#000EF; -+entity("jcirc") -> 16#00135; -+entity("jcy") -> 16#00439; -+entity("jfr") -> 16#1D527; -+entity("jmath") -> 16#00237; -+entity("jopf") -> 16#1D55B; -+entity("jscr") -> 16#1D4BF; -+entity("jsercy") -> 16#00458; -+entity("jukcy") -> 16#00454; -+entity("kappa") -> 16#003BA; -+entity("kappav") -> 16#003F0; -+entity("kcedil") -> 16#00137; -+entity("kcy") -> 16#0043A; -+entity("kfr") -> 16#1D528; -+entity("kgreen") -> 16#00138; -+entity("khcy") -> 16#00445; -+entity("kjcy") -> 16#0045C; -+entity("kopf") -> 16#1D55C; -+entity("kscr") -> 16#1D4C0; -+entity("lAarr") -> 16#021DA; -+entity("lArr") -> 16#021D0; -+entity("lAtail") -> 16#0291B; -+entity("lBarr") -> 16#0290E; -+entity("lE") -> 16#02266; -+entity("lEg") -> 16#02A8B; -+entity("lHar") -> 16#02962; -+entity("lacute") -> 16#0013A; -+entity("laemptyv") -> 16#029B4; -+entity("lagran") -> 16#02112; -+entity("lambda") -> 16#003BB; -+entity("lang") -> 16#027E8; -+entity("langd") -> 16#02991; -+entity("langle") -> 16#027E8; -+entity("lap") -> 16#02A85; -+entity("laquo") -> 16#000AB; -+entity("larr") -> 16#02190; -+entity("larrb") -> 16#021E4; -+entity("larrbfs") -> 16#0291F; -+entity("larrfs") -> 16#0291D; -+entity("larrhk") -> 16#021A9; -+entity("larrlp") -> 16#021AB; -+entity("larrpl") -> 16#02939; -+entity("larrsim") -> 16#02973; -+entity("larrtl") -> 16#021A2; -+entity("lat") -> 16#02AAB; -+entity("latail") -> 16#02919; -+entity("late") -> 16#02AAD; -+entity("lates") -> [16#02AAD, 16#0FE00]; -+entity("lbarr") -> 16#0290C; -+entity("lbbrk") -> 16#02772; -+entity("lbrace") -> 16#0007B; -+entity("lbrack") -> 16#0005B; -+entity("lbrke") -> 16#0298B; -+entity("lbrksld") -> 16#0298F; -+entity("lbrkslu") -> 16#0298D; -+entity("lcaron") -> 16#0013E; -+entity("lcedil") -> 16#0013C; -+entity("lceil") -> 16#02308; -+entity("lcub") -> 16#0007B; -+entity("lcy") -> 16#0043B; -+entity("ldca") -> 16#02936; -+entity("ldquo") -> 16#0201C; -+entity("ldquor") -> 16#0201E; -+entity("ldrdhar") -> 16#02967; -+entity("ldrushar") -> 16#0294B; -+entity("ldsh") -> 16#021B2; -+entity("le") -> 16#02264; -+entity("leftarrow") -> 16#02190; -+entity("leftarrowtail") -> 16#021A2; -+entity("leftharpoondown") -> 16#021BD; -+entity("leftharpoonup") -> 16#021BC; -+entity("leftleftarrows") -> 16#021C7; -+entity("leftrightarrow") -> 16#02194; -+entity("leftrightarrows") -> 16#021C6; -+entity("leftrightharpoons") -> 16#021CB; -+entity("leftrightsquigarrow") -> 16#021AD; -+entity("leftthreetimes") -> 16#022CB; -+entity("leg") -> 16#022DA; -+entity("leq") -> 16#02264; -+entity("leqq") -> 16#02266; -+entity("leqslant") -> 16#02A7D; -+entity("les") -> 16#02A7D; -+entity("lescc") -> 16#02AA8; -+entity("lesdot") -> 16#02A7F; -+entity("lesdoto") -> 16#02A81; -+entity("lesdotor") -> 16#02A83; -+entity("lesg") -> [16#022DA, 16#0FE00]; -+entity("lesges") -> 16#02A93; -+entity("lessapprox") -> 16#02A85; -+entity("lessdot") -> 16#022D6; -+entity("lesseqgtr") -> 16#022DA; -+entity("lesseqqgtr") -> 16#02A8B; -+entity("lessgtr") -> 16#02276; -+entity("lesssim") -> 16#02272; -+entity("lfisht") -> 16#0297C; -+entity("lfloor") -> 16#0230A; -+entity("lfr") -> 16#1D529; -+entity("lg") -> 16#02276; -+entity("lgE") -> 16#02A91; -+entity("lhard") -> 16#021BD; -+entity("lharu") -> 16#021BC; -+entity("lharul") -> 16#0296A; -+entity("lhblk") -> 16#02584; -+entity("ljcy") -> 16#00459; -+entity("ll") -> 16#0226A; -+entity("llarr") -> 16#021C7; -+entity("llcorner") -> 16#0231E; -+entity("llhard") -> 16#0296B; -+entity("lltri") -> 16#025FA; -+entity("lmidot") -> 16#00140; -+entity("lmoust") -> 16#023B0; -+entity("lmoustache") -> 16#023B0; -+entity("lnE") -> 16#02268; -+entity("lnap") -> 16#02A89; -+entity("lnapprox") -> 16#02A89; -+entity("lne") -> 16#02A87; -+entity("lneq") -> 16#02A87; -+entity("lneqq") -> 16#02268; -+entity("lnsim") -> 16#022E6; -+entity("loang") -> 16#027EC; -+entity("loarr") -> 16#021FD; -+entity("lobrk") -> 16#027E6; -+entity("longleftarrow") -> 16#027F5; -+entity("longleftrightarrow") -> 16#027F7; -+entity("longmapsto") -> 16#027FC; -+entity("longrightarrow") -> 16#027F6; -+entity("looparrowleft") -> 16#021AB; -+entity("looparrowright") -> 16#021AC; -+entity("lopar") -> 16#02985; -+entity("lopf") -> 16#1D55D; -+entity("loplus") -> 16#02A2D; -+entity("lotimes") -> 16#02A34; -+entity("lowast") -> 16#02217; -+entity("lowbar") -> 16#0005F; -+entity("loz") -> 16#025CA; -+entity("lozenge") -> 16#025CA; -+entity("lozf") -> 16#029EB; -+entity("lpar") -> 16#00028; -+entity("lparlt") -> 16#02993; -+entity("lrarr") -> 16#021C6; -+entity("lrcorner") -> 16#0231F; -+entity("lrhar") -> 16#021CB; -+entity("lrhard") -> 16#0296D; -+entity("lrm") -> 16#0200E; -+entity("lrtri") -> 16#022BF; -+entity("lsaquo") -> 16#02039; -+entity("lscr") -> 16#1D4C1; -+entity("lsh") -> 16#021B0; -+entity("lsim") -> 16#02272; -+entity("lsime") -> 16#02A8D; -+entity("lsimg") -> 16#02A8F; -+entity("lsqb") -> 16#0005B; -+entity("lsquo") -> 16#02018; -+entity("lsquor") -> 16#0201A; -+entity("lstrok") -> 16#00142; -+entity("lt") -> 16#0003C; -+entity("ltcc") -> 16#02AA6; -+entity("ltcir") -> 16#02A79; -+entity("ltdot") -> 16#022D6; -+entity("lthree") -> 16#022CB; -+entity("ltimes") -> 16#022C9; -+entity("ltlarr") -> 16#02976; -+entity("ltquest") -> 16#02A7B; -+entity("ltrPar") -> 16#02996; -+entity("ltri") -> 16#025C3; -+entity("ltrie") -> 16#022B4; -+entity("ltrif") -> 16#025C2; -+entity("lurdshar") -> 16#0294A; -+entity("luruhar") -> 16#02966; -+entity("lvertneqq") -> [16#02268, 16#0FE00]; -+entity("lvnE") -> [16#02268, 16#0FE00]; -+entity("mDDot") -> 16#0223A; -+entity("macr") -> 16#000AF; -+entity("male") -> 16#02642; -+entity("malt") -> 16#02720; -+entity("maltese") -> 16#02720; -+entity("map") -> 16#021A6; -+entity("mapsto") -> 16#021A6; -+entity("mapstodown") -> 16#021A7; -+entity("mapstoleft") -> 16#021A4; -+entity("mapstoup") -> 16#021A5; -+entity("marker") -> 16#025AE; -+entity("mcomma") -> 16#02A29; -+entity("mcy") -> 16#0043C; -+entity("mdash") -> 16#02014; -+entity("measuredangle") -> 16#02221; -+entity("mfr") -> 16#1D52A; -+entity("mho") -> 16#02127; -+entity("micro") -> 16#000B5; -+entity("mid") -> 16#02223; -+entity("midast") -> 16#0002A; -+entity("midcir") -> 16#02AF0; -+entity("middot") -> 16#000B7; -+entity("minus") -> 16#02212; -+entity("minusb") -> 16#0229F; -+entity("minusd") -> 16#02238; -+entity("minusdu") -> 16#02A2A; -+entity("mlcp") -> 16#02ADB; -+entity("mldr") -> 16#02026; -+entity("mnplus") -> 16#02213; -+entity("models") -> 16#022A7; -+entity("mopf") -> 16#1D55E; -+entity("mp") -> 16#02213; -+entity("mscr") -> 16#1D4C2; -+entity("mstpos") -> 16#0223E; -+entity("mu") -> 16#003BC; -+entity("multimap") -> 16#022B8; -+entity("mumap") -> 16#022B8; -+entity("nGg") -> [16#022D9, 16#00338]; -+entity("nGt") -> [16#0226B, 16#020D2]; -+entity("nGtv") -> [16#0226B, 16#00338]; -+entity("nLeftarrow") -> 16#021CD; -+entity("nLeftrightarrow") -> 16#021CE; -+entity("nLl") -> [16#022D8, 16#00338]; -+entity("nLt") -> [16#0226A, 16#020D2]; -+entity("nLtv") -> [16#0226A, 16#00338]; -+entity("nRightarrow") -> 16#021CF; -+entity("nVDash") -> 16#022AF; -+entity("nVdash") -> 16#022AE; -+entity("nabla") -> 16#02207; -+entity("nacute") -> 16#00144; -+entity("nang") -> [16#02220, 16#020D2]; -+entity("nap") -> 16#02249; -+entity("napE") -> [16#02A70, 16#00338]; -+entity("napid") -> [16#0224B, 16#00338]; -+entity("napos") -> 16#00149; -+entity("napprox") -> 16#02249; -+entity("natur") -> 16#0266E; -+entity("natural") -> 16#0266E; -+entity("naturals") -> 16#02115; -+entity("nbsp") -> 16#000A0; -+entity("nbump") -> [16#0224E, 16#00338]; -+entity("nbumpe") -> [16#0224F, 16#00338]; -+entity("ncap") -> 16#02A43; -+entity("ncaron") -> 16#00148; -+entity("ncedil") -> 16#00146; -+entity("ncong") -> 16#02247; -+entity("ncongdot") -> [16#02A6D, 16#00338]; -+entity("ncup") -> 16#02A42; -+entity("ncy") -> 16#0043D; -+entity("ndash") -> 16#02013; -+entity("ne") -> 16#02260; -+entity("neArr") -> 16#021D7; -+entity("nearhk") -> 16#02924; -+entity("nearr") -> 16#02197; -+entity("nearrow") -> 16#02197; -+entity("nedot") -> [16#02250, 16#00338]; -+entity("nequiv") -> 16#02262; -+entity("nesear") -> 16#02928; -+entity("nesim") -> [16#02242, 16#00338]; -+entity("nexist") -> 16#02204; -+entity("nexists") -> 16#02204; -+entity("nfr") -> 16#1D52B; -+entity("ngE") -> [16#02267, 16#00338]; -+entity("nge") -> 16#02271; -+entity("ngeq") -> 16#02271; -+entity("ngeqq") -> [16#02267, 16#00338]; -+entity("ngeqslant") -> [16#02A7E, 16#00338]; -+entity("nges") -> [16#02A7E, 16#00338]; -+entity("ngsim") -> 16#02275; -+entity("ngt") -> 16#0226F; -+entity("ngtr") -> 16#0226F; -+entity("nhArr") -> 16#021CE; -+entity("nharr") -> 16#021AE; -+entity("nhpar") -> 16#02AF2; -+entity("ni") -> 16#0220B; -+entity("nis") -> 16#022FC; -+entity("nisd") -> 16#022FA; -+entity("niv") -> 16#0220B; -+entity("njcy") -> 16#0045A; -+entity("nlArr") -> 16#021CD; -+entity("nlE") -> [16#02266, 16#00338]; -+entity("nlarr") -> 16#0219A; -+entity("nldr") -> 16#02025; -+entity("nle") -> 16#02270; -+entity("nleftarrow") -> 16#0219A; -+entity("nleftrightarrow") -> 16#021AE; -+entity("nleq") -> 16#02270; -+entity("nleqq") -> [16#02266, 16#00338]; -+entity("nleqslant") -> [16#02A7D, 16#00338]; -+entity("nles") -> [16#02A7D, 16#00338]; -+entity("nless") -> 16#0226E; -+entity("nlsim") -> 16#02274; -+entity("nlt") -> 16#0226E; -+entity("nltri") -> 16#022EA; -+entity("nltrie") -> 16#022EC; -+entity("nmid") -> 16#02224; -+entity("nopf") -> 16#1D55F; -+entity("not") -> 16#000AC; -+entity("notin") -> 16#02209; -+entity("notinE") -> [16#022F9, 16#00338]; -+entity("notindot") -> [16#022F5, 16#00338]; -+entity("notinva") -> 16#02209; -+entity("notinvb") -> 16#022F7; -+entity("notinvc") -> 16#022F6; -+entity("notni") -> 16#0220C; -+entity("notniva") -> 16#0220C; -+entity("notnivb") -> 16#022FE; -+entity("notnivc") -> 16#022FD; -+entity("npar") -> 16#02226; -+entity("nparallel") -> 16#02226; -+entity("nparsl") -> [16#02AFD, 16#020E5]; -+entity("npart") -> [16#02202, 16#00338]; -+entity("npolint") -> 16#02A14; -+entity("npr") -> 16#02280; -+entity("nprcue") -> 16#022E0; -+entity("npre") -> [16#02AAF, 16#00338]; -+entity("nprec") -> 16#02280; -+entity("npreceq") -> [16#02AAF, 16#00338]; -+entity("nrArr") -> 16#021CF; -+entity("nrarr") -> 16#0219B; -+entity("nrarrc") -> [16#02933, 16#00338]; -+entity("nrarrw") -> [16#0219D, 16#00338]; -+entity("nrightarrow") -> 16#0219B; -+entity("nrtri") -> 16#022EB; -+entity("nrtrie") -> 16#022ED; -+entity("nsc") -> 16#02281; -+entity("nsccue") -> 16#022E1; -+entity("nsce") -> [16#02AB0, 16#00338]; -+entity("nscr") -> 16#1D4C3; -+entity("nshortmid") -> 16#02224; -+entity("nshortparallel") -> 16#02226; -+entity("nsim") -> 16#02241; -+entity("nsime") -> 16#02244; -+entity("nsimeq") -> 16#02244; -+entity("nsmid") -> 16#02224; -+entity("nspar") -> 16#02226; -+entity("nsqsube") -> 16#022E2; -+entity("nsqsupe") -> 16#022E3; -+entity("nsub") -> 16#02284; -+entity("nsubE") -> [16#02AC5, 16#00338]; -+entity("nsube") -> 16#02288; -+entity("nsubset") -> [16#02282, 16#020D2]; -+entity("nsubseteq") -> 16#02288; -+entity("nsubseteqq") -> [16#02AC5, 16#00338]; -+entity("nsucc") -> 16#02281; -+entity("nsucceq") -> [16#02AB0, 16#00338]; -+entity("nsup") -> 16#02285; -+entity("nsupE") -> [16#02AC6, 16#00338]; -+entity("nsupe") -> 16#02289; -+entity("nsupset") -> [16#02283, 16#020D2]; -+entity("nsupseteq") -> 16#02289; -+entity("nsupseteqq") -> [16#02AC6, 16#00338]; -+entity("ntgl") -> 16#02279; -+entity("ntilde") -> 16#000F1; -+entity("ntlg") -> 16#02278; -+entity("ntriangleleft") -> 16#022EA; -+entity("ntrianglelefteq") -> 16#022EC; -+entity("ntriangleright") -> 16#022EB; -+entity("ntrianglerighteq") -> 16#022ED; -+entity("nu") -> 16#003BD; -+entity("num") -> 16#00023; -+entity("numero") -> 16#02116; -+entity("numsp") -> 16#02007; -+entity("nvDash") -> 16#022AD; -+entity("nvHarr") -> 16#02904; -+entity("nvap") -> [16#0224D, 16#020D2]; -+entity("nvdash") -> 16#022AC; -+entity("nvge") -> [16#02265, 16#020D2]; -+entity("nvgt") -> [16#0003E, 16#020D2]; -+entity("nvinfin") -> 16#029DE; -+entity("nvlArr") -> 16#02902; -+entity("nvle") -> [16#02264, 16#020D2]; -+entity("nvlt") -> [16#0003C, 16#020D2]; -+entity("nvltrie") -> [16#022B4, 16#020D2]; -+entity("nvrArr") -> 16#02903; -+entity("nvrtrie") -> [16#022B5, 16#020D2]; -+entity("nvsim") -> [16#0223C, 16#020D2]; -+entity("nwArr") -> 16#021D6; -+entity("nwarhk") -> 16#02923; -+entity("nwarr") -> 16#02196; -+entity("nwarrow") -> 16#02196; -+entity("nwnear") -> 16#02927; -+entity("oS") -> 16#024C8; -+entity("oacute") -> 16#000F3; -+entity("oast") -> 16#0229B; -+entity("ocir") -> 16#0229A; -+entity("ocirc") -> 16#000F4; -+entity("ocy") -> 16#0043E; -+entity("odash") -> 16#0229D; -+entity("odblac") -> 16#00151; -+entity("odiv") -> 16#02A38; -+entity("odot") -> 16#02299; -+entity("odsold") -> 16#029BC; -+entity("oelig") -> 16#00153; -+entity("ofcir") -> 16#029BF; -+entity("ofr") -> 16#1D52C; -+entity("ogon") -> 16#002DB; -+entity("ograve") -> 16#000F2; -+entity("ogt") -> 16#029C1; -+entity("ohbar") -> 16#029B5; -+entity("ohm") -> 16#003A9; -+entity("oint") -> 16#0222E; -+entity("olarr") -> 16#021BA; -+entity("olcir") -> 16#029BE; -+entity("olcross") -> 16#029BB; -+entity("oline") -> 16#0203E; -+entity("olt") -> 16#029C0; -+entity("omacr") -> 16#0014D; -+entity("omega") -> 16#003C9; -+entity("omicron") -> 16#003BF; -+entity("omid") -> 16#029B6; -+entity("ominus") -> 16#02296; -+entity("oopf") -> 16#1D560; -+entity("opar") -> 16#029B7; -+entity("operp") -> 16#029B9; -+entity("oplus") -> 16#02295; -+entity("or") -> 16#02228; -+entity("orarr") -> 16#021BB; -+entity("ord") -> 16#02A5D; -+entity("order") -> 16#02134; -+entity("orderof") -> 16#02134; -+entity("ordf") -> 16#000AA; -+entity("ordm") -> 16#000BA; -+entity("origof") -> 16#022B6; -+entity("oror") -> 16#02A56; -+entity("orslope") -> 16#02A57; -+entity("orv") -> 16#02A5B; -+entity("oscr") -> 16#02134; -+entity("oslash") -> 16#000F8; -+entity("osol") -> 16#02298; -+entity("otilde") -> 16#000F5; -+entity("otimes") -> 16#02297; -+entity("otimesas") -> 16#02A36; -+entity("ouml") -> 16#000F6; -+entity("ovbar") -> 16#0233D; -+entity("par") -> 16#02225; -+entity("para") -> 16#000B6; -+entity("parallel") -> 16#02225; -+entity("parsim") -> 16#02AF3; -+entity("parsl") -> 16#02AFD; -+entity("part") -> 16#02202; -+entity("pcy") -> 16#0043F; -+entity("percnt") -> 16#00025; -+entity("period") -> 16#0002E; -+entity("permil") -> 16#02030; -+entity("perp") -> 16#022A5; -+entity("pertenk") -> 16#02031; -+entity("pfr") -> 16#1D52D; -+entity("phi") -> 16#003C6; -+entity("phiv") -> 16#003D5; -+entity("phmmat") -> 16#02133; -+entity("phone") -> 16#0260E; -+entity("pi") -> 16#003C0; -+entity("pitchfork") -> 16#022D4; -+entity("piv") -> 16#003D6; -+entity("planck") -> 16#0210F; -+entity("planckh") -> 16#0210E; -+entity("plankv") -> 16#0210F; -+entity("plus") -> 16#0002B; -+entity("plusacir") -> 16#02A23; -+entity("plusb") -> 16#0229E; -+entity("pluscir") -> 16#02A22; -+entity("plusdo") -> 16#02214; -+entity("plusdu") -> 16#02A25; -+entity("pluse") -> 16#02A72; -+entity("plusmn") -> 16#000B1; -+entity("plussim") -> 16#02A26; -+entity("plustwo") -> 16#02A27; -+entity("pm") -> 16#000B1; -+entity("pointint") -> 16#02A15; -+entity("popf") -> 16#1D561; -+entity("pound") -> 16#000A3; -+entity("pr") -> 16#0227A; -+entity("prE") -> 16#02AB3; -+entity("prap") -> 16#02AB7; -+entity("prcue") -> 16#0227C; -+entity("pre") -> 16#02AAF; -+entity("prec") -> 16#0227A; -+entity("precapprox") -> 16#02AB7; -+entity("preccurlyeq") -> 16#0227C; -+entity("preceq") -> 16#02AAF; -+entity("precnapprox") -> 16#02AB9; -+entity("precneqq") -> 16#02AB5; -+entity("precnsim") -> 16#022E8; -+entity("precsim") -> 16#0227E; -+entity("prime") -> 16#02032; -+entity("primes") -> 16#02119; -+entity("prnE") -> 16#02AB5; -+entity("prnap") -> 16#02AB9; -+entity("prnsim") -> 16#022E8; -+entity("prod") -> 16#0220F; -+entity("profalar") -> 16#0232E; -+entity("profline") -> 16#02312; -+entity("profsurf") -> 16#02313; -+entity("prop") -> 16#0221D; -+entity("propto") -> 16#0221D; -+entity("prsim") -> 16#0227E; -+entity("prurel") -> 16#022B0; -+entity("pscr") -> 16#1D4C5; -+entity("psi") -> 16#003C8; -+entity("puncsp") -> 16#02008; -+entity("qfr") -> 16#1D52E; -+entity("qint") -> 16#02A0C; -+entity("qopf") -> 16#1D562; -+entity("qprime") -> 16#02057; -+entity("qscr") -> 16#1D4C6; -+entity("quaternions") -> 16#0210D; -+entity("quatint") -> 16#02A16; -+entity("quest") -> 16#0003F; -+entity("questeq") -> 16#0225F; -+entity("quot") -> 16#00022; -+entity("rAarr") -> 16#021DB; -+entity("rArr") -> 16#021D2; -+entity("rAtail") -> 16#0291C; -+entity("rBarr") -> 16#0290F; -+entity("rHar") -> 16#02964; -+entity("race") -> [16#0223D, 16#00331]; -+entity("racute") -> 16#00155; -+entity("radic") -> 16#0221A; -+entity("raemptyv") -> 16#029B3; -+entity("rang") -> 16#027E9; -+entity("rangd") -> 16#02992; -+entity("range") -> 16#029A5; -+entity("rangle") -> 16#027E9; -+entity("raquo") -> 16#000BB; -+entity("rarr") -> 16#02192; -+entity("rarrap") -> 16#02975; -+entity("rarrb") -> 16#021E5; -+entity("rarrbfs") -> 16#02920; -+entity("rarrc") -> 16#02933; -+entity("rarrfs") -> 16#0291E; -+entity("rarrhk") -> 16#021AA; -+entity("rarrlp") -> 16#021AC; -+entity("rarrpl") -> 16#02945; -+entity("rarrsim") -> 16#02974; -+entity("rarrtl") -> 16#021A3; -+entity("rarrw") -> 16#0219D; -+entity("ratail") -> 16#0291A; -+entity("ratio") -> 16#02236; -+entity("rationals") -> 16#0211A; -+entity("rbarr") -> 16#0290D; -+entity("rbbrk") -> 16#02773; -+entity("rbrace") -> 16#0007D; -+entity("rbrack") -> 16#0005D; -+entity("rbrke") -> 16#0298C; -+entity("rbrksld") -> 16#0298E; -+entity("rbrkslu") -> 16#02990; -+entity("rcaron") -> 16#00159; -+entity("rcedil") -> 16#00157; -+entity("rceil") -> 16#02309; -+entity("rcub") -> 16#0007D; -+entity("rcy") -> 16#00440; -+entity("rdca") -> 16#02937; -+entity("rdldhar") -> 16#02969; -+entity("rdquo") -> 16#0201D; -+entity("rdquor") -> 16#0201D; -+entity("rdsh") -> 16#021B3; -+entity("real") -> 16#0211C; -+entity("realine") -> 16#0211B; -+entity("realpart") -> 16#0211C; -+entity("reals") -> 16#0211D; -+entity("rect") -> 16#025AD; -+entity("reg") -> 16#000AE; -+entity("rfisht") -> 16#0297D; -+entity("rfloor") -> 16#0230B; -+entity("rfr") -> 16#1D52F; -+entity("rhard") -> 16#021C1; -+entity("rharu") -> 16#021C0; -+entity("rharul") -> 16#0296C; -+entity("rho") -> 16#003C1; -+entity("rhov") -> 16#003F1; -+entity("rightarrow") -> 16#02192; -+entity("rightarrowtail") -> 16#021A3; -+entity("rightharpoondown") -> 16#021C1; -+entity("rightharpoonup") -> 16#021C0; -+entity("rightleftarrows") -> 16#021C4; -+entity("rightleftharpoons") -> 16#021CC; -+entity("rightrightarrows") -> 16#021C9; -+entity("rightsquigarrow") -> 16#0219D; -+entity("rightthreetimes") -> 16#022CC; -+entity("ring") -> 16#002DA; -+entity("risingdotseq") -> 16#02253; -+entity("rlarr") -> 16#021C4; -+entity("rlhar") -> 16#021CC; -+entity("rlm") -> 16#0200F; -+entity("rmoust") -> 16#023B1; -+entity("rmoustache") -> 16#023B1; -+entity("rnmid") -> 16#02AEE; -+entity("roang") -> 16#027ED; -+entity("roarr") -> 16#021FE; -+entity("robrk") -> 16#027E7; -+entity("ropar") -> 16#02986; -+entity("ropf") -> 16#1D563; -+entity("roplus") -> 16#02A2E; -+entity("rotimes") -> 16#02A35; -+entity("rpar") -> 16#00029; -+entity("rpargt") -> 16#02994; -+entity("rppolint") -> 16#02A12; -+entity("rrarr") -> 16#021C9; -+entity("rsaquo") -> 16#0203A; -+entity("rscr") -> 16#1D4C7; -+entity("rsh") -> 16#021B1; -+entity("rsqb") -> 16#0005D; -+entity("rsquo") -> 16#02019; -+entity("rsquor") -> 16#02019; -+entity("rthree") -> 16#022CC; -+entity("rtimes") -> 16#022CA; -+entity("rtri") -> 16#025B9; -+entity("rtrie") -> 16#022B5; -+entity("rtrif") -> 16#025B8; -+entity("rtriltri") -> 16#029CE; -+entity("ruluhar") -> 16#02968; -+entity("rx") -> 16#0211E; -+entity("sacute") -> 16#0015B; -+entity("sbquo") -> 16#0201A; -+entity("sc") -> 16#0227B; -+entity("scE") -> 16#02AB4; -+entity("scap") -> 16#02AB8; -+entity("scaron") -> 16#00161; -+entity("sccue") -> 16#0227D; -+entity("sce") -> 16#02AB0; -+entity("scedil") -> 16#0015F; -+entity("scirc") -> 16#0015D; -+entity("scnE") -> 16#02AB6; -+entity("scnap") -> 16#02ABA; -+entity("scnsim") -> 16#022E9; -+entity("scpolint") -> 16#02A13; -+entity("scsim") -> 16#0227F; -+entity("scy") -> 16#00441; -+entity("sdot") -> 16#022C5; -+entity("sdotb") -> 16#022A1; -+entity("sdote") -> 16#02A66; -+entity("seArr") -> 16#021D8; -+entity("searhk") -> 16#02925; -+entity("searr") -> 16#02198; -+entity("searrow") -> 16#02198; -+entity("sect") -> 16#000A7; -+entity("semi") -> 16#0003B; -+entity("seswar") -> 16#02929; -+entity("setminus") -> 16#02216; -+entity("setmn") -> 16#02216; -+entity("sext") -> 16#02736; -+entity("sfr") -> 16#1D530; -+entity("sfrown") -> 16#02322; -+entity("sharp") -> 16#0266F; -+entity("shchcy") -> 16#00449; -+entity("shcy") -> 16#00448; -+entity("shortmid") -> 16#02223; -+entity("shortparallel") -> 16#02225; -+entity("shy") -> 16#000AD; -+entity("sigma") -> 16#003C3; -+entity("sigmaf") -> 16#003C2; -+entity("sigmav") -> 16#003C2; -+entity("sim") -> 16#0223C; -+entity("simdot") -> 16#02A6A; -+entity("sime") -> 16#02243; -+entity("simeq") -> 16#02243; -+entity("simg") -> 16#02A9E; -+entity("simgE") -> 16#02AA0; -+entity("siml") -> 16#02A9D; -+entity("simlE") -> 16#02A9F; -+entity("simne") -> 16#02246; -+entity("simplus") -> 16#02A24; -+entity("simrarr") -> 16#02972; -+entity("slarr") -> 16#02190; -+entity("smallsetminus") -> 16#02216; -+entity("smashp") -> 16#02A33; -+entity("smeparsl") -> 16#029E4; -+entity("smid") -> 16#02223; -+entity("smile") -> 16#02323; -+entity("smt") -> 16#02AAA; -+entity("smte") -> 16#02AAC; -+entity("smtes") -> [16#02AAC, 16#0FE00]; -+entity("softcy") -> 16#0044C; -+entity("sol") -> 16#0002F; -+entity("solb") -> 16#029C4; -+entity("solbar") -> 16#0233F; -+entity("sopf") -> 16#1D564; -+entity("spades") -> 16#02660; -+entity("spadesuit") -> 16#02660; -+entity("spar") -> 16#02225; -+entity("sqcap") -> 16#02293; -+entity("sqcaps") -> [16#02293, 16#0FE00]; -+entity("sqcup") -> 16#02294; -+entity("sqcups") -> [16#02294, 16#0FE00]; -+entity("sqsub") -> 16#0228F; -+entity("sqsube") -> 16#02291; -+entity("sqsubset") -> 16#0228F; -+entity("sqsubseteq") -> 16#02291; -+entity("sqsup") -> 16#02290; -+entity("sqsupe") -> 16#02292; -+entity("sqsupset") -> 16#02290; -+entity("sqsupseteq") -> 16#02292; -+entity("squ") -> 16#025A1; -+entity("square") -> 16#025A1; -+entity("squarf") -> 16#025AA; -+entity("squf") -> 16#025AA; -+entity("srarr") -> 16#02192; -+entity("sscr") -> 16#1D4C8; -+entity("ssetmn") -> 16#02216; -+entity("ssmile") -> 16#02323; -+entity("sstarf") -> 16#022C6; -+entity("star") -> 16#02606; -+entity("starf") -> 16#02605; -+entity("straightepsilon") -> 16#003F5; -+entity("straightphi") -> 16#003D5; -+entity("strns") -> 16#000AF; -+entity("sub") -> 16#02282; -+entity("subE") -> 16#02AC5; -+entity("subdot") -> 16#02ABD; -+entity("sube") -> 16#02286; -+entity("subedot") -> 16#02AC3; -+entity("submult") -> 16#02AC1; -+entity("subnE") -> 16#02ACB; -+entity("subne") -> 16#0228A; -+entity("subplus") -> 16#02ABF; -+entity("subrarr") -> 16#02979; -+entity("subset") -> 16#02282; -+entity("subseteq") -> 16#02286; -+entity("subseteqq") -> 16#02AC5; -+entity("subsetneq") -> 16#0228A; -+entity("subsetneqq") -> 16#02ACB; -+entity("subsim") -> 16#02AC7; -+entity("subsub") -> 16#02AD5; -+entity("subsup") -> 16#02AD3; -+entity("succ") -> 16#0227B; -+entity("succapprox") -> 16#02AB8; -+entity("succcurlyeq") -> 16#0227D; -+entity("succeq") -> 16#02AB0; -+entity("succnapprox") -> 16#02ABA; -+entity("succneqq") -> 16#02AB6; -+entity("succnsim") -> 16#022E9; -+entity("succsim") -> 16#0227F; -+entity("sum") -> 16#02211; -+entity("sung") -> 16#0266A; -+entity("sup") -> 16#02283; -+entity("sup1") -> 16#000B9; -+entity("sup2") -> 16#000B2; -+entity("sup3") -> 16#000B3; -+entity("supE") -> 16#02AC6; -+entity("supdot") -> 16#02ABE; -+entity("supdsub") -> 16#02AD8; -+entity("supe") -> 16#02287; -+entity("supedot") -> 16#02AC4; -+entity("suphsol") -> 16#027C9; -+entity("suphsub") -> 16#02AD7; -+entity("suplarr") -> 16#0297B; -+entity("supmult") -> 16#02AC2; -+entity("supnE") -> 16#02ACC; -+entity("supne") -> 16#0228B; -+entity("supplus") -> 16#02AC0; -+entity("supset") -> 16#02283; -+entity("supseteq") -> 16#02287; -+entity("supseteqq") -> 16#02AC6; -+entity("supsetneq") -> 16#0228B; -+entity("supsetneqq") -> 16#02ACC; -+entity("supsim") -> 16#02AC8; -+entity("supsub") -> 16#02AD4; -+entity("supsup") -> 16#02AD6; -+entity("swArr") -> 16#021D9; -+entity("swarhk") -> 16#02926; -+entity("swarr") -> 16#02199; -+entity("swarrow") -> 16#02199; -+entity("swnwar") -> 16#0292A; -+entity("szlig") -> 16#000DF; -+entity("target") -> 16#02316; -+entity("tau") -> 16#003C4; -+entity("tbrk") -> 16#023B4; -+entity("tcaron") -> 16#00165; -+entity("tcedil") -> 16#00163; -+entity("tcy") -> 16#00442; -+entity("tdot") -> 16#020DB; -+entity("telrec") -> 16#02315; -+entity("tfr") -> 16#1D531; -+entity("there4") -> 16#02234; -+entity("therefore") -> 16#02234; -+entity("theta") -> 16#003B8; -+entity("thetasym") -> 16#003D1; -+entity("thetav") -> 16#003D1; -+entity("thickapprox") -> 16#02248; -+entity("thicksim") -> 16#0223C; -+entity("thinsp") -> 16#02009; -+entity("thkap") -> 16#02248; -+entity("thksim") -> 16#0223C; -+entity("thorn") -> 16#000FE; -+entity("tilde") -> 16#002DC; -+entity("times") -> 16#000D7; -+entity("timesb") -> 16#022A0; -+entity("timesbar") -> 16#02A31; -+entity("timesd") -> 16#02A30; -+entity("tint") -> 16#0222D; -+entity("toea") -> 16#02928; -+entity("top") -> 16#022A4; -+entity("topbot") -> 16#02336; -+entity("topcir") -> 16#02AF1; -+entity("topf") -> 16#1D565; -+entity("topfork") -> 16#02ADA; -+entity("tosa") -> 16#02929; -+entity("tprime") -> 16#02034; -+entity("trade") -> 16#02122; -+entity("triangle") -> 16#025B5; -+entity("triangledown") -> 16#025BF; -+entity("triangleleft") -> 16#025C3; -+entity("trianglelefteq") -> 16#022B4; -+entity("triangleq") -> 16#0225C; -+entity("triangleright") -> 16#025B9; -+entity("trianglerighteq") -> 16#022B5; -+entity("tridot") -> 16#025EC; -+entity("trie") -> 16#0225C; -+entity("triminus") -> 16#02A3A; -+entity("triplus") -> 16#02A39; -+entity("trisb") -> 16#029CD; -+entity("tritime") -> 16#02A3B; -+entity("trpezium") -> 16#023E2; -+entity("tscr") -> 16#1D4C9; -+entity("tscy") -> 16#00446; -+entity("tshcy") -> 16#0045B; -+entity("tstrok") -> 16#00167; -+entity("twixt") -> 16#0226C; -+entity("twoheadleftarrow") -> 16#0219E; -+entity("twoheadrightarrow") -> 16#021A0; -+entity("uArr") -> 16#021D1; -+entity("uHar") -> 16#02963; -+entity("uacute") -> 16#000FA; -+entity("uarr") -> 16#02191; -+entity("ubrcy") -> 16#0045E; -+entity("ubreve") -> 16#0016D; -+entity("ucirc") -> 16#000FB; -+entity("ucy") -> 16#00443; -+entity("udarr") -> 16#021C5; -+entity("udblac") -> 16#00171; -+entity("udhar") -> 16#0296E; -+entity("ufisht") -> 16#0297E; -+entity("ufr") -> 16#1D532; -+entity("ugrave") -> 16#000F9; -+entity("uharl") -> 16#021BF; -+entity("uharr") -> 16#021BE; -+entity("uhblk") -> 16#02580; -+entity("ulcorn") -> 16#0231C; -+entity("ulcorner") -> 16#0231C; -+entity("ulcrop") -> 16#0230F; -+entity("ultri") -> 16#025F8; -+entity("umacr") -> 16#0016B; -+entity("uml") -> 16#000A8; -+entity("uogon") -> 16#00173; -+entity("uopf") -> 16#1D566; -+entity("uparrow") -> 16#02191; -+entity("updownarrow") -> 16#02195; -+entity("upharpoonleft") -> 16#021BF; -+entity("upharpoonright") -> 16#021BE; -+entity("uplus") -> 16#0228E; -+entity("upsi") -> 16#003C5; -+entity("upsih") -> 16#003D2; -+entity("upsilon") -> 16#003C5; -+entity("upuparrows") -> 16#021C8; -+entity("urcorn") -> 16#0231D; -+entity("urcorner") -> 16#0231D; -+entity("urcrop") -> 16#0230E; -+entity("uring") -> 16#0016F; -+entity("urtri") -> 16#025F9; -+entity("uscr") -> 16#1D4CA; -+entity("utdot") -> 16#022F0; -+entity("utilde") -> 16#00169; -+entity("utri") -> 16#025B5; -+entity("utrif") -> 16#025B4; -+entity("uuarr") -> 16#021C8; -+entity("uuml") -> 16#000FC; -+entity("uwangle") -> 16#029A7; -+entity("vArr") -> 16#021D5; -+entity("vBar") -> 16#02AE8; -+entity("vBarv") -> 16#02AE9; -+entity("vDash") -> 16#022A8; -+entity("vangrt") -> 16#0299C; -+entity("varepsilon") -> 16#003F5; -+entity("varkappa") -> 16#003F0; -+entity("varnothing") -> 16#02205; -+entity("varphi") -> 16#003D5; -+entity("varpi") -> 16#003D6; -+entity("varpropto") -> 16#0221D; -+entity("varr") -> 16#02195; -+entity("varrho") -> 16#003F1; -+entity("varsigma") -> 16#003C2; -+entity("varsubsetneq") -> [16#0228A, 16#0FE00]; -+entity("varsubsetneqq") -> [16#02ACB, 16#0FE00]; -+entity("varsupsetneq") -> [16#0228B, 16#0FE00]; -+entity("varsupsetneqq") -> [16#02ACC, 16#0FE00]; -+entity("vartheta") -> 16#003D1; -+entity("vartriangleleft") -> 16#022B2; -+entity("vartriangleright") -> 16#022B3; -+entity("vcy") -> 16#00432; -+entity("vdash") -> 16#022A2; -+entity("vee") -> 16#02228; -+entity("veebar") -> 16#022BB; -+entity("veeeq") -> 16#0225A; -+entity("vellip") -> 16#022EE; -+entity("verbar") -> 16#0007C; -+entity("vert") -> 16#0007C; -+entity("vfr") -> 16#1D533; -+entity("vltri") -> 16#022B2; -+entity("vnsub") -> [16#02282, 16#020D2]; -+entity("vnsup") -> [16#02283, 16#020D2]; -+entity("vopf") -> 16#1D567; -+entity("vprop") -> 16#0221D; -+entity("vrtri") -> 16#022B3; -+entity("vscr") -> 16#1D4CB; -+entity("vsubnE") -> [16#02ACB, 16#0FE00]; -+entity("vsubne") -> [16#0228A, 16#0FE00]; -+entity("vsupnE") -> [16#02ACC, 16#0FE00]; -+entity("vsupne") -> [16#0228B, 16#0FE00]; -+entity("vzigzag") -> 16#0299A; -+entity("wcirc") -> 16#00175; -+entity("wedbar") -> 16#02A5F; -+entity("wedge") -> 16#02227; -+entity("wedgeq") -> 16#02259; -+entity("weierp") -> 16#02118; -+entity("wfr") -> 16#1D534; -+entity("wopf") -> 16#1D568; -+entity("wp") -> 16#02118; -+entity("wr") -> 16#02240; -+entity("wreath") -> 16#02240; -+entity("wscr") -> 16#1D4CC; -+entity("xcap") -> 16#022C2; -+entity("xcirc") -> 16#025EF; -+entity("xcup") -> 16#022C3; -+entity("xdtri") -> 16#025BD; -+entity("xfr") -> 16#1D535; -+entity("xhArr") -> 16#027FA; -+entity("xharr") -> 16#027F7; -+entity("xi") -> 16#003BE; -+entity("xlArr") -> 16#027F8; -+entity("xlarr") -> 16#027F5; -+entity("xmap") -> 16#027FC; -+entity("xnis") -> 16#022FB; -+entity("xodot") -> 16#02A00; -+entity("xopf") -> 16#1D569; -+entity("xoplus") -> 16#02A01; -+entity("xotime") -> 16#02A02; -+entity("xrArr") -> 16#027F9; -+entity("xrarr") -> 16#027F6; -+entity("xscr") -> 16#1D4CD; -+entity("xsqcup") -> 16#02A06; -+entity("xuplus") -> 16#02A04; -+entity("xutri") -> 16#025B3; -+entity("xvee") -> 16#022C1; -+entity("xwedge") -> 16#022C0; -+entity("yacute") -> 16#000FD; -+entity("yacy") -> 16#0044F; -+entity("ycirc") -> 16#00177; -+entity("ycy") -> 16#0044B; -+entity("yen") -> 16#000A5; -+entity("yfr") -> 16#1D536; -+entity("yicy") -> 16#00457; -+entity("yopf") -> 16#1D56A; -+entity("yscr") -> 16#1D4CE; -+entity("yucy") -> 16#0044E; -+entity("yuml") -> 16#000FF; -+entity("zacute") -> 16#0017A; -+entity("zcaron") -> 16#0017E; -+entity("zcy") -> 16#00437; -+entity("zdot") -> 16#0017C; -+entity("zeetrf") -> 16#02128; -+entity("zeta") -> 16#003B6; -+entity("zfr") -> 16#1D537; -+entity("zhcy") -> 16#00436; -+entity("zigrarr") -> 16#021DD; -+entity("zopf") -> 16#1D56B; -+entity("zscr") -> 16#1D4CF; -+entity("zwj") -> 16#0200D; -+entity("zwnj") -> 16#0200C; -+entity(_) -> undefined. - - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - exhaustive_entity_test() -> - T = mochiweb_cover:clause_lookup_table(?MODULE, entity), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_cookies.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cookies.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_cookies.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cookies.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -23,6 +23,7 @@ - - %% @type proplist() = [{Key::string(), Value::string()}]. - %% @type header() = {Name::string(), Value::string()}. -+%% @type int_seconds() = integer(). - - %% @spec cookie(Key::string(), Value::string()) -> header() - %% @doc Short-hand for <code>cookie(Key, Value, [])</code>. -@@ -30,7 +31,7 @@ - cookie(Key, Value, []). - - %% @spec cookie(Key::string(), Value::string(), Options::[Option]) -> header() --%% where Option = {max_age, integer()} | {local_time, {date(), time()}} -+%% where Option = {max_age, int_seconds()} | {local_time, {date(), time()}} - %% | {domain, string()} | {path, string()} - %% | {secure, true | false} | {http_only, true | false} - %% -@@ -115,12 +116,33 @@ - orelse erlang:error({cookie_quoting_required, V}), - V. - -+ -+%% Return a date in the form of: Wdy, DD-Mon-YYYY HH:MM:SS GMT -+%% See also: rfc2109: 10.1.2 -+rfc2109_cookie_expires_date(LocalTime) -> -+ {{YYYY,MM,DD},{Hour,Min,Sec}} = -+ case calendar:local_time_to_universal_time_dst(LocalTime) of -+ [] -> -+ {Date, {Hour1, Min1, Sec1}} = LocalTime, -+ LocalTime2 = {Date, {Hour1 + 1, Min1, Sec1}}, -+ case calendar:local_time_to_universal_time_dst(LocalTime2) of -+ [Gmt] -> Gmt; -+ [_,Gmt] -> Gmt -+ end; -+ [Gmt] -> Gmt; -+ [_,Gmt] -> Gmt -+ end, -+ DayNumber = calendar:day_of_the_week({YYYY,MM,DD}), -+ lists:flatten( -+ io_lib:format("~s, ~2.2.0w-~3.s-~4.4.0w ~2.2.0w:~2.2.0w:~2.2.0w GMT", -+ [httpd_util:day(DayNumber),DD,httpd_util:month(MM),YYYY,Hour,Min,Sec])). -+ - add_seconds(Secs, LocalTime) -> - Greg = calendar:datetime_to_gregorian_seconds(LocalTime), - calendar:gregorian_seconds_to_datetime(Greg + Secs). - - age_to_cookie_date(Age, LocalTime) -> -- httpd_util:rfc1123_date(add_seconds(Age, LocalTime)). -+ rfc2109_cookie_expires_date(add_seconds(Age, LocalTime)). - - %% @spec parse_cookie(string()) -> [{K::string(), V::string()}] - %% @doc Parse the contents of a Cookie header field, ignoring cookie -@@ -203,8 +225,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - quote_test() -> - %% ?assertError eunit macro is not compatible with coverage module -@@ -293,14 +315,14 @@ - C2 = {"Set-Cookie", - "Customer=WILE_E_COYOTE; " - "Version=1; " -- "Expires=Tue, 15 May 2007 13:45:33 GMT; " -+ "Expires=Tue, 15-May-2007 13:45:33 GMT; " - "Max-Age=0"}, - C2 = cookie("Customer", "WILE_E_COYOTE", - [{max_age, -111}, {local_time, LocalTime}]), - C3 = {"Set-Cookie", - "Customer=WILE_E_COYOTE; " - "Version=1; " -- "Expires=Wed, 16 May 2007 13:45:50 GMT; " -+ "Expires=Wed, 16-May-2007 13:45:50 GMT; " - "Max-Age=86417"}, - C3 = cookie("Customer", "WILE_E_COYOTE", - [{max_age, 86417}, {local_time, LocalTime}]), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_cover.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cover.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_cover.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_cover.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -46,8 +46,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - foo_table(a) -> b; - foo_table("a") -> <<"b">>; - foo_table(123) -> {4, 3, 2}; -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_echo.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_echo.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_echo.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_echo.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -11,11 +11,14 @@ - mochiweb_socket_server:stop(?MODULE). - - start() -> -- mochiweb_socket_server:start([{name, ?MODULE}, -+ mochiweb_socket_server:start([{link, false} | options()]). -+ -+options() -> -+ [{name, ?MODULE}, - {port, 6789}, - {ip, "127.0.0.1"}, - {max, 1}, -- {loop, {?MODULE, loop}}]). -+ {loop, {?MODULE, loop}}]. - - loop(Socket) -> - case mochiweb_socket:recv(Socket, 0, 30000) of -@@ -33,6 +36,6 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -6,22 +6,9 @@ - -module(mochiweb). - -author('bob@mochimedia.com'). - ---export([start/0, stop/0]). - -export([new_request/1, new_response/1]). - -export([all_loaded/0, all_loaded/1, reload/0]). -- --%% @spec start() -> ok --%% @doc Start the MochiWeb server. --start() -> -- ensure_started(crypto), -- application:start(mochiweb). -- --%% @spec stop() -> ok --%% @doc Stop the MochiWeb server. --stop() -> -- Res = application:stop(mochiweb), -- application:stop(crypto), -- Res. -+-export([ensure_started/1]). - - reload() -> - [c:l(Module) || Module <- all_loaded()]. -@@ -78,8 +65,8 @@ - Code, - mochiweb_headers:make(Headers)). - --%% Internal API -- -+%% @spec ensure_started(App::atom()) -> ok -+%% @doc Start the given App if it has not been started already. - ensure_started(App) -> - case application:start(App) of - ok -> -@@ -92,8 +78,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - -record(treq, {path, body= <<>>, xreply= <<>>}). - -@@ -112,7 +98,7 @@ - ssl -> - ServerOpts0 ++ [{ssl, true}, {ssl_opts, ssl_cert_opts()}] - end, -- {ok, Server} = mochiweb_http:start(ServerOpts), -+ {ok, Server} = mochiweb_http:start_link(ServerOpts), - Port = mochiweb_socket_server:get(Server, port), - Res = (catch ClientFun(Transport, Port)), - mochiweb_http:stop(Server), -@@ -123,6 +109,8 @@ - "/foo/bar/baz wibble quux" = R:get(path), - ok. - -+-define(LARGE_TIMEOUT, 60). -+ - single_http_GET_test() -> - do_GET(plain, 1). - -@@ -135,11 +123,13 @@ - multiple_https_GET_test() -> - do_GET(ssl, 3). - --hundred_http_GET_test() -> -- do_GET(plain, 100). -- --hundred_https_GET_test() -> -- do_GET(ssl, 100). -+hundred_http_GET_test_() -> % note the underscore -+ {timeout, ?LARGE_TIMEOUT, -+ fun() -> ?assertEqual(ok, do_GET(plain,100)) end}. -+ -+hundred_https_GET_test_() -> % note the underscore -+ {timeout, ?LARGE_TIMEOUT, -+ fun() -> ?assertEqual(ok, do_GET(ssl,100)) end}. - - single_128_http_POST_test() -> - do_POST(plain, 128, 1). -@@ -165,11 +155,13 @@ - multiple_100K_https_POST_test() -> - do_POST(ssl, 102400, 3). - --hundred_128_http_POST_test() -> -- do_POST(plain, 128, 100). -- --hundred_128_https_POST_test() -> -- do_POST(ssl, 128, 100). -+hundred_128_http_POST_test_() -> % note the underscore -+ {timeout, ?LARGE_TIMEOUT, -+ fun() -> ?assertEqual(ok, do_POST(plain, 128, 100)) end}. -+ -+hundred_128_https_POST_test_() -> % note the underscore -+ {timeout, ?LARGE_TIMEOUT, -+ fun() -> ?assertEqual(ok, do_POST(ssl, 128, 100)) end}. - - do_GET(Transport, Times) -> - PathPrefix = "/whatever/", -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_headers.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_headers.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_headers.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_headers.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -6,7 +6,7 @@ - -module(mochiweb_headers). - -author('bob@mochimedia.com'). - -export([empty/0, from_list/1, insert/3, enter/3, get_value/2, lookup/2]). ---export([delete_any/2, get_primary_value/2]). -+-export([delete_any/2, get_primary_value/2, get_combined_value/2]). - -export([default/3, enter_from_list/2, default_from_list/2]). - -export([to_list/1, make/1]). - -export([from_binary/1]). -@@ -24,8 +24,8 @@ - %% @doc Construct a headers() from the given list. - make(L) when is_list(L) -> - from_list(L); --%% assume a tuple is already mochiweb_headers. --make(T) when is_tuple(T) -> -+%% assume a non-list is already mochiweb_headers. -+make(T) -> - T. - - %% @spec from_binary(iolist()) -> headers() -@@ -112,6 +112,34 @@ - lists:takewhile(fun (C) -> C =/= $; end, V) - end. - -+%% @spec get_combined_value(key(), headers()) -> string() | undefined -+%% @doc Return the value from the given header using a case insensitive search. -+%% If the value of the header is a comma-separated list where holds values -+%% are all identical, the identical value will be returned. -+%% undefined will be returned for keys that are not present or the -+%% values in the list are not the same. -+%% -+%% NOTE: The process isn't designed for a general purpose. If you need -+%% to access all values in the combined header, please refer to -+%% '''tokenize_header_value/1'''. -+%% -+%% Section 4.2 of the RFC 2616 (HTTP 1.1) describes multiple message-header -+%% fields with the same field-name may be present in a message if and only -+%% if the entire field-value for that header field is defined as a -+%% comma-separated list [i.e., #(values)]. -+get_combined_value(K, T) -> -+ case get_value(K, T) of -+ undefined -> -+ undefined; -+ V -> -+ case sets:to_list(sets:from_list(tokenize_header_value(V))) of -+ [Val] -> -+ Val; -+ _ -> -+ undefined -+ end -+ end. -+ - %% @spec lookup(key(), headers()) -> {value, {key(), string()}} | none - %% @doc Return the case preserved key and value for the given header using - %% a case insensitive search. none will be returned for keys that are -@@ -164,6 +192,49 @@ - - %% Internal API - -+tokenize_header_value(undefined) -> -+ undefined; -+tokenize_header_value(V) -> -+ reversed_tokens(trim_and_reverse(V, false), [], []). -+ -+trim_and_reverse([S | Rest], Reversed) when S=:=$ ; S=:=$\n; S=:=$\t -> -+ trim_and_reverse(Rest, Reversed); -+trim_and_reverse(V, false) -> -+ trim_and_reverse(lists:reverse(V), true); -+trim_and_reverse(V, true) -> -+ V. -+ -+reversed_tokens([], [], Acc) -> -+ Acc; -+reversed_tokens([], Token, Acc) -> -+ [Token | Acc]; -+reversed_tokens("\"" ++ Rest, [], Acc) -> -+ case extract_quoted_string(Rest, []) of -+ {String, NewRest} -> -+ reversed_tokens(NewRest, [], [String | Acc]); -+ undefined -> -+ undefined -+ end; -+reversed_tokens("\"" ++ _Rest, _Token, _Acc) -> -+ undefined; -+reversed_tokens([C | Rest], [], Acc) when C=:=$ ;C=:=$\n;C=:=$\t;C=:=$, -> -+ reversed_tokens(Rest, [], Acc); -+reversed_tokens([C | Rest], Token, Acc) when C=:=$ ;C=:=$\n;C=:=$\t;C=:=$, -> -+ reversed_tokens(Rest, [], [Token | Acc]); -+reversed_tokens([C | Rest], Token, Acc) -> -+ reversed_tokens(Rest, [C | Token], Acc); -+reversed_tokens(_, _, _) -> -+ undefeined. -+ -+extract_quoted_string([], _Acc) -> -+ undefined; -+extract_quoted_string("\"\\" ++ Rest, Acc) -> -+ extract_quoted_string(Rest, "\"" ++ Acc); -+extract_quoted_string("\"" ++ Rest, Acc) -> -+ {Acc, Rest}; -+extract_quoted_string([C | Rest], Acc) -> -+ extract_quoted_string(Rest, [C | Acc]). -+ - expand({array, L}) -> - mochiweb_util:join(lists:reverse(L), ", "); - expand(V) -> -@@ -195,8 +266,8 @@ - %% - %% Tests. - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - make_test() -> - Identity = make([{hdr, foo}]), -@@ -237,6 +308,37 @@ - get_primary_value(<<"baz">>, H)), - ok. - -+get_combined_value_test() -> -+ H = make([{hdr, foo}, {baz, <<"wibble,taco">>}, {content_length, "123, 123"}, -+ {test, " 123, 123, 123 , 123,123 "}, -+ {test2, "456, 123, 123 , 123"}, -+ {test3, "123"}, {test4, " 123, "}]), -+ ?assertEqual( -+ "foo", -+ get_combined_value(hdr, H)), -+ ?assertEqual( -+ undefined, -+ get_combined_value(bar, H)), -+ ?assertEqual( -+ undefined, -+ get_combined_value(<<"baz">>, H)), -+ ?assertEqual( -+ "123", -+ get_combined_value(<<"content_length">>, H)), -+ ?assertEqual( -+ "123", -+ get_combined_value(<<"test">>, H)), -+ ?assertEqual( -+ undefined, -+ get_combined_value(<<"test2">>, H)), -+ ?assertEqual( -+ "123", -+ get_combined_value(<<"test3">>, H)), -+ ?assertEqual( -+ "123", -+ get_combined_value(<<"test4">>, H)), -+ ok. -+ - set_cookie_test() -> - H = make([{"set-cookie", foo}, {"set-cookie", bar}, {"set-cookie", baz}]), - ?assertEqual( -@@ -296,4 +398,23 @@ - [] = ?MODULE:to_list(?MODULE:from_binary([<<"\r\n\r\n">>])), - ok. - -+tokenize_header_value_test() -> -+ ?assertEqual(["a quote in a \"quote\"."], -+ tokenize_header_value("\"a quote in a \\\"quote\\\".\"")), -+ ?assertEqual(["abc"], tokenize_header_value("abc")), -+ ?assertEqual(["abc", "def"], tokenize_header_value("abc def")), -+ ?assertEqual(["abc", "def"], tokenize_header_value("abc , def")), -+ ?assertEqual(["abc", "def"], tokenize_header_value(",abc ,, def,,")), -+ ?assertEqual(["abc def"], tokenize_header_value("\"abc def\" ")), -+ ?assertEqual(["abc, def"], tokenize_header_value("\"abc, def\"")), -+ ?assertEqual(["\\a\\$"], tokenize_header_value("\"\\a\\$\"")), -+ ?assertEqual(["abc def", "foo, bar", "12345", ""], -+ tokenize_header_value("\"abc def\" \"foo, bar\" , 12345, \"\"")), -+ ?assertEqual(undefined, -+ tokenize_header_value(undefined)), -+ ?assertEqual(undefined, -+ tokenize_header_value("umatched quote\"")), -+ ?assertEqual(undefined, -+ tokenize_header_value("\"unmatched quote")). -+ - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_html.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_html.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_html.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_html.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -95,7 +95,12 @@ - to_tokens({Tag0, [], Acc}); - to_tokens({Tag0, Attrs, Acc}) -> - Tag = to_tag(Tag0), -- to_tokens([{Tag, Acc}], [{start_tag, Tag, Attrs, is_singleton(Tag)}]). -+ case is_singleton(Tag) of -+ true -> -+ to_tokens([], [{start_tag, Tag, Attrs, true}]); -+ false -> -+ to_tokens([{Tag, Acc}], [{start_tag, Tag, Attrs, false}]) -+ end. - - %% @spec to_html([html_token()] | html_node()) -> iolist() - %% @doc Convert a list of html_token() to a HTML document. -@@ -312,7 +317,8 @@ - {Tag, S1} = tokenize_literal(B, ?ADV_COL(S, 2)), - {S2, _} = find_gt(B, S1), - {{end_tag, Tag}, S2}; -- <<_:O/binary, "<", C, _/binary>> when ?IS_WHITESPACE(C) -> -+ <<_:O/binary, "<", C, _/binary>> -+ when ?IS_WHITESPACE(C); not ?IS_LITERAL_SAFE(C) -> - %% This isn't really strict HTML - {{data, Data, _Whitespace}, S1} = tokenize_data(B, ?INC_COL(S)), - {{data, <<$<, Data/binary>>, false}, S1}; -@@ -501,8 +507,6 @@ - tokenize_quoted_attr_value(B, S1, [Data|Acc], Q); - <<_:O/binary, Q, _/binary>> -> - { iolist_to_binary(lists:reverse(Acc)), ?INC_COL(S) }; -- <<_:O/binary, $\n, _/binary>> -> -- { iolist_to_binary(lists:reverse(Acc)), ?INC_LINE(S) }; - <<_:O/binary, C, _/binary>> -> - tokenize_quoted_attr_value(B, ?INC_COL(S), [C|Acc], Q) - end. -@@ -603,32 +607,33 @@ - end. - - tokenize_charref(Bin, S=#decoder{offset=O}) -> -- tokenize_charref(Bin, S, O). -+ try -+ tokenize_charref(Bin, S, O) -+ catch -+ throw:invalid_charref -> -+ {{data, <<"&">>, false}, S} -+ end. - - tokenize_charref(Bin, S=#decoder{offset=O}, Start) -> - case Bin of - <<_:O/binary>> -> -- <<_:Start/binary, Raw/binary>> = Bin, -- {{data, Raw, false}, S}; -+ throw(invalid_charref); - <<_:O/binary, C, _/binary>> when ?IS_WHITESPACE(C) - orelse C =:= ?SQUOTE - orelse C =:= ?QUOTE - orelse C =:= $/ - orelse C =:= $> -> -- Len = O - Start, -- <<_:Start/binary, Raw:Len/binary, _/binary>> = Bin, -- {{data, Raw, false}, S}; -+ throw(invalid_charref); - <<_:O/binary, $;, _/binary>> -> - Len = O - Start, - <<_:Start/binary, Raw:Len/binary, _/binary>> = Bin, - Data = case mochiweb_charref:charref(Raw) of - undefined -> -- Start1 = Start - 1, -- Len1 = Len + 2, -- <<_:Start1/binary, R:Len1/binary, _/binary>> = Bin, -- R; -- Unichar -> -- mochiutf8:codepoint_to_bytes(Unichar) -+ throw(invalid_charref); -+ Unichar when is_integer(Unichar) -> -+ mochiutf8:codepoint_to_bytes(Unichar); -+ Unichars when is_list(Unichars) -> -+ unicode:characters_to_binary(Unichars) - end, - {{data, Data, false}, ?INC_COL(S)}; - _ -> -@@ -759,8 +764,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - to_html_test() -> - ?assertEqual( -@@ -1232,6 +1237,14 @@ - { <<"img">>, [ { <<"src">>, <<"/images/icon>.png">> } ], [] } - ]}, - mochiweb_html:parse(D2)), -+ -+ %% Quoted attributes can contain whitespace and newlines -+ D3 = <<"<html><a href=\"#\" onclick=\"javascript: test(1,\ntrue);\"></html>">>, -+ ?assertEqual( -+ {<<"html">>,[],[ -+ { <<"a">>, [ { <<"href">>, <<"#">> }, {<<"onclick">>, <<"javascript: test(1,\ntrue);">>} ], [] } -+ ]}, -+ mochiweb_html:parse(D3)), - ok. - - parse_missing_attr_name_test() -> -@@ -1261,4 +1274,59 @@ - mochiweb_html:parse(D0)), - ok. - -+to_html_singleton_test() -> -+ D0 = <<"<link />">>, -+ T0 = {<<"link">>,[],[]}, -+ ?assertEqual(D0, iolist_to_binary(to_html(T0))), -+ -+ D1 = <<"<head><link /></head>">>, -+ T1 = {<<"head">>,[],[{<<"link">>,[],[]}]}, -+ ?assertEqual(D1, iolist_to_binary(to_html(T1))), -+ -+ D2 = <<"<head><link /><link /></head>">>, -+ T2 = {<<"head">>,[],[{<<"link">>,[],[]}, {<<"link">>,[],[]}]}, -+ ?assertEqual(D2, iolist_to_binary(to_html(T2))), -+ -+ %% Make sure singletons are converted to singletons. -+ D3 = <<"<head><link /></head>">>, -+ T3 = {<<"head">>,[],[{<<"link">>,[],[<<"funny">>]}]}, -+ ?assertEqual(D3, iolist_to_binary(to_html(T3))), -+ -+ D4 = <<"<link />">>, -+ T4 = {<<"link">>,[],[<<"funny">>]}, -+ ?assertEqual(D4, iolist_to_binary(to_html(T4))), -+ -+ ok. -+ -+parse_amp_test_() -> -+ [?_assertEqual( -+ {<<"html">>,[], -+ [{<<"body">>,[{<<"onload">>,<<"javascript:A('1&2')">>}],[]}]}, -+ mochiweb_html:parse("<html><body onload=\"javascript:A('1&2')\"></body></html>")), -+ ?_assertEqual( -+ {<<"html">>,[], -+ [{<<"body">>,[{<<"onload">>,<<"javascript:A('1& 2')">>}],[]}]}, -+ mochiweb_html:parse("<html><body onload=\"javascript:A('1& 2')\"></body></html>")), -+ ?_assertEqual( -+ {<<"html">>,[], -+ [{<<"body">>,[],[<<"& ">>]}]}, -+ mochiweb_html:parse("<html><body>& </body></html>")), -+ ?_assertEqual( -+ {<<"html">>,[], -+ [{<<"body">>,[],[<<"&">>]}]}, -+ mochiweb_html:parse("<html><body>&</body></html>"))]. -+ -+parse_unescaped_lt_test() -> -+ D1 = <<"<div> < < <a href=\"/\">Back</a></div>">>, -+ ?assertEqual( -+ {<<"div">>, [], [<<" < < ">>, {<<"a">>, [{<<"href">>, <<"/">>}], -+ [<<"Back">>]}]}, -+ mochiweb_html:parse(D1)), -+ -+ D2 = <<"<div> << <a href=\"/\">Back</a></div>">>, -+ ?assertEqual( -+ {<<"div">>, [], [<<" << ">>, {<<"a">>, [{<<"href">>, <<"/">>}], -+ [<<"Back">>]}]}, -+ mochiweb_html:parse(D2)). -+ - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_http.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_http.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_http.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_http.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -5,13 +5,13 @@ - - -module(mochiweb_http). - -author('bob@mochimedia.com'). ---export([start/0, start/1, stop/0, stop/1]). ---export([loop/2, default_body/1]). -+-export([start/1, start_link/1, stop/0, stop/1]). -+-export([loop/2]). - -export([after_response/2, reentry/1]). - -export([parse_range_request/1, range_skip_length/2]). - ---define(REQUEST_RECV_TIMEOUT, 300000). % timeout waiting for request line ---define(HEADERS_RECV_TIMEOUT, 30000). % timeout waiting for headers -+-define(REQUEST_RECV_TIMEOUT, 300000). %% timeout waiting for request line -+-define(HEADERS_RECV_TIMEOUT, 30000). %% timeout waiting for headers - - -define(MAX_HEADERS, 1000). - -define(DEFAULTS, [{name, ?MODULE}, -@@ -19,9 +19,7 @@ - - parse_options(Options) -> - {loop, HttpLoop} = proplists:lookup(loop, Options), -- Loop = fun (S) -> -- ?MODULE:loop(S, HttpLoop) -- end, -+ Loop = {?MODULE, loop, [HttpLoop]}, - Options1 = [{loop, Loop} | proplists:delete(loop, Options)], - mochilists:set_defaults(?DEFAULTS, Options1). - -@@ -31,15 +29,12 @@ - stop(Name) -> - mochiweb_socket_server:stop(Name). - --start() -> -- start([{ip, "127.0.0.1"}, -- {loop, {?MODULE, default_body}}]). -- - %% @spec start(Options) -> ServerRet - %% Options = [option()] - %% Option = {name, atom()} | {ip, string() | tuple()} | {backlog, integer()} - %% | {nodelay, boolean()} | {acceptor_pool_size, integer()} - %% | {ssl, boolean()} | {profile_fun, undefined | (Props) -> ok} -+%% | {link, false} - %% @doc Start a mochiweb server. - %% profile_fun is used to profile accept timing. - %% After each accept, if defined, profile_fun is called with a proplist of a subset of the mochiweb_socket_server state and timing information. -@@ -48,62 +43,18 @@ - start(Options) -> - mochiweb_socket_server:start(parse_options(Options)). - --frm(Body) -> -- ["<html><head></head><body>" -- "<form method=\"POST\">" -- "<input type=\"hidden\" value=\"message\" name=\"hidden\"/>" -- "<input type=\"submit\" value=\"regular POST\">" -- "</form>" -- "<br />" -- "<form method=\"POST\" enctype=\"multipart/form-data\"" -- " action=\"/multipart\">" -- "<input type=\"hidden\" value=\"multipart message\" name=\"hidden\"/>" -- "<input type=\"file\" name=\"file\"/>" -- "<input type=\"submit\" value=\"multipart POST\" />" -- "</form>" -- "<pre>", Body, "</pre>" -- "</body></html>"]. -- --default_body(Req, M, "/chunked") when M =:= 'GET'; M =:= 'HEAD' -> -- Res = Req:ok({"text/plain", [], chunked}), -- Res:write_chunk("First chunk\r\n"), -- timer:sleep(5000), -- Res:write_chunk("Last chunk\r\n"), -- Res:write_chunk(""); --default_body(Req, M, _Path) when M =:= 'GET'; M =:= 'HEAD' -> -- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, -- {parse_cookie, Req:parse_cookie()}, -- Req:dump()]]), -- Req:ok({"text/html", -- [mochiweb_cookies:cookie("mochiweb_http", "test_cookie")], -- frm(Body)}); --default_body(Req, 'POST', "/multipart") -> -- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, -- {parse_cookie, Req:parse_cookie()}, -- {body, Req:recv_body()}, -- Req:dump()]]), -- Req:ok({"text/html", [], frm(Body)}); --default_body(Req, 'POST', _Path) -> -- Body = io_lib:format("~p~n", [[{parse_qs, Req:parse_qs()}, -- {parse_cookie, Req:parse_cookie()}, -- {parse_post, Req:parse_post()}, -- Req:dump()]]), -- Req:ok({"text/html", [], frm(Body)}); --default_body(Req, _Method, _Path) -> -- Req:respond({501, [], []}). -- --default_body(Req) -> -- default_body(Req, Req:get(method), Req:get(path)). -+start_link(Options) -> -+ mochiweb_socket_server:start_link(parse_options(Options)). - - loop(Socket, Body) -> -- mochiweb_socket:setopts(Socket, [{packet, http}]), -+ ok = mochiweb_socket:setopts(Socket, [{packet, http}]), - request(Socket, Body). - - request(Socket, Body) -> -- mochiweb_socket:setopts(Socket, [{active, once}]), -+ ok = mochiweb_socket:setopts(Socket, [{active, once}]), - receive - {Protocol, _, {http_request, Method, Path, Version}} when Protocol == http orelse Protocol == ssl -> -- mochiweb_socket:setopts(Socket, [{packet, httph}]), -+ ok = mochiweb_socket:setopts(Socket, [{packet, httph}]), - headers(Socket, {Method, Path, Version}, [], Body, 0); - {Protocol, _, {http_error, "\r\n"}} when Protocol == http orelse Protocol == ssl -> - request(Socket, Body); -@@ -112,6 +63,13 @@ - {tcp_closed, _} -> - mochiweb_socket:close(Socket), - exit(normal); -+ {ssl_closed, _} -> -+ mochiweb_socket:close(Socket), -+ exit(normal); -+ {tcp_error,_,emsgsize} -> -+ % R15B02 returns this then closes the socket, so close and exit -+ mochiweb_socket:close(Socket), -+ exit(normal); - _Other -> - handle_invalid_request(Socket) - after ?REQUEST_RECV_TIMEOUT -> -@@ -126,10 +84,10 @@ - - headers(Socket, Request, Headers, _Body, ?MAX_HEADERS) -> - %% Too many headers sent, bad request. -- mochiweb_socket:setopts(Socket, [{packet, raw}]), -+ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), - handle_invalid_request(Socket, Request, Headers); - headers(Socket, Request, Headers, Body, HeaderCount) -> -- mochiweb_socket:setopts(Socket, [{active, once}]), -+ ok = mochiweb_socket:setopts(Socket, [{active, once}]), - receive - {Protocol, _, http_eoh} when Protocol == http orelse Protocol == ssl -> - Req = new_request(Socket, Request, Headers), -@@ -141,6 +99,10 @@ - {tcp_closed, _} -> - mochiweb_socket:close(Socket), - exit(normal); -+ {tcp_error,_,emsgsize} -> -+ % R15B02 returns this then closes the socket, so close and exit -+ mochiweb_socket:close(Socket), -+ exit(normal); - _Other -> - handle_invalid_request(Socket, Request, Headers) - after ?HEADERS_RECV_TIMEOUT -> -@@ -148,14 +110,19 @@ - exit(normal) - end. - -+call_body({M, F, A}, Req) -> -+ erlang:apply(M, F, [Req | A]); - call_body({M, F}, Req) -> - M:F(Req); - call_body(Body, Req) -> - Body(Req). - -+-spec handle_invalid_request(term()) -> no_return(). - handle_invalid_request(Socket) -> -- handle_invalid_request(Socket, {'GET', {abs_path, "/"}, {0,9}}, []). -+ handle_invalid_request(Socket, {'GET', {abs_path, "/"}, {0,9}}, []), -+ exit(normal). - -+-spec handle_invalid_request(term(), term(), term()) -> no_return(). - handle_invalid_request(Socket, Request, RevHeaders) -> - Req = new_request(Socket, Request, RevHeaders), - Req:respond({400, [], []}), -@@ -163,7 +130,7 @@ - exit(normal). - - new_request(Socket, Request, RevHeaders) -> -- mochiweb_socket:setopts(Socket, [{packet, raw}]), -+ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), - mochiweb:new_request({Socket, Request, lists:reverse(RevHeaders)}). - - after_response(Body, Req) -> -@@ -174,6 +141,7 @@ - exit(normal); - false -> - Req:cleanup(), -+ erlang:garbage_collect(), - ?MODULE:loop(Socket, Body) - end. - -@@ -211,6 +179,8 @@ - invalid_range; - {Start, End} when 0 =< Start, Start =< End, End < Size -> - {Start, End - Start + 1}; -+ {Start, End} when 0 =< Start, Start =< End, End >= Size -> -+ {Start, Size - Start}; - {_OutOfRange, _End} -> - invalid_range - end. -@@ -218,8 +188,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - range_test() -> - %% valid, single ranges -@@ -265,19 +235,23 @@ - BodySizeLess1 = BodySize - 1, - ?assertEqual({BodySizeLess1, 1}, - range_skip_length({BodySize - 1, none}, BodySize)), -+ ?assertEqual({BodySizeLess1, 1}, -+ range_skip_length({BodySize - 1, BodySize+5}, BodySize)), -+ ?assertEqual({BodySizeLess1, 1}, -+ range_skip_length({BodySize - 1, BodySize}, BodySize)), - - %% out of range, return whole thing - ?assertEqual({0, BodySize}, - range_skip_length({none, BodySize + 1}, BodySize)), - ?assertEqual({0, BodySize}, - range_skip_length({none, -1}, BodySize)), -+ ?assertEqual({0, BodySize}, -+ range_skip_length({0, BodySize + 1}, BodySize)), - - %% invalid ranges - ?assertEqual(invalid_range, - range_skip_length({-1, 30}, BodySize)), - ?assertEqual(invalid_range, -- range_skip_length({0, BodySize + 1}, BodySize)), -- ?assertEqual(invalid_range, - range_skip_length({-1, BodySize + 1}, BodySize)), - ?assertEqual(invalid_range, - range_skip_length({BodySize, 40}, BodySize)), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_io.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_io.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_io.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_io.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -38,9 +38,6 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -- -- -- -+-include_lib("eunit/include/eunit.hrl"). - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_mime.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_mime.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_mime.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_mime.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -11,72 +11,393 @@ - %% @doc Given a filename extension (e.g. ".html") return a guess for the MIME - %% type such as "text/html". Will return the atom undefined if no good - %% guess is available. --from_extension(".html") -> -- "text/html"; --from_extension(".xhtml") -> -- "application/xhtml+xml"; --from_extension(".xml") -> -- "application/xml"; --from_extension(".css") -> -- "text/css"; -+ -+from_extension(".stl") -> -+ "application/SLA"; -+from_extension(".stp") -> -+ "application/STEP"; -+from_extension(".step") -> -+ "application/STEP"; -+from_extension(".dwg") -> -+ "application/acad"; -+from_extension(".ez") -> -+ "application/andrew-inset"; -+from_extension(".ccad") -> -+ "application/clariscad"; -+from_extension(".drw") -> -+ "application/drafting"; -+from_extension(".tsp") -> -+ "application/dsptype"; -+from_extension(".dxf") -> -+ "application/dxf"; -+from_extension(".xls") -> -+ "application/excel"; -+from_extension(".unv") -> -+ "application/i-deas"; -+from_extension(".jar") -> -+ "application/java-archive"; -+from_extension(".hqx") -> -+ "application/mac-binhex40"; -+from_extension(".cpt") -> -+ "application/mac-compactpro"; -+from_extension(".pot") -> -+ "application/vnd.ms-powerpoint"; -+from_extension(".ppt") -> -+ "application/vnd.ms-powerpoint"; -+from_extension(".dms") -> -+ "application/octet-stream"; -+from_extension(".lha") -> -+ "application/octet-stream"; -+from_extension(".lzh") -> -+ "application/octet-stream"; -+from_extension(".oda") -> -+ "application/oda"; -+from_extension(".ogg") -> -+ "application/ogg"; -+from_extension(".ogm") -> -+ "application/ogg"; -+from_extension(".pdf") -> -+ "application/pdf"; -+from_extension(".pgp") -> -+ "application/pgp"; -+from_extension(".ai") -> -+ "application/postscript"; -+from_extension(".eps") -> -+ "application/postscript"; -+from_extension(".ps") -> -+ "application/postscript"; -+from_extension(".prt") -> -+ "application/pro_eng"; -+from_extension(".rtf") -> -+ "application/rtf"; -+from_extension(".smi") -> -+ "application/smil"; -+from_extension(".smil") -> -+ "application/smil"; -+from_extension(".sol") -> -+ "application/solids"; -+from_extension(".vda") -> -+ "application/vda"; -+from_extension(".xlm") -> -+ "application/vnd.ms-excel"; -+from_extension(".cod") -> -+ "application/vnd.rim.cod"; -+from_extension(".pgn") -> -+ "application/x-chess-pgn"; -+from_extension(".cpio") -> -+ "application/x-cpio"; -+from_extension(".csh") -> -+ "application/x-csh"; -+from_extension(".deb") -> -+ "application/x-debian-package"; -+from_extension(".dcr") -> -+ "application/x-director"; -+from_extension(".dir") -> -+ "application/x-director"; -+from_extension(".dxr") -> -+ "application/x-director"; -+from_extension(".gz") -> -+ "application/x-gzip"; -+from_extension(".hdf") -> -+ "application/x-hdf"; -+from_extension(".ipx") -> -+ "application/x-ipix"; -+from_extension(".ips") -> -+ "application/x-ipscript"; - from_extension(".js") -> - "application/x-javascript"; --from_extension(".jpg") -> -- "image/jpeg"; --from_extension(".gif") -> -- "image/gif"; --from_extension(".png") -> -- "image/png"; -+from_extension(".skd") -> -+ "application/x-koan"; -+from_extension(".skm") -> -+ "application/x-koan"; -+from_extension(".skp") -> -+ "application/x-koan"; -+from_extension(".skt") -> -+ "application/x-koan"; -+from_extension(".latex") -> -+ "application/x-latex"; -+from_extension(".lsp") -> -+ "application/x-lisp"; -+from_extension(".scm") -> -+ "application/x-lotusscreencam"; -+from_extension(".mif") -> -+ "application/x-mif"; -+from_extension(".com") -> -+ "application/x-msdos-program"; -+from_extension(".exe") -> -+ "application/octet-stream"; -+from_extension(".cdf") -> -+ "application/x-netcdf"; -+from_extension(".nc") -> -+ "application/x-netcdf"; -+from_extension(".pl") -> -+ "application/x-perl"; -+from_extension(".pm") -> -+ "application/x-perl"; -+from_extension(".rar") -> -+ "application/x-rar-compressed"; -+from_extension(".sh") -> -+ "application/x-sh"; -+from_extension(".shar") -> -+ "application/x-shar"; - from_extension(".swf") -> - "application/x-shockwave-flash"; --from_extension(".zip") -> -- "application/zip"; --from_extension(".bz2") -> -- "application/x-bzip2"; --from_extension(".gz") -> -- "application/x-gzip"; -+from_extension(".sit") -> -+ "application/x-stuffit"; -+from_extension(".sv4cpio") -> -+ "application/x-sv4cpio"; -+from_extension(".sv4crc") -> -+ "application/x-sv4crc"; -+from_extension(".tar.gz") -> -+ "application/x-tar-gz"; -+from_extension(".tgz") -> -+ "application/x-tar-gz"; - from_extension(".tar") -> - "application/x-tar"; --from_extension(".tgz") -> -- "application/x-gzip"; -+from_extension(".tcl") -> -+ "application/x-tcl"; -+from_extension(".texi") -> -+ "application/x-texinfo"; -+from_extension(".texinfo") -> -+ "application/x-texinfo"; -+from_extension(".man") -> -+ "application/x-troff-man"; -+from_extension(".me") -> -+ "application/x-troff-me"; -+from_extension(".ms") -> -+ "application/x-troff-ms"; -+from_extension(".roff") -> -+ "application/x-troff"; -+from_extension(".t") -> -+ "application/x-troff"; -+from_extension(".tr") -> -+ "application/x-troff"; -+from_extension(".ustar") -> -+ "application/x-ustar"; -+from_extension(".src") -> -+ "application/x-wais-source"; -+from_extension(".zip") -> -+ "application/zip"; -+from_extension(".tsi") -> -+ "audio/TSP-audio"; -+from_extension(".au") -> -+ "audio/basic"; -+from_extension(".snd") -> -+ "audio/basic"; -+from_extension(".kar") -> -+ "audio/midi"; -+from_extension(".mid") -> -+ "audio/midi"; -+from_extension(".midi") -> -+ "audio/midi"; -+from_extension(".mp2") -> -+ "audio/mpeg"; -+from_extension(".mp3") -> -+ "audio/mpeg"; -+from_extension(".mpga") -> -+ "audio/mpeg"; -+from_extension(".aif") -> -+ "audio/x-aiff"; -+from_extension(".aifc") -> -+ "audio/x-aiff"; -+from_extension(".aiff") -> -+ "audio/x-aiff"; -+from_extension(".m3u") -> -+ "audio/x-mpegurl"; -+from_extension(".wax") -> -+ "audio/x-ms-wax"; -+from_extension(".wma") -> -+ "audio/x-ms-wma"; -+from_extension(".rpm") -> -+ "audio/x-pn-realaudio-plugin"; -+from_extension(".ram") -> -+ "audio/x-pn-realaudio"; -+from_extension(".rm") -> -+ "audio/x-pn-realaudio"; -+from_extension(".ra") -> -+ "audio/x-realaudio"; -+from_extension(".wav") -> -+ "audio/x-wav"; -+from_extension(".pdb") -> -+ "chemical/x-pdb"; -+from_extension(".ras") -> -+ "image/cmu-raster"; -+from_extension(".gif") -> -+ "image/gif"; -+from_extension(".ief") -> -+ "image/ief"; -+from_extension(".jpe") -> -+ "image/jpeg"; -+from_extension(".jpeg") -> -+ "image/jpeg"; -+from_extension(".jpg") -> -+ "image/jpeg"; -+from_extension(".jp2") -> -+ "image/jp2"; -+from_extension(".png") -> -+ "image/png"; -+from_extension(".tif") -> -+ "image/tiff"; -+from_extension(".tiff") -> -+ "image/tiff"; -+from_extension(".pnm") -> -+ "image/x-portable-anymap"; -+from_extension(".pbm") -> -+ "image/x-portable-bitmap"; -+from_extension(".pgm") -> -+ "image/x-portable-graymap"; -+from_extension(".ppm") -> -+ "image/x-portable-pixmap"; -+from_extension(".rgb") -> -+ "image/x-rgb"; -+from_extension(".xbm") -> -+ "image/x-xbitmap"; -+from_extension(".xwd") -> -+ "image/x-xwindowdump"; -+from_extension(".iges") -> -+ "model/iges"; -+from_extension(".igs") -> -+ "model/iges"; -+from_extension(".mesh") -> -+ "model/mesh"; -+from_extension(".") -> -+ ""; -+from_extension(".msh") -> -+ "model/mesh"; -+from_extension(".silo") -> -+ "model/mesh"; -+from_extension(".vrml") -> -+ "model/vrml"; -+from_extension(".wrl") -> -+ "model/vrml"; -+from_extension(".css") -> -+ "text/css"; -+from_extension(".htm") -> -+ "text/html"; -+from_extension(".html") -> -+ "text/html"; -+from_extension(".asc") -> -+ "text/plain"; -+from_extension(".c") -> -+ "text/plain"; -+from_extension(".cc") -> -+ "text/plain"; -+from_extension(".f90") -> -+ "text/plain"; -+from_extension(".f") -> -+ "text/plain"; -+from_extension(".hh") -> -+ "text/plain"; -+from_extension(".m") -> -+ "text/plain"; - from_extension(".txt") -> - "text/plain"; --from_extension(".doc") -> -- "application/msword"; --from_extension(".pdf") -> -- "application/pdf"; --from_extension(".xls") -> -- "application/vnd.ms-excel"; --from_extension(".rtf") -> -- "application/rtf"; -+from_extension(".rtx") -> -+ "text/richtext"; -+from_extension(".sgm") -> -+ "text/sgml"; -+from_extension(".sgml") -> -+ "text/sgml"; -+from_extension(".tsv") -> -+ "text/tab-separated-values"; -+from_extension(".jad") -> -+ "text/vnd.sun.j2me.app-descriptor"; -+from_extension(".etx") -> -+ "text/x-setext"; -+from_extension(".xml") -> -+ "application/xml"; -+from_extension(".dl") -> -+ "video/dl"; -+from_extension(".fli") -> -+ "video/fli"; -+from_extension(".flv") -> -+ "video/x-flv"; -+from_extension(".gl") -> -+ "video/gl"; -+from_extension(".mp4") -> -+ "video/mp4"; -+from_extension(".mpe") -> -+ "video/mpeg"; -+from_extension(".mpeg") -> -+ "video/mpeg"; -+from_extension(".mpg") -> -+ "video/mpeg"; - from_extension(".mov") -> - "video/quicktime"; --from_extension(".mp3") -> -- "audio/mpeg"; -+from_extension(".qt") -> -+ "video/quicktime"; -+from_extension(".viv") -> -+ "video/vnd.vivo"; -+from_extension(".vivo") -> -+ "video/vnd.vivo"; -+from_extension(".asf") -> -+ "video/x-ms-asf"; -+from_extension(".asx") -> -+ "video/x-ms-asx"; -+from_extension(".wmv") -> -+ "video/x-ms-wmv"; -+from_extension(".wmx") -> -+ "video/x-ms-wmx"; -+from_extension(".wvx") -> -+ "video/x-ms-wvx"; -+from_extension(".avi") -> -+ "video/x-msvideo"; -+from_extension(".movie") -> -+ "video/x-sgi-movie"; -+from_extension(".mime") -> -+ "www/mime"; -+from_extension(".ice") -> -+ "x-conference/x-cooltalk"; -+from_extension(".vrm") -> -+ "x-world/x-vrml"; -+from_extension(".spx") -> -+ "audio/ogg"; -+from_extension(".xhtml") -> -+ "application/xhtml+xml"; -+from_extension(".bz2") -> -+ "application/x-bzip2"; -+from_extension(".doc") -> -+ "application/msword"; - from_extension(".z") -> - "application/x-compress"; --from_extension(".wav") -> -- "audio/x-wav"; - from_extension(".ico") -> - "image/x-icon"; - from_extension(".bmp") -> - "image/bmp"; - from_extension(".m4a") -> - "audio/mpeg"; --from_extension(".m3u") -> -- "audio/x-mpegurl"; --from_extension(".exe") -> -- "application/octet-stream"; - from_extension(".csv") -> - "text/csv"; -+from_extension(".eot") -> -+ "application/vnd.ms-fontobject"; -+from_extension(".m4v") -> -+ "video/mp4"; -+from_extension(".svg") -> -+ "image/svg+xml"; -+from_extension(".svgz") -> -+ "image/svg+xml"; -+from_extension(".ttc") -> -+ "application/x-font-ttf"; -+from_extension(".ttf") -> -+ "application/x-font-ttf"; -+from_extension(".vcf") -> -+ "text/x-vcard"; -+from_extension(".webm") -> -+ "video/web"; -+from_extension(".webp") -> -+ "image/web"; -+from_extension(".woff") -> -+ "application/x-font-woff"; -+from_extension(".otf") -> -+ "font/opentype"; - from_extension(_) -> - undefined. - - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - exhaustive_from_extension_test() -> - T = mochiweb_cover:clause_lookup_table(?MODULE, from_extension), -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_multipart.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_multipart.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_multipart.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_multipart.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -128,7 +128,7 @@ - - parse_multipart_request(Req, Callback) -> - %% TODO: Support chunked? -- Length = list_to_integer(Req:get_header_value("content-length")), -+ Length = list_to_integer(Req:get_combined_header_value("content-length")), - Boundary = iolist_to_binary( - get_boundary(Req:get_header_value("content-type"))), - Prefix = <<"\r\n--", Boundary/binary>>, -@@ -240,24 +240,22 @@ - S - end. - --find_in_binary(B, Data) when size(B) > 0 -> -- case size(Data) - size(B) of -+%% @spec find_in_binary(Pattern::binary(), Data::binary()) -> -+%% {exact, N} | {partial, N, K} | not_found -+%% @doc Searches for the given pattern in the given binary. -+find_in_binary(P, Data) when size(P) > 0 -> -+ PS = size(P), -+ DS = size(Data), -+ case DS - PS of - Last when Last < 0 -> -- partial_find(B, Data, 0, size(Data)); -+ partial_find(P, Data, 0, DS); - Last -> -- find_in_binary(B, size(B), Data, 0, Last) -+ case binary:match(Data, P) of -+ {Pos, _} -> {exact, Pos}; -+ nomatch -> partial_find(P, Data, Last+1, PS-1) -+ end - end. - --find_in_binary(B, BS, D, N, Last) when N =< Last-> -- case D of -- <<_:N/binary, B:BS/binary, _/binary>> -> -- {exact, N}; -- _ -> -- find_in_binary(B, BS, D, 1 + N, Last) -- end; --find_in_binary(B, BS, D, N, Last) when N =:= 1 + Last -> -- partial_find(B, D, N, BS - 1). -- - partial_find(_B, _D, _N, 0) -> - not_found; - partial_find(B, D, N, K) -> -@@ -295,8 +293,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - ssl_cert_opts() -> - EbinDir = filename:dirname(code:which(?MODULE)), -@@ -313,7 +311,7 @@ - ssl -> - ServerOpts0 ++ [{ssl, true}, {ssl_opts, ssl_cert_opts()}] - end, -- {ok, Server} = mochiweb_socket_server:start(ServerOpts), -+ {ok, Server} = mochiweb_socket_server:start_link(ServerOpts), - Port = mochiweb_socket_server:get(Server, port), - ClientOpts = [binary, {active, false}], - {ok, Client} = case Transport of -@@ -821,4 +819,54 @@ - 10))), - ok. - -+%% @todo Move somewhere more appropriate than in the test suite -+ -+multipart_parsing_benchmark_test() -> -+ run_multipart_parsing_benchmark(1). -+ -+run_multipart_parsing_benchmark(0) -> ok; -+run_multipart_parsing_benchmark(N) -> -+ multipart_parsing_benchmark(), -+ run_multipart_parsing_benchmark(N-1). -+ -+multipart_parsing_benchmark() -> -+ ContentType = "multipart/form-data; boundary=----------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5", -+ Chunk = binary:copy(<<"This Is_%Some=Quite0Long4String2Used9For7BenchmarKing.5">>, 102400), -+ BinContent = <<"------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"Filename\"\r\n\r\nhello.txt\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"success_action_status\"\r\n\r\n201\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"file\"; filename=\"hello.txt\"\r\nContent-Type: application/octet-stream\r\n\r\n", Chunk/binary, "\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5\r\nContent-Disposition: form-data; name=\"Upload\"\r\n\r\nSubmit Query\r\n------------ei4GI3GI3Ij5Ef1ae0KM7Ij5ei4Ij5--">>, -+ Expect = [{headers, -+ [{"content-disposition", -+ {"form-data", [{"name", "Filename"}]}}]}, -+ {body, <<"hello.txt">>}, -+ body_end, -+ {headers, -+ [{"content-disposition", -+ {"form-data", [{"name", "success_action_status"}]}}]}, -+ {body, <<"201">>}, -+ body_end, -+ {headers, -+ [{"content-disposition", -+ {"form-data", [{"name", "file"}, {"filename", "hello.txt"}]}}, -+ {"content-type", {"application/octet-stream", []}}]}, -+ {body, Chunk}, -+ body_end, -+ {headers, -+ [{"content-disposition", -+ {"form-data", [{"name", "Upload"}]}}]}, -+ {body, <<"Submit Query">>}, -+ body_end, -+ eof], -+ TestCallback = fun (Next) -> test_callback(Next, Expect) end, -+ ServerFun = fun (Socket) -> -+ ok = mochiweb_socket:send(Socket, BinContent), -+ exit(normal) -+ end, -+ ClientFun = fun (Socket) -> -+ Req = fake_request(Socket, ContentType, -+ byte_size(BinContent)), -+ Res = parse_multipart_request(Req, TestCallback), -+ {0, <<>>, ok} = Res, -+ ok -+ end, -+ ok = with_socket_server(plain, ServerFun, ClientFun), -+ ok. - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_request.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_request.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -3,7 +3,7 @@ - - %% @doc MochiWeb HTTP Request abstraction. - ---module(mochiweb_request, [Socket, Method, RawPath, Version, Headers]). -+-module(mochiweb_request). - -author('bob@mochimedia.com'). - - -include_lib("kernel/include/file.hrl"). -@@ -11,17 +11,18 @@ - - -define(QUIP, "Any of you quaids got a smint?"). - ---export([get_header_value/1, get_primary_header_value/1, get/1, dump/0]). ---export([send/1, recv/1, recv/2, recv_body/0, recv_body/1, stream_body/3]). ---export([start_response/1, start_response_length/1, start_raw_response/1]). ---export([respond/1, ok/1]). ---export([not_found/0, not_found/1]). ---export([parse_post/0, parse_qs/0]). ---export([should_close/0, cleanup/0]). ---export([parse_cookie/0, get_cookie_value/1]). ---export([serve_file/2, serve_file/3]). ---export([accepted_encodings/1]). ---export([accepts_content_type/1]). -+-export([new/5]). -+-export([get_header_value/2, get_primary_header_value/2, get_combined_header_value/2, get/2, dump/1]). -+-export([send/2, recv/2, recv/3, recv_body/1, recv_body/2, stream_body/4]). -+-export([start_response/2, start_response_length/2, start_raw_response/2]). -+-export([respond/2, ok/2]). -+-export([not_found/1, not_found/2]). -+-export([parse_post/1, parse_qs/1]). -+-export([should_close/1, cleanup/1]). -+-export([parse_cookie/1, get_cookie_value/2]). -+-export([serve_file/3, serve_file/4]). -+-export([accepted_encodings/2]). -+-export([accepts_content_type/2, accepted_content_types/2]). - - -define(SAVE_QS, mochiweb_request_qs). - -define(SAVE_PATH, mochiweb_request_path). -@@ -32,11 +33,10 @@ - -define(SAVE_COOKIE, mochiweb_request_cookie). - -define(SAVE_FORCE_CLOSE, mochiweb_request_force_close). - --%% @type iolist() = [iolist() | binary() | char()]. --%% @type iodata() = binary() | iolist(). - %% @type key() = atom() | string() | binary() - %% @type value() = atom() | string() | binary() | integer() - %% @type headers(). A mochiweb_headers structure. -+%% @type request(). A mochiweb_request parameterized module instance. - %% @type response(). A mochiweb_response parameterized module instance. - %% @type ioheaders() = headers() | [{key(), value()}]. - -@@ -46,50 +46,58 @@ - % Maximum recv_body() length of 1MB - -define(MAX_RECV_BODY, (1024*1024)). - --%% @spec get_header_value(K) -> undefined | Value -+%% @spec new(Socket, Method, RawPath, Version, headers()) -> request() -+%% @doc Create a new request instance. -+new(Socket, Method, RawPath, Version, Headers) -> -+ {?MODULE, [Socket, Method, RawPath, Version, Headers]}. -+ -+%% @spec get_header_value(K, request()) -> undefined | Value - %% @doc Get the value of a given request header. --get_header_value(K) -> -+get_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> - mochiweb_headers:get_value(K, Headers). - --get_primary_header_value(K) -> -+get_primary_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> - mochiweb_headers:get_primary_value(K, Headers). - -+get_combined_header_value(K, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> -+ mochiweb_headers:get_combined_value(K, Headers). -+ - %% @type field() = socket | scheme | method | raw_path | version | headers | peer | path | body_length | range - --%% @spec get(field()) -> term() -+%% @spec get(field(), request()) -> term() - %% @doc Return the internal representation of the given field. If - %% <code>socket</code> is requested on a HTTPS connection, then - %% an ssl socket will be returned as <code>{ssl, SslSocket}</code>. - %% You can use <code>SslSocket</code> with the <code>ssl</code> - %% application, eg: <code>ssl:peercert(SslSocket)</code>. --get(socket) -> -+get(socket, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> - Socket; --get(scheme) -> -+get(scheme, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> - case mochiweb_socket:type(Socket) of - plain -> - http; - ssl -> - https - end; --get(method) -> -+get(method, {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}) -> - Method; --get(raw_path) -> -+get(raw_path, {?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> - RawPath; --get(version) -> -+get(version, {?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}) -> - Version; --get(headers) -> -+get(headers, {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}) -> - Headers; --get(peer) -> -+get(peer, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - case mochiweb_socket:peername(Socket) of - {ok, {Addr={10, _, _, _}, _Port}} -> -- case get_header_value("x-forwarded-for") of -+ case get_header_value("x-forwarded-for", THIS) of - undefined -> - inet_parse:ntoa(Addr); - Hosts -> - string:strip(lists:last(string:tokens(Hosts, ","))) - end; - {ok, {{127, 0, 0, 1}, _Port}} -> -- case get_header_value("x-forwarded-for") of -+ case get_header_value("x-forwarded-for", THIS) of - undefined -> - "127.0.0.1"; - Hosts -> -@@ -100,7 +108,7 @@ - {error, enotconn} -> - exit(normal) - end; --get(path) -> -+get(path, {?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> - case erlang:get(?SAVE_PATH) of - undefined -> - {Path0, _, _} = mochiweb_util:urlsplit_path(RawPath), -@@ -110,35 +118,35 @@ - Cached -> - Cached - end; --get(body_length) -> -+get(body_length, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - case erlang:get(?SAVE_BODY_LENGTH) of - undefined -> -- BodyLength = body_length(), -+ BodyLength = body_length(THIS), - put(?SAVE_BODY_LENGTH, {cached, BodyLength}), - BodyLength; - {cached, Cached} -> - Cached - end; --get(range) -> -- case get_header_value(range) of -+get(range, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ case get_header_value(range, THIS) of - undefined -> - undefined; - RawRange -> - mochiweb_http:parse_range_request(RawRange) - end. - --%% @spec dump() -> {mochiweb_request, [{atom(), term()}]} -+%% @spec dump(request()) -> {mochiweb_request, [{atom(), term()}]} - %% @doc Dump the internal representation to a "human readable" set of terms - %% for debugging/inspection purposes. --dump() -> -+dump({?MODULE, [_Socket, Method, RawPath, Version, Headers]}) -> - {?MODULE, [{method, Method}, - {version, Version}, - {raw_path, RawPath}, - {headers, mochiweb_headers:to_list(Headers)}]}. - --%% @spec send(iodata()) -> ok -+%% @spec send(iodata(), request()) -> ok - %% @doc Send data over the socket. --send(Data) -> -+send(Data, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> - case mochiweb_socket:send(Socket, Data) of - ok -> - ok; -@@ -146,16 +154,16 @@ - exit(normal) - end. - --%% @spec recv(integer()) -> binary() -+%% @spec recv(integer(), request()) -> binary() - %% @doc Receive Length bytes from the client as a binary, with the default - %% idle timeout. --recv(Length) -> -- recv(Length, ?IDLE_TIMEOUT). -+recv(Length, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ recv(Length, ?IDLE_TIMEOUT, THIS). - --%% @spec recv(integer(), integer()) -> binary() -+%% @spec recv(integer(), integer(), request()) -> binary() - %% @doc Receive Length bytes from the client as a binary, with the given - %% Timeout in msec. --recv(Length, Timeout) -> -+recv(Length, Timeout, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> - case mochiweb_socket:recv(Socket, Length, Timeout) of - {ok, Data} -> - put(?SAVE_RECV, true), -@@ -164,12 +172,12 @@ - exit(normal) - end. - --%% @spec body_length() -> undefined | chunked | unknown_transfer_encoding | integer() -+%% @spec body_length(request()) -> undefined | chunked | unknown_transfer_encoding | integer() - %% @doc Infer body length from transfer-encoding and content-length headers. --body_length() -> -- case get_header_value("transfer-encoding") of -+body_length({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ case get_header_value("transfer-encoding", THIS) of - undefined -> -- case get_header_value("content-length") of -+ case get_combined_header_value("content-length", THIS) of - undefined -> - undefined; - Length -> -@@ -182,16 +190,16 @@ - end. - - --%% @spec recv_body() -> binary() -+%% @spec recv_body(request()) -> binary() - %% @doc Receive the body of the HTTP request (defined by Content-Length). - %% Will only receive up to the default max-body length of 1MB. --recv_body() -> -- recv_body(?MAX_RECV_BODY). -+recv_body({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ recv_body(?MAX_RECV_BODY, THIS). - --%% @spec recv_body(integer()) -> binary() -+%% @spec recv_body(integer(), request()) -> binary() - %% @doc Receive the body of the HTTP request (defined by Content-Length). - %% Will receive up to MaxBody bytes. --recv_body(MaxBody) -> -+recv_body(MaxBody, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - case erlang:get(?SAVE_BODY) of - undefined -> - % we could use a sane constant for max chunk size -@@ -205,17 +213,18 @@ - true -> - {NewLength, [Bin | BinAcc]} - end -- end, {0, []}, MaxBody), -+ end, {0, []}, MaxBody, THIS), - put(?SAVE_BODY, Body), - Body; - Cached -> Cached - end. - --stream_body(MaxChunkSize, ChunkFun, FunState) -> -- stream_body(MaxChunkSize, ChunkFun, FunState, undefined). -+stream_body(MaxChunkSize, ChunkFun, FunState, {?MODULE,[_Socket,_Method,_RawPath,_Version,_Headers]}=THIS) -> -+ stream_body(MaxChunkSize, ChunkFun, FunState, undefined, THIS). - --stream_body(MaxChunkSize, ChunkFun, FunState, MaxBodyLength) -> -- Expect = case get_header_value("expect") of -+stream_body(MaxChunkSize, ChunkFun, FunState, MaxBodyLength, -+ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ Expect = case get_header_value("expect", THIS) of - undefined -> - undefined; - Value when is_list(Value) -> -@@ -223,11 +232,12 @@ - end, - case Expect of - "100-continue" -> -- start_raw_response({100, gb_trees:empty()}); -+ _ = start_raw_response({100, gb_trees:empty()}, THIS), -+ ok; - _Else -> - ok - end, -- case body_length() of -+ case body_length(THIS) of - undefined -> - undefined; - {unknown_transfer_encoding, Unknown} -> -@@ -236,7 +246,7 @@ - % In this case the MaxBody is actually used to - % determine the maximum allowed size of a single - % chunk. -- stream_chunked_body(MaxChunkSize, ChunkFun, FunState); -+ stream_chunked_body(MaxChunkSize, ChunkFun, FunState, THIS); - 0 -> - <<>>; - Length when is_integer(Length) -> -@@ -244,62 +254,64 @@ - MaxBodyLength when is_integer(MaxBodyLength), MaxBodyLength < Length -> - exit({body_too_large, content_length}); - _ -> -- stream_unchunked_body(Length, ChunkFun, FunState) -- end; -- Length -> -- exit({length_not_integer, Length}) -+ stream_unchunked_body(Length, ChunkFun, FunState, THIS) -+ end - end. - - --%% @spec start_response({integer(), ioheaders()}) -> response() -+%% @spec start_response({integer(), ioheaders()}, request()) -> response() - %% @doc Start the HTTP response by sending the Code HTTP response and - %% ResponseHeaders. The server will set header defaults such as Server - %% and Date if not present in ResponseHeaders. --start_response({Code, ResponseHeaders}) -> -+start_response({Code, ResponseHeaders}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - HResponse = mochiweb_headers:make(ResponseHeaders), - HResponse1 = mochiweb_headers:default_from_list(server_headers(), - HResponse), -- start_raw_response({Code, HResponse1}). -+ start_raw_response({Code, HResponse1}, THIS). - --%% @spec start_raw_response({integer(), headers()}) -> response() -+%% @spec start_raw_response({integer(), headers()}, request()) -> response() - %% @doc Start the HTTP response by sending the Code HTTP response and - %% ResponseHeaders. --start_raw_response({Code, ResponseHeaders}) -> -+start_raw_response({Code, ResponseHeaders}, {?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}=THIS) -> - F = fun ({K, V}, Acc) -> - [mochiweb_util:make_io(K), <<": ">>, V, <<"\r\n">> | Acc] - end, - End = lists:foldl(F, [<<"\r\n">>], - mochiweb_headers:to_list(ResponseHeaders)), -- send([make_version(Version), make_code(Code), <<"\r\n">> | End]), -+ send([make_version(Version), make_code(Code), <<"\r\n">> | End], THIS), - mochiweb:new_response({THIS, Code, ResponseHeaders}). - - --%% @spec start_response_length({integer(), ioheaders(), integer()}) -> response() -+%% @spec start_response_length({integer(), ioheaders(), integer()}, request()) -> response() - %% @doc Start the HTTP response by sending the Code HTTP response and - %% ResponseHeaders including a Content-Length of Length. The server - %% will set header defaults such as Server - %% and Date if not present in ResponseHeaders. --start_response_length({Code, ResponseHeaders, Length}) -> -+start_response_length({Code, ResponseHeaders, Length}, -+ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - HResponse = mochiweb_headers:make(ResponseHeaders), - HResponse1 = mochiweb_headers:enter("Content-Length", Length, HResponse), -- start_response({Code, HResponse1}). -+ start_response({Code, HResponse1}, THIS). - --%% @spec respond({integer(), ioheaders(), iodata() | chunked | {file, IoDevice}}) -> response() -+%% @spec respond({integer(), ioheaders(), iodata() | chunked | {file, IoDevice}}, request()) -> response() - %% @doc Start the HTTP response with start_response, and send Body to the - %% client (if the get(method) /= 'HEAD'). The Content-Length header - %% will be set by the Body length, and the server will insert header - %% defaults. --respond({Code, ResponseHeaders, {file, IoDevice}}) -> -+respond({Code, ResponseHeaders, {file, IoDevice}}, -+ {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}=THIS) -> - Length = mochiweb_io:iodevice_size(IoDevice), -- Response = start_response_length({Code, ResponseHeaders, Length}), -+ Response = start_response_length({Code, ResponseHeaders, Length}, THIS), - case Method of - 'HEAD' -> - ok; - _ -> -- mochiweb_io:iodevice_stream(fun send/1, IoDevice) -+ mochiweb_io:iodevice_stream( -+ fun (Body) -> send(Body, THIS) end, -+ IoDevice) - end, - Response; --respond({Code, ResponseHeaders, chunked}) -> -+respond({Code, ResponseHeaders, chunked}, {?MODULE, [_Socket, Method, _RawPath, Version, _Headers]}=THIS) -> - HResponse = mochiweb_headers:make(ResponseHeaders), - HResponse1 = case Method of - 'HEAD' -> -@@ -320,35 +332,35 @@ - put(?SAVE_FORCE_CLOSE, true), - HResponse - end, -- start_response({Code, HResponse1}); --respond({Code, ResponseHeaders, Body}) -> -- Response = start_response_length({Code, ResponseHeaders, iolist_size(Body)}), -+ start_response({Code, HResponse1}, THIS); -+respond({Code, ResponseHeaders, Body}, {?MODULE, [_Socket, Method, _RawPath, _Version, _Headers]}=THIS) -> -+ Response = start_response_length({Code, ResponseHeaders, iolist_size(Body)}, THIS), - case Method of - 'HEAD' -> - ok; - _ -> -- send(Body) -+ send(Body, THIS) - end, - Response. - --%% @spec not_found() -> response() -+%% @spec not_found(request()) -> response() - %% @doc Alias for <code>not_found([])</code>. --not_found() -> -- not_found([]). -+not_found({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ not_found([], THIS). - --%% @spec not_found(ExtraHeaders) -> response() -+%% @spec not_found(ExtraHeaders, request()) -> response() - %% @doc Alias for <code>respond({404, [{"Content-Type", "text/plain"} - %% | ExtraHeaders], <<"Not found.">>})</code>. --not_found(ExtraHeaders) -> -+not_found(ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - respond({404, [{"Content-Type", "text/plain"} | ExtraHeaders], -- <<"Not found.">>}). -+ <<"Not found.">>}, THIS). - --%% @spec ok({value(), iodata()} | {value(), ioheaders(), iodata() | {file, IoDevice}}) -> -+%% @spec ok({value(), iodata()} | {value(), ioheaders(), iodata() | {file, IoDevice}}, request()) -> - %% response() - %% @doc respond({200, [{"Content-Type", ContentType} | Headers], Body}). --ok({ContentType, Body}) -> -- ok({ContentType, [], Body}); --ok({ContentType, ResponseHeaders, Body}) -> -+ok({ContentType, Body}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ ok({ContentType, [], Body}, THIS); -+ok({ContentType, ResponseHeaders, Body}, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - HResponse = mochiweb_headers:make(ResponseHeaders), - case THIS:get(range) of - X when (X =:= undefined orelse X =:= fail) orelse Body =:= chunked -> -@@ -357,7 +369,7 @@ - %% full response. - HResponse1 = mochiweb_headers:enter("Content-Type", ContentType, - HResponse), -- respond({200, HResponse1, Body}); -+ respond({200, HResponse1, Body}, THIS); - Ranges -> - {PartList, Size} = range_parts(Body, Ranges), - case PartList of -@@ -366,7 +378,7 @@ - ContentType, - HResponse), - %% could be 416, for now we'll just return 200 -- respond({200, HResponse1, Body}); -+ respond({200, HResponse1, Body}, THIS); - PartList -> - {RangeHeaders, RangeBody} = - mochiweb_multipart:parts_to_body(PartList, ContentType, Size), -@@ -374,46 +386,50 @@ - [{"Accept-Ranges", "bytes"} | - RangeHeaders], - HResponse), -- respond({206, HResponse1, RangeBody}) -+ respond({206, HResponse1, RangeBody}, THIS) - end - end. - --%% @spec should_close() -> bool() -+%% @spec should_close(request()) -> bool() - %% @doc Return true if the connection must be closed. If false, using - %% Keep-Alive should be safe. --should_close() -> -+should_close({?MODULE, [_Socket, _Method, _RawPath, Version, _Headers]}=THIS) -> - ForceClose = erlang:get(?SAVE_FORCE_CLOSE) =/= undefined, - DidNotRecv = erlang:get(?SAVE_RECV) =:= undefined, - ForceClose orelse Version < {1, 0} - %% Connection: close -- orelse get_header_value("connection") =:= "close" -+ orelse is_close(get_header_value("connection", THIS)) - %% HTTP 1.0 requires Connection: Keep-Alive - orelse (Version =:= {1, 0} -- andalso get_header_value("connection") =/= "Keep-Alive") -+ andalso get_header_value("connection", THIS) =/= "Keep-Alive") - %% unread data left on the socket, can't safely continue - orelse (DidNotRecv -- andalso get_header_value("content-length") =/= undefined -- andalso list_to_integer(get_header_value("content-length")) > 0) -+ andalso get_combined_header_value("content-length", THIS) =/= undefined -+ andalso list_to_integer(get_combined_header_value("content-length", THIS)) > 0) - orelse (DidNotRecv -- andalso get_header_value("transfer-encoding") =:= "chunked"). -+ andalso get_header_value("transfer-encoding", THIS) =:= "chunked"). -+ -+is_close("close") -> -+ true; -+is_close(S=[_C, _L, _O, _S, _E]) -> -+ string:to_lower(S) =:= "close"; -+is_close(_) -> -+ false. - --%% @spec cleanup() -> ok -+%% @spec cleanup(request()) -> ok - %% @doc Clean up any junk in the process dictionary, required before continuing - %% a Keep-Alive request. --cleanup() -> -- [erase(K) || K <- [?SAVE_QS, -- ?SAVE_PATH, -- ?SAVE_RECV, -- ?SAVE_BODY, -- ?SAVE_BODY_LENGTH, -- ?SAVE_POST, -- ?SAVE_COOKIE, -- ?SAVE_FORCE_CLOSE]], -+cleanup({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}) -> -+ L = [?SAVE_QS, ?SAVE_PATH, ?SAVE_RECV, ?SAVE_BODY, ?SAVE_BODY_LENGTH, -+ ?SAVE_POST, ?SAVE_COOKIE, ?SAVE_FORCE_CLOSE], -+ lists:foreach(fun(K) -> -+ erase(K) -+ end, L), - ok. - --%% @spec parse_qs() -> [{Key::string(), Value::string()}] -+%% @spec parse_qs(request()) -> [{Key::string(), Value::string()}] - %% @doc Parse the query string of the URL. --parse_qs() -> -+parse_qs({?MODULE, [_Socket, _Method, RawPath, _Version, _Headers]}) -> - case erlang:get(?SAVE_QS) of - undefined -> - {_, QueryString, _} = mochiweb_util:urlsplit_path(RawPath), -@@ -424,17 +440,17 @@ - Cached - end. - --%% @spec get_cookie_value(Key::string) -> string() | undefined -+%% @spec get_cookie_value(Key::string, request()) -> string() | undefined - %% @doc Get the value of the given cookie. --get_cookie_value(Key) -> -- proplists:get_value(Key, parse_cookie()). -+get_cookie_value(Key, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ proplists:get_value(Key, parse_cookie(THIS)). - --%% @spec parse_cookie() -> [{Key::string(), Value::string()}] -+%% @spec parse_cookie(request()) -> [{Key::string(), Value::string()}] - %% @doc Parse the cookie header. --parse_cookie() -> -+parse_cookie({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - case erlang:get(?SAVE_COOKIE) of - undefined -> -- Cookies = case get_header_value("cookie") of -+ Cookies = case get_header_value("cookie", THIS) of - undefined -> - []; - Value -> -@@ -446,17 +462,17 @@ - Cached - end. - --%% @spec parse_post() -> [{Key::string(), Value::string()}] -+%% @spec parse_post(request()) -> [{Key::string(), Value::string()}] - %% @doc Parse an application/x-www-form-urlencoded form POST. This - %% has the side-effect of calling recv_body(). --parse_post() -> -+parse_post({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - case erlang:get(?SAVE_POST) of - undefined -> -- Parsed = case recv_body() of -+ Parsed = case recv_body(THIS) of - undefined -> - []; - Binary -> -- case get_primary_header_value("content-type") of -+ case get_primary_header_value("content-type",THIS) of - "application/x-www-form-urlencoded" ++ _ -> - mochiweb_util:parse_qs(Binary); - _ -> -@@ -469,41 +485,43 @@ - Cached - end. - --%% @spec stream_chunked_body(integer(), fun(), term()) -> term() -+%% @spec stream_chunked_body(integer(), fun(), term(), request()) -> term() - %% @doc The function is called for each chunk. - %% Used internally by read_chunked_body. --stream_chunked_body(MaxChunkSize, Fun, FunState) -> -- case read_chunk_length() of -+stream_chunked_body(MaxChunkSize, Fun, FunState, -+ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ case read_chunk_length(THIS) of - 0 -> -- Fun({0, read_chunk(0)}, FunState); -+ Fun({0, read_chunk(0, THIS)}, FunState); - Length when Length > MaxChunkSize -> -- NewState = read_sub_chunks(Length, MaxChunkSize, Fun, FunState), -- stream_chunked_body(MaxChunkSize, Fun, NewState); -+ NewState = read_sub_chunks(Length, MaxChunkSize, Fun, FunState, THIS), -+ stream_chunked_body(MaxChunkSize, Fun, NewState, THIS); - Length -> -- NewState = Fun({Length, read_chunk(Length)}, FunState), -- stream_chunked_body(MaxChunkSize, Fun, NewState) -+ NewState = Fun({Length, read_chunk(Length, THIS)}, FunState), -+ stream_chunked_body(MaxChunkSize, Fun, NewState, THIS) - end. - --stream_unchunked_body(0, Fun, FunState) -> -+stream_unchunked_body(0, Fun, FunState, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}) -> - Fun({0, <<>>}, FunState); --stream_unchunked_body(Length, Fun, FunState) when Length > 0 -> -+stream_unchunked_body(Length, Fun, FunState, -+ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) when Length > 0 -> - PktSize = case Length > ?RECBUF_SIZE of - true -> - ?RECBUF_SIZE; - false -> - Length - end, -- Bin = recv(PktSize), -+ Bin = recv(PktSize, THIS), - NewState = Fun({PktSize, Bin}, FunState), -- stream_unchunked_body(Length - PktSize, Fun, NewState). -+ stream_unchunked_body(Length - PktSize, Fun, NewState, THIS). - --%% @spec read_chunk_length() -> integer() -+%% @spec read_chunk_length(request()) -> integer() - %% @doc Read the length of the next HTTP chunk. --read_chunk_length() -> -- mochiweb_socket:setopts(Socket, [{packet, line}]), -+read_chunk_length({?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> -+ ok = mochiweb_socket:setopts(Socket, [{packet, line}]), - case mochiweb_socket:recv(Socket, 0, ?IDLE_TIMEOUT) of - {ok, Header} -> -- mochiweb_socket:setopts(Socket, [{packet, raw}]), -+ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), - Splitter = fun (C) -> - C =/= $\r andalso C =/= $\n andalso C =/= $ - end, -@@ -513,11 +531,11 @@ - exit(normal) - end. - --%% @spec read_chunk(integer()) -> Chunk::binary() | [Footer::binary()] -+%% @spec read_chunk(integer(), request()) -> Chunk::binary() | [Footer::binary()] - %% @doc Read in a HTTP chunk of the given length. If Length is 0, then read the - %% HTTP footers (as a list of binaries, since they're nominal). --read_chunk(0) -> -- mochiweb_socket:setopts(Socket, [{packet, line}]), -+read_chunk(0, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> -+ ok = mochiweb_socket:setopts(Socket, [{packet, line}]), - F = fun (F1, Acc) -> - case mochiweb_socket:recv(Socket, 0, ?IDLE_TIMEOUT) of - {ok, <<"\r\n">>} -> -@@ -529,10 +547,10 @@ - end - end, - Footers = F(F, []), -- mochiweb_socket:setopts(Socket, [{packet, raw}]), -+ ok = mochiweb_socket:setopts(Socket, [{packet, raw}]), - put(?SAVE_RECV, true), - Footers; --read_chunk(Length) -> -+read_chunk(Length, {?MODULE, [Socket, _Method, _RawPath, _Version, _Headers]}) -> - case mochiweb_socket:recv(Socket, 2 + Length, ?IDLE_TIMEOUT) of - {ok, <<Chunk:Length/binary, "\r\n">>} -> - Chunk; -@@ -540,32 +558,34 @@ - exit(normal) - end. - --read_sub_chunks(Length, MaxChunkSize, Fun, FunState) when Length > MaxChunkSize -> -- Bin = recv(MaxChunkSize), -+read_sub_chunks(Length, MaxChunkSize, Fun, FunState, -+ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) when Length > MaxChunkSize -> -+ Bin = recv(MaxChunkSize, THIS), - NewState = Fun({size(Bin), Bin}, FunState), -- read_sub_chunks(Length - MaxChunkSize, MaxChunkSize, Fun, NewState); -+ read_sub_chunks(Length - MaxChunkSize, MaxChunkSize, Fun, NewState, THIS); - --read_sub_chunks(Length, _MaxChunkSize, Fun, FunState) -> -- Fun({Length, read_chunk(Length)}, FunState). -+read_sub_chunks(Length, _MaxChunkSize, Fun, FunState, -+ {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ Fun({Length, read_chunk(Length, THIS)}, FunState). - --%% @spec serve_file(Path, DocRoot) -> Response -+%% @spec serve_file(Path, DocRoot, request()) -> Response - %% @doc Serve a file relative to DocRoot. --serve_file(Path, DocRoot) -> -- serve_file(Path, DocRoot, []). -+serve_file(Path, DocRoot, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ serve_file(Path, DocRoot, [], THIS). - --%% @spec serve_file(Path, DocRoot, ExtraHeaders) -> Response -+%% @spec serve_file(Path, DocRoot, ExtraHeaders, request()) -> Response - %% @doc Serve a file relative to DocRoot. --serve_file(Path, DocRoot, ExtraHeaders) -> -+serve_file(Path, DocRoot, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - case mochiweb_util:safe_relative_path(Path) of - undefined -> -- not_found(ExtraHeaders); -+ not_found(ExtraHeaders, THIS); - RelPath -> - FullPath = filename:join([DocRoot, RelPath]), - case filelib:is_dir(FullPath) of - true -> -- maybe_redirect(RelPath, FullPath, ExtraHeaders); -+ maybe_redirect(RelPath, FullPath, ExtraHeaders, THIS); - false -> -- maybe_serve_file(FullPath, ExtraHeaders) -+ maybe_serve_file(FullPath, ExtraHeaders, THIS) - end - end. - -@@ -575,13 +595,14 @@ - directory_index(FullPath) -> - filename:join([FullPath, "index.html"]). - --maybe_redirect([], FullPath, ExtraHeaders) -> -- maybe_serve_file(directory_index(FullPath), ExtraHeaders); -+maybe_redirect([], FullPath, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ maybe_serve_file(directory_index(FullPath), ExtraHeaders, THIS); - --maybe_redirect(RelPath, FullPath, ExtraHeaders) -> -+maybe_redirect(RelPath, FullPath, ExtraHeaders, -+ {?MODULE, [_Socket, _Method, _RawPath, _Version, Headers]}=THIS) -> - case string:right(RelPath, 1) of - "/" -> -- maybe_serve_file(directory_index(FullPath), ExtraHeaders); -+ maybe_serve_file(directory_index(FullPath), ExtraHeaders, THIS); - _ -> - Host = mochiweb_headers:get_value("host", Headers), - Location = "http://" ++ Host ++ "/" ++ RelPath ++ "/", -@@ -596,16 +617,16 @@ - "<p>The document has moved <a href=\"">>, - Bottom = <<">here</a>.</p></body></html>\n">>, - Body = <<Top/binary, LocationBin/binary, Bottom/binary>>, -- respond({301, MoreHeaders, Body}) -+ respond({301, MoreHeaders, Body}, THIS) - end. - --maybe_serve_file(File, ExtraHeaders) -> -+maybe_serve_file(File, ExtraHeaders, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - case file:read_file_info(File) of - {ok, FileInfo} -> - LastModified = httpd_util:rfc1123_date(FileInfo#file_info.mtime), -- case get_header_value("if-modified-since") of -+ case get_header_value("if-modified-since", THIS) of - LastModified -> -- respond({304, ExtraHeaders, ""}); -+ respond({304, ExtraHeaders, ""}, THIS); - _ -> - case file:open(File, [raw, binary]) of - {ok, IoDevice} -> -@@ -613,15 +634,15 @@ - Res = ok({ContentType, - [{"last-modified", LastModified} - | ExtraHeaders], -- {file, IoDevice}}), -- file:close(IoDevice), -+ {file, IoDevice}}, THIS), -+ ok = file:close(IoDevice), - Res; - _ -> -- not_found(ExtraHeaders) -+ not_found(ExtraHeaders, THIS) - end - end; - {error, _} -> -- not_found(ExtraHeaders) -+ not_found(ExtraHeaders, THIS) - end. - - server_headers() -> -@@ -669,7 +690,7 @@ - end, - {lists:foldr(F, [], Ranges), Size}. - --%% @spec accepted_encodings([encoding()]) -> [encoding()] | bad_accept_encoding_value -+%% @spec accepted_encodings([encoding()], request()) -> [encoding()] | bad_accept_encoding_value - %% @type encoding() = string(). - %% - %% @doc Returns a list of encodings accepted by a request. Encodings that are -@@ -693,8 +714,8 @@ - %% accepted_encodings(["gzip", "deflate", "identity"]) -> - %% ["deflate", "gzip", "identity"] - %% --accepted_encodings(SupportedEncodings) -> -- AcceptEncodingHeader = case get_header_value("Accept-Encoding") of -+accepted_encodings(SupportedEncodings, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ AcceptEncodingHeader = case get_header_value("Accept-Encoding", THIS) of - undefined -> - ""; - Value -> -@@ -709,7 +730,7 @@ - ) - end. - --%% @spec accepts_content_type(string() | binary()) -> boolean() | bad_accept_header -+%% @spec accepts_content_type(string() | binary(), request()) -> boolean() | bad_accept_header - %% - %% @doc Determines whether a request accepts a given media type by analyzing its - %% "Accept" header. -@@ -731,16 +752,9 @@ - %% 5) For an "Accept" header with value "text/*; q=0.0, */*": - %% accepts_content_type("text/plain") -> false - %% --accepts_content_type(ContentType) when is_binary(ContentType) -> -- accepts_content_type(binary_to_list(ContentType)); --accepts_content_type(ContentType1) -> -+accepts_content_type(ContentType1, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> - ContentType = re:replace(ContentType1, "\\s", "", [global, {return, list}]), -- AcceptHeader = case get_header_value("Accept") of -- undefined -> -- "*/*"; -- Value -> -- Value -- end, -+ AcceptHeader = accept_header(THIS), - case mochiweb_util:parse_qvalues(AcceptHeader) of - invalid_qvalue_string -> - bad_accept_header; -@@ -761,9 +775,83 @@ - (not lists:member({SuperType, 0.0}, QList)) - end. - -+%% @spec accepted_content_types([string() | binary()], request()) -> [string()] | bad_accept_header -+%% -+%% @doc Filters which of the given media types this request accepts. This filtering -+%% is performed by analyzing the "Accept" header. The returned list is sorted -+%% according to the preferences specified in the "Accept" header (higher Q values -+%% first). If two or more types have the same preference (Q value), they're order -+%% in the returned list is the same as they're order in the input list. -+%% -+%% Examples -+%% -+%% 1) For a missing "Accept" header: -+%% accepted_content_types(["text/html", "application/json"]) -> -+%% ["text/html", "application/json"] -+%% -+%% 2) For an "Accept" header with value "text/html, application/*": -+%% accepted_content_types(["application/json", "text/html"]) -> -+%% ["application/json", "text/html"] -+%% -+%% 3) For an "Accept" header with value "text/html, */*; q=0.0": -+%% accepted_content_types(["text/html", "application/json"]) -> -+%% ["text/html"] -+%% -+%% 4) For an "Accept" header with value "text/html; q=0.5, */*; q=0.1": -+%% accepts_content_types(["application/json", "text/html"]) -> -+%% ["text/html", "application/json"] -+%% -+accepted_content_types(Types1, {?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ Types = lists:map( -+ fun(T) -> re:replace(T, "\\s", "", [global, {return, list}]) end, -+ Types1), -+ AcceptHeader = accept_header(THIS), -+ case mochiweb_util:parse_qvalues(AcceptHeader) of -+ invalid_qvalue_string -> -+ bad_accept_header; -+ QList -> -+ TypesQ = lists:foldr( -+ fun(T, Acc) -> -+ case proplists:get_value(T, QList) of -+ undefined -> -+ [MainType, _SubType] = string:tokens(T, "/"), -+ case proplists:get_value(MainType ++ "/*", QList) of -+ undefined -> -+ case proplists:get_value("*/*", QList) of -+ Q when is_float(Q), Q > 0.0 -> -+ [{Q, T} | Acc]; -+ _ -> -+ Acc -+ end; -+ Q when Q > 0.0 -> -+ [{Q, T} | Acc]; -+ _ -> -+ Acc -+ end; -+ Q when Q > 0.0 -> -+ [{Q, T} | Acc]; -+ _ -> -+ Acc -+ end -+ end, -+ [], Types), -+ % Note: Stable sort. If 2 types have the same Q value we leave them in the -+ % same order as in the input list. -+ SortFun = fun({Q1, _}, {Q2, _}) -> Q1 >= Q2 end, -+ [Type || {_Q, Type} <- lists:sort(SortFun, TypesQ)] -+ end. -+ -+accept_header({?MODULE, [_Socket, _Method, _RawPath, _Version, _Headers]}=THIS) -> -+ case get_header_value("Accept", THIS) of -+ undefined -> -+ "*/*"; -+ Value -> -+ Value -+ end. -+ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_request_tests.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request_tests.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_request_tests.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_request_tests.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -1,12 +1,13 @@ - -module(mochiweb_request_tests). - ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - accepts_content_type_test() -> - Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, - mochiweb_headers:make([{"Accept", "multipart/related"}])), - ?assertEqual(true, Req1:accepts_content_type("multipart/related")), -+ ?assertEqual(true, Req1:accepts_content_type(<<"multipart/related">>)), - - Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, - mochiweb_headers:make([{"Accept", "text/html"}])), -@@ -60,4 +61,122 @@ - mochiweb_headers:make([{"Accept", "text/html;level=1;q=0.1, text/html"}])), - ?assertEqual(true, Req14:accepts_content_type("text/html; level=1")). - -+accepted_encodings_test() -> -+ Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([])), -+ ?assertEqual(["identity"], -+ Req1:accepted_encodings(["gzip", "identity"])), -+ -+ Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept-Encoding", "gzip, deflate"}])), -+ ?assertEqual(["gzip", "identity"], -+ Req2:accepted_encodings(["gzip", "identity"])), -+ -+ Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept-Encoding", "gzip;q=0.5, deflate"}])), -+ ?assertEqual(["deflate", "gzip", "identity"], -+ Req3:accepted_encodings(["gzip", "deflate", "identity"])), -+ -+ Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept-Encoding", "identity, *;q=0"}])), -+ ?assertEqual(["identity"], -+ Req4:accepted_encodings(["gzip", "deflate", "identity"])), -+ -+ Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept-Encoding", "gzip; q=0.1, *;q=0"}])), -+ ?assertEqual(["gzip"], -+ Req5:accepted_encodings(["gzip", "deflate", "identity"])), -+ -+ Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept-Encoding", "gzip; q=, *;q=0"}])), -+ ?assertEqual(bad_accept_encoding_value, -+ Req6:accepted_encodings(["gzip", "deflate", "identity"])), -+ -+ Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept-Encoding", "gzip;q=2.0, *;q=0"}])), -+ ?assertEqual(bad_accept_encoding_value, -+ Req7:accepted_encodings(["gzip", "identity"])), -+ -+ Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept-Encoding", "deflate, *;q=0.0"}])), -+ ?assertEqual([], -+ Req8:accepted_encodings(["gzip", "identity"])). -+ -+accepted_content_types_test() -> -+ Req1 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept", "text/html"}])), -+ ?assertEqual(["text/html"], -+ Req1:accepted_content_types(["text/html", "application/json"])), -+ -+ Req2 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept", "text/html, */*;q=0"}])), -+ ?assertEqual(["text/html"], -+ Req2:accepted_content_types(["text/html", "application/json"])), -+ -+ Req3 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept", "text/*, */*;q=0"}])), -+ ?assertEqual(["text/html"], -+ Req3:accepted_content_types(["text/html", "application/json"])), -+ -+ Req4 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])), -+ ?assertEqual(["text/html", "application/json"], -+ Req4:accepted_content_types(["application/json", "text/html"])), -+ -+ Req5 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept", "text/*;q=0.8, */*;q=0.5"}])), -+ ?assertEqual(["text/html", "application/json"], -+ Req5:accepted_content_types(["text/html", "application/json"])), -+ -+ Req6 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept", "text/*;q=0.5, */*;q=0.5"}])), -+ ?assertEqual(["application/json", "text/html"], -+ Req6:accepted_content_types(["application/json", "text/html"])), -+ -+ Req7 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make( -+ [{"Accept", "text/html;q=0.5, application/json;q=0.5"}])), -+ ?assertEqual(["application/json", "text/html"], -+ Req7:accepted_content_types(["application/json", "text/html"])), -+ -+ Req8 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept", "text/html"}])), -+ ?assertEqual([], -+ Req8:accepted_content_types(["application/json"])), -+ -+ Req9 = mochiweb_request:new(nil, 'GET', "/foo", {1, 1}, -+ mochiweb_headers:make([{"Accept", "text/*;q=0.9, text/html;q=0.5, */*;q=0.7"}])), -+ ?assertEqual(["application/json", "text/html"], -+ Req9:accepted_content_types(["text/html", "application/json"])). -+ -+should_close_test() -> -+ F = fun (V, H) -> -+ (mochiweb_request:new( -+ nil, 'GET', "/", V, -+ mochiweb_headers:make(H) -+ )):should_close() -+ end, -+ ?assertEqual( -+ true, -+ F({1, 1}, [{"Connection", "close"}])), -+ ?assertEqual( -+ true, -+ F({1, 0}, [{"Connection", "close"}])), -+ ?assertEqual( -+ true, -+ F({1, 1}, [{"Connection", "ClOSe"}])), -+ ?assertEqual( -+ false, -+ F({1, 1}, [{"Connection", "closer"}])), -+ ?assertEqual( -+ false, -+ F({1, 1}, [])), -+ ?assertEqual( -+ true, -+ F({1, 0}, [])), -+ ?assertEqual( -+ false, -+ F({1, 0}, [{"Connection", "Keep-Alive"}])), -+ ok. -+ - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_response.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_response.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_response.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_response.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -3,39 +3,47 @@ - - %% @doc Response abstraction. - ---module(mochiweb_response, [Request, Code, Headers]). -+-module(mochiweb_response). - -author('bob@mochimedia.com'). - - -define(QUIP, "Any of you quaids got a smint?"). - ---export([get_header_value/1, get/1, dump/0]). ---export([send/1, write_chunk/1]). -+-export([new/3, get_header_value/2, get/2, dump/1]). -+-export([send/2, write_chunk/2]). - --%% @spec get_header_value(string() | atom() | binary()) -> string() | undefined -+%% @type response(). A mochiweb_response parameterized module instance. -+ -+%% @spec new(Request, Code, Headers) -> response() -+%% @doc Create a new mochiweb_response instance. -+new(Request, Code, Headers) -> -+ {?MODULE, [Request, Code, Headers]}. -+ -+%% @spec get_header_value(string() | atom() | binary(), response()) -> -+%% string() | undefined - %% @doc Get the value of the given response header. --get_header_value(K) -> -+get_header_value(K, {?MODULE, [_Request, _Code, Headers]}) -> - mochiweb_headers:get_value(K, Headers). - --%% @spec get(request | code | headers) -> term() -+%% @spec get(request | code | headers, response()) -> term() - %% @doc Return the internal representation of the given field. --get(request) -> -+get(request, {?MODULE, [Request, _Code, _Headers]}) -> - Request; --get(code) -> -+get(code, {?MODULE, [_Request, Code, _Headers]}) -> - Code; --get(headers) -> -+get(headers, {?MODULE, [_Request, _Code, Headers]}) -> - Headers. - --%% @spec dump() -> {mochiweb_request, [{atom(), term()}]} -+%% @spec dump(response()) -> {mochiweb_request, [{atom(), term()}]} - %% @doc Dump the internal representation to a "human readable" set of terms - %% for debugging/inspection purposes. --dump() -> -+dump({?MODULE, [Request, Code, Headers]}) -> - [{request, Request:dump()}, - {code, Code}, - {headers, mochiweb_headers:to_list(Headers)}]. - --%% @spec send(iodata()) -> ok -+%% @spec send(iodata(), response()) -> ok - %% @doc Send data over the socket if the method is not HEAD. --send(Data) -> -+send(Data, {?MODULE, [Request, _Code, _Headers]}) -> - case Request:get(method) of - 'HEAD' -> - ok; -@@ -43,22 +51,22 @@ - Request:send(Data) - end. - --%% @spec write_chunk(iodata()) -> ok -+%% @spec write_chunk(iodata(), response()) -> ok - %% @doc Write a chunk of a HTTP chunked response. If Data is zero length, - %% then the chunked response will be finished. --write_chunk(Data) -> -+write_chunk(Data, {?MODULE, [Request, _Code, _Headers]}=THIS) -> - case Request:get(version) of - Version when Version >= {1, 1} -> - Length = iolist_size(Data), -- send([io_lib:format("~.16b\r\n", [Length]), Data, <<"\r\n">>]); -+ send([io_lib:format("~.16b\r\n", [Length]), Data, <<"\r\n">>], THIS); - _ -> -- send(Data) -+ send(Data, THIS) - end. - - - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - -endif. -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_socket_server.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_socket_server.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_socket_server.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_socket_server.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -9,7 +9,7 @@ - - -include("internal.hrl"). - ---export([start/1, stop/1]). -+-export([start/1, start_link/1, stop/1]). - -export([init/1, handle_call/3, handle_cast/2, terminate/2, code_change/3, - handle_info/2]). - -export([get/2, set/3]). -@@ -33,10 +33,22 @@ - - -define(is_old_state(State), not is_record(State, mochiweb_socket_server)). - --start(State=#mochiweb_socket_server{}) -> -- start_server(State); -+start_link(Options) -> -+ start_server(start_link, parse_options(Options)). -+ - start(Options) -> -- start(parse_options(Options)). -+ case lists:keytake(link, 1, Options) of -+ {value, {_Key, false}, Options1} -> -+ start_server(start, parse_options(Options1)); -+ _ -> -+ %% TODO: https://github.com/mochi/mochiweb/issues/58 -+ %% [X] Phase 1: Add new APIs (Sep 2011) -+ %% [_] Phase 2: Add deprecation warning -+ %% [_] Phase 3: Change default to {link, false} and ignore link -+ %% [_] Phase 4: Add deprecation warning for {link, _} option -+ %% [_] Phase 5: Remove support for {link, _} option -+ start_link(Options) -+ end. - - get(Name, Property) -> - gen_server:call(Name, {get, Property}). -@@ -61,6 +73,8 @@ - - %% Internal API - -+parse_options(State=#mochiweb_socket_server{}) -> -+ State; - parse_options(Options) -> - parse_options(Options, #mochiweb_socket_server{}). - -@@ -116,22 +130,22 @@ - parse_options(Rest, State#mochiweb_socket_server{profile_fun=ProfileFun}). - - --start_server(State=#mochiweb_socket_server{ssl=Ssl, name=Name}) -> -- case Ssl of -- true -> -- application:start(crypto), -- application:start(public_key), -- application:start(ssl); -- false -> -- void -- end, -+start_server(F, State=#mochiweb_socket_server{ssl=Ssl, name=Name}) -> -+ ok = prep_ssl(Ssl), - case Name of - undefined -> -- gen_server:start_link(?MODULE, State, []); -+ gen_server:F(?MODULE, State, []); - _ -> -- gen_server:start_link(Name, ?MODULE, State, []) -+ gen_server:F(Name, ?MODULE, State, []) - end. - -+prep_ssl(true) -> -+ ok = mochiweb:ensure_started(crypto), -+ ok = mochiweb:ensure_started(public_key), -+ ok = mochiweb:ensure_started(ssl); -+prep_ssl(false) -> -+ ok. -+ - ensure_int(N) when is_integer(N) -> - N; - ensure_int(S) when is_list(S) -> -@@ -165,27 +179,7 @@ - {_, _, _, _, _, _, _, _} -> % IPv6 - [inet6, {ip, Ip} | BaseOpts] - end, -- case listen(Port, Opts, State) of -- {stop, eacces} -> -- case Port < 1024 of -- true -> -- case catch fdsrv:start() of -- {ok, _} -> -- case fdsrv:bind_socket(tcp, Port) of -- {ok, Fd} -> -- listen(Port, [{fd, Fd} | Opts], State); -- _ -> -- {stop, fdsrv_bind_failed} -- end; -- _ -> -- {stop, fdsrv_start_failed} -- end; -- false -> -- {stop, eacces} -- end; -- Other -> -- Other -- end. -+ listen(Port, Opts, State). - - new_acceptor_pool(Listen, - State=#mochiweb_socket_server{acceptor_pool=Pool, -@@ -271,15 +265,8 @@ - - terminate(Reason, State) when ?is_old_state(State) -> - terminate(Reason, upgrade_state(State)); --terminate(_Reason, #mochiweb_socket_server{listen=Listen, port=Port}) -> -- mochiweb_socket:close(Listen), -- case Port < 1024 of -- true -> -- catch fdsrv:stop(), -- ok; -- false -> -- ok -- end. -+terminate(_Reason, #mochiweb_socket_server{listen=Listen}) -> -+ mochiweb_socket:close(Listen). - - code_change(_OldVsn, State, _Extra) -> - State. -@@ -337,8 +324,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - upgrade_state_test() -> - OldState = {mochiweb_socket_server, -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/mochiweb_util.erl apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_util.erl ---- apache-couchdb-1.2.1/src/mochiweb/mochiweb_util.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/mochiweb_util.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -9,7 +9,7 @@ - -export([path_split/1]). - -export([urlsplit/1, urlsplit_path/1, urlunsplit/1, urlunsplit_path/1]). - -export([guess_mime/1, parse_header/1]). ---export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2, cmd_status/1]). -+-export([shell_quote/1, cmd/1, cmd_string/1, cmd_port/2, cmd_status/1, cmd_status/2]). - -export([record_to_proplist/2, record_to_proplist/3]). - -export([safe_relative_path/1, partition/2]). - -export([parse_qvalues/1, pick_accepted_encodings/3]). -@@ -124,11 +124,17 @@ - string:join([shell_quote(X) || X <- Argv], " "). - - %% @spec cmd_status([string()]) -> {ExitStatus::integer(), Stdout::binary()} --%% @doc Accumulate the output and exit status from the given application, will be --%% spawned with cmd_port/2. -+%% @doc Accumulate the output and exit status from the given application, -+%% will be spawned with cmd_port/2. - cmd_status(Argv) -> -+ cmd_status(Argv, []). -+ -+%% @spec cmd_status([string()], [atom()]) -> {ExitStatus::integer(), Stdout::binary()} -+%% @doc Accumulate the output and exit status from the given application, -+%% will be spawned with cmd_port/2. -+cmd_status(Argv, Options) -> - Port = cmd_port(Argv, [exit_status, stderr_to_stdout, -- use_stdio, binary]), -+ use_stdio, binary | Options]), - try cmd_loop(Port, []) - after catch port_close(Port) - end. -@@ -578,8 +584,8 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - - make_io_test() -> - ?assertEqual( -diff -wbBur apache-couchdb-1.2.1/src/mochiweb/reloader.erl apache-couchdb-1.2.1.q/src/mochiweb/reloader.erl ---- apache-couchdb-1.2.1/src/mochiweb/reloader.erl 2012-12-21 01:24:07.000000000 +0400 -+++ apache-couchdb-1.2.1.q/src/mochiweb/reloader.erl 2013-03-22 15:26:58.000000000 +0400 -@@ -59,7 +59,7 @@ - %% @doc gen_server callback. - handle_info(doit, State) -> - Now = stamp(), -- doit(State#state.last, Now), -+ _ = doit(State#state.last, Now), - {noreply, State#state{last = Now}}; - handle_info(_Info, State) -> - {noreply, State}. -@@ -156,6 +156,6 @@ - %% - %% Tests - %% ---include_lib("eunit/include/eunit.hrl"). - -ifdef(TEST). -+-include_lib("eunit/include/eunit.hrl"). - -endif. diff --git a/community/couchdb/erlang-r16b01.patch b/community/couchdb/erlang-r16b01.patch deleted file mode 100644 index f10bc6cf9..000000000 --- a/community/couchdb/erlang-r16b01.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur apache-couchdb-1.2.2/src/couchdb/couch_app.erl apache-couchdb-1.2.2.q/src/couchdb/couch_app.erl ---- apache-couchdb-1.2.2/src/couchdb/couch_app.erl 2013-03-24 00:33:33.000000000 +0400 -+++ apache-couchdb-1.2.2.q/src/couchdb/couch_app.erl 2013-06-21 19:30:30.083579366 +0400 -@@ -20,7 +20,7 @@ - - start(_Type, DefaultIniFiles) -> - IniFiles = get_ini_files(DefaultIniFiles), -- case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb, os_mon]) of -+ case start_apps([crypto, asn1, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb, os_mon]) of - ok -> - couch_server_sup:start_link(IniFiles); - {error, Reason} -> diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 79e78e67a..ce74afe72 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 92273 2013-06-03 13:36:04Z spupykin $ +# $Id: PKGBUILD 93153 2013-06-26 11:50:34Z 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.1 +pkgver=1.2.2 _pkgver=1.2 -pkgrel=2 +pkgrel=1 pkgdesc="Utility to organize and develop raw images" arch=('i686' 'x86_64' 'mips64el') url=http://darktable.sf.net/ @@ -19,7 +19,7 @@ optdepends=('librsvg') install=darktable.install options=(!libtool) source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.xz) -md5sums=('f970573777752b1b4447997d1f1f65fa') +md5sums=('df2a2b02d6d855cfd8f1cf77c7e12995') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index bde55dc70..1c55c9bdd 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92241 2013-06-03 10:26:07Z spupykin $ +# $Id: PKGBUILD 93423 2013-07-03 11:48:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail pkgver=3.0.3pre -pkgrel=1 +pkgrel=2 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') depends=('gmime24' 'libzdb' 'mhash' 'libevent') @@ -12,7 +12,8 @@ makedepends=('asciidoc' 'xmlto' 'docbook-xsl' 'docbook-xml' 'postgresql-libs>=8. 'sqlite' 'libmysqlclient' 'libldap>=2.4.18' 'libsieve' 'git') optdepends=('libldap: for LDAP authentication' - 'libsieve: for dbmail-sieve') + 'libsieve: for dbmail-sieve' + 'python2-mysql2pgsql: migrate from MySQL to PostreSQL') url="http://www.dbmail.org" license=('GPL') options=('!libtool' 'zipman') @@ -58,6 +59,7 @@ package() { install -Dm644 dbmail.conf $pkgdir/etc/dbmail.conf.sample mkdir $pkgdir/usr/share/dbmail cp -r sql/* $pkgdir/usr/share/dbmail/ + cp -a contrib $pkgdir/usr/share/dbmail/ cp dbmail.schema $pkgdir/usr/share/dbmail/ for i in dbmail-imapd dbmail-lmtpd dbmail-pop3d dbmail-timsieved; do diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD index 961e9d00e..0593cca62 100644 --- a/community/ejabberd/PKGBUILD +++ b/community/ejabberd/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 91490 2013-05-23 10:12:55Z spupykin $ +# $Id: PKGBUILD 93139 2013-06-25 15:54:26Z 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.12 -pkgrel=4 +pkgver=2.1.13 +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' 'pam' 'iproute2') +depends=('expat' 'openssl' 'zlib' 'erlang-nox' 'pam' 'iproute2') backup=('etc/ejabberd/ejabberd.cfg' 'etc/ejabberd/ejabberdctl.cfg' 'etc/logrotate.d/ejabberd') install=$pkgname.install -source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${pkgver}.tgz" +source=("$pkgname-$pkgver.tar.gz::https://github.com/processone/ejabberd/archive/v$pkgver.tar.gz" "$pkgname.logrotate" "ejabberd.service") -md5sums=('7d49242cf04282f3c4cebfafa2cc2f46' +md5sums=('2a7c3b711b4f7091f811c51b52beb735' 'f97c8a96160f30e0aecc9526c12e6606' 'df32aa17e40a7bc5d9946d3ba6fe5e16') diff --git a/community/fcitx-anthy/PKGBUILD b/community/fcitx-anthy/PKGBUILD index bbbd3720e..7992b1dac 100644 --- a/community/fcitx-anthy/PKGBUILD +++ b/community/fcitx-anthy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 81663 2012-12-26 08:40:15Z fyan $ +# $Id: PKGBUILD 93363 2013-07-02 09:47:20Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: lh <jason52lh@gmail.com> pkgname=fcitx-anthy -pkgver=0.1.1 -pkgrel=2 +pkgver=0.2.0 +pkgrel=1 pkgdesc="Fcitx Wrapper for anthy." arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.5' 'anthy') makedepends=('cmake' 'intltool') -source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz") install=fcitx-anthy.install build(){ @@ -29,4 +29,5 @@ package() { cd "$srcdir"/${pkgname}-${pkgver}/build make DESTDIR=${pkgdir} install } -md5sums=('651e9a21e5203c14ca0968c63a820157') + +md5sums=('c02e4393d6141a4d0fa1693bf38a8f79') diff --git a/community/fcitx-chewing/PKGBUILD b/community/fcitx-chewing/PKGBUILD index 228e0a995..2105b8930 100644 --- a/community/fcitx-chewing/PKGBUILD +++ b/community/fcitx-chewing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82974 2013-01-26 07:14:41Z fyan $ +# $Id: PKGBUILD 93175 2013-06-27 03:40:28Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-chewing -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc='Fcitx Wrapper for chewing' arch=('i686' 'x86_64' 'mips64el') @@ -26,4 +26,4 @@ package() { cd "$srcdir"/${pkgname}-${pkgver}/build make DESTDIR="$pkgdir" install } -md5sums=('d4dacf213673b5cac50db41427eb6b35') +md5sums=('1879ad51b16e07db40338db55054833c') diff --git a/community/fcitx-cloudpinyin/PKGBUILD b/community/fcitx-cloudpinyin/PKGBUILD index 314d6458f..fd2573134 100644 --- a/community/fcitx-cloudpinyin/PKGBUILD +++ b/community/fcitx-cloudpinyin/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 82972 2013-01-26 07:09:42Z fyan $ +# $Id: PKGBUILD 93364 2013-07-02 09:47:21Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=fcitx-cloudpinyin -pkgver=0.3.1 +pkgver=0.3.2 pkgrel=1 pkgdesc='Standalone module for fcitx that uses pinyin API on the internet to provide additional input candidates' arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="https://github.com/fcitx/fcitx-cloudpinyin" license=('GPL') depends=('curl' 'fcitx>=4.2.7') makedepends=('cmake') -source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz") build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -27,4 +27,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('3690930d1412258ad37524448268534e') +sha512sums=('ddda528f72ffd200ae78b4b2d9791e20576a220d0b15e4c55e9bd1977188c65696ca2a522acbb27177b2b22b33cdc41774d1ce111eb090adaba8fcc97f12cd8e') diff --git a/community/fcitx-configtool/PKGBUILD b/community/fcitx-configtool/PKGBUILD index 0d2fb7c45..4dc27e2d7 100644 --- a/community/fcitx-configtool/PKGBUILD +++ b/community/fcitx-configtool/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 82970 2013-01-26 07:06:27Z fyan $ +# $Id: PKGBUILD 93365 2013-07-02 09:47:22Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-configtool -pkgver=0.4.6 -pkgrel=1 +pkgver=0.4.7 +pkgrel=2 pkgdesc="GTK based config tool for Fcitx" arch=('i686' 'x86_64' 'mips64el') url="http://fcitx.googlecode.com/" license=('GPL2') depends=("fcitx>=4.2.7" "gtk3" "iso-codes") -optdepends=('fcitx-qt: for some configuration windows') +optdepends=('fcitx-qt4: for some configuration windows') makedepends=("cmake") -source=("http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz") build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,4 +29,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('69eb7271883b0b7894ddab5a38ceeb2f') +sha512sums=('90ec9f4c30c46ea937f965173a4213b67d1cb360cc43b96af9899cdd5a0e35d34658ee7149ed10b3dc58d3851bc1712915db970fd2d25a976983b1037e380be2') diff --git a/community/fcitx-hangul/PKGBUILD b/community/fcitx-hangul/PKGBUILD index 4af6c9771..9ba04b596 100644 --- a/community/fcitx-hangul/PKGBUILD +++ b/community/fcitx-hangul/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82968 2013-01-26 07:04:20Z fyan $ +# $Id: PKGBUILD 93366 2013-07-02 09:47:23Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-hangul -pkgver=0.2.1 +pkgver=0.3.0 pkgrel=1 pkgdesc="Hangul (Korean) support for fcitx" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL2') depends=('fcitx>=4.2.7' 'libhangul') makedepends=('cmake' 'intltool') install=$pkgname.install -source=("http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz") build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,4 +30,4 @@ package() { make DESTDIR="$pkgdir" install } -md5sums=('d3dac52b1a1697a4f8256e383c889216') +sha512sums=('07085508da98c49bcecf75fbfad6681263a735a1efcc4fb7a6fa05cb215dfe0c338e95e26cc55e488501b5abbc1007464b1bbf488f07aaca2d1a0a18c8173074') diff --git a/community/fcitx-kkc/PKGBUILD b/community/fcitx-kkc/PKGBUILD new file mode 100644 index 000000000..ede7a106b --- /dev/null +++ b/community/fcitx-kkc/PKGBUILD @@ -0,0 +1,32 @@ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: csslayer <wengxt AT gmail com> + +pkgname=fcitx-kkc +pkgver=0.1.0 +pkgrel=1 +pkgdesc="Fcitx Wrapper for libkkc" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx" +license=('GPL') +depends=('fcitx>=4.2.8' 'libkkc>=0.2.3' 'libkkc-data' 'skk-jisyo' 'fcitx-qt4') +makedepends=('cmake') +install=$pkgname.install +source=(http://download.fcitx-im.org/${pkgname}/${pkgname}-${pkgver}.tar.xz) + +build(){ + cd "$srcdir/${pkgname}-${pkgver}" + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package () +{ + cd "$srcdir/${pkgname}-${pkgver}/build" + make DESTDIR="${pkgdir}" install +} + +md5sums=('c86a48f9e7a1e9de16b0919e5413fc9d') diff --git a/community/fcitx-kkc/fcitx-kkc.install b/community/fcitx-kkc/fcitx-kkc.install new file mode 100644 index 000000000..6b1b64bdd --- /dev/null +++ b/community/fcitx-kkc/fcitx-kkc.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD index 61bad23d0..22a6b7e6a 100644 --- a/community/fcitx-libpinyin/PKGBUILD +++ b/community/fcitx-libpinyin/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 89876 2013-05-04 04:07:04Z fyan $ +# $Id: PKGBUILD 93398 2013-07-03 05:13:18Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=fcitx-libpinyin -pkgver=0.2.92 -pkgrel=1 +pkgver=0.3.0 +pkgrel=2 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fcitx/fcitx-libpinyin" license=('GPL') -depends=('fcitx' 'libpinyin') +depends=('fcitx' 'libpinyin' 'fcitx-qt4' 'qtwebkit') makedepends=('cmake' 'intltool' 'wget') -source=("https://fcitx.googlecode.com/files/${pkgname}-${pkgver}_dict.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}_dict.tar.xz" + "https://github.com/fcitx/fcitx-libpinyin/commit/7a68b40e36bd3425dae847a3860057a951ec5e78.patch") install=$pkgname.install build() { cd "$srcdir/${pkgname}-${pkgver}" + # Fix importdict + patch -p1 -i ../7a68b40e36bd3425dae847a3860057a951ec5e78.patch + rm -rf build mkdir build cd build @@ -31,4 +35,6 @@ package() { cd "$srcdir/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install } -sha512sums=('bea86b1041fa311a9bbcd2a6d74ab36d9659ebb6c92122307d3bd4dc44bcb0567d4aeafe62f3b6fe6a85160b369722f391063b47765dc88ec9a9b569cfca640f') + +sha512sums=('e80e15a51f0d7de20abc4877d32796bbd93f30a2e4383bd64bccf1075696dddb2d0ea0180fff44ebee0e94988ab60e3d2526dd3f80bb99f4186e1bf4e3437762' + '0b4776d348db9616d9bd4485fe7950a5c88f349388a4dc97e0ec62beaf0d6729ba88c645b1f83d415af8c5808cde3aae4b8306fd65e21bd404e9a8105d5bcae0') diff --git a/community/fcitx-m17n/PKGBUILD b/community/fcitx-m17n/PKGBUILD index 77b2b1d1c..76643f035 100644 --- a/community/fcitx-m17n/PKGBUILD +++ b/community/fcitx-m17n/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82966 2013-01-26 06:55:02Z fyan $ +# $Id: PKGBUILD 93368 2013-07-02 09:47:25Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-m17n -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc="Fcitx Wrapper for m17n." arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://code.google.com/p/fcitx" license=('GPL') depends=('fcitx>=4.2.7' 'm17n-lib') makedepends=('cmake') -source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz) +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz") build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -25,4 +25,5 @@ package() { cd "$srcdir/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install } -md5sums=('6740e3a983c3e7647be3f082abdfc57c') + +sha512sums=('b2becf6f20de32191690a5541956dc0a607443bd593fbfb61d1663dcc1f854df6b146c17ed73afbdff4006c12f001707de87adc706b3e1d45608bbf2bc045bce') diff --git a/community/fcitx-sayura/PKGBUILD b/community/fcitx-sayura/PKGBUILD new file mode 100644 index 000000000..318877548 --- /dev/null +++ b/community/fcitx-sayura/PKGBUILD @@ -0,0 +1,31 @@ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-sayura +pkgver=0.1.1 +pkgrel=1 +pkgdesc="Sinhala Transe IME engine for fcitx." +arch=('i686' 'x86_64') +url="https://github.com/fcitx/fcitx-sayura" +license=('GPL') +depends=('fcitx>=4.2.8') +makedepends=('cmake' 'intltool') +install=${pkgname}.install +source=("http://download.fcitx-im.org/$pkgname/$pkgname-$pkgver.tar.xz") + +build() { + cd "$srcdir"/${pkgname}-${pkgver} + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir"/${pkgname}-${pkgver}/build + make DESTDIR="$pkgdir" install +} + +sha512sums=('1eda91ae985df65982cf6f4e67b676bb8eb7117cd1aad7c2a90e81c13fa2a806bbff5eda7bb7e797cb26cb46bbda51931ecffd50384a89ead24ad90777183dc3') diff --git a/community/fcitx-sayura/fcitx-sayura.install b/community/fcitx-sayura/fcitx-sayura.install new file mode 100644 index 000000000..6b1b64bdd --- /dev/null +++ b/community/fcitx-sayura/fcitx-sayura.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/fcitx-sunpinyin/PKGBUILD b/community/fcitx-sunpinyin/PKGBUILD index f38d60b45..5a6413427 100644 --- a/community/fcitx-sunpinyin/PKGBUILD +++ b/community/fcitx-sunpinyin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 82959 2013-01-26 06:44:09Z fyan $ +# $Id: PKGBUILD 93370 2013-07-02 09:47:26Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-sunpinyin -pkgver=0.4.0 +pkgver=0.4.1 pkgrel=1 pkgdesc="Fcitx Wrapper for sunpinyin, Statistical Language Model based pinyin IME by Sun" arch=('i686' 'x86_64' 'mips64el') @@ -10,8 +10,8 @@ url="http://code.google.com/p/fcitx" license=('GPL') install=fcitx-sunpinyin.install depends=('fcitx>=4.2.7' 'sunpinyin>2.0.3' 'sunpinyin-data' 'gtk-update-icon-cache') -makedepends=('cmake' 'intltool') -source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +makedepends=('cmake') +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz") build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -28,4 +28,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('de2723baf8e5d9092706cd2baf2f21bb') +sha512sums=('7ad9065d86d7bb3ceb6536a0fe3559bf2ba60aebe69e2f07c8dadad1a0a2283a1b85712105c6c2a2bf19b9645c4392204db9c3d1db234618ba7f62ee44eda85c') diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD index 015e1b78f..965ae4fee 100644 --- a/community/fcitx-unikey/PKGBUILD +++ b/community/fcitx-unikey/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85345 2013-03-01 10:30:29Z andrea $ +# $Id: PKGBUILD 93372 2013-07-02 09:47:28Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=fcitx-unikey -pkgver=0.2.0 -pkgrel=2 +pkgver=0.2.1 +pkgrel=1 pkgdesc="Fcitx Wrapper for unikey" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx" @@ -11,7 +11,7 @@ license=('GPL') depends=('fcitx>=4.2.7') optdepends=('qt4: To run the fcitx unikey macro editor') makedepends=('cmake' 'qt4') -source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz") install=fcitx-unikey.install build(){ @@ -19,7 +19,7 @@ build(){ mkdir -p build cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DQT_QMAKE_EXECUTABLE=qmake-qt4 .. make } @@ -28,4 +28,5 @@ package () cd "$srcdir/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install } -md5sums=('f1ffd6c8439e4d277eace994052d91da') + +sha512sums=('8349623c196ec7c4e48e64d07ef551a308f71f2bfc09fcd320bb02854a77370169b94131750dfcf065dd2a9c734c86048f482d0d2f0b210a1834ab77ea3bf1aa') diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 7cd37be7d..f41a44166 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,33 +1,34 @@ -# $Id: PKGBUILD 88848 2013-04-24 06:26:30Z fyan $ +# $Id: PKGBUILD 93362 2013-07-02 09:47:19Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt4') -pkgver=4.2.7 -pkgrel=8 +pkgver=4.2.8 +pkgrel=2 groups=('fcitx-im') arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/fcitx/" +url="http://fcitx-im.org" license=('GPL') makedepends=('cmake' 'doxygen' 'gtk2' 'gtk3' 'qt4' 'icu' 'mesa' \ - 'iso-codes' 'gobject-introspection' 'libxkbfile' 'git') -source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}_dict.tar.xz - https://github.com/fcitx/fcitx/commit/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch - https://github.com/fcitx/fcitx/commit/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch - https://github.com/fcitx/fcitx/commit/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch - https://github.com/fcitx/fcitx/commit/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch -) + 'iso-codes' 'gobject-introspection' 'libxkbfile') +source=(http://download.fcitx-im.org/$pkgbase/$pkgbase-${pkgver}_dict.tar.xz + https://github.com/fcitx/fcitx/commit/b0a5439ac0188211c0955baf6811a0e3406ac812.patch + https://github.com/fcitx/fcitx/commit/94635187b18badb1a2dff821de9a30a20d00feb1.patch + https://github.com/fcitx/fcitx/commit/46d5a69d595ac825f47a3c22ddeb8ce71b04e887.patch) build() { #source /etc/profile.d/qt4.sh cd "$srcdir/$pkgbase-$pkgver" - patch -Np1 -i "$srcdir/9937b68bad3a7e9465e17b711ce9c0a072d3071f.patch" - patch -Np1 -i "$srcdir/10ff96ca1215187444951cdbebe9e0beacacdf5e.patch" - git apply -v -p1 "$srcdir/dc36c1a88f863971f81a76b8d9ec0db23b0d9387.patch" - patch -Np1 -i "$srcdir/a9e6570046f9c1477dd6ec6e30e91e020e62d698.patch" + + # Fix ELF file patch + patch -p1 -i ../b0a5439ac0188211c0955baf6811a0e3406ac812.patch + + # Fix switch key issue + patch -p1 -i ../94635187b18badb1a2dff821de9a30a20d00feb1.patch + patch -p1 -i ../46d5a69d595ac825f47a3c22ddeb8ce71b04e887.patch cd "$srcdir" mkdir -p build @@ -88,7 +89,7 @@ package_fcitx() { rm -r "${pkgdir}/usr/lib/"{gtk-2.0,gtk-3.0,qt4} rm -r "${pkgdir}/usr/lib/fcitx/qt" rm -r "${pkgdir}/usr/include/fcitx-qt" - rm "${pkgdir}/usr/bin/fcitx-qt-gui-wrapper" + rm "${pkgdir}/usr/lib/fcitx/libexec/fcitx-qt-gui-wrapper" rm "${pkgdir}/usr/lib/"libfcitx-qt.so* rm "${pkgdir}/usr/lib/pkgconfig/fcitx-qt.pc" } @@ -128,8 +129,7 @@ package_fcitx-qt4() { make DESTDIR="${pkgdir}" install } -md5sums=('6e291717c24615b9dc9bfaa2949af3a7' - '246e36c2232f107ed1692a52ebc43c39' - '6f420547bc8af9627db2e5290f758433' - '51e53377e1b83661f2896e25d1a46242' - '5e9f90817722a138b459b2bf6a926f96') +md5sums=('79676d18536ebb9d0a0fa47e96416016' + '0f3f85204ac1559bbf2cff304122234e' + '417cd212d9fb7b9881232d57d023e49f' + 'd91ae8316154eccce3234c55e53a3c3b') diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD index 0a8b6eb0e..d3d967969 100644 --- a/community/filezilla/PKGBUILD +++ b/community/filezilla/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92950 2013-06-20 08:29:35Z bluewind $ +# $Id: PKGBUILD 93466 2013-07-03 21:46:52Z bluewind $ # Contributor: Alexander Fehr <pizzapunk gmail com> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=filezilla -pkgver=3.7.1 +pkgver=3.7.1.1 pkgrel=1 pkgdesc="Fast and reliable FTP, FTPS and SFTP client" arch=('i686' 'x86_64' 'mips64el') @@ -31,4 +31,4 @@ package() { make DESTDIR="${pkgdir}" install } -md5sums=('be19e8c157e81f94048ed3b1e3031b07') +md5sums=('52c6f764b2f4a94b1781da42b2bbb9b5') diff --git a/community/gloobus-preview/PKGBUILD b/community/gloobus-preview/PKGBUILD deleted file mode 100644 index 175945c38..000000000 --- a/community/gloobus-preview/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 91027 2013-05-18 11:44:36Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=gloobus-preview -pkgver=0.4.5.290 -_pkgver=0.4.5-ubuntu11~ppa290 -pkgrel=1 -pkgdesc="Gnome application designed to enable a full screen preview of any kind of file" -arch=('i686' 'x86_64' 'mips64el') -url="http://gloobus.net/" -license=('GPL') -depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils') -makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') -optdepends=('djvulibre: Preview DjVu documents' - 'gstreamer0.10-bad-plugins: Extra media codecs' - 'gstreamer0.10-good-plugins: Extra media codecs' - 'gstreamer0.10-ffmpeg: Extra media codecs' - 'gstreamer0.10-ugly-plugins: Extra media codecs' - 'libspectre: Preview PostScript documents' - 'p7zip: View content of 7z archives' - 'unoconv: Preview LibreOffice compatible documents' - 'unrar: View content of RAR archives' - 'unzip: View content of .ZIP archives') -options=('!libtool') -install=$pkgname.install -source=(https://launchpad.net/~gloobus-dev/+archive/$pkgname/+files/${pkgname}_$_pkgver.orig.tar.xz - gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi - fix-gtksource-include.patch - fix-unoconv.patch - use-xdg-open.patch) -md5sums=('27b3db2043ecaf47fa928940bbb4f32a' - 'SKIP' - 'ca15a3e31cec01d3d4fc5a4e1720f692' - '03379c173e67ad1b6804bc609336451d' - 'd6d9e2b3e001f0ea8440cccdf90480af') - -prepare() { - cd "$srcdir/$pkgname-$_pkgver" - - # Python2 fix - sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration - - # Fix build - patch -Np1 -i "$srcdir/fix-gtksource-include.patch" - sed -i 's/-Werror//' configure.ac src/Makefile.am - - # Fix unoconv support - patch -Np1 -i "$srcdir/fix-unoconv.patch" - - # Use xdg-open - patch -Np1 -i "$srcdir/use-xdg-open.patch" - - ### Prepare gloobus-sushi - cd "$srcdir/gloobus-sushi" - - # Python2 fix - sed -i 's/python /python2 /' src/gloobus-sushi.in -} - - -build() { - cd "$srcdir/$pkgname-$_pkgver" - - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static - make - - ### Build gloobus-sushi - cd "$srcdir/gloobus-sushi" - - ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd "$srcdir/$pkgname-$_pkgver" - make DESTDIR="$pkgdir" install - - ### Install gloobus-sushi - cd "$srcdir/gloobus-sushi" - make DESTDIR="$pkgdir" install - - # Rename service file to avoid conflict with sushi - mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service} -} diff --git a/community/gloobus-preview/fix-gtksource-include.patch b/community/gloobus-preview/fix-gtksource-include.patch deleted file mode 100644 index 053169a43..000000000 --- a/community/gloobus-preview/fix-gtksource-include.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h 2013-05-17 06:27:37.833360264 +0200 -@@ -1,8 +1,7 @@ - #ifndef _ITEXT_ - #define _ITEXT_ - --#include <gtksourceview/gtksourceview.h> --#include <gtksourceview/gtksourcelanguagemanager.h> -+#include <gtksourceview/gtksource.h> - //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview - - #include "gloobus-preview-interface-main.h" -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp 2013-05-17 06:28:19.300984059 +0200 -@@ -1,6 +1,6 @@ - #include "gloobus-preview-plugin-manager.h" - #include <dlfcn.h> --#include <gtksourceview/gtksourcelanguagemanager.h> -+#include <gtksourceview/gtksource.h> - - vector<gp_plugin_container*> PluginManager::plugins; - map<string, int> PluginManager::filetypes; -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h 2013-05-17 06:26:26.788384315 +0200 -@@ -3,10 +3,7 @@ - - #ifndef PLUGIN_LOADER - --#include <gtksourceview/gtksourceview.h> --#include <gtksourceview/gtksourcelanguagemanager.h> --#include <gtksourceview/gtksourcestylescheme.h> --#include <gtksourceview/gtksourcestyleschememanager.h> -+#include <gtksourceview/gtksource.h> - #include <gio/gio.h> - - #include "../gloobus-preview-config.h" diff --git a/community/gloobus-preview/fix-unoconv.patch b/community/gloobus-preview/fix-unoconv.patch deleted file mode 100644 index f918f3019..000000000 --- a/community/gloobus-preview/fix-unoconv.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp 2013-05-18 10:24:33.558221788 +0200 -@@ -87,7 +87,7 @@ - - if( NULL == uri && Utils::isProgramAvailable("unoconv") ) { - gchar *path = g_file_get_path(file); -- gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp); -+ gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path); - - if( system(cmd) == 0) { - uri = pathToUri(tmp); -@@ -123,4 +123,4 @@ - { - path = "file://" + path; - return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false); --} -\ No newline at end of file -+} -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h 2013-05-18 10:33:02.352806550 +0200 -@@ -6,15 +6,21 @@ - PluginManager::register_plugin("office"); - - PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1); -+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1); - PluginManager::register_filetype("application/msword", 1); - PluginManager::register_filetype("application/rtf", 1); - PluginManager::register_filetype("application/vnd.ms-excel", 1); - PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1); -+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1); - PluginManager::register_filetype("application/vnd.ms-powerpoint", 1); -+PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1); -+PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1); - PluginManager::register_filetype("application/vnd.sun.xml.calc", 1); -+PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1); -+ - - // TODO: add more filetypes supported by abiword and/or OpenOffice - - #endif - --#endif /* OFFICE_PLUGIN_H */ -\ No newline at end of file -+#endif /* OFFICE_PLUGIN_H */ diff --git a/community/gloobus-preview/gloobus-preview.install b/community/gloobus-preview/gloobus-preview.install deleted file mode 100644 index 16ad7278f..000000000 --- a/community/gloobus-preview/gloobus-preview.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - gdk-pixbuf-query-loaders --update-cache -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/gloobus-preview/use-xdg-open.patch b/community/gloobus-preview/use-xdg-open.patch deleted file mode 100644 index 68e219e6a..000000000 --- a/community/gloobus-preview/use-xdg-open.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp ---- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp 2012-04-06 15:07:29.000000000 +0200 -+++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp 2013-05-18 09:49:24.833574800 +0200 -@@ -560,12 +560,12 @@ - string label(gtk_menu_item_get_label(item)); - if(label == _("Settings")) - cmd = "gloobus-preview-configuration"; -- else if(label == _("Report a Bug")) -- cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\""; -+ else if(label == _("Report a Problem")) -+ cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\""; - else if(label == _("Blog")) -- cmd = "gnome-open \"http://gloobus.wordpress.com\"" ; -+ cmd = "xdg-open \"http://gloobus.wordpress.com\"" ; - else if(label == _("Donate")) -- cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0¤cy_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ; -+ cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0¤cy_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ; - else if(label == _("About")) - ui->create_about(); - else if(label == _("Quit")) diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD index 90347bdf1..64d9a6cd9 100644 --- a/community/gnome-screensaver/PKGBUILD +++ b/community/gnome-screensaver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88685 2013-04-21 22:16:59Z heftig $ +# $Id: PKGBUILD 93459 2013-07-03 14:24: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=3 +pkgrel=4 pkgdesc="Legacy GNOME screensaver" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,6 +13,7 @@ url="http://live.gnome.org/GnomeScreensaver" backup=(etc/pam.d/gnome-screensaver) depends=('dbus-glib' 'libgnomekbd' 'gnome-desktop') makedepends=('intltool' 'gnome-common') +optdepends=('gnome-themes-standard: default background') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam move-desktop-file.patch diff --git a/community/gsoap/PKGBUILD b/community/gsoap/PKGBUILD index ef25e78f4..4b2733451 100644 --- a/community/gsoap/PKGBUILD +++ b/community/gsoap/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 87262 2013-03-29 11:58:05Z spupykin $ +# $Id: PKGBUILD 93225 2013-06-28 19:02:51Z 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.14 +pkgver=2.8.15 pkgrel=1 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" @@ -14,7 +14,7 @@ depends=('openssl' 'zlib' 'gcc-libs') makedepends=('autoconf' 'automake') source=(http://prdownloads.sourceforge.net/gsoap2/${pkgname}_${pkgver}.zip LICENSE) -md5sums=('a032616b7c3b613ce67260a89db9df74' +md5sums=('abd244644446ae08d3aa36ece9113ad4' '27aaa3f5166db94d44044c11a7b2c37b') build() { diff --git a/community/gwget/PKGBUILD b/community/gwget/PKGBUILD index f14aa9a4d..8abab841c 100644 --- a/community/gwget/PKGBUILD +++ b/community/gwget/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 70413 2012-05-05 16:24:44Z bgyorgy $ +# $Id: PKGBUILD 93450 2013-07-03 13:33:10Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Aaron, phrakture, Griffin <aaron@archlinux.org> @@ -7,7 +7,7 @@ pkgname=gwget pkgver=1.0.4 -pkgrel=5 +pkgrel=6 pkgdesc="Download manager for GNOME" arch=('i686' 'x86_64' 'mips64el') url="http://projects.gnome.org/gwget/" @@ -22,7 +22,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$p sha256sums=('a65b2b2b3befb6cf34a697a13111b35498a6d63f9a9b048a22b8654f35ef643f' '84efbbea9c2a91c60288edb67264bbdb4ec2c579cf95b3baa8282040a1b65c76' '319c4795d0034c4adacf302db697d966ca228fc1bbe9778af9dadcfb0c2531c8' - '72506677886deb5fc2436c667e2f79ed868ce9384cad77b9a97ec68e41ae45c3') + '465216f441271fffdd4530bc07829e733e0d3476fdc34f1f028da82cfc05373d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gwget/drop-libgnomeui.patch b/community/gwget/drop-libgnomeui.patch index 30a121f25..7f1f551a6 100644 --- a/community/gwget/drop-libgnomeui.patch +++ b/community/gwget/drop-libgnomeui.patch @@ -1,6 +1,6 @@ diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac ---- gwget-1.0.4.orig/configure.ac 2009-10-17 22:26:09.000000000 +0200 -+++ gwget-1.0.4/configure.ac 2012-03-10 01:09:09.246869284 +0100 +--- gwget-1.0.4.orig/configure.ac 2013-07-03 14:43:02.845220000 +0200 ++++ gwget-1.0.4/configure.ac 2013-07-03 14:43:57.003180469 +0200 @@ -14,15 +14,13 @@ AM_GCONF_SOURCE_2 @@ -21,7 +21,7 @@ diff -Naur gwget-1.0.4.orig/configure.ac gwget-1.0.4/configure.ac diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/src/custom-cell-renderer-progressbar.c --- gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c 2009-06-16 19:58:06.000000000 +0200 -+++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c 2012-03-10 01:09:09.260201828 +0100 ++++ gwget-1.0.4/src/custom-cell-renderer-progressbar.c 2013-07-03 14:43:57.003180469 +0200 @@ -21,8 +21,8 @@ #include <config.h> @@ -35,7 +35,7 @@ diff -Naur gwget-1.0.4.orig/src/custom-cell-renderer-progressbar.c gwget-1.0.4/s diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-application.c --- gwget-1.0.4.orig/src/gwget-application.c 2009-06-20 10:12:37.000000000 +0200 -+++ gwget-1.0.4/src/gwget-application.c 2012-03-10 01:09:09.263534966 +0100 ++++ gwget-1.0.4/src/gwget-application.c 2013-07-03 14:43:57.003180469 +0200 @@ -21,8 +21,6 @@ #include "gwget-application.h" @@ -95,7 +95,7 @@ diff -Naur gwget-1.0.4.orig/src/gwget-application.c gwget-1.0.4/src/gwget-applic diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c --- gwget-1.0.4.orig/src/main.c 2009-06-20 10:12:37.000000000 +0200 -+++ gwget-1.0.4/src/main.c 2012-03-10 01:09:09.273534378 +0100 ++++ gwget-1.0.4/src/main.c 2013-07-03 14:43:57.003180469 +0200 @@ -17,11 +17,13 @@ #include <config.h> @@ -146,7 +146,7 @@ diff -Naur gwget-1.0.4.orig/src/main.c gwget-1.0.4/src/main.c } diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c --- gwget-1.0.4.orig/src/main_window.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/main_window.c 2012-03-10 01:09:09.276867514 +0100 ++++ gwget-1.0.4/src/main_window.c 2013-07-03 14:46:01.992833090 +0200 @@ -15,7 +15,9 @@ */ @@ -158,9 +158,46 @@ diff -Naur gwget-1.0.4.orig/src/main_window.c gwget-1.0.4/src/main_window.c #include <gconf/gconf-client.h> #include <glib/gstdio.h> #include <string.h> +@@ -118,20 +120,22 @@ + toolbar = GTK_WIDGET (gtk_builder_get_object(builder,"toolbar1")); + toolbar_setting = gconf_client_get_string(gconf_client,"/desktop/gnome/interface/toolbar_style",NULL); + +- if (!strcmp(toolbar_setting,"icons")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_ICONS); +- } +- +- if (!strcmp(toolbar_setting,"both")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH); +- } +- +- if (!strcmp(toolbar_setting,"both-horiz")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH_HORIZ); +- } +- +- if (!strcmp(toolbar_setting,"text")) { +- gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_TEXT); ++ if (toolbar_setting!=NULL) { ++ if (!strcmp(toolbar_setting,"icons")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_ICONS); ++ } ++ ++ if (!strcmp(toolbar_setting,"both")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH); ++ } ++ ++ if (!strcmp(toolbar_setting,"both-horiz")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_BOTH_HORIZ); ++ } ++ ++ if (!strcmp(toolbar_setting,"text")) { ++ gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),GTK_TOOLBAR_TEXT); ++ } + } + + /* Listen to changes to the key. */ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb.c --- gwget-1.0.4.orig/src/main_window_cb.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/main_window_cb.c 2012-03-10 01:07:57.131122811 +0100 ++++ gwget-1.0.4/src/main_window_cb.c 2013-07-03 14:43:57.003180469 +0200 @@ -15,7 +15,9 @@ */ @@ -172,7 +209,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. #include <gconf/gconf-client.h> #include <signal.h> -@@ -217,7 +220,10 @@ +@@ -217,7 +219,10 @@ gchar *size; int width = 16, height = 16; gdouble perc; @@ -184,7 +221,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. gtk_list_store_append (GTK_LIST_STORE(model), &iter); size = g_strdup_printf ("%d kB", (guint32)(gwgetdata->cur_size + 512) / 1024); gtk_list_store_set (GTK_LIST_STORE(model), &iter,URL_COLUMN,gwgetdata->url, -@@ -243,10 +249,15 @@ +@@ -243,10 +248,15 @@ theme = gtk_icon_theme_get_default (); if (!gwgetdata->recursive) { content_type = g_content_type_guess (gwgetdata->local_filename, NULL, 0, NULL); @@ -205,7 +242,7 @@ diff -Naur gwget-1.0.4.orig/src/main_window_cb.c gwget-1.0.4/src/main_window_cb. width *= 2; diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c --- gwget-1.0.4.orig/src/new_window.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/new_window.c 2012-03-10 01:09:09.283533785 +0100 ++++ gwget-1.0.4/src/new_window.c 2013-07-03 14:43:57.003180469 +0200 @@ -24,7 +24,8 @@ */ @@ -217,8 +254,8 @@ diff -Naur gwget-1.0.4.orig/src/new_window.c gwget-1.0.4/src/new_window.c #include "new_window.h" #include "main_window.h" diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c ---- gwget-1.0.4.orig/src/systray.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/systray.c 2012-03-10 01:09:09.290200060 +0100 +--- gwget-1.0.4.orig/src/systray.c 2013-07-03 14:43:02.845220000 +0200 ++++ gwget-1.0.4/src/systray.c 2013-07-03 14:43:57.006513881 +0200 @@ -1,6 +1,7 @@ #include <config.h> @@ -230,7 +267,7 @@ diff -Naur gwget-1.0.4.orig/src/systray.c gwget-1.0.4/src/systray.c #include "systray.h" diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c --- gwget-1.0.4.orig/src/utils.c 2009-08-14 19:19:51.000000000 +0200 -+++ gwget-1.0.4/src/utils.c 2012-03-10 01:09:09.296866335 +0100 ++++ gwget-1.0.4/src/utils.c 2013-07-03 14:43:57.006513881 +0200 @@ -14,7 +14,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -243,7 +280,7 @@ diff -Naur gwget-1.0.4.orig/src/utils.c gwget-1.0.4/src/utils.c #include "gwget_data.h" diff -Naur gwget-1.0.4.orig/src/wget-log.c gwget-1.0.4/src/wget-log.c --- gwget-1.0.4.orig/src/wget-log.c 2009-10-04 20:29:35.000000000 +0200 -+++ gwget-1.0.4/src/wget-log.c 2012-03-10 01:09:09.306865743 +0100 ++++ gwget-1.0.4/src/wget-log.c 2013-07-03 14:43:57.006513881 +0200 @@ -25,7 +25,9 @@ #define _FILE_OFFSET_BITS 64 diff --git a/community/hatari/PKGBUILD b/community/hatari/PKGBUILD index 68d56ef68..21d505b7e 100644 --- a/community/hatari/PKGBUILD +++ b/community/hatari/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 90046 2013-05-06 19:37:48Z foutrelis $ +# $Id: PKGBUILD 93259 2013-06-30 06:28:12Z lcarlier $ # Maintainer: Shinlun Hsieh <yngwiexx@yahoo.com.tw> pkgname=hatari -pkgver=1.6.2 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc='An Atari ST and STE emulator' arch=('i686' 'x86_64' 'mips64el') url='http://hatari.sourceforge.net/' @@ -11,7 +11,7 @@ license=('GPL') depends=('sdl' 'libpng') makedepends=('cmake') source=("http://download.tuxfamily.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('3957d0c5f8093313c798e565af9a92e1') +md5sums=('67b16ec0a0994aa6a935b193254118e0') build() { cd ${pkgname}-${pkgver} diff --git a/community/ibus-kkc/ChangeLog b/community/ibus-kkc/ChangeLog new file mode 100644 index 000000000..61358e57e --- /dev/null +++ b/community/ibus-kkc/ChangeLog @@ -0,0 +1,14 @@ +2013-06-07 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * ibus-kkc 1.5.14-1 + - upstream update + +2013-05-27 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * ibus-kkc 1.5.13-2 + - Fix dependency (Add libkkc) + +2013-05-27 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * ibus-kkc 1.5.13-1 + - Initial release on AUR diff --git a/community/ibus-kkc/PKGBUILD b/community/ibus-kkc/PKGBUILD new file mode 100644 index 000000000..d9d9a5a07 --- /dev/null +++ b/community/ibus-kkc/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> + +pkgname=ibus-kkc +pkgver=1.5.14 +pkgrel=2 +pkgdesc="libkkc (Japanese Kana Kanji input method) engine for ibus" +arch=('i686' 'x86_64') +url="https://bitbucket.org/libkkc" +license=('GPL') +options=(!libtool) +depends=('ibus' 'libkkc' 'libkkc-data' 'skk-jisyo') +makedepends=('vala' 'intltool') +changelog=ChangeLog +source=(https://bitbucket.org/libkkc/${pkgname}/downloads/${pkgname}-${pkgver}.tar.gz) +sha1sums=('9396521d85501757dd42c64f92e52a2e5f514872') + +build() { + cd "${pkgname}-${pkgver}" + # VALAC=/usr/bin/valac-0.18 \ + ./configure --prefix=/usr --libexecdir=/usr/lib/ibus-kkc --disable-static + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install +} diff --git a/community/kcm-fcitx/PKGBUILD b/community/kcm-fcitx/PKGBUILD index 693cc4901..b6b8c2d3e 100644 --- a/community/kcm-fcitx/PKGBUILD +++ b/community/kcm-fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 85498 2013-03-02 02:59:40Z fyan $ +# $Id: PKGBUILD 93373 2013-07-02 09:47:29Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: poplarch <poplarch@gmail.com> pkgname=kcm-fcitx -pkgver=0.4.2 -pkgrel=2 +pkgver=0.4.3 +pkgrel=1 pkgdesc="KDE Config Module for Fcitx" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/fcitx/kcm-fcitx" license=('GPL') depends=('fcitx>=4.2.7' 'kdebase-runtime' 'fcitx-qt4') makedepends=('cmake' 'automoc4') -source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") +source=("http://download.fcitx-im.org/$pkgname/$pkgname-${pkgver}.tar.xz") build() { cd "$srcdir/${pkgname}-${pkgver}" @@ -27,4 +27,5 @@ package() { cd "$srcdir/${pkgname}-${pkgver}/build" make DESTDIR="${pkgdir}" install } -md5sums=('3c45e7109bec4b6fa984f952fb94002d') + +sha512sums=('d311699a5d99f75d353899b7fba0a950491ee8b891724b855033449900ec4b3db9408bb1b80e60ceb0dbb0ce91072162062261a497f83a2a683214b71c3f4713') diff --git a/community/krecipes/PKGBUILD b/community/krecipes/PKGBUILD index 25847dcc0..67e9af6fe 100644 --- a/community/krecipes/PKGBUILD +++ b/community/krecipes/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 87005 2013-03-25 19:16:45Z bpiotrowski $ +# $Id: PKGBUILD 93464 2013-07-03 19:08:14Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: shamrok <szamrok@gmail.com> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> @@ -7,14 +7,14 @@ pkgname=krecipes pkgver=2.0beta2 _pkgver=2.0-beta2 -pkgrel=3 +pkgrel=4 pkgdesc="A tool designed to make organizing your personal recipes collection fast and easy" arch=('i686' 'x86_64' 'mips64el') url="http://extragear.kde.org/apps/krecipes/" license=('GPL') depends=('kdebase-runtime' 'qimageblitz' 'hicolor-icon-theme') makedepends=('cmake' 'automoc4' 'docbook-xsl') -optdepends=('matriadb' 'postgresql') +optdepends=('mariadb' 'postgresql') install=${pkgname}.install source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.gz) md5sums=('4c01ccad7ad1409cb35c824a61250fe2') diff --git a/community/libgit2-glib/PKGBUILD b/community/libgit2-glib/PKGBUILD index 8e9fadcb6..38f5b31d5 100644 --- a/community/libgit2-glib/PKGBUILD +++ b/community/libgit2-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 92908 2013-06-18 13:46:11Z heftig $ +# $Id: PKGBUILD 93394 2013-07-02 20:55:40Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=libgit2-glib -pkgver=0.0.2 +pkgver=0.0.6 pkgrel=1 pkgdesc="GLib wrapper for libgit2" url="http://live.gnome.org/Libgit2-glib" @@ -11,7 +11,7 @@ arch=(i686 x86_64) depends=(glib2 libgit2 gobject-introspection) options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e1e0c6e0cb6897c09e06edc06ee70befca2a3e1b3eb629c449b8ca0f49db75e5') +sha256sums=('bda84b5ab6fbe2922a4cf386b4e6d4401863dec7bea1879e86939d005cd521f6') build() { cd $pkgname-$pkgver diff --git a/community/libgit2/PKGBUILD b/community/libgit2/PKGBUILD index 07d9ad5bb..37fe82c0e 100644 --- a/community/libgit2/PKGBUILD +++ b/community/libgit2/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 88415 2013-04-17 09:17:05Z thestinger $ +# $Id: PKGBUILD 93245 2013-06-29 19:05:07Z thestinger $ # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Hilton Medeiros <medeiros.hilton@gmail.com> # Contributor: Dave Reisner <d@falconindy.com> pkgname=libgit2 -pkgver=0.18.0 +pkgver=0.19.0 pkgrel=1 pkgdesc="A linkable library for Git" arch=('i686' 'x86_64' 'mips64el') url="http://libgit2.github.com/" -depends=(zlib openssl) +depends=(zlib openssl libssh2) makedepends=(cmake python) license=('GPL2') source=("src-$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/tarball/v$pkgver") -md5sums=('50409ddb0c34713677b33ef617e92c94') +md5sums=('df1c1e058b2d0f46b1b73dc78d551ea1') build() { cd $pkgname-* diff --git a/community/libkkc-data/ChangeLog b/community/libkkc-data/ChangeLog new file mode 100644 index 000000000..dc925a33b --- /dev/null +++ b/community/libkkc-data/ChangeLog @@ -0,0 +1,14 @@ +2013-05-28 ponsfoot <cabezon dot hashimoto at gmail dot com> + + - Clean up makedepends + +2013-05-28 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * libkkc-data 0.2.0-2 + - Add marisa (marisa-python) into makedepends + +2013-05-27 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * libkkc-data 0.2.0-1 + - Initial release on AUR + diff --git a/community/libkkc-data/PKGBUILD b/community/libkkc-data/PKGBUILD new file mode 100644 index 000000000..1c84beae9 --- /dev/null +++ b/community/libkkc-data/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> + +pkgname=libkkc-data +pkgver=0.2.0 +pkgrel=4 +pkgdesc="Language model data package for libkkc" +arch=('i686' 'x86_64') +url="https://bitbucket.org/libkkc" +license=('GPL') +makedepends=('python2-marisa') +changelog=ChangeLog +source=(https://bitbucket.org/libkkc/${pkgname}/downloads/${pkgname}-${pkgver}.tar.xz) +sha1sums=('6bc5601b3ec4c76066255827563b8debb50dd917') + +build() { + cd "${pkgname}-${pkgver}" + ./configure PYTHON=/usr/bin/python2 --prefix=/usr + make -j1 +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install +} diff --git a/community/libkkc/ChangeLog b/community/libkkc/ChangeLog new file mode 100644 index 000000000..8067acabf --- /dev/null +++ b/community/libkkc/ChangeLog @@ -0,0 +1,26 @@ +2013-06-07 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * libkkc 0.2.4-1 + - upstream update + +2013-05-29 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * libkkc 0.2.3-4 + - Fix makedepends (s/python2/marisa-python2/) + - Add to install docs + +2013-05-28 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * libkkc 0.2.3-3 + - Fix dependency (libgee-0.6 -> libgee06 [extra]) + +2013-05-27 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * libkkc 0.2.3-2 + - Fix dependency (move some of makedepends into depends) + +2013-05-27 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * libkkc 0.2.3-1 + - Initial release on AUR + diff --git a/community/libkkc/PKGBUILD b/community/libkkc/PKGBUILD new file mode 100644 index 000000000..32afb6144 --- /dev/null +++ b/community/libkkc/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> + +pkgname=libkkc +pkgver=0.2.4 +pkgrel=2 +pkgdesc="Japanese Kana Kanji conversion library" +arch=('i686' 'x86_64') +url="https://bitbucket.org/libkkc" +license=('GPL') +options=(!libtool) +depends=('marisa' 'json-glib' 'libgee06') +makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa') +changelog=ChangeLog +source=(https://bitbucket.org/libkkc/libkkc/downloads/${pkgname}-${pkgver}.tar.gz) +sha1sums=('28bafb612f8176735f02bd6f49581e072700af4e') + +build() { + cd "${pkgname}-${pkgver}" + + #VALAC=/usr/bin/valac-0.18 \ + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr --disable-static --disable-silent-rules + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install + install -d "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" + install -m 644 README data/rules/README.rules COPYING \ + "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" +} diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 57d75a4e3..8e311c4fa 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92622 2013-06-10 07:23:18Z fyan $ +# $Id: PKGBUILD 93183 2013-06-27 13:57:26Z 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.92 +pkgver=0.9.93 pkgrel=1 pkgdesc="Library to deal with pinyin" arch=('i686' 'x86_64' 'mips64el') @@ -30,5 +30,5 @@ package() { cd "${srcdir}/libpinyin-$pkgver" make DESTDIR="${pkgdir}" install } -sha512sums=('6e88143d0032a7da61d141b23df2265540ea7667dfe641e9f1945cf8bc7b2c9df72d96bfa4df4333d550ca9f6d64545076b1aceda1d2b855fa95a2bd793943f4' +sha512sums=('7214c7913ed116a5557e89958d0d117e7a2781dcbbcc8b1c6713fb569ca121a5763e5cf1dedfdb4607638f773875c374112865d3a306876906a126954c4ef387' '8719d99b2efb22438ec067c046f8d45addb3e0d336e8d6ec4b8ed22370fe81366d19a34934bb059230f86e74c379acb62822ee3458850437880d531de8ff3e0e') diff --git a/community/libvirt-glib/PKGBUILD b/community/libvirt-glib/PKGBUILD new file mode 100644 index 000000000..f04454542 --- /dev/null +++ b/community/libvirt-glib/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 93427 2013-07-03 12:11:24Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Stefano Facchini <stefano.facchini@gmail.com> + +pkgname=libvirt-glib +pkgver=0.1.6 +pkgrel=1 +pkgdesc="GLib bindings for libvirt" +arch=('i686' 'x86_64') +url="http://libvirt.org" +license=('LGPL2.1') +depends=('libvirt' 'glib2' 'gobject-introspection' 'python2') +options=('!libtool') +source=(ftp://libvirt.org/libvirt/glib/$pkgname-$pkgver.tar.gz) +sha256sums=('274b88584db94bb5d404e5398d6b5ef184afad49a2e4b3f4f6c47ba940bf55bf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index acdc24608..e301ba2dc 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 92992 2013-06-21 11:27:42Z spupykin $ +# $Id: PKGBUILD 93317 2013-07-01 14:35:45Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.0.6 -pkgrel=3 +pkgver=1.1.0 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -34,7 +34,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d libvirt.tmpfiles.d) -md5sums=('a4a09a981f902c4d6aa5138c753d64fd' +md5sums=('f980a84719033e9efca01048da505dfb' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') diff --git a/community/lua-zlib/PKGBUILD b/community/lua-zlib/PKGBUILD index a7878b14a..22e490738 100644 --- a/community/lua-zlib/PKGBUILD +++ b/community/lua-zlib/PKGBUILD @@ -1,49 +1,42 @@ -# $Id: PKGBUILD 92720 2013-06-13 12:58:26Z spupykin $ +# $Id: PKGBUILD 93359 2013-07-02 09:43:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=(lua-zlib lua51-zlib) pkgbase=lua-zlib -pkgver=0.2 -pkgrel=5 -_gitver=8d07669 +pkgver=20130702 +pkgrel=1 url="http://github.com/brimworks/lua-zlib" pkgdesc='Simple streaming interface to zlib for Lua.' arch=('i686' 'x86_64' 'mips64el') license=('MIT') -makedepends=('cmake' 'lua' 'lua51' 'zlib') +makedepends=('cmake' 'lua' 'lua51' 'zlib' 'git') conflicts=('lua-lzlib') -source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver") -md5sums=('e6c780c0c4b6dcb88cf16949bb751be7') +#source=("lua-zlib-$pkgver.zip::https://github.com/brimworks/lua-zlib/zipball/v$pkgver") +source=("git://github.com/brimworks/lua-zlib.git") +md5sums=('SKIP') build() { - cp -a $srcdir/brimworks-lua-zlib-${_gitver} $srcdir/brimworks-lua51-zlib-${_gitver} - - cd $srcdir/brimworks-lua-zlib-${_gitver} - sed -i "s#share/lua/cmod#lib/lua/5.2#" CMakeLists.txt - cmake -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr . - make - - cd $srcdir/brimworks-lua51-zlib-${_gitver} -# sed -i "s#share/lua/cmod#lib/lua/5.1#" CMakeLists.txt -# cmake -DCMAKE_BUILD_TYPE=Release \ -# -DCMAKE_INSTALL_PREFIX=/usr . - make linux + cp -a $srcdir/lua-zlib $srcdir/lua51-zlib + + cd $srcdir/lua-zlib + gcc -o zlib.so -O2 -fPIC -shared lua_zlib.c -llua -lz + + cd $srcdir/lua51-zlib + gcc -o zlib.so -O2 -fPIC -shared -I/usr/include/lua5.1 lua_zlib.c -llua5.1 -lz } package_lua-zlib() { depends=('zlib' 'lua') - cd $srcdir/brimworks-lua-zlib-${_gitver} - make DESTDIR="$pkgdir" install - install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README" + cd $srcdir/lua-zlib + install -Dm0755 zlib.so $pkgdir/usr/lib/lua/5.2/zlib.so + install -Dm644 "README" "$pkgdir/usr/share/licenses/$pkgname/README" } package_lua51-zlib() { depends=('zlib' 'lua51') - cd $srcdir/brimworks-lua51-zlib-${_gitver} - mkdir -p $pkgdir/usr/lib/lua/5.1 - make DESTDIR="$pkgdir" LUACPATH=$pkgdir/usr/lib/lua/5.1 install + cd $srcdir/lua51-zlib + install -Dm0755 zlib.so $pkgdir/usr/lib/lua/5.1/zlib.so install -D -m644 "README" "$pkgdir/usr/share/licenses/$pkgname/README" } diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index bb1990f2a..578633a39 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93034 2013-06-22 17:02:30Z seblu $ +# $Id: PKGBUILD 93201 2013-06-28 13:21:16Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Laszlo Papp <djszapi at archlinux us> @@ -6,7 +6,7 @@ pkgbase=luaposix pkgname=('lua-posix' 'lua51-posix') -pkgver=5.1.28 +pkgver=29 pkgrel=1 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ license=('GPL' 'LGPL') makedepends=('lua' 'lua51' 'lua51-bitop' 'git') options=('!libtool') source=("$pkgname-$pkgver.tar.gz::https://github.com/luaposix/luaposix/archive/v$pkgver.tar.gz") -md5sums=('0ea20ea21bd9f92b79041beb6d41393e') +md5sums=('5c3e49c51caeee6eb5f9dcb2bb082bed') prepare() { # do bootstrap in prepare, as it clone external git diff --git a/community/marisa/ChangeLog b/community/marisa/ChangeLog new file mode 100644 index 000000000..b7f4b062d --- /dev/null +++ b/community/marisa/ChangeLog @@ -0,0 +1,10 @@ +2013-05-28 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * marisa 0.2.4-2 + - Separate bindings to another packages + +2013-05-27 ponsfoot <cabezon dot hashimoto at gmail dot com> + + * marisa 0.2.4-1 + - Initial release on AUR + diff --git a/community/marisa/PKGBUILD b/community/marisa/PKGBUILD new file mode 100644 index 000000000..9d4effbc3 --- /dev/null +++ b/community/marisa/PKGBUILD @@ -0,0 +1,109 @@ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com> + +pkgbase=marisa +pkgname=('marisa' 'perl-marisa' 'python2-marisa' 'ruby-marisa') +pkgver=0.2.4 +pkgrel=2 +arch=('i686' 'x86_64') +url="https://code.google.com/p/marisa-trie/" +license=('BSD' 'LGPL') +options=(!libtool) +makedepends=('python2' 'ruby' 'perl') +changelog=ChangeLog +source=(https://marisa-trie.googlecode.com/files/$pkgbase-$pkgver.tar.gz) +sha1sums=('fb0ed7d993e84dff32ec456a79bd36a00022629d') + +build() { + cd "${pkgname}-${pkgver}" + ./configure --prefix=/usr --disable-static \ + # --enable-popcnt + # --enable-sse2 + # --enable-sse3 + # --enable-ssse3 + # --enable-sse4.1 + # --enable-sse4.2 + # --enable-sse4 + # --enable-sse4a + + sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool + sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make + + # Perl bindings + cd "${srcdir}/${pkgbase}-${pkgver}/bindings/perl" + perl Makefile.PL \ + INC="-I${srcdir}/${pkgbase}-${pkgver}/lib" \ + LIBS="-L${srcdir}/${pkgbase}-${pkgver}/lib/.libs" + make + + # Python bindings + cd "${srcdir}/${pkgbase}-${pkgver}/bindings/python" + python2 setup.py build_ext \ + --include-dirs="${srcdir}/${pkgbase}-${pkgver}/lib" \ + --library-dirs="${srcdir}/${pkgbase}-${pkgver}/lib/.libs" + python2 setup.py build + + # Ruby bindings + cd "${srcdir}/${pkgbase}-${pkgver}/bindings/ruby" + ruby extconf.rb \ + --with-opt-include="${srcdir}/${pkgbase}-${pkgver}/lib" \ + --with-opt-lib="${srcdir}/${pkgbase}-${pkgver}/lib/.libs" \ + --vendor + make +} + +package_marisa() { + pkgdesc="Static and space-efficient trie data structure library" + depends=('gcc-libs') + + cd "${pkgbase}-${pkgver}" + make DESTDIR="$pkgdir" install + + install -d "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}" + install -m 644 docs/* README "${pkgdir}/usr/share/doc/${pkgbase}-${pkgver}/" + + install -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/" +} + +package_perl-marisa() { + pkgdesc="Perl language binding for marisa" + depends=('perl' 'marisa') + + cd "${pkgbase}-${pkgver}/bindings/perl" + make DESTDIR="$pkgdir" install + + cd ../.. + install -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/" +} + +package_python2-marisa() { + pkgdesc="Python 2.x language binding for marisa" + depends=('python2' 'marisa') + + cd "${pkgbase}-${pkgver}/bindings/python" + python2 setup.py install --root="$pkgdir" + + cd ../.. + install -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/" +} + +package_ruby-marisa() { + pkgdesc="Ruby language binding for marisa" + depends=('ruby' 'marisa') + + cd "${pkgbase}-${pkgver}/bindings/ruby" + _hdrdir=`pkg-config --variable=rubyhdrdir ruby-2.0` + _arch=`pkg-config --variable=arch ruby-2.0` + make DESTDIR="$pkgdir" install \ + hdrdir="$_hdrdir" \ + arch_hdrdir="${_hdrdir}/${_arch}" \ + rubyhdrdir="$_hdrdir" + + cd ../.. + install -d "${pkgdir}/usr/share/licenses/$pkgname" + install -m 644 AUTHORS COPYING "${pkgdir}/usr/share/licenses/$pkgname/" +} diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD index bcff92743..fa9b9dcf1 100644 --- a/community/megaglest/PKGBUILD +++ b/community/megaglest/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 90059 2013-05-06 19:38:20Z foutrelis $ +# $Id: PKGBUILD 93166 2013-06-26 17:55:13Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=megaglest -pkgver=3.7.1 -pkgrel=2 +pkgver=3.8.0beta1 +_pkgver=3.8.0-beta1 +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/" @@ -12,27 +13,24 @@ license=('GPL3') depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua51' 'icu' 'ftgl' 'glew' 'libircclient' 'miniupnpc' 'wxgtk' 'glu') makedepends=('ftjam' 'cmake' 'mesa') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" - lol.patch) -md5sums=('e7a960ec73784aa0f7b951d2ad963456' - '68fd326b73ed1c75981004fbdef6b73a') +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${_pkgver}.tar.xz") +md5sums=('1da8707d435ffb2342f03ca466d4eeed') build() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - - #patch -Np1 < "$srcdir/lol.patch" + cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ [[ -d build ]] && rm -r build mkdir build && cd build + cmake .. \ -DWANT_SVN_STAMP=OFF \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version + -DCMAKE_BUILD_TYPE=Release make } package() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ + cd "${srcdir}"/"${pkgname}"-"${_pkgver}"/ cd build make DESTDIR="$pkgdir" install diff --git a/community/megaglest/lol.patch b/community/megaglest/lol.patch deleted file mode 100644 index 56f94c852..000000000 --- a/community/megaglest/lol.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h -index 8fcfb27..3cb7a41 100644 ---- a/source/shared_lib/include/graphics/math_util.h -+++ b/source/shared_lib/include/graphics/math_util.h -@@ -184,10 +184,10 @@ public: - - Rect2<T> computeBoundingRect() const{ - return Rect2i( -- min(p[0].x, p[1].x), -- min(p[0].y, p[2].y), -- max(p[2].x, p[3].x), -- max(p[1].y, p[3].y)); -+ std::min(p[0].x, p[1].x), -+ std::min(p[0].y, p[2].y), -+ std::max(p[2].x, p[3].x), -+ std::max(p[1].y, p[3].y)); - } - - bool isInside(const Vec2<T> &pt) const{ -diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp -index b09c972..ddebd03 100644 ---- a/source/shared_lib/sources/platform/posix/ircclient.cpp -+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp -@@ -13,6 +13,7 @@ - #include "ircclient.h" - #include "util.h" - #include "platform_common.h" -+#include "libirc_rfcnumeric.h" - #include "libircclient.h" - - #include <stdio.h> -diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp -index 05478fc..c27aa62 100644 ---- a/source/shared_lib/sources/util/util.cpp -+++ b/source/shared_lib/sources/util/util.cpp -@@ -19,6 +19,7 @@ - #include <stdarg.h> - #include <time.h> - #include <fcntl.h> // for open() -+#include <unistd.h> - - #ifdef WIN32 - #include <io.h> // for open() diff --git a/community/opensmtpd/PKGBUILD b/community/opensmtpd/PKGBUILD index 066a53470..b4e5e9038 100644 --- a/community/opensmtpd/PKGBUILD +++ b/community/opensmtpd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92253 2013-06-03 11:15:25Z allan $ +# $Id: PKGBUILD 93322 2013-07-01 22:20:09Z seblu $ # Maintainer: Sébastien Luttringer pkgname=opensmtpd -pkgver=5.3.2p1 -pkgrel=2 +pkgver=5.3.3p1 +pkgrel=1 pkgdesc='Free implementation of the server-side SMTP protocol' arch=('i686' 'x86_64' 'mips64el') url='http://www.opensmtpd.org/' @@ -11,29 +11,40 @@ license=('custom') depends=('libevent') provides=('smtp-server' 'smtp-forwarder') conflicts=('smtp-server' 'smtp-forwarder') -backup=('etc/smtpd.conf' 'etc/aliases' 'etc/virtual' 'etc/secrets') +backup=('etc/smtpd/smtpd.conf' 'etc/smtpd/aliases') install=opensmtpd.install source=("http://www.opensmtpd.org/archives/$pkgname-$pkgver.tar.gz" 'smtpd.service' 'smtpd.socket') -md5sums=('8fc513dd632461f70e433103d75dbf50' +md5sums=('795982f9b0b45c7645f897ba2ead0024' '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 +} + build() { cd $pkgname-$pkgver - ./bootstrap ./configure \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/smtpd \ --sbindir=/usr/bin \ --libexecdir=/usr/bin \ --with-maildir=/var/spool/mail \ --with-privsep-path=/var/empty \ --with-sock-dir=/run \ - --with-privsep-user=mail \ - --with-filter-user=mail \ - --with-queue-user=mail \ + --with-privsep-user=smtpd \ + --with-lookup-user=smtpd \ + --with-queue-user=smtpq \ + --with-filter-user=smtpf \ --with-pam make } @@ -41,23 +52,21 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir/" install + # license install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - cd "$pkgdir" # working directory + cd "$pkgdir" install -dm711 var/spool/smtpd - # license 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 -r usr/bin/opensmtpd - # empty aliases file - install -Dm644 /dev/null "$pkgdir/etc/aliases" - install -Dm644 /dev/null "$pkgdir/etc/virtual" - install -Dm640 /dev/null "$pkgdir/etc/secrets" + 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... - ln "$pkgdir/usr/bin/smtpctl" "$pkgdir/usr/bin/sendmail" + # use hardlink as upstream does + cd "$pkgdir/usr/bin" + ln smtpctl "$pkgdir/usr/bin/sendmail" } # vim:set ts=2 sw=2 et: diff --git a/community/opensmtpd/opensmtpd.install b/community/opensmtpd/opensmtpd.install index 0e3d8c0e1..48366c15c 100644 --- a/community/opensmtpd/opensmtpd.install +++ b/community/opensmtpd/opensmtpd.install @@ -1,14 +1,29 @@ # arg 1: the new package version -# arg 2: the old package version +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 -post_install() { - makemap -t aliases /etc/aliases +# arg 2: the old package version +post_upgrade() { + post_install "$1" + if (( $(vercmp $2 5.3.3p1-1) < 0 )); then + echo 'Configuration files have been moved to /etc/smtpd.' + echo 'New users have been added.' + echo 'Check your configuration!' + fi } # arg 1: the old package version post_remove() { - rm -f /etc/aliases.db + for _u in smtpd smtpq smtpf; do userdel -f "$_u"; done + true } # vim:set ts=2 sw=2 et: diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD index 7956f81b3..0ad0688a2 100644 --- a/community/parole/PKGBUILD +++ b/community/parole/PKGBUILD @@ -1,22 +1,21 @@ -# $Id: PKGBUILD 92376 2013-06-04 12:32:38Z spupykin $ +# $Id: PKGBUILD 93130 2013-06-25 14:39:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: TDY <tdy@gmx.com> pkgname=parole pkgver=0.5.1 -pkgrel=1 +pkgrel=2 pkgdesc="A modern media player based on the GStreamer framework" arch=('i686' 'x86_64' 'mips64el') url="http://goodies.xfce.org/projects/applications/parole/" license=('GPL') depends=('gstreamer' 'gst-plugins-base-libs' 'hicolor-icon-theme' 'libnotify>=0.4.1' - 'libxfce4ui>=4.7.0' 'taglib>=1.4' 'desktop-file-utils') + 'libxfce4ui>=4.7.0' 'taglib>=1.4' 'desktop-file-utils' 'gst-plugins-good') makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools') optdepends=('xulrunner: browser plugin' 'gst-libav' 'gst-plugins-bad' 'gst-plugins-base' - 'gst-plugins-good' 'gst-plugins-ugly') conflicts=('parole-media-player-git') options=('!libtool') diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD index 59bff2498..7950df9c0 100644 --- a/community/processing/PKGBUILD +++ b/community/processing/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 92422 2013-06-04 20:05:04Z arodseth $ +# $Id: PKGBUILD 93145 2013-06-25 20:18:20Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=processing -pkgver=2.0 +pkgver=2.0.1 pkgrel=1 arch=('x86_64' 'i686') pkgdesc='Programming language and environment for creating images, animations and interactions' @@ -12,17 +12,17 @@ depends=('libgl' 'sh' 'libxxf86vm') makedepends=('gendesk') options=(!strip) -if [ "$CARCH" == "x86_64" ]; then - source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux64.tgz" +#if [ "$CARCH" == "x86_64" ]; then + source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz" "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('91b218d69bfe681c671d029346c671612f443f429ea68b63e0e08ae3aa2ffcf6' + sha256sums=('cd1c723e3521b679b8e36d4f04718adcf515d759cb69fc9dfe9020e1a1b2ad1b' '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') -else - source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver-linux32.tgz" - "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") - sha256sums=('5f09d79b13ec24384d64385c625b559cc24f2682d5ca3d6a8944ce95873e8e26' - '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') -fi +#else +# source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz" +# "$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png") +# sha256sums=('99c3e49d235a70c59da3f032c59ca5271177b076aa8f2bff1735a14b7c4adfec' +# '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a') +#fi prepare() { cd "$srcdir" diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD index f2a5b88f0..bd9db9a8b 100644 --- a/community/python-psycopg2/PKGBUILD +++ b/community/python-psycopg2/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 87852 2013-04-08 09:24:14Z spupykin $ +# $Id: PKGBUILD 93151 2013-06-26 09:20:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgbase=python-psycopg2 pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.5 +pkgver=2.5.1 pkgrel=1 pkgdesc="A PostgreSQL database adapter for the Python programming language." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://initd.org/psycopg/" license=('LGPL3') makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz) -md5sums=('facd82faa067e99b80146a0ee2f842f6') +md5sums=('1b433f83d50d1bc61e09026e906d84c7') build() { cd "$srcdir/psycopg2-$pkgver" diff --git a/community/python2-fonttools/PKGBUILD b/community/python2-fonttools/PKGBUILD index dbd2bd8b2..74d7c7309 100644 --- a/community/python2-fonttools/PKGBUILD +++ b/community/python2-fonttools/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 76250 2012-09-15 08:59:17Z aginiewicz $ +# $Id: PKGBUILD 93407 2013-07-03 09:46:05Z aginiewicz $ # Maintainer: Andrzej Giniewicz <gginiu@gmail.com> # Contributor: Firmicus <firmicus āt gmx dōt net> pkgname=python2-fonttools -pkgver=2.3 +pkgver=2.4 pkgrel=1 pkgdesc="Converts OpenType and TrueType fonts to and from XML" url="http://sourceforge.net/projects/fonttools/" @@ -14,7 +14,7 @@ makedepends=("python2-distribute") provides=('fonttools') # temporary compatibility because of rename replaces=('fonttools') source=(http://downloads.sourceforge.net/fonttools/fonttools-$pkgver.tar.gz) -md5sums=('502cdf6662e1d075f1902fbd995eaace') +md5sums=('41b2d2be48214d2af848e04fded54689') build() { cd "$srcdir"/fonttools-$pkgver diff --git a/community/python2-ldap/PKGBUILD b/community/python2-ldap/PKGBUILD index 393da122d..5d64c807b 100644 --- a/community/python2-ldap/PKGBUILD +++ b/community/python2-ldap/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 72704 2012-06-20 12:26:14Z spupykin $ +# $Id: PKGBUILD 93180 2013-06-27 12:10:25Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Morgan LEFIEUX <comete_AT_archlinuxfr.org> pkgname=python2-ldap -pkgver=2.4.10 +pkgver=2.4.13 pkgrel=1 pkgdesc="Provides an object-oriented API to access LDAP directory servers from Python programs" arch=('i686' 'x86_64' 'mips64el') @@ -13,12 +13,16 @@ depends=('python2' 'libldap>=2.4.26') makedepends=('chrpath') replaces=('python-ldap') source=(http://pypi.python.org/packages/source/p/python-ldap/python-ldap-$pkgver.tar.gz) -md5sums=('a15827ca13c90e9101e5e9405c1d83be') +md5sums=('74b7b50267761540451eade44b2049ee') build() { cd $srcdir/python-ldap-$pkgver sed -i 's|<sasl.h>|<sasl/sasl.h>|' Modules/LDAPObject.c python2 setup.py build +} + +package() { + cd $srcdir/python-ldap-$pkgver python2 setup.py install --root $pkgdir install -D -m644 LICENCE $pkgdir/usr/share/licenses/$pkgname/LICENSE chrpath -d $pkgdir/usr/lib/python2.7/site-packages/_ldap.so diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD index b595d186f..c75c6a28f 100644 --- a/community/qcad/PKGBUILD +++ b/community/qcad/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 92285 2013-06-03 13:57:13Z spupykin $ +# $Id: PKGBUILD 93132 2013-06-25 14:39:54Z 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.0.14.0 -pkgrel=2 +pkgver=3.1.2.0 +pkgrel=1 pkgdesc="A 2D CAD package based upon Qt" arch=('i686' 'x86_64' 'mips64el') url="http://www.ribbonsoft.com/qcad.html" @@ -14,23 +14,21 @@ license=('GPL3') depends=('qtwebkit') makedepends=('glu') options=(libtool) -source=($pkgname-$pkgver.zip::https://github.com/qcad/qcad/archive/v${pkgver}.zip +source=($pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz QCad.desktop) -md5sums=('2c460838235a95a4d969e508a75b8206' +md5sums=('9741d2e4f01b59107a50c0c95af7b972' '8c4288986b78b14a813b005e81b6ba53') 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 } build() { cd ${srcdir}/qcad-$pkgver - qmake-qt4 - make PREFIX=/usr CXX="g++ -fpermissive" + make all -j1 } package() { @@ -42,27 +40,26 @@ package() { install -dm755 ${pkgdir}/usr/share/{qcad,pixmaps,applications} cp -r examples fonts libraries patterns plugins scripts ts ${pkgdir}/usr/share/qcad - cp release/* ${pkgdir}/usr/share/qcad + cp debug/* ${pkgdir}/usr/share/qcad - install -m755 qcad ${pkgdir}/usr/share/qcad/qcad install -m755 readme.txt ${pkgdir}/usr/share/qcad/readme.txt # qtwebkit - ln -s /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so + ln -sf /usr/lib/qt4/plugins/designer/libqwebview.so ${pkgdir}/usr/share/qcad/plugins/designer/libqwebview.so # qt for sofiles in /usr/lib/qt4/plugins/imageformats/*.so do - ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/} + ln -sf ${sofiles} ${pkgdir}/usr/share/qcad/plugins/imageformats/${sofiles##/*/} done for sofiles in /usr/lib/qt4/plugins/sqldrivers/*.so do - ln -s ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/} + ln -sf ${sofiles} ${pkgdir}/usr/share/qcad/plugins/sqldrivers/${sofiles##/*/} done install -Dm644 scripts/qcad_icon.png ${pkgdir}/usr/share/pixmaps/qcad_icon.png install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop install -dm0755 $pkgdir/usr/bin - echo -e '#!/bin/sh\ncd /usr/share/qcad\nexec ./qcad' >$pkgdir/usr/bin/qcad + echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=`pwd`:$LD_LIBRARY_PATH exec ./qcad-bin' >$pkgdir/usr/bin/qcad chmod 0755 $pkgdir/usr/bin/qcad } diff --git a/community/recorditnow/PKGBUILD b/community/recorditnow/PKGBUILD index 450d3018d..c7a493fb1 100644 --- a/community/recorditnow/PKGBUILD +++ b/community/recorditnow/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81949 2013-01-04 08:45:38Z fyan $ +# $Id: PKGBUILD 93279 2013-07-01 05:44:50Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Yichao Yu <yyc1992@gmail.com> # Contributor: Weng Xuetian <wengxt@gmail.com> @@ -7,15 +7,16 @@ pkgname=recorditnow pkgver=0.8.1 -pkgrel=4 +pkgrel=5 pkgdesc="A plugin based desktop recorder for KDE SC 4" arch=('i686' 'x86_64' 'mips64el') url="http://kde-apps.org/content/show.php/RecordItNow?content=114610" license=('GPL') -depends=('kdebase-runtime' 'recordmydesktop' 'ffmpeg' 'xdg-utils') -makedepends=('cmake' 'automoc4') -optdepends=('mencoder: for mencoder encoder plugin') -provides=('recorditnow' 'joschy') +depends=('kdebase-runtime' 'ffmpeg' 'xdg-utils') +makedepends=('cmake' 'automoc4' 'recordmydesktop') +optdepends=('mencoder: for mencoder encoder plugin' + 'recordmydesktop') +provides=('joschy') conflicts=('joschy-git') install=recorditnow.install source=("http://downloads.sourceforge.net/project/recorditnow/${pkgname}-${pkgver}.tar.bz2" diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index 7ef4d64bd..d4c4e9f15 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 93061 2013-06-23 17:21:00Z andrea $ +# $Id: PKGBUILD 93287 2013-07-01 06:22:40Z 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.1 +pkgver=2.3.2 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ 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=('1c552bad65c640bcd1a7550d45ad37ad93e16e75f14cf71685363e04f4c2a658') +sha256sums=('9cfdb7e02a08ad4d2b5dd6e8bd1c85c11013f41a3186c8c5c22454093722bc74') build(){ mkdir build diff --git a/community/sakura/PKGBUILD b/community/sakura/PKGBUILD index 063a72c49..cd5e476a1 100644 --- a/community/sakura/PKGBUILD +++ b/community/sakura/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71005 2012-05-21 18:31:37Z rvanharen $ +# $Id: PKGBUILD 93276 2013-07-01 04:10:57Z angvp $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=sakura -pkgver=3.0.4 +pkgver=3.1.0 pkgrel=1 pkgdesc="A terminal emulator based on GTK and VTE" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('vte3' 'libxft' 'desktop-file-utils') makedepends=('cmake') source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2") install=sakura.install -sha1sums=('e4d3a7fce9600cbdec9fda1e6fd20f38ebb4655e') +sha1sums=('159abc2f83e912da1bfb35c9b239b092e78a044f') build() { cd $srcdir/${pkgname}-${pkgver} diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD deleted file mode 100644 index 99a2f6b6d..000000000 --- a/community/smc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 90091 2013-05-06 19:39:36Z foutrelis $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Kritoke <typeolinux@yahoo.com> - -pkgname=smc -pkgver=1.9 -pkgrel=21 -pkgdesc="Secret Maryo Chronicles" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.secretmaryo.org/" -license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') -makedepends=('autoconf' 'automake' 'boost') -source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 - smc-for-cegui-v0-7.diff - boost_filesystem3.diff - smc.desktop - smc.png) -md5sums=('75ab7826303c49aec25b052a8b90287f' - '51dfea21b741ad19df14e738df52f1cf' - '309a5a6d4b3c0b3dc5e1b7f4de84086f' - '80fe208132ff41dd7677a53ee429ecdb' - 'efca7580e28748625eb676c9d24ee122') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # to remove when smc will be compatible with cegui-0.7.x - patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff" - # fix compilation - export CXXFLAGS="${CXXFLAGS} -fpermissive" - # fix for boost >= 1.50 - patch -Np1 -i "${srcdir}/boost_filesystem3.diff" - - ./autogen.sh - LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make install DESTDIR="$pkgdir" - # install some freedesktop.org compatibility - install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - - rm -rf "$pkgdir/usr/share/smc/" -} diff --git a/community/smc/boost_filesystem3.diff b/community/smc/boost_filesystem3.diff deleted file mode 100644 index 6786b98f5..000000000 --- a/community/smc/boost_filesystem3.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -rup smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new/src/core/filesystem/filesystem.cpp ---- smc-1.9/src/core/filesystem/filesystem.cpp 2009-07-04 12:11:18.000000000 +0200 -+++ smc-1.9.new/src/core/filesystem/filesystem.cpp 2012-07-12 15:36:31.361941069 +0200 -@@ -142,27 +142,27 @@ vector<std::string> Get_Directory_Files( - if( fs::is_directory( *dir_itr ) ) - { - // ignore hidden directories -- if( dir_itr->path().leaf().find( "." ) == 0 ) -+ if( dir_itr->path().filename().string().find( "." ) == 0 ) - { - continue; - } - - if( with_directories ) - { -- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); -+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); - } - - // load all items from the sub-directory - if( search_in_sub_directories ) - { -- vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories ); -+ vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories ); - valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() ); - } - } - // valid file -- else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos ) -+ else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos ) - { -- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); -+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); - } - } - catch( const std::exception &ex ) -diff -rup smc-1.9/src/overworld/world_manager.cpp smc-1.9.new/src/overworld/world_manager.cpp ---- smc-1.9/src/overworld/world_manager.cpp 2009-08-16 18:44:52.000000000 +0200 -+++ smc-1.9.new/src/overworld/world_manager.cpp 2012-07-12 15:37:13.564660591 +0200 -@@ -118,7 +118,7 @@ void cOverworld_Manager :: Load_Dir( con - {
- try
- {
-- std::string current_dir = dir_itr->path().leaf();
-+ std::string current_dir = dir_itr->path().filename().string();
-
- // only directories with an existing description
- if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
diff --git a/community/smc/smc-for-cegui-v0-7.diff b/community/smc/smc-for-cegui-v0-7.diff deleted file mode 100644 index a99cbce6c..000000000 --- a/community/smc/smc-for-cegui-v0-7.diff +++ /dev/null @@ -1,437 +0,0 @@ -diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac ---- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 -+++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 -@@ -53,7 +53,7 @@ - AC_MSG_ERROR([SDL_ttf library not found])) - - # Check for the CEGUI library --PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) -+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) - CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" - LIBS="$LIBS $CEGUI_LIBS" - -diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp ---- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 -+++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 -@@ -118,16 +118,10 @@ - return tmp;
- }
-
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- // draw text
-- list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
-- // draw text
-- list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+ list_text->draw( buffer, targetRect, alpha, clipper );
- }
-
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@ - if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- {
- // Listbox dimension
-- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
-- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- // Vertical ScrollBar Position
- float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- // font height
-- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
-
- // draw items
- for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h ---- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 -+++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 -@@ -62,8 +62,7 @@ - */
- virtual CEGUI::Size getPixelSize( void ) const;
- // draw
-- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
-- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- // draw image
- void Draw_Image( void );
-
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp ---- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 -+++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 -@@ -265,7 +265,7 @@ -
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- // fixme : Can't handle multiple lines of text
- float text_width = font->getTextExtent( text ) * global_downscalex;
-
-@@ -1182,7 +1182,7 @@ - text_default->setText( gui_text );
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@ - text_default->moveToFront();
-
- // set window height
-- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
-
- while( draw )
- {
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp ---- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 -+++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 -@@ -444,13 +444,15 @@ - - if( pGuiSystem ) - { -- delete pGuiSystem; -+ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); -+ pGuiSystem->destroy(); - pGuiSystem = NULL; -+ delete rp; - } - - if( pGuiRenderer ) - { -- delete pGuiRenderer; -+ pGuiRenderer->destroy( *pGuiRenderer ); - pGuiRenderer = NULL; - } - -@@ -507,7 +509,7 @@ - } - case SDL_VIDEORESIZE: - { -- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); -+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); - break; - } - case SDL_KEYDOWN: -diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp ---- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 -+++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 -@@ -946,7 +946,7 @@ - m_text_debug_text->setVisible( 1 );
-
- // update position
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp ---- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 -+++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -432,17 +432,12 @@ -
- void cMouseCursor :: Render( void ) const
- {
-- if( !m_active )
-- {
-+ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+ if ( m_active == mouse->isVisible() )
- return;
-- }
-
-- // Render CEGUI Mouse
-- pGuiRenderer->setQueueingEnabled( 0 );
-- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-- mouse->setVisible( 1 );
-- mouse->draw();
-- mouse->setVisible( 0 );
-+ mouse->setVisible( m_active );
- }
-
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp ---- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 -+++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 -@@ -163,8 +163,8 @@ - editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- // preview window
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
-- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
-
- Update_BG_Colors( CEGUI::EventArgs() );
-
-@@ -555,8 +555,8 @@ -
- // set default rect
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
-- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
-
- if( !File_Exists( filename ) )
- {
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp ---- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 -+++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -1663,7 +1663,7 @@ - window_name->setText( name );
- window_name->setTooltipText( tooltip );
- // get text width
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- // all names should have the same width
- if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp ---- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 -+++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 -@@ -103,15 +103,15 @@ -
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-
--cFake_Renderer :: cFake_Renderer( void )
--{
-- d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+// d_identifierString = "Fake Renderer";
-+//}
-
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
-
--}
-+//}
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
-
-@@ -158,7 +158,7 @@ - std::string log_dump_dir = "/dev/null";
- #endif
- // create fake system and renderer
-- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
-
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@ - CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
-
-- delete pGuiSystem;
-+ pGuiSystem->destroy();
- pGuiSystem = NULL;
- delete renderer;
- delete rp;
-@@ -177,7 +177,7 @@ - // create renderer
- try
- {
-- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@ - exit( EXIT_FAILURE );
- }
-
-- /* create Resource Provider
-- * no need to destroy it later since it is handled by the CEGUI renderer
-- */
-- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+ pGuiRenderer->enableExtraStateSettings(true);
-+
-+ // create Resource Provider
-+ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
-
- // set Resource Provider directories
- rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@ - // create system
- try
- {
-- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@ - // load the scheme file, which auto-loads the imageset
- try
- {
-- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@ - // default mouse cursor
- pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- // force new mouse image
-- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
-- // hide CEGUI mouse always because we render it manually
-- CEGUI::MouseCursor::getSingleton().hide();
-+ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- // default tooltip
- pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- // create default root window
-@@ -553,7 +551,7 @@ - pFont->Restore_Textures();
-
- // send new size to CEGUI
-- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-
- // check if CEGUI is initialized
- bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h ---- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 -+++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 -@@ -23,7 +23,7 @@ - #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
-
- namespace SMC
- {
-@@ -129,31 +129,100 @@ - EFFECT_IN_AMOUNT
- };
-
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+ void draw() const {}
-+ void setTranslation(const CEGUI::Vector3&) {}
-+ void setRotation(const CEGUI::Vector3&) {}
-+ void setPivot(const CEGUI::Vector3&) {}
-+ void setClippingRegion(const CEGUI::Rect&) {}
-+ void appendVertex(const CEGUI::Vertex&) {}
-+ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+ void setActiveTexture(CEGUI::Texture*) {}
-+ void reset() {}
-+ CEGUI::Texture* getActiveTexture() const { return 0; }
-+ CEGUI::uint getVertexCount() const { return 0; }
-+ CEGUI::uint getBatchCount() const { return 0; }
-+ void setRenderEffect(CEGUI::RenderEffect*) {}
-+ CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
-
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+ cFake_Texture() :
-+ m_size(1, 1),
-+ m_scaling(1, 1) {}
-+
-+ const CEGUI::Size& getSize() const { return m_size; }
-+ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+ void saveToMemory(void*) {}
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
-- cFake_Renderer( void );
-- virtual ~cFake_Renderer( void );
-+ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+ void draw(const CEGUI::GeometryBuffer&) {}
-+ void draw(const CEGUI::RenderQueue&) {}
-+ void setArea(const CEGUI::Rect&) {}
-+ const CEGUI::Rect& getArea() const { return m_area; }
-+ bool isImageryCache() const { return false; }
-+ void activate() {}
-+ void deactivate() {}
-+ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+ CEGUI::Rect m_area;
-+};
-
-- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
-- virtual void doRender(void) {};
-- virtual void clearRenderList(void) {};
-- virtual void setQueueingEnabled(bool setting) {};
-- virtual CEGUI::Texture *createTexture(void) { return NULL; };
-- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
-- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
-- virtual void destroyTexture(CEGUI::Texture* texture) {};
-- virtual void destroyAllTextures(void) {};
-- virtual bool isQueueingEnabled(void) const { return 0; };
-- virtual float getWidth(void) const { return 0; };
-- virtual float getHeight(void) const { return 0; };
-- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
-- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
-- virtual unsigned int getMaxTextureSize(void) const { return 0; };
-- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
-- virtual unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+ cFake_Renderer( void ) :
-+ m_size(0, 0),
-+ m_dpi(0, 0),
-+ m_identifierString("Fake Renderer"),
-+ m_root(m_target) {}
-+ ~cFake_Renderer( void ) {}
-+
-+ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+ void destroyAllGeometryBuffers() {}
-+ CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+ void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+ void destroyAllTextureTargets() {}
-+ CEGUI::Texture& createTexture() { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+ void destroyTexture(CEGUI::Texture&) {}
-+ void destroyAllTextures() {}
-+ void beginRendering() {}
-+ void endRendering() {}
-+ void setDisplaySize(const CEGUI::Size&) {}
-+ const CEGUI::Size& getDisplaySize() const { return m_size; }
-+ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+ CEGUI::uint getMaxTextureSize() const { return 0; }
-+ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_dpi;
-+ CEGUI::String m_identifierString;
-+ cFake_GeometryBuffer m_geometry;
-+ cFake_Texture m_texture;
-+ cFake_RenderTarget m_target;
-+ CEGUI::RenderingRoot m_root;
- };
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community/smc/smc.desktop b/community/smc/smc.desktop deleted file mode 100644 index 6cfe5b018..000000000 --- a/community/smc/smc.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry]
-Name=Secret Maryo Chronicles
-GenericName=Arcade Game
-Exec=smc
-Icon=smc.png
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;KidsGame;
-StartupNotify=false
\ No newline at end of file diff --git a/community/smc/smc.png b/community/smc/smc.png Binary files differdeleted file mode 100644 index f02af1bfc..000000000 --- a/community/smc/smc.png +++ /dev/null diff --git a/community/solfege/PKGBUILD b/community/solfege/PKGBUILD index 925b45bc2..8b3e6aaff 100644 --- a/community/solfege/PKGBUILD +++ b/community/solfege/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82340 2013-01-15 15:31:26Z schiv $ +# $Id: PKGBUILD 93249 2013-06-29 19:58:40Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> # Contributor: sickhate <sickhate@tux-linux.net> # TODO: bring in pyalsa, csound, mma pkgname=solfege -pkgver=3.20.8 +pkgver=3.22.0 pkgrel=1 pkgdesc="Music education and ear training software" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ optdepends=('timidity++: or any MIDI player & MIDI-WAV converter' 'lilypond: for generating print-outs & score sheets' 'texlive-bin: use LaTeX to replace HTML reports with DVI') source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('401f421bde27112d7fa01aaccc080a95') +md5sums=('8a5275d6db3ff181068441d7e32ad7f3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/spice-gtk3/PKGBUILD b/community/spice-gtk3/PKGBUILD new file mode 100644 index 000000000..803951dfc --- /dev/null +++ b/community/spice-gtk3/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 93453 2013-07-03 13:44:50Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Stefano Facchini <stefano.facchini@gmail.com> +# Contributor: Jonathan Lestrelin <zanko@daemontux.org> +# Derived from the spice-gtk PKGBUILD by +# Contributor: Lucio Zara <pennega@gmail.com> + +pkgname=spice-gtk3 +pkgver=0.20 +pkgrel=2 +pkgdesc="A Gtk client and libraries for SPICE remote desktop servers (gtk3 version)." +arch=('x86_64' 'i686') +url="http://spice-space.org" +license=('GPL') +makedepends=('intltool' 'vala' 'python2-pyparsing' 'python2-gobject') +depends=('libpulse' 'gtk3' 'spice' 'libusb' 'usbredir') +conflicts=('spice-gtk') +options=('!libtool') +source=("http://www.spice-space.org/download/gtk/spice-gtk-$pkgver.tar.bz2") +sha256sums=('b1355823b0ceb2e118c1f9a9a602ccab78e1e2edf2d93f71fa42d3bc85ca75df') + +build() { + cd "$srcdir/spice-gtk-$pkgver" + sed -i 's,/usr/bin/env python,/usr/bin/python2,' spice-common/spice_codegen.py + ./configure --prefix=/usr \ + --with-gtk=3.0 \ + --with-python \ + --enable-vala \ + --enable-smartcard=no + make +} + +package() { + cd "$srcdir/spice-gtk-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/spice/PKGBUILD b/community/spice/PKGBUILD new file mode 100644 index 000000000..7f033c5a5 --- /dev/null +++ b/community/spice/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 93446 2013-07-03 13:23:11Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Patryk Kowalczyk < patryk at kowalczyk dot ws> + +pkgname=spice +pkgver=0.12.3 +pkgrel=1 +pkgdesc="SPICE client and server" +arch=('i686' 'x86_64') +url="http://spice-space.org" +license=('GPL') +makedepends=(python2 python2-pyparsing qemu mesa) +depends=(pixman spice-protocol alsa-utils libxrandr libxinerama libsasl openssl celt0.5.1 libgl glu) +source=(http://spice-space.org/download/releases/$pkgname-$pkgver.tar.bz2) +md5sums=('f33a682892f6793169f20298b2296449') + +build() { + cd "$srcdir/$pkgname-$pkgver" + PYTHON=python2 ./configure --prefix=/usr --enable-opengl --enable-client + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/community/squid/PKGBUILD b/community/squid/PKGBUILD index 396e514a3..54a864ffc 100644 --- a/community/squid/PKGBUILD +++ b/community/squid/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 91502 2013-05-23 10:15:09Z spupykin $ +# $Id: PKGBUILD 93361 2013-07-02 09:44:06Z 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.5 -pkgrel=2 +pkgver=3.3.6 +pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686' 'mips64el') url='http://www.squid-cache.org' depends=('openssl' 'pam' 'cron' 'perl' 'libltdl') -makedepends=('libcap') +makedepends=('libcap' 'krb5') license=('GPL') options=('emptydirs') backup=('etc/squid/squid.conf' @@ -21,12 +21,12 @@ source=("http://www.squid-cache.org/Versions/v3/3.3/$pkgname-$pkgver.tar.bz2" 'squid.pam' 'squid.cron' 'squid.service') -md5sums=('c7991aa8528034af0e21a69edf26e41b' +md5sums=('8dff6c8e9f46722fc62131364f0eeac6' '270977cdd9b47ef44c0c427ab9034777' 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # gcc 4.6 doesn't support -fhuge-objects. @@ -39,6 +39,20 @@ build() { 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" + ./configure \ --prefix=/usr \ --sbindir=/usr/bin \ diff --git a/community/usbredir/PKGBUILD b/community/usbredir/PKGBUILD new file mode 100644 index 000000000..7668e5247 --- /dev/null +++ b/community/usbredir/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 93438 2013-07-03 12:56:12Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Stefano Facchini <stefano.facchini@gmail.com> + +pkgname=usbredir +pkgver=0.6 +pkgrel=3 +pkgdesc="USB traffic redirection protocol" +arch=('i686' 'x86_64') +url="http://spice-space.org/page/UsbRedir" +license=('GPL2' 'LGPL2.1') +depends=('libusb') +options=(!libtool) +source=(http://spice-space.org/download/usbredir/$pkgname-$pkgver.tar.bz2) +sha256sums=('028184960044ea4124030000b3c55a35c3238835116e3a0fbcaff449df2c8edf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sbindir=/usr/bin + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index e3862c973..cc9ce02bf 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 93064 2013-06-23 17:40:06Z seblu $ +# $Id: PKGBUILD 93232 2013-06-29 10:08:01Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux' - 'linux-headers' +makedepends=('linux>=3.9' 'linux<3.10' + 'linux-headers>=3.9' 'linux-headers<3.10' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver" 'expac' 'sed' 'bc') +# remember to also adjust the .install files and the package deps below +_extramodules=extramodules-3.9-ARCH + build() { - _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') - _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) + _kernver="$(cat /usr/lib/modules/$_extramodules/version)" # dkms need modification to be run as user cp -r /var/lib/dkms . echo "dkms_tree='$srcdir/dkms'" > dkms.conf @@ -32,36 +34,32 @@ build() { } package_virtualbox-host-modules(){ - _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') - _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) + _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)") + depends=('linux>=3.9' 'linux<3.10') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" - install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" + install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/" + install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules.install" } package_virtualbox-guest-modules(){ - _kernmaj=$(expac -Q '%v' linux|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') - _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-ARCH/version) + _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=("linux>=$_kernmaj" "linux<$(echo "$_kernmaj+0.1"|bc)") + depends=('linux>=3.9' 'linux<3.10') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" - install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-ARCH/" + install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/" + install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/" find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules.install" } # vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/virtualbox-guest-modules.install b/community/virtualbox-modules/virtualbox-guest-modules.install index 73eddf0fd..169dd9a35 100644 --- a/community/virtualbox-modules/virtualbox-guest-modules.install +++ b/community/virtualbox-modules/virtualbox-guest-modules.install @@ -1,18 +1,21 @@ -VERSION='3.9.7-1-ARCH' +_depmod() { + EXTRAMODULES='extramodules-3.9-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - depmod $VERSION + _depmod } post_upgrade() { - depmod $VERSION + _depmod } post_remove() { - depmod $VERSION + _depmod } # vim:set ts=2 sw=2 et: diff --git a/community/virtualbox-modules/virtualbox-host-modules.install b/community/virtualbox-modules/virtualbox-host-modules.install index 4741f26bf..b1c7a68c6 100644 --- a/community/virtualbox-modules/virtualbox-host-modules.install +++ b/community/virtualbox-modules/virtualbox-host-modules.install @@ -1,20 +1,23 @@ -VERSION='3.9.7-1-ARCH' +_depmod() { + EXTRAMODULES='extramodules-3.9-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} post_install() { -cat << EOF + cat << EOF ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - depmod $VERSION + _depmod } post_upgrade() { - depmod $VERSION + _depmod echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - depmod $VERSION + _depmod } # vim:set ts=2 sw=2 et: diff --git a/community/winff/PKGBUILD b/community/winff/PKGBUILD new file mode 100644 index 000000000..f342c14de --- /dev/null +++ b/community/winff/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 93143 2013-06-25 18:51:28Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: yugrotavele <yugrotavele at archlinux dot us> +# Contributor: Paolo Stivanin <admin AT polslinux DOT it> + +pkgname=winff +pkgver=1.5.0 +pkgrel=1 +pkgdesc='GUI for ffmpeg' +url='http://code.google.com/p/winff/' +license=('GPL3') +arch=('x86_64' 'i686') +depends=('ffmpeg' 'gtk2' 'xterm' 'hicolor-icon-theme') +makedepends=('lazarus' 'lazarus-gtk2' 'gendesk') +install="$pkgname.install" +source=("http://winff.googlecode.com/files/winff-$pkgver-source.tar.gz") +sha256sums=('e94e5a4c11038e9a30fc3f5ea9094f86415d02bd1f1a746808513bbd47ea5766') + +prepare() { + cd "$srcdir" + + gendesk -n \ + --pkgname "$pkgname" \ + --pkgdesc "$pkgdesc" \ + --genericname 'Video converter' \ + --categories 'AudioVideo;AudioVideoEditing;GTK' +} + +build() { + cd "$srcdir/$pkgname" + + lazbuild --lazarusdir=/usr/lib/lazarus winff.lpr --ws=gtk2 +} + +package() { + cd "$srcdir" + + install -Dm755 "$srcdir/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" + install -dm755 "$pkgdir/usr/share/winff/" + find . -name "*.xml" \ + -exec install -Dm644 {} "$pkgdir/usr/share/winff/" \; &> /dev/null + install -Dm644 "$srcdir/winff.desktop" \ + "$pkgdir/usr/share/applications/winff.desktop" + install -Dm644 "$srcdir/$pkgname/winff-icons/48x48/winff.png" \ + "$pkgdir/usr/share/pixmaps/winff.png" + for size in 16x16 24x24 32x32 48x48; do + install -Dm644 "$srcdir/$pkgname/winff-icons/$size/winff.png" \ + "$pkgdir/usr/share/icons/hicolor/$size/apps/winff.png" + done + install -dm755 "$pkgdir/usr/share/winff/languages/" + find . -name "*.po" \ + -exec install -Dm644 {} "$pkgdir/usr/share/winff/languages/" \; &> /dev/null + rm -f "$srcdir/$pkgname/presets.xml" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/winff/winff.install b/community/winff/winff.install new file mode 100644 index 000000000..92e6750ef --- /dev/null +++ b/community/winff/winff.install @@ -0,0 +1,14 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/wxgtk2.9/PKGBUILD b/community/wxgtk2.9/PKGBUILD index a90bb4f4e..330ba6f87 100644 --- a/community/wxgtk2.9/PKGBUILD +++ b/community/wxgtk2.9/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 90109 2013-05-06 19:40:09Z foutrelis $ +# $Id: PKGBUILD 93329 2013-07-02 01:23:14Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=wxgtk2.9 pkgver=2.9.4 -pkgrel=3 +pkgrel=4 pkgdesc="GTK+ implementation of wxWidgets API for GUI" arch=('i686' 'x86_64' 'mips64el') url="http://wxwidgets.org" license=('custom:wxWindows') depends=('gtk2' 'gstreamer0.10-base') -makedepends=('gstreamer0.10-base-plugins' 'gconf') +makedepends=('gstreamer0.10-base-plugins' 'gconf' 'webkitgtk2') +optdepends=('webkitgtk2: for webview support') source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch) sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1' 'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3') @@ -22,7 +23,7 @@ prepare() { build() { cd wxWidgets-${pkgver} ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \ + --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \ --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ --disable-precomp-headers make diff --git a/community/xjadeo/PKGBUILD b/community/xjadeo/PKGBUILD new file mode 100644 index 000000000..f90e2f9b7 --- /dev/null +++ b/community/xjadeo/PKGBUILD @@ -0,0 +1,42 @@ +# $Id: PKGBUILD 93274 2013-07-01 02:54:17Z speps $ +# Maintainer : speps <speps at aur dot archlinux dot org> + +pkgname=xjadeo +pkgver=0.7.3 +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') +makedepends=('qt4') +optdepends=('qt4: for the GUI (qjadeo)') +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + "qjadeo.desktop") +install="$pkgname.install" +md5sums=('b5a67f7a8a8279f37ac681f40d6cbc10' + '315e2ab44ce3edf4068ff6db48942908') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ + --enable-qtgui \ + --with-qt4prefix=/usr/lib/qt4 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + # rc file + install -Dm644 doc/xjadeorc "$pkgdir/etc/xjadeorc" + + # desktop file + install -Dm644 ../qjadeo.desktop \ + "$pkgdir/usr/share/applications/qjadeo.desktop" + + # icon + install -Dm644 doc/xjadeo.png \ + "$pkgdir/usr/share/pixmaps/qjadeo.png" +} diff --git a/community/xjadeo/qjadeo.desktop b/community/xjadeo/qjadeo.desktop new file mode 100644 index 000000000..4d68949f6 --- /dev/null +++ b/community/xjadeo/qjadeo.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Exec=qjadeo +Type=Application +Terminal=false +Name=QJadeo +Comment=QJadeo Jack Video Player +Categories=AudioVideo; +Icon=qjadeo
\ No newline at end of file diff --git a/community/xjadeo/xjadeo.install b/community/xjadeo/xjadeo.install new file mode 100644 index 000000000..29a708b66 --- /dev/null +++ b/community/xjadeo/xjadeo.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_install() { + post_install +} + +post_remove() { + post_install +} diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index ccd6b5de5..2e0bbc52d 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -3,7 +3,7 @@ pkgname='cronie' pkgver=1.4.9 -pkgrel=4 +pkgrel=5 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -14,31 +14,25 @@ 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" - 'cron.deny' 'service' - 'pam.d') + 'pam.d' + 'deny') sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' - '0f279b8fb820340267d578dc85511c980715f91e' - 'de455f11a310e64d6930390e57726ed70f3295d0' - '5eff7fb31f6bc0a924243ff046704726cf20c221') + 'eb8ed1e22dbe9c02075fe4bbe925b6eeb9954649' + '5eff7fb31f6bc0a924243ff046704726cf20c221' + '0f279b8fb820340267d578dc85511c980715f91e') -backup=('etc/anacrontab' - 'etc/conf.d/crond' +backup=('etc/cron.deny' 'etc/pam.d/crond' - 'etc/cron.deny') + 'etc/cron.d/0hourly' + 'etc/anacrontab') conflicts=('cron') provides=('cron') groups=('base') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed 's:usr/sbin:usr/bin:g' -i contrib/0anacron -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -60,11 +54,10 @@ package() { install -d "${pkgdir}"/var/spool/{ana,}cron install -d "${pkgdir}"/etc/cron.{d,hourly,daily,weekly,monthly} + install -Dm644 ../deny "${pkgdir}"/etc/cron.deny install -Dm644 ../pam.d "${pkgdir}"/etc/pam.d/crond - install -Dm644 ../cron.deny "${pkgdir}"/etc/cron.deny install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/cronie.service - install -Dm644 crond.sysconfig "${pkgdir}"/etc/conf.d/crond install -Dm644 contrib/anacrontab "${pkgdir}"/etc/anacrontab install -Dm644 contrib/0hourly "${pkgdir}"/etc/cron.d/0hourly install -Dm755 contrib/0anacron "${pkgdir}"/etc/cron.hourly/0anacron diff --git a/core/cronie/cron.deny b/core/cronie/deny index 06e685cc8..06e685cc8 100644 --- a/core/cronie/cron.deny +++ b/core/cronie/deny diff --git a/core/cronie/service b/core/cronie/service index cc671f7b6..84145251c 100644 --- a/core/cronie/service +++ b/core/cronie/service @@ -3,7 +3,7 @@ Description=Periodic Command Scheduler [Service] ExecStart=/usr/bin/crond -n -ExecReload=/bin/kill -HUP $MAINPID +ExecReload=/usr/bin/kill -HUP $MAINPID KillMode=process Restart=always diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index a8089f496..8c980e783 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 182802 2013-04-15 12:46:55Z dreisner $ +# $Id: PKGBUILD 188993 2013-06-28 01:14:19Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,17 +6,18 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.30.0 +pkgver=7.31.0 pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') +provides=('libcurl.so') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) -md5sums=('60bb6ff558415b73ba2f00163fd307c5' +md5sums=('6f26843f7e3a2fb06e02f68a55efe8c7' 'SKIP' '751bd433ede935c8fae727377625a8ae') diff --git a/core/ed/PKGBUILD b/core/ed/PKGBUILD index b96a06cfb..8067b6faa 100644 --- a/core/ed/PKGBUILD +++ b/core/ed/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187025 2013-06-03 11:15:04Z allan $ +# $Id: PKGBUILD 189480 2013-07-03 11:36:49Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=ed -pkgver=1.8 -pkgrel=2 +pkgver=1.9 +pkgrel=1 pkgdesc="A POSIX-compliant line-oriented text editor" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -13,7 +13,7 @@ depends=('glibc' 'sh') options=('!emptydirs') source=("ftp://ftp.gnu.org/gnu/ed/$pkgname-$pkgver.tar.gz"{,.sig}) install='ed.install' -md5sums=('2268d2344b3c52d23730acb2e3c942fe' +md5sums=('565b6d1d5a9a8816b9b304fc4ed9405d' 'SKIP') build() { diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index 3a94e7e06..7b546ece3 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182768 2013-04-15 01:13:42Z allan $ +# $Id: PKGBUILD 188940 2013-06-26 05:31:47Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl -pkgver=0.11.2 +pkgver=0.12 pkgrel=1 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ depends=('gmp') license=('MIT') options=('!libtool') source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) -md5sums=('c40daa17d2995d1c98a0c1aca607541f') +md5sums=('eaa1968dda763f12dc84e45a892cd428') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,7 +29,7 @@ package() { make -j1 DESTDIR="$pkgdir/" install install -dm755 $pkgdir/usr/share/gdb/auto-load/usr/lib/ - mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.1.2-gdb.py + mv $pkgdir/{,/usr/share/gdb/auto-load/}usr/lib/libisl.so.10.2.0-gdb.py install -Dm644 LICENSE $pkgdir/usr/share/licenses/isl/LICENSE } diff --git a/core/make/PKGBUILD b/core/make/PKGBUILD index cbc6f77c1..9d6a8660a 100644 --- a/core/make/PKGBUILD +++ b/core/make/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166683 2012-09-15 15:22:53Z allan $ +# $Id: PKGBUILD 189479 2013-07-03 10:09:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=make pkgver=3.82 -pkgrel=5 +pkgrel=6 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/make" @@ -20,15 +20,14 @@ source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} make-3.82-expensive_glob.patch make-3.82-dont-prune-intermediate.patch) md5sums=('1a11100f3c63fcf5753818e59d63088f' - 'c78daf24f4ec5900c8f81e89a6e1cd5a' - 'c8f496b22191f9fb9420ab14c1a19a47' + 'SKIP' + '8714ba22911a58ab3eb42ac3f4c6c3bd' '662e6450e19a5acdaa5c9fcb8ad78dea' '7d01a99f389d8f08dec93ed479071ee4' 'bc12ad4d0c6e6c0e72d9fb61054f446b' 'e58d4211c5b29d7d927a304d082849e7' '45ac9e987f4bf16c0d7e1685db943917') - build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/make/make-3.82-bug30612.patch b/core/make/make-3.82-bug30612.patch index fb843bcd9..9867a15b2 100644 --- a/core/make/make-3.82-bug30612.patch +++ b/core/make/make-3.82-bug30612.patch @@ -1,4 +1,3 @@ -diff -Naur make-3.82-orig/main.c make-3.82-fix30612//main.c --- make-3.82-orig/main.c 2010-07-19 17:10:53.000000000 +1000 +++ make-3.82-fix30612//main.c 2010-09-23 23:33:37.908855839 +1000 @@ -1,3 +1,4 @@ @@ -64,3 +63,29 @@ diff -Naur make-3.82-orig/read.c make-3.82-fix30612//read.c /* Find and set the new end. Massage names if necessary. */ while (1) +diff --git make-3.82-orig/read.c make-3.82-fix30612/read.c +index c87d4a7..b012094 100644 +--- make-3.82-orig/read.c ++++ make-3.82-fix30612/read.c +@@ -3044,16 +3044,16 @@ parse_file_seq (char **stringp, unsigned int size, int stopchar, + nlen -= (n + 1) - tp; + tp = n + 1; + +- /* If we have just "lib(", part of something like +- "lib( a b)", go to the next item. */ +- if (! nlen) +- continue; +- + /* We can stop looking now. */ + break; + } + } + while (*e != '\0'); ++ ++ /* If we have just "lib(", part of something like "lib( a b)", ++ go to the next item. */ ++ if (! nlen) ++ continue; + } + } + diff --git a/core/man-db/PKGBUILD b/core/man-db/PKGBUILD index 304458770..e2671a68f 100644 --- a/core/man-db/PKGBUILD +++ b/core/man-db/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186047 2013-05-20 18:28:50Z andyrtr $ +# $Id: PKGBUILD 189192 2013-06-29 06:03:40Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> pkgname=man-db -pkgver=2.6.3 -pkgrel=3 +pkgver=2.6.5 +pkgrel=1 pkgdesc="A utility for reading man pages" arch=('i686' 'x86_64' 'mips64el') url="http://www.nongnu.org/man-db/" @@ -21,7 +21,7 @@ install=${pkgname}.install source=(http://savannah.nongnu.org/download/man-db/$pkgname-$pkgver.tar.xz{,.sig} convert-mans man-db.cron.daily) options=('!libtool') -md5sums=('a593a095599ae97bcacf8d038659a146' +md5sums=('36f59d9314b45a266ba350584b4d7cc1' 'SKIP' '2b7662a7d5b33fe91f9f3e034361a2f6' '934fd047fecb915038bf4bf844ea609c') diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index 158f407f1..3cd906d29 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186686 2013-05-30 13:43:55Z bisson $ +# $Id: PKGBUILD 188912 2013-06-25 10:40:52Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng pkgver=3.3.8 -pkgrel=1 +pkgrel=2 pkgdesc='Utilities for monitoring your system and its processes' url='http://gitorious.org/procps' license=('GPL' 'LGPL') @@ -15,7 +15,7 @@ backup=('etc/sysctl.conf') source=("${pkgname}-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver}" 'sysctl.conf') sha1sums=('63aed46ba4b5b05698beb25d2aa3eee6779d7f45' - '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53') + 'bc4e929a0ddcdcd627e8d15d30abcf185aa33fab') conflicts=('procps') provides=('procps') diff --git a/core/procps-ng/sysctl.conf b/core/procps-ng/sysctl.conf index 4695cdd92..fae2c6082 100644 --- a/core/procps-ng/sysctl.conf +++ b/core/procps-ng/sysctl.conf @@ -36,6 +36,3 @@ net.ipv6.conf.all.forwarding = 0 # Reboot 600 seconds after kernel panic or oops. #kernel.panic_on_oops = 1 #kernel.panic = 600 - -# Disable SysRq key to avoid console security issues. -kernel.sysrq = 0 diff --git a/extra/ardour/PKGBUILD b/extra/ardour/PKGBUILD index 1bc3eb9ec..877faf646 100644 --- a/extra/ardour/PKGBUILD +++ b/extra/ardour/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 182614 2013-04-11 09:00:27Z schiv $ +# $Id: PKGBUILD 189213 2013-06-29 15:55:30Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: see .contrib pkgname=ardour _pkgname=Ardour3 -pkgver=3.1 +pkgver=3.2 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64' 'mips64el') @@ -15,9 +15,9 @@ depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') install=$pkgname.install -source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.bz2" +source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2" "$pkgname.desktop") -md5sums=('6291ee6e6519a801a6c7255eb005895f' +md5sums=('17028a3106f870cd62f6a60930a28590' '316bd21ece5e2208a104fd09cac521af') prepare() { diff --git a/extra/ardour/ardour.install b/extra/ardour/ardour.install index 555d7377d..78d8f7734 100644 --- a/extra/ardour/ardour.install +++ b/extra/ardour/ardour.install @@ -3,6 +3,11 @@ post_install() { > Ardour 3 has support for native "Linux" VSTs. You may want to export > LXVST_PATH to include any custom directories of *.so VST plug-ins. + > Ardour 3 also supports video (timeline and monitoring), but aside from + > xjadeo (AUR) the required external programs need to be retrieved from: + + http://x42.github.io/harvid/ + > Please consider supporting Paul Davis, lead developer of Ardour, by > either subscribing or at least donating to the project's cause: @@ -15,7 +20,21 @@ MSG } post_upgrade() { - post_install + 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, which + > is presently available in the AUR. It will be in our repositories soon. +MSG } # vim:set ts=2 sw=2 et: diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD index 65e47dd71..0e921fda8 100644 --- a/extra/audacious/PKGBUILD +++ b/extra/audacious/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 177006 2013-02-04 00:32:16Z bisson $ +# $Id: PKGBUILD 189207 2013-06-29 12:06:19Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=audacious -pkgver=3.3.4 +pkgver=3.4 pkgrel=1 pkgdesc='Lightweight, advanced audio player focused on audio quality' url='http://audacious-media-player.org/' @@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins' 'hicolor-icon-theme' 'desktop-file-utils') optdepends=('unzip-libre: zipped skins support') source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('d1050fb88a59b46c0c9bbb1af0e7efc2b02f2b4d') +sha1sums=('2a40e41a8689e90456ce1f7aeabb6a49c1b2f385') provides=('audacious-player') replaces=('audacious-player') diff --git a/extra/cfitsio/PKGBUILD b/extra/cfitsio/PKGBUILD index 58d6e2d16..6c8c45481 100644 --- a/extra/cfitsio/PKGBUILD +++ b/extra/cfitsio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 180514 2013-03-22 13:00:52Z andrea $ +# $Id: PKGBUILD 189244 2013-07-01 10:04:11Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=cfitsio -pkgver=3.340 +pkgver=3.350 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') @@ -13,7 +13,7 @@ license=('custom') depends=('glibc') options=('!libtool') source=("ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${pkgname}${pkgver/./}.tar.gz") -md5sums=('99210838af46b7bf2d945ccbb05e3ad3') +md5sums=('3e61f17731fe8db503b1b39873e4a8c4') build() { cd ${pkgname} diff --git a/extra/clutter-gtk/PKGBUILD b/extra/clutter-gtk/PKGBUILD index 7ef5204a5..69e11f31c 100644 --- a/extra/clutter-gtk/PKGBUILD +++ b/extra/clutter-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183341 2013-04-21 22:08:42Z heftig $ +# $Id: PKGBUILD 189249 2013-07-01 11:24:00Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=clutter-gtk pkgver=1.4.4 -pkgrel=1 +pkgrel=2 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64' 'mips64el') url="http://clutter-project.org/" @@ -11,8 +11,15 @@ options=('!libtool') license=('LGPL') depends=('clutter' 'gtk3') makedepends=('gobject-introspection') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch) +sha256sums=('bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e' + '45e86e364756d6ac86c646ee1bcab6c9b94316673963e0b83b1140d9c4978bef') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 -i ../dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch +} build() { cd $pkgname-$pkgver diff --git a/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch new file mode 100644 index 000000000..e3eb8ce13 --- /dev/null +++ b/extra/clutter-gtk/dont-use-clutter_x11_set_use_argb_visual-on-non-X11.patch @@ -0,0 +1,29 @@ +From 6b1093d903f4605dcb974a3b299ed47f3e15edc1 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera <hadess@hadess.net> +Date: Wed, 27 Mar 2013 11:08:46 +0000 +Subject: util: Don't use clutter_x11_set_use_argb_visual() on non-X11 + +We shouldn't be running this on non-X11 windowing systems. + +https://bugzilla.gnome.org/show_bug.cgi?id=696687 +--- +diff --git a/clutter-gtk/gtk-clutter-util.c b/clutter-gtk/gtk-clutter-util.c +index 38e3ced..d4a9fa5 100644 +--- a/clutter-gtk/gtk-clutter-util.c ++++ b/clutter-gtk/gtk-clutter-util.c +@@ -249,8 +249,11 @@ gtk_clutter_init_with_args (int *argc, + return CLUTTER_INIT_SUCCESS; + + #if defined(CLUTTER_WINDOWING_X11) +- /* enable ARGB visuals by default for Clutter */ +- clutter_x11_set_use_argb_visual (TRUE); ++ if (clutter_check_windowing_backend (CLUTTER_WINDOWING_X11)) ++ { ++ /* enable ARGB visuals by default for Clutter */ ++ clutter_x11_set_use_argb_visual (TRUE); ++ } + #endif + + /* we let gtk+ open the display */ +-- +cgit v0.9.2 diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD index 1f01a480d..3998489f2 100644 --- a/extra/colord/PKGBUILD +++ b/extra/colord/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185329 2013-05-13 11:18:43Z heftig $ +# $Id: PKGBUILD 188955 2013-06-27 04:04:12Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Ionut Biru <ibiru@archlinux.org> pkgname=colord -pkgver=1.0.0 +pkgver=1.0.1 pkgrel=1 pkgdesc="System daemon for managing color devices" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') install=colord.install backup=(etc/colord.conf) source=($url/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('a01547080f0905dacca37c5ded3886431144a36a') +sha1sums=('d480eb23a3de67cab090c810c894cc68069a278d') build() { cd $pkgname-$pkgver diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index 0c74200e2..841c951ac 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188728 2013-06-18 15:46:35Z andyrtr $ +# $Id: PKGBUILD 188926 2013-06-25 16:51:14Z 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.3 +pkgver=2.2.4 pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') @@ -24,7 +24,7 @@ options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.tmpfilesd) -md5sums=('306664f09560d2c6515ba80e1dd7f353' +md5sums=('984cfc921a83c580c52c86e128e9dac2' 'SKIP' '342a28251d40f983c98c0d1f1bf3d07d') diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 9ccf17eb3..b09cf7948 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166543 2012-09-10 09:44:48Z stephane $ +# $Id: PKGBUILD 189328 2013-07-03 01:24:05Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> @@ -20,21 +20,26 @@ sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b' 'fcd0ebd029b305bf030983daf151a2a1ab5294af' '8a8be7c0686c6311c1ce969ba10494e704ead48c') +prepare() { + cd ${pkgname}-${pkgver} + patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch + sed -i -e 's:-Werror::g' $(find -name Makefile.in) +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} CFLAGS+=" -g" # required for test-suite success - patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch ./configure --prefix=/usr --program-prefix="eu-" make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} [ "$CARCH" = "mips64el" ] && return 0 # Known to fail, no benefit from running. make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD deleted file mode 100644 index 6a4b8e41c..000000000 --- a/extra/freenx/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# $Id: PKGBUILD 174925 2013-01-09 04:17:20Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -#Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=freenx -pkgver=0.7.3 -pkgrel=15 -pkgdesc="Free Software (GPL) Implementation of the NX Server" -arch=(i686 x86_64 'mips64el') -url="http://freenx.berlios.de" -license=('GPL') -depends=('nx-common' 'nx-x11>=3.5.0.17' 'nxagent' 'nxproxy' 'netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' - 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') -optdepends=('cups: adds printing support') -makedepends=('imake') -options=('!makeflags') -conflicts=('nxserver') -provides=('nxserver') -backup=(etc/nxserver/node.conf) -install=freenx.install -source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz - keymap.patch - nxagent-startup.patch - freenx-latest-svn.patch - remove-dialog.patch - freenx-server-0.7.3-nxipp.patch) -md5sums=('856f597e139018f7ed62713c9d6c9ed5' - 'f0867659c925f6363fb2b7661f349248' - '30dc16d8e2093ff71d5834a169ad9d00' - '788f30322783cf2c2dc833e2e4d5e8ad' - 'cae1773312506eeefe6a8de07c492bd8' - 'b3244c52a6bafc6d9b528eb4d4426e36') - -build() { - # patch and install nxserver - cd $srcdir/$pkgname-server-$pkgver - # add latest svn fixes - patch -Np3 -i ../freenx-latest-svn.patch - # patch from inside nx - patch < gentoo-nomachine.diff - # patch broken keymap remapping - patch -Np0 -i ${srcdir}/keymap.patch - # patch nxagent startup to avoid login issues - patch -Np0 -i ${srcdir}/nxagent-startup.patch - # check for cups existance and then symlinks the backend - patch -Np1 -i ${srcdir}/freenx-server-0.7.3-nxipp.patch - # remove broken dialog function - patch -Np0 -i ${srcdir}/remove-dialog.patch - sed -i -e 's,authorized_keys2,authorized_keys,g' nxloadconfig - sed -i -e 's,\/usr\/NX,\/usr\/lib/nx,g' nxloadconfig node.conf.sample - sed -i -e "s:NX_DIR\/lib:NX_DIR\/X11:" nxloadconfig - sed -i -e 's,netcat,nc,g' nxloadconfig - sed -i -e 's/utmp/nx/g' nxsetup - sed -i -e 's,/usr/X11R6/bin/xauth,/usr/bin/xauth,g' nxloadconfig - sed -i -e 's,COMMAND_FOOMATIC="/usr/lib/cups/driver/foomatic-ppdfile",COMMAND_FOOMATIC="/usr/bin/foomatic-ppdfile",g' nxloadconfig - sed -i -e 's,COMMAND_MD5SUM="openssl md5",COMMAND_MD5SUM="md5sum",g' nxloadconfig node.conf.sample - sed -i -e 's|AGENT_EXTRA_OPTIONS_X=""|AGENT_EXTRA_OPTIONS_X="-co /usr/share/X11/rgb -fp /usr/share/fonts/misc,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/TTF,/usr/share/fonts/Type1 -xkbdir /usr/share/X11/xkb"|g' nxloadconfig - sed -i -e 's/ENABLE_AUTORECONNECT_BEFORE_140="1"/ENABLE_AUTORECONNECT_BEFORE_140="0"/g' nxloadconfig - sed -i -e 's,/etc/init.d/ssh,/etc/rc.d/sshd,g' nxsetup - sed -i -e 's,libXcomp.so,libXcomp.so.3,g' nxloadconfig - sed -i -e 's,libXcompext.so,libXcompext.so.3,g' nxloadconfig - sed -i -e 's,libXrender.so.1.2,libXrender.so.1.2.2:$APPLICATION_LIBRARY_PATH/libXcompsh.so.3:$APPLICATION_LIBRARY_PATH/libXcompshad.so.3,g' nxloadconfig - sed -i -e 's:NX_ETC_DIR\=$NX_DIR\/etc:NX_ETC_DIR=\/etc\/nxserver:g' nxloadconfig - sed -i -e 's:NX_SESS_DIR=$NX_DIR\/var\/db:NX_SESS_DIR=\/var\/lib\/nxserver\/db:g' nxloadconfig - sed -i -e 's:NX_HOME_DIR=$NX_DIR:NX_HOME_DIR=\/var\/lib\/nxserver:g' nxloadconfig - sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample - sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog - - # python2 fix - sed -i -e 's:\/usr\/bin\/env\ python:\/usr\/bin\/env\ python2:' nx-session-launcher/nx-session-launcher - - # fix key generation - sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup - - make -} - -package() { - cd $srcdir/$pkgname-server-$pkgver - - make install DESTDIR="${pkgdir}" - - # create symlinks - install -dm755 ${pkgdir}/usr/bin - cd ${pkgdir}/usr/bin - for file in ${pkgdir}/usr/lib/nx/bin/*; do - ln -sv /usr/lib/nx/bin/`basename $file` . - done - - mv $pkgdir/etc/nxserver/node.conf.sample $pkgdir/etc/nxserver/node.conf - - # create some missing nxserver directories - mkdir -m700 -p $pkgdir/var/lib/nxserver/{home/nx,db} - mkdir -m700 -p $pkgdir/usr/lib/nx/share - - # remove files that are part of nxclient - rm -f ${pkgdir}/usr/lib/nx/bin/nxprint - rm -f ${pkgdir}/usr/bin/nxprint -} diff --git a/extra/freenx/freenx-latest-svn.patch b/extra/freenx/freenx-latest-svn.patch deleted file mode 100644 index bcc8ddd17..000000000 --- a/extra/freenx/freenx-latest-svn.patch +++ /dev/null @@ -1,288 +0,0 @@ -diff -ur freenx-server-0.7.3//ChangeLog ../trunk/freenx-server//ChangeLog ---- freenx-server-0.7.3//ChangeLog 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//ChangeLog 2011-01-26 23:23:36.850005855 +0100 -@@ -1,3 +1,20 @@ -+xx.11.2008 FreeNX 0.7.4 -+ * Opened the 0.7.4 development. -+ * Fixed missing export of NX_ETC_DIR in Makefile, -+ so node.conf.sample is installed correctly. -+ (fabianx@bat.berlios.de) -+ * Fixed broken round-robin load balance algorithm. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ load balancing case. -+ (fabianx@bat.berlios.de) -+ * Fixed --terminate|--suspend|--force-terminate for -+ usermode case. -+ (fabianx@bat.berlios.de) -+ * Fixed non-encrypted session mode. You might need to -+ set EXTERNAL_PROXY_IP in node.conf. -+ (fabianx@bat.berlios.de) -+ - 18.08.2008 FreeNX 0.7.3 "Priscilla One Year Edition" - * Opened the 0.7.3 development. - * Added logging of failed authentication attempts -diff -ur freenx-server-0.7.3//Makefile ../trunk/freenx-server//Makefile ---- freenx-server-0.7.3//Makefile 2008-08-18 04:16:25.000000000 +0200 -+++ ../trunk/freenx-server//Makefile 2011-01-26 23:23:36.856672521 +0100 -@@ -8,7 +8,7 @@ - all: - cd nxviewer-passwd && xmkmf && make Makefiles && make depend - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - for i in $(SUBDIRS) ; \ - do\ - echo "making" all "in $$i..."; \ -@@ -44,5 +44,5 @@ - - install: - source nxloadconfig &&\ -- export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION &&\ -+ export PATH_BIN PATH_LIB CUPS_BACKEND NX_VERSION NX_ETC_DIR &&\ - $(MAKE) nxenv_install -diff -ur freenx-server-0.7.3//node.conf.sample ../trunk/freenx-server//node.conf.sample ---- freenx-server-0.7.3//node.conf.sample 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//node.conf.sample 2011-01-26 23:23:36.850005855 +0100 -@@ -37,7 +37,7 @@ - # - # https://mail.kde.org/mailman/listinfo/freenx-knx - # --# SVN: $Id: node.conf.sample 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: node.conf.sample 613 2008-09-01 20:42:31Z fabianx $ - - ######################################################################### - # General FreeNX directives -@@ -47,6 +47,11 @@ - # different than the default hostname (as returned by `hostname`) - #SERVER_NAME="$(hostname)" - -+# The node ip which is used by NX Node in unecnrypted session mode. -+# Set it if you want to use a specific external ip or the autodetection -+# is not working. -+#EXTERNAL_PROXY_IP="" -+ - # The port number where local 'sshd' is listening. - #SSHD_PORT=22 - -diff -ur freenx-server-0.7.3//nxloadconfig ../trunk/freenx-server//nxloadconfig ---- freenx-server-0.7.3//nxloadconfig 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxloadconfig 2011-01-26 23:23:36.856672521 +0100 -@@ -5,7 +5,7 @@ - # - # License: GPL, version 2 - # --# SVN: $Id: nxloadconfig 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxloadconfig 613 2008-09-01 20:42:31Z fabianx $ - # - # ======================================================================== - -@@ -52,7 +52,7 @@ - # DO NOT TOUCH unless you REALLY know what you are doing - ######################################################################### - --NX_VERSION=3.2.0-73 -+NX_VERSION=3.2.0-74-SVN - NX_LICENSE="OS (GPL, using backend: %BACKEND%)" - - # Where can different nx components be found -@@ -85,6 +85,7 @@ - # General FreeNX directives - - SERVER_NAME="$(hostname)" -+EXTERNAL_PROXY_IP="" - SSHD_PORT=22 - - # Authentication / Security directives -diff -ur freenx-server-0.7.3//nxnode ../trunk/freenx-server//nxnode ---- freenx-server-0.7.3//nxnode 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxnode 2011-01-26 23:23:36.853339188 +0100 -@@ -13,7 +13,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxnode 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxnode 613 2008-09-01 20:42:31Z fabianx $ - # - # 21.06.2004: - Full reconnection support - -@@ -1184,6 +1184,17 @@ - [ -z "$userip" -a "$host" = "127.0.0.1" ] && userip="127.0.0.1" - [ -z "$userip" ] && userip="*" - fi -+ -+ # We need our own external IP -+ proxyip="$EXTERNAL_PROXY_IP" -+ -+ if [ -z "$proxyip" -a -n "$host" ] -+ then -+ [ "$host" = "127.0.0.1" ] && host=$(hostname) -+ proxyip=$(ping -c1 "$host" | grep 'PING' | cut -d'(' -f2 | cut -d')' -f1) -+ fi -+ -+ [ -z "$proxyip" ] && proxyip="127.0.0.1" - - # ok, lets make the session dir first: - -@@ -1316,7 +1327,7 @@ - NX> 705 Session display: $display - NX> 703 Session type: $type - NX> 701 Proxy cookie: $proxy_cookie --NX> 702 Proxy IP: $userip -+NX> 702 Proxy IP: $proxyip - NX> 706 Agent cookie: $cookie - NX> 704 Session cache: $type - NX> 707 SSL tunneling: $ssl_tunnel -diff -ur freenx-server-0.7.3//nxserver ../trunk/freenx-server//nxserver ---- freenx-server-0.7.3//nxserver 2008-08-22 02:44:43.000000000 +0200 -+++ ../trunk/freenx-server//nxserver 2011-01-26 23:23:36.856672521 +0100 -@@ -11,7 +11,7 @@ - # - # License: GNU GPL, version 2 - # --# SVN: $Id: nxserver 580 2008-08-22 00:44:43Z fabianx $ -+# SVN: $Id: nxserver 612 2008-08-25 03:28:15Z fabianx $ - # - - # Read the config file -@@ -1192,7 +1192,7 @@ - # Lock held - - SERVER_LB_NR=$(cat $NX_SESS_DIR/round-robin 2>/dev/null) -- let SERVER_LB_NR=(SERVER_LB_NR+1) % SERVER_LB_NR_OF_HOSTS -+ let SERVER_LB_NR=(SERVER_LB_NR+1)%SERVER_LB_NR_OF_HOSTS - echo $SERVER_LB_NR >$NX_SESS_DIR/round-robin - - # Exit critical section -@@ -1961,71 +1961,71 @@ - session_history "$user" "$sessid" - } - --cmd_terminate() -+cmd_execute() - { -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- for i in $CMD_PARAMS; -+ cmd_host="$1" -+ cmd_user="$2" -+ cmd_cmd="$3" -+ -+ if [ "$ENABLE_USERMODE_AUTHENTICATION" = "1" ] -+ then -+ sh -c "$cmd_cmd" -+ elif [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ then -+ su - "$cmd_user" -c "$cmd_cmd" -+ else -+ ssh "$cmd_host" su - "$cmd_user" -c "'$cmd_cmd'" -+ fi -+} -+ -+cmd_terminate_or_send() -+{ -+ CMD="$1" -+ -+ if [ "$CMD" = "--broadcast" ] -+ then -+ CMD_PARAMS=$(session_find_all) -+ [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -+ else -+ CMD_PARAMS=$(cmd_parse_3_params "$2") -+ [ -z "$CMD_PARAMS" ] && exit 1 -+ shift -+ fi -+ shift -+ -+ for i in $CMD_PARAMS - do - CMDLINE=$(session_get_cmdline $i) - cmd_sessionid=$(getparam sessionId) -+ cmd_display=$(getparam display) - cmd_user=$(getparam userName) - cmd_type=$(getparam type) - cmd_status=$(getparam status) -+ cmd_host=$(getparam host) - - # is it a "good" session? -- case "$1" in -+ case "$CMD" in - --suspend) - if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --suspend" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --suspend" - fi - ;; - --terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - ;; - --force-terminate) -- echo "sessionid=$cmd_sessionid" | su - "$cmd_user" -c "$PATH_BIN/nxnode --terminate" -+ echo "sessionid=$cmd_sessionid" | cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxnode --terminate" - session_close $cmd_sessionid - ;; -- esac -- done -- --} -- --cmd_send() --{ -- if [ "$1" = "--broadcast" ] -- then -- CMD_PARAMS=$(session_find_all) -- [ -z "$CMD_PARAMS" ] && cmd_abort "Error: No running session could be found." -- else -- CMD_PARAMS=$(cmd_parse_3_params "$2") -- [ -z "$CMD_PARAMS" ] && exit 1 -- shift -- fi -- shift -- for i in $CMD_PARAMS; -- do -- CMDLINE=$(session_get_cmdline $i) -- cmd_display=$(getparam display) -- cmd_user=$(getparam userName) -- cmd_type=$(getparam type) -- cmd_status=$(getparam status) -- cmd_host=$(getparam host) -- -- # is it a "good" session? -- if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" -- then -- if [ "$cmd_host" = "127.0.0.1" -o "$cmd_host" = "localhost" ] -+ --send|--broadcast) -+ # is it a "good" session? -+ if [ "$cmd_status" = "Running" ] && stringinstring "unix-" "$cmd_type" - then -- su - "$cmd_user" -c "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" -- else -- ssh $cmd_host su - "$cmd_user" -c "'$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &'" -+ cmd_execute "$cmd_host" "$cmd_user" "$PATH_BIN/nxdialog --dialog ok --caption \"NX Administrator Message\" --message \"$@\" -display \":$cmd_display\" &" - fi -- fi -+ esac - done -- #nxnode_start --send "$CMD_PARAMS" - } - - # -@@ -2099,13 +2099,13 @@ - cmd_history "$@" - ;; - --terminate|--suspend|--force-terminate) -- cmd_terminate "$@" -+ cmd_terminate_or_send "$@" - ;; - --cleanup) -- cmd_terminate "--force-terminate" "*" -+ cmd_terminate_or_send "--force-terminate" "*" - ;; - --send|--broadcast) -- cmd_send "$@" -+ cmd_terminate_or_send "$@" - ;; - *) - cmd_abort "Error: Function $CMD not implemented yet." diff --git a/extra/freenx/freenx-server-0.7.3-nxipp.patch b/extra/freenx/freenx-server-0.7.3-nxipp.patch deleted file mode 100644 index 81b286593..000000000 --- a/extra/freenx/freenx-server-0.7.3-nxipp.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up freenx-server-0.7.3/nxsetup~ freenx-server-0.7.3/nxsetup ---- freenx-server-0.7.3/nxsetup~ 2011-12-30 23:04:53.515194711 +0200 -+++ freenx-server-0.7.3/nxsetup 2011-12-30 23:05:55.499954085 +0200 -@@ -366,11 +366,10 @@ EOF - - echo "done" - -- if [ -d "$CUPS_BACKEND" ] -+ if [ -d "$CUPS_BACKEND" ] && [ ! -f "$CUPS_IPP_BACKEND" ] - then - echo -n "Setting up cups nxipp backend ..." -- cp -af "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" -- chmod 755 "$CUPS_IPP_BACKEND" -+ ln -sf "$CUPS_BACKEND/ipp" "$CUPS_IPP_BACKEND" - echo "done" - fi - } diff --git a/extra/freenx/freenx.install b/extra/freenx/freenx.install deleted file mode 100644 index 0f3260166..000000000 --- a/extra/freenx/freenx.install +++ /dev/null @@ -1,59 +0,0 @@ -post_install() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo 'Generating keys ...' - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - echo "ATTENTION FREENX:" - echo "For correct setup please take a look at the wiki:" - echo "http://wiki.archlinux.org/index.php/FreeNX" -} - -post_upgrade() { - # Make sure the group and user "nx" exists on this system and have the correct values - if grep -q "^nx:" /etc/group &> /dev/null ; then - groupmod -g 85 -n nx nx &> /dev/null - else - groupadd -g 85 nx &> /dev/null - fi - - if grep -q "^nx:" /etc/passwd 2> /dev/null ; then - usermod -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx nx &> /dev/null - else - useradd -s /usr/bin/nxserver -c "NX user" -d /var/lib/nxserver/home/nx -u 85 -g nx -r nx &> /dev/null - fi - - # setting up freenx - echo "Rerunning nxsetup ..." - /usr/lib/nx/bin/nxsetup --install 2>&1 >/dev/null - - if [ "`vercmp $2 0.7.3-10.1`" -lt 0 ]; then - # important upgrade notice - echo "*** config file location has been moved ***" - echo "Please apply your local settings from /opt/NX/etc/node.conf.pacsave" - echo "into /etc/nxserver/node.conf. A new key set is required." - echo "Please copy to your clients the new client key:" - echo "\"/var/lib/nxserver/home/nx/.ssh/client.id_dsa.key\"" - echo "When you have FreeNX server running clean up with \"rm -rf /opt/NX\"." - fi -} - -# arg 1: the old package version -pre_remove() { - /usr/lib/nx/bin/nxsetup --uninstall --purge 2>&1 >/dev/null -# usr/sbin/groupdel nx &>/dev/null - userdel nx &> /dev/null - groupdel nx &> /dev/null || /bin/true -} diff --git a/extra/freenx/keymap.patch b/extra/freenx/keymap.patch deleted file mode 100644 index a0bb678e4..000000000 --- a/extra/freenx/keymap.patch +++ /dev/null @@ -1,32 +0,0 @@ -=== modified file 'nxnode' ---- nxnode 2009-01-14 04:22:40 +0000 -+++ nxnode 2009-01-14 04:24:02 +0000 -@@ -555,7 +555,8 @@ - - # Start the agent - -- PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ #PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $P $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $K $G $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & -+ PATH="$PATH_BIN:$PATH" $PATH_BIN/nxagent $R -name "NX - $user@$SERVER_NAME:$display - $session (GPL Edition)" -option "$USER_FAKE_HOME/.nx/C-$sess_id/options" $B $FP $AGENT_EXTRA_OPTIONS_X :$display 2>&3 & - fi - - # -@@ -1094,6 +1095,8 @@ - # Rootless fix from 2x nxserver 1.5.0 - realtype=$type - [ "$type" = "unix-application" -o "$type" = "unix-default" ] && realtype="unix-desktop" -+ [ "$type" = "unix-gnome" ] && realtype="gnome" -+ [ "$type" = "unix-kde" ] && realtype="kde" - - # NX 2.1.0 file-sharing port options - client=$(getparam client) -@@ -1272,7 +1275,7 @@ - umask 0077 - - cat << EOF > "$USER_FAKE_HOME/.nx/C-$sess_id/options" --${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype,cleanup=0,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${clipboard:+,clipboard=$clipboard}${menu:+,menu=$menu}:$display -+nx/nx,${keyboard:+keyboard=$keyboard,}${kbtype:+kbtype=$kbtype,}${kbload:+kbload=$kbload,}${keymap:+keymap=$keymap,}${geometry:+geometry=$geometry,}${client:+client=$client,}${resize:+resize=$resize,}${CACHE}${IMAGES}${PACK}link=$link,nodelay=$nodelay,type=$realtype${clipboard:+,clipboard=$clipboard}${composite:+composite=$composite},cleanup=0,product=LFE/None/LFEN/None,shmem=1,${backingstore:+backingstore=$backingstore,}shpix=1,${ACCEPT}cookie=$proxy_cookie,id=$sess_id,samba=$samba,media=$media${sync:+,sync=$sync}${cups:+,cups=$cups}${keybd:+,keybd=$keybd}${aux:+,aux=$aux}${http:+,http=$http}${rdpcolors:+,rdpcolors=$rdpcolors}${rdpcache:+,rdpcache=$rdpcache}${fullscreen:+,fullscreen=1}${menu:+,menu=$menu}:$display - EOF - umask $OLD_UMASK - #samba=$samba, - diff --git a/extra/freenx/nxagent-startup.patch b/extra/freenx/nxagent-startup.patch deleted file mode 100644 index e3c5497c1..000000000 --- a/extra/freenx/nxagent-startup.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- nxnode~ 2010-04-30 15:42:46.000000000 +0200 -+++ nxnode 2010-04-30 15:42:46.000000000 +0200 -@@ -328,6 +328,9 @@ - NODE_WM_PID=$! - fi - -+ # Patch - delay to allow nxagent to complete launching -+ sleep 4 -+ - echo "Xft.dpi: 96" | DISPLAY=:$display xrdb -merge >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - [ -d /etc/X11/Xresources ] && xrdb -display :$display -merge /etc/X11/Xresources/* >>"$USER_FAKE_HOME/.nx/C-$sess_id/session" 2>&1 - diff --git a/extra/freenx/remove-dialog.patch b/extra/freenx/remove-dialog.patch deleted file mode 100644 index 054f1f6c4..000000000 --- a/extra/freenx/remove-dialog.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- nxdialog~ 2011-02-01 09:05:28.993333438 +0100 -+++ nxdialog 2011-02-01 09:05:29.010000106 +0100 -@@ -85,29 +85,6 @@ - then - dialog_interface="xdialog" - DIALOG=/usr/bin/Xdialog # just in case that we have no good path --elif [ -x /usr/bin/dialog ] --then -- #JJK: Added 'dialog_interface=dialog' option because Xdialog not standard -- #JJK: on some distros such as Fedora and xmessage won't handle long -- #JJK: lists of ppd files while the combination of 'dialog' and 'xterm' -- #JJK: should be present on most setups. -- -- dialog_interface="dialog" -- DIALOG=/usr/bin/dialog -- if [ -z "$NXCLIENT_FIRST_TIME" ] -- then -- # Run only once in case of subdialogs. Capture result in tempfile -- TMPFILE=$(mktemp /tmp/nxclient.XXXXX) -- export NXCLIENT_FIRST_TIME=1 -- -- xterm -geometry 120x24+100+100 +sb -title "NXclient" -e \ -- /bin/bash -c "$DIALOG --infobox 'Please wait...' 3 25; $0 $INPUTS | tee $TMPFILE" || exit 1 -- -- #Need to recover the last line output (and not remove non-printing chars, because --stdout is used) -- tail -1 $TMPFILE -- rm -f $TMPFILE -- exit 0 -- fi - else - dialog_interface="xmessage" - xmessage=$(which xmessage 2>/dev/null) diff --git a/extra/freetype2/PKGBUILD b/extra/freetype2/PKGBUILD index f6fe3449e..e6f2bfad4 100644 --- a/extra/freetype2/PKGBUILD +++ b/extra/freetype2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185748 2013-05-18 10:42:24Z andyrtr $ +# $Id: PKGBUILD 188918 2013-06-25 14:14:01Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=freetype2 -pkgver=2.4.12 +pkgver=2.5.0.1 pkgrel=1 pkgdesc="TrueType font rendering library" arch=(i686 x86_64 'mips64el') @@ -11,18 +11,32 @@ url="http://freetype.sourceforge.net" depends=('zlib' 'bzip2' 'sh') options=('!libtool') 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.2.1-enable-valid.patch) -md5sums=('3463102764315eb86c0d3c2e1f3ffb7d' + freetype-2.4.11-enable-sph.patch) +md5sums=('c72e9010b1d986d556fc0b2b5fcbf31a' + '214119610444c9b02766ccee5e220680' '816dc8619a6904a7385769433c0a8653' - '214119610444c9b02766ccee5e220680') + '2422f8902224fedb46ae9eec08c8ceac') -build() { +prepare() { cd "${srcdir}/freetype-${pkgver}" - patch -Np1 -i "${srcdir}/freetype-2.3.0-enable-spr.patch" patch -Np1 -i "${srcdir}/freetype-2.2.1-enable-valid.patch" + patch -Np1 -i "${srcdir}/freetype-2.3.0-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" +} + +build() { + cd "${srcdir}/freetype-${pkgver}" + + # PNG support is useless if FT_CONFIG_OPTION_USE_PNG is disabled + ./configure --prefix=/usr --disable-static \ + --without-png - ./configure --prefix=/usr make } diff --git a/extra/freetype2/freetype-2.4.11-enable-sph.patch b/extra/freetype2/freetype-2.4.11-enable-sph.patch new file mode 100644 index 000000000..34c8d63bf --- /dev/null +++ b/extra/freetype2/freetype-2.4.11-enable-sph.patch @@ -0,0 +1,13 @@ +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 + /* This option requires TT_CONFIG_OPTION_BYTECODE_INTERPRETER to be */ + /* defined. */ + /* */ +-/* #define TT_CONFIG_OPTION_SUBPIXEL_HINTING */ ++#define TT_CONFIG_OPTION_SUBPIXEL_HINTING + + + /*************************************************************************/ diff --git a/extra/gedit/PKGBUILD b/extra/gedit/PKGBUILD index 1e7fc883c..b8552eba1 100644 --- a/extra/gedit/PKGBUILD +++ b/extra/gedit/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 185365 2013-05-13 17:49:32Z heftig $ +# $Id: PKGBUILD 188910 2013-06-25 07:42:51Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gedit -pkgver=3.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="A text editor for GNOME" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ options=('!libtool' '!emptydirs') url="http://www.gnome.org" install=gedit.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('1b7450cb194d4dadb7a82635d0e7f92da2b65a8487341e0410b676d9f33e19d2') +sha256sums=('dfbc2d9cf975b247c6a6b8bd1ae1b72d8e8a1f862f5f3d084a404853092cf9d3') build() { cd $pkgname-$pkgver diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD index 7d14e7a82..fb5089c9a 100644 --- a/extra/giflib/PKGBUILD +++ b/extra/giflib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187002 2013-06-03 07:04:28Z bpiotrowski $ +# $Id: PKGBUILD 189261 2013-07-01 19:08:45Z bpiotrowski $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com> # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com> @@ -6,7 +6,7 @@ pkgname=giflib pkgver=4.2.1 -pkgrel=2 +pkgrel=3 pkgdesc="A library for reading and writing gif images" url="http://sourceforge.net/projects/giflib/" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/giflib/${pkgname}-${pkgver}.tar.bz2 giflib-4.2.1-quantize.patch) md5sums=('bbd3324af24156d5d7e66ab1cee8508d' - '67e46b344340ac10f4f597d772679f23') + '26174405ba886a89b8a4db18fe653a99') prepare() { cd ${pkgname}-${pkgver} diff --git a/extra/giflib/giflib-4.2.1-quantize.patch b/extra/giflib/giflib-4.2.1-quantize.patch index 197f88b77..f6745d2c0 100644 --- a/extra/giflib/giflib-4.2.1-quantize.patch +++ b/extra/giflib/giflib-4.2.1-quantize.patch @@ -1,39 +1,39 @@ -diff -up giflib-4.2.1/lib/Makefile.in.quantize giflib-4.2.1/lib/Makefile.in ---- giflib-4.2.1/lib/Makefile.in.quantize 2012-10-09 00:37:59.000000000 -0300 -+++ giflib-4.2.1/lib/Makefile.in 2012-11-17 12:16:04.485736553 -0200 -@@ -77,7 +77,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" - LTLIBRARIES = $(lib_LTLIBRARIES) - libgif_la_DEPENDENCIES = - am_libgif_la_OBJECTS = dgif_lib.lo egif_lib.lo gif_font.lo gif_hash.lo \ -- gifalloc.lo gif_err.lo -+ gifalloc.lo gif_err.lo quantize.lo - libgif_la_OBJECTS = $(am_libgif_la_OBJECTS) - libgif_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -@@ -234,6 +234,7 @@ libgif_la_SOURCES = dgif_lib.c \ +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 \ -+ quantize.c \ - gif_lib_private.h +- gif_lib_private.h ++ gif_lib_private.h \ ++ quantize.c - libgif_la_LDFLAGS = -version-info @SHLIBVERSION@ -@@ -319,6 +320,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_font.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gif_hash.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gifalloc.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quantize.Plo@am__quote@ + 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); - .c.o: - @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h ---- giflib-4.2.1/lib/gif_lib.h.quantize 2012-10-09 00:36:32.000000000 -0300 -+++ giflib-4.2.1/lib/gif_lib.h 2012-11-17 12:16:04.488735917 -0200 -@@ -180,6 +180,15 @@ int DGifCloseFile(GifFileType * GifFile) - #define D_GIF_ERR_IMAGE_DEFECT 112 - #define D_GIF_ERR_EOF_TOO_SOON 113 -+/****************************************************************************** + /****************************************************************************** + * O.K., here are the routines from GIF_LIB file QUANTIZE.C. +******************************************************************************/ +int QuantizeBuffer(unsigned int Width, unsigned int Height, @@ -42,37 +42,29 @@ diff -up giflib-4.2.1/lib/gif_lib.h.quantize giflib-4.2.1/lib/gif_lib.h + GifByteType * OutputBuffer, + GifColorType * OutputColorMap); + - /* These are legacy. You probably do not want to call them directly */ - int DGifGetScreenDesc(GifFileType * GifFile); - int DGifGetRecordType(GifFileType * GifFile, GifRecordType * GifType); -diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c ---- giflib-4.2.1/lib/quantize.c.quantize 2012-11-17 12:17:44.741435334 -0200 -+++ giflib-4.2.1/lib/quantize.c 2012-11-17 12:16:04.491735283 -0200 -@@ -0,0 +1,332 @@ ++/****************************************************************************** + * 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 @@ +/***************************************************************************** -+ * "Gif-Lib" - Yet another gif library. + * -+ * Written by: Gershon Elber IBM PC Ver 0.1, Jun. 1989 -+ ****************************************************************************** -+ * Module to quatize 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. ++ * 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. ++ * + *****************************************************************************/ + -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#ifdef __MSDOS__ -+#include <dos.h> -+#include <alloc.h> -+#include <graphics.h> -+#endif /* __MSDOS__ */ -+ +#include <stdlib.h> +#include <stdio.h> +#include "gif_lib.h" @@ -80,20 +72,9 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + +#define ABS(x) ((x) > 0 ? (x) : (-(x))) + -+#define PROGRAM_NAME "giflib" -+ -+/* The colors are stripped to 5 bits per primary color if non MSDOS system -+ * or to 4 (not enough memory...) if MSDOS as first step. -+ */ -+#ifdef __MSDOS__ -+#define COLOR_ARRAY_SIZE 4096 -+#define BITS_PER_PRIM_COLOR 4 -+#define MAX_PRIM_COLOR 0x0f -+#else +#define COLOR_ARRAY_SIZE 32768 +#define BITS_PER_PRIM_COLOR 5 +#define MAX_PRIM_COLOR 0x1f -+#endif /* __MSDOS__ */ + +static int SortRGBAxis; + @@ -114,7 +95,7 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c +static int SubdivColorMap(NewColorMapType * NewColorSubdiv, + unsigned int ColorMapSize, + unsigned int *NewColorMapSize); -+static int SortCmpRtn(const VoidPtr Entry1, const VoidPtr Entry2); ++static int SortCmpRtn(const void *Entry1, const void *Entry2); + +/****************************************************************************** + * Quantize high resolution image into lower one. Input image consists of a @@ -226,10 +207,7 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + 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 @@ -375,30 +353,327 @@ diff -up giflib-4.2.1/lib/quantize.c.quantize giflib-4.2.1/lib/quantize.c + * Routine called by qsort to compare to entries. + ****************************************************************************/ +static int -+SortCmpRtn(const VoidPtr Entry1, -+ const VoidPtr Entry2) { ++SortCmpRtn(const void *Entry1, ++ const void *Entry2) { + + return (*((QuantizedColorType **) Entry1))->RGB[SortRGBAxis] - + (*((QuantizedColorType **) Entry2))->RGB[SortRGBAxis]; +} -diff -up giflib-4.2.1/util/rgb2gif.c.quantize giflib-4.2.1/util/rgb2gif.c ---- giflib-4.2.1/util/rgb2gif.c.quantize 2012-10-09 00:28:12.000000000 -0300 -+++ giflib-4.2.1/util/rgb2gif.c 2012-11-17 12:16:04.490735495 -0200 -@@ -129,7 +129,7 @@ static int SortCmpRtn(const void *Entry1 - * This function returns GIF_OK if succesfull, GIF_ERROR otherwise. - ******************************************************************************/ - static int --QuantizeBuffer(unsigned int Width, -+GifQuantizeBuffer(unsigned int Width, - unsigned int Height, - int *ColorMapSize, - GifByteType * RedInput, -@@ -428,7 +428,7 @@ int main(int argc, char **argv) - sizeof(GifByteType))) == NULL) - GIF_EXIT("Failed to allocate memory required, aborted."); ++ ++/* 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); -- if (QuantizeBuffer(Width, Height, &ColorMapSize, -+ if (GifQuantizeBuffer(Width, Height, &ColorMapSize, - RedBuffer, GreenBuffer, BlueBuffer, - OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) - QuitGifError(NULL); + /****************************************************************************** +- * 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/git/PKGBUILD b/extra/git/PKGBUILD index 8eeac789d..d0afe870f 100644 --- a/extra/git/PKGBUILD +++ b/extra/git/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188161 2013-06-10 22:30:55Z dan $ +# $Id: PKGBUILD 189217 2013-06-29 20:32:47Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=git -pkgver=1.8.3.1 +pkgver=1.8.3.2 pkgrel=1 pkgdesc="the fast distributed version control system" arch=(i686 x86_64 'mips64el') @@ -111,7 +111,7 @@ package() { install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket } -md5sums=('35401b410e7f248b13e35a1069aca2e2' - '3f801cc82a58c2c2ceeab95975114113' +md5sums=('83b792fd06066c77e1d4911ebba2d701' + 'f850829e1e7f32e388d2ffb61759fcc9' '042524f942785772d7bd52a1f02fe5ae' 'f67869315c2cc112e076f0c73f248002') diff --git a/extra/gmime/PKGBUILD b/extra/gmime/PKGBUILD index 246240e89..08415356b 100644 --- a/extra/gmime/PKGBUILD +++ b/extra/gmime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 178917 2013-02-28 18:49:48Z ioni $ +# $Id: PKGBUILD 189227 2013-06-30 19:58:41Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=gmime -pkgver=2.6.15 +pkgver=2.6.16 pkgrel=1 pkgdesc="Core mime parsing library" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('glib2' 'gpgme' 'zlib') [ "$CARCH" != "mips64el" ] && makedepends=('gtk-sharp-2') options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b4c2a0b99b82063387cd750a38421ebaa0636f339e67984a84371bcb697dc99a') +sha256sums=('1093c2c9b4644d53b9c2df30042b3c4c2e9141d3e65e299030d227485d95c8af') build() { # get rid of that .wapi errors in fakeroot diff --git a/extra/gnome-alsamixer/02_change_gconf-keys_path.diff b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff new file mode 100644 index 000000000..6df8bc903 --- /dev/null +++ b/extra/gnome-alsamixer/02_change_gconf-keys_path.diff @@ -0,0 +1,207 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_change_gconf-keys_path.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb@diwi.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace path to gnome-alsamixer's gconf keys + +@DPATCH@ + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider.c +@@ -481,7 +481,7 @@ + + disp_name = g_strndup (gam_slider_get_name (gam_slider), 8); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -508,7 +508,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -533,7 +533,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +@@ -557,7 +557,7 @@ + + priv = GAM_SLIDER_GET_PRIVATE (gam_slider); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_sliders/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_sliders/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_slider_get_config_name (gam_slider)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-toggle.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-toggle.c +@@ -410,7 +410,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -433,7 +433,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/toggle_display_names/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/toggle_display_names/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -458,7 +458,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +@@ -482,7 +482,7 @@ + + priv = GAM_TOGGLE_GET_PRIVATE (gam_toggle); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_toggles/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_toggles/%s-%s", + gam_mixer_get_config_name (GAM_MIXER (priv->mixer)), + gam_toggle_get_config_name (gam_toggle)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-app.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-app.c +@@ -331,7 +331,7 @@ + gam_app_load_prefs (gam_app); + + /*gconf_client_notify_add (priv->gconf_client, +- "/apps/PAW/gnomealsamixer/preferences/tab_position", ++ "/apps/gnomealsamixer/preferences/tab_position", + (GConfClientNotifyFunc) pawed_app_gconf_notify_func, + pawed_app, + NULL, +@@ -351,10 +351,10 @@ + priv = GAM_APP_GET_PRIVATE (gam_app); + + width = gconf_client_get_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_width", ++ "/apps/gnome-alsamixer/geometry/main_window_width", + NULL); + height = gconf_client_get_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_height", ++ "/apps/gnome-alsamixer/geometry/main_window_height", + NULL); + + if ((height != 0) && (width != 0)) +@@ -376,11 +376,11 @@ + gdk_window_get_geometry (GDK_WINDOW (GTK_WIDGET (gam_app)->window), NULL, NULL, &width, &height, NULL); + + gconf_client_set_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_height", ++ "/apps/gnome-alsamixer/geometry/main_window_height", + height, + NULL); + gconf_client_set_int (priv->gconf_client, +- "/apps/PAW/gnome-alsamixer/geometry/main_window_width", ++ "/apps/gnome-alsamixer/geometry/main_window_width", + width, + NULL); + +@@ -630,7 +630,7 @@ + gint + gam_app_get_mixer_slider_style (GamApp *gam_app) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style"; + gint style = 0; + + g_return_if_fail (GAM_IS_APP (gam_app)); +@@ -646,7 +646,7 @@ + void + gam_app_set_mixer_slider_style (GamApp *gam_app, gint style) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_style"; + + g_return_if_fail (GAM_IS_APP (gam_app)); + +@@ -661,7 +661,7 @@ + gint + gam_app_get_slider_toggle_style (GamApp *gam_app) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style"; + gint style = 1; + + g_return_if_fail (GAM_IS_APP (gam_app)); +@@ -677,7 +677,7 @@ + void + gam_app_set_slider_toggle_style (GamApp *gam_app, gint style) + { +- const gchar *key = "/apps/PAW/gnome-alsamixer/geometry/mixer_slider_toggle_style"; ++ const gchar *key = "/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style"; + + g_return_if_fail (GAM_IS_APP (gam_app)); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-slider-dual.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-slider-dual.c +@@ -446,7 +446,7 @@ + + priv = GAM_SLIDER_DUAL_GET_PRIVATE (gam_slider_dual); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/slider_locked/%s-%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/slider_locked/%s-%s", + gam_mixer_get_config_name (gam_slider_get_mixer (GAM_SLIDER (gam_slider_dual))), + gam_slider_get_config_name (GAM_SLIDER (gam_slider_dual))); + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/src/gam-mixer.c ++++ gnome-alsamixer-0.9.7.cvs20050822/src/gam-mixer.c +@@ -478,7 +478,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s", + gam_mixer_get_config_name (gam_mixer)); + + name = gconf_client_get_string (gam_app_get_gconf_client (GAM_APP (priv->app)), +@@ -500,7 +500,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_names/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_names/%s", + gam_mixer_get_config_name (gam_mixer)); + + gconf_client_set_string (gam_app_get_gconf_client (GAM_APP (priv->app)), +@@ -526,7 +526,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s", + gam_mixer_get_config_name (gam_mixer)); + + if (gconf_client_dir_exists (gam_app_get_gconf_client (GAM_APP (priv->app)), key, NULL)) +@@ -549,7 +549,7 @@ + + priv = GAM_MIXER_GET_PRIVATE (gam_mixer); + +- key = g_strdup_printf ("/apps/PAW/gnome-alsamixer/display_mixers/%s", ++ key = g_strdup_printf ("/apps/gnome-alsamixer/display_mixers/%s", + gam_mixer_get_config_name (gam_mixer)); + + gconf_client_set_bool (gam_app_get_gconf_client (GAM_APP (priv->app)), diff --git a/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff new file mode 100644 index 000000000..91630a6d3 --- /dev/null +++ b/extra/gnome-alsamixer/03_gnome-alsamixer.schemas.diff @@ -0,0 +1,174 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_gnome-alsamixer.schemas.dpatch.dpatch by Mohammed Adnène Trojette <adn+deb@diwi.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Intent to guess gnome-alsamixer.schemas + +@DPATCH@ + +--- gnome-alsamixer-0.9.7.cvs20050822.orig/gnome-alsamixer.schemas ++++ gnome-alsamixer-0.9.7.cvs20050822/gnome-alsamixer.schemas +@@ -0,0 +1,163 @@ ++<gconfschemafile> ++ <schemalist> ++ ++ <!-- Completion uris --> ++ ++ <!--schema> ++ <key>/schemas/apps/PAW/PAWed/preferences</key> ++ <applyto>/apps/PAW/PAWed/preferences</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type></type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnomealsamixer/preferences/tab_position</key> ++ <applyto>/apps/gnomealsamixer/preferences/tab_position</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema--> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/main_window_width</key> ++ <applyto>/apps/gnome-alsamixer/geometry/main_window_width</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default>600</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/main_window_height</key> ++ <applyto>/apps/gnome-alsamixer/geometry/main_window_height</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>int</type> ++ <default>380</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/mixer_slider_style</key> ++ <applyto>/apps/gnome-alsamixer/geometry/mixer_slider_style</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default>false</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style</key> ++ <applyto>/apps/gnome-alsamixer/geometry/mixer_slider_toggle_style</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default>true</default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <!--schema> ++ <key>/schemas/apps/gnome-alsamixer/display_names/%s</key> ++ <applyto>/apps/gnome-alsamixer/display_names/%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_mixers/%s</key> ++ <applyto>/apps/gnome-alsamixer/display_mixers/%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/slider_display_names/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/slider_display_names/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>string</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_sliders/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/display_sliders/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/slider_locked/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/slider_locked/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/toggle_display_names/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/toggle_display_names/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>string</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema> ++ ++ ++ <schema> ++ <key>/schemas/apps/gnome-alsamixer/display_toggles/%s-%s</key> ++ <applyto>/apps/gnome-alsamixer/display_toggles/%s-%s</applyto> ++ <owner>gnome-alsamixer</owner> ++ <type>bool</type> ++ <default></default> ++ <locale name="C"> ++ <short></short> ++ </locale> ++ </schema--> ++ ++ ++ </schemalist> ++</gconfschemafile> diff --git a/extra/gnome-alsamixer/04_ignore-delimiters.diff b/extra/gnome-alsamixer/04_ignore-delimiters.diff new file mode 100644 index 000000000..3e00e9205 --- /dev/null +++ b/extra/gnome-alsamixer/04_ignore-delimiters.diff @@ -0,0 +1,15 @@ +# Fixes: #400667 + +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.h 2008-01-04 00:43:39.000000000 +0100 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.h 2008-01-04 00:44:18.000000000 +0100 +@@ -26,7 +26,7 @@ + + G_BEGIN_DECLS + +-#define GAM_CONFIG_DELIMITERS " &()+/" ++#define GAM_CONFIG_DELIMITERS " &()+/," + + #define GAM_TYPE_APP (gam_app_get_type ()) + #define GAM_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAM_TYPE_APP, GamApp)) diff --git a/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch new file mode 100644 index 000000000..0a352867b --- /dev/null +++ b/extra/gnome-alsamixer/05-remove-G_CONST_RETURN.patch @@ -0,0 +1,111 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.c 2011-09-12 21:01:20.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.c 2011-09-12 21:02:41.000000000 +0200 +@@ -439,7 +439,7 @@ + NULL); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_mixer_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +@@ -451,7 +451,7 @@ + return priv->mixer_name; + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_mixer_get_config_name (GamMixer *gam_mixer) + { + GamMixerPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-mixer.h 2011-09-12 21:01:43.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-mixer.h 2011-09-12 21:03:36.000000000 +0200 +@@ -57,8 +57,8 @@ + GType gam_mixer_get_type (void) G_GNUC_CONST; + GtkWidget *gam_mixer_new (GamApp *gam_app, + const gchar *card_id); +-G_CONST_RETURN gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); +-G_CONST_RETURN gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_mixer_name (GamMixer *gam_mixer); ++const gchar *gam_mixer_get_config_name (GamMixer *gam_mixer); + gchar *gam_mixer_get_display_name (GamMixer *gam_mixer); + void gam_mixer_set_display_name (GamMixer *gam_mixer, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.c 2011-09-12 21:01:49.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.c 2011-09-12 21:03:47.000000000 +0200 +@@ -440,7 +440,7 @@ + g_signal_emit (gam_slider, signals[REFRESH], 0); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +@@ -452,7 +452,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_slider_get_config_name (GamSlider *gam_slider) + { + GamSliderPrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-slider.h 2011-09-12 21:01:28.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-slider.h 2011-09-12 21:03:13.000000000 +0200 +@@ -58,8 +58,8 @@ + #include "gam-mixer.h" + + GType gam_slider_get_type (void) G_GNUC_CONST; +-G_CONST_RETURN gchar *gam_slider_get_name (GamSlider *gam_slider); +-G_CONST_RETURN gchar *gam_slider_get_config_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_name (GamSlider *gam_slider); ++const gchar *gam_slider_get_config_name (GamSlider *gam_slider); + gchar *gam_slider_get_display_name (GamSlider *gam_slider); + void gam_slider_set_display_name (GamSlider *gam_slider, + const gchar *name); +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.c 2011-09-12 21:01:36.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.c 2011-09-12 21:03:26.000000000 +0200 +@@ -371,7 +371,7 @@ + internal_state); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +@@ -383,7 +383,7 @@ + return snd_mixer_selem_get_name (priv->elem); + } + +-G_CONST_RETURN gchar * ++const gchar * + gam_toggle_get_config_name (GamToggle *gam_toggle) + { + GamTogglePrivate *priv; +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-toggle.h 2011-09-12 21:01:55.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-toggle.h 2011-09-12 21:04:00.000000000 +0200 +@@ -55,8 +55,8 @@ + gboolean gam_toggle_get_state (GamToggle *gam_toggle); + void gam_toggle_set_state (GamToggle *gam_toggle, + gboolean state); +-G_CONST_RETURN gchar *gam_toggle_get_name (GamToggle *gam_toggle); +-G_CONST_RETURN gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_name (GamToggle *gam_toggle); ++const gchar *gam_toggle_get_config_name (GamToggle *gam_toggle); + gchar *gam_toggle_get_display_name (GamToggle *gam_toggle); + void gam_toggle_set_display_name (GamToggle *gam_toggle, + const gchar *name); diff --git a/extra/gnome-alsamixer/06-use-libgnome-headers.patch b/extra/gnome-alsamixer/06-use-libgnome-headers.patch new file mode 100644 index 000000000..5c431f02b --- /dev/null +++ b/extra/gnome-alsamixer/06-use-libgnome-headers.patch @@ -0,0 +1,26 @@ +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-main.c 2005-07-06 17:14:57.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-main.c 2011-10-26 02:47:47.000000000 +0200 +@@ -22,7 +22,7 @@ + #include <config.h> + #endif + +-#include <gnome.h> ++#include <libgnomeui/gnome-ui-init.h> + #include <glib/gi18n.h> + + #include "gam-app.h" +Index: gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c +=================================================================== +--- gnome-alsamixer-0.9.7~cvs.20060916.ds.1.orig/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 ++++ gnome-alsamixer-0.9.7~cvs.20060916.ds.1/src/gam-app.c 2011-10-26 02:47:21.000000000 +0200 +@@ -27,7 +27,7 @@ + #include <gtk/gtkmenuitem.h> + #include <glib/gi18n.h> + #include <libgnomeui/gnome-about.h> +-#include <libgnomeui/gnome-app-helper.h> ++/*#include <libgnomeui/gnome-app-helper.h>*/ + #include <libgnomeui/gnome-stock-icons.h> + + #include "gam-app.h" diff --git a/extra/gnome-alsamixer/PKGBUILD b/extra/gnome-alsamixer/PKGBUILD index b36e9d567..5afe3f74b 100644 --- a/extra/gnome-alsamixer/PKGBUILD +++ b/extra/gnome-alsamixer/PKGBUILD @@ -1,33 +1,50 @@ -# $Id: PKGBUILD 136003 2011-08-21 09:18:58Z eric $ +# $Id: PKGBUILD 189332 2013-07-03 05:25:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gnome-alsamixer -pkgver=0.9.6 -pkgrel=4 +pkgver=0.9.7 +pkgrel=1 pkgdesc="Gnome ALSA mixer" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/gnome-alsamixer" license=('GPL') depends=('libgnomeui') -source=(ftp://ftp.archlinux.org/other/gnome-alsamixer/${pkgname}-${pkgver}.tar.gz - gnome-alsamixer-0.9.6-gtk24.patch gnome-alsamixer.desktop) -md5sums=('387623cfeb079d78325eed2d6bc94251' - '82b95a0df43429da5098b4da883f6bd0' - 'c7dbc44207bede96e4fafc24a7c7beb3') -sha1sums=('faece601a4329d2b01b9efe65200021538fc066d' - 'b4e3b871676025600170ba54f59db4977b853c08' +options=('!emptydirs') +install=gnome-alsamixer.install +source=(https://launchpad.net/ubuntu/+archive/primary/+files/gnome-alsamixer_0.9.7~cvs.20060916.ds.1.orig.tar.gz + 02_change_gconf-keys_path.diff 03_gnome-alsamixer.schemas.diff 04_ignore-delimiters.diff + 05-remove-G_CONST_RETURN.patch 06-use-libgnome-headers.patch gnome-alsamixer.desktop) +sha1sums=('98e716cd14fe46cb9c77034de7558ef113da26f5' + 'ee7743abfc8d6005be6fcb0fb47b45e636db5fdc' + '6b3148bab4ed53bc9a0a123b33585cd81b138225' + 'd4a7f9a5868c5af52f9b3c7a146ae34ddc45adf7' + '6b19224d0346cf53b864333b191fa99fc8e7ebdc' + '2731a7ef249aac51eeab1717c645c995780f36a7' '31639f7932d088ca76a18c79839682be811f23d0') +prepare() { + cd ${pkgname}-${pkgver}~cvs.20060916 + patch -Np1 -i ../02_change_gconf-keys_path.diff + patch -Np1 -i ../03_gnome-alsamixer.schemas.diff + patch -Np1 -i ../04_ignore-delimiters.diff + patch -Np1 -i ../05-remove-G_CONST_RETURN.patch + patch -Np1 -i ../06-use-libgnome-headers.patch + + ln -sf /usr/share/automake-*/mkinstalldirs mkinstalldirs +} + build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/gnome-alsamixer-0.9.6-gtk24.patch" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var LIBS=-lm - make + cd ${pkgname}-${pkgver}~cvs.20060916 + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make MSGFMT_OPTS="-c" LIBS+="-lm" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/gnome-alsamixer.desktop" \ - "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + cd ${pkgname}-${pkgver}~cvs.20060916 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + install -D -m644 "${srcdir}/gnome-alsamixer.desktop" "${pkgdir}/usr/share/applications/gnome-alsamixer.desktop" + + install -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas + rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas } diff --git a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch b/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch deleted file mode 100644 index 9e5f4eeb1..000000000 --- a/extra/gnome-alsamixer/gnome-alsamixer-0.9.6-gtk24.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur gnome-alsamixer-0.9.6/src/Makefile.in gnome-alsamixer-0.9.6.new/src/Makefile.in ---- gnome-alsamixer-0.9.6/src/Makefile.in 2003-09-09 12:44:25.000000000 +0100 -+++ gnome-alsamixer-0.9.6.new/src/Makefile.in 2004-04-04 18:51:36.000000000 +0100 -@@ -86,10 +86,6 @@ - -DPACKAGE_DATA_DIR=\""$(datadir)/gnome-alsamixer"\" \ - -DPIXMAP_ICONDIR=\""$(datadir)/pixmaps/gnome-alsamixer"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -- -DG_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED \ -- -DGNOME_DISABLE_DEPRECATED \ - @PACKAGE_CFLAGS@ - - -Only in gnome-alsamixer-0.9.6.new/src: Makefile.in~ diff --git a/extra/gnome-alsamixer/gnome-alsamixer.install b/extra/gnome-alsamixer/gnome-alsamixer.install new file mode 100644 index 000000000..2787d5675 --- /dev/null +++ b/extra/gnome-alsamixer/gnome-alsamixer.install @@ -0,0 +1,19 @@ +pkgname=gnome-alsamixer + +post_install() { + gconfpkg --install ${pkgname} +} + +pre_upgrade() { + if [[ "$(vercmp $2 0.9.7)" -gt 0 ]]; then + pre_remove $1 + fi +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + gconfpkg --uninstall ${pkgname} +} diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index 35b067508..a9d5b9820 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187902 2013-06-07 22:40:58Z heftig $ +# $Id: PKGBUILD 189242 2013-07-01 09:11:00Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell pkgver=3.8.3 -pkgrel=1 +pkgrel=3 pkgdesc="The next generation GNOME Shell" arch=(i686 x86_64 mips64el) url="http://live.gnome.org/GnomeShell" @@ -19,15 +19,20 @@ options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz - nm-libexecdir.patch) + nm-libexecdir.patch + git-fixes.patch) sha256sums=('145724f21ead9dbe0c39d3ab468b39264c7aaf3f0fa5d152b295d905d8339c22' - 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607') + 'e5bb10ad2e5c3e0fde3d05babd1bfdda701e553e02d493f7e54cb7832ce7e607' + '3e08176d55c000eb88660349a4325e8134f4def66ef83efc7f45f0fb34a06e1c') prepare() { cd $pkgname-$pkgver # FS#30747 FS#32730 Problems due to libexecdir different from NM patch -Np1 -i ../nm-libexecdir.patch + + # Git fixes - up to 60225ef86d070a7999bd6cded43837ca87d3f24f + patch -Np1 -i ../git-fixes.patch } build() { diff --git a/extra/gnome-shell/git-fixes.patch b/extra/gnome-shell/git-fixes.patch new file mode 100644 index 000000000..989c881f0 --- /dev/null +++ b/extra/gnome-shell/git-fixes.patch @@ -0,0 +1,125 @@ +diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css +index 775b687..f4ea781 100644 +--- a/data/theme/gnome-shell.css ++++ b/data/theme/gnome-shell.css +@@ -2312,6 +2312,7 @@ StScrollBar StButton#vhandle:active { + font-weight: bold; + color: #666666; + padding-top: 1em; ++ padding-left: 2px; + } + + .login-dialog-not-listed-button:focus .login-dialog-not-listed-label, +diff --git a/js/gdm/util.js b/js/gdm/util.js +index 6075e66..cae3e1b 100644 +--- a/js/gdm/util.js ++++ b/js/gdm/util.js +@@ -164,6 +164,7 @@ const ShellUserVerifier = new Lang.Class({ + + answerQuery: function(serviceName, answer) { + if (!this._userVerifier.hasPendingMessages) { ++ this._clearMessageQueue(); + this._userVerifier.call_answer_query(serviceName, answer, this._cancellable, null); + } else { + let signalId = this._userVerifier.connect('no-more-messages', +diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js +index b07ea95..72bc010 100644 +--- a/js/ui/components/telepathyClient.js ++++ b/js/ui/components/telepathyClient.js +@@ -18,7 +18,7 @@ const Params = imports.misc.params; + const PopupMenu = imports.ui.popupMenu; + + // See Notification.appendMessage +-const SCROLLBACK_IMMEDIATE_TIME = 60; // 1 minute ++const SCROLLBACK_IMMEDIATE_TIME = 3 * 60; // 3 minutes + const SCROLLBACK_RECENT_TIME = 15 * 60; // 15 minutes + const SCROLLBACK_RECENT_LENGTH = 20; + const SCROLLBACK_IDLE_LENGTH = 5; +@@ -967,7 +967,8 @@ const ChatNotification = new Lang.Class({ + let timeLabel = this._append({ body: this._formatTimestamp(lastMessageDate), + group: 'meta', + styles: ['chat-meta-message'], +- childProps: { expand: true, x_fill: false }, ++ childProps: { expand: true, x_fill: false, ++ x_align: St.Align.END }, + noTimestamp: true, + timestamp: lastMessageTime }); + +diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js +index d322581..ed61bf7 100644 +--- a/js/ui/endSessionDialog.js ++++ b/js/ui/endSessionDialog.js +@@ -420,6 +420,7 @@ const EndSessionDialog = new Lang.Class({ + _startTimer: function() { + let startTime = GLib.get_monotonic_time(); + this._secondsLeft = this._totalSecondsToStayOpen; ++ this._updateDescription(); + + this._timerId = Mainloop.timeout_add_seconds(1, Lang.bind(this, + function() { +diff --git a/js/ui/layout.js b/js/ui/layout.js +index 0bb887e..e25b3bd 100644 +--- a/js/ui/layout.js ++++ b/js/ui/layout.js +@@ -728,6 +728,8 @@ const LayoutManager = new Lang.Class({ + // and shown otherwise) + addChrome: function(actor, params) { + this.uiGroup.add_actor(actor); ++ if (this.uiGroup.contains(global.top_window_group)) ++ this.uiGroup.set_child_below_sibling(actor, global.top_window_group); + this._trackActor(actor, params); + }, + +diff --git a/js/ui/osdWindow.js b/js/ui/osdWindow.js +index 7e7b536..7fa052e 100644 +--- a/js/ui/osdWindow.js ++++ b/js/ui/osdWindow.js +@@ -167,14 +167,17 @@ const OsdWindow = new Lang.Class({ + { opacity: 0, + time: FADE_TIME, + transition: 'easeOutQuad', +- onComplete: Lang.bind(this, this._reset) }); ++ onComplete: Lang.bind(this, function() { ++ this._reset(); ++ Meta.enable_unredirect_for_screen(global.screen); ++ }) ++ }); + }, + + _reset: function() { + this.actor.hide(); + this.setLabel(null); + this.setLevel(null); +- Meta.enable_unredirect_for_screen(global.screen); + }, + + _monitorsChanged: function() { +diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js +index fe9cd31..4264f01 100644 +--- a/js/ui/screenShield.js ++++ b/js/ui/screenShield.js +@@ -709,6 +709,8 @@ const ScreenShield = new Lang.Class({ + }, + + _onDragEnd: function(action, actor, eventX, eventY, modifiers) { ++ if (this._lockScreenState != MessageTray.State.HIDING) ++ return; + if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) { + // Complete motion automatically + let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0); +diff --git a/src/st/st-widget.c b/src/st/st-widget.c +index 42992ec..4875acc 100644 +--- a/src/st/st-widget.c ++++ b/src/st/st-widget.c +@@ -608,8 +608,9 @@ st_widget_get_theme_node (StWidget *widget) + + if (stage == NULL) + { +- g_error ("st_widget_get_theme_node called on the widget %s which is not in the stage.", +- st_describe_actor (CLUTTER_ACTOR (widget))); ++ g_critical ("st_widget_get_theme_node called on the widget %s which is not in the stage.", ++ st_describe_actor (CLUTTER_ACTOR (widget))); ++ return g_object_new (ST_TYPE_THEME_NODE, NULL); + } + + if (parent_node == NULL) diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index 52c40c691..40b638520 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 186380 2013-05-26 09:24:31Z bluewind $ +# $Id: PKGBUILD 188945 2013-06-26 11:13:30Z foutrelis $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.2 -pkgrel=2 +pkgver=1.12.3 +pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnome.org/projects/gnumeric/" license=('GPL') depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils' - 'gobject-introspection' 'optipng') + 'gobject-introspection') optdepends=('python2-gobject: for python plugin support' 'perl: for perl plugin support' 'psiconv: for Psion 5 file support' @@ -19,27 +19,19 @@ optdepends=('python2-gobject: for python plugin support' install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz - gnumeric-1.12.1-automake-1.13.patch revert-warnings.patch) -sha256sums=('d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874' - '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275' +sha256sums=('b332e6785077a2e7febf26a6ccac73e9ae1813c365bc3bf851fb27a5477713a6' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch patch -Np0 -i ../revert-warnings.patch # Remove invalid mime type. (FS#26338) sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in autoreconf -fi - - # Fix invalid PNG images to work with libpng 1.6 - # https://bugzilla.gnome.org/show_bug.cgi?id=699683 - # XXX: PNGs have been fixed upsteam; remove when gnumeric 1.12.3 is out - find -name '*.png' -exec optipng -quiet -force -fix {} + } build() { diff --git a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch b/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch deleted file mode 100644 index 1ae1fb955..000000000 --- a/extra/gnumeric/gnumeric-1.12.1-automake-1.13.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -up gnumeric-1.12.0/test/Makefile.am.automake-1_13 gnumeric-1.12.0/test/Makefile.am ---- gnumeric-1.12.0/test/Makefile.am.automake-1_13 2011-05-18 02:54:24.000000000 +0200 -+++ gnumeric-1.12.0/test/Makefile.am 2013-01-05 18:25:56.380686587 +0100 -@@ -25,7 +25,99 @@ - # - # 90xx: Misc stuff. - --TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl)) -+TESTS = \ -+t1000-statfuns.pl \ -+t1001-mathfuns.pl \ -+t1002-finfuns.pl \ -+t1003-engfuns.pl \ -+t1004-textfuns.pl \ -+t1005-logfuns.pl \ -+t1006-datefuns.pl \ -+t1007-dbfuns.pl \ -+t1008-infofuns.pl \ -+t1009-lookfuns.pl \ -+t1010-bitwise.pl \ -+t1011-yalta2008.pl \ -+t1100-chitest.pl \ -+t1101-ftest.pl \ -+t1102-ttest.pl \ -+t1103-sumif.pl \ -+t1104-linest.pl \ -+t1800-operators.pl \ -+t1900-array.pl \ -+t1901-regress.pl \ -+t1902-array-intersection.pl \ -+t2000-names-insdel.pl \ -+t2001-func-help.pl \ -+t2002-nonascii-numbers.pl \ -+t2003-random-generators.pl \ -+t2800-style-optimizer.pl \ -+t5900-sc.pl \ -+t5901-qpro.pl \ -+t5902-applix.pl \ -+t5903-sylk.pl \ -+t5904-mps.pl \ -+t6000-statfuns.pl \ -+t6001-mathfuns.pl \ -+t6002-objs.pl \ -+t6003-lookfuns.pl \ -+t6004-chart-tests.pl \ -+t6004-finfuns.pl \ -+t6100-statfuns-ods.pl \ -+t6101-mathfuns-ods.pl \ -+t6102-objs-ods.pl \ -+t6103-lookfuns-ods.pl \ -+t6104-finfuns-ods.pl \ -+t7000-goal-seek.pl \ -+t7100-solver-blend.pl \ -+t7101-solver-afiro.pl \ -+t7110-solver-Misra1a.pl \ -+t7111-solver-Chwirut2.pl \ -+t7112-solver-Chwirut1.pl \ -+t7113-solver-Lanczos3.pl \ -+t7114-solver-Gauss1.pl \ -+t7115-solver-Gauss2.pl \ -+t7116-solver-DanWood.pl \ -+t7117-solver-Misra1b.pl \ -+t7120-solver-Kirby2.pl \ -+t7121-solver-Hahn1.pl \ -+t7122-solver-Nelson.pl \ -+t7123-solver-MGH17.pl \ -+t7124-solver-Lanczos1.pl \ -+t7125-solver-Lanczos2.pl \ -+t7126-solver-Gauss3.pl \ -+t7127-solver-Misra1c.pl \ -+t7128-solver-Misra1d.pl \ -+t7129-solver-Roszman1.pl \ -+t7130-solver-ENSO.pl \ -+t7140-solver-MGH09.pl \ -+t7141-solver-Thurber.pl \ -+t7142-solver-BoxBOD.pl \ -+t7143-solver-Rat42.pl \ -+t7144-solver-MGH10.pl \ -+t7145-solver-Eckerle4.pl \ -+t7146-solver-Rat43.pl \ -+t7147-solver-Bennett5.pl \ -+t8000-valgrind.pl \ -+t8001-valgrind-xls.pl \ -+t8002-valgrind-gnumeric.pl \ -+t8003-valgrind-pdf.pl \ -+t8004-valgrind-xls-macro.pl \ -+t8005-valgrind-chart-fit.pl \ -+t8050-valgrind-sstest.pl \ -+t8100-null-false.pl \ -+t8101-gfree.pl \ -+t8102-glade-visible.pl \ -+t8103-gtk.pl \ -+t8104-glade-parsing.pl \ -+t8200-gslice1.pl \ -+t8201-gslice2.pl \ -+t8202-gslice3.pl \ -+t9000-ssindex.pl \ -+t9100-number-match.pl \ -+t9999-epilogue.pl -+ -+ - SUPPS = common.supp gui.supp t8003-valgrind-pdf.supp - - import-db: diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index 644bd459e..33cf7a38b 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 183875 2013-04-29 09:27:35Z jgc $ +# $Id: PKGBUILD 188943 2013-06-26 11:06:57Z foutrelis $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.2 +pkgver=0.10.3 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('7d38769a7af655c0f0373738c786318734400d71b6bbc8d1ce6b6de99bb95674') +sha256sums=('1fd0048b25f7687eede9b0a8d712922113995db74a095bf43ad150d01b236bf2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gtkmm/PKGBUILD b/extra/gtkmm/PKGBUILD index c9c4b3225..be91b660a 100644 --- a/extra/gtkmm/PKGBUILD +++ b/extra/gtkmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 185348 2013-05-13 15:46:57Z jgc $ +# $Id: PKGBUILD 189082 2013-06-28 13:55:25Z lcarlier $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtkmm pkgname=('gtkmm' 'gtkmm-docs') -pkgver=2.24.3 +pkgver=2.24.4 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('gtk2' 'pangomm' 'atkmm' 'glibmm-docs') license=('LGPL') options=('!libtool' '!emptydirs') -url="http://gtkmm.sourceforge.net/" +url="http://www.gtkmm.org/" source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgbase}/2.24/${pkgbase}-${pkgver}.tar.xz) -sha256sums=('c564a438677174b97d69dd70467cb03c933481006398dc9377417aa6abe02a39') +sha256sums=('443a2ff3fcb42a915609f1779000390c640a6d7fd19ad8816e6161053696f5ee') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/gvfs/PKGBUILD b/extra/gvfs/PKGBUILD index 384f2d116..6c06f1cb0 100644 --- a/extra/gvfs/PKGBUILD +++ b/extra/gvfs/PKGBUILD @@ -1,20 +1,28 @@ -# $Id: PKGBUILD 188470 2013-06-14 19:24:13Z heftig $ +# $Id: PKGBUILD 189282 2013-07-02 08:23:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gvfs pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp' 'gvfs-goa' 'gvfs-mtp') pkgver=1.16.3 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('avahi' 'bluez-libs' 'dbus-glib' 'fuse' 'intltool' 'libarchive' 'libcdio-paranoia' 'libgphoto2' 'libimobiledevice' 'libsoup>=2.24.0' 'smbclient' 'udisks2' 'libsecret' 'docbook-xsl' 'gtk3' 'libmtp' 'gnome-online-accounts' 'libbluray') url="http://www.gnome.org" options=(!libtool) -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz) -sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz + imobiledevice-1.1.5.patch) +sha256sums=('02a4483d0dd2e307f58f8e1d34dd29dbe06d3a345b73ac8d6f87bb91189c8e49' + '3faf3027ef40c5cea3f01cb9d37e4cf848ed2ecfe6cde3b7bf86087da4a2d2e1') + +prepare() { + cd $pkgbase-$pkgver + patch -Np1 -i ../imobiledevice-1.1.5.patch +} build() { cd "$pkgbase-$pkgver" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --libexecdir=/usr/lib/gvfs \ diff --git a/extra/gvfs/imobiledevice-1.1.5.patch b/extra/gvfs/imobiledevice-1.1.5.patch new file mode 100644 index 000000000..00e9358dc --- /dev/null +++ b/extra/gvfs/imobiledevice-1.1.5.patch @@ -0,0 +1,221 @@ +From d71c6108901460842de25012d5ece727a0c70d27 Mon Sep 17 00:00:00 2001 +From: Ondrej Holy <oholy@redhat.com> +Date: Tue, 11 Jun 2013 11:33:23 +0000 +Subject: afc: Update to libimobiledevice new api + +https://bugzilla.redhat.com/show_bug.cgi?id=951731 +https://bugzilla.gnome.org/show_bug.cgi?id=702577 +--- +diff --git a/configure.ac b/configure.ac +index 12dbdcd..2846d82 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -372,14 +372,11 @@ AFC_LIBS= + AFC_CFLAGS= + + if test "x$enable_afc" != "xno" ; then +- PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.0 libplist >= 0.15, msg_afc=yes) ++ PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.5 libplist >= 0.15, msg_afc=yes) + + if test "x$msg_afc" = "xyes"; then + PKG_CHECK_MODULES(AFC, libimobiledevice-1.0 libplist) + AC_DEFINE(HAVE_AFC, 1, [Define to 1 if AFC is going to be built]) +- PKG_CHECK_EXISTS(libimobiledevice-1.0 >= 1.1.2, +- [AC_DEFINE(HAVE_LIBIMOBILEDEVICE_1_1_2, 1, +- [Define to 1 if libimobiledevice-1.1.2 found])]) + fi + fi + +diff --git a/daemon/gvfsbackendafc.c b/daemon/gvfsbackendafc.c +index ab4a9ce..6b0b64f 100644 +--- a/daemon/gvfsbackendafc.c ++++ b/daemon/gvfsbackendafc.c +@@ -349,12 +349,7 @@ _idevice_event_cb (const idevice_event_t *event, void *user_data) + if (event->event != IDEVICE_DEVICE_REMOVE) + return; + +-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2 + event_udid = event->udid; +-#else +- event_udid = event->uuid; +-#endif +- + if (g_str_equal (event_udid, afc_backend->uuid) == FALSE) + return; + +@@ -401,7 +396,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + const char *str; + char *tmp; + char *display_name = NULL; +- guint16 port; ++ lockdownd_service_descriptor_t lockdown_service = NULL; + int virtual_port; + GMountSpec *real_spec; + GVfsBackendAfc *self; +@@ -414,6 +409,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + char **dcim_afcinfo; + plist_t value; + lockdownd_error_t lerr; ++ afc_error_t aerr; + const gchar *choices[] = {_("Try again"), _("Cancel"), NULL}; /* keep in sync with the enum above */ + gboolean aborted = FALSE; + gchar *message = NULL; +@@ -649,41 +645,38 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + + switch (self->mode) { + case ACCESS_MODE_AFC: +- lerr = lockdownd_start_service (lockdown_cli, self->service, &port); ++ lerr = lockdownd_start_service (lockdown_cli, self->service, &lockdown_service); + if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job)))) + { + goto out_destroy_lockdown; + } +- if (G_UNLIKELY(g_vfs_backend_afc_check (afc_client_new (self->dev, +- port, &self->afc_cli), +- G_VFS_JOB(job)))) ++ aerr = afc_client_new (self->dev, lockdown_service, &self->afc_cli); ++ if (G_UNLIKELY(g_vfs_backend_afc_check (aerr, G_VFS_JOB(job)))) + { + goto out_destroy_lockdown; + } + break; + case ACCESS_MODE_HOUSE_ARREST: +- lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &port); ++ lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.installation_proxy", &lockdown_service); + if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job)))) + { + g_warning ("couldn't start inst proxy"); + goto out_destroy_lockdown; + } +- if (G_UNLIKELY(g_vfs_backend_inst_check (instproxy_client_new (self->dev, +- port, &self->inst), +- G_VFS_JOB(job)))) ++ aerr = instproxy_client_new (self->dev, lockdown_service, &self->inst); ++ if (G_UNLIKELY(g_vfs_backend_inst_check (aerr, G_VFS_JOB(job)))) + { + g_warning ("couldn't create inst proxy instance"); + goto out_destroy_lockdown; + } +- lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &port); ++ lerr = lockdownd_start_service (lockdown_cli, "com.apple.springboardservices", &lockdown_service); + if (G_UNLIKELY(g_vfs_backend_lockdownd_check (lerr, G_VFS_JOB(job)))) + { + g_warning ("couldn't start SBServices proxy"); + goto out_destroy_lockdown; + } +- if (G_UNLIKELY(g_vfs_backend_sbs_check (sbservices_client_new (self->dev, +- port, &self->sbs), +- G_VFS_JOB(job)))) ++ aerr = sbservices_client_new (self->dev, lockdown_service, &self->sbs); ++ if (G_UNLIKELY(g_vfs_backend_sbs_check (aerr, G_VFS_JOB(job)))) + { + g_warning ("couldn't create SBServices proxy instance"); + goto out_destroy_lockdown; +@@ -705,6 +698,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + + /* lockdown connection is not needed anymore */ + lockdownd_client_free (lockdown_cli); ++ lockdownd_service_descriptor_free (lockdown_service); + + /* Add camera item if necessary */ + if (self->mode == ACCESS_MODE_AFC) +@@ -723,6 +717,7 @@ g_vfs_backend_afc_mount (GVfsBackend *backend, + + out_destroy_lockdown: + lockdownd_client_free (lockdown_cli); ++ lockdownd_service_descriptor_free (lockdown_service); + + out_destroy_dev: + idevice_free (self->dev); +@@ -794,10 +789,11 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self, + { + AppInfo *info; + lockdownd_client_t lockdown_cli; +- guint16 port; ++ lockdownd_service_descriptor_t lockdown_service = NULL; + house_arrest_client_t house_arrest; + afc_client_t afc; + plist_t dict, error; ++ lockdownd_error_t lerr; + + info = g_hash_table_lookup (self->apps, id); + +@@ -812,7 +808,8 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self, + g_warning ("Failed to get a lockdown to start house arrest for app %s", info->id); + return; + } +- if (lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS) ++ lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service); ++ if (lerr != LOCKDOWN_E_SUCCESS) + { + lockdownd_client_free (lockdown_cli); + g_warning ("Failed to start house arrest for app %s", info->id); +@@ -820,14 +817,17 @@ g_vfs_backend_setup_afc_for_app (GVfsBackendAfc *self, + } + + house_arrest = NULL; +- house_arrest_client_new (self->dev, port, &house_arrest); ++ house_arrest_client_new (self->dev, lockdown_service, &house_arrest); + if (house_arrest == NULL) + { + g_warning ("Failed to start house arrest for app %s", info->id); + lockdownd_client_free (lockdown_cli); ++ lockdownd_service_descriptor_free (lockdown_service); + return; + } + ++ lockdownd_service_descriptor_free (lockdown_service); ++ + dict = NULL; + if (house_arrest_send_command (house_arrest, "VendContainer", info->id) != HOUSE_ARREST_E_SUCCESS || + house_arrest_get_result (house_arrest, &dict) != HOUSE_ARREST_E_SUCCESS) +diff --git a/monitor/afc/afcvolume.c b/monitor/afc/afcvolume.c +index 9829077..b7284b0 100644 +--- a/monitor/afc/afcvolume.c ++++ b/monitor/afc/afcvolume.c +@@ -80,6 +80,8 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self) + guint retries; + plist_t value; + char *model, *display_name; ++ lockdownd_service_descriptor_t lockdown_service = NULL; ++ lockdownd_error_t lerr; + + retries = 0; + do { +@@ -94,14 +96,14 @@ _g_vfs_afc_volume_update_metadata (GVfsAfcVolume *self) + + if (self->service != NULL) + { +- guint16 port; +- + if (lockdownd_client_new_with_handshake (dev, &lockdown_cli, "gvfs-afc-volume-monitor") != LOCKDOWN_E_SUCCESS) + { + idevice_free (dev); + return 0; + } +- if (lockdownd_start_service(lockdown_cli, "com.apple.mobile.house_arrest", &port) != LOCKDOWN_E_SUCCESS) ++ lerr = lockdownd_start_service (lockdown_cli, "com.apple.mobile.house_arrest", &lockdown_service); ++ lockdownd_service_descriptor_free (lockdown_service); ++ if (lerr != LOCKDOWN_E_SUCCESS) + { + idevice_free (dev); + return 0; +diff --git a/monitor/afc/afcvolumemonitor.c b/monitor/afc/afcvolumemonitor.c +index 3545bdf..995ef4d 100644 +--- a/monitor/afc/afcvolumemonitor.c ++++ b/monitor/afc/afcvolumemonitor.c +@@ -89,12 +89,7 @@ g_vfs_afc_monitor_idevice_event (const idevice_event_t *event, void *user_data) + + self = G_VFS_AFC_VOLUME_MONITOR(user_data); + +-#ifdef HAVE_LIBIMOBILEDEVICE_1_1_2 + event_udid = event->udid; +-#else +- event_udid = event->uuid; +-#endif +- + if (event->event == IDEVICE_DEVICE_ADD) + g_vfs_afc_monitor_create_volume (self, event_udid); + else +-- +cgit v0.9.2 diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 252085b35..0eba76bc6 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187911 2013-06-08 05:14:18Z eric $ +# $Id: PKGBUILD 188981 2013-06-27 18:52:49Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.5.10 +pkgver=6.8.6.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -13,7 +13,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('ae47754c676df262956d1c740cf4ff297dfda71b' +sha1sums=('58b09b94a59457a7c82a4db9cc29e9a5718129a2' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { diff --git a/extra/intel-tbb/PKGBUILD b/extra/intel-tbb/PKGBUILD index 543f99e93..985d1b765 100644 --- a/extra/intel-tbb/PKGBUILD +++ b/extra/intel-tbb/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186302 2013-05-24 12:22:34Z stephane $ +# $Id: PKGBUILD 188979 2013-06-27 17:08:09Z 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.1_20130314 +pkgver=4.1_20130613 pkgrel=1 pkgdesc='High level abstract threading library' arch=('i686' 'x86_64' 'mips64el') @@ -12,16 +12,16 @@ 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=('e2bf74c1e492b06faf3ecdf2321e64ca698c0921') +sha1sums=('b1322bd10c5b05a79f61edb236adc0513b4a1532') build() { - cd "${srcdir}"/tbb${pkgver/\./}oss + cd tbb${pkgver/\./}oss make } package() { - cd "${srcdir}"/tbb${pkgver/\./}oss + cd tbb${pkgver/\./}oss install -d "${pkgdir}"/usr/lib install -m755 build/linux_*/*.so* "${pkgdir}"/usr/lib diff --git a/extra/kactivities/PKGBUILD b/extra/kactivities/PKGBUILD index e0ef39ff2..838f0e9ec 100644 --- a/extra/kactivities/PKGBUILD +++ b/extra/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187927 2013-06-08 07:59:05Z andrea $ +# $Id: PKGBUILD 189490 2013-07-03 17:00:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.10.4 +pkgver=4.10.5 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=('a339ad9eeff20ba384a03d2dff5b4d3622f9e17d') +sha1sums=('6f0a7593ac5f7a4daf231bc403a78a658aae2db2') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-jovie/PKGBUILD b/extra/kdeaccessibility-jovie/PKGBUILD index 5c8839f2f..8becbc971 100644 --- a/extra/kdeaccessibility-jovie/PKGBUILD +++ b/extra/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187954 2013-06-08 07:59:34Z andrea $ +# $Id: PKGBUILD 189517 2013-07-03 17:01:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.10.4 +pkgver=4.10.5 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=('3a4d718251fb8f5e66c127028dbca99607eb4b66') +sha1sums=('59d2e627b71e6ffe5c3f1f54a680522a114b74bc') build() { mkdir build diff --git a/extra/kdeaccessibility-kaccessible/PKGBUILD b/extra/kdeaccessibility-kaccessible/PKGBUILD index 3dcdb3506..b8f015c64 100644 --- a/extra/kdeaccessibility-kaccessible/PKGBUILD +++ b/extra/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187955 2013-06-08 07:59:35Z andrea $ +# $Id: PKGBUILD 189518 2013-07-03 17:01:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.10.4 +pkgver=4.10.5 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=('c7e6946120b34e6a5963f103430da1d3ca812ca8') +sha1sums=('b56172555573162636937587436ee30091a16f6f') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmag/PKGBUILD b/extra/kdeaccessibility-kmag/PKGBUILD index ce6110987..de94250b5 100644 --- a/extra/kdeaccessibility-kmag/PKGBUILD +++ b/extra/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187956 2013-06-08 07:59:36Z andrea $ +# $Id: PKGBUILD 189519 2013-07-03 17:01:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.10.4 +pkgver=4.10.5 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=('68e9ec4b646db7b7711a08ecf62e1011be60024e') +sha1sums=('0054927193647296448329bbdce1438e62fc57da') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmousetool/PKGBUILD b/extra/kdeaccessibility-kmousetool/PKGBUILD index 2787ba36d..8faa0eb2c 100644 --- a/extra/kdeaccessibility-kmousetool/PKGBUILD +++ b/extra/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187957 2013-06-08 07:59:37Z andrea $ +# $Id: PKGBUILD 189520 2013-07-03 17:01:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.10.4 +pkgver=4.10.5 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=('e3e635780254a2ac9ce94c5c1f21bfabc4b59121') +sha1sums=('ec4aac22da5499a484bd3b45a78c4a10b8ae4632') build() { cd "${srcdir}" diff --git a/extra/kdeaccessibility-kmouth/PKGBUILD b/extra/kdeaccessibility-kmouth/PKGBUILD index 89402afcf..b6b17d649 100644 --- a/extra/kdeaccessibility-kmouth/PKGBUILD +++ b/extra/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187958 2013-06-08 07:59:38Z andrea $ +# $Id: PKGBUILD 189521 2013-07-03 17:01:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.10.4 +pkgver=4.10.5 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=('3236b2fcb79f95a1eb44928a2cd286243f0b128c') +sha1sums=('267079c968a59fd878eaff3e2986cfe82426513b') build() { cd "${srcdir}" diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD index eb9b6cf89..9e224d891 100644 --- a/extra/kdeadmin/PKGBUILD +++ b/extra/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187959 2013-06-08 07:59:40Z andrea $ +# $Id: PKGBUILD 189522 2013-07-03 17:01:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdeadmin pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -14,7 +14,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdelibs' 'kdebase-runtime' 'kdepimlibs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('422b9cd97d40191080ee4a121fda24fb19759216' +sha1sums=('0b809772effe249d1ec581902fcecb73e7761134' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') prepare() { @@ -39,7 +39,7 @@ package_kdeadmin-kcron() { depends=('kdelibs') cd $srcdir/build/kcron make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kcron + cd $srcdir/build/kcron/doc make DESTDIR=$pkgdir install } @@ -49,7 +49,7 @@ package_kdeadmin-ksystemlog() { url="http://kde.org/applications/system/ksystemlog/" cd $srcdir/build/ksystemlog make DESTDIR=$pkgdir install - cd $srcdir/build/doc/ksystemlog + cd $srcdir/build/ksystemlog/doc make DESTDIR=$pkgdir install } @@ -60,6 +60,6 @@ package_kdeadmin-kuser() { install='kdeadmin.install' cd $srcdir/build/kuser make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kuser + cd $srcdir/build/kuser/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdeartwork/PKGBUILD b/extra/kdeartwork/PKGBUILD index 7f36675eb..5fca4b83b 100644 --- a/extra/kdeartwork/PKGBUILD +++ b/extra/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187960 2013-06-08 07:59:41Z andrea $ +# $Id: PKGBUILD 189523 2013-07-03 17:01:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdeartwork-colorschemes' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -20,7 +20,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=('b41e00708a595f4ee310a69c7326a6f956e8c6e2') +sha1sums=('a6f9244b473ec01174ba85f9375438050be76daf') build() { cd $srcdir diff --git a/extra/kdebase-konsole/PKGBUILD b/extra/kdebase-konsole/PKGBUILD index 11c370600..1d5cc2275 100644 --- a/extra/kdebase-konsole/PKGBUILD +++ b/extra/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187961 2013-06-08 07:59:42Z andrea $ +# $Id: PKGBUILD 189524 2013-07-03 17:01:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.10.4 +pkgver=4.10.5 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=('8fdc5965837f104ddc9923e97bb1499f6293c833') +sha1sums=('f6c08b19e2154dab6a7e86255ec254d79e305993') build() { cd "${srcdir}" diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 2bf2aafab..30cf83faa 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 187940 2013-06-08 07:59:19Z andrea $ +# $Id: PKGBUILD 189503 2013-07-03 17:00:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64' 'mips64el') @@ -26,8 +26,9 @@ install="${pkgname}.install" 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=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' + 'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch' + 'fix-plasma-memory-leak.patch') +sha1sums=('d4986c1b4e3232f74a6348116908a13aee073a93' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' @@ -35,7 +36,8 @@ sha1sums=('9f3f4f63e6fe409eb2293ee361b481198fb852b5' 'bbe55f2000217474ce7246f12ee437ceaaf7e9ae' 'c079ebd157c836ba996190f0d2bcea1a7828d02c' 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee' - 'd509dac592bd8b310df27991b208c95b6d907514') + 'd509dac592bd8b310df27991b208c95b6d907514' + 'e453545568d20165f80b97dd270b5adc731d5f21') prepare() { cd ${_pkgname}-${pkgver} @@ -47,6 +49,9 @@ prepare() { # KDEBUG#202629 patch -p0 -i "${srcdir}"/terminate-server.patch + + # KDEBUG#314919 + patch -p1 -i "${srcdir}"/fix-plasma-memory-leak.patch } build() { diff --git a/extra/kdebase-workspace/fix-plasma-memory-leak.patch b/extra/kdebase-workspace/fix-plasma-memory-leak.patch new file mode 100644 index 000000000..78ced11b7 --- /dev/null +++ b/extra/kdebase-workspace/fix-plasma-memory-leak.patch @@ -0,0 +1,53 @@ +commit ec8e405ca447ba5bc5a9f6a2a12e2fa90412a0d4 +Author: Andreas Hartmetz <ahartmetz@gmail.com> +Date: Tue Jul 2 18:35:35 2013 +0200 + + Fix pixmap leak when the tray icon changes (e.g. when it's animated). + + This could easily leak 4KB/second of X pixmap memory. + All the actual difference comes from the QPixmap::ExplicitlyShared + argument, the rest is making some wonky-looking but working code look + less wonky. + + BUG: 314919 + +diff --git a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +index 1826512..a5bc826 100644 +--- a/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp ++++ b/plasma/generic/applets/systemtray/protocols/fdo/x11embedcontainer.cpp +@@ -194,8 +194,7 @@ void X11EmbedContainer::paintEvent(QPaintEvent *event) + + // Taking a detour via a QPixmap is unfortunately the only way we can get + // the window contents into Qt's backing store. +- QPixmap pixmap(size()); +- pixmap = toX11Pixmap(pixmap); ++ QPixmap pixmap = toX11Pixmap(QPixmap(size())); + pixmap.fill(Qt::transparent); + XRenderComposite(x11Info().display(), PictOpSrc, d->picture, None, pixmap.x11PictureHandle(), + 0, 0, 0, 0, 0, 0, width(), height()); +@@ -232,16 +231,18 @@ void X11EmbedContainer::setBackgroundPixmap(QPixmap background) + // NOTE: The alpha-channel is not preserved if it exists, but for X pixmaps it generally should not be needed anyway. + QPixmap X11EmbedContainer::toX11Pixmap(const QPixmap& pix) + { +- if(pix.handle() != 0) // X11 pixmap ++ if (pix.handle() != 0) // X11 pixmap + return pix; ++ QPixmap ret; + Pixmap xpix = XCreatePixmap(pix.x11Info().display(), RootWindow(pix.x11Info().display(), pix.x11Info().screen()), + pix.width(), pix.height(), QX11Info::appDepth()); +- QPixmap wrk = QPixmap::fromX11Pixmap(xpix); +- QPainter paint(&wrk); +- paint.drawPixmap(0, 0, pix); +- paint.end(); +- QPixmap ret = wrk.copy(); +- wrk = QPixmap(); // reset, so that xpix can be freed (QPixmap does not own it) ++ { ++ QPixmap wrk = QPixmap::fromX11Pixmap(xpix, QPixmap::ExplicitlyShared); ++ QPainter paint(&wrk); ++ paint.drawPixmap(0, 0, pix); ++ paint.end(); ++ ret = wrk.copy(); ++ } // free resources so that xpix can be freed (QPixmap does not own it) + XFreePixmap(pix.x11Info().display(), xpix); + return ret; + } diff --git a/extra/kdebase/PKGBUILD b/extra/kdebase/PKGBUILD index efbd9f19d..5473aac99 100644 --- a/extra/kdebase/PKGBUILD +++ b/extra/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187942 2013-06-08 07:59:21Z andrea $ +# $Id: PKGBUILD 189505 2013-07-03 17:00:55Z 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.10.4 +pkgver=4.10.5 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=('5465fffdaea70a5ca225283f45b9504775d0432d') +sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6') build() { cd ${srcdir} diff --git a/extra/kdebindings-kimono/PKGBUILD b/extra/kdebindings-kimono/PKGBUILD index 1ae1a8126..1343f4cc0 100644 --- a/extra/kdebindings-kimono/PKGBUILD +++ b/extra/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187962 2013-06-08 07:59:43Z andrea $ +# $Id: PKGBUILD 189525 2013-07-03 17:01:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.10.4 +pkgver=4.10.5 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=('87fb44759e2f4ffa1fbcbebb0f15b359f02875b8') +sha1sums=('b4ecd3d9a95966c7d290b45031da4550a1c71c09') build() { cd "${srcdir}" diff --git a/extra/kdebindings-korundum/PKGBUILD b/extra/kdebindings-korundum/PKGBUILD index 1c8772651..2beb4befa 100644 --- a/extra/kdebindings-korundum/PKGBUILD +++ b/extra/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187963 2013-06-08 07:59:44Z andrea $ +# $Id: PKGBUILD 189526 2013-07-03 17:01:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,18 +15,14 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' optdepends=('kdegraphics-okular: okular bindings' 'kdepimlibs: akonadi bindings') conflicts=('kdebindings-ruby') -source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" - 'ruby19.patch') -sha1sums=('d4b2920db047a10addbd1a8818878b2f93c75648' - 'c074f027bac3b9bffe70a2c2304a6a7be12be034') +source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz") +sha1sums=('fa3e3c8dfdd4a81e49f91aa264d64f700ec4241f') prepare() { - cd korundum-${pkgver} - patch -p1 -i "${srcdir}/ruby19.patch" + mkdir build } build() { - mkdir build cd build cmake ../korundum-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/extra/kdebindings-korundum/ruby19.patch b/extra/kdebindings-korundum/ruby19.patch deleted file mode 100644 index c2468d9ce..000000000 --- a/extra/kdebindings-korundum/ruby19.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- korundum-4.9.0/src/krubypluginfactory.cpp~ 2012-07-27 10:44:19.544464612 +0000 -+++ korundum-4.9.0/src/krubypluginfactory.cpp 2012-07-27 10:53:15.247374749 +0000 -@@ -39,7 +39,6 @@ - extern "C" { - extern VALUE rb_load_path; - extern VALUE qt_internal_module; --void Init_prelude(void); - } - - // -@@ -165,7 +164,8 @@ - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+ char *opts[] = { "ruby", "-e;" }; -+ ruby_options(2, opts); - #endif - - ruby_incpush(QFile::encodeName(program.path())); -@@ -342,7 +342,8 @@ - #if RUBY_VERSION >= 0x10900 - VALUE gem = rb_define_module("Gem"); - rb_const_set(gem, rb_intern("Enable"), Qtrue); -- Init_prelude(); -+ char *opts[] = { "ruby", "-e;" }; -+ ruby_options(2, opts); - #endif - - ruby_incpush(QFile::encodeName(program.path())); diff --git a/extra/kdebindings-kross/PKGBUILD b/extra/kdebindings-kross/PKGBUILD index b8d38e105..e56805e05 100644 --- a/extra/kdebindings-kross/PKGBUILD +++ b/extra/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 187964 2013-06-08 07:59:45Z andrea $ +# $Id: PKGBUILD 189527 2013-07-03 17:01:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.10.4 +pkgver=4.10.5 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=('04ab37ee0c6fcf0a3d7824b49f73529d4f480a0d') +sha1sums=('58bb1c9fb45d20768c59e1147aa954d14d6dd18e') build() { cd "${srcdir}" diff --git a/extra/kdebindings-perlkde/PKGBUILD b/extra/kdebindings-perlkde/PKGBUILD index 978794432..0bda66e57 100644 --- a/extra/kdebindings-perlkde/PKGBUILD +++ b/extra/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187965 2013-06-08 07:59:45Z andrea $ +# $Id: PKGBUILD 189528 2013-07-03 17:01:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.10.4 +pkgver=4.10.5 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=('034a5f0b98cb361cad8bb684a4834f47d16efb9c') +sha1sums=('a0eb27db883b8fd8411041373140f3d6a5bcdbfc') build() { mkdir build diff --git a/extra/kdebindings-perlqt/PKGBUILD b/extra/kdebindings-perlqt/PKGBUILD index 8e1f3070e..df7d20acd 100644 --- a/extra/kdebindings-perlqt/PKGBUILD +++ b/extra/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187936 2013-06-08 07:59:15Z andrea $ +# $Id: PKGBUILD 189499 2013-07-03 17:00:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.10.4 +pkgver=4.10.5 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=('8b72c8c53d74b2bc8f38baca6c599067a6cfaac6') +sha1sums=('e4349b27791962188e8e56bd717a2ae7aec263c3') build() { mkdir build diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD index 1d709f430..adbf0b092 100644 --- a/extra/kdebindings-python/PKGBUILD +++ b/extra/kdebindings-python/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 188702 2013-06-18 10:31:18Z andrea $ +# $Id: PKGBUILD 189496 2013-07-03 17:00:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2' 'kdebindings-python-common') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'FDL') @@ -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=('4243f60d549b75ad734141ad2bfef884d12d014e') +sha1sums=('1e474e5d15756a6846902c11d6a7c95c5ca688da') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/extra/kdebindings-qtruby/PKGBUILD b/extra/kdebindings-qtruby/PKGBUILD index c84ad53ff..8e92f8d95 100644 --- a/extra/kdebindings-qtruby/PKGBUILD +++ b/extra/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187938 2013-06-08 07:59:16Z andrea $ +# $Id: PKGBUILD 189501 2013-07-03 17:00:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.10.4 +pkgver=4.10.5 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=('70fa8ea5ee961ece5d29cb84cb37c57923f18d85') +sha1sums=('6fc117f8d046ae4f026015475792c43f80346d29') build() { mkdir build diff --git a/extra/kdebindings-qyoto/PKGBUILD b/extra/kdebindings-qyoto/PKGBUILD index 59acd2122..d58fef949 100644 --- a/extra/kdebindings-qyoto/PKGBUILD +++ b/extra/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187937 2013-06-08 07:59:15Z andrea $ +# $Id: PKGBUILD 189500 2013-07-03 17:00:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.10.4 +pkgver=4.10.5 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=('1a0503ef0117aa19cdffdddc9501fee83411d576') +sha1sums=('d79d5d67fe95aecb326edba4cf1200b6a22f394c') build() { mkdir build diff --git a/extra/kdebindings-smokegen/PKGBUILD b/extra/kdebindings-smokegen/PKGBUILD index beb566986..b28b18847 100644 --- a/extra/kdebindings-smokegen/PKGBUILD +++ b/extra/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187930 2013-06-08 07:59:08Z andrea $ +# $Id: PKGBUILD 189493 2013-07-03 17:00:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.10.4 +pkgver=4.10.5 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=('57c92b313bae5274b571c09f94cf599d1afd4846') +sha1sums=('d9d803c9d66d59ffc8d5a7372ee2176d355d3bb3') build() { cd "${srcdir}" diff --git a/extra/kdebindings-smokekde/PKGBUILD b/extra/kdebindings-smokekde/PKGBUILD index 3ac063966..7a78d982c 100644 --- a/extra/kdebindings-smokekde/PKGBUILD +++ b/extra/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187935 2013-06-08 07:59:14Z andrea $ +# $Id: PKGBUILD 189498 2013-07-03 17:00:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.10.4 +pkgver=4.10.5 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=('557f3a888759cb3dd397466bd16246a1ef5858f2') +sha1sums=('22b2b717a8a81e3b4d52a65afd985044b5e77e3b') build() { mkdir build diff --git a/extra/kdebindings-smokeqt/PKGBUILD b/extra/kdebindings-smokeqt/PKGBUILD index 544939e8a..fac287340 100644 --- a/extra/kdebindings-smokeqt/PKGBUILD +++ b/extra/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187931 2013-06-08 07:59:09Z andrea $ +# $Id: PKGBUILD 189494 2013-07-03 17:00:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ 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=('292285272998b096eef62812e65b5027cf2800ec') +sha1sums=('af5c3b4cf9bf82de15ddb26a5ab188e800fe7942') build() { cd "${srcdir}" diff --git a/extra/kdeedu-analitza/PKGBUILD b/extra/kdeedu-analitza/PKGBUILD index 4b63b0e41..9798ea9e4 100644 --- a/extra/kdeedu-analitza/PKGBUILD +++ b/extra/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187949 2013-06-08 07:59:29Z andrea $ +# $Id: PKGBUILD 189512 2013-07-03 17:01:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('46de1f60e149f6b5a526fa62e6dcf52ade9d4eff') +sha1sums=('e8f6810516838d94bb66db01c6ef19ebc8680ca7') build() { cd "${srcdir}" diff --git a/extra/kdeedu-blinken/PKGBUILD b/extra/kdeedu-blinken/PKGBUILD index 5c50b9b80..bec07471d 100644 --- a/extra/kdeedu-blinken/PKGBUILD +++ b/extra/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187966 2013-06-08 07:59:47Z andrea $ +# $Id: PKGBUILD 189529 2013-07-03 17:01:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.10.4 +pkgver=4.10.5 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=('ea4d9363c6bf08683a5c9733d11ec7928a358f73') +sha1sums=('45c720a6b1566d941cfae8d8354d603331c1e258') build() { cd "${srcdir}" diff --git a/extra/kdeedu-cantor/PKGBUILD b/extra/kdeedu-cantor/PKGBUILD index 565689876..49a5a9e88 100644 --- a/extra/kdeedu-cantor/PKGBUILD +++ b/extra/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187967 2013-06-08 07:59:48Z andrea $ +# $Id: PKGBUILD 189530 2013-07-03 17:01:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -17,7 +17,7 @@ optdepends=('maxima: Maxima backend' install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz" 'sage58.patch') -sha1sums=('3ecd559d6563945ed7730a524c2da5d637a340ba' +sha1sums=('b815ec8ceef27436bca46ee80d933912deb7c771' 'c02051c30ece57800d693da60280b0bdb5f45697') prepare() { diff --git a/extra/kdeedu-kalgebra/PKGBUILD b/extra/kdeedu-kalgebra/PKGBUILD index a4633d125..f270c1268 100644 --- a/extra/kdeedu-kalgebra/PKGBUILD +++ b/extra/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187968 2013-06-08 07:59:49Z andrea $ +# $Id: PKGBUILD 189531 2013-07-03 17:01:30Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.10.4 +pkgver=4.10.5 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=('86032621d84ef5d8ea68cf9b0e7b696b96154ece') +sha1sums=('a762efe6ab7bedb5e5a1f97e7227fc48729c8b62') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kalzium/PKGBUILD b/extra/kdeedu-kalzium/PKGBUILD index 2493416f2..f49bf7169 100644 --- a/extra/kdeedu-kalzium/PKGBUILD +++ b/extra/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187969 2013-06-08 07:59:50Z andrea $ +# $Id: PKGBUILD 189532 2013-07-03 17:01:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.10.4 +pkgver=4.10.5 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=('b8225cae39c1b27d1defabd08cd2e64e5c893602') +sha1sums=('b4429f34b85c507474cd33e2a1571de9acd70b5c') build() { mkdir build diff --git a/extra/kdeedu-kanagram/PKGBUILD b/extra/kdeedu-kanagram/PKGBUILD index b8e1b45ae..2a232f3f6 100644 --- a/extra/kdeedu-kanagram/PKGBUILD +++ b/extra/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187970 2013-06-08 07:59:51Z andrea $ +# $Id: PKGBUILD 189533 2013-07-03 17:01:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.10.4 +pkgver=4.10.5 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=('fa1635720602ba02cb0064d3c01c752d208f5e09') +sha1sums=('1db931a1796a090ffefc1d922b9bf689e045581a') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kbruch/PKGBUILD b/extra/kdeedu-kbruch/PKGBUILD index b18b17ced..283471486 100644 --- a/extra/kdeedu-kbruch/PKGBUILD +++ b/extra/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187971 2013-06-08 07:59:53Z andrea $ +# $Id: PKGBUILD 189534 2013-07-03 17:01:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.10.4 +pkgver=4.10.5 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=('be9dd5ce3a0b8b7162faf1f78c22a7aeb5a8449c') +sha1sums=('f01c2b9f2bf1db8d5c2836fdff04862b311e3eac') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kgeography/PKGBUILD b/extra/kdeedu-kgeography/PKGBUILD index 7cdaf68b6..893b1cdf2 100644 --- a/extra/kdeedu-kgeography/PKGBUILD +++ b/extra/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187972 2013-06-08 07:59:56Z andrea $ +# $Id: PKGBUILD 189535 2013-07-03 17:01:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.10.4 +pkgver=4.10.5 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=('a283d3521e853d040e7938e004fcbef6cf41aa82') +sha1sums=('22beaaada1a55aa5a5b107fa0eef9f3850aff2a1') build() { cd "${srcdir}" diff --git a/extra/kdeedu-khangman/PKGBUILD b/extra/kdeedu-khangman/PKGBUILD index ca5d48365..1bca9ef14 100644 --- a/extra/kdeedu-khangman/PKGBUILD +++ b/extra/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187973 2013-06-08 07:59:58Z andrea $ +# $Id: PKGBUILD 189536 2013-07-03 17:01:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.10.4 +pkgver=4.10.5 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=('1d1a8d7dc99e59bcb006302d1bb7d9a8366041d9') +sha1sums=('b8347034cefa309850ac3099321179cd64ce4d2f') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD index c88c5a4dd..b607867fa 100644 --- a/extra/kdeedu-kig/PKGBUILD +++ b/extra/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187974 2013-06-08 07:59:59Z andrea $ +# $Id: PKGBUILD 189537 2013-07-03 17:01:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('91c0880d48ed16e05481c3ce424075d30f695bf4') +sha1sums=('8eb3dae04ce6599f911fa29e5109089dd0a5ca56') build() { mkdir build diff --git a/extra/kdeedu-kiten/PKGBUILD b/extra/kdeedu-kiten/PKGBUILD index ab2bdf211..bf8713107 100644 --- a/extra/kdeedu-kiten/PKGBUILD +++ b/extra/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187975 2013-06-08 08:00:01Z andrea $ +# $Id: PKGBUILD 189538 2013-07-03 17:01:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.10.4 +pkgver=4.10.5 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=('970620fc621dd31c99c71bd3b446da4d1d3015c4') +sha1sums=('af9040043e03ef516e582c5a8d1219e358339aac') build() { cd "${srcdir}" diff --git a/extra/kdeedu-klettres/PKGBUILD b/extra/kdeedu-klettres/PKGBUILD index 37677c5d5..31e08126e 100644 --- a/extra/kdeedu-klettres/PKGBUILD +++ b/extra/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187976 2013-06-08 08:00:03Z andrea $ +# $Id: PKGBUILD 189539 2013-07-03 17:01:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.10.4 +pkgver=4.10.5 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=('5141988a04d1a9e428c41cc751cd217a53fef13a') +sha1sums=('285ed3b40f7502fe90d319c434946a344b54246d') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kmplot/PKGBUILD b/extra/kdeedu-kmplot/PKGBUILD index 0e69c0c3e..57ac8b2dd 100644 --- a/extra/kdeedu-kmplot/PKGBUILD +++ b/extra/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187977 2013-06-08 08:00:04Z andrea $ +# $Id: PKGBUILD 189540 2013-07-03 17:01:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.10.4 +pkgver=4.10.5 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=('e212aee5cdee0d767efd9d004a17238f043485a2') +sha1sums=('da01e941e4439223cacc03de29780c27d41455b0') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kstars/PKGBUILD b/extra/kdeedu-kstars/PKGBUILD index 6971bf592..04f1540ac 100644 --- a/extra/kdeedu-kstars/PKGBUILD +++ b/extra/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187978 2013-06-08 08:00:07Z andrea $ +# $Id: PKGBUILD 189541 2013-07-03 17:01:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -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=('9a434b7e2c9b67cce4611ad443cfd1ef9a190436') +sha1sums=('724acde654d7d66ec8bf6c088c2f892eaf9d103d') build() { mkdir build diff --git a/extra/kdeedu-ktouch/PKGBUILD b/extra/kdeedu-ktouch/PKGBUILD index caa89639d..cfb3c3b7c 100644 --- a/extra/kdeedu-ktouch/PKGBUILD +++ b/extra/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187979 2013-06-08 08:00:08Z andrea $ +# $Id: PKGBUILD 189542 2013-07-03 17:01:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.10.4 +pkgver=4.10.5 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=('dfda5d6f0af6bfc2853595a5af86c7a96cd66c33') +sha1sums=('87c772a43e164a557e8fed01a5c5064823eb29c9') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kturtle/PKGBUILD b/extra/kdeedu-kturtle/PKGBUILD index e1b7409f6..2f9f0a484 100644 --- a/extra/kdeedu-kturtle/PKGBUILD +++ b/extra/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187980 2013-06-08 08:00:10Z andrea $ +# $Id: PKGBUILD 189543 2013-07-03 17:01:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.10.4 +pkgver=4.10.5 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=('82cc5e6abb7ab10bf1da247f67293d45b3d38195') +sha1sums=('ca8b46766ea8135978b7e6f3b1f7f21e5a1b6639') build() { cd "${srcdir}" diff --git a/extra/kdeedu-kwordquiz/PKGBUILD b/extra/kdeedu-kwordquiz/PKGBUILD index 7f552dbbe..845969d75 100644 --- a/extra/kdeedu-kwordquiz/PKGBUILD +++ b/extra/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187981 2013-06-08 08:00:11Z andrea $ +# $Id: PKGBUILD 189544 2013-07-03 17:01:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.10.4 +pkgver=4.10.5 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=('3c321e7f4a9a136cc29227c98d10bd3f4551f32b') +sha1sums=('3d92e066adecd77ef4de5b3ab4ecb6e06251dd55') build() { cd "${srcdir}" diff --git a/extra/kdeedu-marble/PKGBUILD b/extra/kdeedu-marble/PKGBUILD index 08459332f..838d819a1 100644 --- a/extra/kdeedu-marble/PKGBUILD +++ b/extra/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187944 2013-06-08 07:59:24Z andrea $ +# $Id: PKGBUILD 189507 2013-07-03 17:00:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('664ff3564e2136566808d2ea801b42ede04d6a8d') +sha1sums=('15563a5f31bf1c655fe6afc6477bd3f8042e8a6f') build() { mkdir build diff --git a/extra/kdeedu-pairs/PKGBUILD b/extra/kdeedu-pairs/PKGBUILD index 79610b18a..335de7626 100644 --- a/extra/kdeedu-pairs/PKGBUILD +++ b/extra/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187982 2013-06-08 08:00:13Z andrea $ +# $Id: PKGBUILD 189545 2013-07-03 17:01:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.10.4 +pkgver=4.10.5 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=('20b4e8e98487bc05602a15969bac63ea64a6ac74') +sha1sums=('c42d6a0dab25e28173ab47f1e18dda40204aaf15') build() { cd "${srcdir}" diff --git a/extra/kdeedu-parley/PKGBUILD b/extra/kdeedu-parley/PKGBUILD index 7c7738207..1ed12bb43 100644 --- a/extra/kdeedu-parley/PKGBUILD +++ b/extra/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187983 2013-06-08 08:00:14Z andrea $ +# $Id: PKGBUILD 189546 2013-07-03 17:01:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.10.4 +pkgver=4.10.5 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=('d13d686b77a36ca488ab6f545e0871ad37f9b490') +sha1sums=('ff4361c225fe4e9530200ca169b1a0fc0f5b5852') build() { mkdir build diff --git a/extra/kdeedu-rocs/PKGBUILD b/extra/kdeedu-rocs/PKGBUILD index dfebfafa4..db921c813 100644 --- a/extra/kdeedu-rocs/PKGBUILD +++ b/extra/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187984 2013-06-08 08:00:15Z andrea $ +# $Id: PKGBUILD 189547 2013-07-03 17:01:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.10.4 +pkgver=4.10.5 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=('c09ba436f60bf856733e50bd331e84a8b1f975fb') +sha1sums=('0f9e33b679f528918b682153447a5813d88c57ef') build() { cd "${srcdir}" diff --git a/extra/kdeedu-step/PKGBUILD b/extra/kdeedu-step/PKGBUILD index 8baf3884f..6e0febf85 100644 --- a/extra/kdeedu-step/PKGBUILD +++ b/extra/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187985 2013-06-08 08:00:17Z andrea $ +# $Id: PKGBUILD 189548 2013-07-03 17:01:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.10.4 +pkgver=4.10.5 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=('3dcbd853ede5fbc6517d52faa8722395ecf0eb0b') +sha1sums=('e218cd5af527a815e222838b32bcffaaaa78e495') build() { cd "${srcdir}" diff --git a/extra/kdegames-bomber/PKGBUILD b/extra/kdegames-bomber/PKGBUILD index 6ee2a6ff2..aa38c6dd9 100644 --- a/extra/kdegames-bomber/PKGBUILD +++ b/extra/kdegames-bomber/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187986 2013-06-08 08:00:18Z andrea $ +# $Id: PKGBUILD 189549 2013-07-03 17:02:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bomber -pkgver=4.10.4 +pkgver=4.10.5 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=('88f98c0179516cfd08952112fb6dc6ba6bb85231') +sha1sums=('9ccd0e60f5ada51aae2fd35b214a2350e7950351') build() { mkdir build diff --git a/extra/kdegames-bovo/PKGBUILD b/extra/kdegames-bovo/PKGBUILD index 25008fee8..89957d7ef 100644 --- a/extra/kdegames-bovo/PKGBUILD +++ b/extra/kdegames-bovo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187987 2013-06-08 08:00:20Z andrea $ +# $Id: PKGBUILD 189550 2013-07-03 17:02:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-bovo -pkgver=4.10.4 +pkgver=4.10.5 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=('102ceee58b4851b24cb23bd4907449cdd63aa3d7') +sha1sums=('cf6de267949be1900b9a74eb77118ed33f8fe389') build() { mkdir build diff --git a/extra/kdegames-granatier/PKGBUILD b/extra/kdegames-granatier/PKGBUILD index b8cf9165a..a63d05050 100644 --- a/extra/kdegames-granatier/PKGBUILD +++ b/extra/kdegames-granatier/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187988 2013-06-08 08:00:21Z andrea $ +# $Id: PKGBUILD 189551 2013-07-03 17:02:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-granatier -pkgver=4.10.4 +pkgver=4.10.5 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=('b49be2c81a8b8670bfe8f53ae09e9aab9de5134a') +sha1sums=('5ba19a929dd4812ece1c3c1658e5d0457d737cb1') build() { mkdir build diff --git a/extra/kdegames-kapman/PKGBUILD b/extra/kdegames-kapman/PKGBUILD index c636906f9..8cef66026 100644 --- a/extra/kdegames-kapman/PKGBUILD +++ b/extra/kdegames-kapman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187990 2013-06-08 08:00:24Z andrea $ +# $Id: PKGBUILD 189553 2013-07-03 17:02:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kapman -pkgver=4.10.4 +pkgver=4.10.5 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=('6dbb6b7f4a87aa2cd21d13330913d7a999b888e8') +sha1sums=('4da9e17243a87108bb55006a8d486d68d57f5e86') build() { mkdir build diff --git a/extra/kdegames-katomic/PKGBUILD b/extra/kdegames-katomic/PKGBUILD index c89ad6099..edc6c00df 100644 --- a/extra/kdegames-katomic/PKGBUILD +++ b/extra/kdegames-katomic/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187991 2013-06-08 08:00:26Z andrea $ +# $Id: PKGBUILD 189554 2013-07-03 17:02:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-katomic -pkgver=4.10.4 +pkgver=4.10.5 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=('6c4893910a11f2c1bc20492a93d6475fa397f9df') +sha1sums=('79f8e11671cd67fac0aff8ed5ebf8a845ed0e2b8') build() { mkdir build diff --git a/extra/kdegames-kblackbox/PKGBUILD b/extra/kdegames-kblackbox/PKGBUILD index 60dcbc11b..fc9ea8d03 100644 --- a/extra/kdegames-kblackbox/PKGBUILD +++ b/extra/kdegames-kblackbox/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187992 2013-06-08 08:00:28Z andrea $ +# $Id: PKGBUILD 189555 2013-07-03 17:02:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblackbox -pkgver=4.10.4 +pkgver=4.10.5 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=('dd19f0c54740e5e0add1271ebd6595f237a670d5') +sha1sums=('3cfb90ce5810df96ab8893fd0c2da984825a3ed0') build() { mkdir build diff --git a/extra/kdegames-kblocks/PKGBUILD b/extra/kdegames-kblocks/PKGBUILD index 6b5116b55..14632d22e 100644 --- a/extra/kdegames-kblocks/PKGBUILD +++ b/extra/kdegames-kblocks/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187993 2013-06-08 08:00:29Z andrea $ +# $Id: PKGBUILD 189556 2013-07-03 17:02:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kblocks -pkgver=4.10.4 +pkgver=4.10.5 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=('e6c9e5d3dc368d87afe82375d3537aeb03247edb') +sha1sums=('98965d0f09d072722d8a35a9aee982cb66b0b61e') build() { mkdir build diff --git a/extra/kdegames-kbounce/PKGBUILD b/extra/kdegames-kbounce/PKGBUILD index 353e13dde..f71855671 100644 --- a/extra/kdegames-kbounce/PKGBUILD +++ b/extra/kdegames-kbounce/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187994 2013-06-08 08:00:30Z andrea $ +# $Id: PKGBUILD 189557 2013-07-03 17:02:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbounce -pkgver=4.10.4 +pkgver=4.10.5 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=('481fb1b98597ae0cceadcfb7d7b5d4b1171e1267') +sha1sums=('45ab0f6440933719d70d6f10ad091a7753100832') build() { mkdir build diff --git a/extra/kdegames-kbreakout/PKGBUILD b/extra/kdegames-kbreakout/PKGBUILD index ae33ee756..2a263f746 100644 --- a/extra/kdegames-kbreakout/PKGBUILD +++ b/extra/kdegames-kbreakout/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187995 2013-06-08 08:00:32Z andrea $ +# $Id: PKGBUILD 189558 2013-07-03 17:02:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kbreakout -pkgver=4.10.4 +pkgver=4.10.5 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=('c8c5acdf8ca4915b37c6fa8e5cf6725e21ab97fa') +sha1sums=('38c1fb790541c01427e9cb7314e05929a25dc5d5') build() { mkdir build diff --git a/extra/kdegames-kdiamond/PKGBUILD b/extra/kdegames-kdiamond/PKGBUILD index c5ef52b67..5e5fbccb6 100644 --- a/extra/kdegames-kdiamond/PKGBUILD +++ b/extra/kdegames-kdiamond/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187996 2013-06-08 08:00:33Z andrea $ +# $Id: PKGBUILD 189559 2013-07-03 17:02:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kdiamond -pkgver=4.10.4 +pkgver=4.10.5 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=('acb1b7cdfdc30025a4686321ab0ef226c8adb1e0') +sha1sums=('eba0692af37410bd1005d0cbb8759420169d2e7b') build() { mkdir build diff --git a/extra/kdegames-kfourinline/PKGBUILD b/extra/kdegames-kfourinline/PKGBUILD index 6eeff0f0a..0e395f7aa 100644 --- a/extra/kdegames-kfourinline/PKGBUILD +++ b/extra/kdegames-kfourinline/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187997 2013-06-08 08:00:35Z andrea $ +# $Id: PKGBUILD 189560 2013-07-03 17:02:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kfourinline -pkgver=4.10.4 +pkgver=4.10.5 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=('263a7a641c3f48f078aebbc179ec2475558605e8') +sha1sums=('d923b3477cd7ac2e693a69cf5dcc4f0667b72670') build() { mkdir build diff --git a/extra/kdegames-kgoldrunner/PKGBUILD b/extra/kdegames-kgoldrunner/PKGBUILD index 7a8d4adbd..3226073e4 100644 --- a/extra/kdegames-kgoldrunner/PKGBUILD +++ b/extra/kdegames-kgoldrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187998 2013-06-08 08:00:36Z andrea $ +# $Id: PKGBUILD 189561 2013-07-03 17:02:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kgoldrunner -pkgver=4.10.4 +pkgver=4.10.5 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=('95fc29d606d5b491920c612e1887b1699aad4481') +sha1sums=('ade056258864f670d0e9932c07b4bec6c96589cb') build() { mkdir build diff --git a/extra/kdegames-kigo/PKGBUILD b/extra/kdegames-kigo/PKGBUILD index 825c1c938..3bac16137 100644 --- a/extra/kdegames-kigo/PKGBUILD +++ b/extra/kdegames-kigo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187999 2013-06-08 08:00:39Z andrea $ +# $Id: PKGBUILD 189562 2013-07-03 17:02:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kigo -pkgver=4.10.4 +pkgver=4.10.5 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=('caad098497bdd71184983cc22cfd23fe71bb243a') +sha1sums=('458ceb98d8704d7810539e24be708de089814b28') build() { mkdir build diff --git a/extra/kdegames-killbots/PKGBUILD b/extra/kdegames-killbots/PKGBUILD index 4ec19ff9c..e721516a3 100644 --- a/extra/kdegames-killbots/PKGBUILD +++ b/extra/kdegames-killbots/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188000 2013-06-08 08:00:40Z andrea $ +# $Id: PKGBUILD 189563 2013-07-03 17:02:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-killbots -pkgver=4.10.4 +pkgver=4.10.5 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=('5fef75ba6d3c849ce271164a532eaddde1c41cd4') +sha1sums=('fedcdb56a0daa244ded949433b591f783f9fe03b') build() { mkdir build diff --git a/extra/kdegames-kiriki/PKGBUILD b/extra/kdegames-kiriki/PKGBUILD index c26f2f174..08c5dd2ec 100644 --- a/extra/kdegames-kiriki/PKGBUILD +++ b/extra/kdegames-kiriki/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188001 2013-06-08 08:00:41Z andrea $ +# $Id: PKGBUILD 189564 2013-07-03 17:02:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kiriki -pkgver=4.10.4 +pkgver=4.10.5 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=('a724586705a9bb66d4a9af684a0b56239d395e5e') +sha1sums=('459ad2ae8ed5d23f0fa49a512afe5c9100457e0c') build() { mkdir build diff --git a/extra/kdegames-kjumpingcube/PKGBUILD b/extra/kdegames-kjumpingcube/PKGBUILD index 49b7addda..2f042989f 100644 --- a/extra/kdegames-kjumpingcube/PKGBUILD +++ b/extra/kdegames-kjumpingcube/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188002 2013-06-08 08:00:43Z andrea $ +# $Id: PKGBUILD 189565 2013-07-03 17:02:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kjumpingcube -pkgver=4.10.4 +pkgver=4.10.5 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=('012a89130cb95f8ae223f1dfb8380e1316ac91be') +sha1sums=('82c175cef97149ba079c8b1520d48c60f1785903') build() { mkdir build diff --git a/extra/kdegames-klickety/PKGBUILD b/extra/kdegames-klickety/PKGBUILD index 4e17debf7..182be6147 100644 --- a/extra/kdegames-klickety/PKGBUILD +++ b/extra/kdegames-klickety/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188003 2013-06-08 08:00:44Z andrea $ +# $Id: PKGBUILD 189566 2013-07-03 17:02:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klickety -pkgver=4.10.4 +pkgver=4.10.5 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=('e7540d663a36a580e68d8ac69ba229c42db724f6') +sha1sums=('4630f3f31d9ab439475420ccd54707f097630371') build() { mkdir build diff --git a/extra/kdegames-klines/PKGBUILD b/extra/kdegames-klines/PKGBUILD index 66fed7127..1dbb9ecfd 100644 --- a/extra/kdegames-klines/PKGBUILD +++ b/extra/kdegames-klines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188004 2013-06-08 08:00:46Z andrea $ +# $Id: PKGBUILD 189567 2013-07-03 17:02:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-klines -pkgver=4.10.4 +pkgver=4.10.5 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=('6cbd46188030e3f495812a5d50e34be9936cdb08') +sha1sums=('adb8c1c1709b4dbdb733602ef29bcab6a177d494') build() { mkdir build diff --git a/extra/kdegames-kmahjongg/PKGBUILD b/extra/kdegames-kmahjongg/PKGBUILD index 6d7c80f1e..b0b8905f0 100644 --- a/extra/kdegames-kmahjongg/PKGBUILD +++ b/extra/kdegames-kmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188005 2013-06-08 08:00:47Z andrea $ +# $Id: PKGBUILD 189568 2013-07-03 17:02:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmahjongg -pkgver=4.10.4 +pkgver=4.10.5 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=('ebecd24f0da87165d0b8859444d035019a7bcd5a') +sha1sums=('e020846d2252402cf51ae8bd63539774aeb775e9') build() { mkdir build diff --git a/extra/kdegames-kmines/PKGBUILD b/extra/kdegames-kmines/PKGBUILD index 4158ddc30..f246cb653 100644 --- a/extra/kdegames-kmines/PKGBUILD +++ b/extra/kdegames-kmines/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188006 2013-06-08 08:00:48Z andrea $ +# $Id: PKGBUILD 189569 2013-07-03 17:02:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kmines -pkgver=4.10.4 +pkgver=4.10.5 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=('950f28e722db36daee4ee187f696eaa51415b752') +sha1sums=('c896f86b96f4fb380c695c0491db6d5fff0836fe') build() { mkdir build diff --git a/extra/kdegames-knavalbattle/PKGBUILD b/extra/kdegames-knavalbattle/PKGBUILD index 973c9f00a..9ad03e271 100644 --- a/extra/kdegames-knavalbattle/PKGBUILD +++ b/extra/kdegames-knavalbattle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188007 2013-06-08 08:00:50Z andrea $ +# $Id: PKGBUILD 189570 2013-07-03 17:02:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knavalbattle -pkgver=4.10.4 +pkgver=4.10.5 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=('cf55f549029647b59b082bc2ab9383a5375a416c') +sha1sums=('e939a5b5d409bf89da3ffa8cd6e4af0d0e7798a0') build() { mkdir build diff --git a/extra/kdegames-knetwalk/PKGBUILD b/extra/kdegames-knetwalk/PKGBUILD index 9f801cec5..6c5c748ca 100644 --- a/extra/kdegames-knetwalk/PKGBUILD +++ b/extra/kdegames-knetwalk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188008 2013-06-08 08:00:51Z andrea $ +# $Id: PKGBUILD 189571 2013-07-03 17:02:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-knetwalk -pkgver=4.10.4 +pkgver=4.10.5 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=('482d4ba187a55ba32841e141ce3717ad94306377') +sha1sums=('61fb05ab580785362b1204c8b64badc160284d02') build() { mkdir build diff --git a/extra/kdegames-kolf/PKGBUILD b/extra/kdegames-kolf/PKGBUILD index 528a232ab..7aabde091 100644 --- a/extra/kdegames-kolf/PKGBUILD +++ b/extra/kdegames-kolf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188009 2013-06-08 08:00:52Z andrea $ +# $Id: PKGBUILD 189572 2013-07-03 17:02:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kolf -pkgver=4.10.4 +pkgver=4.10.5 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=('ec61e9d436c59cc738f340b7ca27e8ccef017b2f') +sha1sums=('ae1af46f6144adf912b3b9bf99666a178a6f78ac') build() { mkdir build diff --git a/extra/kdegames-kollision/PKGBUILD b/extra/kdegames-kollision/PKGBUILD index bbc850b5c..4c2084ae7 100644 --- a/extra/kdegames-kollision/PKGBUILD +++ b/extra/kdegames-kollision/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188010 2013-06-08 08:00:56Z andrea $ +# $Id: PKGBUILD 189573 2013-07-03 17:02:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kollision -pkgver=4.10.4 +pkgver=4.10.5 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=('bd7839e85789894010a2df0171e417a008afd753') +sha1sums=('d7850701d8817dac21457ebeef78c18d0f37001f') build() { mkdir build diff --git a/extra/kdegames-konquest/PKGBUILD b/extra/kdegames-konquest/PKGBUILD index 0ec218ceb..792c926a8 100644 --- a/extra/kdegames-konquest/PKGBUILD +++ b/extra/kdegames-konquest/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188011 2013-06-08 08:00:57Z andrea $ +# $Id: PKGBUILD 189574 2013-07-03 17:02:44Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-konquest -pkgver=4.10.4 +pkgver=4.10.5 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=('a238dee4a52ad6a051d53843112f85a7a912355f') +sha1sums=('5e5c61bc3823be1dd45c87a77f404f51f5ed9b6e') build() { mkdir build diff --git a/extra/kdegames-kpatience/PKGBUILD b/extra/kdegames-kpatience/PKGBUILD index 44d6e7211..6ea963369 100644 --- a/extra/kdegames-kpatience/PKGBUILD +++ b/extra/kdegames-kpatience/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188012 2013-06-08 08:01:00Z andrea $ +# $Id: PKGBUILD 189575 2013-07-03 17:02:45Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kpatience -pkgver=4.10.4 +pkgver=4.10.5 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=('c5ab4a1a27c4fe2f88e456af08aca3a4d2d1340e') +sha1sums=('65be653b7fa41054e3f446441365fbad65b841b0') build() { mkdir build diff --git a/extra/kdegames-kreversi/PKGBUILD b/extra/kdegames-kreversi/PKGBUILD index f9cbf9bff..33a0647bf 100644 --- a/extra/kdegames-kreversi/PKGBUILD +++ b/extra/kdegames-kreversi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188013 2013-06-08 08:01:01Z andrea $ +# $Id: PKGBUILD 189576 2013-07-03 17:02:47Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kreversi -pkgver=4.10.4 +pkgver=4.10.5 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=('b30a93287348fd2394b9abf4e60b07f29bdccbfb') +sha1sums=('f3ea6c3c37367ca112146c4b85cb521064f1187c') build() { mkdir build diff --git a/extra/kdegames-kshisen/PKGBUILD b/extra/kdegames-kshisen/PKGBUILD index 28532127a..1235fd275 100644 --- a/extra/kdegames-kshisen/PKGBUILD +++ b/extra/kdegames-kshisen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188014 2013-06-08 08:01:02Z andrea $ +# $Id: PKGBUILD 189577 2013-07-03 17:02:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kshisen -pkgver=4.10.4 +pkgver=4.10.5 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=('c09157433df05f409046606d890b0935c167b877') +sha1sums=('28cfe402f4a39d0902a85e8e316f40d26af17e1b') build() { mkdir build diff --git a/extra/kdegames-ksirk/PKGBUILD b/extra/kdegames-ksirk/PKGBUILD index 34f4d08ff..bf17ffde6 100644 --- a/extra/kdegames-ksirk/PKGBUILD +++ b/extra/kdegames-ksirk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188015 2013-06-08 08:01:04Z andrea $ +# $Id: PKGBUILD 189578 2013-07-03 17:02:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksirk -pkgver=4.10.4 +pkgver=4.10.5 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=('f0145f13d8ead33d37855298f8732ac82ea7dbe1') +sha1sums=('dc43176fc71a7ca45976f79eb383aa1922a8adf8') build() { mkdir build diff --git a/extra/kdegames-ksnakeduel/PKGBUILD b/extra/kdegames-ksnakeduel/PKGBUILD index de3357ee0..272318de8 100644 --- a/extra/kdegames-ksnakeduel/PKGBUILD +++ b/extra/kdegames-ksnakeduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188016 2013-06-08 08:01:05Z andrea $ +# $Id: PKGBUILD 189579 2013-07-03 17:02:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksnakeduel -pkgver=4.10.4 +pkgver=4.10.5 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=('21fec5a9e979065958ccb670a7198ecd82a334fb') +sha1sums=('a7c5416dadf66a4148e4e30c12a6dc1528793524') build() { mkdir build diff --git a/extra/kdegames-kspaceduel/PKGBUILD b/extra/kdegames-kspaceduel/PKGBUILD index 6197885c6..b57dd2cd4 100644 --- a/extra/kdegames-kspaceduel/PKGBUILD +++ b/extra/kdegames-kspaceduel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188017 2013-06-08 08:01:06Z andrea $ +# $Id: PKGBUILD 189580 2013-07-03 17:02:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kspaceduel -pkgver=4.10.4 +pkgver=4.10.5 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=('e4e8667c2961bae7a96143ccc7dc342d3c959799') +sha1sums=('1b4146c55498e1223d0cf9209c1cec45d5cb5720') build() { mkdir build diff --git a/extra/kdegames-ksquares/PKGBUILD b/extra/kdegames-ksquares/PKGBUILD index 573eed219..7a41a708c 100644 --- a/extra/kdegames-ksquares/PKGBUILD +++ b/extra/kdegames-ksquares/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188018 2013-06-08 08:01:08Z andrea $ +# $Id: PKGBUILD 189581 2013-07-03 17:02:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksquares -pkgver=4.10.4 +pkgver=4.10.5 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=('6553d30c4f983fd3346ad85e551afbbdb590442c') +sha1sums=('ca68405a5344481c1ed81bda0a7e37d78d0300f4') build() { mkdir build diff --git a/extra/kdegames-ksudoku/PKGBUILD b/extra/kdegames-ksudoku/PKGBUILD index 15d22736f..0941002cf 100644 --- a/extra/kdegames-ksudoku/PKGBUILD +++ b/extra/kdegames-ksudoku/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188019 2013-06-08 08:01:09Z andrea $ +# $Id: PKGBUILD 189582 2013-07-03 17:02:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ksudoku -pkgver=4.10.4 +pkgver=4.10.5 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=('563d086f2b8fe844c7ae5b3fcecef496cb851d20') +sha1sums=('65da23cf971d77c563803f8f35794f4ff1ad4d15') build() { mkdir build diff --git a/extra/kdegames-ktuberling/PKGBUILD b/extra/kdegames-ktuberling/PKGBUILD index 440498402..167069b4c 100644 --- a/extra/kdegames-ktuberling/PKGBUILD +++ b/extra/kdegames-ktuberling/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188020 2013-06-08 08:01:11Z andrea $ +# $Id: PKGBUILD 189583 2013-07-03 17:02:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-ktuberling -pkgver=4.10.4 +pkgver=4.10.5 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=('209f64812e1aa9a6bd4f5ae87a83e6cb096d42f7') +sha1sums=('59128492d7f7ecb1dcde1b88f40ddc186590914d') build() { mkdir build diff --git a/extra/kdegames-kubrick/PKGBUILD b/extra/kdegames-kubrick/PKGBUILD index 10b923e99..744e93344 100644 --- a/extra/kdegames-kubrick/PKGBUILD +++ b/extra/kdegames-kubrick/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188021 2013-06-08 08:01:13Z andrea $ +# $Id: PKGBUILD 189584 2013-07-03 17:03:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-kubrick -pkgver=4.10.4 +pkgver=4.10.5 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=('4b40f130930594908b0764744947c9a2deb1954e') +sha1sums=('e1bc6911e549ca39725b2b093b0d33868c6cea52') build() { mkdir build diff --git a/extra/kdegames-lskat/PKGBUILD b/extra/kdegames-lskat/PKGBUILD index bb83e6700..8904c0738 100644 --- a/extra/kdegames-lskat/PKGBUILD +++ b/extra/kdegames-lskat/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188022 2013-06-08 08:01:15Z andrea $ +# $Id: PKGBUILD 189585 2013-07-03 17:03:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-lskat -pkgver=4.10.4 +pkgver=4.10.5 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=('060cdb3f02655a82442b8eff9ef3d3b2be12fd9c') +sha1sums=('48465c69208786a1e642968e5097b4acedb4aba1') build() { mkdir build diff --git a/extra/kdegames-palapeli/PKGBUILD b/extra/kdegames-palapeli/PKGBUILD index d9d5a7e00..8256821c8 100644 --- a/extra/kdegames-palapeli/PKGBUILD +++ b/extra/kdegames-palapeli/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188023 2013-06-08 08:01:17Z andrea $ +# $Id: PKGBUILD 189586 2013-07-03 17:03:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-palapeli -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A single-player jigsaw puzzle game" url="http://kde.org/applications/games/palapeli/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdegames') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/palapeli-${pkgver}.tar.xz") -sha1sums=('595572e46a0dbd31fe3bb8cb623602dadf3d8753') +sha1sums=('08dfbb9619197597094d1e543825217a9c79c4fd') build() { mkdir build diff --git a/extra/kdegames-picmi/PKGBUILD b/extra/kdegames-picmi/PKGBUILD index ab0817b38..816003aed 100644 --- a/extra/kdegames-picmi/PKGBUILD +++ b/extra/kdegames-picmi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188024 2013-06-08 08:01:18Z andrea $ +# $Id: PKGBUILD 189587 2013-07-03 17:03:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegames-picmi -pkgver=4.10.4 +pkgver=4.10.5 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=('ef1a3c217432e44f4f3f146a54513b9ea56b4c96') +sha1sums=('fd2f95d39f4aeeea694a3b74949a3472783a3719') build() { mkdir build diff --git a/extra/kdegraphics-gwenview/PKGBUILD b/extra/kdegraphics-gwenview/PKGBUILD index b620ba2f7..59323a01a 100644 --- a/extra/kdegraphics-gwenview/PKGBUILD +++ b/extra/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188025 2013-06-08 08:01:19Z andrea $ +# $Id: PKGBUILD 189588 2013-07-03 17:03:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.10.4 +pkgver=4.10.5 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=('0cd301a65f800a201a57295984374612db7d6377') +sha1sums=('14e8b214ad2aa17a3ce586ca481502a120061912') build() { mkdir build diff --git a/extra/kdegraphics-kamera/PKGBUILD b/extra/kdegraphics-kamera/PKGBUILD index a04834fc3..af1fcb9fd 100644 --- a/extra/kdegraphics-kamera/PKGBUILD +++ b/extra/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188026 2013-06-08 08:01:21Z andrea $ +# $Id: PKGBUILD 189589 2013-07-03 17:03:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.10.4 +pkgver=4.10.5 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=('022c0ab35f4a57e6bbf200caff0a8f2688f47b2a') +sha1sums=('1ff61bd5f4bc78b947451306aec899c845d0e178') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kcolorchooser/PKGBUILD b/extra/kdegraphics-kcolorchooser/PKGBUILD index 1c099ce00..7fc3f3a98 100644 --- a/extra/kdegraphics-kcolorchooser/PKGBUILD +++ b/extra/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188027 2013-06-08 08:01:22Z andrea $ +# $Id: PKGBUILD 189590 2013-07-03 17:03:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.10.4 +pkgver=4.10.5 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=('baa625095edbee3b943a0e09287a7c2bff7c20af') +sha1sums=('0e601ca75d6d237c23a83b10b2597b1ff905ea97') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kgamma/PKGBUILD b/extra/kdegraphics-kgamma/PKGBUILD index 6f1b36ca2..5d7513cdb 100644 --- a/extra/kdegraphics-kgamma/PKGBUILD +++ b/extra/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188028 2013-06-08 08:01:24Z andrea $ +# $Id: PKGBUILD 189591 2013-07-03 17:03:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.10.4 +pkgver=4.10.5 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=('e9441c3358e2be76912a5879decedfa911809247') +sha1sums=('31d4f0e2da3475f423a8c9aa77db569d7ea698d6') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kolourpaint/PKGBUILD b/extra/kdegraphics-kolourpaint/PKGBUILD index 471cd21ad..d7f40bb1f 100644 --- a/extra/kdegraphics-kolourpaint/PKGBUILD +++ b/extra/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188029 2013-06-08 08:01:25Z andrea $ +# $Id: PKGBUILD 189592 2013-07-03 17:03:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.10.4 +pkgver=4.10.5 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=('8578d6e50f60955392ac7c9e6aff93696126247f') +sha1sums=('976a2093dda115b16f13603c35959b163cc4169e') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-kruler/PKGBUILD b/extra/kdegraphics-kruler/PKGBUILD index 9b6857ffc..7d788d371 100644 --- a/extra/kdegraphics-kruler/PKGBUILD +++ b/extra/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188030 2013-06-08 08:01:27Z andrea $ +# $Id: PKGBUILD 189593 2013-07-03 17:03:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.10.4 +pkgver=4.10.5 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=('f762162c9fcb276c6c52508c70eea95ba135e4be') +sha1sums=('c76fcd0f5fedcfd0017b3f27349e5fab8dd7bb74') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksaneplugin/PKGBUILD b/extra/kdegraphics-ksaneplugin/PKGBUILD index 6dcde696c..1135a400b 100644 --- a/extra/kdegraphics-ksaneplugin/PKGBUILD +++ b/extra/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188031 2013-06-08 08:01:28Z andrea $ +# $Id: PKGBUILD 189594 2013-07-03 17:03:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.10.4 +pkgver=4.10.5 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=('34a8f6c379aa2defca2441c7f2583f1d75f99441') +sha1sums=('4bae1e43e55f0aad7626c9a2fe10bca46cba1bd8') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-ksnapshot/PKGBUILD b/extra/kdegraphics-ksnapshot/PKGBUILD index 25fa594d6..8025affe1 100644 --- a/extra/kdegraphics-ksnapshot/PKGBUILD +++ b/extra/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188032 2013-06-08 08:01:30Z andrea $ +# $Id: PKGBUILD 189595 2013-07-03 17:03:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.10.4 +pkgver=4.10.5 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=('6550523e0270447a00b7c498fbe03f67b425626b') +sha1sums=('2a5dcb4cc7ed0f290a857d4b7a1418f31c39a25f') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-mobipocket/PKGBUILD b/extra/kdegraphics-mobipocket/PKGBUILD index 0cea57133..481ba502e 100644 --- a/extra/kdegraphics-mobipocket/PKGBUILD +++ b/extra/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188033 2013-06-08 08:01:31Z andrea $ +# $Id: PKGBUILD 189596 2013-07-03 17:03:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('f4b58972ce05a4bdfcb94c972b023f168d3172e9') +sha1sums=('80a5878f2c9f4fa490f22a22fde03003c883c8cb') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD index ca290f5a5..736b0b87e 100644 --- a/extra/kdegraphics-okular/PKGBUILD +++ b/extra/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187932 2013-06-08 07:59:10Z andrea $ +# $Id: PKGBUILD 189495 2013-07-03 17:00:40Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('7659ac1e1d9832f541f605abbfc47da9d3ab2356') +sha1sums=('8009cd23f844691c18001dbfe98a8e2f5a9f30b9') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-strigi-analyzer/PKGBUILD b/extra/kdegraphics-strigi-analyzer/PKGBUILD index 0f81b4a15..1de32d595 100644 --- a/extra/kdegraphics-strigi-analyzer/PKGBUILD +++ b/extra/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188034 2013-06-08 08:01:33Z andrea $ +# $Id: PKGBUILD 189597 2013-07-03 17:03:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.10.4 +pkgver=4.10.5 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=('70feca363d1a5d5aa9d784d62819a34eb701054f') +sha1sums=('b7db0edf8113faa4796cd585e41e514a7218a720') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-svgpart/PKGBUILD b/extra/kdegraphics-svgpart/PKGBUILD index f7c1e3e11..71cf62db3 100644 --- a/extra/kdegraphics-svgpart/PKGBUILD +++ b/extra/kdegraphics-svgpart/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188035 2013-06-08 08:01:34Z andrea $ +# $Id: PKGBUILD 189598 2013-07-03 17:03:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.10.4 +pkgver=4.10.5 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=('356f0bb93514b240a67b0a02edad15ac5e107fdb') +sha1sums=('fcd7759b4a92217c93188ed82e4cff7817013bb5') build() { cd "${srcdir}" diff --git a/extra/kdegraphics-thumbnailers/PKGBUILD b/extra/kdegraphics-thumbnailers/PKGBUILD index f24d37a01..6928b875f 100644 --- a/extra/kdegraphics-thumbnailers/PKGBUILD +++ b/extra/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188036 2013-06-08 08:01:37Z andrea $ +# $Id: PKGBUILD 189599 2013-07-03 17:03:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.10.4 +pkgver=4.10.5 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=('e9c939d22a4dd6c17cdda9da964434e014d6b771') +sha1sums=('88631de08af153d1c745ba2cd0468e8cb7474217') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-audiocd-kio/PKGBUILD b/extra/kdemultimedia-audiocd-kio/PKGBUILD index 9a24d7cf5..31a8f3c18 100644 --- a/extra/kdemultimedia-audiocd-kio/PKGBUILD +++ b/extra/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188037 2013-06-08 08:01:38Z andrea $ +# $Id: PKGBUILD 189600 2013-07-03 17:03:25Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.10.4 +pkgver=4.10.5 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=('7dbd0c6b08fe0b4223012f7332e661c9cd046697') +sha1sums=('d215fe1ec68cee0b833ed82ad34c4850400cc081') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-dragonplayer/PKGBUILD b/extra/kdemultimedia-dragonplayer/PKGBUILD index 8d5cdc6f4..711fb5d39 100644 --- a/extra/kdemultimedia-dragonplayer/PKGBUILD +++ b/extra/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188038 2013-06-08 08:01:40Z andrea $ +# $Id: PKGBUILD 189601 2013-07-03 17:03:26Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.10.4 +pkgver=4.10.5 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=('c7ff43b01890318ed0c629eed64fe36cc2e15db6') +sha1sums=('58cf5d6fa420257665032c70cf8a70485af45a97') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD index 57c08ecc1..85b1bc1d6 100644 --- a/extra/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/extra/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188039 2013-06-08 08:01:41Z andrea $ +# $Id: PKGBUILD 189602 2013-07-03 17:03:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.10.4 +pkgver=4.10.5 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=('6c1e4fcb3fe8ecabca3a49718b815eda0f20c5cc') +sha1sums=('68fb56a2cb51672f250566baeb36e489cc15909c') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-juk/PKGBUILD b/extra/kdemultimedia-juk/PKGBUILD index 042db5183..d12f82761 100644 --- a/extra/kdemultimedia-juk/PKGBUILD +++ b/extra/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188040 2013-06-08 08:01:42Z andrea $ +# $Id: PKGBUILD 189603 2013-07-03 17:03:31Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.10.4 +pkgver=4.10.5 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=('92af1645405b88aef85505649e68e3fcab4a7841') +sha1sums=('9f3aec6a41e3089c0a97feb48d94cd5d206c252a') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD index 5fdf38288..2abc84f93 100644 --- a/extra/kdemultimedia-kmix/PKGBUILD +++ b/extra/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188041 2013-06-08 08:01:44Z andrea $ +# $Id: PKGBUILD 189604 2013-07-03 17:03:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.10.4 +pkgver=4.10.5 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=('d392101358196e0b99bc15846b895dff9c88cafc') +sha1sums=('80b29d1c360dbebf1516c92de144f823012491ee') build() { cd "${srcdir}" diff --git a/extra/kdemultimedia-kscd/PKGBUILD b/extra/kdemultimedia-kscd/PKGBUILD index d3d9ad7a5..bdabd514f 100644 --- a/extra/kdemultimedia-kscd/PKGBUILD +++ b/extra/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188042 2013-06-08 08:01:45Z andrea $ +# $Id: PKGBUILD 189605 2013-07-03 17:03:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.10.4 +pkgver=4.10.5 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=('e3e3c0b60897559ce3f5ff8a0f5dfe7bcd10ae98') +sha1sums=('8573e185d1e3ca05eda2f7a37ff7500859e3d0e3') build() { mkdir build diff --git a/extra/kdemultimedia-mplayerthumbs/PKGBUILD b/extra/kdemultimedia-mplayerthumbs/PKGBUILD index cb09a4512..c8b43845d 100644 --- a/extra/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/extra/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188043 2013-06-08 08:01:46Z andrea $ +# $Id: PKGBUILD 189606 2013-07-03 17:03:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.10.4 +pkgver=4.10.5 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=('3b82041ae4a297c448971bb3faeb9e5492654310') +sha1sums=('dc72e06f6298647635b7490e8acff75a14aa0682') build() { cd "${srcdir}" diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD index d85b87a86..4daeb8141 100644 --- a/extra/kdenetwork/PKGBUILD +++ b/extra/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188553 2013-06-15 11:11:29Z andrea $ +# $Id: PKGBUILD 189607 2013-07-03 17:03:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -9,8 +9,8 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' +sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') prepare() { @@ -48,7 +48,7 @@ package_kdenetwork-filesharing() { pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' depends=('kdelibs' 'smbclient') install='kdenetwork.install' - cd $srcdir/build/filesharing + cd $srcdir/build/kdenetwork-filesharing make DESTDIR=$pkgdir install } @@ -66,8 +66,6 @@ package_kdenetwork-kget() { install='kdenetwork-kget.install' cd $srcdir/build/kget make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kget - make DESTDIR=$pkgdir install } package_kdenetwork-kppp() { @@ -77,7 +75,7 @@ package_kdenetwork-kppp() { install='kdenetwork-kppp.install' cd $srcdir/build/kppp make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kppp + cd $srcdir/build/kppp/doc make DESTDIR=$pkgdir install } @@ -90,7 +88,7 @@ package_kdenetwork-krdc() { url="http://kde.org/applications/internet/krdc/" cd $srcdir/build/krdc make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krdc + cd $srcdir/build/krdc/doc make DESTDIR=$pkgdir install } @@ -102,6 +100,6 @@ package_kdenetwork-krfb() { depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt') cd $srcdir/build/krfb make DESTDIR=$pkgdir install - cd $srcdir/build/doc/krfb + cd $srcdir/build/krfb/doc make DESTDIR=$pkgdir install } diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index fd6e82a1f..194ac9b6f 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187929 2013-06-08 07:59:07Z andrea $ +# $Id: PKGBUILD 189492 2013-07-03 17:00:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkgapi' 'libkolab') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1ef9a4b6224363db2c3b50199dd302cea57c3a27') +sha1sums=('f0b18cd320973c02d9b52cce9f4f424cb868d7fb') build() { mkdir build diff --git a/extra/kdepimlibs/PKGBUILD b/extra/kdepimlibs/PKGBUILD index 7d4aad653..bf30a69c4 100644 --- a/extra/kdepimlibs/PKGBUILD +++ b/extra/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187925 2013-06-08 07:59:03Z andrea $ +# $Id: PKGBUILD 189488 2013-07-03 17:00:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.10.4 +pkgver=4.10.5 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=('58f785dbc07932aad01bd7beeeceacc8fefac0bd') +sha1sums=('3e5ab28312cf1f194d8b3c1999102a4de8029146') build() { mkdir build diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index dabd76d63..96e235cbc 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188046 2013-06-08 08:01:54Z andrea $ +# $Id: PKGBUILD 189609 2013-07-03 17:03:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,6 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-applets-fuzzy-clock' 'kdeplasma-addons-applets-icontasks' 'kdeplasma-addons-applets-incomingmsg' - 'kdeplasma-addons-applets-kdeobservatory' 'kdeplasma-addons-applets-kimpanel' 'kdeplasma-addons-applets-knowledgebase' 'kdeplasma-addons-applets-kolourpicker' @@ -77,7 +76,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -86,7 +85,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=('bdc8f5db0253132f8007d52fc79d8aa2ea2f9e0a') +sha1sums=('d2198e25bdde0f9b4ce6ce0024c4662dc97e5fa4') build() { mkdir build @@ -224,14 +223,6 @@ package_kdeplasma-addons-applets-incomingmsg() { make DESTDIR=$pkgdir install } -package_kdeplasma-addons-applets-kdeobservatory() { - pkgdesc='Visualize the KDE ecosystem' - depends=('kdeplasma-addons-libs' 'qwt') - install='kdeplasma-addons.install' - cd $srcdir/build/applets/kdeobservatory - make DESTDIR=$pkgdir install -} - package_kdeplasma-addons-applets-kimpanel() { pkgdesc='A generic input method panel for Oriental languages' depends=('kdeplasma-addons-libs') diff --git a/extra/kdesdk-kate/PKGBUILD b/extra/kdesdk-kate/PKGBUILD index 6fb1ea26a..f12dadca6 100644 --- a/extra/kdesdk-kate/PKGBUILD +++ b/extra/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 188716 2013-06-18 14:20:59Z andrea $ +# $Id: PKGBUILD 189497 2013-07-03 17:00:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +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=('167c7bc7f9f83f4017f006e2b4c2a3ec24eb6c9d' +sha1sums=('39cca1dad490ba9ec36b43967afc0159d7343185' 'dc70306c507083cf9b4bb1c536858742292fa1bf') prepare() { diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD index 6d615223f..c0e4d4663 100644 --- a/extra/kdesdk/PKGBUILD +++ b/extra/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188047 2013-06-08 08:01:57Z andrea $ +# $Id: PKGBUILD 189610 2013-07-03 17:03:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -16,7 +16,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-poxml' 'kdesdk-strigi-analyzers' 'kdesdk-umbrello') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -26,7 +26,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('da886df4ddebb12e760db7469de1350feed2b338' +sha1sums=('e14780cfd63f14cc4b5ec2f769af6a5e9b416940' '07db42bbcae402c292eebf002e549b04162621c5') prepare() { diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD index 6eac7a25e..08b5c89eb 100644 --- a/extra/kdetoys/PKGBUILD +++ b/extra/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188048 2013-06-08 08:01:58Z andrea $ +# $Id: PKGBUILD 189611 2013-07-03 17:03:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('ad148c0b8acdcc8062d832ca21bb84284bcab841') +sha1sums=('acecc68284addf327b70a72c787befd2cc0f28d2') build() { cd $srcdir diff --git a/extra/kdeutils-filelight/PKGBUILD b/extra/kdeutils-filelight/PKGBUILD index 64a1eb1f0..52a405b26 100644 --- a/extra/kdeutils-filelight/PKGBUILD +++ b/extra/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188050 2013-06-08 08:02:01Z andrea $ +# $Id: PKGBUILD 189613 2013-07-03 17:03:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.10.4 +pkgver=4.10.5 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=('acc3004826ae3afd3f87463b6c36661c566a8c7b') +sha1sums=('0028141091901b08b133d338e6c4ce44448b680c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcalc/PKGBUILD b/extra/kdeutils-kcalc/PKGBUILD index 92475c793..4796e58e2 100644 --- a/extra/kdeutils-kcalc/PKGBUILD +++ b/extra/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188051 2013-06-08 08:02:03Z andrea $ +# $Id: PKGBUILD 189614 2013-07-03 17:03:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.10.4 +pkgver=4.10.5 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=('8c8aa571a6e3541e276128503358c6de6bf8e20a') +sha1sums=('9c9f3219482d5a90e8c90d5fc0a3fa53c947d150') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kcharselect/PKGBUILD b/extra/kdeutils-kcharselect/PKGBUILD index 9a2e544ea..bbfa1af77 100644 --- a/extra/kdeutils-kcharselect/PKGBUILD +++ b/extra/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188052 2013-06-08 08:02:07Z andrea $ +# $Id: PKGBUILD 189615 2013-07-03 17:03:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.10.4 +pkgver=4.10.5 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=('bd3525ffc4fbd2e0f8fbbdd377b00ac21ae9241d') +sha1sums=('0d3ff509cd38ba290160575d7456ec17bfe00628') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kdf/PKGBUILD b/extra/kdeutils-kdf/PKGBUILD index 3cd9bc54b..a15c4b171 100644 --- a/extra/kdeutils-kdf/PKGBUILD +++ b/extra/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188053 2013-06-08 08:02:10Z andrea $ +# $Id: PKGBUILD 189616 2013-07-03 17:03:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.10.4 +pkgver=4.10.5 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=('9d0c6f9a476610670cc7775b6bb5cc5f014f8536') +sha1sums=('23c17847fa52849c90920f4a4717d578aedc0cdc') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kfloppy/PKGBUILD b/extra/kdeutils-kfloppy/PKGBUILD index bf389fc13..9087b06f0 100644 --- a/extra/kdeutils-kfloppy/PKGBUILD +++ b/extra/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188054 2013-06-08 08:02:11Z andrea $ +# $Id: PKGBUILD 189617 2013-07-03 17:04:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.10.4 +pkgver=4.10.5 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=('12160f2b5e7bb94cd72d090627f39b4eaa2ae03e') +sha1sums=('9758ded1ad5a664d4f22f4de16e3809549495ee5') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kgpg/PKGBUILD b/extra/kdeutils-kgpg/PKGBUILD index cef8c9182..e0741d5fc 100644 --- a/extra/kdeutils-kgpg/PKGBUILD +++ b/extra/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188055 2013-06-08 08:02:12Z andrea $ +# $Id: PKGBUILD 189618 2013-07-03 17:04:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.10.4 +pkgver=4.10.5 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=('b4d9773326dfe16f3b50b6f16b52c906b7c3180e') +sha1sums=('4875e0940e4e18d4be9c428c66aaaf204950ae3c') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kremotecontrol/PKGBUILD b/extra/kdeutils-kremotecontrol/PKGBUILD index 85f9325fc..72ef08458 100644 --- a/extra/kdeutils-kremotecontrol/PKGBUILD +++ b/extra/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.10.4 +pkgver=4.10.5 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=('9e8ee623f83a7d909b1e4385430c9716807bfa2e') +sha1sums=('c87ff44502352ae63120991866c239544d28d3ca') build() { cd "${srcdir}" diff --git a/extra/kdeutils-ktimer/PKGBUILD b/extra/kdeutils-ktimer/PKGBUILD index 6c5b89040..2b5e684c9 100644 --- a/extra/kdeutils-ktimer/PKGBUILD +++ b/extra/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188057 2013-06-08 08:02:15Z andrea $ +# $Id: PKGBUILD 189620 2013-07-03 17:04:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.10.4 +pkgver=4.10.5 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=('f98109823013dd6ee7cff81e55f338dbd8695eab') +sha1sums=('f34c6b40a9cc581ab03bd79839276fdd9885b356') build() { cd "${srcdir}" diff --git a/extra/kdeutils-kwallet/PKGBUILD b/extra/kdeutils-kwallet/PKGBUILD index 7aa80414e..5484f5e52 100644 --- a/extra/kdeutils-kwallet/PKGBUILD +++ b/extra/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188058 2013-06-08 08:02:17Z andrea $ +# $Id: PKGBUILD 189621 2013-07-03 17:04:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.10.4 +pkgver=4.10.5 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=('47198c116fab656279090e9461daf334381554b2') +sha1sums=('ff945ff2cee1a0e9bcccd3d526dd077028c21308') build() { cd "${srcdir}" diff --git a/extra/kdeutils-print-manager/PKGBUILD b/extra/kdeutils-print-manager/PKGBUILD index 7106e1082..13c27b5b2 100644 --- a/extra/kdeutils-print-manager/PKGBUILD +++ b/extra/kdeutils-print-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188059 2013-06-08 08:02:19Z andrea $ +# $Id: PKGBUILD 189622 2013-07-03 17:04:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-print-manager -pkgver=4.10.4 +pkgver=4.10.5 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=('a2adfbb31a78f1f7978997844c1d758fac53098a') +sha1sums=('fb8df7bf5f9bd6da2099e9dadf3cdf20f20a9083') build() { mkdir build diff --git a/extra/kdeutils-superkaramba/PKGBUILD b/extra/kdeutils-superkaramba/PKGBUILD index 28f62fd27..76f05035f 100644 --- a/extra/kdeutils-superkaramba/PKGBUILD +++ b/extra/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188060 2013-06-08 08:02:21Z andrea $ +# $Id: PKGBUILD 189623 2013-07-03 17:04:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.10.4 +pkgver=4.10.5 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=('0c5addd5093d676ba2733c7132d4a231f0e6955e') +sha1sums=('7e41f314431432b1d5b7b51432f6c80b910b3e55') build() { cd "${srcdir}" diff --git a/extra/kdeutils-sweeper/PKGBUILD b/extra/kdeutils-sweeper/PKGBUILD index 75890f0c0..5ddc89b6d 100644 --- a/extra/kdeutils-sweeper/PKGBUILD +++ b/extra/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188061 2013-06-08 08:02:22Z andrea $ +# $Id: PKGBUILD 189624 2013-07-03 17:04:14Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.10.4 +pkgver=4.10.5 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=('646e60691f68bfbff9b5ecc57cf0e198a6229a53') +sha1sums=('e88a8782c33ba5ca8893c8df4826dc699de1cccb') build() { cd "${srcdir}" diff --git a/extra/kdewebdev/PKGBUILD b/extra/kdewebdev/PKGBUILD index 0cca96ed0..ee0b1dfe4 100644 --- a/extra/kdewebdev/PKGBUILD +++ b/extra/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188062 2013-06-08 08:02:24Z andrea $ +# $Id: PKGBUILD 189625 2013-07-03 17:04:16Z 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.10.4 +pkgver=4.10.5 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=('d54b8a154350795613080a5f28f56bbf80c10ed2') +sha1sums=('6d81be773a08fe41cbd34ac178107e3ba3a96181') build() { cd $srcdir diff --git a/extra/lcms2/PKGBUILD b/extra/lcms2/PKGBUILD index cfeec5209..2521472b1 100644 --- a/extra/lcms2/PKGBUILD +++ b/extra/lcms2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166698 2012-09-15 23:58:57Z eric $ +# $Id: PKGBUILD 189259 2013-07-01 18:54:09Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=lcms2 -pkgver=2.4 -pkgrel=1.1 +pkgver=2.5 +pkgrel=1 pkgdesc="Small-footprint color management engine, version 2" arch=('i686' 'x86_64' 'mips64el') license=('MIT') @@ -12,21 +12,21 @@ depends=('libtiff') url="http://www.littlecms.com" options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/lcms/${pkgname}-${pkgver}.tar.gz) -sha1sums=('9944902864283af49e4e21a1ca456db4e04ea7c2') +sha1sums=('bab3470471fc7756c5fbe71be9a3c7d677d2ee7b') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } check() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/leveldb/PKGBUILD b/extra/leveldb/PKGBUILD index 1fbc25589..40409218e 100644 --- a/extra/leveldb/PKGBUILD +++ b/extra/leveldb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188250 2013-06-13 13:52:03Z dreisner $ +# $Id: PKGBUILD 189268 2013-07-02 02:41:15Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: feydaykyn <feydaykyn@yahoo.fr> pkgname=leveldb -pkgver=1.10.0 +pkgver=1.12.0 pkgrel=1 pkgdesc="A fast and lightweight key/value database library" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url="https://code.google.com/p/leveldb/" license=('BSD') depends=('gperftools' 'snappy') source=("https://leveldb.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha1sums=('d5b234658138d07f6edc2de24e01d9b0585c03cb') +sha1sums=('e7b84f239949920bfc2d7d1074ec6a6fa8869e23') build() { make -C "$pkgname-$pkgver" diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index d7da69d70..93312bb7e 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185754 2013-05-18 10:51:46Z andyrtr $ +# $Id: PKGBUILD 189301 2013-07-02 19:57:06Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.45 +pkgver=2.4.46 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64 'mips64el') @@ -16,7 +16,7 @@ url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 no-pthread-stubs.patch COPYING) -sha256sums=('3ef0a70c16080fb90c50e807b660b7353d82509c03647f6ecc00bbfa1caee208' +sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1' 'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') diff --git a/extra/libkcddb/PKGBUILD b/extra/libkcddb/PKGBUILD index b58503776..26f5cf8b0 100644 --- a/extra/libkcddb/PKGBUILD +++ b/extra/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187950 2013-06-08 07:59:30Z andrea $ +# $Id: PKGBUILD 189513 2013-07-03 17:01:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.10.4 +pkgver=4.10.5 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=('a9017c1922ee56f51c16c617e9046ccb6149ccd5') +sha1sums=('125568df9a1f8e1f78f29d6e85ac7681100ed9ff') build() { cd "${srcdir}" diff --git a/extra/libkcompactdisc/PKGBUILD b/extra/libkcompactdisc/PKGBUILD index 68225a978..01ecddac6 100644 --- a/extra/libkcompactdisc/PKGBUILD +++ b/extra/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187951 2013-06-08 07:59:31Z andrea $ +# $Id: PKGBUILD 189514 2013-07-03 17:01:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.10.4 +pkgver=4.10.5 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=('d442e7d4257b68f182815f3a4330982a026b7dc3') +sha1sums=('69c63adeaa2d449a36f7cb7b9735321e7f8e3fc2') build() { cd "${srcdir}" diff --git a/extra/libkdcraw/PKGBUILD b/extra/libkdcraw/PKGBUILD index 819d7d53c..cc3dec567 100644 --- a/extra/libkdcraw/PKGBUILD +++ b/extra/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187945 2013-06-08 07:59:25Z andrea $ +# $Id: PKGBUILD 189508 2013-07-03 17:00:59Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -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=('3390eb344d62f7e44fe5db65eb171d397142fa96') +sha1sums=('fc124bb21db24dea02233e26f852628e10dd11d4') build() { mkdir build diff --git a/extra/libkdeedu/PKGBUILD b/extra/libkdeedu/PKGBUILD index 8c3ea236d..a8dc805f1 100644 --- a/extra/libkdeedu/PKGBUILD +++ b/extra/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187943 2013-06-08 07:59:23Z andrea $ +# $Id: PKGBUILD 189506 2013-07-03 17:00:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('78b56f1388be8fcbfc0d9f4f9e395a6ae5f25d7f') +sha1sums=('40c7aa6d23f31389bb72ae9f2c25bbdfe54d34f5') build() { cd "${srcdir}" diff --git a/extra/libkdegames/PKGBUILD b/extra/libkdegames/PKGBUILD index 4f9ffb501..37bfeb96c 100644 --- a/extra/libkdegames/PKGBUILD +++ b/extra/libkdegames/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187952 2013-06-08 07:59:32Z andrea $ +# $Id: PKGBUILD 189515 2013-07-03 17:01:10Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdegames -pkgver=4.10.4 +pkgver=4.10.5 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=('5c3ff5f9ac6c7f4c80044e67cad1863631c0a7e6') +sha1sums=('d4f343d27fbc83e8b31b6bf2cb626e893b9ac515') build() { mkdir build diff --git a/extra/libkexiv2/PKGBUILD b/extra/libkexiv2/PKGBUILD index bc614dfea..b2b49c2bc 100644 --- a/extra/libkexiv2/PKGBUILD +++ b/extra/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187946 2013-06-08 07:59:26Z andrea $ +# $Id: PKGBUILD 189509 2013-07-03 17:01:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.10.4 +pkgver=4.10.5 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=('88db6d3eae13ac1dd0113e456cb1f6ad8f31c7b3') +sha1sums=('9521acdb66893006143bffdba81d2dbf140ce27f') build() { cd "${srcdir}" diff --git a/extra/libkfbapi/PKGBUILD b/extra/libkfbapi/PKGBUILD new file mode 100644 index 000000000..6182653fd --- /dev/null +++ b/extra/libkfbapi/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 188957 2013-06-27 06:08:07Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: birdflesh <antkoul at gmail dot com> + +pkgname=libkfbapi +pkgver=1.0 +pkgrel=1 +pkgdesc="KDE library for accessing Facebook services" +arch=('i686' 'x86_64') +url='https://projects.kde.org/libkfbapi' +license=('GPL') +depends=('kdepimlibs') +makedepends=('cmake' 'automoc4' 'boost') +source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2") +md5sums=('05ce3213a1383796a02115705c2bf829') + +prepare() { + mkdir build +} + +build() { + cd build + cmake ../$pkgname-$pkgver \ + -DQT_QMAKE_EXECUTABLE=qmake-qt4 \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd build + make DESTDIR="${pkgdir}" install +} diff --git a/extra/libkipi/PKGBUILD b/extra/libkipi/PKGBUILD index 805629acf..52ab216c4 100644 --- a/extra/libkipi/PKGBUILD +++ b/extra/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -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=('f4d96eddaad6e160c3ca579420117ed2deec74f6') +sha1sums=('a9ead1c184938ea17b3bc0162dabb4df7ae4673b') build() { cd "${srcdir}" diff --git a/extra/libkmahjongg/PKGBUILD b/extra/libkmahjongg/PKGBUILD index c3fc14617..ae74de3ea 100644 --- a/extra/libkmahjongg/PKGBUILD +++ b/extra/libkmahjongg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187953 2013-06-08 07:59:33Z andrea $ +# $Id: PKGBUILD 189516 2013-07-03 17:01:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkmahjongg -pkgver=4.10.4 +pkgver=4.10.5 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=('5bb8fbcc696702489fb12dde5f8a098aecdd9a3a') +sha1sums=('5dbed099eea3338088b61173c512dda4c92747a4') build() { mkdir build diff --git a/extra/libksane/PKGBUILD b/extra/libksane/PKGBUILD index d72ffc11f..5190eb293 100644 --- a/extra/libksane/PKGBUILD +++ b/extra/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187948 2013-06-08 07:59:28Z andrea $ +# $Id: PKGBUILD 189511 2013-07-03 17:01:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.10.4 +pkgver=4.10.5 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=('6bb65bd85a9e65dfc20448a359df77c11e6aca55') +sha1sums=('5142d582390b031751dc410bdef80253dd596dfb') build() { cd "${srcdir}" diff --git a/extra/libmspack/PKGBUILD b/extra/libmspack/PKGBUILD index cdf016760..f180b2a97 100644 --- a/extra/libmspack/PKGBUILD +++ b/extra/libmspack/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136796 2011-09-01 15:19:12Z andyrtr $ +# $Id: PKGBUILD 189640 2013-07-03 19:24:42Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgname=libmspack -pkgver=0.3alpha -pkgrel=1.1 +pkgver=0.4alpha +pkgrel=1 pkgdesc="A library for Microsoft compression formats" arch=('i686' 'x86_64' 'mips64el') url="http://www.cabextract.org.uk/libmspack/" @@ -12,7 +12,7 @@ depends=('glibc') makedepends=() options=('!libtool') source=(http://www.cabextract.org.uk/libmspack/$pkgname-$pkgver.tar.gz) -md5sums=('08d08455b6d58ea649b35febd23f6386') +md5sums=('1ab10b507259993c74b4c41a88103b59') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libsecret/PKGBUILD b/extra/libsecret/PKGBUILD index 0d1a717b1..2c6086d5c 100644 --- a/extra/libsecret/PKGBUILD +++ b/extra/libsecret/PKGBUILD @@ -3,13 +3,14 @@ pkgname=libsecret pkgver=0.15 -pkgrel=1 +pkgrel=2 pkgdesc='library for storing and retrieving passwords and other secrets.' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') url="https://live.gnome.org/Libsecret" depends=('glib2' 'libgcrypt') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'vala') +optdepends=('gnome-keyring: key storage service (or use any other service implementing org.freedesktop.secrets') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) sha256sums=('33e728b843efbe099483376ff5a3469260ee4b6ce035c7730909ac3793cb0fb8') diff --git a/extra/libtheora/PKGBUILD b/extra/libtheora/PKGBUILD index 7871d1c24..8280477cf 100644 --- a/extra/libtheora/PKGBUILD +++ b/extra/libtheora/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137894 2011-09-12 09:56:42Z pierre $ +# $Id: PKGBUILD 189280 2013-07-02 08:08:13Z jgc $ # Maintainer: Tom Killian <tom@archlinux.org> # Committer: dorphell <dorphell@archlinux.org> pkgname=libtheora pkgver=1.1.1 -pkgrel=2.1 +pkgrel=3 pkgdesc="An open video codec developed by the Xiph.org" arch=('i686' 'x86_64' 'mips64el') url="http://www.xiph.org" @@ -12,18 +12,26 @@ license=('BSD') depends=('libogg') makedepends=('libvorbis') options=('!libtool') -source=("http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2") -md5sums=('292ab65cedd5021d6b7ddd117e07cd8e') -sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262') +source=(http://downloads.xiph.org/releases/theora/libtheora-${pkgver}.tar.bz2 + libtheora-1.1.1-libpng16.patch) +md5sums=('292ab65cedd5021d6b7ddd117e07cd8e' + '08edd81c7a1be2c4edfd2cd3c112a8c6') +sha1sums=('8dcaa8e61cd86eb1244467c0b64b9ddac04ae262' + 'c3f03dbaa5c6459846ce79ea904db1b66971878d') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../libtheora-1.1.1-libpng16.patch +} build() { - cd "${srcdir}/libtheora-${pkgver}" - ./configure --prefix=/usr --enable-shared --disable-static --build=$CHOST --target=$CHOST --host=$CHOST + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --enable-shared --disable-static make } package() { - cd "${srcdir}/libtheora-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/libtheora/libtheora-1.1.1-libpng16.patch b/extra/libtheora/libtheora-1.1.1-libpng16.patch new file mode 100644 index 000000000..93da700c4 --- /dev/null +++ b/extra/libtheora/libtheora-1.1.1-libpng16.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/465450 +http://trac.xiph.org/ticket/1947 + +--- examples/png2theora.c ++++ examples/png2theora.c +@@ -462,9 +462,9 @@ + png_set_strip_alpha(png_ptr); + + row_data = (png_bytep)png_malloc(png_ptr, +- 3*height*width*png_sizeof(*row_data)); ++ 3*height*width*sizeof(*row_data)); + row_pointers = (png_bytep *)png_malloc(png_ptr, +- height*png_sizeof(*row_pointers)); ++ height*sizeof(*row_pointers)); + for(y = 0; y < height; y++) { + row_pointers[y] = row_data + y*(3*width); + } diff --git a/extra/libva-intel-driver/PKGBUILD b/extra/libva-intel-driver/PKGBUILD index e822af1bc..1bf94b42b 100644 --- a/extra/libva-intel-driver/PKGBUILD +++ b/extra/libva-intel-driver/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182376 2013-04-09 18:36:11Z ioni $ +# $Id: PKGBUILD 188964 2013-06-27 12:37:13Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva-intel-driver -pkgver=1.0.20 +pkgver=1.2.0 pkgrel=1 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('libva') options=('!libtool') replaces=('libva-driver-intel') source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('0aeba2d78f02c4f2c13b519c468e04fa88b2ae3e') +sha1sums=('580c8dc5d2323b1e7dd9506512695001f845c2f1') build() { cd $pkgname-$pkgver diff --git a/extra/libva/PKGBUILD b/extra/libva/PKGBUILD index 5542ce890..bcf5de286 100644 --- a/extra/libva/PKGBUILD +++ b/extra/libva/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 182375 2013-04-09 18:35:29Z ioni $ +# $Id: PKGBUILD 188963 2013-06-27 12:36:37Z heftig $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgname=libva -pkgver=1.1.1 +pkgver=1.2.1 pkgrel=1 pkgdesc="Video Acceleration (VA) API for Linux" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ optdepends=('libva-vdpau-driver: vdpau back-end for nvidia' 'libva-intel-driver: back-end for intel cards') options=('!libtool') source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) -sha1sums=('755e488677a196c9ac18b8c0d11aa2a56e050306') +sha1sums=('f716a4cadd670b14f44a2e833f96a2c509956339') build() { cd "$pkgname-$pkgver" diff --git a/extra/libvdpau/PKGBUILD b/extra/libvdpau/PKGBUILD index f62047d91..ec4e40325 100644 --- a/extra/libvdpau/PKGBUILD +++ b/extra/libvdpau/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 176895 2013-02-02 07:01:31Z andyrtr $ +# $Id: PKGBUILD 189278 2013-07-02 07:41:51Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libvdpau pkgver=0.6 -pkgrel=1 +pkgrel=2 pkgdesc="Nvidia VDPAU library" arch=(i686 x86_64 mips64el) url='http://cgit.freedesktop.org/~aplattner/libvdpau' -depends=('gcc-libs') +depends=('gcc-libs' 'libxext') conflicts=('nvidia-utils<190.42-2') options=('!libtool') license=('custom') source=(http://people.freedesktop.org/~aplattner/vdpau/${pkgname}-${pkgver}.tar.gz) -makedepends=('libx11') +makedepends=('dri2proto') sha256sums=('9b55beec9d8b01bbf89229b7d075ceee870f4e1830523c11f29a46c07fe72d75') build() { diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD index ae57ce964..ac72fa01e 100644 --- a/extra/libwebp/PKGBUILD +++ b/extra/libwebp/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 184409 2013-05-06 19:38:39Z foutrelis $ +# $Id: PKGBUILD 188992 2013-06-27 23:02:01Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> # Contributor: Jon Nordby <jononor@gmail.com> pkgname=libwebp -pkgver=0.3.0 -pkgrel=3 +pkgver=0.3.1 +pkgrel=1 pkgdesc="WebP library and conversion tools" arch=('x86_64' 'i686' 'mips64el') url="https://developers.google.com/speed/webp/" @@ -13,7 +13,7 @@ license=(BSD) depends=(libpng libjpeg libtiff giflib) options=('!libtool') source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz") -sha256sums=('8903fca40ece603b9cb20d32105168da7e2a33bebbd4d89001a3c8741ef03ddb') +sha256sums=('b37932c625322a69fe4e9b88884b5c7aed2b3eaf9fd5e5b480aee339a92e6ee7') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD index 38e2623e2..8d7b13e69 100644 --- a/extra/libxi/PKGBUILD +++ b/extra/libxi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188904 2013-06-24 21:48:21Z lcarlier $ +# $Id: PKGBUILD 189335 2013-07-03 08:11:31Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libxi -pkgver=1.7.1 -pkgrel=3 +pkgver=1.7.2 +pkgrel=1 pkgdesc="X11 Input extension library" arch=('i686' 'x86_64' 'mips64el') url="http://xorg.freedesktop.org" @@ -12,20 +12,8 @@ depends=('libxext' 'inputproto') makedepends=('pkgconfig' 'xorg-util-macros' 'libxfixes' 'automake') options=(!libtool) license=('custom') -source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2 - git-fixes.diff) -sha256sums=('e92adb6b69c53c51e05c1e65db97e23751b935a693000fb0606c11b88c0066c5' - 'faa2f76f68e65f537062829ad45977561079ac8747bd8e24a82055e70a5bf0cc') - -prepare() { - cd "${srcdir}/libXi-${pkgver}" - - # fix CVE-2013-1998 CVE-2013-1984 CVE-2013-1995 merged upstream - patch -Np1 -i ${srcdir}/git-fixes.diff - - # a patch change configure.ac - autoreconf -fiv -} +source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2) +sha256sums=('df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e') build() { cd "${srcdir}/libXi-${pkgver}" diff --git a/extra/libxi/git-fixes.diff b/extra/libxi/git-fixes.diff deleted file mode 100644 index b1b4f40d9..000000000 --- a/extra/libxi/git-fixes.diff +++ /dev/null @@ -1,1386 +0,0 @@ -From bb82c72a1d69eaf60b7586570faf797df967f661 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Mon, 29 Apr 2013 18:39:34 -0700 -Subject: [PATCH 01/16] Expand comment on the memory vs. reply ordering in - XIGetSelectedEvents() - -Unpacking from the wire involves un-interleaving the structs & masks, -which wasn't obvious to me the first time I read it, so make notes -before I forget again. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XISelEv.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/XISelEv.c b/src/XISelEv.c -index fa7eb54..f871222 100644 ---- a/src/XISelEv.c -+++ b/src/XISelEv.c -@@ -135,8 +135,14 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - - _XRead(dpy, (char*)mask_in, reply.length * 4); - -- /* Memory layout of the XIEventMask for a 3 mask reply: -- * [struct a][struct b][struct c][masks a][masks b][masks c] -+ /* -+ * This function takes interleaved xXIEventMask structs & masks off -+ * the wire, such as this 3 mask reply: -+ * [struct a][masks a][struct b][masks b][struct c][masks c] -+ * And generates a memory buffer to be returned to callers in which -+ * they are not interleaved, so that callers can treat the returned -+ * pointer as a simple array of XIEventMask structs, such as: -+ * [struct a][struct b][struct c][masks a][masks b][masks c] - */ - len = reply.num_masks * sizeof(XIEventMask); - --- -1.8.3.1 - - -From 5d43d4914dcabb6de69859567061e99300e56ef4 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri, 17 May 2013 09:07:44 +1000 -Subject: [PATCH 02/16] Copy the sequence number into the target event too - (#64687) - -X.Org Bug 64687 <http://bugs.freedesktop.org/show_bug.cgi?id=64687> - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> ---- - src/XExtInt.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 507573b..8e19b97 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -915,6 +915,7 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -+ cookie->serial = ev->sequenceNumber; - } - - static Bool -@@ -1521,6 +1522,7 @@ wireToDeviceEvent(xXIDeviceEvent *in, XGenericEventCookie* cookie) - out = next_block(&ptr_lib, sizeof(XIDeviceEvent)); - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1793,6 +1795,7 @@ wireToDeviceChangedEvent(xXIDeviceChangedEvent *in, XGenericEventCookie *cookie) - cookie->data = out = malloc(sizeof(XIDeviceChangedEvent) + len); - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1825,6 +1828,7 @@ wireToHierarchyChangedEvent(xXIHierarchyEvent *in, XGenericEventCookie *cookie) - out->info = (XIHierarchyInfo*)&out[1]; - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1865,6 +1869,7 @@ wireToRawEvent(XExtDisplayInfo *info, xXIRawEvent *in, XGenericEventCookie *cook - - out = next_block(&ptr, sizeof(XIRawEvent)); - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1915,6 +1920,7 @@ wireToEnterLeave(xXIEnterEvent *in, XGenericEventCookie *cookie) - out->buttons.mask = (unsigned char*)&out[1]; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -1957,6 +1963,7 @@ wireToPropertyEvent(xXIPropertyEvent *in, XGenericEventCookie *cookie) - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); -@@ -1977,6 +1984,7 @@ wireToTouchOwnershipEvent(xXITouchOwnershipEvent *in, - cookie->data = out; - - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->display = cookie->display; - out->extension = in->extension; - out->evtype = in->evtype; -@@ -2004,6 +2012,7 @@ wireToBarrierEvent(xXIBarrierEvent *in, XGenericEventCookie *cookie) - - out->display = cookie->display; - out->type = in->type; -+ out->serial = in->sequenceNumber; - out->extension = in->extension; - out->evtype = in->evtype; - out->send_event = ((in->type & 0x80) != 0); --- -1.8.3.1 - - -From 59b8e1388a687f871831ac5a9e0ac11de75e2516 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Wed, 1 May 2013 23:58:39 -0700 -Subject: [PATCH 03/16] Use _XEatDataWords to avoid overflow of rep.length bit - shifting - -rep.length is a CARD32, so rep.length << 2 could overflow in 32-bit builds - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - configure.ac | 6 ++++++ - src/XGMotion.c | 2 +- - src/XGetDCtl.c | 2 +- - src/XGetDProp.c | 5 ++--- - src/XGetFCtl.c | 2 +- - src/XGetKMap.c | 2 +- - src/XGetMMap.c | 2 +- - src/XGetProp.c | 4 +--- - src/XGtSelect.c | 2 +- - src/XIProperties.c | 7 +++---- - src/XIint.h | 14 ++++++++++++++ - src/XListDProp.c | 2 +- - src/XListDev.c | 2 +- - src/XOpenDev.c | 2 +- - src/XQueryDv.c | 2 +- - 15 files changed, 36 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8dbca38..f5ef1e2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,6 +31,12 @@ PKG_CHECK_MODULES(XI, [xproto >= 7.0.13] [x11 >= 1.4.99.1] [xextproto >= 7.0.3] - # CFLAGS only for PointerBarrier typedef - PKG_CHECK_MODULES(XFIXES, [xfixes >= 5]) - -+# Check for _XEatDataWords function that may be patched into older Xlib releases -+SAVE_LIBS="$LIBS" -+LIBS="$XI_LIBS" -+AC_CHECK_FUNCS([_XEatDataWords]) -+LIBS="$SAVE_LIBS" -+ - # Check for xmlto and asciidoc for man page conversion - # (only needed by people building tarballs) - if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then -diff --git a/src/XGMotion.c b/src/XGMotion.c -index 99b1c44..5feac85 100644 ---- a/src/XGMotion.c -+++ b/src/XGMotion.c -@@ -112,7 +112,7 @@ XGetDeviceMotionEvents( - Xfree(bufp); - Xfree(savp); - *nEvents = 0; -- _XEatData(dpy, (unsigned long)size); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (NULL); -diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c -index c66212d..f73a4e8 100644 ---- a/src/XGetDCtl.c -+++ b/src/XGetDCtl.c -@@ -95,7 +95,7 @@ XGetDeviceControl( - nbytes = (long)rep.length << 2; - d = (xDeviceState *) Xmalloc((unsigned)nbytes); - if (!d) { -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - sav = d; -diff --git a/src/XGetDProp.c b/src/XGetDProp.c -index 5d44f91..f9e8f0c 100644 ---- a/src/XGetDProp.c -+++ b/src/XGetDProp.c -@@ -112,14 +112,13 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- nbytes = rep.length << 2; -- _XEatData(dpy, (unsigned long) nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadImplementation); - } - if (! *prop) { -- _XEatData(dpy, (unsigned long) nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadAlloc); -diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c -index 43afa00..28fab4d 100644 ---- a/src/XGetFCtl.c -+++ b/src/XGetFCtl.c -@@ -95,7 +95,7 @@ XGetFeedbackControl( - nbytes = (long)rep.length << 2; - f = (xFeedbackState *) Xmalloc((unsigned)nbytes); - if (!f) { -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - sav = f; -diff --git a/src/XGetKMap.c b/src/XGetKMap.c -index 9431fbb..00dde06 100644 ---- a/src/XGetKMap.c -+++ b/src/XGetKMap.c -@@ -99,7 +99,7 @@ XGetDeviceKeyMapping(register Display * dpy, XDevice * dev, - if (mapping) - _XRead(dpy, (char *)mapping, nbytes); - else -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - } - - UnlockDisplay(dpy); -diff --git a/src/XGetMMap.c b/src/XGetMMap.c -index 8a1cdb2..ce10c2d 100644 ---- a/src/XGetMMap.c -+++ b/src/XGetMMap.c -@@ -92,7 +92,7 @@ XGetDeviceModifierMapping( - if (res->modifiermap) - _XReadPad(dpy, (char *)res->modifiermap, nbytes); - else -- _XEatData(dpy, (unsigned long)nbytes); -+ _XEatDataWords(dpy, rep.length); - res->max_keypermod = rep.numKeyPerModifier; - } - -diff --git a/src/XGetProp.c b/src/XGetProp.c -index c5d088b..34bc581 100644 ---- a/src/XGetProp.c -+++ b/src/XGetProp.c -@@ -68,7 +68,6 @@ XGetDeviceDontPropagateList( - int *count) - { - XEventClass *list = NULL; -- int rlen; - xGetDeviceDontPropagateListReq *req; - xGetDeviceDontPropagateListReply rep; - XExtDisplayInfo *info = XInput_find_display(dpy); -@@ -90,7 +89,6 @@ XGetDeviceDontPropagateList( - *count = rep.count; - - if (*count) { -- rlen = rep.length << 2; - list = (XEventClass *) Xmalloc(rep.length * sizeof(XEventClass)); - if (list) { - int i; -@@ -105,7 +103,7 @@ XGetDeviceDontPropagateList( - list[i] = (XEventClass) ec; - } - } else -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - } - - UnlockDisplay(dpy); -diff --git a/src/XGtSelect.c b/src/XGtSelect.c -index f890db7..5c0f812 100644 ---- a/src/XGtSelect.c -+++ b/src/XGtSelect.c -@@ -104,7 +104,7 @@ XGetSelectedExtensionEvents( - (XEventClass *) Xmalloc(*this_client_count * - sizeof(XEventClass)); - if (!*this_client_list) { -- _XEatData(dpy, (unsigned long)tlen + alen); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (Success); -diff --git a/src/XIProperties.c b/src/XIProperties.c -index 83a7a68..5e58fb6 100644 ---- a/src/XIProperties.c -+++ b/src/XIProperties.c -@@ -64,7 +64,7 @@ XIListProperties(Display* dpy, int deviceid, int *num_props_return) - props = (Atom*)Xmalloc(rep.num_properties * sizeof(Atom)); - if (!props) - { -- _XEatData(dpy, rep.num_properties << 2); -+ _XEatDataWords(dpy, rep.length); - goto cleanup; - } - -@@ -203,8 +203,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- nbytes = rep.length << 2; -- _XEatData(dpy, nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadImplementation); -@@ -222,7 +221,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - *data = Xmalloc(rbytes); - - if (!(*data)) { -- _XEatData(dpy, nbytes); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return(BadAlloc); -diff --git a/src/XIint.h b/src/XIint.h -index 571bb23..3ddc3c5 100644 ---- a/src/XIint.h -+++ b/src/XIint.h -@@ -83,4 +83,18 @@ next_block(void **ptr, int size) { - return ret; - } - -+#ifndef HAVE__XEATDATAWORDS -+#include <X11/Xmd.h> /* for LONG64 on 64-bit platforms */ -+#include <limits.h> -+ -+static inline void _XEatDataWords(Display *dpy, unsigned long n) -+{ -+# ifndef LONG64 -+ if (n >= (ULONG_MAX >> 2)) -+ _XIOError(dpy); -+# endif -+ _XEatData (dpy, n << 2); -+} -+#endif -+ - #endif -diff --git a/src/XListDProp.c b/src/XListDProp.c -index 8667350..bde6cb5 100644 ---- a/src/XListDProp.c -+++ b/src/XListDProp.c -@@ -65,7 +65,7 @@ XListDeviceProperties(Display* dpy, XDevice* dev, int *nprops_return) - props = (Atom*)Xmalloc(rep.nAtoms * sizeof(Atom)); - if (!props) - { -- _XEatData(dpy, rep.nAtoms << 2); -+ _XEatDataWords(dpy, rep.length); - goto cleanup; - } - -diff --git a/src/XListDev.c b/src/XListDev.c -index bd6e70a..1fa4747 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -202,7 +202,7 @@ XListInputDevices( - list = (xDeviceInfo *) Xmalloc(rlen); - slist = list; - if (!slist) { -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); - SyncHandle(); - return (XDeviceInfo *) NULL; -diff --git a/src/XOpenDev.c b/src/XOpenDev.c -index 74f18ac..e784f8b 100644 ---- a/src/XOpenDev.c -+++ b/src/XOpenDev.c -@@ -101,7 +101,7 @@ XOpenDevice( - if (rlen - dlen > 0) - _XEatData(dpy, (unsigned long)rlen - dlen); - } else -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - - UnlockDisplay(dpy); - SyncHandle(); -diff --git a/src/XQueryDv.c b/src/XQueryDv.c -index 24d4e4e..69c285b 100644 ---- a/src/XQueryDv.c -+++ b/src/XQueryDv.c -@@ -91,7 +91,7 @@ XQueryDeviceState( - if (rlen > 0) { - data = Xmalloc(rlen); - if (!data) { -- _XEatData(dpy, (unsigned long)rlen); -+ _XEatDataWords(dpy, rep.length); - goto out; - } - _XRead(dpy, data, rlen); --- -1.8.3.1 - - -From f3e08e4fbe40016484ba795feecf1a742170ffc1 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:26:52 -0800 -Subject: [PATCH 04/16] Stack buffer overflow in XGetDeviceButtonMapping() - [CVE-2013-1998 1/3] - -We copy the entire reply sent by the server into the fixed size -mapping[] array on the stack, even if the server says it's a larger -size than the mapping array can hold. HULK SMASH STACK! - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetBMap.c | 21 +++++++++++++-------- - 1 file changed, 13 insertions(+), 8 deletions(-) - -diff --git a/src/XGetBMap.c b/src/XGetBMap.c -index 211c9ca..002daba 100644 ---- a/src/XGetBMap.c -+++ b/src/XGetBMap.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - #ifdef MIN /* some systems define this in <sys/param.h> */ - #undef MIN -@@ -75,7 +76,6 @@ XGetDeviceButtonMapping( - { - int status = 0; - unsigned char mapping[256]; /* known fixed size */ -- long nbytes; - XExtDisplayInfo *info = XInput_find_display(dpy); - - register xGetDeviceButtonMappingReq *req; -@@ -92,13 +92,18 @@ XGetDeviceButtonMapping( - - status = _XReply(dpy, (xReply *) & rep, 0, xFalse); - if (status == 1) { -- nbytes = (long)rep.length << 2; -- _XRead(dpy, (char *)mapping, nbytes); -- -- /* don't return more data than the user asked for. */ -- if (rep.nElts) -- memcpy((char *)map, (char *)mapping, MIN((int)rep.nElts, nmap)); -- status = rep.nElts; -+ if (rep.length <= (sizeof(mapping) >> 2)) { -+ unsigned long nbytes = rep.length << 2; -+ _XRead(dpy, (char *)mapping, nbytes); -+ -+ /* don't return more data than the user asked for. */ -+ if (rep.nElts) -+ memcpy(map, mapping, MIN((int)rep.nElts, nmap)); -+ status = rep.nElts; -+ } else { -+ _XEatDataWords(dpy, rep.length); -+ status = 0; -+ } - } else - status = 0; - UnlockDisplay(dpy); --- -1.8.3.1 - - -From 91434737f592e8f5cc1762383882a582b55fc03a Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 23:37:23 -0800 -Subject: [PATCH 05/16] memory corruption in _XIPassiveGrabDevice() - [CVE-2013-1998 2/3] - -If the server returned more modifiers than the caller asked for, -we'd just keep copying past the end of the array provided by the -caller, writing over who-knows-what happened to be there. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XIPassiveGrab.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/XIPassiveGrab.c b/src/XIPassiveGrab.c -index ac17c01..53b4084 100644 ---- a/src/XIPassiveGrab.c -+++ b/src/XIPassiveGrab.c -@@ -88,7 +88,7 @@ _XIPassiveGrabDevice(Display* dpy, int deviceid, int grabtype, int detail, - return -1; - _XRead(dpy, (char*)failed_mods, reply.num_modifiers * sizeof(xXIGrabModifierInfo)); - -- for (i = 0; i < reply.num_modifiers; i++) -+ for (i = 0; i < reply.num_modifiers && i < num_modifiers; i++) - { - modifiers_inout[i].status = failed_mods[i].status; - modifiers_inout[i].modifiers = failed_mods[i].modifiers; --- -1.8.3.1 - - -From 5398ac0797f7516f2c9b8f2869a6c6d071437352 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 26 Apr 2013 22:48:36 -0700 -Subject: [PATCH 06/16] unvalidated lengths in XQueryDeviceState() - [CVE-2013-1998 3/3] - -If the lengths given for each class state in the reply add up to more -than the rep.length, we could read past the end of the buffer allocated -to hold the data read from the server. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XQueryDv.c | 17 ++++++++++++----- - 1 file changed, 12 insertions(+), 5 deletions(-) - -diff --git a/src/XQueryDv.c b/src/XQueryDv.c -index 69c285b..3836777 100644 ---- a/src/XQueryDv.c -+++ b/src/XQueryDv.c -@@ -59,6 +59,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceState * - XQueryDeviceState( -@@ -66,8 +67,8 @@ XQueryDeviceState( - XDevice *dev) - { - int i, j; -- int rlen; -- int size = 0; -+ unsigned long rlen; -+ size_t size = 0; - xQueryDeviceStateReq *req; - xQueryDeviceStateReply rep; - XDeviceState *state = NULL; -@@ -87,9 +88,11 @@ XQueryDeviceState( - if (!_XReply(dpy, (xReply *) & rep, 0, xFalse)) - goto out; - -- rlen = rep.length << 2; -- if (rlen > 0) { -- data = Xmalloc(rlen); -+ if (rep.length > 0) { -+ if (rep.length < (INT_MAX >> 2)) { -+ rlen = (unsigned long) rep.length << 2; -+ data = Xmalloc(rlen); -+ } - if (!data) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -97,6 +100,10 @@ XQueryDeviceState( - _XRead(dpy, data, rlen); - - for (i = 0, any = (XInputClass *) data; i < (int)rep.num_classes; i++) { -+ if (any->length > rlen) -+ goto out; -+ rlen -= any->length; -+ - switch (any->class) { - case KeyClass: - size += sizeof(XKeyState); --- -1.8.3.1 - - -From b0b13c12a8079a5a0e7f43b2b8983699057b2cec Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 07/16] integer overflow in XGetDeviceControl() [CVE-2013-1984 - 1/8] - -If the number of valuators reported by the server is large enough that -it overflows when multiplied by the size of the appropriate struct, then -memory corruption can occur when more bytes are copied from the X server -reply than the size of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, so -we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetDCtl.c | 31 ++++++++++++++++++++++++------- - 1 file changed, 24 insertions(+), 7 deletions(-) - -diff --git a/src/XGetDCtl.c b/src/XGetDCtl.c -index f73a4e8..51ed0ae 100644 ---- a/src/XGetDCtl.c -+++ b/src/XGetDCtl.c -@@ -61,6 +61,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceControl * - XGetDeviceControl( -@@ -68,8 +69,6 @@ XGetDeviceControl( - XDevice *dev, - int control) - { -- int size = 0; -- int nbytes, i; - XDeviceControl *Device = NULL; - XDeviceControl *Sav = NULL; - xDeviceState *d = NULL; -@@ -92,8 +91,12 @@ XGetDeviceControl( - goto out; - - if (rep.length > 0) { -- nbytes = (long)rep.length << 2; -- d = (xDeviceState *) Xmalloc((unsigned)nbytes); -+ unsigned long nbytes; -+ size_t size = 0; -+ if (rep.length < (INT_MAX >> 2)) { -+ nbytes = (unsigned long) rep.length << 2; -+ d = Xmalloc(nbytes); -+ } - if (!d) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -111,33 +114,46 @@ XGetDeviceControl( - case DEVICE_RESOLUTION: - { - xDeviceResolutionState *r; -+ size_t val_size; - - r = (xDeviceResolutionState *) d; -- size += sizeof(XDeviceResolutionState) + -- (3 * sizeof(int) * r->num_valuators); -+ if (r->num_valuators >= (INT_MAX / (3 * sizeof(int)))) -+ goto out; -+ val_size = 3 * sizeof(int) * r->num_valuators; -+ if ((sizeof(xDeviceResolutionState) + val_size) > nbytes) -+ goto out; -+ size += sizeof(XDeviceResolutionState) + val_size; - break; - } - case DEVICE_ABS_CALIB: - { -+ if (sizeof(xDeviceAbsCalibState) > nbytes) -+ goto out; - size += sizeof(XDeviceAbsCalibState); - break; - } - case DEVICE_ABS_AREA: - { -+ if (sizeof(xDeviceAbsAreaState) > nbytes) -+ goto out; - size += sizeof(XDeviceAbsAreaState); - break; - } - case DEVICE_CORE: - { -+ if (sizeof(xDeviceCoreState) > nbytes) -+ goto out; - size += sizeof(XDeviceCoreState); - break; - } - default: -+ if (d->length > nbytes) -+ goto out; - size += d->length; - break; - } - -- Device = (XDeviceControl *) Xmalloc((unsigned)size); -+ Device = Xmalloc(size); - if (!Device) - goto out; - -@@ -150,6 +166,7 @@ XGetDeviceControl( - int *iptr, *iptr2; - xDeviceResolutionState *r; - XDeviceResolutionState *R; -+ unsigned int i; - - r = (xDeviceResolutionState *) d; - R = (XDeviceResolutionState *) Device; --- -1.8.3.1 - - -From 322ee3576789380222d4403366e4fd12fb24cb6a Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 08/16] integer overflow in XGetFeedbackControl() - [CVE-2013-1984 2/8] - -If the number of feedbacks reported by the server is large enough that -it overflows when multiplied by the size of the appropriate struct, or -if the total size of all the feedback structures overflows when added -together, then memory corruption can occur when more bytes are copied from -the X server reply than the size of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, so - we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetFCtl.c | 24 +++++++++++++++++++----- - 1 file changed, 19 insertions(+), 5 deletions(-) - -diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c -index 28fab4d..bb50bf3 100644 ---- a/src/XGetFCtl.c -+++ b/src/XGetFCtl.c -@@ -61,6 +61,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XFeedbackState * - XGetFeedbackControl( -@@ -68,8 +69,6 @@ XGetFeedbackControl( - XDevice *dev, - int *num_feedbacks) - { -- int size = 0; -- int nbytes, i; - XFeedbackState *Feedback = NULL; - XFeedbackState *Sav = NULL; - xFeedbackState *f = NULL; -@@ -91,9 +90,16 @@ XGetFeedbackControl( - goto out; - - if (rep.length > 0) { -+ unsigned long nbytes; -+ size_t size = 0; -+ int i; -+ - *num_feedbacks = rep.num_feedbacks; -- nbytes = (long)rep.length << 2; -- f = (xFeedbackState *) Xmalloc((unsigned)nbytes); -+ -+ if (rep.length < (INT_MAX >> 2)) { -+ nbytes = rep.length << 2; -+ f = Xmalloc(nbytes); -+ } - if (!f) { - _XEatDataWords(dpy, rep.length); - goto out; -@@ -102,6 +108,10 @@ XGetFeedbackControl( - _XRead(dpy, (char *)f, nbytes); - - for (i = 0; i < *num_feedbacks; i++) { -+ if (f->length > nbytes) -+ goto out; -+ nbytes -= f->length; -+ - switch (f->class) { - case KbdFeedbackClass: - size += sizeof(XKbdFeedbackState); -@@ -116,6 +126,8 @@ XGetFeedbackControl( - { - xStringFeedbackState *strf = (xStringFeedbackState *) f; - -+ if (strf->num_syms_supported >= (INT_MAX / sizeof(KeySym))) -+ goto out; - size += sizeof(XStringFeedbackState) + - (strf->num_syms_supported * sizeof(KeySym)); - } -@@ -130,10 +142,12 @@ XGetFeedbackControl( - size += f->length; - break; - } -+ if (size > INT_MAX) -+ goto out; - f = (xFeedbackState *) ((char *)f + f->length); - } - -- Feedback = (XFeedbackState *) Xmalloc((unsigned)size); -+ Feedback = Xmalloc(size); - if (!Feedback) - goto out; - --- -1.8.3.1 - - -From 6dd6dc51a2935c72774be81e5cc2ba2c30e9feff Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 09/16] integer overflow in XGetDeviceDontPropagateList() - [CVE-2013-1984 3/8] - -If the number of event classes reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -V2: EatData if count is 0 but length is > 0 to avoid XIOErrors - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetProp.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/XGetProp.c b/src/XGetProp.c -index 34bc581..b49328c 100644 ---- a/src/XGetProp.c -+++ b/src/XGetProp.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XEventClass * - XGetDeviceDontPropagateList( -@@ -88,10 +89,11 @@ XGetDeviceDontPropagateList( - } - *count = rep.count; - -- if (*count) { -- list = (XEventClass *) Xmalloc(rep.length * sizeof(XEventClass)); -+ if (rep.length != 0) { -+ if ((rep.count != 0) && (rep.length < (INT_MAX / sizeof(XEventClass)))) -+ list = Xmalloc(rep.length * sizeof(XEventClass)); - if (list) { -- int i; -+ unsigned int i; - CARD32 ec; - - /* read and assign each XEventClass separately because --- -1.8.3.1 - - -From bb922ed4253b35590f0369f32a917ff89ade0830 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 10/16] integer overflow in XGetDeviceMotionEvents() - [CVE-2013-1984 4/8] - -If the number of events or axes reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGMotion.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/XGMotion.c b/src/XGMotion.c -index 5feac85..a4c75b6 100644 ---- a/src/XGMotion.c -+++ b/src/XGMotion.c -@@ -59,6 +59,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - XDeviceTimeCoord * - XGetDeviceMotionEvents( -@@ -74,7 +75,7 @@ XGetDeviceMotionEvents( - xGetDeviceMotionEventsReply rep; - XDeviceTimeCoord *tc; - int *data, *bufp, *readp, *savp; -- long size, size2; -+ unsigned long size; - int i, j; - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -104,10 +105,21 @@ XGetDeviceMotionEvents( - SyncHandle(); - return (NULL); - } -- size = rep.length << 2; -- size2 = rep.nEvents * (sizeof(XDeviceTimeCoord) + (rep.axes * sizeof(int))); -- savp = readp = (int *)Xmalloc(size); -- bufp = (int *)Xmalloc(size2); -+ if (rep.length < (INT_MAX >> 2)) { -+ size = rep.length << 2; -+ savp = readp = Xmalloc(size); -+ } else { -+ size = 0; -+ savp = readp = NULL; -+ } -+ /* rep.axes is a CARD8, so assume max number of axes for bounds check */ -+ if (rep.nEvents < -+ (INT_MAX / (sizeof(XDeviceTimeCoord) + (UCHAR_MAX * sizeof(int))))) { -+ size_t bsize = rep.nEvents * -+ (sizeof(XDeviceTimeCoord) + (rep.axes * sizeof(int))); -+ bufp = Xmalloc(bsize); -+ } else -+ bufp = NULL; - if (!bufp || !savp) { - Xfree(bufp); - Xfree(savp); --- -1.8.3.1 - - -From 242f92b490a695fbab244af5bad11b71f897c732 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 11/16] integer overflow in XIGetProperty() [CVE-2013-1984 5/8] - -If the number of items reported by the server is large enough that -it overflows when multiplied by the size of the appropriate item type, -then memory corruption can occur when more bytes are copied from the -X server reply than the size of the buffer we allocated to hold them. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XIProperties.c | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/src/XIProperties.c b/src/XIProperties.c -index 5e58fb6..32436d1 100644 ---- a/src/XIProperties.c -+++ b/src/XIProperties.c -@@ -38,6 +38,7 @@ - #include <X11/extensions/XInput2.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - Atom* - XIListProperties(Display* dpy, int deviceid, int *num_props_return) -@@ -170,7 +171,7 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - { - xXIGetPropertyReq *req; - xXIGetPropertyReply rep; -- long nbytes, rbytes; -+ unsigned long nbytes, rbytes; - - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -216,9 +217,11 @@ XIGetProperty(Display* dpy, int deviceid, Atom property, long offset, - * recopy the string to make it null terminated. - */ - -- nbytes = rep.num_items * rep.format/8; -- rbytes = nbytes + 1; -- *data = Xmalloc(rbytes); -+ if (rep.num_items < (INT_MAX / (rep.format/8))) { -+ nbytes = rep.num_items * rep.format/8; -+ rbytes = nbytes + 1; -+ *data = Xmalloc(rbytes); -+ } - - if (!(*data)) { - _XEatDataWords(dpy, rep.length); --- -1.8.3.1 - - -From 528419b9ef437e7eeafb41bf45e8ff7d818bd845 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sat, 9 Mar 2013 22:55:23 -0800 -Subject: [PATCH 12/16] integer overflow in XIGetSelectedEvents() - [CVE-2013-1984 6/8] - -If the number of events or masks reported by the server is large enough -that it overflows when multiplied by the size of the appropriate struct, -or the sizes overflow as they are totaled up, then memory corruption can -occur when more bytes are copied from the X server reply than the size -of the buffer we allocated to hold them. - -v2: check that reply size fits inside the data read from the server, - so that we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XISelEv.c | 25 +++++++++++++++++++------ - 1 file changed, 19 insertions(+), 6 deletions(-) - -diff --git a/src/XISelEv.c b/src/XISelEv.c -index f871222..0471bef 100644 ---- a/src/XISelEv.c -+++ b/src/XISelEv.c -@@ -42,6 +42,7 @@ in this Software without prior written authorization from the author. - #include <X11/extensions/ge.h> - #include <X11/extensions/geproto.h> - #include "XIint.h" -+#include <limits.h> - - int - XISelectEvents(Display* dpy, Window win, XIEventMask* masks, int num_masks) -@@ -101,13 +102,14 @@ out: - XIEventMask* - XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - { -- int i, len = 0; -+ unsigned int i, len = 0; - unsigned char *mask; - XIEventMask *mask_out = NULL; - xXIEventMask *mask_in = NULL, *mi; - xXIGetSelectedEventsReq *req; - xXIGetSelectedEventsReply reply; - XExtDisplayInfo *info = XInput_find_display(dpy); -+ size_t rbytes; - - *num_masks_return = -1; - LockDisplay(dpy); -@@ -129,11 +131,16 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - goto out; - } - -- mask_in = Xmalloc(reply.length * 4); -- if (!mask_in) -+ if (reply.length < (INT_MAX >> 2)) { -+ rbytes = (unsigned long) reply.length << 2; -+ mask_in = Xmalloc(rbytes); -+ } -+ if (!mask_in) { -+ _XEatDataWords(dpy, reply.length); - goto out; -+ } - -- _XRead(dpy, (char*)mask_in, reply.length * 4); -+ _XRead(dpy, (char*)mask_in, rbytes); - - /* - * This function takes interleaved xXIEventMask structs & masks off -@@ -148,8 +155,14 @@ XIGetSelectedEvents(Display* dpy, Window win, int *num_masks_return) - - for (i = 0, mi = mask_in; i < reply.num_masks; i++) - { -- len += mi->mask_len * 4; -- mi = (xXIEventMask*)((char*)mi + mi->mask_len * 4); -+ unsigned int mask_bytes = mi->mask_len * 4; -+ len += mask_bytes; -+ if (len > INT_MAX) -+ goto out; -+ if ((sizeof(xXIEventMask) + mask_bytes) > rbytes) -+ goto out; -+ rbytes -= (sizeof(xXIEventMask) + mask_bytes); -+ mi = (xXIEventMask*)((char*)mi + mask_bytes); - mi++; - } - --- -1.8.3.1 - - -From 17071c1c608247800b2ca03a35b1fcc9c4cabe6c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 13:30:55 -0700 -Subject: [PATCH 13/16] Avoid integer overflow in XGetDeviceProperties() - [CVE-2013-1984 7/8] - -If the number of items as reported by the Xserver is too large, it -could overflow the calculation for the size of the buffer to copy the -reply into, causing memory corruption. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XGetDProp.c | 61 ++++++++++++++++++++++++++++++++++----------------------- - 1 file changed, 37 insertions(+), 24 deletions(-) - -diff --git a/src/XGetDProp.c b/src/XGetDProp.c -index f9e8f0c..3691122 100644 ---- a/src/XGetDProp.c -+++ b/src/XGetDProp.c -@@ -38,6 +38,7 @@ in this Software without prior written authorization from the author. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - int - XGetDeviceProperty(Display* dpy, XDevice* dev, -@@ -48,7 +49,8 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - { - xGetDevicePropertyReq *req; - xGetDevicePropertyReply rep; -- long nbytes, rbytes; -+ unsigned long nbytes, rbytes; -+ int ret = Success; - - XExtDisplayInfo *info = XInput_find_display(dpy); - -@@ -81,30 +83,43 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * data, but this last byte is null terminated and convenient for - * returning string properties, so the client doesn't then have to - * recopy the string to make it null terminated. -+ * -+ * Maximum item limits are set to both prevent integer overflow when -+ * calculating the amount of memory to malloc, and to limit how much -+ * memory will be used if a server provides an insanely high count. - */ - switch (rep.format) { - case 8: -- nbytes = rep.nItems; -- rbytes = rep.nItems + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XReadPad (dpy, (char *) *prop, nbytes); -+ if (rep.nItems < INT_MAX) { -+ nbytes = rep.nItems; -+ rbytes = rep.nItems + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XReadPad (dpy, (char *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - case 16: -- nbytes = rep.nItems << 1; -- rbytes = rep.nItems * sizeof (short) + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XRead16Pad (dpy, (short *) *prop, nbytes); -+ if (rep.nItems < (INT_MAX / sizeof (short))) { -+ nbytes = rep.nItems << 1; -+ rbytes = rep.nItems * sizeof (short) + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XRead16Pad (dpy, (short *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - case 32: -- nbytes = rep.nItems << 2; -- rbytes = rep.nItems * sizeof (long) + 1; -- if (rbytes > 0 && -- (*prop = (unsigned char *) Xmalloc ((unsigned)rbytes))) -- _XRead32 (dpy, (long *) *prop, nbytes); -+ if (rep.nItems < (INT_MAX / sizeof (long))) { -+ nbytes = rep.nItems << 2; -+ rbytes = rep.nItems * sizeof (long) + 1; -+ if ((*prop = Xmalloc (rbytes))) -+ _XRead32 (dpy, (long *) *prop, nbytes); -+ else -+ ret = BadAlloc; -+ } - break; - - default: -@@ -112,16 +127,13 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - * This part of the code should never be reached. If it is, - * the server sent back a property with an invalid format. - */ -- _XEatDataWords(dpy, rep.length); -- UnlockDisplay(dpy); -- SyncHandle(); -- return(BadImplementation); -+ ret = BadImplementation; - } - if (! *prop) { - _XEatDataWords(dpy, rep.length); -- UnlockDisplay(dpy); -- SyncHandle(); -- return(BadAlloc); -+ if (ret == Success) -+ ret = BadAlloc; -+ goto out; - } - (*prop)[rbytes - 1] = '\0'; - } -@@ -130,9 +142,10 @@ XGetDeviceProperty(Display* dpy, XDevice* dev, - *actual_format = rep.format; - *nitems = rep.nItems; - *bytes_after = rep.bytesAfter; -+ out: - UnlockDisplay (dpy); - SyncHandle (); - -- return Success; -+ return ret; - } - --- -1.8.3.1 - - -From ef82512288d8ca36ac0beeb289f158195b0a8cae Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 00:22:14 -0800 -Subject: [PATCH 14/16] Avoid integer overflow in XListInputDevices() - [CVE-2013-1984 8/8] - -If the length of the reply as reported by the Xserver is too long, it -could overflow the calculation for the size of the buffer to copy the -reply into, causing memory corruption. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XListDev.c | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index 1fa4747..1c14b96 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -60,6 +60,7 @@ SOFTWARE. - #include <X11/extensions/XInput.h> - #include <X11/extensions/extutil.h> - #include "XIint.h" -+#include <limits.h> - - /* Calculate length field to a multiples of sizeof(XID). XIDs are typedefs - * to ulong and thus may be 8 bytes on some platforms. This can trigger a -@@ -179,7 +180,7 @@ XListInputDevices( - XAnyClassPtr Any; - char *nptr, *Nptr; - int i; -- long rlen; -+ unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); - - LockDisplay(dpy); -@@ -198,9 +199,10 @@ XListInputDevices( - - if ((*ndevices = rep.ndevices)) { /* at least 1 input device */ - size = *ndevices * sizeof(XDeviceInfo); -- rlen = rep.length << 2; /* multiply length by 4 */ -- list = (xDeviceInfo *) Xmalloc(rlen); -- slist = list; -+ if (rep.length < (INT_MAX >> 2)) { -+ rlen = rep.length << 2; /* multiply length by 4 */ -+ slist = list = Xmalloc(rlen); -+ } - if (!slist) { - _XEatDataWords(dpy, rep.length); - UnlockDisplay(dpy); --- -1.8.3.1 - - -From 81b4df8ac6aa1520c41c3526961014a6f115cc46 Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Sun, 10 Mar 2013 00:16:22 -0800 -Subject: [PATCH 15/16] sign extension issue in XListInputDevices() - [CVE-2013-1995] - -nptr is (signed) char, which can be negative, and will sign extend -when added to the int size, which means size can be subtracted from, -leading to allocating too small a buffer to hold the data being copied -from the X server's reply. - -v2: check that string size fits inside the data read from the server, - so that we don't read out of bounds either - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XListDev.c | 16 ++++++++++------ - 1 file changed, 10 insertions(+), 6 deletions(-) - -diff --git a/src/XListDev.c b/src/XListDev.c -index 1c14b96..b85ff3c 100644 ---- a/src/XListDev.c -+++ b/src/XListDev.c -@@ -73,7 +73,7 @@ static int pad_to_xid(int base_size) - return ((base_size + padsize - 1)/padsize) * padsize; - } - --static int -+static size_t - SizeClassInfo(xAnyClassPtr *any, int num_classes) - { - int size = 0; -@@ -170,7 +170,7 @@ XListInputDevices( - register Display *dpy, - int *ndevices) - { -- int size; -+ size_t size; - xListInputDevicesReq *req; - xListInputDevicesReply rep; - xDeviceInfo *list, *slist = NULL; -@@ -178,7 +178,7 @@ XListInputDevices( - XDeviceInfo *clist = NULL; - xAnyClassPtr any, sav_any; - XAnyClassPtr Any; -- char *nptr, *Nptr; -+ unsigned char *nptr, *Nptr; - int i; - unsigned long rlen; - XExtDisplayInfo *info = XInput_find_display(dpy); -@@ -217,9 +217,12 @@ XListInputDevices( - size += SizeClassInfo(&any, (int)list->num_classes); - } - -- for (i = 0, nptr = (char *)any; i < *ndevices; i++) { -+ Nptr = ((unsigned char *)list) + rlen + 1; -+ for (i = 0, nptr = (unsigned char *)any; i < *ndevices; i++) { - size += *nptr + 1; - nptr += (*nptr + 1); -+ if (nptr > Nptr) -+ goto out; - } - - clist = (XDeviceInfoPtr) Xmalloc(size); -@@ -245,8 +248,8 @@ XListInputDevices( - } - - clist = sclist; -- nptr = (char *)any; -- Nptr = (char *)Any; -+ nptr = (unsigned char *)any; -+ Nptr = (unsigned char *)Any; - for (i = 0; i < *ndevices; i++, clist++) { - clist->name = (char *)Nptr; - memcpy(Nptr, nptr + 1, *nptr); -@@ -256,6 +259,7 @@ XListInputDevices( - } - } - -+ out: - XFree((char *)slist); - UnlockDisplay(dpy); - SyncHandle(); --- -1.8.3.1 - - -From 661c45ca17c434dbd342a46fd3fb813852ae0ca9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Tue, 21 May 2013 12:23:05 +1000 -Subject: [PATCH 16/16] Don't overwrite the cookies serial number - -serial != sequenceNumber, see _XSetLastRequestRead() - -cookie->serial is already set at this point, setting it again directly from -the sequenceNumber of the event causes a bunch of weird issues such as -scrollbars and text drag-n-drop breaking. - -https://bugzilla.redhat.com/show_bug.cgi?id=965347 - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> ---- - src/XExtInt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/XExtInt.c b/src/XExtInt.c -index 8e19b97..d3c6b7c 100644 ---- a/src/XExtInt.c -+++ b/src/XExtInt.c -@@ -915,7 +915,6 @@ static void xge_copy_to_cookie(xGenericEvent* ev, - cookie->type = ev->type; - cookie->evtype = ev->evtype; - cookie->extension = ev->extension; -- cookie->serial = ev->sequenceNumber; - } - - static Bool --- -1.8.3.1 - diff --git a/extra/link-grammar/PKGBUILD b/extra/link-grammar/PKGBUILD index 99ad5a40a..ce3a26ac5 100644 --- a/extra/link-grammar/PKGBUILD +++ b/extra/link-grammar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188255 2013-06-13 15:52:39Z giovanni $ +# $Id: PKGBUILD 189484 2013-07-03 16:37:06Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=link-grammar -pkgver=4.7.12 +pkgver=4.7.14 pkgrel=1 pkgdesc="A Grammar Checking library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('BSD') depends=('aspell') options=('!libtool' '!makeflags') source=("http://www.abisource.com/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('f4f0b731dc0bbd1c7adfe9a8ef7ab116') +md5sums=('2d7771d8063aec6efb27a35663d67e9f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index fcf5d170a..c10b39419 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187158 2013-06-04 16:22:02Z giovanni $ +# $Id: PKGBUILD 189482 2013-07-03 16:31:41Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.6.2 +pkgver=2.6.3 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=('55f6ea5982cf87836113376174826e8c' +md5sums=('99e311b2202057a259899f67b425e087' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/mesa/CVE-2013-1993.patch b/extra/mesa/CVE-2013-1993.patch deleted file mode 100644 index 00f723d35..000000000 --- a/extra/mesa/CVE-2013-1993.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 80ac3b279e776b3d9f45a209e52c5bd34ba7e7df Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 26 Apr 2013 23:31:58 +0000 -Subject: integer overflow in XF86DRIOpenConnection() [CVE-2013-1993 1/2] - -busIdStringLength is a CARD32 and needs to be bounds checked before adding -one to it to come up with the total size to allocate, to avoid integer -overflow leading to underallocation and writing data from the network past -the end of the allocated buffer. - -NOTE: This is a candidate for stable release branches. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -(cherry picked from commit 2e5a268f18be30df15aed0b44b01a18a37fb5df4) ---- -diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c -index b1cdc9b..8f53bd7 100644 ---- a/src/glx/XF86dri.c -+++ b/src/glx/XF86dri.c -@@ -43,6 +43,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - #include <X11/extensions/Xext.h> - #include <X11/extensions/extutil.h> - #include "xf86dristr.h" -+#include <limits.h> - - static XExtensionInfo _xf86dri_info_data; - static XExtensionInfo *xf86dri_info = &_xf86dri_info_data; -@@ -201,7 +202,11 @@ XF86DRIOpenConnection(Display * dpy, int screen, drm_handle_t * hSAREA, - } - - if (rep.length) { -- if (!(*busIdString = calloc(rep.busIdStringLength + 1, 1))) { -+ if (rep.busIdStringLength < INT_MAX) -+ *busIdString = calloc(rep.busIdStringLength + 1, 1); -+ else -+ *busIdString = NULL; -+ if (*busIdString == NULL) { - _XEatData(dpy, ((rep.busIdStringLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); --- -cgit v0.9.0.2-2-gbebe -From 6de60ddf9ccac6f185d8f4e88ddfc63a94bd670f Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Fri, 26 Apr 2013 23:33:03 +0000 -Subject: integer overflow in XF86DRIGetClientDriverName() [CVE-2013-1993 2/2] - -clientDriverNameLength is a CARD32 and needs to be bounds checked before -adding one to it to come up with the total size to allocate, to avoid -integer overflow leading to underallocation and writing data from the -network past the end of the allocated buffer. - -NOTE: This is a candidate for stable release branches. - -Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Brian Paul <brianp@vmware.com> -(cherry picked from commit 306f630e676eb901789dd09a0f30d7e7fa941ebe) ---- -diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c -index 8f53bd7..56e3557 100644 ---- a/src/glx/XF86dri.c -+++ b/src/glx/XF86dri.c -@@ -305,9 +305,11 @@ XF86DRIGetClientDriverName(Display * dpy, int screen, - *ddxDriverPatchVersion = rep.ddxDriverPatchVersion; - - if (rep.length) { -- if (! -- (*clientDriverName = -- calloc(rep.clientDriverNameLength + 1, 1))) { -+ if (rep.clientDriverNameLength < INT_MAX) -+ *clientDriverName = calloc(rep.clientDriverNameLength + 1, 1); -+ else -+ *clientDriverName = NULL; -+ if (*clientDriverName == NULL) { - _XEatData(dpy, ((rep.clientDriverNameLength + 3) & ~3)); - UnlockDisplay(dpy); - SyncHandle(); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 4fa536edd..5f8d193eb 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 188839 2013-06-22 10:51:37Z lcarlier $ +# $Id: PKGBUILD 189266 2013-07-01 22:29:39Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.3 -pkgrel=2 +pkgver=9.1.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' 'wayland' 'systemd') @@ -17,18 +17,9 @@ url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 - LICENSE - CVE-2013-1993.patch) -md5sums=('952ccd03547ed72333b64e1746cf8ada' - '5c65a0fe315dd347e09b1f2826a1df5a' - 'dc8dad7c9bc6a92bd9c33b27b9da825e') - -prepare() { - cd ${srcdir}/?esa-* - - # fix CVE-2013-1993 merged upstream - patch -Np1 -i ${srcdir}/CVE-2013-1993.patch -} + LICENSE) +md5sums=('a2c4e25d0e27918bc67f61bae04d0cb8' + '5c65a0fe315dd347e09b1f2826a1df5a') build() { cd ${srcdir}/?esa-* diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index b34f0297a..ea2db4660 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 184009 2013-04-30 20:08:12Z giovanni $ +# $Id: PKGBUILD 189221 2013-06-30 05:10:45Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: xduugu <xduugu@gmx.com> pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') -pkgver=6.2.0 +pkgver=6.3.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -12,7 +12,7 @@ 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=('a09b69f7e17677f1b5bfd15720dd004c') +md5sums=('3d64652b1aa3ce3faaa468b11dcbd82c') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/nepomuk-core/PKGBUILD b/extra/nepomuk-core/PKGBUILD index cedf8841f..58f51c2f3 100644 --- a/extra/nepomuk-core/PKGBUILD +++ b/extra/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187924 2013-06-08 07:59:02Z andrea $ +# $Id: PKGBUILD 189487 2013-07-03 17:00:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.10.4 +pkgver=4.10.5 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" @@ -11,7 +11,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdelibs' 'poppler-qt' 'taglib' 'ffmpeg') makedepends=('cmake' 'automoc4' 'doxygen') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('28d9641ffc1b877f0cd0d27343b56563ed2bc74d') +sha1sums=('416dbcc9e20d463ed8dc009a4cd7d26be6ffa6cc') build() { mkdir build diff --git a/extra/nepomuk-widgets/PKGBUILD b/extra/nepomuk-widgets/PKGBUILD index 5a5d121d3..da65212de 100644 --- a/extra/nepomuk-widgets/PKGBUILD +++ b/extra/nepomuk-widgets/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 187941 2013-06-08 07:59:20Z andrea $ +# $Id: PKGBUILD 189504 2013-07-03 17:00:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-widgets -pkgver=4.10.4 +pkgver=4.10.5 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=('fb7379a3b324b2660f220094c8273860722fe3f1') +sha1sums=('f796178217f69e211786f08ed7c40c39b96d25c9') build() { mkdir build diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD index aaa1795b7..96d9a654a 100644 --- a/extra/ntfs-3g_ntfsprogs/PKGBUILD +++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185299 2013-05-13 04:23:22Z eric $ +# $Id: PKGBUILD 188990 2013-06-27 19:50:33Z bpiotrowski $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Bchler <thomas.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=ntfs-3g_ntfsprogs pkgname=ntfs-3g pkgver=2013.1.13 -pkgrel=3 +pkgrel=4 pkgdesc="NTFS filesystem utilities" arch=('i686' 'x86_64' 'mips64el') url="http://www.tuxera.com/community/ntfs-3g-download/" @@ -29,7 +29,8 @@ build() { ./configure --prefix=/usr \ --with-fuse=external --disable-static \ --enable-posix-acls --disable-ldconfig \ - --mandir=/usr/share/man --sbin=/usr/bin + --mandir=/usr/share/man --sbin=/usr/bin \ + --enable-extras make } diff --git a/extra/nx-common/NXproto.h.64bit.diff b/extra/nx-common/NXproto.h.64bit.diff deleted file mode 100644 index ac326ebcd..000000000 --- a/extra/nx-common/NXproto.h.64bit.diff +++ /dev/null @@ -1,66 +0,0 @@ ---- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 -+++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 -@@ -26,6 +26,30 @@ - #include <X11/Xmd.h> - #include <X11/Xproto.h> - -+/* -+ Copied from Xproto.h -+ */ -+ -+/* For the purpose of the structure definitions in this file, -+we must redefine the following types in terms of Xmd.h's types, which may -+include bit fields. All of these are #undef'd at the end of this file, -+restoring the definitions in X.h. */ -+ -+#define Window CARD32 -+#define Drawable CARD32 -+#define Font CARD32 -+#define Pixmap CARD32 -+#define Cursor CARD32 -+#define Colormap CARD32 -+#define GContext CARD32 -+#define Atom CARD32 -+#define VisualID CARD32 -+#define Time CARD32 -+#define KeyCode CARD8 -+#define KeySym CARD32 -+ -+/* End copied from Xproto.h */ -+ - #define sz_xNXGetControlParametersReq 4 - #define sz_xNXGetCleanupParametersReq 4 - #define sz_xNXGetImageParametersReq 4 -@@ -343,9 +367,9 @@ - CARD8 dstDepth; - CARD32 srcLength B32; - CARD32 dstLength B32; -- INT16 srcX B16, srcY B16; -+ CARD16 srcX B16, srcY B16; - CARD16 srcWidth B16, srcHeight B16; -- INT16 dstX B16, dstY B16; -+ CARD16 dstX B16, dstY B16; - CARD16 dstWidth B16, dstHeight B16; - } xNXPutPackedImageReq; - -@@ -463,4 +487,20 @@ - } - #endif - -+/* Copied from Xproto.h */ -+ -+/* restore these definitions back to the typedefs in X.h */ -+#undef Window -+#undef Drawable -+#undef Font -+#undef Pixmap -+#undef Cursor -+#undef Colormap -+#undef GContext -+#undef Atom -+#undef VisualID -+#undef Time -+#undef KeyCode -+#undef KeySym -+ - #endif /* NXproto_H */ diff --git a/extra/nx-common/PKGBUILD b/extra/nx-common/PKGBUILD deleted file mode 100644 index ee36eb8f2..000000000 --- a/extra/nx-common/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 157435 2012-04-28 09:58:39Z andyrtr $ -# Maintainer: Tobias Powalowski <tpowa@archlinux.org> -# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> - -pkgname=nx-common -pkgver=3.5.0 -pkgrel=5 -pkgdesc="NoMachine NX common package for client and server" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://nomachine.com/" -depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'libxcomp') # 'bash' -makedepends=('xorg-server-devel' 'nx-headers') -source=(http://64.34.173.142/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz - http://64.34.173.142/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz - nxcompsh-gcc43.patch) -options=('!libtool') -md5sums=('84ade443b79ea079380b754aba9d392e' - 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' - 'b6c279654dac421fc3dd1a27d66ff53c') - -build() { - # nxcompsh - cd ${srcdir}/nxcompsh - patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch - ./configure --prefix=/usr/lib/nx - make - - # nxssh - cd ${srcdir}/nxssh - sed -i "s:NX.h:nx/NX.h:g" clientloop.c packet.c proxy.c - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib - make -} - -package() { - install -dm755 ${pkgdir}/usr/{bin,lib/nx} - - # nxcompsh - cd ${srcdir}/nxcompsh - cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx - cd ${pkgdir}/usr/lib/ - ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} . - # ^ really needed? - - # nxssh - cd ${srcdir}/nxssh - install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh - cd ${pkgdir}/usr/bin - ln -sv /usr/lib/nx/bin/nxssh . -} diff --git a/extra/nx-common/nx-3.5.0-libpng15.patch b/extra/nx-common/nx-3.5.0-libpng15.patch deleted file mode 100644 index c8f2a9559..000000000 --- a/extra/nx-common/nx-3.5.0-libpng15.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp ---- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 -+++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 -@@ -414,7 +414,7 @@ - - png_read_info(pngPtr, infoPtr); - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -565,7 +565,7 @@ - - png_read_info( pngPtr, infoPtr ) ; - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } -@@ -709,7 +709,7 @@ - png_read_info(pngPtr, infoPtr) ; - - -- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) -+ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) - { - png_set_expand(pngPtr); - } diff --git a/extra/nx-common/nxcompsh-gcc43.patch b/extra/nx-common/nxcompsh-gcc43.patch deleted file mode 100644 index 681a0dab5..000000000 --- a/extra/nx-common/nxcompsh-gcc43.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 -+++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 -@@ -18,10 +18,12 @@ - #ifndef Misc_H - #define Misc_H - --#include <iostream.h> -+#include <iostream> - --#include <errno.h> --#include <string.h> -+#include <cerrno> -+#include <cstring> -+ -+using namespace std; - - // - // Error handling macros. - diff --git a/extra/openmpi/PKGBUILD b/extra/openmpi/PKGBUILD index 330cb5a14..06fac5810 100644 --- a/extra/openmpi/PKGBUILD +++ b/extra/openmpi/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 181255 2013-04-02 18:31:27Z stephane $ +# $Id: PKGBUILD 189231 2013-06-30 23:32:16Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> pkgname=openmpi -pkgver=1.6.4 -pkgrel=2 +pkgver=1.6.5 +pkgrel=1 pkgdesc="High performance message passing library (MPI)" arch=('i686' 'x86_64' 'mips64el') url="http://www.open-mpi.org" @@ -10,12 +10,12 @@ license=('custom') depends=('gcc-fortran' 'openssh' 'libltdl' 'hwloc') [ "$CARCH" = "mips64el" ] || depends+=('valgrind') makedepends=('inetutils') -options=(!libtool) +options=('!libtool') source=(http://www.open-mpi.org/software/ompi/v1.6/downloads/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('38095d3453519177272f488d5058a98f7ebdbf10') +sha1sums=('93859d515b33dd9a0ee6081db285a2d1dffe21ce') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} if [ "$CARCH" = "mips64el" ]; then valgrind="--without-valgrind --disable-memchecker" @@ -45,7 +45,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install # FS#28583 @@ -57,8 +57,9 @@ package() { # Openmpi's otfinfo conflicts with the one from texlive mv "${pkgdir}"/usr/bin/otfinfo{,mpi} - # Remove dangling symlink + # Remove dangling symlink and useless file rm "${pkgdir}"/usr/share/man/man1/orteCC.1 + rm "${pkgdir}"/usr/share/vampirtrace/config.log install -d -m 755 "${pkgdir}"/etc/ld.so.conf.d echo "/usr/lib/${pkgname}" > "${pkgdir}"/etc/ld.so.conf.d/${pkgname}.conf diff --git a/extra/opennx/PKGBUILD b/extra/opennx/PKGBUILD deleted file mode 100644 index e7abfa9ee..000000000 --- a/extra/opennx/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 175949 2013-01-25 09:52:43Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> -# Contributor: Armin Luntzer -# Original opennx PKGBUILD: Tomas Groth tomasgroth.at.yahoo.dk - -pkgname=opennx -pkgver=0.16.0.725 -pkgrel=1 -pkgdesc="A GPL replacement for the NoMachine client, patched to always show the session chooser" -url="http://opennx.sf.net/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('wxgtk' 'libcups' 'libxext' 'libxft' 'xorg-xauth' 'curl' 'nx-common') -makedepends=('zip' 'opensc' 'libpulse' 'smbclient' 'libusb-compat') -#optdepends=('cups: for full local printing support') -source=(http://downloads.sourceforge.net/project/opennx/opennx/CI-source/opennx-$pkgver.tar.gz) -md5sums=('6bfe389638ac9c14fa89ca56b0c671b6') - -build() { - cd $srcdir/opennx* - ./configure --prefix=/usr \ - --enable-usbip - make -} - -package() { - cd $srcdir/opennx* - make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} install-man - - # fix some file locations - install -dm755 ${pkgdir}/usr/share/applications - cp -aR ${pkgdir}/usr/share/applnk/xdg/* ${pkgdir}/usr/share/applications - rm -rf ${pkgdir}/usr/share/applnk - - sed -i -e "s:Exec=/usr/NX/bin/opennx:Exec=/usr/bin/opennx:" ${pkgdir}/usr/share/applications/*.desktop -} diff --git a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch b/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch deleted file mode 100644 index 5b65557c1..000000000 --- a/extra/perl-tk/0001-Fix-compilation-under-threaded-bleadperl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8eb3ec51a58dd02334118d8f0aa1bebb5704d15c Mon Sep 17 00:00:00 2001 -From: Father Chrysostomos via RT <bug-Tk@rt.cpan.org> -Date: Mon, 6 Aug 2012 17:42:14 -0400 -Subject: [PATCH] Fix compilation under threaded bleadperl - - Ticket <URL: https://rt.cpan.org/Ticket/Display.html?id=78824 > - -CopSTASHPV is no longer an lvalue under threads. (It never was under non-threaded builds.) ---- - tkGlue.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/tkGlue.c b/tkGlue.c -index 1b7c025..9079302 100644 ---- a/tkGlue.c -+++ b/tkGlue.c -@@ -4154,11 +4154,7 @@ int type; - SV *x = NULL; - int prefix = '?'; - name = SvPV(sv,na); --#ifdef USE_ITHREADS -- CopSTASHPV(PL_curcop) = NULL; --#else -- CopSTASH(PL_curcop) = NULL; --#endif -+ CopSTASH_set(PL_curcop, NULL); - switch (type) - { - case TK_CONFIG_SCALARVAR: --- -1.8.2.3 - diff --git a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch b/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch deleted file mode 100644 index 95067501f..000000000 --- a/extra/perl-tk/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2333fa35c99aae1db1cb8d3ebce31fc21bc66e0a Mon Sep 17 00:00:00 2001 -From: Slaven Rezic <slaven@rezic.de> -Date: Sat, 23 Mar 2013 14:00:58 +0100 -Subject: [PATCH] * fix for 5.17.7 and newer: SvUPGRADE() is no longer an - expression - ---- - IO/IO.xs | 6 +----- - tkGlue.c | 5 +---- - 2 files changed, 2 insertions(+), 9 deletions(-) - -diff --git a/IO/IO.xs b/IO/IO.xs -index 8ae2a57..42f7515 100644 ---- a/IO/IO.xs -+++ b/IO/IO.xs -@@ -207,11 +207,7 @@ int offset - info.count = 0; - info.error = 0; - info.eof = 0; -- if (!SvUPGRADE(buf, SVt_PV)) -- { -- RETVAL = &PL_sv_undef; -- return; -- } -+ (void)SvUPGRADE(buf, SVt_PV); - SvPOK_only(buf); /* validate pointer */ - Tcl_CreateFileHandler(fd, TCL_READABLE, read_handler, (ClientData) &info); - do -diff --git a/tkGlue.c b/tkGlue.c -index dd3d283..cdc53ad 100644 ---- a/tkGlue.c -+++ b/tkGlue.c -@@ -3830,10 +3830,7 @@ ClientData clientData; - return EXPIRE((interp, "Cannot trace readonly variable")); - } - } -- if (!SvUPGRADE(sv, SVt_PVMG)) -- { -- return EXPIRE((interp, "Trace SvUPGRADE failed")); -- } -+ (void)SvUPGRADE(sv, SVt_PVMG); - - if (SvTYPE(sv) == SVt_PVAV) - { --- -1.8.2.3 - diff --git a/extra/perl-tk/PKGBUILD b/extra/perl-tk/PKGBUILD index 41ac2a372..32e1d58b6 100644 --- a/extra/perl-tk/PKGBUILD +++ b/extra/perl-tk/PKGBUILD @@ -1,51 +1,36 @@ -# $Id: PKGBUILD 186419 2013-05-26 09:25:47Z bluewind $ +# $Id: PKGBUILD 189257 2013-07-01 18:23:51Z eric $ # Maintainer: # Contributor: François Charette <francois ατ archlinux δοτ org> # Contributor: Jason Chu <jchu@xentac.net> # Contributor: Juergen Hoetzel <juergen@archlinux.org> pkgname=perl-tk -_cpanname=Tk -pkgver=804.030 -pkgrel=5 +pkgver=804.031 +pkgrel=1 pkgdesc="A graphical user interface toolkit for Perl" arch=('i686' 'x86_64' 'mips64el') -url="http://search.cpan.org/dist/${_cpanname}" +url="http://search.cpan.org/dist/Tk" license=('PerlArtistic' 'GPL' 'custom') depends=('libpng' 'libjpeg' 'tk' 'perl') options=('!emptydirs') replaces=('perltk') provides=('perltk') -source=(http://www.cpan.org/authors/id/S/SR/SREZIC/${_cpanname}-${pkgver}.tar.gz - 0001-Fix-compilation-under-threaded-bleadperl.patch - 0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch) -md5sums=('13275e85f99ee467a86d9598a437abff' - '361c34978746310e5c31b7a47c016b22' - '46448cdac9d7159f15f2d4b2719d171b') - -prepare() { - cd "$srcdir/${_cpanname}-$pkgver" - - # https://rt.cpan.org/Public/Bug/Display.html?id=78824 - patch -Np1 -i "$srcdir/0001-Fix-compilation-under-threaded-bleadperl.patch" - - # https://rt.cpan.org/Public/Bug/Display.html?id=82677 - patch -Np1 -i "$srcdir/0001-fix-for-5.17.7-and-newer-SvUPGRADE-is-no-longer-an-e.patch" -} +source=(http://www.cpan.org/authors/id/S/SR/SREZIC/Tk-${pkgver}.tar.gz) +md5sums=('57a8afd0563184c17a6470d1ee957f35') build() { - cd "$srcdir/${_cpanname}-$pkgver" - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + cd Tk-$pkgver + perl Makefile.PL INSTALLDIRS=vendor make } #check() { -# cd "$srcdir/${_cpanname}-$pkgver" +# cd Tk-$pkgver # make test #} package() { - cd "$srcdir/${_cpanname}-$pkgver" + cd Tk-$pkgver make install DESTDIR="$pkgdir" # license diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD index 65e20e86f..63eca9541 100644 --- a/extra/pigeonhole/PKGBUILD +++ b/extra/pigeonhole/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188729 2013-06-18 15:46:36Z andyrtr $ +# $Id: PKGBUILD 188927 2013-06-25 16:51:15Z 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.3 +_dcpkgver=2.2.4 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.4.0 -pkgrel=4 +pkgrel=5 pkgdesc="Sieve implementation for Dovecot" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index 430e0d077..c46a82e66 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185057 2013-05-10 18:09:28Z andrea $ +# $Id: PKGBUILD 189290 2013-07-02 11:12:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 -pkgver=4.8.4 -pkgrel=18 +pkgver=4.8.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -14,7 +14,8 @@ depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'mesa-libgl') -optdepends=('postgresql-libs: PostgreSQL driver' +optdepends=('qtchooser: set the default Qt toolkit' + 'postgresql-libs: PostgreSQL driver' 'libmariadbclient: MariaDB driver' 'unixodbc: ODBC driver' 'libxinerama: Xinerama support' @@ -30,12 +31,12 @@ options=('!libtool') replaces=('qt<=4.8.4') conflicts=('qt') _pkgfqn="qt-everywhere-opensource-src-${pkgver}" -source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz" +source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pkgfqn}.tar.gz" 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' 'declarative-fix-sigbus.patch') -md5sums=('89c5ecba180cae74c66260ac732dc5cb' +md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' '9727c406c240990870c905696a8c5bd1' @@ -44,7 +45,7 @@ md5sums=('89c5ecba180cae74c66260ac732dc5cb' 'c439c7731c25387352d8453ca7574971' 'aac963d05a9d5733e2bfce9e26607f51') -build() { +prepare() { cd ${_pkgfqn} # (FS#28381) (KDEBUG#180051) @@ -53,16 +54,26 @@ build() { # MIPS N32-specific fix, shouldn't affect correctness on other platforms. patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" - export QT4DIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} - - [ "${CARCH}" = "mips64el" ] && export CXXFLAGS="${CXXFLAGS} -fpermissive" - 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 - [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase" + cp mkspecs/common/linux{,32}.conf + sed -i "/^QMAKE_LIBDIR\s/s|=|= /usr/lib32|g" mkspecs/common/linux32.conf + sed -i "s|common/linux.conf|common/linux32.conf|" mkspecs/linux-g++-32/qmake.conf +} + +build() { + export QT4DIR="${srcdir}"/${_pkgfqn} + export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH} + + if [ "${CARCH}" = "mips64el" ]; then + export CXXFLAGS="${CXXFLAGS} -fpermissive" + else + extra="-plugin-sql-ibase" + fi + + cd ${_pkgfqn} ./configure -confirm-license -opensource \ -prefix /usr \ @@ -117,7 +128,7 @@ package() { install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer.png \ "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/qdbusviewer-qt4.png install -D -m644 tools/qdbus/qdbusviewer/images/qdbusviewer-128.png \ - "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdusviewer-qt4.png + "${pkgdir}"/usr/share/icons/hicolor/128x128/apps/qdbusviewer-qt4.png install -d "${pkgdir}"/usr/share/applications install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig,qdbusviewer}-qt4.desktop \ diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD index 028af2afd..c201d7bf1 100644 --- a/extra/refind-efi/PKGBUILD +++ b/extra/refind-efi/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188814 2013-06-21 19:48:54Z tpowa $ +# $Id: PKGBUILD 189205 2013-06-29 11:28:10Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> @@ -16,8 +16,8 @@ _COMPILER="GCC46" ####### pkgname="refind-efi" -pkgver="0.6.12" -pkgrel="2" +pkgver="0.7.0" +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" arch=('x86_64' 'i686') @@ -41,15 +41,6 @@ for _DIR_ in BaseTools MdePkg MdeModulePkg IntelFrameworkPkg IntelFrameworkModul source+=("${_TIANO_DIR_}/${_DIR_}::svn+${_TIANOCORE_SVN_URL}/${_DIR_}") done -sha1sums=('aabac34b2a30e16c5fd105777b9245c2ed0496e4' - '4d1992699f9b48dd2b7e6bd6c0b25fc065f75894' - '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') - [[ "${CARCH}" == "x86_64" ]] && _TIANO_ARCH="X64" [[ "${CARCH}" == "i686" ]] && _TIANO_ARCH="IA32" @@ -209,3 +200,11 @@ package() { install -D -m0644 "${srcdir}/refind-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/refind/LICENSE" } +sha1sums=('f71f00dbbe8c068c9ef80f468835c998832d364f' + '4d1992699f9b48dd2b7e6bd6c0b25fc065f75894' + '3d53eb615c3363d45feb95b9bfbf1d5491bf1c24' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') diff --git a/extra/rrdtool/PKGBUILD b/extra/rrdtool/PKGBUILD index 1f8a9b70a..3c78759bd 100644 --- a/extra/rrdtool/PKGBUILD +++ b/extra/rrdtool/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186426 2013-05-26 09:26:05Z bluewind $ +# $Id: PKGBUILD 188995 2013-06-28 01:52:37Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=rrdtool -pkgver=1.4.7 -pkgrel=7 +pkgver=1.4.8 +pkgrel=1 pkgdesc="Data logging and graphing application" arch=('i686' 'x86_64' 'mips64el') url="http://www.rrdtool.org" @@ -15,24 +15,28 @@ optdepends=('tcl: to use corresponding binding' \ 'ruby: to use corresponding binding' \ 'lua51: to use corresponding binding') options=('!libtool' '!emptydirs' '!makeflags') -source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz) -sha1sums=('faab7df7696b69f85d6f89dd9708d7cf0c9a273b') +source=(http://oss.oetiker.ch/rrdtool/pub/rrdtool-${pkgver}.tar.gz + rrdtool-pangofont.patch) +sha1sums=('56d68857f39e70bfa32360947614d8220702ed02' + '8c600285bdab7776c1d5301df7cf486d69eae048') prepare() { cd ${pkgname}-${pkgver} # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby sed -e 's/$(RUBY) extconf.rb/& --vendor/' -i bindings/Makefile.in + patch -p1 -i ../rrdtool-pangofont.patch } build() { cd ${pkgname}-${pkgver} + autoconf PYTHON=python2 LUA=/usr/bin/lua5.1 \ LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \ ./configure --prefix=/usr --localstatedir=/var --disable-rpath \ --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \ --enable-ruby --enable-ruby-site-install --enable-python \ --enable-lua --enable-lua-site-install --enable-tcl --disable-libwrap - make + make LIBS+="-lglib-2.0" } package() { diff --git a/extra/rrdtool/rrdtool-pangofont.patch b/extra/rrdtool/rrdtool-pangofont.patch new file mode 100644 index 000000000..60936d8b5 --- /dev/null +++ b/extra/rrdtool/rrdtool-pangofont.patch @@ -0,0 +1,39 @@ +From ba76d4915eb3d379d69205957e48edea4aee27b6 Mon Sep 17 00:00:00 2001 +From: Tobias Oetiker <tobi@oetiker.ch> +Date: Wed, 24 Apr 2013 23:49:28 +0200 +Subject: [PATCH] move to non-deprecated pango_font_map_create_context + +--- + configure.ac | 2 +- + src/rrd_graph.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2f9e395..d6b2722 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -535,7 +535,7 @@ EX_CHECK_ALL(cairo, cairo_font_options_create, cairo.h, + EX_CHECK_ALL(cairo, cairo_svg_surface_create, cairo-svg.h, cairo-svg, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_pdf_surface_create, cairo-pdf.h, cairo-pdf, 1.10.2, http://cairographics.org/releases/, "") + EX_CHECK_ALL(cairo, cairo_ps_surface_create, cairo-ps.h, cairo-ps, 1.10.2, http://cairographics.org/releases/, "") +-EX_CHECK_ALL(pangocairo-1.0, pango_cairo_context_set_font_options, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") ++EX_CHECK_ALL(pangocairo-1.0, pango_font_map_create_context, pango/pango.h, pangocairo, 1.28.4, http://ftp.gnome.org/pub/GNOME/sources/pango/1.28, "") + + fi + EX_CHECK_ALL(glib-2.0, glib_check_version, glib.h, glib-2.0, 2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "") +diff --git a/src/rrd_graph.c b/src/rrd_graph.c +index 5547aa6..25ae485 100644 +--- a/src/rrd_graph.c ++++ b/src/rrd_graph.c +@@ -4282,7 +4282,7 @@ void rrd_graph_init( + fontmap = pango_cairo_font_map_get_default(); + } + +- context = pango_cairo_font_map_create_context((PangoCairoFontMap*)fontmap); ++ context = pango_font_map_create_context(fontmap); + + pango_cairo_context_set_resolution(context, 100); + +-- +1.8.1.6 + diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD index 048fa5b79..e28535354 100644 --- a/extra/ruby/PKGBUILD +++ b/extra/ruby/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Jeramy Rutley <jrutley@gmail.com> pkgname=('ruby' 'ruby-docs') -pkgver=2.0.0_p195 +pkgver=2.0.0_p247 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.ruby-lang.org/en/' @@ -13,7 +13,7 @@ makedepends=('openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') options=('!emptydirs' '!makeflags') source=("ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/ruby-${pkgver//_/-}.tar.bz2" 'gemrc') -md5sums=('2f54faea6ee1ca500632ec3c0cb59cb6' +md5sums=('60913f3eec0c4071f44df42600be2604' '6fb8e7a09955e0f64be3158fb4a27e7a') build() { diff --git a/extra/snd/PKGBUILD b/extra/snd/PKGBUILD index 894ad7771..ce5dea5d9 100644 --- a/extra/snd/PKGBUILD +++ b/extra/snd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186867 2013-05-31 11:57:47Z schiv $ +# $Id: PKGBUILD 189298 2013-07-02 15:47:31Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: see .contrib pkgname=snd -pkgver=13.7 +pkgver=13.8 pkgrel=1 pkgdesc="An advanced sound editor" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ optdepends=('wavpack' 'flac' 'speex' 'mpg123' 'timidity++' 'vorbis-tools') install=$pkgname.install source=("ftp://ccrma-ftp.stanford.edu/pub/Lisp/$pkgname-$pkgver.tar.gz") -md5sums=('220b0155bace73d4442374a837c2f5fd') +md5sums=('d70148dc06073b49a854ada504e8a2d4') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/soprano/PKGBUILD b/extra/soprano/PKGBUILD index c78ff1934..6c4bbacbe 100644 --- a/extra/soprano/PKGBUILD +++ b/extra/soprano/PKGBUILD @@ -1,22 +1,25 @@ -# $Id: PKGBUILD 185050 2013-05-10 17:29:50Z andrea $ +# $Id: PKGBUILD 189254 2013-07-01 16:34:52Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=soprano pkgver=2.9.2 -pkgrel=1 +pkgrel=2 pkgdesc='A library which provides a highly usable object-oriented C++/Qt4 framework for RDF data' arch=('i686' 'x86_64' 'mips64el') url='http://soprano.sourceforge.net/' license=('GPL' 'LGPL') -depends=('qt4' 'redland-storage-virtuoso' 'libiodbc' 'virtuoso-base') +depends=('qt4' 'libiodbc' 'virtuoso-base' 'redland') makedepends=('cmake' 'doxygen') [ "$CARCH" != "mips64el" ] && makedepends+=('java-environment') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") md5sums=('60ce910cf3c8e4655c614b45d73f2b2a') -build() { +prepare() { mkdir build +} + +build() { cd build # we need the rpath cmake ../${pkgname}-${pkgver} \ diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index eb16cf181..dc1da967f 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 181132 2013-03-31 23:20:08Z bisson $ +# $Id: PKGBUILD 189234 2013-07-01 01:03:08Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.8.5 +pkgver=1.8.6 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -16,8 +16,8 @@ optdepends=('qt4: immodule and helper applications' 'gtk3: immodules and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') -source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('13178e0ad9e9196e3fdb0bb9806e4add8fe3a8e5') +source=("https://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") +sha1sums=('409c30b31b9e58e3c18cb7862933487b0585cd1d') install=install diff --git a/extra/wireshark/PKGBUILD b/extra/wireshark/PKGBUILD index 3db3d41be..be063f430 100644 --- a/extra/wireshark/PKGBUILD +++ b/extra/wireshark/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 188206 2013-06-12 20:04:04Z guillaume $ +# $Id: PKGBUILD 189196 2013-06-29 09:29:34Z guillaume $ # Maintainer: 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.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('GPL2') makedepends=('bison' 'flex' 'gtk3' 'krb5' 'libcap' 'libpcap' 'bash' 'gnutls' @@ -59,7 +59,7 @@ package_wireshark-cli() { # Headers install -dm755 ${pkgdir}/usr/include/${pkgbase}/{epan/{crypt,dfilter,dissectors,ftypes},wiretap,wsutil} - install -m644 color.h config.h register.h "${pkgdir}/usr/include/${pkgbase}" + install -m644 color.h config.h register.h ws_symbol_export.h "${pkgdir}/usr/include/${pkgbase}" for d in epan epan/crypt epan/dfilter epan/dissectors epan/ftypes wiretap wsutil; do install -m644 ${d}/*.h ${pkgdir}/usr/include/${pkgbase}/${d} done diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index c936481fc..013ddac45 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 187885 2013-06-07 20:50:17Z lcarlier $ +# $Id: PKGBUILD 189300 2013-07-02 19:56:50Z lcarlier $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.21.9 +pkgver=2.21.11 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -19,18 +19,22 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1359cbc9e494a284faa52d1db83e7388cb8ab590b660e29e78e6e7f5ee7ff189') +sha256sums=('523aa13f2ba65f0be871de338956a5acccb0d3a3d9c195ed3cd47abc2c025e22') build() { cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr \ --enable-dri + make } package() { cd "${srcdir}/${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/xmlsec/PKGBUILD b/extra/xmlsec/PKGBUILD index ec82fd47f..12ada7f9f 100644 --- a/extra/xmlsec/PKGBUILD +++ b/extra/xmlsec/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 135818 2011-08-18 15:05:00Z andyrtr $ +# $Id: PKGBUILD 189642 2013-07-03 19:47:13Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Hussam Al-Tayeb <ht990332@gmail.com> pkgname=xmlsec -pkgver=1.2.18 -pkgrel=2.1 +pkgver=1.2.19 +pkgrel=1 pkgdesc="XML Security Library is a C library based on LibXML2" license=('custom') arch=(i686 x86_64 'mips64el') url="http://www.aleksey.com/xmlsec/index.html" -depends=('libxslt>=1.1.26' 'openssl>=1.0.0' 'gnutls' 'nss>=3.12.10' 'libtool') -makedepends=('pkgconfig') +depends=('libxslt' 'openssl' 'gnutls' 'nss' 'libltdl') options=('!libtool') source=(http://www.aleksey.com/xmlsec/download/${pkgname}1-${pkgver}.tar.gz) -md5sums=('8694b4609aab647186607f79e1da7f1a') +md5sums=('fe664ba5f01ebfaeb0ab5deeb0b2249e') build() { cd ${srcdir}/${pkgname}1-${pkgver} diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 398e39971..3a5d78c56 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 183085 2013-04-17 12:51:32Z andyrtr $ +# $Id: PKGBUILD 189247 2013-07-01 10:57:37Z jgc $ # 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.1 -pkgrel=1 +pkgver=1.14.2 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -19,43 +19,49 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 autoconfig-sis.patch xserver-1.6.0-less-acpi-brokenness.patch bug59825.patch + xephyr-glx.patch xvfb-run xvfb-run.1 10-quirks.conf loongson.patch - git-fixes.patch) -sha256sums=('a5adb02571efb7d7459dde83286a3adb77dfd1a52a7348e75d2dc72d6f8d28aa' + fb-rename-wfbDestroyGlyphCache.patch) +sha256sums=('f6ddfb3f1cfff2d69d45657aec626ebe8b5847810154ff7df7ed2072b076c86b' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a' '26ee6ff255a60d7c1e136c612925eb63c86e85a4a3a55d531852ad9275526588' + 'bb63658d250c21bbfaf94c5417f2920ce5963ee1f7db6cac2b163a54f2e9b619' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' 'c1081681093cd56003f77e1bf4febc3e6bb84a1bde95292fbe19e8c461a7d207' 'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1') -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - +prepare() { + cd "${pkgbase}-${pkgver}" # Use nouveau/nv/nvidia drivers for nvidia devices - patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + patch -Np1 -i ../autoconfig-nvidia.patch # Use unofficial imedia SiS driver for supported SiS devices - patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + patch -Np0 -i ../autoconfig-sis.patch # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html patch -Np1 -i "${srcdir}/loongson.patch" # https://bugs.freedesktop.org/show_bug.cgi?id=59825 - fixes crash with vboxvideo - patch -Np1 -i "${srcdir}/bug59825.patch" + patch -Np1 -i ../bug59825.patch # From Fedora. Do not build acpid code, it is buggy and we do not need it - patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch" + patch -Np1 -i ../xserver-1.6.0-less-acpi-brokenness.patch - # post release git fixes - patch -Np1 -i "${srcdir}/git-fixes.patch" + # Add GLX support for Xephyr - https://bugs.freedesktop.org/show_bug.cgi?id=62346 + patch -Np0 -i ../xephyr-glx.patch + # http://cgit.freedesktop.org/xorg/xserver/commit/fb/wfbrename.h?id=5047810a4c20fab444b8c6eb146c55dcdb0d4219 + patch -Np1 -i ../fb-rename-wfbDestroyGlyphCache.patch +} +build() { + cd "${pkgbase}-${pkgver}" autoreconf -fi ./configure --prefix=/usr \ --enable-ipv6 \ @@ -98,7 +104,7 @@ package_xorg-server-common() { pkgdesc="Xorg server common files" depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" @@ -120,7 +126,7 @@ package_xorg-server() { groups=('xorg') conflicts=('nvidia-utils<=290.10') - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/etc/X11" @@ -150,7 +156,7 @@ package_xorg-server-xephyr() { pkgdesc="A nested X server that runs as an X application" depends=(libxfont libgl libgcrypt libxv 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" + cd "${pkgbase}-${pkgver}/hw/kdrive" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" @@ -159,9 +165,9 @@ package_xorg-server-xephyr() { package_xorg-server-xvfb() { pkgdesc="Virtual framebuffer X server" - depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common) + depends=(libxfont libxdmcp libxau libgcrypt 'pixman>=0.28.0' xorg-server-common xorg-xauth) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" + cd "${pkgbase}-${pkgver}/hw/vfb" make DESTDIR="${pkgdir}" install install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" @@ -175,7 +181,7 @@ package_xorg-server-xnest() { pkgdesc="A nested X server that runs as an X application" depends=(libxfont libxext libgcrypt 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" + cd "${pkgbase}-${pkgver}/hw/xnest" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" @@ -186,7 +192,7 @@ package_xorg-server-xdmx() { pkgdesc="Distributed Multihead X Server and utilities" depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes 'pixman>=0.28.0' xorg-server-common) - cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" + cd "${pkgbase}-${pkgver}/hw/dmx" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" @@ -204,7 +210,7 @@ package_xorg-server-devel() { # not technically required but almost every Xorg pkg needs it to build xorg-util-macros) - cd "${srcdir}/${pkgbase}-${pkgver}" + cd "${pkgbase}-${pkgver}" make DESTDIR="${pkgdir}" install rm -rf "${pkgdir}/usr/bin" diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch index 177f908ef..177f908ef 100644 --- a/extra/xorg-server/git-fixes.patch +++ b/extra/xorg-server/fb-rename-wfbDestroyGlyphCache.patch diff --git a/extra/xorg-server/xephyr-glx.patch b/extra/xorg-server/xephyr-glx.patch new file mode 100644 index 000000000..3011e2497 --- /dev/null +++ b/extra/xorg-server/xephyr-glx.patch @@ -0,0 +1,39 @@ +--- hw/kdrive/ephyr/ephyrinit.c 2013-03-14 19:07:41.904335711 +0100 ++++ hw/kdrive/ephyr/ephyrinit.c.new 2013-03-14 19:07:33.024335444 +0100 +@@ -28,6 +28,7 @@ + #endif + #include "ephyr.h" + #include "ephyrlog.h" ++#include "glx_extinit.h" + + extern Window EphyrPreExistingHostWin; + extern Bool EphyrWantGrayScale; +@@ -53,9 +54,28 @@ + KdCardInfoAdd(&ephyrFuncs, 0); + } + ++static const ExtensionModule ephyrExtensions[] = { ++#ifdef GLXEXT ++ { GlxExtensionInit, "GLX", &noGlxExtension }, ++#endif ++}; ++ ++static ++void ephyrExtensionInit(void) ++{ ++ int i; ++ ++ for (i = 0; i < ARRAY_SIZE(ephyrExtensions); i++) ++ LoadExtension(&ephyrExtensions[i], TRUE); ++} ++ ++ + void + InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) + { ++ if (serverGeneration == 1) ++ ephyrExtensionInit(); ++ + KdInitOutput(pScreenInfo, argc, argv); + } + diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 8045f9ab8..1553ddcc3 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 185530 2013-05-14 19:12:24Z foutrelis $ +# $Id: PKGBUILD 188951 2013-06-27 01:33:26Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> + pkgname=xulrunner -pkgver=21.0 +pkgver=22.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') @@ -16,7 +17,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/ shared-libs.patch) options=('!emptydirs') replaces=('xulrunner-oss') -sha256sums=('c3623bc243bd57c7267eacac658993f5f635f639235bea9ed8fce9b52e59be64' +sha256sums=('f806adf3f1c5b4c8d26322401ef876c73a549f93911be921044f508d698ac589' '3fba82b327f8825ebe93ceaeaea4968d57cf7d700f40bf4457b06d263bcc2e8f' '23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269' 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1') diff --git a/java/apache-ant/PKGBUILD b/java/apache-ant/PKGBUILD index 9f9c77c28..dfda3c28d 100755 --- a/java/apache-ant/PKGBUILD +++ b/java/apache-ant/PKGBUILD @@ -12,9 +12,10 @@ provides=("apache-ant-libre=$pkgver") replaces=("apache-ant-libre") conflicts=("apache-ant-libre") -pkgrel=2 +pkgrel=3 arch=('any') depends=('java-environment') +makedepends=('jh') _mirror=http://archive.apache.org/dist source=($_mirror/ant/source/${pkgname}-${pkgver}-src.tar.bz2 @@ -98,9 +99,18 @@ package() { install -d "${pkgdir}"/usr/share/doc/${pkgname} install -d "${pkgdir}"/usr/share/licenses/${pkgname} + cd "${pkgdir}"/${ANT_HOME}/lib + 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 + done + cd "${pkgdir}"/${ANT_HOME} for prog in bin/*; do - ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin + ln -sf ${ANT_HOME}/$prog "${pkgdir}"/usr/bin done ln -sf ${ANT_HOME}/{README,WHATSNEW} "${pkgdir}"/usr/share/doc/${pkgname} ln -sf ${ANT_HOME}/docs "${pkgdir}"/usr/share/doc/${pkgname}/html diff --git a/java/beanshell/PKGBUILD b/java/beanshell/PKGBUILD new file mode 100644 index 000000000..95b14d379 --- /dev/null +++ b/java/beanshell/PKGBUILD @@ -0,0 +1,45 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer (Arch): AndyRTR <andyrtr at archlinux.org> + +pkgname=beanshell +pkgver=2.0b4 +pkgrel=2.1 +pkgdesc="Lightweight scripting for Java" +url="http://www.beanshell.org/" +license=('LGPL') + +provides=('bsh') + +arch=('any') +depends=('java-runtime') +makedepends=('apache-ant' 'java-commons-bsf2' 'javacc' 'java-servlet3.0-tomcat') +source=("http://www.beanshell.org/bsh-${pkgver}-src.jar") + +prepare() { + cd "$srcdir"/BeanShell-$pkgver + + rm lib/*.jar + ln -s /usr/share/java/bsf2.jar lib/ + ln -s /usr/share/java/javacc.jar lib/ + ln -s /usr/share/java/servlet-api.jar lib/servlet.jar +} + +build() { + cd "$srcdir"/BeanShell-$pkgver + ant dist +} + +check() { + cd "$srcdir"/BeanShell-$pkgver + ant test +} + +package() { + cd "$srcdir"/BeanShell-$pkgver/dist + install -d "${pkgdir}"/usr/share/java/ + for artifact in $(printf '%s\n' *.jar|sed 's/-[0-9b.]*\.jar$//'); do + install -m644 $artifact-$pkgver.jar "${pkgdir}"/usr/share/java/$artifact.jar + done +} + +sha1sums=('69b36df249654a04e777ab899046c50b8cc844ac') diff --git a/java/java-commons-bsf/PKGBUILD b/java/java-commons-bsf2/PKGBUILD index 57a9dfc1a..57a9dfc1a 100644 --- a/java/java-commons-bsf/PKGBUILD +++ b/java/java-commons-bsf2/PKGBUILD diff --git a/java/java-jarjar/PKGBUILD b/java/java-jarjar/PKGBUILD index 8d1d1120b..c78d5539e 100644 --- a/java/java-jarjar/PKGBUILD +++ b/java/java-jarjar/PKGBUILD @@ -9,30 +9,28 @@ pkgver=1.2 _pkgrev=132 # v1.2 wasn't tagged, but this is clearly it pkgdesc="Java static linker (instead of the normal dynamic linking)" url="https://code.google.com/p/jarjar/" -license=('Apache2') +license=('Apache') -pkgrel=1 +pkgrel=2 arch=('any') depends=('java-runtime') -makedepends=('apache-ant' 'java-asm3' 'junit' 'maven' 'jh') -source=("svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev") +makedepends=('apache-ant' 'java-asm3' 'junit' 'maven') +source=("libre://${_pkgname}-${pkgver}.tar.gz") +mksource=("${_pkgname}-${pkgver}::svn+http://jarjar.googlecode.com/svn/trunk/jarjar#revision=$_pkgrev") mksource() { - cd "$srcdir/$_pkgname" - rm -f src/test/*.{class,jar} + cd "$srcdir/$_pkgname-$pkgver" rm -f lib/*.jar } build() { - cd "$srcdir/$_pkgname" - eval `jh mksource` + cd "$srcdir/$_pkgname-$pkgver" - ln -s /usr/share/java/asm-3.jar lib/asm-3.3.1.jar - ln -s /usr/share/java/asm-commons-3.jar lib/asm-commons-3.3.1.jar - ln -s /usr/share/java/junit.jar lib/junit-4.8.1.jar - ln -s /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar - - ln -s /opt/apache-ant/lib/ant.jar lib/ + ln -sf /usr/share/java/asm-3.jar lib/asm-3.3.1.jar + ln -sf /usr/share/java/asm-commons-3.jar lib/asm-commons-3.3.1.jar + ln -sf /usr/share/java/junit.jar lib/junit-4.8.1.jar + ln -sf /opt/maven/lib/maven-plugin-api-*.jar lib/maven-plugin-api.jar + ln -sf /opt/apache-ant/lib/ant.jar lib/ant.jar export CLASSPATH=/usr/share/java/asm-3.jar echo 'includeantruntime false' > build.properties @@ -40,10 +38,11 @@ build() { } package() { - cd "$srcdir/$_pkgname" + cd "$srcdir/$_pkgname-$pkgver" install -d "$pkgdir/usr/share/java/$_pkgname" install -D "dist/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname" ln -s "$_pkgname/$_pkgname-$pkgver.jar" "$pkgdir/usr/share/java/$_pkgname.jar" } -md5sums=('SKIP') +mkmd5sums=('SKIP') +md5sums=('cc2698a58f93cdb22c51f039a1b8a56e') diff --git a/java/java-json-android/PKGBUILD b/java/java-json-android/PKGBUILD new file mode 100644 index 000000000..3b0a08195 --- /dev/null +++ b/java/java-json-android/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +pkgname=java-json-android +_pkgver=4.2.2_r1 +pkgdesc="Java org.json implementation developed as part of Android's libcore" +url="https://android.googlesource.com/platform/libcore/" +license=(Apache2) + +pkgver=${_pkgver//_/.} +provides=(java-json) +conflicts=(java-json) + +pkgrel=1 +arch=(any) + +depends=(java-runtime) +makedepends=(java-environment junit) + +source=("libre://android-libcore-$_pkgver.tar.gz") +md5sums=('367769bb9d7fe571ff4e1e82b99e99ed') + +mkdepends=(git) +mksource=("android-libcore-$_pkgver::git+https://android.googlesource.com/platform/libcore/#tag=android-${_pkgver}") +mkmd5sums=('SKIP') + +build() { + cd "$srcdir"/android-libcore-$_pkgver + sed 11q < NOTICE > json/NOTICE + cd json/src/main/java + javac org/json/*.java + jar cf json.jar org/json/*.class +} + +check() { + cd "$srcdir"/android-libcore-$_pkgver/json/src/test/java + + # disable test for known bug: + sed -i 's/test64BitHexValues()/x&/' org/json/ParsingTest.java + + local cp="/usr/share/java/junit.jar:../../main/java/json.jar" + javac -cp "$cp" org/json/*.java + printf '%s\n' org/json/*.java | sed 's|/|.|g;s|\.java$||' > tests.txt + java -cp "$cp:." org.junit.runner.JUnitCore $(cat tests.txt) +} + +package() { + cd "$srcdir"/android-libcore-$_pkgver/json + install -Dm644 NOTICE "pkgdir"/usr/share/licenses/$pkgname + install -Dm644 src/main/java/json.jar "pkgdir"/usr/share/java/json.jar +} diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD index 4fcabe2a4..ceb0d9bab 100644 --- a/java/java-rxtx/PKGBUILD +++ b/java/java-rxtx/PKGBUILD @@ -10,16 +10,18 @@ pkgver=${_pkgver//-/.} pkgdesc="A native library providing serial and parallel communication for Java" license=(LGPL2.1) -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') depends=('java-runtime') -makedepends=('java-environment' 'pacman>4.0.3') +makedepends=('java-environment') case "$_pkgver" in *arduino*) url="https://github.com/arduino/RXTX" - source=("git://github.com/arduino/RXTX.git#${_gitver}") - md5sums=('SKIP') + source=("libre://RXTX-$pkgver.tar.gz") + md5sums=('a71156587dc8d28d1ff4ece376bc0140') + mksource=("git://github.com/arduino/RXTX.git#${_gitver}") + mkmd5sums=('SKIP') _dirname=RXTX ;; *) diff --git a/java/java-sonatype-oss-parent/PKGBUILD b/java/java-sonatype-oss-parent/PKGBUILD index f42f6adc5..b62c971ac 100644 --- a/java/java-sonatype-oss-parent/PKGBUILD +++ b/java/java-sonatype-oss-parent/PKGBUILD @@ -5,23 +5,17 @@ pkgver=7 pkgdesc="Metadata file for Maven-based build systems to inherit from" license='Apache2' -_groupId=org/sonatype/oss +_groupId=org.sonatype.oss _artifactId=oss-parent pkgrel=1 arch=('any') -depends=('maven') -makedepends=('java-sonatype-oss-parent=7' 'jh') +makedepends=('jh') source=("http://search.maven.org/remotecontent?filepath=$_groupId/$_artifactId/$pkgver/$_artifactId-$pkgver.pom") -build() { - : -} - package() { cd "$srcdir" - install -Dm644 $_artifactId-$pkgver.pom \ - "$pkgdir/`jh mvn-basename $_groupId $_artifactId $pkgver`".pom + DESTDIR=$pkgdir jh mvn-install $_groupId $_artifactId $pkgver $_artifactId-$pkgver.pom } md5sums=('3e418cf7f2607bf359e6c514a992cb38') diff --git a/java-ugly/maven/PKGBUILD b/java/maven/PKGBUILD index 3f8e5071d..3f8e5071d 100755..100644 --- a/java-ugly/maven/PKGBUILD +++ b/java/maven/PKGBUILD diff --git a/java-ugly/maven/maven.csh b/java/maven/maven.csh index f5750cfc8..f5750cfc8 100755..100644 --- a/java-ugly/maven/maven.csh +++ b/java/maven/maven.csh diff --git a/java-ugly/maven/maven.sh b/java/maven/maven.sh index b6655cc22..b6655cc22 100755..100644 --- a/java-ugly/maven/maven.sh +++ b/java/maven/maven.sh diff --git a/java/not-working/closure-compiler/PKGBUILD b/java/not-working/closure-compiler/PKGBUILD deleted file mode 100644 index 8318379a2..000000000 --- a/java/not-working/closure-compiler/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=closure-compiler -pkgver=20120917 -_pkgrev=2180 -pkgdesc="A JavaScript optimizing compiler." -url="https://code.google.com/closure/compiler/" -license=('Apache') - -pkgrel=1 -arch=('any') -depends=('java-runtime') -makedepends=( - 'apache-ant' - 'java-args4j' # does not exist - 'google-caja' # does not exist - 'java-guava' # does not build - 'java-jarjar' - 'java-json' # does not exist - 'java-jsr305' # does not exist - 'junit' - 'java-protobuf' # does not build - # maven-ant-tasks - 'jh') -source=("compiler-$pkgver::svn+http://closure-compiler.googlecode.com/svn/trunk/#revision=$_pkgrev") - -# For some reason, `file` detects this as a Fortran binary -_funny_js=( - lib/rhino/testsrc/benchmarks/sunspider-0.9.1/bitops-3bit-bits-in-byte.js -) - -mksource() { - cd "$srcdir/compiler-$pkgver" - rm lib/ant.jar - rm lib/ant-launcher.jar - rm lib/args4j.jar - rm lib/caja-r4314.jar - rm lib/guava.jar - rm lib/jarjar.jar - rm lib/json.jar - rm lib/jsr305.jar - rm lib/junit.jar - rm lib/protobuf-java.jar - rm lib/rhino/testsrc/org/mozilla/javascript/tests/commonjs/module/modules.jar - rm tools/maven-ant-tasks-2.1.3.jar -} - -build() { - cd "$srcdir/compiler-$pkgver" - eval `jh mksource ${_funny_js[@]}` - - ln -s /opt/apache-ant/lib/ant.jar lib/ant.jar - ln -s /opt/apache-ant/lib/ant-launcher.jar lib/ant-launcher.jar - ln -s /usr/share/java/... lib/args4j.jar - ln -s /usr/share/java/... lib/caja-r4314.jar - ln -s /usr/share/java/... lib/guava.jar - ln -s /usr/share/java/jarjar.jar lib/jarjar.jar - ln -s /usr/share/java/... lib/json.jar - ln -s /usr/share/java/... lib/jsr305.jar - ln -s /usr/share/java/junit.jar lib/junit.jar - ln -s /usr/share/java/protobuf.jar lib/protobuf-java.jar - # I think lib/rhino/.../module.jar autogenerates - ln -s /... tools/maven-ant-tasks-2.1.3.jar - - ant jar -} - -package() { - cd "$srcdir/$pkgname" - : -} - -md5sums=('SKIP') diff --git a/java/not-working/closure-compiler/TODO b/java/not-working/closure-compiler/TODO deleted file mode 100644 index 8527a4898..000000000 --- a/java/not-working/closure-compiler/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* Has plenty of missing dependencies (most of the 'not-working' folder) -* package() has not been written diff --git a/java/not-working/java-asm4/PKGBUILD b/java/not-working/java-asm4/PKGBUILD deleted file mode 100644 index 3db06dddc..000000000 --- a/java/not-working/java-asm4/PKGBUILD +++ /dev/null @@ -1,17 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgver=4.1 -. ../java-asm2/common.sh -depends+=('java-bnd') - -#### - -pkgrel=5 -_checksource_ignore=(src/org/objectweb/asm/optimizer/jdk{1.2.2_017,1.3.1_19}.txt.gz) - -mksource() { - cd "$srcdir/$_pkgname-$pkgver" - rm examples/jasmin/test/jasmin.jar -} - -md5sums=('cbfd7445edc517e0867ad410e48cb106') diff --git a/java/not-working/java-asm4/TODO b/java/not-working/java-asm4/TODO deleted file mode 100644 index 563c88bc9..000000000 --- a/java/not-working/java-asm4/TODO +++ /dev/null @@ -1 +0,0 @@ -Depends on java-bnd, which is not packaged
\ No newline at end of file diff --git a/java-ugly/not-working/java-bnd/PKGBUILD b/java/not-working/java-bnd/PKGBUILD index 86820469a..86820469a 100644 --- a/java-ugly/not-working/java-bnd/PKGBUILD +++ b/java/not-working/java-bnd/PKGBUILD diff --git a/java/not-working/java-guava/PKGBUILD b/java/not-working/java-guava/PKGBUILD deleted file mode 100644 index 0250e7183..000000000 --- a/java/not-working/java-guava/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -_pkgname=guava -pkgname=java-guava -pkgver=13.0.1 -pkgdesc="Google Core Libraries for Java." -url="https://code.google.com/p/guava-libraries/" -license=('Apache2') - -pkgrel=1 -arch=('any') -depends=('java-runtime>=5') -makedepends=('java-runtime>=6' 'maven' 'junit-truth' 'jh') -conflicts=('openjdk6') # OpenJDK bug 100167 conflicts -source=("$pkgname::git+https://code.google.com/p/guava-libraries/#tag=v$pkgver") - -mksource() { - cd "$srcdir/$pkgname" - rm guava/lib/*.jar - rm guava-test/lib/*.jar -} - -build() { - cd "$srcdir/$pkgname" - eval `jh mksource` - - ln -s /usr/share/java/junit-truth.jar guava-tests/lib/libtruth.java - - mvn package -} - -package() { - : -} diff --git a/java/not-working/java-guava/TODO b/java/not-working/java-guava/TODO deleted file mode 100644 index ee0a18042..000000000 --- a/java/not-working/java-guava/TODO +++ /dev/null @@ -1,2 +0,0 @@ -* depends on junit-truth, which does not build yet -* package() hasn't been written diff --git a/java/not-working/junit-truth/PKGBUILD b/java/not-working/junit-truth/PKGBUILD deleted file mode 100644 index 61a0ee469..000000000 --- a/java/not-working/junit-truth/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> - -pkgname=junit-truth -pkgdesc="Assertion/Proposition framework for Java unit tests." -url="https://github.com/truth0/truth" -license=('Apache2') - -#_pkgver=0.5.0-beta1 -#pkgver=${_pkgver//-/.} -#_tag=v${_pkgver} - -#pkgver=0.7.0 -#_tag=truth-rel-${pkgver//./-} - -#pkgver=0.8 -#_tag=truth-${pkgver} - -#pkgver=0.9 -#_tag=release_${pkgver//./_} - -pkgver=0.10 -_tag=release_${pkgver//./_} - -pkgrel=1 -arch=('any') -depends=('junit') -makedepends=('maven' 'jh') -conflicts=('openjdk6') # OpenJDK bug 100167 conflicts -source=("$pkgname::git://github.com/truth0/truth.git#tag=$tag") - -build() { - cd "${srcdir}/${pkgname}" - jh checksource - mvn package -} - -package() { - cd "${srcdir}/${pkgname}" - install -d "${pkgdir}"/usr/share/java/${pkgname} - JAR=${pkgname}-${pkgver}.jar - install -Dm 644 target/${JAR} "${pkgdir}"/usr/share/java/${pkgname} - ln -s ${pkgname}/${JAR} "${pkgdir}"/usr/share/java/${pkgname}.jar -} - -md5sums=('SKIP') diff --git a/java/not-working/junit-truth/TODO b/java/not-working/junit-truth/TODO deleted file mode 100644 index d21b3e472..000000000 --- a/java/not-working/junit-truth/TODO +++ /dev/null @@ -1 +0,0 @@ -has unpackaged dependencies diff --git a/java/not-working/protobuf/PKGBUILD b/java/not-working/protobuf/PKGBUILD deleted file mode 100644 index 699bde0cf..000000000 --- a/java/not-working/protobuf/PKGBUILD +++ /dev/null @@ -1,99 +0,0 @@ -# Maintainer: Thomas S Hatch <thatch45@gmail.com> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgbase=protobuf -pkgname=('protobuf' 'python2-protobuf' 'java-protobuf') -pkgver=2.4.1 -pkgrel=2.1 -pkgdesc="A way of encoding structured data in an efficient yet extensible format" -arch=('i686' 'x86_64') -url="http://code.google.com/p/protobuf/" -license=('APACHE') -depends=('gcc-libs' 'zlib') -makedepends=('python2' 'python2-distribute' 'java-environment') -options=(!libtool) -source=(http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -md5sums=('ed436802019c9e1f40cc750eaf78f318') - -#### - -build() { - build_protobuf - build_python2-protobuf - build_java-protobuf -} - -check() { - check_protobuf - check_python2-protobuf - check_java-protobuf -} - -package() { - package_protobuf - package_python2-protobuf - package_java-protobuf -} - -#### - -build_protobuf() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-static - make -} - -check_protobuf() { - cd $srcdir/$pkgname-$pkgver - make check -} - -package_protobuf() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} - -#### - -build_python2-protobuf() { - cd $srcdir/$pkgname-$pkgver/python - python2 setup.py build -} - -check_python2-protobuf() { - cd $srcdir/$pkgname-$pkgver/python - python2 setup.py test -} - -package_python2-protobuf() { - pkgdesc="protobuf python2 API" - replaces=('protobuf-python') - provides=("protobuf-python=${pkgver}") - depends=("python2" "protobuf=${pkgver}") - - cd $srcdir/protobuf-$pkgver/python - python2 setup.py install --prefix=/usr --root $pkgdir -} - -#### - -build_java-protobuf() { - cd $srcdir/$pkgname-$pkgver/java - mvn compile -} - -check_java-protobuf() { - cd $srcdir/$pkgname-$pkgver/java - mvn test -} - -package_java-protobuf() { - pkgdesc="protobuf Java API" - replaces=('protobuf-java') - provides=("protobuf-java=${pkgver}") - depends=("java-runtime" "protobuf=${pkgver}") - - cd $srcdir/$pkgname-$pkgver/java - : -} diff --git a/java/not-working/protobuf/TODO b/java/not-working/protobuf/TODO deleted file mode 100644 index 6a126b757..000000000 --- a/java/not-working/protobuf/TODO +++ /dev/null @@ -1,5 +0,0 @@ -* Missing dependencies: - * junit:junit:4.4 (4.10 is packaged, patch to use 4.10?) - * org.easymock:easymock:2.2 - * org.easymock:easymockclassextension:2.2.1 -* package_java-protobuf() has not been written diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD index 0487320e7..8b9e59932 100644 --- a/libre-testing/systemd/rePKGBUILD +++ b/libre-testing/systemd/rePKGBUILD @@ -4,7 +4,7 @@ # then please put 'unknown'. # Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar> -# Maintainer: André Silva <andre.paulista@adinet.com.uy> +# Maintainer: André Silva <emulatorman@lavabit.com> source PKGBUILD unset build package md5sums source check _repo=testing diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install deleted file mode 100644 index ac814c2fc..000000000 --- a/libre/abs-libre/abs.install +++ /dev/null @@ -1,13 +0,0 @@ -pre_upgrade() { - if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then - echo "==> Fixing potential ABS tree permission issues (this may take a while...)" - - for dir in core extra community testing; do - if [ -d /var/abs/$dir ]; then - find /var/abs/$dir -type d -exec chown root:root {} \; - find /var/abs/$dir -type d -exec chmod 755 {} \; - fi - done - fi -} - diff --git a/libre/abs-libre/PKGBUILD b/libre/abs/PKGBUILD index 259cf007f..f7e85d0ef 100644 --- a/libre/abs-libre/PKGBUILD +++ b/libre/abs/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $ +# $Id$ # Maintainer: Allan McRae <allan@archlinux.org> -_pkgname=abs -pkgname=abs-libre -#CARCH=mips64el +replaces=('abs-libre') +conflicts=('abs-libre') + +pkgname=abs pkgver=2.4.4 -pkgrel=1 +pkgrel=1.1 pkgdesc="Utilities to download and work with the Arch Build System (ABS)" arch=('i686' 'x86_64' 'mips64el') url="http://projects.archlinux.org/abs.git/" @@ -15,18 +16,15 @@ backup=(etc/abs.conf) source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig}) md5sums=('7258c739a93e02a4f31f114e9fc3b0ba' 'a628f7d5b1cd1e838366b88709690c24') -provides=("${_pkgname}=${pkgver}") -replaces=("${_pkgname}") -conflicts=("${_pkgname}") build() { - cd "$_pkgname-$pkgver" + cd "$pkgname-$pkgver" make } package() { - cd "$_pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="${pkgdir}" install @@ -34,18 +32,11 @@ package() { install -dm755 "${pkgdir}"/var/abs/local/ install -Dm644 README "${pkgdir}"/var/abs/README - sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' ${pkgdir}/etc/abs.conf - sed -i -e 's|(core|(libre !libre-testing core|' ${pkgdir}/etc/abs.conf - # make adjustments to abs.conf - if [[ $CARCH = "i686" ]]; then + sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf + sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf + if [[ $CARCH != "x86_64" ]]; then sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf fi - if [[ $CARCH = "x86_64" ]]; then - sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf - fi - if [[ $CARCH = "mips64el" ]]; then - sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf - sed -i '/ARCH=/s|i686|mips64el|' ${pkgdir}/etc/abs.conf - fi + sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf } diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD index 251b52851..8108a95bf 100644 --- a/libre/abuse-libre/PKGBUILD +++ b/libre/abuse-libre/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: jlvsimoes <jlvsimoes@oninet.pt> # Contributor: kevin <kevin@archlinux.org> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=abuse pkgname=abuse-libre diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD index ea1dfec52..0745630ad 100644 --- a/libre/atool-libre/PKGBUILD +++ b/libre/atool-libre/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: leif_thande <leif.thande@gmail.com> # Contributor: tranquility <trankas@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=atool pkgname=atool-libre diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD index 8108ea353..cfbf19e5c 100644 --- a/libre/audacious-plugins-libre/PKGBUILD +++ b/libre/audacious-plugins-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 177005 2013-02-04 00:31:50Z bisson $ +# $Id: PKGBUILD 189208 2013-06-29 12:06:26Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: William Rea <sillywilly@gmail.com> @@ -8,9 +8,9 @@ _pkgname=audacious-plugins pkgname=audacious-plugins-libre -pkgver=3.3.4 -pkgrel=2 -pkgdesc='Plugins for Audacious without unfree plugins' +pkgver=3.4 +pkgrel=1 +pkgdesc='Plugins for Audacious, without nonfree plugins' url='http://audacious-media-player.org/' license=('GPL' 'GPL3' 'LGPL' 'custom:BSD') arch=('i686' 'x86_64' 'mips64el') @@ -24,17 +24,17 @@ arch=('i686' 'x86_64' 'mips64el') # # All the other custom licensed plugins I think are mostly modified BSD or ISC. -provides=("audacious-plugins=$pkgver") -replaces=("${pkgname%-libre}") -conflicts=("${pkgname%-libre}") +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver makedepends=("audacious>=${pkgver}" 'alsa-lib' 'pulseaudio' 'jack2' 'lame' 'libvorbis' 'flac' 'mpg123' 'faad2' 'ffmpeg' 'libmodplug' 'fluidsynth' 'libcdio-paranoia' 'libsidplay' 'wavpack' 'libnotify' 'curl' 'libmtp' 'neon' 'libmms' 'libcue') -[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss') -optdepends=('oss: Open Sound System v4 output' +[ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils-libre' 'oss-libre') +optdepends=('oss-libre: Open Sound System v4 output' 'alsa-lib: Advanced Linux Sound Arch. output' 'pulseaudio: PulseAudio output' 'jack2: Jack Audio Connection Kit output' @@ -52,7 +52,7 @@ optdepends=('oss: Open Sound System v4 output' 'wavpack: WavPack input' 'libnotify: libnotify OSD' - 'lirc-utils: LIRC' + 'lirc-utils-libre: LIRC' 'curl: AudioScrobbler Client' 'libmtp: Upload to MTP device' @@ -61,9 +61,9 @@ optdepends=('oss: Open Sound System v4 output' 'libcue: CUE playlist format') source=("http://distfiles.audacious-media-player.org/${_pkgname}-${pkgver}.tar.bz2") -sha1sums=('6493f051417a201fc0e2de7ef36a709676f96607') +sha1sums=('2b2f1d30f0b790e6cc3e00483ed4774b0fa1fc42') -build() { +prepare() { # Retrieve upstream & remove plugin 'psf' due to issues mentioned above. sed -i s/enable_psf=yes/enable_psf=no/ ${_pkgname}-$pkgver/configure @@ -105,6 +105,10 @@ build() { install -m644 LICENSE.voice_removal $l install -m644 LICENSE.xfs $l popd +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" ./configure \ --prefix=/usr \ diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD index 01a5bb944..e9e18ba48 100644 --- a/libre/audacity-libre/PKGBUILD +++ b/libre/audacity-libre/PKGBUILD @@ -1,6 +1,6 @@ # $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=audacity pkgname=audacity-libre diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index 7be8ca825..f8e66c762 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.9-LIBRE # Don't forget to update bbswitch.install -pkgrel=3 +pkgrel=4 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") @@ -25,7 +25,7 @@ build() { cd ${srcdir}/${_pkgname}-${pkgver} _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - + make KDIR=/usr/src/linux-${_kernver} } diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD index dd41034a1..980f35851 100644 --- a/libre/blackbox-libre/PKGBUILD +++ b/libre/blackbox-libre/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: durbatuluk <dvdscripter@gmail.org> # Contributor: Steve Ponsford <sp4d@lavabit.com> -# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=blackbox pkgname=${_pkgname}-libre diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 6637e134c..040eeccf4 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=blender-addon-luxrender _pkgname=${pkgname:14:3}${pkgname::5}25 diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 0b61073cf..339969ba1 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92987 2013-06-21 10:34:05Z jelle $ +# $Id: PKGBUILD 93260 2013-06-30 12:27:03Z 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=0.9.36 +pkgver=0.9.37 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('f7dfb823bd17435c99f20b8a5f904b2a' +md5sums=('76db2eb11fe51d85ae9121203defb677' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD index f1c6481d5..518e25312 100644 --- a/libre/cdfs-libre/PKGBUILD +++ b/libre/cdfs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92970 2013-06-21 08:06:15Z tpowa $ +# $Id: PKGBUILD 93210 2013-06-28 18:33:45Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -7,7 +7,7 @@ _pkgname=cdfs pkgname=cdfs-libre pkgver=2.6.27 _extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install -pkgrel=47 +pkgrel=48 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)" arch=(i686 x86_64 mips64el) url="http://www.elis.UGent.be/~ronsse/cdfs/" diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index 001cd00f2..0fb3b9116 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93076 2013-06-24 03:20:38Z fyan $ +# $Id: PKGBUILD 93146 2013-06-26 07:01:43Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: monson <holymonson@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > @@ -7,7 +7,7 @@ pkgname=cgminer-libre _pkgflag=libre -pkgver=3.3.0 +pkgver=3.3.1 pkgrel=1 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation" url='http://forum.bitcoin.org/index.php?topic=28402.0' @@ -51,6 +51,6 @@ package() { install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf } -md5sums=('65af0ace6627d2ff50203d9a789f52da' +md5sums=('1e6ccf16c4695fc086581bbb95923abe' 'fe4a243fabe24608f5c05e40f0f118f6' 'bd76fc92fedce18c59ccea2aa79cc664') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index d29becae5..d1b2948f6 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185774 2013-05-18 15:32:58Z andyrtr $ +# $Id: PKGBUILD 188974 2013-06-27 14:08:06Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.34 -pkgrel=4 +pkgver=1.0.35 +pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.linuxfoundation.org/collaborate/workgroups/openprinting" @@ -19,7 +19,7 @@ backup=(etc/fonts/conf.d/99pdftoopvp.conf options=(!libtool) source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz cups-browsed.service) -md5sums=('fea9cad6bbb14ab0635243ed5d1d5c77' +md5sums=('26f150f1e9ce1f7b0f38ae4ebb01e23d' '9ef68d7c2a84713fd421f4e87dec0a6e') replaces=("${_pkgname}") conflicts=("${_pkgname}") diff --git a/libre/django13/PKGBUILD b/libre/django13/PKGBUILD deleted file mode 100644 index 554acccc7..000000000 --- a/libre/django13/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id$ -# Maintainer: Dan McGee <dan@archlinux.org> -# Contributor: Shahar Weiss <sweiss4@gmx.net> - -pkgname=django -pkgver=1.3.1 -pkgrel=2 -pkgdesc="A high-level Python Web framework." -arch=('any') -license=('BSD') -url="http://www.djangoproject.com/" -depends=('python2') -makedepends=('python2-distribute') -optdepends=('mysql-python: for MySQL backend' - 'python2-psycopg2: for PostgreSQL backend') -source=("https://www.djangoproject.com/m/releases/1.3/Django-$pkgver.tar.gz" - diff-django_branches_releases_1.3.X-from-16768-to-17460.diff) -md5sums=('62d8642fd06b9a0bf8544178f8500767' - 'd09d8f9e156b9aa1b580a1b43209b99f') -sha256sums=('af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b' - '8e08b5b5bbe7c042a1df4d5615a9d068ec6718fd00bef627c0a9a9e48ee58c15') - -build() { - cd "$srcdir/Django-$pkgver" - patch -Np1 -i ../diff-django_branches_releases_1.3.X-from-16768-to-17460.diff - python2 setup.py build -} - -package() { - cd "$srcdir/Django-$pkgver" - python2 setup.py install --root="$pkgdir" --optimize=1 - - install -Dm644 extras/django_bash_completion \ - "$pkgdir"/etc/bash_completion.d/django - - find "$pkgdir"/usr/lib/python2.7/site-packages/django/ -name '*.py' | \ - xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" - - install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} - -_pkgname=$pkgname -pkgname=django13 -pkgdesc+=" (legacy version for ParabolaWeb)" -pkgrel+=.1 -provides=("$_pkgname=$pkgver") -conflicts=("$_pkgname") diff --git a/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff b/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff deleted file mode 100644 index c6819c1ab..000000000 --- a/libre/django13/diff-django_branches_releases_1.3.X-from-16768-to-17460.diff +++ /dev/null @@ -1,1573 +0,0 @@ -diff --git a/README b/README -index c7d225c..47bfd33 100644 ---- a/README -+++ b/README -@@ -28,7 +28,7 @@ http://code.djangoproject.com/newticket - To get more help: - - * Join the #django channel on irc.freenode.net. Lots of helpful people -- hang out there. Read the archives at http://botland.oebfare.com/logger/django/. -+ hang out there. Read the archives at http://django-irc-logs.com/. - - * Join the django-users mailing list, or read the archives, at - http://groups.google.com/group/django-users. -diff --git a/django/contrib/admin/media/css/forms.css b/django/contrib/admin/media/css/forms.css -index 1cedf24..35d0ed7 100644 ---- a/django/contrib/admin/media/css/forms.css -+++ b/django/contrib/admin/media/css/forms.css -@@ -352,9 +352,3 @@ fieldset.monospace textarea { - .empty-form { - display: none; - } -- --/* IE7 specific bug fixes */ -- --.submit-row input { -- float: right; --} -\ No newline at end of file -diff --git a/django/contrib/gis/db/backends/spatialite/compiler.py b/django/contrib/gis/db/backends/spatialite/compiler.py -deleted file mode 100644 -index 3f81ae6..0000000 ---- a/django/contrib/gis/db/backends/spatialite/compiler.py -+++ /dev/null -@@ -1,32 +0,0 @@ --from django.db.backends.util import typecast_timestamp --from django.db.models.sql import compiler --from django.db.models.sql.constants import MULTI --from django.contrib.gis.db.models.sql.compiler import GeoSQLCompiler as BaseGeoSQLCompiler -- --SQLCompiler = compiler.SQLCompiler -- --class GeoSQLCompiler(BaseGeoSQLCompiler, SQLCompiler): -- pass -- --class SQLInsertCompiler(compiler.SQLInsertCompiler, GeoSQLCompiler): -- pass -- --class SQLDeleteCompiler(compiler.SQLDeleteCompiler, GeoSQLCompiler): -- pass -- --class SQLUpdateCompiler(compiler.SQLUpdateCompiler, GeoSQLCompiler): -- pass -- --class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler): -- pass -- --class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler): -- """ -- This is overridden for GeoDjango to properly cast date columns, see #16757. -- """ -- def results_iter(self): -- offset = len(self.query.extra_select) -- for rows in self.execute_sql(MULTI): -- for row in rows: -- date = typecast_timestamp(str(row[offset])) -- yield date -diff --git a/django/contrib/gis/db/backends/spatialite/creation.py b/django/contrib/gis/db/backends/spatialite/creation.py -index c107d96..ee5f9db 100644 ---- a/django/contrib/gis/db/backends/spatialite/creation.py -+++ b/django/contrib/gis/db/backends/spatialite/creation.py -@@ -56,14 +56,6 @@ class SpatiaLiteCreation(DatabaseCreation): - interactive=False, - database=self.connection.alias) - -- # One effect of calling syncdb followed by flush is that the id of the -- # default site may or may not be 1, depending on how the sequence was -- # reset. If the sites app is loaded, then we coerce it. -- from django.db.models import get_model -- Site = get_model('sites', 'Site') -- if Site is not None and Site.objects.using(self.connection.alias).count() == 1: -- Site.objects.using(self.connection.alias).update(id=settings.SITE_ID) -- - from django.core.cache import get_cache - from django.core.cache.backends.db import BaseDatabaseCache - for cache_alias in settings.CACHES: -diff --git a/django/contrib/gis/db/backends/spatialite/operations.py b/django/contrib/gis/db/backends/spatialite/operations.py -index 1dc612c..e6f8409 100644 ---- a/django/contrib/gis/db/backends/spatialite/operations.py -+++ b/django/contrib/gis/db/backends/spatialite/operations.py -@@ -48,7 +48,7 @@ def get_dist_ops(operator): - return (SpatiaLiteDistance(operator),) - - class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations): -- compiler_module = 'django.contrib.gis.db.backends.spatialite.compiler' -+ compiler_module = 'django.contrib.gis.db.models.sql.compiler' - name = 'spatialite' - spatialite = True - version_regex = re.compile(r'^(?P<major>\d)\.(?P<minor1>\d)\.(?P<minor2>\d+)') -diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py -index 782ce78..405a000 100644 ---- a/django/contrib/gis/db/models/sql/compiler.py -+++ b/django/contrib/gis/db/models/sql/compiler.py -@@ -1,7 +1,7 @@ - from itertools import izip --from django.db.backends.util import truncate_name -+from django.db.backends.util import truncate_name, typecast_timestamp - from django.db.models.sql import compiler --from django.db.models.sql.constants import TABLE_NAME -+from django.db.models.sql.constants import TABLE_NAME, MULTI - from django.db.models.sql.query import get_proxied_model - - SQLCompiler = compiler.SQLCompiler -@@ -194,7 +194,7 @@ class GeoSQLCompiler(compiler.SQLCompiler): - # We resolve the rest of the columns if we're on Oracle or if - # the `geo_values` attribute is defined. - for value, field in map(None, row[index_start:], fields): -- values.append(self.query.convert_values(value, field, connection=self.connection)) -+ values.append(self.query.convert_values(value, field, self.connection)) - else: - values.extend(row[index_start:]) - return tuple(values) -@@ -275,4 +275,24 @@ class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler): - pass - - class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler): -- pass -+ """ -+ This is overridden for GeoDjango to properly cast date columns, since -+ `GeoQuery.resolve_columns` is used for spatial values. -+ See #14648, #16757. -+ """ -+ def results_iter(self): -+ if self.connection.ops.oracle: -+ from django.db.models.fields import DateTimeField -+ fields = [DateTimeField()] -+ else: -+ needs_string_cast = self.connection.features.needs_datetime_string_cast -+ -+ offset = len(self.query.extra_select) -+ for rows in self.execute_sql(MULTI): -+ for row in rows: -+ date = row[offset] -+ if self.connection.ops.oracle: -+ date = self.resolve_columns(row, fields)[offset] -+ elif needs_string_cast: -+ date = typecast_timestamp(str(date)) -+ yield date -diff --git a/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz b/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz -index 68bf54c..8937637 100644 -Binary files a/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz and b/django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz differ -diff --git a/django/contrib/gis/tests/relatedapp/models.py b/django/contrib/gis/tests/relatedapp/models.py -index 2e9a62b..aec4e15 100644 ---- a/django/contrib/gis/tests/relatedapp/models.py -+++ b/django/contrib/gis/tests/relatedapp/models.py -@@ -36,6 +36,7 @@ class Parcel(models.Model): - # These use the GeoManager but do not have any geographic fields. - class Author(models.Model): - name = models.CharField(max_length=100) -+ dob = models.DateField() - objects = models.GeoManager() - - class Article(models.Model): -diff --git a/django/contrib/gis/tests/relatedapp/tests.py b/django/contrib/gis/tests/relatedapp/tests.py -index 250783b..1a6197c 100644 ---- a/django/contrib/gis/tests/relatedapp/tests.py -+++ b/django/contrib/gis/tests/relatedapp/tests.py -@@ -1,3 +1,4 @@ -+from datetime import date - from django.test import TestCase - - from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint -@@ -281,4 +282,11 @@ class RelatedGeoModelTest(TestCase): - # evaluated as list generation swallows TypeError in CPython. - sql = str(qs.query) - -+ def test16_annotated_date_queryset(self): -+ "Ensure annotated date querysets work if spatial backend is used. See #14648." -+ birth_years = [dt.year for dt in -+ list(Author.objects.annotate(num_books=Count('books')).dates('dob', 'year'))] -+ birth_years.sort() -+ self.assertEqual([1950, 1974], birth_years) -+ - # TODO: Related tests for KML, GML, and distance lookups. -diff --git a/django/contrib/sites/management.py b/django/contrib/sites/management.py -index 1987274..9bf5a14 100644 ---- a/django/contrib/sites/management.py -+++ b/django/contrib/sites/management.py -@@ -3,15 +3,34 @@ Creates the default Site object. - """ - - from django.db.models import signals -+from django.db import connections -+from django.db import router - from django.contrib.sites.models import Site - from django.contrib.sites import models as site_app -+from django.core.management.color import no_style - - def create_default_site(app, created_models, verbosity, db, **kwargs): -- if Site in created_models: -+ # Only create the default sites in databases where Django created the table -+ if Site in created_models and router.allow_syncdb(db, Site) : -+ # The default settings set SITE_ID = 1, and some tests in Django's test -+ # suite rely on this value. However, if database sequences are reused -+ # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that -+ # the next id will be 1, so we coerce it. See #15573 and #16353. This -+ # can also crop up outside of tests - see #15346. - if verbosity >= 2: - print "Creating example.com Site object" -- s = Site(domain="example.com", name="example.com") -- s.save(using=db) -+ Site(pk=1, domain="example.com", name="example.com").save(using=db) -+ -+ # We set an explicit pk instead of relying on auto-incrementation, -+ # so we need to reset the database sequence. -+ sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site]) -+ if sequence_sql: -+ if verbosity >= 2: -+ print "Resetting sequence" -+ cursor = connections[db].cursor() -+ for command in sequence_sql: -+ cursor.execute(command) -+ - Site.objects.clear_cache() - - signals.post_syncdb.connect(create_default_site, sender=site_app) -diff --git a/django/contrib/sites/tests.py b/django/contrib/sites/tests.py -index 17ab1f2..828badb 100644 ---- a/django/contrib/sites/tests.py -+++ b/django/contrib/sites/tests.py -@@ -15,6 +15,12 @@ class SitesFrameworkTests(TestCase): - def tearDown(self): - Site._meta.installed = self.old_Site_meta_installed - -+ def test_save_another(self): -+ # Regression for #17415 -+ # On some backends the sequence needs reset after save with explicit ID. -+ # Test that there is no sequence collisions by saving another site. -+ Site(domain="example2.com", name="example2.com").save() -+ - def test_site_manager(self): - # Make sure that get_current() does not return a deleted Site object. - s = Site.objects.get_current() -diff --git a/django/core/management/commands/shell.py b/django/core/management/commands/shell.py -index e4ce462..039ebb8 100644 ---- a/django/core/management/commands/shell.py -+++ b/django/core/management/commands/shell.py -@@ -13,9 +13,8 @@ class Command(NoArgsCommand): - - def ipython(self): - try: -- from IPython.frontend.terminal.embed import TerminalInteractiveShell -- shell = TerminalInteractiveShell() -- shell.mainloop() -+ from IPython import embed -+ embed() - except ImportError: - # IPython < 0.11 - # Explicitly pass an empty list as arguments, because otherwise -diff --git a/django/core/validators.py b/django/core/validators.py -index a93c6ac..9dcc2bc 100644 ---- a/django/core/validators.py -+++ b/django/core/validators.py -@@ -147,7 +147,8 @@ class EmailValidator(RegexValidator): - - email_re = re.compile( - r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*" # dot-atom -- r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string -+ # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5 -+ r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"' - r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE) # domain - validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid') - -diff --git a/django/db/backends/creation.py b/django/db/backends/creation.py -index 57e3f77..ef594b7 100644 ---- a/django/db/backends/creation.py -+++ b/django/db/backends/creation.py -@@ -374,15 +374,6 @@ class BaseDatabaseCreation(object): - verbosity=max(verbosity - 1, 0), - interactive=False, - database=self.connection.alias) -- -- # One effect of calling syncdb followed by flush is that the id of the -- # default site may or may not be 1, depending on how the sequence was -- # reset. If the sites app is loaded, then we coerce it. -- from django.db.models import get_model -- if 'django.contrib.sites' in settings.INSTALLED_APPS: -- Site = get_model('sites', 'Site') -- if Site is not None and Site.objects.using(self.connection.alias).count() == 1: -- Site.objects.using(self.connection.alias).update(id=settings.SITE_ID) - - from django.core.cache import get_cache - from django.core.cache.backends.db import BaseDatabaseCache -diff --git a/django/http/__init__.py b/django/http/__init__.py -index 68ac45d..07e5a46 100644 ---- a/django/http/__init__.py -+++ b/django/http/__init__.py -@@ -92,7 +92,7 @@ else: - if not _cookie_allows_colon_in_names: - def load(self, rawdata, ignore_parse_errors=False): - if ignore_parse_errors: -- self.bad_cookies = [] -+ self.bad_cookies = set() - self._BaseCookie__set = self._loose_set - super(SimpleCookie, self).load(rawdata) - if ignore_parse_errors: -@@ -106,8 +106,8 @@ else: - try: - self._strict_set(key, real_value, coded_value) - except Cookie.CookieError: -- self.bad_cookies.append(key) -- dict.__setitem__(self, key, None) -+ self.bad_cookies.add(key) -+ dict.__setitem__(self, key, Cookie.Morsel()) - - - class CompatCookie(SimpleCookie): -diff --git a/django/http/utils.py b/django/http/utils.py -index 5eea239..0180864 100644 ---- a/django/http/utils.py -+++ b/django/http/utils.py -@@ -76,7 +76,8 @@ def fix_IE_for_vary(request, response): - - # The first part of the Content-Type field will be the MIME type, - # everything after ';', such as character-set, can be ignored. -- if response['Content-Type'].split(';')[0] not in safe_mime_types: -+ mime_type = response.get('Content-Type', '').partition(';')[0] -+ if mime_type not in safe_mime_types: - try: - del response['Vary'] - except KeyError: -diff --git a/docs/howto/deployment/modpython.txt b/docs/howto/deployment/modpython.txt -index f5030e9..693f942 100644 ---- a/docs/howto/deployment/modpython.txt -+++ b/docs/howto/deployment/modpython.txt -@@ -293,11 +293,14 @@ of the admin app, but this is not the case when you use any other server - arrangement. You're responsible for setting up Apache, or whichever media - server you're using, to serve the admin files. - --The admin files live in (:file:`django/contrib/admin/static/admin`) of the -+The admin files live in (:file:`django/contrib/admin/media/admin`) of the - Django distribution. - --We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle --the admin files, but here are two other approaches: -+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the -+admin files (this means using the :djadmin:`collectstatic` management command -+to collect the static files in :setting:`STATIC_ROOT`, and then configuring -+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but -+here are two other approaches: - - 1. Create a symbolic link to the admin static files from within your - document root. -diff --git a/docs/howto/deployment/modwsgi.txt b/docs/howto/deployment/modwsgi.txt -index de3a5b6..fdf9d27 100644 ---- a/docs/howto/deployment/modwsgi.txt -+++ b/docs/howto/deployment/modwsgi.txt -@@ -127,11 +127,14 @@ of the admin app, but this is not the case when you use any other server - arrangement. You're responsible for setting up Apache, or whichever media - server you're using, to serve the admin files. - --The admin files live in (:file:`django/contrib/admin/static/admin`) of the -+The admin files live in (:file:`django/contrib/admin/media/admin`) of the - Django distribution. - --We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle --the admin files, but here are two other approaches: -+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the -+admin files (this means using the :djadmin:`collectstatic` management command -+to collect the static files in :setting:`STATIC_ROOT`, and then configuring -+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but -+here are two other approaches: - - 1. Create a symbolic link to the admin static files from within your - document root. -diff --git a/docs/index.txt b/docs/index.txt -index 0cf066e..20a7cec 100644 ---- a/docs/index.txt -+++ b/docs/index.txt -@@ -28,7 +28,7 @@ Having trouble? We'd like to help! - .. _archives of the django-users mailing list: http://groups.google.com/group/django-users/ - .. _post a question: http://groups.google.com/group/django-users/ - .. _#django IRC channel: irc://irc.freenode.net/django --.. _IRC logs: http://botland.oebfare.com/logger/django/ -+.. _IRC logs: http://django-irc-logs.com/ - .. _ticket tracker: http://code.djangoproject.com/ - - First steps -diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt -index 3f0f998..ca29d15 100644 ---- a/docs/internals/deprecation.txt -+++ b/docs/internals/deprecation.txt -@@ -177,6 +177,12 @@ their deprecation, as per the :ref:`Django deprecation policy - required to end with a trailing slash to ensure there is a consistent - way to combine paths in templates. - -+ * Translations located under the so-called *project path* will be -+ ignored during the translation building process performed at runtime. -+ The :setting:`LOCALE_PATHS` setting can be used for the same task by -+ including the filesystem path to a ``locale`` directory containing -+ non-app-specific translations in its value. -+ - * 2.0 - * ``django.views.defaults.shortcut()``. This function has been moved - to ``django.contrib.contenttypes.views.shortcut()`` as part of the -diff --git a/docs/internals/release-process.txt b/docs/internals/release-process.txt -index 2a56f0b..799a59e 100644 ---- a/docs/internals/release-process.txt -+++ b/docs/internals/release-process.txt -@@ -99,6 +99,13 @@ varying levels: - * Security fixes will be applied to the current trunk and the previous two - minor releases. - -+* Documentation fixes will generally be more freely backported to the last -+ release branch (at the discretion of the committer), and don't need to meet -+ the "critical fixes only" bar as it's highly advantageous to have the docs -+ for the last release be up-to-date and correct, and the downside of -+ backporting (risk of introducing regressions) is much less of a concern -+ with doc fixes. -+ - As a concrete example, consider a moment in time halfway between the release of - Django 1.3 and 1.4. At this point in time: - -@@ -111,6 +118,9 @@ Django 1.3 and 1.4. At this point in time: - ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``, - ``1.2.1``, etc. - -+* Documentation fixes will be applied to trunk, and if easily backported, to -+ the ``1.3.X`` branch. -+ - .. _release-process: - - Release process -diff --git a/docs/intro/index.txt b/docs/intro/index.txt -index bc61be7..19290a5 100644 ---- a/docs/intro/index.txt -+++ b/docs/intro/index.txt -@@ -31,6 +31,6 @@ place: read this material to quickly get up and running. - - .. _python: http://python.org/ - .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers -- .. _dive into python: http://diveintopython.org/ -+ .. _dive into python: http://diveintopython.net/ - .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20 - .. _books about Python: http://wiki.python.org/moin/PythonBooks -\ No newline at end of file -diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt -index 2f2e049..4dc1e5c 100644 ---- a/docs/intro/tutorial01.txt -+++ b/docs/intro/tutorial01.txt -@@ -59,7 +59,7 @@ This will create a ``mysite`` directory in your current directory. - can be run as a program. To do this, open Terminal.app and navigate (using - the ``cd`` command) to the directory where :doc:`django-admin.py - </ref/django-admin>` is installed, then run the command -- ``chmod +x django-admin.py``. -+ ``sudo chmod +x django-admin.py``. - - .. note:: - -@@ -692,10 +692,9 @@ Save these changes and start a new Python interactive shell by running - - For more information on model relations, see :doc:`Accessing related objects - </ref/models/relations>`. For more on how to use double underscores to perform --field lookups via the API, see `Field lookups`__. For full details on the --database API, see our :doc:`Database API reference </topics/db/queries>`. -- --__ http://docs.djangoproject.com/en/1.2/topics/db/queries/#field-lookups -+field lookups via the API, see :ref:`Field lookups <field-lookups-intro>`. For -+full details on the database API, see our :doc:`Database API reference -+</topics/db/queries>`. - - When you're comfortable with the API, read :doc:`part 2 of this tutorial - </intro/tutorial02>` to get Django's automatic admin working. -diff --git a/docs/intro/tutorial02.txt b/docs/intro/tutorial02.txt -index 4bd31fb..1e837e6 100644 ---- a/docs/intro/tutorial02.txt -+++ b/docs/intro/tutorial02.txt -@@ -40,22 +40,22 @@ activate the admin site for your installation, do these three things: - - .. parsed-literal:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - # Uncomment the next two lines to enable the admin: - **from django.contrib import admin** - **admin.autodiscover()** - - urlpatterns = patterns('', -- # Example: -- # (r'^mysite/', include('mysite.foo.urls')), -+ # Examples: -+ # url(r'^$', 'mysite.views.home', name='home'), -+ # url(r'^mysite/', include('mysite.foo.urls')), - -- # Uncomment the admin/doc line below and add 'django.contrib.admindocs' -- # to INSTALLED_APPS to enable admin documentation: -- # (r'^admin/doc/', include('django.contrib.admindocs.urls')), -+ # Uncomment the admin/doc line below to enable admin documentation: -+ # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: -- **(r'^admin/', include(admin.site.urls)),** -+ **url(r'^admin/', include(admin.site.urls)),** - ) - - (The bold lines are the ones that needed to be uncommented.) -diff --git a/docs/intro/tutorial03.txt b/docs/intro/tutorial03.txt -index 41a62a7..566ba55 100644 ---- a/docs/intro/tutorial03.txt -+++ b/docs/intro/tutorial03.txt -@@ -78,17 +78,17 @@ point at that file:: - - Time for an example. Edit ``mysite/urls.py`` so it looks like this:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - from django.contrib import admin - admin.autodiscover() - - urlpatterns = patterns('', -- (r'^polls/$', 'polls.views.index'), -- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'), -- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'), -- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), -- (r'^admin/', include(admin.site.urls)), -+ url(r'^polls/$', 'polls.views.index'), -+ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'), -+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'), -+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), -+ url(r'^admin/', include(admin.site.urls)), - ) - - This is worth a review. When somebody requests a page from your Web site -- say, -@@ -112,7 +112,7 @@ what you can do with them. And there's no need to add URL cruft such as ``.php`` - -- unless you have a sick sense of humor, in which case you can do something - like this:: - -- (r'^polls/latest\.php$', 'polls.views.index'), -+ url(r'^polls/latest\.php$', 'polls.views.index'), - - But, don't do that. It's silly. - -@@ -357,22 +357,23 @@ the list is empty. - Write a 404 (page not found) view - ================================= - --When you raise :exc:`~django.http.Http404` from within a view, Django will load --a special view devoted to handling 404 errors. It finds it by looking for the --variable ``handler404``, which is a string in Python dotted syntax -- the same --format the normal URLconf callbacks use. A 404 view itself has nothing special: --It's just a normal view. -- --You normally won't have to bother with writing 404 views. By default, URLconfs --have the following line up top:: -- -- from django.conf.urls.defaults import * -+When you raise :exc:`~django.http.Http404` from within a view, Django -+will load a special view devoted to handling 404 errors. It finds it -+by looking for the variable ``handler404`` in your root URLconf (and -+only in your root URLconf; setting ``handler404`` anywhere else will -+have no effect), which is a string in Python dotted syntax -- the same -+format the normal URLconf callbacks use. A 404 view itself has nothing -+special: It's just a normal view. - --That takes care of setting ``handler404`` in the current module. As you can see --in ``django/conf/urls/defaults.py``, ``handler404`` is set to --:func:`django.views.defaults.page_not_found` by default. -+You normally won't have to bother with writing 404 views. If you don't set -+``handler404``, the built-in view :func:`django.views.defaults.page_not_found` -+is used by default. In this case, you still have one obligation: To create a -+``404.html`` template in the root of your template directory. The default 404 -+view will use that template for all 404 errors. If :setting:`DEBUG` is set to -+``False`` (in your settings module) and if you didn't create a ``404.html`` -+file, an ``Http500`` is raised instead. So remember to create a ``404.html``. - --Four more things to note about 404 views: -+A couple more things to note about 404 views: - - * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your - 404 view will never be used (and thus the ``404.html`` template will never -@@ -381,21 +382,12 @@ Four more things to note about 404 views: - * The 404 view is also called if Django doesn't find a match after checking - every regular expression in the URLconf. - -- * If you don't define your own 404 view -- and simply use the default, which -- is recommended -- you still have one obligation: To create a ``404.html`` -- template in the root of your template directory. The default 404 view will -- use that template for all 404 errors. -- -- * If :setting:`DEBUG` is set to ``False`` (in your settings module) and if -- you didn't create a ``404.html`` file, an ``Http500`` is raised instead. -- So remember to create a ``404.html``. -- - Write a 500 (server error) view - =============================== - --Similarly, URLconfs may define a ``handler500``, which points to a view to call --in case of server errors. Server errors happen when you have runtime errors in --view code. -+Similarly, your root URLconf may define a ``handler500``, which points -+to a view to call in case of server errors. Server errors happen when -+you have runtime errors in view code. - - Use the template system - ======================= -@@ -432,10 +424,10 @@ Take some time to play around with the views and template system. As you edit - the URLconf, you may notice there's a fair bit of redundancy in it:: - - urlpatterns = patterns('', -- (r'^polls/$', 'polls.views.index'), -- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'), -- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'), -- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), -+ url(r'^polls/$', 'polls.views.index'), -+ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'), -+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'), -+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), - ) - - Namely, ``polls.views`` is in every callback. -@@ -445,10 +437,10 @@ common prefixes. You can factor out the common prefixes and add them as the - first argument to :func:`~django.conf.urls.defaults.patterns`, like so:: - - urlpatterns = patterns('polls.views', -- (r'^polls/$', 'index'), -- (r'^polls/(?P<poll_id>\d+)/$', 'detail'), -- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'), -- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'), -+ url(r'^polls/$', 'index'), -+ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'), -+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'), -+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'), - ) - - This is functionally identical to the previous formatting. It's just a bit -@@ -459,20 +451,20 @@ callback in your URLconf, you can concatenate multiple - :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might - now look like this:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - from django.contrib import admin - admin.autodiscover() - - urlpatterns = patterns('polls.views', -- (r'^polls/$', 'index'), -- (r'^polls/(?P<poll_id>\d+)/$', 'detail'), -- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'), -- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'), -+ url(r'^polls/$', 'index'), -+ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'), -+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'), -+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'), - ) - - urlpatterns += patterns('', -- (r'^admin/', include(admin.site.urls)), -+ url(r'^admin/', include(admin.site.urls)), - ) - - Decoupling the URLconfs -@@ -502,8 +494,8 @@ Copy the file ``mysite/urls.py`` to ``polls/urls.py``. Then, change - admin.autodiscover() - - urlpatterns = patterns('', -- (r'^polls/', include('polls.urls')), -- (r'^admin/', include(admin.site.urls)), -+ url(r'^polls/', include('polls.urls')), -+ url(r'^admin/', include(admin.site.urls)), - ) - - :func:`~django.conf.urls.defaults.include` simply references another URLconf. -@@ -526,13 +518,13 @@ URLconf by removing the leading "polls/" from each line, and removing the - lines registering the admin site. Your ``polls/urls.py`` file should now look like - this:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - urlpatterns = patterns('polls.views', -- (r'^$', 'index'), -- (r'^(?P<poll_id>\d+)/$', 'detail'), -- (r'^(?P<poll_id>\d+)/results/$', 'results'), -- (r'^(?P<poll_id>\d+)/vote/$', 'vote'), -+ url(r'^$', 'index'), -+ url(r'^(?P<poll_id>\d+)/$', 'detail'), -+ url(r'^(?P<poll_id>\d+)/results/$', 'results'), -+ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'), - ) - - The idea behind :func:`~django.conf.urls.defaults.include` and URLconf -diff --git a/docs/intro/tutorial04.txt b/docs/intro/tutorial04.txt -index ded5cb2..4c2f2d4 100644 ---- a/docs/intro/tutorial04.txt -+++ b/docs/intro/tutorial04.txt -@@ -218,13 +218,13 @@ Read on for details. - First, open the ``polls/urls.py`` URLconf. It looks like this, according to the - tutorial so far:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - urlpatterns = patterns('polls.views', -- (r'^$', 'index'), -- (r'^(?P<poll_id>\d+)/$', 'detail'), -- (r'^(?P<poll_id>\d+)/results/$', 'results'), -- (r'^(?P<poll_id>\d+)/vote/$', 'vote'), -+ url(r'^$', 'index'), -+ url(r'^(?P<poll_id>\d+)/$', 'detail'), -+ url(r'^(?P<poll_id>\d+)/results/$', 'results'), -+ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'), - ) - - Change it like so:: -@@ -234,12 +234,12 @@ Change it like so:: - from polls.models import Poll - - urlpatterns = patterns('', -- (r'^$', -+ url(r'^$', - ListView.as_view( - queryset=Poll.objects.order_by('-pub_date')[:5], - context_object_name='latest_poll_list', - template_name='polls/index.html')), -- (r'^(?P<pk>\d+)/$', -+ url(r'^(?P<pk>\d+)/$', - DetailView.as_view( - model=Poll, - template_name='polls/detail.html')), -@@ -248,7 +248,7 @@ Change it like so:: - model=Poll, - template_name='polls/results.html'), - name='poll_results'), -- (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), -+ url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), - ) - - We're using two generic views here: -diff --git a/docs/ref/contrib/admin/index.txt b/docs/ref/contrib/admin/index.txt -index beff94e..7394c3a 100644 ---- a/docs/ref/contrib/admin/index.txt -+++ b/docs/ref/contrib/admin/index.txt -@@ -19,8 +19,10 @@ There are six steps in activating the Django admin site: - 1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS` - setting. - -- 2. Admin has two dependencies - :mod:`django.contrib.auth` and -- :mod:`django.contrib.contenttypes`. If these applications are not -+ 2. The admin has four dependencies - :mod:`django.contrib.auth`, -+ :mod:`django.contrib.contenttypes`, -+ :mod:`django.contrib.messages` and -+ :mod:`django.contrib.sessions`. If these applications are not - in your :setting:`INSTALLED_APPS` list, add them. - - 3. Determine which of your application's models should be editable in the -@@ -542,7 +544,7 @@ subclass:: - Fields in ``list_filter`` can also span relations using the ``__`` lookup:: - - class UserAdminWithLookup(UserAdmin): -- list_filter = ('groups__name') -+ list_filter = ('groups__name',) - - .. attribute:: ModelAdmin.list_per_page - -diff --git a/docs/ref/contrib/gis/geoip.txt b/docs/ref/contrib/gis/geoip.txt -index 6503be7..f5c45e1 100644 ---- a/docs/ref/contrib/gis/geoip.txt -+++ b/docs/ref/contrib/gis/geoip.txt -@@ -144,7 +144,7 @@ parameters. - Returns a dictionary of city information for the given query. Some - of the values in the dictionary may be undefined (``None``). - --.. method:: GeoIPcountry(query) -+.. method:: GeoIP.country(query) - - Returns a dictionary with the country code and country for the given - query. -diff --git a/docs/ref/contrib/messages.txt b/docs/ref/contrib/messages.txt -index ca3212d..ee7e01c 100644 ---- a/docs/ref/contrib/messages.txt -+++ b/docs/ref/contrib/messages.txt -@@ -210,6 +210,10 @@ If you're using the context processor, your template should be rendered with a - ``RequestContext``. Otherwise, ensure ``messages`` is available to - the template context. - -+Even if you know there is only just one message, you should still iterate over -+the ``messages`` sequence, because otherwise the message storage will not be cleared -+for the next request. -+ - Creating custom message levels - ------------------------------ - -diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt -index 89bc43f..58b86ea 100644 ---- a/docs/ref/django-admin.txt -+++ b/docs/ref/django-admin.txt -@@ -1156,7 +1156,7 @@ variable. - Note that this option is unnecessary in ``manage.py``, because it takes care of - setting the Python path for you. - --.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html -+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html - - .. django-admin-option:: --settings - -diff --git a/docs/ref/models/instances.txt b/docs/ref/models/instances.txt -index 3728a09..52c0869 100644 ---- a/docs/ref/models/instances.txt -+++ b/docs/ref/models/instances.txt -@@ -470,7 +470,7 @@ the URL. For example, if your URLconf contained a line such as:: - - Similarly, if you had a URLconf entry that looked like:: - -- (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view) -+ (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view) - - ...you could reference this using ``permalink()`` as follows:: - -@@ -478,8 +478,8 @@ Similarly, if you had a URLconf entry that looked like:: - def get_absolute_url(self): - return ('archive_view', (), { - 'year': self.created.year, -- 'month': self.created.month, -- 'day': self.created.day}) -+ 'month': self.created.strftime('%m'), -+ 'day': self.created.strftime('%d')}) - - Notice that we specify an empty sequence for the second parameter in this case, - because we only want to pass keyword parameters, not positional ones. -diff --git a/docs/ref/models/options.txt b/docs/ref/models/options.txt -index 4530439..c1beab0 100644 ---- a/docs/ref/models/options.txt -+++ b/docs/ref/models/options.txt -@@ -166,6 +166,13 @@ Django quotes column and table names behind the scenes. - >>> answer.get_previous_in_order() - <Answer: 1> - -+.. admonition:: Changing order_with_respect_to -+ -+ ``order_with_respect_to`` adds an additional field/database column -+ named ``_order``, so be sure to handle that as you would any other -+ change to your models if you add or change ``order_with_respect_to`` -+ after your initial :djadmin:`syncdb`. -+ - ``ordering`` - ------------ - -@@ -238,6 +245,12 @@ Django quotes column and table names behind the scenes. - - unique_together = ("driver", "restaurant") - -+ A :class:`~django.db.models.ManyToManyField` cannot be included in -+ unique_together (it's not even clear what that would mean). If you -+ need to validate uniqueness related to a -+ :class:`~django.db.models.ManyToManyField`, look at signals or -+ using an explicit :attr:`through <ManyToManyField.through>` model. -+ - ``verbose_name`` - ---------------- - -diff --git a/docs/ref/signals.txt b/docs/ref/signals.txt -index e83142e..ad25dce 100644 ---- a/docs/ref/signals.txt -+++ b/docs/ref/signals.txt -@@ -352,12 +352,16 @@ post_syncdb - .. data:: django.db.models.signals.post_syncdb - :module: - --Sent by :djadmin:`syncdb` after it installs an application. -+Sent by :djadmin:`syncdb` command after it installs an application, and -+:djadmin:`flush` command. - - Any handlers that listen to this signal need to be written in a particular - place: a ``management`` module in one of your :setting:`INSTALLED_APPS`. If - handlers are registered anywhere else they may not be loaded by --:djadmin:`syncdb`. -+:djadmin:`syncdb`. It is important that handlers of this signal perform -+idempotent changes (e.g. no database alterations) as this may cause the -+:djadmin:`flush` management command to fail if it also ran during the -+:djadmin:`syncdb` command. - - Arguments sent with this signal: - -diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt -index 7d24c1d..6c7057a 100644 ---- a/docs/ref/templates/builtins.txt -+++ b/docs/ref/templates/builtins.txt -@@ -1868,7 +1868,7 @@ slice - Returns a slice of the list. - - Uses the same syntax as Python's list slicing. See --http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice -+http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice - for an introduction. - - Example:: -diff --git a/docs/releases/0.95.txt b/docs/releases/0.95.txt -index 7409bff..3632c31 100644 ---- a/docs/releases/0.95.txt -+++ b/docs/releases/0.95.txt -@@ -92,15 +92,15 @@ changes is described in the `Removing The Magic`_ wiki page. There is also an - easy checklist_ for reference when undertaking the porting operation. - - .. _Removing The Magic: http://code.djangoproject.com/wiki/RemovingTheMagic --.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet1 -+.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet - - Problem reports and getting help - ================================ - --Need help resolving a problem with Django? The documentation in the distribution --is also available online_ at the `Django Web site`_. The :doc:`FAQ </faq/index>` --document is especially recommended, as it contains a number of issues that come --up time and again. -+Need help resolving a problem with Django? The documentation in the -+distribution is also available :doc:`online </index>` at the `Django Web -+site`_. The :doc:`FAQ </faq/index>` document is especially recommended, as it -+contains a number of issues that come up time and again. - - For more personalized help, the `django-users`_ mailing list is a very active - list, with more than 2,000 subscribers who can help you solve any sort of -@@ -113,7 +113,6 @@ there's a #django channel on irc.freenode.net that is regularly populated by - Django users and developers from around the world. Friendly people are usually - available at any hour of the day -- to help, or just to chat. - --.. _online: http://www.djangoproject.com/documentation/0.95/ - .. _Django Web site: http://www.djangoproject.com/ - .. _django-users: http://groups.google.com/group/django-users - -diff --git a/docs/releases/0.96.txt b/docs/releases/0.96.txt -index 1224360..8874ccb 100644 ---- a/docs/releases/0.96.txt -+++ b/docs/releases/0.96.txt -@@ -50,12 +50,10 @@ aside from any necessary security fixes, it will not be actively - maintained, and it will be removed in a future release of Django. - - Also, note that some features, like the new :setting:`DATABASE_OPTIONS` --setting (see the `databases documentation`_ for details), are only --available on the "mysql" backend, and will not be made available for -+setting (see the :doc:`databases documentation </ref/databases>` for details), -+are only available on the "mysql" backend, and will not be made available for - "mysql_old". - --.. _databases documentation: http://www.djangoproject.com/documentation/0.96/databases/ -- - Database constraint names changed - --------------------------------- - -@@ -164,10 +162,8 @@ Although the ``newforms`` library will continue to evolve, it's ready for use - for most common cases. We recommend that anyone new to form handling skip the - old forms system and start with the new. - --For more information about ``django.newforms``, read the `newforms --documentation`_. -- --.. _newforms documentation: http://www.djangoproject.com/documentation/0.96/newforms/ -+For more information about ``django.newforms``, read the :doc:`newforms -+documentation </topics/forms/index>`. - - URLconf improvements - -------------------- -@@ -216,19 +212,15 @@ The test framework - ------------------ - - Django now includes a test framework so you can start transmuting fear into --boredom (with apologies to Kent Beck). You can write tests based on doctest_ --or unittest_ and test your views with a simple test client. -+boredom (with apologies to Kent Beck). You can write tests based on -+:mod:`doctest` or :mod:`unittest` and test your views with a simple test client. - - There is also new support for "fixtures" -- initial data, stored in any of the --supported `serialization formats`_, that will be loaded into your database at the --start of your tests. This makes testing with real data much easier. -- --See `the testing documentation`_ for the full details. -+supported :doc:`serialization formats </topics/serialization>`, that will be -+loaded into your database at the start of your tests. This makes testing with -+real data much easier. - --.. _doctest: http://docs.python.org/library/doctest.html --.. _unittest: http://docs.python.org/library/unittest.html --.. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/ --.. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/ -+See :doc:`the testing documentation </topics/testing>` for the full details. - - Improvements to the admin interface - ----------------------------------- -diff --git a/docs/releases/1.0.1.txt b/docs/releases/1.0.1.txt -index 780dc53..3550e7c 100644 ---- a/docs/releases/1.0.1.txt -+++ b/docs/releases/1.0.1.txt -@@ -6,10 +6,10 @@ Welcome to Django 1.0.1! - - This is the first "bugfix" release in the Django 1.0 series, improving - the stability and performance of the Django 1.0 codebase. As such, --Django 1.0.1 contains no new features (and, pursuant to `our --compatibility policy`_, maintains backwards compatibility with Django --1.0), but does contain a number of fixes and other --improvements. Django 1.0.1 is a recommended upgrade for any -+Django 1.0.1 contains no new features (and, pursuant to :doc:`our -+compatibility policy </misc/api-stability/>`, maintains backwards -+compatibility with Django 1.0), but does contain a number of fixes -+and other improvements. Django 1.0.1 is a recommended upgrade for any - development or deployment currently using or targeting Django 1.0. - - -@@ -46,8 +46,9 @@ highlights: - - * A fix to the application of autoescaping for literal strings passed - to the ``join`` template filter. Previously, literal strings passed -- to ``join`` were automatically escaped, contrary to `the documented -- behavior for autoescaping and literal strings`_. Literal strings -+ to ``join`` were automatically escaped, contrary to :ref:`the -+ documented behavior for autoescaping and literal strings -+ <string-literals-and-automatic-escaping>`. Literal strings - passed to ``join`` are no longer automatically escaped, meaning you - must now manually escape them; this is an incompatibility if you - were relying on this bug, but not if you were relying on escaping -@@ -60,6 +61,4 @@ highlights: - documentation, including both corrections to existing documents and - expanded and new documentation. - --.. _our compatibility policy: http://docs.djangoproject.com/en/dev/misc/api-stability/ - .. _the Subversion log of the 1.0.X branch: http://code.djangoproject.com/log/django/branches/releases/1.0.X --.. _the documented behavior for autoescaping and literal strings: http://docs.djangoproject.com/en/dev/topics/templates/#string-literals-and-automatic-escaping -diff --git a/docs/releases/1.2.6.txt b/docs/releases/1.2.6.txt -new file mode 100644 -index 0000000..cfd1d9c ---- /dev/null -+++ b/docs/releases/1.2.6.txt -@@ -0,0 +1,16 @@ -+========================== -+Django 1.2.6 release notes -+========================== -+ -+*September 9, 2011* -+ -+Welcome to Django 1.2.6! -+ -+This is the sixth bugfix/security release in the Django 1.2 series, fixing -+several security issues present in Django 1.2.5. Django 1.2.6 is a -+recommended upgrade for all users of any Django release in the 1.2.X series. -+ -+For a full list of issues addressed in this release, see the `security -+advisory`_. -+ -+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/ -diff --git a/docs/releases/1.2.7.txt b/docs/releases/1.2.7.txt -new file mode 100644 -index 0000000..c0cf698 ---- /dev/null -+++ b/docs/releases/1.2.7.txt -@@ -0,0 +1,16 @@ -+========================== -+Django 1.2.7 release notes -+========================== -+ -+*September 10, 2011* -+ -+Welcome to Django 1.2.7! -+ -+This is the seventh bugfix/security release in the Django 1.2 series. It -+replaces Django 1.2.6 due to problems with the 1.2.6 release tarball. -+Django 1.2.7 is a recommended upgrade for all users of any Django release in -+the 1.2.X series. -+ -+For more information, see the `release advisory`_. -+ -+.. _release advisory: https://www.djangoproject.com/weblog/2011/sep/10/127/ -diff --git a/docs/releases/1.3.1.txt b/docs/releases/1.3.1.txt -new file mode 100644 -index 0000000..4c28916 ---- /dev/null -+++ b/docs/releases/1.3.1.txt -@@ -0,0 +1,16 @@ -+========================== -+Django 1.3.1 release notes -+========================== -+ -+*September 9, 2011* -+ -+Welcome to Django 1.3.1! -+ -+This is the first security release in the Django 1.3 series, fixing several -+security issues in Django 1.3. Django 1.3.1 is a recommended upgrade for -+all users of Django 1.3. -+ -+For a full list of issues addressed in this release, see the `security -+advisory`_. -+ -+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/ -diff --git a/docs/releases/index.txt b/docs/releases/index.txt -index 8d23c28..40fe5b0 100644 ---- a/docs/releases/index.txt -+++ b/docs/releases/index.txt -@@ -19,6 +19,7 @@ Final releases - .. toctree:: - :maxdepth: 1 - -+ 1.3.1 - 1.3 - - 1.2 release -@@ -26,6 +27,8 @@ Final releases - .. toctree:: - :maxdepth: 1 - -+ 1.2.7 -+ 1.2.6 - 1.2.5 - 1.2.4 - 1.2.2 -diff --git a/docs/topics/auth.txt b/docs/topics/auth.txt -index 635f18f..5a2608a 100644 ---- a/docs/topics/auth.txt -+++ b/docs/topics/auth.txt -@@ -1251,16 +1251,19 @@ can or cannot do with Task instances, specific to your application:: - ... - class Meta: - permissions = ( -- ("can_view", "Can see available tasks"), -- ("can_change_status", "Can change the status of tasks"), -- ("can_close", "Can remove a task by setting its status as closed"), -+ ("view_task", "Can see available tasks"), -+ ("change_task_status", "Can change the status of tasks"), -+ ("close_task", "Can remove a task by setting its status as closed"), - ) - - The only thing this does is create those extra permissions when you run - :djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the - value of these permissions when an user is trying to access the functionality - provided by the application (viewing tasks, changing the status of tasks, --closing tasks.) -+closing tasks.) Continuing the above example, the following checks if a user may -+view tasks:: -+ -+ user.has_perm('app.view_task') - - API reference - ------------- -diff --git a/docs/topics/cache.txt b/docs/topics/cache.txt -index 8ef4ea2..9b68353 100644 ---- a/docs/topics/cache.txt -+++ b/docs/topics/cache.txt -@@ -99,8 +99,9 @@ To use Memcached with Django: - on your chosen memcached binding) - - * Set :setting:`LOCATION <CACHES-LOCATION>` to ``ip:port`` values, -- where ``ip`` is the IP address of the Memcached daemon and -- ``port`` is the port on which Memcached is running. -+ where ``ip`` is the IP address of the Memcached daemon and ``port`` is the -+ port on which Memcached is running, or to a ``unix:path`` value, where -+ ``path`` is the path to a Memcached Unix socket file. - - In this example, Memcached is running on localhost (127.0.0.1) port 11211, using - the ``python-memcached`` binding:: -@@ -112,6 +113,16 @@ the ``python-memcached`` binding:: - } - } - -+In this example, Memcached is available through a local Unix socket file -+:file:`/tmp/memcached.sock` using the ``python-memcached`` binding:: -+ -+ CACHES = { -+ 'default': { -+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', -+ 'LOCATION': 'unix:/tmp/memcached.sock', -+ } -+ } -+ - One excellent feature of Memcached is its ability to share cache over multiple - servers. This means you can run Memcached daemons on multiple machines, and the - program will treat the group of machines as a *single* cache, without the need -@@ -526,9 +537,10 @@ you may expect. But once a particular URL (e.g., ``/foo/23/``) has been - requested, subsequent requests to that URL will use the cache. - - ``cache_page`` can also take an optional keyword argument, ``cache``, --which directs the decorator to use a specific cache alias when caching view --results. By default, the ``default`` alias will be used, but you can specify --any cache alias you want:: -+which directs the decorator to use a specific cache (from your -+:setting:`CACHES` setting) when caching view results. By default, the -+``default`` cache will be used, but you can specify any cache you -+want:: - - @cache_page(60 * 15, cache="special_cache") - def my_view(request): -diff --git a/docs/topics/class-based-views.txt b/docs/topics/class-based-views.txt -index 3831046..4da48ec 100644 ---- a/docs/topics/class-based-views.txt -+++ b/docs/topics/class-based-views.txt -@@ -380,7 +380,7 @@ Next, we'll write the ``PublisherBookListView`` view itself:: - class PublisherBookListView(ListView): - - context_object_name = "book_list" -- template_name = "books/books_by_publisher.html", -+ template_name = "books/books_by_publisher.html" - - def get_queryset(self): - publisher = get_object_or_404(Publisher, name__iexact=self.args[0]) -@@ -396,7 +396,7 @@ use it in the template:: - class PublisherBookListView(ListView): - - context_object_name = "book_list" -- template_name = "books/books_by_publisher.html", -+ template_name = "books/books_by_publisher.html" - - def get_queryset(self): - self.publisher = get_object_or_404(Publisher, name__iexact=self.args[0]) -diff --git a/docs/topics/db/models.txt b/docs/topics/db/models.txt -index 0e18205..af76344 100644 ---- a/docs/topics/db/models.txt -+++ b/docs/topics/db/models.txt -@@ -324,11 +324,10 @@ whatever you want. For example:: - should work; all are optional. - - For details on accessing backwards-related objects, see the -- `Following relationships backward example`_. -- -+ :ref:`Following relationships backward example <backwards-related-objects>`. -+ - For sample code, see the `Many-to-one relationship model tests`_. - -- .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects - .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one - - Many-to-many relationships -diff --git a/docs/topics/db/sql.txt b/docs/topics/db/sql.txt -index fe71736..d9b8b1a 100644 ---- a/docs/topics/db/sql.txt -+++ b/docs/topics/db/sql.txt -@@ -236,6 +236,30 @@ alias:: - # Your code here... - transaction.commit_unless_managed(using='my_db_alias') - -+By default, the Python DB API will return results without their field -+names, which means you end up with a ``list`` of values, rather than a -+``dict``. At a small performance cost, you can return results as a -+``dict`` by using something like this:: -+ -+ def dictfetchall(cursor): -+ "Returns all rows from a cursor as a dict" -+ desc = cursor.description -+ return [ -+ dict(zip([col[0] for col in desc], row)) -+ for row in cursor.fetchall() -+ ] -+ -+Here is an example of the difference between the two:: -+ -+ >>> cursor.execute("SELECT id, parent_id from test LIMIT 2"); -+ >>> cursor.fetchall() -+ ((54360982L, None), (54360880L, None)) -+ -+ >>> cursor.execute("SELECT id, parent_id from test LIMIT 2"); -+ >>> dictfetchall(cursor) -+ [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}] -+ -+ - .. _transactions-and-raw-sql: - - Transactions and raw SQL -diff --git a/docs/topics/forms/modelforms.txt b/docs/topics/forms/modelforms.txt -index 07bc5e3..24e000e 100644 ---- a/docs/topics/forms/modelforms.txt -+++ b/docs/topics/forms/modelforms.txt -@@ -332,13 +332,17 @@ Since the Author model has only 3 fields, 'name', 'title', and - .. note:: - - If you specify ``fields`` or ``exclude`` when creating a form with -- ``ModelForm``, then the fields that are not in the resulting form will not -- be set by the form's ``save()`` method. Django will prevent any attempt to -- save an incomplete model, so if the model does not allow the missing fields -- to be empty, and does not provide a default value for the missing fields, -- any attempt to ``save()`` a ``ModelForm`` with missing fields will fail. -- To avoid this failure, you must instantiate your model with initial values -- for the missing, but required fields:: -+ ``ModelForm``, then the fields that are not in the resulting form -+ will not be set by the form's ``save()`` method. Also, if you -+ manually add the excluded fields back to the form, they will not -+ be initialized from the model instance. -+ -+ Django will prevent any attempt to save an incomplete model, so if -+ the model does not allow the missing fields to be empty, and does -+ not provide a default value for the missing fields, any attempt to -+ ``save()`` a ``ModelForm`` with missing fields will fail. To -+ avoid this failure, you must instantiate your model with initial -+ values for the missing, but required fields:: - - author = Author(title='Mr') - form = PartialAuthorForm(request.POST, instance=author) -@@ -633,6 +637,12 @@ database. If a given instance's data didn't change in the bound data, the - instance won't be saved to the database and won't be included in the return - value (``instances``, in the above example). - -+When fields are missing from the form (for example because they have -+been excluded), these fields will not be set by the ``save()`` -+method. You can find more information about this restriction, which -+also holds for regular ``ModelForms``, in `Using a subset of fields on -+the form`_. -+ - Pass ``commit=False`` to return the unsaved model instances:: - - # don't save to the database -diff --git a/docs/topics/http/urls.txt b/docs/topics/http/urls.txt -index 1caa801..7a0e724 100644 ---- a/docs/topics/http/urls.txt -+++ b/docs/topics/http/urls.txt -@@ -54,6 +54,10 @@ algorithm the system follows to determine which Python code to execute: - :class:`~django.http.HttpRequest` as its first argument and any values - captured in the regex as remaining arguments. - -+ 5. If no regex matches, or if an exception is raised during any -+ point in this process, Django invokes an appropriate -+ error-handling view. See `Error handling`_ below. -+ - Example - ======= - -@@ -99,10 +103,10 @@ Example requests: - * ``/articles/2003`` would not match any of these patterns, because each - pattern requires that the URL end with a slash. - -- * ``/articles/2003/03/3/`` would match the final pattern. Django would call -- the function ``news.views.article_detail(request, '2003', '03', '3')``. -+ * ``/articles/2003/03/03/`` would match the final pattern. Django would call -+ the function ``news.views.article_detail(request, '2003', '03', '03')``. - --.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3 -+.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3 - - Named groups - ============ -@@ -123,7 +127,7 @@ Here's the above example URLconf, rewritten to use named groups:: - (r'^articles/2003/$', 'news.views.special_case_2003'), - (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'), - (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'), -- (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'), -+ (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'), - ) - - This accomplishes exactly the same thing as the previous example, with one -@@ -134,8 +138,8 @@ arguments rather than positional arguments. For example: - ``news.views.month_archive(request, year='2005', month='03')``, instead - of ``news.views.month_archive(request, '2005', '03')``. - -- * A request to ``/articles/2003/03/3/`` would call the function -- ``news.views.article_detail(request, year='2003', month='03', day='3')``. -+ * A request to ``/articles/2003/03/03/`` would call the function -+ ``news.views.article_detail(request, year='2003', month='03', day='03')``. - - In practice, this means your URLconfs are slightly more explicit and less prone - to argument-order bugs -- and you can reorder the arguments in your views' -@@ -246,6 +250,31 @@ The ``prefix`` parameter has the same meaning as the first argument to - ``patterns()`` and is only relevant when you're passing a string as the - ``view`` parameter. - -+include -+------- -+ -+.. function:: include(<module or pattern_list>) -+ -+A function that takes a full Python import path to another URLconf module that -+should be "included" in this place. -+ -+:func:`include` also accepts as an argument an iterable that returns URL -+patterns. -+ -+See `Including other URLconfs`_ below. -+ -+Error handling -+============== -+ -+When Django can't find a regex matching the requested URL, or when an -+exception is raised, Django will invoke an error-handling view. The -+views to use for these cases are specified by two variables which can -+be set in your root URLconf. Setting these variables in any other -+URLconf will have no effect. -+ -+See the documentation on :ref:`customizing error views -+<customizing-error-views>` for more details. -+ - handler404 - ---------- - -@@ -275,19 +304,6 @@ value should suffice. - .. versionchanged:: 1.2 - Previous versions of Django only accepted strings representing import paths. - --include --------- -- --.. function:: include(<module or pattern_list>) -- --A function that takes a full Python import path to another URLconf module that --should be "included" in this place. -- --:func:`include` also accepts as an argument an iterable that returns URL --patterns. -- --See `Including other URLconfs`_ below. -- - Notes on capturing text in URLs - =============================== - -@@ -420,8 +436,8 @@ directly the pattern list as returned by `patterns`_ instead. For example:: - from django.conf.urls.defaults import * - - extra_patterns = patterns('', -- url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'), -- url(r'charge/$', 'credit.views.charge', name='credit-charge'), -+ url(r'^reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'), -+ url(r'^charge/$', 'credit.views.charge', name='credit-charge'), - ) - - urlpatterns = patterns('', -diff --git a/docs/topics/http/views.txt b/docs/topics/http/views.txt -index 99359ab..83a52cb 100644 ---- a/docs/topics/http/views.txt -+++ b/docs/topics/http/views.txt -@@ -122,6 +122,8 @@ In order to use the ``Http404`` exception to its fullest, you should create a - template that is displayed when a 404 error is raised. This template should be - called ``404.html`` and located in the top level of your template tree. - -+.. _customizing-error-views: -+ - Customizing error views - ======================= - -diff --git a/docs/topics/i18n/internationalization.txt b/docs/topics/i18n/internationalization.txt -index 5d50fa7..a83299c 100644 ---- a/docs/topics/i18n/internationalization.txt -+++ b/docs/topics/i18n/internationalization.txt -@@ -477,7 +477,7 @@ for use within the translation block. Examples:: - - You can use multiple expressions inside a single ``blocktrans`` tag:: - -- {% blocktrans with book_t=book|title and author_t=author|title %} -+ {% blocktrans with book_t=book|title author_t=author|title %} - This is {{ book_t }} by {{ author_t }} - {% endblocktrans %} - -diff --git a/docs/topics/settings.txt b/docs/topics/settings.txt -index 61ddf8c..bda51f2 100644 ---- a/docs/topics/settings.txt -+++ b/docs/topics/settings.txt -@@ -39,7 +39,7 @@ The value of ``DJANGO_SETTINGS_MODULE`` should be in Python path syntax, e.g. - ``mysite.settings``. Note that the settings module should be on the - Python `import search path`_. - --.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html -+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html - - The django-admin.py utility - --------------------------- -diff --git a/docs/topics/templates.txt b/docs/topics/templates.txt -index 83269ae..fc2cd3f 100644 ---- a/docs/topics/templates.txt -+++ b/docs/topics/templates.txt -@@ -555,6 +555,8 @@ variable that needs escaping. When auto-escaping is on, there's no danger of - the ``escape`` filter *double-escaping* data -- the ``escape`` filter does not - affect auto-escaped variables. - -+.. _string-literals-and-automatic-escaping: -+ - String literals and automatic escaping - -------------------------------------- - -diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt -index 0a86f0d..8262b57 100644 ---- a/docs/topics/testing.txt -+++ b/docs/topics/testing.txt -@@ -1586,7 +1586,7 @@ skipUnlessDBFeature - Skip the decorated test if the named database feature is *not* - supported. - --For example, the following test will not be executed if the database -+For example, the following test will only be executed if the database - supports transactions (e.g., it would run under PostgreSQL, but *not* - under MySQL with MyISAM tables):: - -diff --git a/tests/modeltests/validators/tests.py b/tests/modeltests/validators/tests.py -index e585262..4bd5827 100644 ---- a/tests/modeltests/validators/tests.py -+++ b/tests/modeltests/validators/tests.py -@@ -28,6 +28,9 @@ TEST_DATA = ( - (validate_email, 'abc', ValidationError), - (validate_email, 'a @x.cz', ValidationError), - (validate_email, 'something@@somewhere.com', ValidationError), -+ # Quoted-string format (CR not allowed) -+ (validate_email, '"\\\011"@here.com', None), -+ (validate_email, '"\\\012"@here.com', ValidationError), - - (validate_slug, 'slug-ok', None), - (validate_slug, 'longer-slug-still-ok', None), -diff --git a/tests/regressiontests/httpwrappers/tests.py b/tests/regressiontests/httpwrappers/tests.py -index 2e2932f..6aabfe6 100644 ---- a/tests/regressiontests/httpwrappers/tests.py -+++ b/tests/regressiontests/httpwrappers/tests.py -@@ -281,3 +281,9 @@ class CookieTests(unittest.TestCase): - Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007. - """ - self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys()) -+ -+ def test_repeated_nonstandard_keys(self): -+ """ -+ Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852 -+ """ -+ self.assertTrue('good_cookie' in parse_cookie('a,=b; a,=c; good_cookie=yes').keys()) -diff --git a/tests/regressiontests/utils/http.py b/tests/regressiontests/utils/http.py -index 83a4a7f..666d04f 100644 ---- a/tests/regressiontests/utils/http.py -+++ b/tests/regressiontests/utils/http.py -@@ -1,5 +1,7 @@ - from django.utils import http - from django.utils import unittest -+from django.http import HttpResponse, utils -+from django.test import RequestFactory - - class TestUtilsHttp(unittest.TestCase): - -@@ -21,3 +23,49 @@ class TestUtilsHttp(unittest.TestCase): - self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com')) - # Different port - self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001')) -+ -+ def test_fix_IE_for_vary(self): -+ """ -+ Regression for #16632. -+ -+ `fix_IE_for_vary` shouldn't crash when there's no Content-Type header. -+ """ -+ -+ # functions to generate responses -+ def response_with_unsafe_content_type(): -+ r = HttpResponse(content_type="text/unsafe") -+ r['Vary'] = 'Cookie' -+ return r -+ -+ def no_content_response_with_unsafe_content_type(): -+ # 'Content-Type' always defaulted, so delete it -+ r = response_with_unsafe_content_type() -+ del r['Content-Type'] -+ return r -+ -+ # request with & without IE user agent -+ rf = RequestFactory() -+ request = rf.get('/') -+ ie_request = rf.get('/', HTTP_USER_AGENT='MSIE') -+ -+ # not IE, unsafe_content_type -+ response = response_with_unsafe_content_type() -+ utils.fix_IE_for_vary(request, response) -+ self.assertTrue('Vary' in response) -+ -+ # IE, unsafe_content_type -+ response = response_with_unsafe_content_type() -+ utils.fix_IE_for_vary(ie_request, response) -+ self.assertFalse('Vary' in response) -+ -+ # not IE, no_content -+ response = no_content_response_with_unsafe_content_type() -+ utils.fix_IE_for_vary(request, response) -+ self.assertTrue('Vary' in response) -+ -+ # IE, no_content -+ response = no_content_response_with_unsafe_content_type() -+ utils.fix_IE_for_vary(ie_request, response) -+ self.assertFalse('Vary' in response) -+ -+ diff --git a/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff b/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff deleted file mode 100644 index ebbf80993..000000000 --- a/libre/django13/diff-django_branches_releases_1.3.X-from-16771-to-17460.diff +++ /dev/null @@ -1,1575 +0,0 @@ -Index: django/http/__init__.py -=================================================================== ---- django/http/__init__.py (revision 16771) -+++ django/http/__init__.py (revision 17460) -@@ -92,7 +92,7 @@ - if not _cookie_allows_colon_in_names: - def load(self, rawdata, ignore_parse_errors=False): - if ignore_parse_errors: -- self.bad_cookies = [] -+ self.bad_cookies = set() - self._BaseCookie__set = self._loose_set - super(SimpleCookie, self).load(rawdata) - if ignore_parse_errors: -@@ -106,8 +106,8 @@ - try: - self._strict_set(key, real_value, coded_value) - except Cookie.CookieError: -- self.bad_cookies.append(key) -- dict.__setitem__(self, key, None) -+ self.bad_cookies.add(key) -+ dict.__setitem__(self, key, Cookie.Morsel()) - - - class CompatCookie(SimpleCookie): -Index: django/http/utils.py -=================================================================== ---- django/http/utils.py (revision 16771) -+++ django/http/utils.py (revision 17460) -@@ -76,7 +76,8 @@ - - # The first part of the Content-Type field will be the MIME type, - # everything after ';', such as character-set, can be ignored. -- if response['Content-Type'].split(';')[0] not in safe_mime_types: -+ mime_type = response.get('Content-Type', '').partition(';')[0] -+ if mime_type not in safe_mime_types: - try: - del response['Vary'] - except KeyError: -Index: django/db/backends/creation.py -=================================================================== ---- django/db/backends/creation.py (revision 16771) -+++ django/db/backends/creation.py (revision 17460) -@@ -374,15 +374,6 @@ - verbosity=max(verbosity - 1, 0), - interactive=False, - database=self.connection.alias) -- -- # One effect of calling syncdb followed by flush is that the id of the -- # default site may or may not be 1, depending on how the sequence was -- # reset. If the sites app is loaded, then we coerce it. -- from django.db.models import get_model -- if 'django.contrib.sites' in settings.INSTALLED_APPS: -- Site = get_model('sites', 'Site') -- if Site is not None and Site.objects.using(self.connection.alias).count() == 1: -- Site.objects.using(self.connection.alias).update(id=settings.SITE_ID) - - from django.core.cache import get_cache - from django.core.cache.backends.db import BaseDatabaseCache -Index: django/core/validators.py -=================================================================== ---- django/core/validators.py (revision 16771) -+++ django/core/validators.py (revision 17460) -@@ -147,7 +147,8 @@ - - email_re = re.compile( - r"(^[-!#$%&'*+/=?^_`{}|~0-9A-Z]+(\.[-!#$%&'*+/=?^_`{}|~0-9A-Z]+)*" # dot-atom -- r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-011\013\014\016-\177])*"' # quoted-string -+ # quoted-string, see also http://tools.ietf.org/html/rfc2822#section-3.2.5 -+ r'|^"([\001-\010\013\014\016-\037!#-\[\]-\177]|\\[\001-\011\013\014\016-\177])*"' - r')@(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+[A-Z]{2,6}\.?$', re.IGNORECASE) # domain - validate_email = EmailValidator(email_re, _(u'Enter a valid e-mail address.'), 'invalid') - -Index: django/core/management/commands/shell.py -=================================================================== ---- django/core/management/commands/shell.py (revision 16771) -+++ django/core/management/commands/shell.py (revision 17460) -@@ -13,9 +13,8 @@ - - def ipython(self): - try: -- from IPython.frontend.terminal.embed import TerminalInteractiveShell -- shell = TerminalInteractiveShell() -- shell.mainloop() -+ from IPython import embed -+ embed() - except ImportError: - # IPython < 0.11 - # Explicitly pass an empty list as arguments, because otherwise -Index: django/contrib/gis/db/models/sql/compiler.py -=================================================================== ---- django/contrib/gis/db/models/sql/compiler.py (revision 16771) -+++ django/contrib/gis/db/models/sql/compiler.py (revision 17460) -@@ -1,7 +1,7 @@ - from itertools import izip --from django.db.backends.util import truncate_name -+from django.db.backends.util import truncate_name, typecast_timestamp - from django.db.models.sql import compiler --from django.db.models.sql.constants import TABLE_NAME -+from django.db.models.sql.constants import TABLE_NAME, MULTI - from django.db.models.sql.query import get_proxied_model - - SQLCompiler = compiler.SQLCompiler -@@ -194,7 +194,7 @@ - # We resolve the rest of the columns if we're on Oracle or if - # the `geo_values` attribute is defined. - for value, field in map(None, row[index_start:], fields): -- values.append(self.query.convert_values(value, field, connection=self.connection)) -+ values.append(self.query.convert_values(value, field, self.connection)) - else: - values.extend(row[index_start:]) - return tuple(values) -@@ -275,4 +275,24 @@ - pass - - class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler): -- pass -+ """ -+ This is overridden for GeoDjango to properly cast date columns, since -+ `GeoQuery.resolve_columns` is used for spatial values. -+ See #14648, #16757. -+ """ -+ def results_iter(self): -+ if self.connection.ops.oracle: -+ from django.db.models.fields import DateTimeField -+ fields = [DateTimeField()] -+ else: -+ needs_string_cast = self.connection.features.needs_datetime_string_cast -+ -+ offset = len(self.query.extra_select) -+ for rows in self.execute_sql(MULTI): -+ for row in rows: -+ date = row[offset] -+ if self.connection.ops.oracle: -+ date = self.resolve_columns(row, fields)[offset] -+ elif needs_string_cast: -+ date = typecast_timestamp(str(date)) -+ yield date -Index: django/contrib/gis/db/backends/spatialite/compiler.py -=================================================================== ---- django/contrib/gis/db/backends/spatialite/compiler.py (revision 16771) -+++ django/contrib/gis/db/backends/spatialite/compiler.py (revision 17460) -@@ -1,32 +0,0 @@ --from django.db.backends.util import typecast_timestamp --from django.db.models.sql import compiler --from django.db.models.sql.constants import MULTI --from django.contrib.gis.db.models.sql.compiler import GeoSQLCompiler as BaseGeoSQLCompiler -- --SQLCompiler = compiler.SQLCompiler -- --class GeoSQLCompiler(BaseGeoSQLCompiler, SQLCompiler): -- pass -- --class SQLInsertCompiler(compiler.SQLInsertCompiler, GeoSQLCompiler): -- pass -- --class SQLDeleteCompiler(compiler.SQLDeleteCompiler, GeoSQLCompiler): -- pass -- --class SQLUpdateCompiler(compiler.SQLUpdateCompiler, GeoSQLCompiler): -- pass -- --class SQLAggregateCompiler(compiler.SQLAggregateCompiler, GeoSQLCompiler): -- pass -- --class SQLDateCompiler(compiler.SQLDateCompiler, GeoSQLCompiler): -- """ -- This is overridden for GeoDjango to properly cast date columns, see #16757. -- """ -- def results_iter(self): -- offset = len(self.query.extra_select) -- for rows in self.execute_sql(MULTI): -- for row in rows: -- date = typecast_timestamp(str(row[offset])) -- yield date -Index: django/contrib/gis/db/backends/spatialite/operations.py -=================================================================== ---- django/contrib/gis/db/backends/spatialite/operations.py (revision 16771) -+++ django/contrib/gis/db/backends/spatialite/operations.py (revision 17460) -@@ -48,7 +48,7 @@ - return (SpatiaLiteDistance(operator),) - - class SpatiaLiteOperations(DatabaseOperations, BaseSpatialOperations): -- compiler_module = 'django.contrib.gis.db.backends.spatialite.compiler' -+ compiler_module = 'django.contrib.gis.db.models.sql.compiler' - name = 'spatialite' - spatialite = True - version_regex = re.compile(r'^(?P<major>\d)\.(?P<minor1>\d)\.(?P<minor2>\d+)') -Index: django/contrib/gis/db/backends/spatialite/creation.py -=================================================================== ---- django/contrib/gis/db/backends/spatialite/creation.py (revision 16771) -+++ django/contrib/gis/db/backends/spatialite/creation.py (revision 17460) -@@ -56,14 +56,6 @@ - interactive=False, - database=self.connection.alias) - -- # One effect of calling syncdb followed by flush is that the id of the -- # default site may or may not be 1, depending on how the sequence was -- # reset. If the sites app is loaded, then we coerce it. -- from django.db.models import get_model -- Site = get_model('sites', 'Site') -- if Site is not None and Site.objects.using(self.connection.alias).count() == 1: -- Site.objects.using(self.connection.alias).update(id=settings.SITE_ID) -- - from django.core.cache import get_cache - from django.core.cache.backends.db import BaseDatabaseCache - for cache_alias in settings.CACHES: -Index: django/contrib/gis/tests/relatedapp/fixtures/initial_data.json.gz -=================================================================== -Cannot display: file marked as a binary type. -svn:mime-type = application/octet-stream -Index: django/contrib/gis/tests/relatedapp/tests.py -=================================================================== ---- django/contrib/gis/tests/relatedapp/tests.py (revision 16771) -+++ django/contrib/gis/tests/relatedapp/tests.py (revision 17460) -@@ -1,3 +1,4 @@ -+from datetime import date - from django.test import TestCase - - from django.contrib.gis.geos import GEOSGeometry, Point, MultiPoint -@@ -281,4 +282,11 @@ - # evaluated as list generation swallows TypeError in CPython. - sql = str(qs.query) - -+ def test16_annotated_date_queryset(self): -+ "Ensure annotated date querysets work if spatial backend is used. See #14648." -+ birth_years = [dt.year for dt in -+ list(Author.objects.annotate(num_books=Count('books')).dates('dob', 'year'))] -+ birth_years.sort() -+ self.assertEqual([1950, 1974], birth_years) -+ - # TODO: Related tests for KML, GML, and distance lookups. -Index: django/contrib/gis/tests/relatedapp/models.py -=================================================================== ---- django/contrib/gis/tests/relatedapp/models.py (revision 16771) -+++ django/contrib/gis/tests/relatedapp/models.py (revision 17460) -@@ -36,6 +36,7 @@ - # These use the GeoManager but do not have any geographic fields. - class Author(models.Model): - name = models.CharField(max_length=100) -+ dob = models.DateField() - objects = models.GeoManager() - - class Article(models.Model): -Index: django/contrib/sites/management.py -=================================================================== ---- django/contrib/sites/management.py (revision 16771) -+++ django/contrib/sites/management.py (revision 17460) -@@ -3,15 +3,34 @@ - """ - - from django.db.models import signals -+from django.db import connections -+from django.db import router - from django.contrib.sites.models import Site - from django.contrib.sites import models as site_app -+from django.core.management.color import no_style - - def create_default_site(app, created_models, verbosity, db, **kwargs): -- if Site in created_models: -+ # Only create the default sites in databases where Django created the table -+ if Site in created_models and router.allow_syncdb(db, Site) : -+ # The default settings set SITE_ID = 1, and some tests in Django's test -+ # suite rely on this value. However, if database sequences are reused -+ # (e.g. in the test suite after flush/syncdb), it isn't guaranteed that -+ # the next id will be 1, so we coerce it. See #15573 and #16353. This -+ # can also crop up outside of tests - see #15346. - if verbosity >= 2: - print "Creating example.com Site object" -- s = Site(domain="example.com", name="example.com") -- s.save(using=db) -+ Site(pk=1, domain="example.com", name="example.com").save(using=db) -+ -+ # We set an explicit pk instead of relying on auto-incrementation, -+ # so we need to reset the database sequence. -+ sequence_sql = connections[db].ops.sequence_reset_sql(no_style(), [Site]) -+ if sequence_sql: -+ if verbosity >= 2: -+ print "Resetting sequence" -+ cursor = connections[db].cursor() -+ for command in sequence_sql: -+ cursor.execute(command) -+ - Site.objects.clear_cache() - - signals.post_syncdb.connect(create_default_site, sender=site_app) -Index: django/contrib/sites/tests.py -=================================================================== ---- django/contrib/sites/tests.py (revision 16771) -+++ django/contrib/sites/tests.py (revision 17460) -@@ -15,6 +15,12 @@ - def tearDown(self): - Site._meta.installed = self.old_Site_meta_installed - -+ def test_save_another(self): -+ # Regression for #17415 -+ # On some backends the sequence needs reset after save with explicit ID. -+ # Test that there is no sequence collisions by saving another site. -+ Site(domain="example2.com", name="example2.com").save() -+ - def test_site_manager(self): - # Make sure that get_current() does not return a deleted Site object. - s = Site.objects.get_current() -Index: django/contrib/admin/media/css/forms.css -=================================================================== ---- django/contrib/admin/media/css/forms.css (revision 16771) -+++ django/contrib/admin/media/css/forms.css (revision 17460) -@@ -352,9 +352,3 @@ - .empty-form { - display: none; - } -- --/* IE7 specific bug fixes */ -- --.submit-row input { -- float: right; --} -\ No newline at end of file -Index: tests/modeltests/validators/tests.py -=================================================================== ---- tests/modeltests/validators/tests.py (revision 16771) -+++ tests/modeltests/validators/tests.py (revision 17460) -@@ -28,6 +28,9 @@ - (validate_email, 'abc', ValidationError), - (validate_email, 'a @x.cz', ValidationError), - (validate_email, 'something@@somewhere.com', ValidationError), -+ # Quoted-string format (CR not allowed) -+ (validate_email, '"\\\011"@here.com', None), -+ (validate_email, '"\\\012"@here.com', ValidationError), - - (validate_slug, 'slug-ok', None), - (validate_slug, 'longer-slug-still-ok', None), -Index: tests/regressiontests/utils/http.py -=================================================================== ---- tests/regressiontests/utils/http.py (revision 16771) -+++ tests/regressiontests/utils/http.py (revision 17460) -@@ -1,5 +1,7 @@ - from django.utils import http - from django.utils import unittest -+from django.http import HttpResponse, utils -+from django.test import RequestFactory - - class TestUtilsHttp(unittest.TestCase): - -@@ -21,3 +23,49 @@ - self.assertFalse(http.same_origin('http://foo.com', 'http://foo.com.evil.com')) - # Different port - self.assertFalse(http.same_origin('http://foo.com:8000', 'http://foo.com:8001')) -+ -+ def test_fix_IE_for_vary(self): -+ """ -+ Regression for #16632. -+ -+ `fix_IE_for_vary` shouldn't crash when there's no Content-Type header. -+ """ -+ -+ # functions to generate responses -+ def response_with_unsafe_content_type(): -+ r = HttpResponse(content_type="text/unsafe") -+ r['Vary'] = 'Cookie' -+ return r -+ -+ def no_content_response_with_unsafe_content_type(): -+ # 'Content-Type' always defaulted, so delete it -+ r = response_with_unsafe_content_type() -+ del r['Content-Type'] -+ return r -+ -+ # request with & without IE user agent -+ rf = RequestFactory() -+ request = rf.get('/') -+ ie_request = rf.get('/', HTTP_USER_AGENT='MSIE') -+ -+ # not IE, unsafe_content_type -+ response = response_with_unsafe_content_type() -+ utils.fix_IE_for_vary(request, response) -+ self.assertTrue('Vary' in response) -+ -+ # IE, unsafe_content_type -+ response = response_with_unsafe_content_type() -+ utils.fix_IE_for_vary(ie_request, response) -+ self.assertFalse('Vary' in response) -+ -+ # not IE, no_content -+ response = no_content_response_with_unsafe_content_type() -+ utils.fix_IE_for_vary(request, response) -+ self.assertTrue('Vary' in response) -+ -+ # IE, no_content -+ response = no_content_response_with_unsafe_content_type() -+ utils.fix_IE_for_vary(ie_request, response) -+ self.assertFalse('Vary' in response) -+ -+ -Index: tests/regressiontests/httpwrappers/tests.py -=================================================================== ---- tests/regressiontests/httpwrappers/tests.py (revision 16771) -+++ tests/regressiontests/httpwrappers/tests.py (revision 17460) -@@ -281,3 +281,9 @@ - Test that a single non-standard cookie name doesn't affect all cookies. Ticket #13007. - """ - self.assertTrue('good_cookie' in parse_cookie('good_cookie=yes;bad:cookie=yes').keys()) -+ -+ def test_repeated_nonstandard_keys(self): -+ """ -+ Test that a repeated non-standard name doesn't affect all cookies. Ticket #15852 -+ """ -+ self.assertTrue('good_cookie' in parse_cookie('a,=b; a,=c; good_cookie=yes').keys()) -Index: docs/index.txt -=================================================================== ---- docs/index.txt (revision 16771) -+++ docs/index.txt (revision 17460) -@@ -28,7 +28,7 @@ - .. _archives of the django-users mailing list: http://groups.google.com/group/django-users/ - .. _post a question: http://groups.google.com/group/django-users/ - .. _#django IRC channel: irc://irc.freenode.net/django --.. _IRC logs: http://botland.oebfare.com/logger/django/ -+.. _IRC logs: http://django-irc-logs.com/ - .. _ticket tracker: http://code.djangoproject.com/ - - First steps -Index: docs/intro/tutorial01.txt -=================================================================== ---- docs/intro/tutorial01.txt (revision 16771) -+++ docs/intro/tutorial01.txt (revision 17460) -@@ -59,7 +59,7 @@ - can be run as a program. To do this, open Terminal.app and navigate (using - the ``cd`` command) to the directory where :doc:`django-admin.py - </ref/django-admin>` is installed, then run the command -- ``chmod +x django-admin.py``. -+ ``sudo chmod +x django-admin.py``. - - .. note:: - -@@ -692,10 +692,9 @@ - - For more information on model relations, see :doc:`Accessing related objects - </ref/models/relations>`. For more on how to use double underscores to perform --field lookups via the API, see `Field lookups`__. For full details on the --database API, see our :doc:`Database API reference </topics/db/queries>`. -+field lookups via the API, see :ref:`Field lookups <field-lookups-intro>`. For -+full details on the database API, see our :doc:`Database API reference -+</topics/db/queries>`. - --__ http://docs.djangoproject.com/en/1.2/topics/db/queries/#field-lookups -- - When you're comfortable with the API, read :doc:`part 2 of this tutorial - </intro/tutorial02>` to get Django's automatic admin working. -Index: docs/intro/tutorial02.txt -=================================================================== ---- docs/intro/tutorial02.txt (revision 16771) -+++ docs/intro/tutorial02.txt (revision 17460) -@@ -40,22 +40,22 @@ - - .. parsed-literal:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - # Uncomment the next two lines to enable the admin: - **from django.contrib import admin** - **admin.autodiscover()** - - urlpatterns = patterns('', -- # Example: -- # (r'^mysite/', include('mysite.foo.urls')), -+ # Examples: -+ # url(r'^$', 'mysite.views.home', name='home'), -+ # url(r'^mysite/', include('mysite.foo.urls')), - -- # Uncomment the admin/doc line below and add 'django.contrib.admindocs' -- # to INSTALLED_APPS to enable admin documentation: -- # (r'^admin/doc/', include('django.contrib.admindocs.urls')), -+ # Uncomment the admin/doc line below to enable admin documentation: -+ # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - - # Uncomment the next line to enable the admin: -- **(r'^admin/', include(admin.site.urls)),** -+ **url(r'^admin/', include(admin.site.urls)),** - ) - - (The bold lines are the ones that needed to be uncommented.) -Index: docs/intro/tutorial03.txt -=================================================================== ---- docs/intro/tutorial03.txt (revision 16771) -+++ docs/intro/tutorial03.txt (revision 17460) -@@ -78,17 +78,17 @@ - - Time for an example. Edit ``mysite/urls.py`` so it looks like this:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - from django.contrib import admin - admin.autodiscover() - - urlpatterns = patterns('', -- (r'^polls/$', 'polls.views.index'), -- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'), -- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'), -- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), -- (r'^admin/', include(admin.site.urls)), -+ url(r'^polls/$', 'polls.views.index'), -+ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'), -+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'), -+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), -+ url(r'^admin/', include(admin.site.urls)), - ) - - This is worth a review. When somebody requests a page from your Web site -- say, -@@ -112,7 +112,7 @@ - -- unless you have a sick sense of humor, in which case you can do something - like this:: - -- (r'^polls/latest\.php$', 'polls.views.index'), -+ url(r'^polls/latest\.php$', 'polls.views.index'), - - But, don't do that. It's silly. - -@@ -357,23 +357,24 @@ - Write a 404 (page not found) view - ================================= - --When you raise :exc:`~django.http.Http404` from within a view, Django will load --a special view devoted to handling 404 errors. It finds it by looking for the --variable ``handler404``, which is a string in Python dotted syntax -- the same --format the normal URLconf callbacks use. A 404 view itself has nothing special: --It's just a normal view. -+When you raise :exc:`~django.http.Http404` from within a view, Django -+will load a special view devoted to handling 404 errors. It finds it -+by looking for the variable ``handler404`` in your root URLconf (and -+only in your root URLconf; setting ``handler404`` anywhere else will -+have no effect), which is a string in Python dotted syntax -- the same -+format the normal URLconf callbacks use. A 404 view itself has nothing -+special: It's just a normal view. - --You normally won't have to bother with writing 404 views. By default, URLconfs --have the following line up top:: -+You normally won't have to bother with writing 404 views. If you don't set -+``handler404``, the built-in view :func:`django.views.defaults.page_not_found` -+is used by default. In this case, you still have one obligation: To create a -+``404.html`` template in the root of your template directory. The default 404 -+view will use that template for all 404 errors. If :setting:`DEBUG` is set to -+``False`` (in your settings module) and if you didn't create a ``404.html`` -+file, an ``Http500`` is raised instead. So remember to create a ``404.html``. - -- from django.conf.urls.defaults import * -+A couple more things to note about 404 views: - --That takes care of setting ``handler404`` in the current module. As you can see --in ``django/conf/urls/defaults.py``, ``handler404`` is set to --:func:`django.views.defaults.page_not_found` by default. -- --Four more things to note about 404 views: -- - * If :setting:`DEBUG` is set to ``True`` (in your settings module) then your - 404 view will never be used (and thus the ``404.html`` template will never - be rendered) because the traceback will be displayed instead. -@@ -381,21 +382,12 @@ - * The 404 view is also called if Django doesn't find a match after checking - every regular expression in the URLconf. - -- * If you don't define your own 404 view -- and simply use the default, which -- is recommended -- you still have one obligation: To create a ``404.html`` -- template in the root of your template directory. The default 404 view will -- use that template for all 404 errors. -- -- * If :setting:`DEBUG` is set to ``False`` (in your settings module) and if -- you didn't create a ``404.html`` file, an ``Http500`` is raised instead. -- So remember to create a ``404.html``. -- - Write a 500 (server error) view - =============================== - --Similarly, URLconfs may define a ``handler500``, which points to a view to call --in case of server errors. Server errors happen when you have runtime errors in --view code. -+Similarly, your root URLconf may define a ``handler500``, which points -+to a view to call in case of server errors. Server errors happen when -+you have runtime errors in view code. - - Use the template system - ======================= -@@ -432,10 +424,10 @@ - the URLconf, you may notice there's a fair bit of redundancy in it:: - - urlpatterns = patterns('', -- (r'^polls/$', 'polls.views.index'), -- (r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'), -- (r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'), -- (r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), -+ url(r'^polls/$', 'polls.views.index'), -+ url(r'^polls/(?P<poll_id>\d+)/$', 'polls.views.detail'), -+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'polls.views.results'), -+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), - ) - - Namely, ``polls.views`` is in every callback. -@@ -445,10 +437,10 @@ - first argument to :func:`~django.conf.urls.defaults.patterns`, like so:: - - urlpatterns = patterns('polls.views', -- (r'^polls/$', 'index'), -- (r'^polls/(?P<poll_id>\d+)/$', 'detail'), -- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'), -- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'), -+ url(r'^polls/$', 'index'), -+ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'), -+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'), -+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'), - ) - - This is functionally identical to the previous formatting. It's just a bit -@@ -459,20 +451,20 @@ - :func:`~django.conf.urls.defaults.patterns`. Your full ``mysite/urls.py`` might - now look like this:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - from django.contrib import admin - admin.autodiscover() - - urlpatterns = patterns('polls.views', -- (r'^polls/$', 'index'), -- (r'^polls/(?P<poll_id>\d+)/$', 'detail'), -- (r'^polls/(?P<poll_id>\d+)/results/$', 'results'), -- (r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'), -+ url(r'^polls/$', 'index'), -+ url(r'^polls/(?P<poll_id>\d+)/$', 'detail'), -+ url(r'^polls/(?P<poll_id>\d+)/results/$', 'results'), -+ url(r'^polls/(?P<poll_id>\d+)/vote/$', 'vote'), - ) - - urlpatterns += patterns('', -- (r'^admin/', include(admin.site.urls)), -+ url(r'^admin/', include(admin.site.urls)), - ) - - Decoupling the URLconfs -@@ -502,8 +494,8 @@ - admin.autodiscover() - - urlpatterns = patterns('', -- (r'^polls/', include('polls.urls')), -- (r'^admin/', include(admin.site.urls)), -+ url(r'^polls/', include('polls.urls')), -+ url(r'^admin/', include(admin.site.urls)), - ) - - :func:`~django.conf.urls.defaults.include` simply references another URLconf. -@@ -526,13 +518,13 @@ - lines registering the admin site. Your ``polls/urls.py`` file should now look like - this:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - urlpatterns = patterns('polls.views', -- (r'^$', 'index'), -- (r'^(?P<poll_id>\d+)/$', 'detail'), -- (r'^(?P<poll_id>\d+)/results/$', 'results'), -- (r'^(?P<poll_id>\d+)/vote/$', 'vote'), -+ url(r'^$', 'index'), -+ url(r'^(?P<poll_id>\d+)/$', 'detail'), -+ url(r'^(?P<poll_id>\d+)/results/$', 'results'), -+ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'), - ) - - The idea behind :func:`~django.conf.urls.defaults.include` and URLconf -Index: docs/intro/index.txt -=================================================================== ---- docs/intro/index.txt (revision 16771) -+++ docs/intro/index.txt (revision 17460) -@@ -31,6 +31,6 @@ - - .. _python: http://python.org/ - .. _list of Python resources for non-programmers: http://wiki.python.org/moin/BeginnersGuide/NonProgrammers -- .. _dive into python: http://diveintopython.org/ -+ .. _dive into python: http://diveintopython.net/ - .. _dead-tree version: http://www.amazon.com/exec/obidos/ASIN/1590593561/ref=nosim/jacobian20 - .. _books about Python: http://wiki.python.org/moin/PythonBooks -\ No newline at end of file -Index: docs/intro/tutorial04.txt -=================================================================== ---- docs/intro/tutorial04.txt (revision 16771) -+++ docs/intro/tutorial04.txt (revision 17460) -@@ -218,13 +218,13 @@ - First, open the ``polls/urls.py`` URLconf. It looks like this, according to the - tutorial so far:: - -- from django.conf.urls.defaults import * -+ from django.conf.urls.defaults import patterns, include, url - - urlpatterns = patterns('polls.views', -- (r'^$', 'index'), -- (r'^(?P<poll_id>\d+)/$', 'detail'), -- (r'^(?P<poll_id>\d+)/results/$', 'results'), -- (r'^(?P<poll_id>\d+)/vote/$', 'vote'), -+ url(r'^$', 'index'), -+ url(r'^(?P<poll_id>\d+)/$', 'detail'), -+ url(r'^(?P<poll_id>\d+)/results/$', 'results'), -+ url(r'^(?P<poll_id>\d+)/vote/$', 'vote'), - ) - - Change it like so:: -@@ -234,12 +234,12 @@ - from polls.models import Poll - - urlpatterns = patterns('', -- (r'^$', -+ url(r'^$', - ListView.as_view( - queryset=Poll.objects.order_by('-pub_date')[:5], - context_object_name='latest_poll_list', - template_name='polls/index.html')), -- (r'^(?P<pk>\d+)/$', -+ url(r'^(?P<pk>\d+)/$', - DetailView.as_view( - model=Poll, - template_name='polls/detail.html')), -@@ -248,7 +248,7 @@ - model=Poll, - template_name='polls/results.html'), - name='poll_results'), -- (r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), -+ url(r'^(?P<poll_id>\d+)/vote/$', 'polls.views.vote'), - ) - - We're using two generic views here: -Index: docs/internals/release-process.txt -=================================================================== ---- docs/internals/release-process.txt (revision 16771) -+++ docs/internals/release-process.txt (revision 17460) -@@ -99,6 +99,13 @@ - * Security fixes will be applied to the current trunk and the previous two - minor releases. - -+* Documentation fixes will generally be more freely backported to the last -+ release branch (at the discretion of the committer), and don't need to meet -+ the "critical fixes only" bar as it's highly advantageous to have the docs -+ for the last release be up-to-date and correct, and the downside of -+ backporting (risk of introducing regressions) is much less of a concern -+ with doc fixes. -+ - As a concrete example, consider a moment in time halfway between the release of - Django 1.3 and 1.4. At this point in time: - -@@ -111,6 +118,9 @@ - ``1.2.X`` branch. Security fixes will trigger the release of ``1.3.1``, - ``1.2.1``, etc. - -+* Documentation fixes will be applied to trunk, and if easily backported, to -+ the ``1.3.X`` branch. -+ - .. _release-process: - - Release process -Index: docs/internals/deprecation.txt -=================================================================== ---- docs/internals/deprecation.txt (revision 16771) -+++ docs/internals/deprecation.txt (revision 17460) -@@ -177,6 +177,12 @@ - required to end with a trailing slash to ensure there is a consistent - way to combine paths in templates. - -+ * Translations located under the so-called *project path* will be -+ ignored during the translation building process performed at runtime. -+ The :setting:`LOCALE_PATHS` setting can be used for the same task by -+ including the filesystem path to a ``locale`` directory containing -+ non-app-specific translations in its value. -+ - * 2.0 - * ``django.views.defaults.shortcut()``. This function has been moved - to ``django.contrib.contenttypes.views.shortcut()`` as part of the -Index: docs/howto/deployment/modpython.txt -=================================================================== ---- docs/howto/deployment/modpython.txt (revision 16771) -+++ docs/howto/deployment/modpython.txt (revision 17460) -@@ -293,11 +293,14 @@ - arrangement. You're responsible for setting up Apache, or whichever media - server you're using, to serve the admin files. - --The admin files live in (:file:`django/contrib/admin/static/admin`) of the -+The admin files live in (:file:`django/contrib/admin/media/admin`) of the - Django distribution. - --We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle --the admin files, but here are two other approaches: -+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the -+admin files (this means using the :djadmin:`collectstatic` management command -+to collect the static files in :setting:`STATIC_ROOT`, and then configuring -+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but -+here are two other approaches: - - 1. Create a symbolic link to the admin static files from within your - document root. -Index: docs/howto/deployment/modwsgi.txt -=================================================================== ---- docs/howto/deployment/modwsgi.txt (revision 16771) -+++ docs/howto/deployment/modwsgi.txt (revision 17460) -@@ -127,11 +127,14 @@ - arrangement. You're responsible for setting up Apache, or whichever media - server you're using, to serve the admin files. - --The admin files live in (:file:`django/contrib/admin/static/admin`) of the -+The admin files live in (:file:`django/contrib/admin/media/admin`) of the - Django distribution. - --We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle --the admin files, but here are two other approaches: -+We **strongly** recommend using :mod:`django.contrib.staticfiles` to handle the -+admin files (this means using the :djadmin:`collectstatic` management command -+to collect the static files in :setting:`STATIC_ROOT`, and then configuring -+your webserver to serve :setting:`STATIC_ROOT` at :setting:`STATIC_URL`), but -+here are two other approaches: - - 1. Create a symbolic link to the admin static files from within your - document root. -Index: docs/topics/auth.txt -=================================================================== ---- docs/topics/auth.txt (revision 16771) -+++ docs/topics/auth.txt (revision 17460) -@@ -1251,17 +1251,20 @@ - ... - class Meta: - permissions = ( -- ("can_view", "Can see available tasks"), -- ("can_change_status", "Can change the status of tasks"), -- ("can_close", "Can remove a task by setting its status as closed"), -+ ("view_task", "Can see available tasks"), -+ ("change_task_status", "Can change the status of tasks"), -+ ("close_task", "Can remove a task by setting its status as closed"), - ) - - The only thing this does is create those extra permissions when you run - :djadmin:`manage.py syncdb <syncdb>`. Your code is in charge of checking the - value of these permissions when an user is trying to access the functionality - provided by the application (viewing tasks, changing the status of tasks, --closing tasks.) -+closing tasks.) Continuing the above example, the following checks if a user may -+view tasks:: - -+ user.has_perm('app.view_task') -+ - API reference - ------------- - -Index: docs/topics/http/urls.txt -=================================================================== ---- docs/topics/http/urls.txt (revision 16771) -+++ docs/topics/http/urls.txt (revision 17460) -@@ -54,6 +54,10 @@ - :class:`~django.http.HttpRequest` as its first argument and any values - captured in the regex as remaining arguments. - -+ 5. If no regex matches, or if an exception is raised during any -+ point in this process, Django invokes an appropriate -+ error-handling view. See `Error handling`_ below. -+ - Example - ======= - -@@ -99,10 +103,10 @@ - * ``/articles/2003`` would not match any of these patterns, because each - pattern requires that the URL end with a slash. - -- * ``/articles/2003/03/3/`` would match the final pattern. Django would call -- the function ``news.views.article_detail(request, '2003', '03', '3')``. -+ * ``/articles/2003/03/03/`` would match the final pattern. Django would call -+ the function ``news.views.article_detail(request, '2003', '03', '03')``. - --.. _Dive Into Python's explanation: http://diveintopython.org/regular_expressions/street_addresses.html#re.matching.2.3 -+.. _Dive Into Python's explanation: http://diveintopython.net/regular_expressions/street_addresses.html#re.matching.2.3 - - Named groups - ============ -@@ -123,7 +127,7 @@ - (r'^articles/2003/$', 'news.views.special_case_2003'), - (r'^articles/(?P<year>\d{4})/$', 'news.views.year_archive'), - (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/$', 'news.views.month_archive'), -- (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d+)/$', 'news.views.article_detail'), -+ (r'^articles/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', 'news.views.article_detail'), - ) - - This accomplishes exactly the same thing as the previous example, with one -@@ -134,8 +138,8 @@ - ``news.views.month_archive(request, year='2005', month='03')``, instead - of ``news.views.month_archive(request, '2005', '03')``. - -- * A request to ``/articles/2003/03/3/`` would call the function -- ``news.views.article_detail(request, year='2003', month='03', day='3')``. -+ * A request to ``/articles/2003/03/03/`` would call the function -+ ``news.views.article_detail(request, year='2003', month='03', day='03')``. - - In practice, this means your URLconfs are slightly more explicit and less prone - to argument-order bugs -- and you can reorder the arguments in your views' -@@ -246,6 +250,31 @@ - ``patterns()`` and is only relevant when you're passing a string as the - ``view`` parameter. - -+include -+------- -+ -+.. function:: include(<module or pattern_list>) -+ -+A function that takes a full Python import path to another URLconf module that -+should be "included" in this place. -+ -+:func:`include` also accepts as an argument an iterable that returns URL -+patterns. -+ -+See `Including other URLconfs`_ below. -+ -+Error handling -+============== -+ -+When Django can't find a regex matching the requested URL, or when an -+exception is raised, Django will invoke an error-handling view. The -+views to use for these cases are specified by two variables which can -+be set in your root URLconf. Setting these variables in any other -+URLconf will have no effect. -+ -+See the documentation on :ref:`customizing error views -+<customizing-error-views>` for more details. -+ - handler404 - ---------- - -@@ -275,19 +304,6 @@ - .. versionchanged:: 1.2 - Previous versions of Django only accepted strings representing import paths. - --include --------- -- --.. function:: include(<module or pattern_list>) -- --A function that takes a full Python import path to another URLconf module that --should be "included" in this place. -- --:func:`include` also accepts as an argument an iterable that returns URL --patterns. -- --See `Including other URLconfs`_ below. -- - Notes on capturing text in URLs - =============================== - -@@ -420,8 +436,8 @@ - from django.conf.urls.defaults import * - - extra_patterns = patterns('', -- url(r'reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'), -- url(r'charge/$', 'credit.views.charge', name='credit-charge'), -+ url(r'^reports/(?P<id>\d+)/$', 'credit.views.report', name='credit-reports'), -+ url(r'^charge/$', 'credit.views.charge', name='credit-charge'), - ) - - urlpatterns = patterns('', -Index: docs/topics/http/views.txt -=================================================================== ---- docs/topics/http/views.txt (revision 16771) -+++ docs/topics/http/views.txt (revision 17460) -@@ -122,6 +122,8 @@ - template that is displayed when a 404 error is raised. This template should be - called ``404.html`` and located in the top level of your template tree. - -+.. _customizing-error-views: -+ - Customizing error views - ======================= - -Index: docs/topics/i18n/internationalization.txt -=================================================================== ---- docs/topics/i18n/internationalization.txt (revision 16771) -+++ docs/topics/i18n/internationalization.txt (revision 17460) -@@ -477,7 +477,7 @@ - - You can use multiple expressions inside a single ``blocktrans`` tag:: - -- {% blocktrans with book_t=book|title and author_t=author|title %} -+ {% blocktrans with book_t=book|title author_t=author|title %} - This is {{ book_t }} by {{ author_t }} - {% endblocktrans %} - -Index: docs/topics/cache.txt -=================================================================== ---- docs/topics/cache.txt (revision 16771) -+++ docs/topics/cache.txt (revision 17460) -@@ -99,8 +99,9 @@ - on your chosen memcached binding) - - * Set :setting:`LOCATION <CACHES-LOCATION>` to ``ip:port`` values, -- where ``ip`` is the IP address of the Memcached daemon and -- ``port`` is the port on which Memcached is running. -+ where ``ip`` is the IP address of the Memcached daemon and ``port`` is the -+ port on which Memcached is running, or to a ``unix:path`` value, where -+ ``path`` is the path to a Memcached Unix socket file. - - In this example, Memcached is running on localhost (127.0.0.1) port 11211, using - the ``python-memcached`` binding:: -@@ -112,6 +113,16 @@ - } - } - -+In this example, Memcached is available through a local Unix socket file -+:file:`/tmp/memcached.sock` using the ``python-memcached`` binding:: -+ -+ CACHES = { -+ 'default': { -+ 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', -+ 'LOCATION': 'unix:/tmp/memcached.sock', -+ } -+ } -+ - One excellent feature of Memcached is its ability to share cache over multiple - servers. This means you can run Memcached daemons on multiple machines, and the - program will treat the group of machines as a *single* cache, without the need -@@ -526,9 +537,10 @@ - requested, subsequent requests to that URL will use the cache. - - ``cache_page`` can also take an optional keyword argument, ``cache``, --which directs the decorator to use a specific cache alias when caching view --results. By default, the ``default`` alias will be used, but you can specify --any cache alias you want:: -+which directs the decorator to use a specific cache (from your -+:setting:`CACHES` setting) when caching view results. By default, the -+``default`` cache will be used, but you can specify any cache you -+want:: - - @cache_page(60 * 15, cache="special_cache") - def my_view(request): -Index: docs/topics/db/models.txt -=================================================================== ---- docs/topics/db/models.txt (revision 16771) -+++ docs/topics/db/models.txt (revision 17460) -@@ -324,11 +324,10 @@ - should work; all are optional. - - For details on accessing backwards-related objects, see the -- `Following relationships backward example`_. -- -+ :ref:`Following relationships backward example <backwards-related-objects>`. -+ - For sample code, see the `Many-to-one relationship model tests`_. - -- .. _Following relationships backward example: http://docs.djangoproject.com/en/dev/topics/db/queries/#backwards-related-objects - .. _Many-to-one relationship model tests: http://code.djangoproject.com/browser/django/trunk/tests/modeltests/many_to_one - - Many-to-many relationships -Index: docs/topics/db/sql.txt -=================================================================== ---- docs/topics/db/sql.txt (revision 16771) -+++ docs/topics/db/sql.txt (revision 17460) -@@ -236,6 +236,30 @@ - # Your code here... - transaction.commit_unless_managed(using='my_db_alias') - -+By default, the Python DB API will return results without their field -+names, which means you end up with a ``list`` of values, rather than a -+``dict``. At a small performance cost, you can return results as a -+``dict`` by using something like this:: -+ -+ def dictfetchall(cursor): -+ "Returns all rows from a cursor as a dict" -+ desc = cursor.description -+ return [ -+ dict(zip([col[0] for col in desc], row)) -+ for row in cursor.fetchall() -+ ] -+ -+Here is an example of the difference between the two:: -+ -+ >>> cursor.execute("SELECT id, parent_id from test LIMIT 2"); -+ >>> cursor.fetchall() -+ ((54360982L, None), (54360880L, None)) -+ -+ >>> cursor.execute("SELECT id, parent_id from test LIMIT 2"); -+ >>> dictfetchall(cursor) -+ [{'parent_id': None, 'id': 54360982L}, {'parent_id': None, 'id': 54360880L}] -+ -+ - .. _transactions-and-raw-sql: - - Transactions and raw SQL -Index: docs/topics/forms/modelforms.txt -=================================================================== ---- docs/topics/forms/modelforms.txt (revision 16771) -+++ docs/topics/forms/modelforms.txt (revision 17460) -@@ -332,14 +332,18 @@ - .. note:: - - If you specify ``fields`` or ``exclude`` when creating a form with -- ``ModelForm``, then the fields that are not in the resulting form will not -- be set by the form's ``save()`` method. Django will prevent any attempt to -- save an incomplete model, so if the model does not allow the missing fields -- to be empty, and does not provide a default value for the missing fields, -- any attempt to ``save()`` a ``ModelForm`` with missing fields will fail. -- To avoid this failure, you must instantiate your model with initial values -- for the missing, but required fields:: -+ ``ModelForm``, then the fields that are not in the resulting form -+ will not be set by the form's ``save()`` method. Also, if you -+ manually add the excluded fields back to the form, they will not -+ be initialized from the model instance. - -+ Django will prevent any attempt to save an incomplete model, so if -+ the model does not allow the missing fields to be empty, and does -+ not provide a default value for the missing fields, any attempt to -+ ``save()`` a ``ModelForm`` with missing fields will fail. To -+ avoid this failure, you must instantiate your model with initial -+ values for the missing, but required fields:: -+ - author = Author(title='Mr') - form = PartialAuthorForm(request.POST, instance=author) - form.save() -@@ -633,6 +637,12 @@ - instance won't be saved to the database and won't be included in the return - value (``instances``, in the above example). - -+When fields are missing from the form (for example because they have -+been excluded), these fields will not be set by the ``save()`` -+method. You can find more information about this restriction, which -+also holds for regular ``ModelForms``, in `Using a subset of fields on -+the form`_. -+ - Pass ``commit=False`` to return the unsaved model instances:: - - # don't save to the database -Index: docs/topics/class-based-views.txt -=================================================================== ---- docs/topics/class-based-views.txt (revision 16771) -+++ docs/topics/class-based-views.txt (revision 17460) -@@ -380,7 +380,7 @@ - class PublisherBookListView(ListView): - - context_object_name = "book_list" -- template_name = "books/books_by_publisher.html", -+ template_name = "books/books_by_publisher.html" - - def get_queryset(self): - publisher = get_object_or_404(Publisher, name__iexact=self.args[0]) -@@ -396,7 +396,7 @@ - class PublisherBookListView(ListView): - - context_object_name = "book_list" -- template_name = "books/books_by_publisher.html", -+ template_name = "books/books_by_publisher.html" - - def get_queryset(self): - self.publisher = get_object_or_404(Publisher, name__iexact=self.args[0]) -Index: docs/topics/testing.txt -=================================================================== ---- docs/topics/testing.txt (revision 16771) -+++ docs/topics/testing.txt (revision 17460) -@@ -1586,7 +1586,7 @@ - Skip the decorated test if the named database feature is *not* - supported. - --For example, the following test will not be executed if the database -+For example, the following test will only be executed if the database - supports transactions (e.g., it would run under PostgreSQL, but *not* - under MySQL with MyISAM tables):: - -Index: docs/topics/templates.txt -=================================================================== ---- docs/topics/templates.txt (revision 16771) -+++ docs/topics/templates.txt (revision 17460) -@@ -555,6 +555,8 @@ - the ``escape`` filter *double-escaping* data -- the ``escape`` filter does not - affect auto-escaped variables. - -+.. _string-literals-and-automatic-escaping: -+ - String literals and automatic escaping - -------------------------------------- - -Index: docs/topics/settings.txt -=================================================================== ---- docs/topics/settings.txt (revision 16771) -+++ docs/topics/settings.txt (revision 17460) -@@ -39,7 +39,7 @@ - ``mysite.settings``. Note that the settings module should be on the - Python `import search path`_. - --.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html -+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html - - The django-admin.py utility - --------------------------- -Index: docs/releases/1.2.6.txt -=================================================================== ---- docs/releases/1.2.6.txt (revision 0) -+++ docs/releases/1.2.6.txt (revision 17460) -@@ -0,0 +1,16 @@ -+========================== -+Django 1.2.6 release notes -+========================== -+ -+*September 9, 2011* -+ -+Welcome to Django 1.2.6! -+ -+This is the sixth bugfix/security release in the Django 1.2 series, fixing -+several security issues present in Django 1.2.5. Django 1.2.6 is a -+recommended upgrade for all users of any Django release in the 1.2.X series. -+ -+For a full list of issues addressed in this release, see the `security -+advisory`_. -+ -+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/ -Index: docs/releases/1.2.7.txt -=================================================================== ---- docs/releases/1.2.7.txt (revision 0) -+++ docs/releases/1.2.7.txt (revision 17460) -@@ -0,0 +1,16 @@ -+========================== -+Django 1.2.7 release notes -+========================== -+ -+*September 10, 2011* -+ -+Welcome to Django 1.2.7! -+ -+This is the seventh bugfix/security release in the Django 1.2 series. It -+replaces Django 1.2.6 due to problems with the 1.2.6 release tarball. -+Django 1.2.7 is a recommended upgrade for all users of any Django release in -+the 1.2.X series. -+ -+For more information, see the `release advisory`_. -+ -+.. _release advisory: https://www.djangoproject.com/weblog/2011/sep/10/127/ -Index: docs/releases/index.txt -=================================================================== ---- docs/releases/index.txt (revision 16771) -+++ docs/releases/index.txt (revision 17460) -@@ -19,6 +19,7 @@ - .. toctree:: - :maxdepth: 1 - -+ 1.3.1 - 1.3 - - 1.2 release -@@ -26,6 +27,8 @@ - .. toctree:: - :maxdepth: 1 - -+ 1.2.7 -+ 1.2.6 - 1.2.5 - 1.2.4 - 1.2.2 -Index: docs/releases/0.95.txt -=================================================================== ---- docs/releases/0.95.txt (revision 16771) -+++ docs/releases/0.95.txt (revision 17460) -@@ -92,15 +92,15 @@ - easy checklist_ for reference when undertaking the porting operation. - - .. _Removing The Magic: http://code.djangoproject.com/wiki/RemovingTheMagic --.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet1 -+.. _checklist: http://code.djangoproject.com/wiki/MagicRemovalCheatSheet - - Problem reports and getting help - ================================ - --Need help resolving a problem with Django? The documentation in the distribution --is also available online_ at the `Django Web site`_. The :doc:`FAQ </faq/index>` --document is especially recommended, as it contains a number of issues that come --up time and again. -+Need help resolving a problem with Django? The documentation in the -+distribution is also available :doc:`online </index>` at the `Django Web -+site`_. The :doc:`FAQ </faq/index>` document is especially recommended, as it -+contains a number of issues that come up time and again. - - For more personalized help, the `django-users`_ mailing list is a very active - list, with more than 2,000 subscribers who can help you solve any sort of -@@ -113,7 +113,6 @@ - Django users and developers from around the world. Friendly people are usually - available at any hour of the day -- to help, or just to chat. - --.. _online: http://www.djangoproject.com/documentation/0.95/ - .. _Django Web site: http://www.djangoproject.com/ - .. _django-users: http://groups.google.com/group/django-users - -Index: docs/releases/0.96.txt -=================================================================== ---- docs/releases/0.96.txt (revision 16771) -+++ docs/releases/0.96.txt (revision 17460) -@@ -50,12 +50,10 @@ - maintained, and it will be removed in a future release of Django. - - Also, note that some features, like the new :setting:`DATABASE_OPTIONS` --setting (see the `databases documentation`_ for details), are only --available on the "mysql" backend, and will not be made available for -+setting (see the :doc:`databases documentation </ref/databases>` for details), -+are only available on the "mysql" backend, and will not be made available for - "mysql_old". - --.. _databases documentation: http://www.djangoproject.com/documentation/0.96/databases/ -- - Database constraint names changed - --------------------------------- - -@@ -164,11 +162,9 @@ - for most common cases. We recommend that anyone new to form handling skip the - old forms system and start with the new. - --For more information about ``django.newforms``, read the `newforms --documentation`_. -+For more information about ``django.newforms``, read the :doc:`newforms -+documentation </topics/forms/index>`. - --.. _newforms documentation: http://www.djangoproject.com/documentation/0.96/newforms/ -- - URLconf improvements - -------------------- - -@@ -216,20 +212,16 @@ - ------------------ - - Django now includes a test framework so you can start transmuting fear into --boredom (with apologies to Kent Beck). You can write tests based on doctest_ --or unittest_ and test your views with a simple test client. -+boredom (with apologies to Kent Beck). You can write tests based on -+:mod:`doctest` or :mod:`unittest` and test your views with a simple test client. - - There is also new support for "fixtures" -- initial data, stored in any of the --supported `serialization formats`_, that will be loaded into your database at the --start of your tests. This makes testing with real data much easier. -+supported :doc:`serialization formats </topics/serialization>`, that will be -+loaded into your database at the start of your tests. This makes testing with -+real data much easier. - --See `the testing documentation`_ for the full details. -+See :doc:`the testing documentation </topics/testing>` for the full details. - --.. _doctest: http://docs.python.org/library/doctest.html --.. _unittest: http://docs.python.org/library/unittest.html --.. _the testing documentation: http://www.djangoproject.com/documentation/0.96/testing/ --.. _serialization formats: http://www.djangoproject.com/documentation/0.96/serialization/ -- - Improvements to the admin interface - ----------------------------------- - -Index: docs/releases/1.0.1.txt -=================================================================== ---- docs/releases/1.0.1.txt (revision 16771) -+++ docs/releases/1.0.1.txt (revision 17460) -@@ -6,10 +6,10 @@ - - This is the first "bugfix" release in the Django 1.0 series, improving - the stability and performance of the Django 1.0 codebase. As such, --Django 1.0.1 contains no new features (and, pursuant to `our --compatibility policy`_, maintains backwards compatibility with Django --1.0), but does contain a number of fixes and other --improvements. Django 1.0.1 is a recommended upgrade for any -+Django 1.0.1 contains no new features (and, pursuant to :doc:`our -+compatibility policy </misc/api-stability/>`, maintains backwards -+compatibility with Django 1.0), but does contain a number of fixes -+and other improvements. Django 1.0.1 is a recommended upgrade for any - development or deployment currently using or targeting Django 1.0. - - -@@ -46,8 +46,9 @@ - - * A fix to the application of autoescaping for literal strings passed - to the ``join`` template filter. Previously, literal strings passed -- to ``join`` were automatically escaped, contrary to `the documented -- behavior for autoescaping and literal strings`_. Literal strings -+ to ``join`` were automatically escaped, contrary to :ref:`the -+ documented behavior for autoescaping and literal strings -+ <string-literals-and-automatic-escaping>`. Literal strings - passed to ``join`` are no longer automatically escaped, meaning you - must now manually escape them; this is an incompatibility if you - were relying on this bug, but not if you were relying on escaping -@@ -60,6 +61,4 @@ - documentation, including both corrections to existing documents and - expanded and new documentation. - --.. _our compatibility policy: http://docs.djangoproject.com/en/dev/misc/api-stability/ - .. _the Subversion log of the 1.0.X branch: http://code.djangoproject.com/log/django/branches/releases/1.0.X --.. _the documented behavior for autoescaping and literal strings: http://docs.djangoproject.com/en/dev/topics/templates/#string-literals-and-automatic-escaping -Index: docs/releases/1.3.1.txt -=================================================================== ---- docs/releases/1.3.1.txt (revision 0) -+++ docs/releases/1.3.1.txt (revision 17460) -@@ -0,0 +1,16 @@ -+========================== -+Django 1.3.1 release notes -+========================== -+ -+*September 9, 2011* -+ -+Welcome to Django 1.3.1! -+ -+This is the first security release in the Django 1.3 series, fixing several -+security issues in Django 1.3. Django 1.3.1 is a recommended upgrade for -+all users of Django 1.3. -+ -+For a full list of issues addressed in this release, see the `security -+advisory`_. -+ -+.. _security advisory: https://www.djangoproject.com/weblog/2011/sep/09/security-releases-issued/ -Index: docs/ref/models/instances.txt -=================================================================== ---- docs/ref/models/instances.txt (revision 16771) -+++ docs/ref/models/instances.txt (revision 17460) -@@ -470,7 +470,7 @@ - - Similarly, if you had a URLconf entry that looked like:: - -- (r'/archive/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', archive_view) -+ (r'/archive/(?P<year>\d{4})/(?P<month>\d{2})/(?P<day>\d{2})/$', archive_view) - - ...you could reference this using ``permalink()`` as follows:: - -@@ -478,8 +478,8 @@ - def get_absolute_url(self): - return ('archive_view', (), { - 'year': self.created.year, -- 'month': self.created.month, -- 'day': self.created.day}) -+ 'month': self.created.strftime('%m'), -+ 'day': self.created.strftime('%d')}) - - Notice that we specify an empty sequence for the second parameter in this case, - because we only want to pass keyword parameters, not positional ones. -Index: docs/ref/models/options.txt -=================================================================== ---- docs/ref/models/options.txt (revision 16771) -+++ docs/ref/models/options.txt (revision 17460) -@@ -166,6 +166,13 @@ - >>> answer.get_previous_in_order() - <Answer: 1> - -+.. admonition:: Changing order_with_respect_to -+ -+ ``order_with_respect_to`` adds an additional field/database column -+ named ``_order``, so be sure to handle that as you would any other -+ change to your models if you add or change ``order_with_respect_to`` -+ after your initial :djadmin:`syncdb`. -+ - ``ordering`` - ------------ - -@@ -238,6 +245,12 @@ - - unique_together = ("driver", "restaurant") - -+ A :class:`~django.db.models.ManyToManyField` cannot be included in -+ unique_together (it's not even clear what that would mean). If you -+ need to validate uniqueness related to a -+ :class:`~django.db.models.ManyToManyField`, look at signals or -+ using an explicit :attr:`through <ManyToManyField.through>` model. -+ - ``verbose_name`` - ---------------- - -Index: docs/ref/templates/builtins.txt -=================================================================== ---- docs/ref/templates/builtins.txt (revision 16771) -+++ docs/ref/templates/builtins.txt (revision 17460) -@@ -1868,7 +1868,7 @@ - Returns a slice of the list. - - Uses the same syntax as Python's list slicing. See --http://diveintopython.org/native_data_types/lists.html#odbchelper.list.slice -+http://diveintopython.net/native_data_types/lists.html#odbchelper.list.slice - for an introduction. - - Example:: -Index: docs/ref/contrib/gis/geoip.txt -=================================================================== ---- docs/ref/contrib/gis/geoip.txt (revision 16771) -+++ docs/ref/contrib/gis/geoip.txt (revision 17460) -@@ -144,7 +144,7 @@ - Returns a dictionary of city information for the given query. Some - of the values in the dictionary may be undefined (``None``). - --.. method:: GeoIPcountry(query) -+.. method:: GeoIP.country(query) - - Returns a dictionary with the country code and country for the given - query. -Index: docs/ref/contrib/messages.txt -=================================================================== ---- docs/ref/contrib/messages.txt (revision 16771) -+++ docs/ref/contrib/messages.txt (revision 17460) -@@ -210,6 +210,10 @@ - ``RequestContext``. Otherwise, ensure ``messages`` is available to - the template context. - -+Even if you know there is only just one message, you should still iterate over -+the ``messages`` sequence, because otherwise the message storage will not be cleared -+for the next request. -+ - Creating custom message levels - ------------------------------ - -Index: docs/ref/contrib/admin/index.txt -=================================================================== ---- docs/ref/contrib/admin/index.txt (revision 16771) -+++ docs/ref/contrib/admin/index.txt (revision 17460) -@@ -19,8 +19,10 @@ - 1. Add ``'django.contrib.admin'`` to your :setting:`INSTALLED_APPS` - setting. - -- 2. Admin has two dependencies - :mod:`django.contrib.auth` and -- :mod:`django.contrib.contenttypes`. If these applications are not -+ 2. The admin has four dependencies - :mod:`django.contrib.auth`, -+ :mod:`django.contrib.contenttypes`, -+ :mod:`django.contrib.messages` and -+ :mod:`django.contrib.sessions`. If these applications are not - in your :setting:`INSTALLED_APPS` list, add them. - - 3. Determine which of your application's models should be editable in the -@@ -542,7 +544,7 @@ - Fields in ``list_filter`` can also span relations using the ``__`` lookup:: - - class UserAdminWithLookup(UserAdmin): -- list_filter = ('groups__name') -+ list_filter = ('groups__name',) - - .. attribute:: ModelAdmin.list_per_page - -Index: docs/ref/django-admin.txt -=================================================================== ---- docs/ref/django-admin.txt (revision 16771) -+++ docs/ref/django-admin.txt (revision 17460) -@@ -1156,7 +1156,7 @@ - Note that this option is unnecessary in ``manage.py``, because it takes care of - setting the Python path for you. - --.. _import search path: http://diveintopython.org/getting_to_know_python/everything_is_an_object.html -+.. _import search path: http://diveintopython.net/getting_to_know_python/everything_is_an_object.html - - .. django-admin-option:: --settings - -Index: docs/ref/signals.txt -=================================================================== ---- docs/ref/signals.txt (revision 16771) -+++ docs/ref/signals.txt (revision 17460) -@@ -352,12 +352,16 @@ - .. data:: django.db.models.signals.post_syncdb - :module: - --Sent by :djadmin:`syncdb` after it installs an application. -+Sent by :djadmin:`syncdb` command after it installs an application, and -+:djadmin:`flush` command. - - Any handlers that listen to this signal need to be written in a particular - place: a ``management`` module in one of your :setting:`INSTALLED_APPS`. If - handlers are registered anywhere else they may not be loaded by --:djadmin:`syncdb`. -+:djadmin:`syncdb`. It is important that handlers of this signal perform -+idempotent changes (e.g. no database alterations) as this may cause the -+:djadmin:`flush` management command to fail if it also ran during the -+:djadmin:`syncdb` command. - - Arguments sent with this signal: - -Index: README -=================================================================== ---- README (revision 16771) -+++ README (revision 17460) -@@ -28,7 +28,7 @@ - To get more help: - - * Join the #django channel on irc.freenode.net. Lots of helpful people -- hang out there. Read the archives at http://botland.oebfare.com/logger/django/. -+ hang out there. Read the archives at http://django-irc-logs.com/. - - * Join the django-users mailing list, or read the archives, at - http://groups.google.com/group/django-users. diff --git a/libre/dkms-libre/01-broken-uninstall.patch b/libre/dkms-libre/01-broken-uninstall.patch new file mode 100644 index 000000000..a859efabe --- /dev/null +++ b/libre/dkms-libre/01-broken-uninstall.patch @@ -0,0 +1,22 @@ +diff --git a/dkms b/dkms +index abb01a4..265b69a 100644 +--- a/dkms ++++ b/dkms +@@ -162,11 +162,14 @@ set_kernel_source_dir() + + # A little test function for DKMS commands that only work on one kernel. + have_one_kernel() { +- (( ${#kernelver[@]} > 1 )) && \ +- die 4 $"The action $1 does not support multiple kernel version" \ +- $"parameters on the command line." +- [[ $all ]] && die 5 $"The action $1 does not support the --all" \ +- $"parameter." ++ if (( ${#kernelver[@]} != 1 )); then ++ die 4 $"The action $1 does not support multiple kernel version" \ ++ $"parameters on the command line." ++ fi ++ if [[ $all ]]; then ++ die 5 $"The action $1 does not support the --all" \ ++ $"parameter." ++ fi + } diff --git a/libre/dkms-libre/02-no-kernel-hook.patch b/libre/dkms-libre/02-no-kernel-hook.patch new file mode 100644 index 000000000..f01f22002 --- /dev/null +++ b/libre/dkms-libre/02-no-kernel-hook.patch @@ -0,0 +1,13 @@ +# Author: Sébastien Luttringer <seblu@seblu.net> +--- a/Makefile 2011-12-07 19:23:51.000000000 +0100 ++++ b/Makefile 2013-05-13 00:48:19.620000000 +0200 +@@ -46,9 +46,6 @@ + gzip -c -9 dkms.8 > $(MAN)/dkms.8.gz + chmod 0644 $(MAN)/dkms.8.gz + touch --reference=dkms.8 $(MAN)/dkms.8.gz +- mkdir -p -m 0755 $(KCONF)/prerm.d $(KCONF)/postinst.d +- install -p -m 0755 kernel_prerm.d_dkms $(KCONF)/prerm.d/dkms +- install -p -m 0755 kernel_postinst.d_dkms $(KCONF)/postinst.d/dkms + + DOCFILES=sample.spec sample.conf AUTHORS COPYING README.dkms sample-suse-9-mkkmp.spec sample-suse-10-mkkmp.spec + diff --git a/libre/dkms-libre/PKGBUILD b/libre/dkms-libre/PKGBUILD new file mode 100644 index 000000000..99caab5fa --- /dev/null +++ b/libre/dkms-libre/PKGBUILD @@ -0,0 +1,66 @@ +# $Id: PKGBUILD 90494 2013-05-12 22:57:28Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Balwinder S "bsd" Dheeman (bdheeman AT gmail.com) +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +_pkgname=dkms +pkgname=dkms-libre +pkgver=2.2.0.3 +pkgrel=14 +pkgdesc='Dynamic Kernel Modules System, with linux-libre-headers and linux-libre-lts-headers recommendation' +arch=('any') +url='http://linux.dell.com/dkms/' +license=('GPL2') +depends=('bash' 'kmod' 'gcc' 'make' 'patch') +optdepends=('linux-libre-headers: build modules against linux-libre kernel' + 'linux-libre-lts-headers: build modules against linux-libre-lts kernel') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +backup=('etc/dkms/framework.conf' 'etc/default/dkms') +install=$_pkgname.install +source=("http://linux.dell.com/$_pkgname/permalink/$_pkgname-$pkgver.tar.gz" + "$_pkgname.default" + "$_pkgname.service" + "$_pkgname.systemd" + '01-broken-uninstall.patch' + '02-no-kernel-hook.patch') +md5sums=('11a8aaade2ebec2803653837c7593030' + '33be2fbf1bcc1b3fb2f38d9e7eaa809d' + '02e9744e3fdc3d2f68e46966fb32e260' + '267632312aa52a190ec0db0758920dd3' + '2dfd8656dc79afd229c1481a90fb645b' + '82d520c39c99c34977e48b313a189c6c') + +prepare() { + # patch + patches=("$srcdir"/*.patch) + cd $_pkgname-$pkgver + for p in "${patches[@]}"; do + msg2 "Apply patch: ${p##*/}" + patch -p1 -i "$p" + done + # /usr move + msg2 '/usr move patching' + for i in dkms{,_framework.conf,.bash-completion,.8,_common.postinst}; do + sed -ri 's,/lib/modules,/usr/lib/modules,g' "$i" + done + # fix hardcoded paths + sed -i "s|/sbin/depmod|depmod|" dkms +} + +package() { + # systemd + install -D -m 644 $_pkgname.service "$pkgdir/usr/lib/systemd/system/$_pkgname.service" + install -D -m 755 $_pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$_pkgname" + install -D -m 644 $_pkgname.default "$pkgdir/etc/default/$_pkgname" + # upstream installer + cd $_pkgname-$pkgver + make \ + DESTDIR="$pkgdir" \ + SBIN="$pkgdir/usr/bin" \ + BASHDIR="$pkgdir/usr/share/bash-completion/completions" \ + install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/dkms-libre/dkms.default b/libre/dkms-libre/dkms.default new file mode 100644 index 000000000..d430855bb --- /dev/null +++ b/libre/dkms-libre/dkms.default @@ -0,0 +1,9 @@ +# vim:set ts=2 sw=2 ft=sh noet: + +# With LOAD set to yes, modules listed as installed will be loaded with +# systemctl start dkms.service. Default is yes. +LOAD=yes + +# With UNLOAD set to yes, modules listed as installed will be unloaded with +# systemctl stop dkms.service. Default is no. +UNLOAD=no diff --git a/libre/dkms-libre/dkms.hook b/libre/dkms-libre/dkms.hook new file mode 100644 index 000000000..3d656e32d --- /dev/null +++ b/libre/dkms-libre/dkms.hook @@ -0,0 +1,12 @@ +#!/bin/bash + +dkms_autoinstall() { + export TMPDIR=/dev/shm + status 'Starting DKMS autoinstall' dkms autoinstall + unset TMPDIR +} + +add_hook single_udevlaunched dkms_autoinstall +add_hook sysinit_udevlaunched dkms_autoinstall + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/dkms-libre/dkms.install b/libre/dkms-libre/dkms.install new file mode 100644 index 000000000..4dd18dd19 --- /dev/null +++ b/libre/dkms-libre/dkms.install @@ -0,0 +1,13 @@ +#!/bin/sh + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 2.2.0.3-12)" -le 0 ]; then + cat << EOF +===> dkms startup config file moved to /etc/default/dkms +EOF + fi +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/dkms-libre/dkms.service b/libre/dkms-libre/dkms.service new file mode 100644 index 000000000..0e679a949 --- /dev/null +++ b/libre/dkms-libre/dkms.service @@ -0,0 +1,11 @@ +[Unit] +Description=Dynamic Kernel Modules System + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/lib/systemd/scripts/dkms start +ExecStop=/usr/lib/systemd/scripts/dkms stop + +[Install] +WantedBy=multi-user.target diff --git a/libre/dkms-libre/dkms.systemd b/libre/dkms-libre/dkms.systemd new file mode 100644 index 000000000..03e6bfe97 --- /dev/null +++ b/libre/dkms-libre/dkms.systemd @@ -0,0 +1,61 @@ +#!/bin/bash + +. /etc/default/dkms + +# list dkms modules for the current running kernel +list_dkms_modules() { + shopt -s nullglob + declare -a DKMS_MOULES + # dkms status needs uname -r to list correctly intalled version for current kernel + local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p')) + for p in "${modules_path[@]}"; do + for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do + m=${m##*/} + m=${m%.gz} + m=${m%.ko} + DKMS_MODULES+=("$m") + done + done +} + +# load installed kernel modules for the current kernel version +load_dkms_modules() { + local ret=0 + list_dkms_modules + for m in "${DKMS_MODULES[@]}"; do + modprobe "$m" + ret+=$? + done + return $ret +} + +# unload installed kernel modules for the current kernel version +unload_dkms_modules() { + list_dkms_modules + # ask for removal + for m in "${DKMS_MODULES[@]}"; do + modprobe --remove --quiet "$m" + done + # check modules are unloaded + # sometimes modprobe -r fail but modules are removed + for m in "${DKMS_MODULES[@]}"; do + [[ -e /sys/modules/$m ]] && return 1 + done + return 0 +} + +case "$1" in + start) + dkms autoinstall -k "$(uname -r)" + [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules + ;; + stop) + [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules + ;; + *) + echo "usage: $0 {start|stop}" >&2 + ;; +esac + +: +# vim:set ts=2 sw=2 ft=sh et: diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD index 3a0446c49..3a7f2c3bf 100644 --- a/libre/epdfview-libre/PKGBUILD +++ b/libre/epdfview-libre/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer: schuay <jakob.gruber@gmail.com> # Contributor: Tom K <tomk@runbox.com> # Contributor: Thayer Williams <thayer@archlinux.org> -# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=epdfview-libre _pkgname=epdfview diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index e01981433..6ea777a16 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185397 2013-05-13 19:05:20Z heftig $ +# $Id: PKGBUILD 189275 2013-07-02 07:37:30Z 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.8.2 +pkgver=3.8.3 pkgrel=1 pkgdesc="Create and modify archives, with unar recommendation included and nonfree unace recommendation removed" arch=('i686' 'x86_64' 'mips64el') @@ -23,7 +23,7 @@ options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver::3}/$_pkgname-$pkgver.tar.xz) -sha256sums=('b251b146d7966d770c98546e2152dbc17785ef3b8cf460f692829d0ac1cbe79e') +sha256sums=('55caac832ed0bab89085fdf7a3c3fa1afaf8ae6fb05aeb2a872e42cb6c52894e') build() { cd $_pkgname-$pkgver diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD index 12bff5f1d..5881a4c2e 100644 --- a/libre/gloobus-preview-libre/PKGBUILD +++ b/libre/gloobus-preview-libre/PKGBUILD @@ -1,17 +1,20 @@ -# $Id: PKGBUILD 91027 2013-05-18 11:44:36Z bgyorgy $ +# $Id: PKGBUILD 91026 2013-05-18 11:44:23Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> _pkgname=gloobus-preview pkgname=gloobus-preview-libre pkgver=0.4.5.290 _pkgver=0.4.5-ubuntu11~ppa290 -pkgrel=1 -pkgdesc="Gnome application designed to enable a full screen preview of any kind of file (using bsdtar to preview RAR archives)" +pkgrel=1.1 +pkgdesc="Gnome application designed to enable a full screen preview of any kind of file, with libarchive support" arch=('i686' 'x86_64') url="http://gloobus.net/" license=('GPL') depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils') makedepends=('boost' 'bzr' 'djvulibre' 'libspectre') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver optdepends=('djvulibre: Preview DjVu documents' 'gstreamer0.10-bad-plugins: Extra media codecs' 'gstreamer0.10-good-plugins: Extra media codecs' @@ -20,6 +23,7 @@ optdepends=('djvulibre: Preview DjVu documents' 'libspectre: Preview PostScript documents' 'p7zip: View content of 7z archives' 'unoconv: Preview LibreOffice compatible documents' + 'libarchive: View content of RAR archives' 'unzip: View content of .ZIP archives') options=('!libtool') install=$_pkgname.install @@ -52,7 +56,7 @@ prepare() { # Use xdg-open patch -Np1 -i "$srcdir/use-xdg-open.patch" - # Use bsdtar if unrar is not found. + # Use bsdtar (libarchive) if unrar is not found. patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch" ### Prepare gloobus-sushi diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 21220a209..56d994beb 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -3,76 +3,69 @@ # Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -## grub-extras lua and gpxe fail to build +_GRUB_BZR_REV="5043" + +## grub-extras lua and gpxe fail to build with grub bzr rev 5043 [[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64" [[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386" pkgname=grub pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)" -pkgver=2.00 -pkgrel=1 +pkgver=2.00.${_GRUB_BZR_REV} +pkgrel=2 url="https://www.gnu.org/software/grub/" arch=('x86_64' 'i686') license=('GPL3') -backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom') +backup=('etc/default/grub' 'etc/grub.d/40_custom') install="${pkgname}.install" options=('!makeflags') -conflicts=('grub-legacy' 'grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}") +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') + 'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr' 'rsync') depends=('sh' 'xz' 'gettext' 'device-mapper') optdepends=('freetype2: For grub-mkfont usage' 'fuse: For grub-mount usage' - 'dosfstools: For EFI support' + 'dosfstools: For grub-mkrescue FAT FS and EFI support' 'efibootmgr: For grub-install EFI support' 'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue' 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' 'mtools: For grub-mkrescue FAT FS support') -source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz" - '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch' - 'grub-2.00-fix-docs.patch' +# 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}" 'parabola_grub_mkconfig_fixes.patch' '60_memtest86+' - 'grub.default' - 'grub.cfg') + 'grub.default') for _DIR_ in 915resolution ntldr-img ; do - source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/") + source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/#revision=") done -source+=("grub-extras-lua::bzr+bzr://bzr.savannah.gnu.org/grub-extras/lua/#revision=24" - "grub-extras-gpxe::bzr+bzr://bzr.savannah.gnu.org/grub-extras/gpxe/#revision=13") - -sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' - 'b68565bc155094bade390c257c3f31bc55ae244b' - '1dc08391bb13f8e23faa21a76cc4cc4b25467702' - 'c631ec04d458c60a3ceffe60d2d1806d54554d9c' +# sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b' +sha1sums=('SKIP' + '513172d91d1a2e2cda7c0a744c766d5868cb28bf' '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559' '06b926320cb2add6c157d59d46e553b89dd3aa03' - '662ec5f0d44122b66666a788387ec69389295b2c' - 'SKIP' - 'SKIP' 'SKIP' 'SKIP') _build_grub-common_and_bios() { ## Copy the source for building the common/bios package - cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-bios-${pkgver}" - cd "${srcdir}/grub-bios-${pkgver}/" + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-bios" + cd "${srcdir}/grub-${pkgver}-bios/" ## Add the grub-extra sources - export GRUB_CONTRIB="${srcdir}/grub-bios-${pkgver}/grub-extras/" + export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-bios/grub-extras/" - install -d "${srcdir}/grub-bios-${pkgver}/grub-extras" - for _DIR_ in 915resolution ntldr-img lua gpxe ; do - cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}" + 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_}" done ## Unset all compiler FLAGS for bios build @@ -83,11 +76,11 @@ _build_grub-common_and_bios() { unset MAKEFLAGS ## Start the actual build process - cd "${srcdir}/grub-bios-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-bios/" ./autogen.sh echo - CFLAGS="-fno-stack-protector" ./configure \ + ./configure \ --with-platform="pc" \ --target="i386" \ "${_EFIEMU}" \ @@ -117,15 +110,15 @@ _build_grub-common_and_bios() { _build_grub-efi() { ## Copy the source for building the efi package - cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-efi-${pkgver}" - cd "${srcdir}/grub-efi-${pkgver}/" + cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-${pkgver}-efi" + cd "${srcdir}/grub-${pkgver}-efi/" - export GRUB_CONTRIB="${srcdir}/grub-efi-${pkgver}/grub-extras/" + # export GRUB_CONTRIB="${srcdir}/grub-${pkgver}-efi/grub-extras/" - install -d "${srcdir}/grub-efi-${pkgver}/grub-extras/" - for _DIR_ in lua gpxe ; do - cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}" - done + # 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 ## Unset all compiler FLAGS for efi build unset CFLAGS @@ -134,7 +127,7 @@ _build_grub-efi() { unset LDFLAGS unset MAKEFLAGS - cd "${srcdir}/grub-efi-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-efi/" ./autogen.sh echo @@ -166,7 +159,7 @@ _build_grub-efi() { } -build() { +prepare() { ## Set ARCH dependent variables if [[ "${CARCH}" == 'x86_64' ]]; then @@ -177,14 +170,6 @@ build() { cd "${srcdir}/grub-${pkgver}/" - ## Fix compiling with gcc48 - patch -Np1 -i "${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch" - echo - - ## Fix docs compiling - patch -Np1 -i "${srcdir}/grub-2.00-fix-docs.patch" - echo - ## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch" echo @@ -197,7 +182,18 @@ build() { ## 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 _build_grub-common_and_bios echo @@ -208,7 +204,7 @@ build() { _package_grub-common_and_bios() { - cd "${srcdir}/grub-bios-${pkgver}/" + cd "${srcdir}/grub-${pkgver}-bios/" make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo @@ -223,15 +219,12 @@ _package_grub-common_and_bios() { ## Install /etc/default/grub (used by grub-mkconfig) install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub" - ## Install grub.cfg for backup array - install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg" - } _package_grub-efi() { - cd "${srcdir}/grub-efi-${pkgver}/" - make DESTDIR="${pkgdir}/" install + cd "${srcdir}/grub-${pkgver}-efi/" + make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install echo ## remove gdb debugging related files diff --git a/libre/grub/grub_bzr_export.sh b/libre/grub/grub_bzr_export.sh deleted file mode 100644 index ff8f99ecc..000000000 --- a/libre/grub/grub_bzr_export.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash - -## For actual repos - -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/lua lua -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/gpxe gpxe -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/ntldr-img ntldr-img -# bzr branch bzr://bzr.savannah.gnu.org/grub-extras/915resolution 915resolution - -## For launchpad mirror - -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-lua lua -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-gpxe gpxe -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-ntldr-img ntldr-img -# bzr branch lp:~the-ridikulus-rat/grub/grub-extras-915resolution 915resolution - -## grub-extras zfs is integrated into grub bzr main repo and is no longer needed separately. - -_WD="${PWD}/" -_OUTPUT_DIR="${_WD}/" - -_ACTUAL_PKGVER="2.00" - -_GRUB_BZR_REPO_DIR="${_WD}/grub_mainline_BZR/" -_GRUB_BZR_EXP_REPO_DIR="${_WD}/grub_experimental_BZR/" -_GRUB_EXTRAS_REPOS_DIR="${_WD}/grub_extras_BZR/" - -_MAIN_SNAPSHOT() { - - cd "${_GRUB_BZR_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_BZR_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub_r${_REVNUM}.tar" - echo - -} - -_EXP_SNAPSHOT() { - - cd "${_GRUB_BZR_EXP_REPO_DIR}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_BZR_EXP_REPO_DIR})" - bzr export --root="grub-${_ACTUAL_PKGVER}" --format="tar" "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - - xz -9 "${_OUTPUT_DIR}/grub_exp_r${_REVNUM}.tar" - echo - -} - -_EXTRAS_SNAPSHOT() { - - cd "${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME}/" - echo - - _REVNUM="$(bzr revno ${_GRUB_EXTRAS_REPOS_DIR}/${_GRUB_EXTRAS_NAME})" - bzr export --root="${_GRUB_EXTRAS_NAME}" --format="tar" "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - - cd "${_OUTPUT_DIR}/" - echo - - xz -9 "${_OUTPUT_DIR}/grub_extras_${_GRUB_EXTRAS_NAME}_r${_REVNUM}.tar" - echo - -} - -echo - -set -x -e - -echo - -_MAIN_SNAPSHOT - -echo - -# _EXP_SNAPSHOT - -echo - -_GRUB_EXTRAS_NAME="lua" -_EXTRAS_SNAPSHOT - -# _GRUB_EXTRAS_NAME="gpxe" -# _EXTRAS_SNAPSHOT - -_GRUB_EXTRAS_NAME="ntldr-img" -_EXTRAS_SNAPSHOT - -_GRUB_EXTRAS_NAME="915resolution" -_EXTRAS_SNAPSHOT - -echo - -set +x +e - -echo - -unset _WD -unset _OUTPUT_DIR -unset _GRUB_BZR_REPO_DIR -unset _GRUB_EXTRAS_REPOS_DIR -unset _GRUB_EXTRAS_NAME diff --git a/libre/grub/parabola_grub_mkconfig_fixes.patch b/libre/grub/parabola_grub_mkconfig_fixes.patch index 5324afa01..fbcca19ec 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 516be86..5f37db2 100644 +index 8decc1d..170047f 100644 --- a/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in -@@ -213,6 +213,8 @@ export GRUB_DEFAULT \ +@@ -212,6 +212,8 @@ export GRUB_DEFAULT \ GRUB_THEME \ GRUB_GFXPAYLOAD_LINUX \ GRUB_DISABLE_OS_PROBER \ @@ -12,10 +12,10 @@ index 516be86..5f37db2 100644 GRUB_SAVEDEFAULT \ GRUB_ENABLE_CRYPTODISK \ diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in -index 765bfdc..b148558 100644 +index 2c4bb0a..c7120d2 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in -@@ -115,6 +115,14 @@ cat <<EOF +@@ -125,6 +125,14 @@ cat <<EOF EOF @@ -64,7 +64,7 @@ index 14402e8..e85f7d6 100644 fi - if [ x$type != xrecovery ] ; then + if [ x$type != xrecovery ] && [ x$type != xfallback ] ; then - save_default_entry | sed -e "s/^/\t/" + save_default_entry | grub_add_tab fi @@ -132,7 +140,8 @@ linux_entry () @@ -75,7 +75,7 @@ index 14402e8..e85f7d6 100644 + + message="$(gettext_printf "Loading Linux %s ..." "${version}")" sed "s/^/$submenu_indentation/" << EOF - echo '$message' + 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 alt_version=`echo $version | sed -e "s,\.old$,,g"` diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 2503fe028..968110d3e 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 185808 2013-05-19 10:16:28Z andyrtr $ +# $Id: PKGBUILD 188976 2013-06-27 14:29:36Z andyrtr $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> @@ -6,8 +6,8 @@ _pkgname=hplip pkgname=hplip-libre -pkgver=3.13.5 -pkgrel=2 +pkgver=3.13.6 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet, without hplip-plugin binary blobs recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://hplipopensource.com" @@ -30,26 +30,16 @@ provides=$_pkgname=$pkgver options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc} - cups-1.6-buildfix.diff - hp-mkuri.patch - hplip_typo.patch) -md5sums=('f0c406f06f191a120f7d283b69ff10e8' + hp-mkuri.patch) +md5sums=('3dd5052864052b8cd4ce013bb71f4d6c' 'SKIP' - 'ef64578c6cb3ce252dbdcb0f1c2f4a47' - '0bd7779fdbc4d7a9386df04dce2cb8d4' - 'b3dd33a538ed8a3774f3c22f13e0a549') + '0bd7779fdbc4d7a9386df04dce2cb8d4') build() { cd "$srcdir/$_pkgname-$pkgver" - # fix build with cups 1.6 - FC hplip-ipp-accessors.patch - patch -p1 -i "${srcdir}/cups-1.6-buildfix.diff" - # fix linking libnotify, FS#34283 patch -Np0 -i ${srcdir}/hp-mkuri.patch - - # fix typo preventing FW to load - patch -Np0 -i ${srcdir}/hplip_typo.patch export PYTHON=python2 diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD index 1a0e3ddd0..3f83618e0 100644 --- a/libre/icecat-noscript/PKGBUILD +++ b/libre/icecat-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ +# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-noscript pkgname=icecat-noscript -pkgver=2.6.6 -pkgrel=2 +pkgver=2.6.6.7 +pkgrel=1 pkgdesc="plugin for icecat which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('a018efb1fe0f722ff307382791bf3c98') +md5sums=('10b6704f34568d226fb5fe69b7d6043d') package() { # _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1 -d-` diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index d9c2c7481..45294e48e 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgbase=icedove-l10n -_pkgver=17.0.5 -pkgver=17.0.5.2 +_pkgver=17.0.7 +pkgver=17.0.7.1 _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) @@ -64,58 +64,58 @@ done md5sums=('d5b2567a8cc8f64591f313a6efdaaffc' 'f3719964e893c1002b7a923e8f95f923' - 'ef463b3772f804beb4108e15917485fd' - '6125a2e91119afe4cd4fb78909bc2168' - '990067ee981db3bf9873e4bd9b2b1eba' - 'e32d496230cba49a435775359d4485ce' - 'd212d8bc244184e816cf36a9b654e7e6' - '4a83b506d1b81dfffa0b33bc0f12b24f' - '6349985a77b2db81a43cb22291bfd972' - 'dd4a259bfa4ce6816c55e9d7ff7f1172' - 'dc3ec06ccb5e98cfa332fca40af77470' - 'e81e63d8fac6c61cbbe72b1c8b0ce05c' - 'f0850f83f396c33a4e69abd00bda0e55' - 'ffc5de6b5409cf7cdd411ae853e0ba05' - '169780df5d160a04221dd80c92dd131a' - '8d1eacb770748156dbe02e493c41a5a6' - 'a3a0d856da6af722a6444567b684eb14' - '798415f06ce916eb6c84ea4cf97e1253' - 'c8eefe6a65295d354beb59e8f1b3116e' - '3ec1490226e064bc1145072ecdf031b4' - 'a3ff2959c9375084683b0741797103f9' - '99ea64506470bf7938e169bfe5f569b3' - '8170d58dcbb1b84820ef0ace6dc23965' - '24ba56f81446d551101d1848ed660682' - '53b9b22f7ad5916c8dfccd8b758828dc' - '0bdcd2f628dff58a4544e93a88344b76' - '87d516fbb68ae06d5ee7439a8a4d3d96' - 'c3cfa07d55fec1eb558e11c63ebd2a97' - '9845802371f603cb70df77a63088c16d' - '552e297a315a1b6f308604da4b492c53' - 'dc6755c33351b95f9e883c8e64fab7b6' - 'f3a67c52f5c5ca8cd5484250617f1aff' - '48fc583c7e67e87113fb73243da46313' - '4450b7753336f279296260e444cb0ba2' - '3a639521e20e5fb936f6d1b7679becd9' - '241a29846743f4dbcd5704e470193f30' - '71d71192e076a889da26129efd5f2f3d' - 'efc91beb8c199d459e1f24164066d75e' - 'ed717c1b94618faa8304796f1ff0acd7' - '8fc0aea02c1373f0ac0b7fa7eac2fa0c' - '808c60d4af8ee7b6bbbd82a5079c293e' - '6f0e4c6fe66e6d0e98f2fc444b59d629' - 'bc5e9972f5a092f4f28f577f7ade7ad7' - '2f852610ddc1550200965d4be6320879' - '6ad80cd433ef69c3577bfea9fd26cedc' - '0dd02b5317c9656c64543067956940bf' - '9e0d2f288130f048358135a89732ca85' - '936dbda4758d9a65f8c27603a2dee3bd' - '820d70ce31ca9731c162ab942b0daea1' - 'd737350d9edb73c15096e867fbdd8f3c' - 'b1896502d411dd6037f141d3561461d4' - '491a3a386c4963f162e050c370ffa140' - 'aa9f4e83501e624e4054f3ff61b71db3' - '257ee623933cfda550a8643a1a0b1d1c' - 'c3a8fa4fc511d914892e08fa17fab8a9' - '44be6381519c6c5ea785a4f5a5122a64' - '6693c752bf6272caed2e204556fc69b8') + 'fb33f8da3bc9f0906baf5222098e9359' + '0ceada37eed6ea7986fdffd6b0ea5aac' + '612dcc6e280b547efe9d6cebf82a1eb5' + 'fcc841359ef595fb58e6ef2333453ca0' + '69c31584fd7b442b655e58e4556f5034' + '479b6a37772b6885c52f26187818c542' + 'b723a4ae893838f4d332c5118bacd2fb' + '8cae26bd3354071f96faaa58f633f7f3' + '99fcd0609b232ba167d22200df617ce4' + '14e0224981659188f41d15d8a2a116bf' + '1da89ba6776c5be68851ab6782809b25' + '4e5e74537f138c0a5cfef02931e57c6b' + '67bb0b85fd5fd3f7344982cb0f93cc60' + 'a7120022d3a957f152044f5d7ce155e2' + '44a35e42bc9682b42f7fad416f803b83' + '149da69e91a018b8c2d2341b62091b18' + 'e78c3749605674623a5ebd455d1da5e6' + '18d4429db86023c3cff4cdfdb3c7db61' + '327f085c787a61c95b7904f1d68ba8ba' + 'c7f83c1d5fac8bae0257f5269d6318a9' + '2d8f1bf1e814fc984d791a95c4ef8811' + '2513698f14cbc85651c5b752845a9d7f' + '5d727ff5a17e105abe44b1e970868ea2' + 'e233b53dce6072308c190cdb83cb3d08' + 'f8c1f680d62c76607c12cf517fb4d9b1' + '124a5110c4e807bae739fa5542b21e6f' + '8031d7162eeb68343d0879550653c13d' + 'af6f26ef85012c84fb28279230a6bf47' + '93a25ac664d66deb4e0e88a9dd0f601f' + 'f834580781619b97659dc95d8f203d2b' + 'd54e1e7ed5c5d88db1ef2445bc0c9948' + '7a899329dafb829075f735990171823f' + '46fb6882a4350a86616dd0859b230602' + '80492e996b180062f56f9005d4083608' + '9fab024f293084e98e00639bb156b7aa' + 'a24adcb523efdfb836d7aa8dcb192a8b' + '3742697f98cec4bb7c565cdede33263f' + 'd9362ae826eb8591db5d6cf3f56bba0f' + '5e05ee5c2ef8ee9e5869a1f26277df2c' + '6cd8b8a4f19df69408ed03e7d09032dd' + '5ff06adb7f42975034f29910f5c9698d' + '74b76de767b3d1fc5eae3b40f55bca20' + 'd387e154d9a6d322551a16ac9e9b38e3' + '03c41d2d47146ca18aab8dff9023d3aa' + '8fb9aa07d7c5244da75192ebaa254d3c' + '84377496e3bc15d46f85bef767ca13ba' + '07ac58fb12e6744279670c22bbe41d9b' + 'b12f1a56bc7ce08c2800955257db1799' + '36ffa376a0e38e5b7000c2725cca994d' + '1fb8619dff3c3ee7c07e659a88094b8f' + '158ca3414b6ac982fc0c97d8b4f28c98' + '1fdabfde405e2bf54a4c8ad25c04d98f' + 'ffce5a4d36bc8a42496fda405ac677f7' + 'e183f1b3c17813399a930cb7b66d545d' + '12a93560247c526b0d29cacfc9f4882d') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index 8473cadd8..5fcf9f112 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,8 +3,8 @@ # We're getting this from Debian Sid _debname=icedove -_debver=17.0.5 -_debrel=2 +_debver=17.0.7 +_debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -33,8 +33,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" ${_pkgname}.desktop Icedove-branding.patch) options=(!emptydirs) -md5sums=('0c68298c17757257da79b6bb39e3fd10' - '2086f544ef90570d7629374aeac22aa6' +md5sums=('d5c0351b374b6caf536c11522929d822' + '0c9fc53103e7168edd972466a29cc8cf' '5cf95ea94f69cdd36604890cfbf7b954' 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' @@ -94,6 +94,8 @@ prepare() { } build() { + export DEBIAN_BUILD="comm-esr17" + cd "${srcdir}/${DEBIAN_BUILD}" export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" @@ -103,6 +105,8 @@ build() { } package() { + export DEBIAN_BUILD="comm-esr17" + cd "${srcdir}/${DEBIAN_BUILD}" make -j1 -f client.mk DESTDIR="${pkgdir}" install diff --git a/libre/iceweasel-l10n/PKGBUILD b/libre/iceweasel-l10n/PKGBUILD index 298d740cc..375785d88 100644 --- a/libre/iceweasel-l10n/PKGBUILD +++ b/libre/iceweasel-l10n/PKGBUILD @@ -1,8 +1,8 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer: André Silva <emulatorman@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: fauno <fauno@kiwwwi.com.ar> # Contributor: Figue <ffigue@gmail.com> -# Maintainer: Márcio Silva <coadde@lavabit.com> -# Maintainer: André Silva <emulatorman@lavabit.com> # Based on icecat-i18n package, which is in turn based on firefox-i18n # When updating to a newer upstream release: @@ -11,7 +11,7 @@ # - Run 'make'. It will take care of everything else for you. _debname=iceweasel -_debver=21.0 +_debver=22.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -23,7 +23,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) pkgver=$_debver.$_debrel -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Iceweasel." arch=('any') @@ -54,7 +54,7 @@ build() { cd $srcdir/$_path unzip -q langpack-$i@iceweasel.mozilla.org.xpi -d $i rm langpack-$i@iceweasel.mozilla.org.xpi - install -Dm644 $srcdir/region.properties $i/chrome/$i/locale/browser-region + install -Dm644 $srcdir/region.properties $i/browser/chrome/$i/locale/browser-region cd $i zip -q -r $srcdir/$_path/langpack-$i@iceweasel.mozilla.org.xpi . done @@ -75,91 +75,91 @@ package_iceweasel-l10n-$(echo $lang | tr A-Z a-z)() { done md5sums=('e88728730ecf9f0f145de5f70e362b15' - '59b4b2a362eece9edabb2fdc0f548ea2' - '24df894af578b902d16d4bc91759e926' - '489f555d46d08e3cb37eb5cb16203a3b' - '3b71f901014bd3fdcfc53d19a13cff10' - 'fc4a5af84dcf6b055b11b8d2ac9868ac' - '7d03e2d5c2660942d5fbb5078b71c8cc' - 'd12132ce5c0a4a881363dfebbf23fbee' - '09a5cf2d291f052433bdf834fe1f5100' - 'a8eb8983f0c63c1383f18f894f2292ee' - 'ef6fbffbad81223386c30c06da584f65' - 'f4b80fc31cea5e0aa3c03eab9f36765f' - 'c7ba7f36e104046ab22f37202c5e291e' - 'e884fe1127ef15376f4d72047e2ee924' - 'b235bed0eb4f872d5478a58c00341458' - '577498e39c9dd00ea2fb72146b3b5eac' - 'c611cfc16c7c7b5b6c877fd88b40c10e' - '5c6e2f317aba37bc701e4aab4720fcd7' - 'f9f7db03d1fcf2337902eba79289934c' - 'e601dc8a1bdd9204ca3a4db5e4fe0df1' - 'c2075468a1fea47efb7c65000fe73652' - 'fcf2f689a8d06c7c2c6bb49f57037d55' - 'f0c8d22cc820bb7177326bb069a38f5e' - '9dd2dc6c155ec3a61e26fba4baa980bc' - '41eff39b7c819c78fcac10f8064a2627' - 'c3f9a5f5305fece3f165d5d946805180' - 'd424c55b8a0242e500916f5bfdc60319' - 'f5d41bf99c08a27c4f4a2d370e6414f2' - '420a3b3194938ecc31e05899bd0c52e4' - '19e23ac8f3e187c1b7112e1a252adacb' - 'f1c9f646c5b70f591497cc36b7312aae' - 'b246026367f3c5416397566bd5980e5b' - '24e4bf6cc17e3fd724387e157e6a49b1' - '60af06bc25f259311284d83cb6b2ba02' - 'c5d8d2fecb6b0d2172ea1b4a4bdb2d68' - '58c93fd5ad320935666f0e10a2111f0a' - '7777c5b6bfa40c3ece5b48ef18d12938' - '47725d7fa7594f5739725096ae999dd1' - 'c2f34c4fbd2eaf0a9c7e8d97ac49ae43' - '7900a33d5694744af6c1b3a6b8a5f2df' - '97a95a5c30d8ba542a4c5457a831259d' - '02a3052bf3af409c56cdca72c23f2669' - 'a617e607fe3f952b6a152707c5c895e4' - '8d93b0550a30af8377e6198d67fb740e' - '938c22bdb193a8be3cf317deded8a49e' - 'f343106f50810e14ae1264933d5495fb' - 'a58187d70e895b90ea7667b08e0df6e4' - 'a014309f9621a15a7f86e759d5a42aa5' - '8a4c8bea9c508ad4ca395eb5d31e3105' - '6e728d930ca539a022d1d5cc5d8cc9c8' - '6c10afb3a86a1305ec4fdfde5702908e' - '3f749b1b19d5534442eb9daf5f9ddba1' - 'd8876e6f3ee24768a602128963f80e1c' - '6b7213d8c4d625ff0293e7a7c8eb4254' - '3d2b5b760c369ce1ff764205b196f0e5' - 'c09eec3566a2352f1dd2f2ad0e7cbf6c' - '5e560da497a4e448413bfd343d23493d' - 'faf5235cb19f5d1ee1d8868eb9399d8a' - '1dc06a576d7c87059125fa51e8677500' - 'ea7c6eb5df30fbf3b7b4737025492fd9' - 'f50c41542503959ddcc0ce200c2f8ec4' - '1a633a935016e3570327b52b66bb0dca' - '59bcc03566d356ac027655453775efa4' - '2d8644f035fe7d4e77a0f5eb196ddb0b' - 'a5cf6b19492d3e969187fe847d4ee990' - 'e3167e646b7c556e0d43565a13b066f9' - 'b1ce311e588dd120d04c2d94597ae100' - '129a07881b89c3f3ab14971dec88007f' - '37bc634c1f82bd9a01ea7e817e100d71' - 'd9b39409aa83bcae7aa22c54ebcd48b0' - '582926879e8d10d52448f373cd3fbd33' - 'cf6bafb6e3ee659c27579b43038f704c' - '083f69fd4f64fd436d7fdfe8a7747b41' - '6f65d6a154fa2c7d72045b4b34fc8890' - '1a060b1b08d6fa8413995003c62b220f' - '84194eba8c736cd8036975a8423758c0' - '30f15d767b3e867df514175680a78a8d' - '32946289930406ed3ccd1c174e464210' - '05547b17ebd589408a9633aeb4fede40' - 'f53c078d1ed0e90f2d68f098b34279f2' - 'a11cf418be9247856f3179f85fe57c9a' - '39d47c6e738749b1c01d06a1b112c368' - '63adbbe9ac9dde80d2c3ae0c861f1d33' - '82d6b78bf72083a5e01652c02e152680' - '725a322b12f522591a5fba5aa32031bb' - '98c7ed17e8fbe4478032a31ad2c2aa07' - 'a7c33685d88af8a90a14c874538fa53a' - '9b43e2e557c82a20509f34a54cc42e0f' - '84e12ebfd749a04adc5b3ace348a06f1') + 'ee742b573a169d31560f6a6becb41e3a' + '5d0dc39924ce4e0db437996d8a34fdd0' + '0f0ac315f5fbb5e081e5e9969c5482fc' + '4f9acf9efb7bfdaaa6061d76a61f1fe0' + 'ba5e95c3b6a48c8078353658e90a86f0' + '62b101c5e3ec1bfb7096c1728a5a1f89' + '33c910cb338f15b1f8bb53642f926c3a' + 'c971d199e6ce406095c82fe0aa11fe01' + '023ffab908dfd2ba970a1b5b9e5d2b0e' + '4c268fbe223e195ead80454880d064c7' + '8bd1c3303d7c17f2bc60240496c76ce2' + 'cf9e7a05dfa86d45246d0605d00e2d87' + 'a5fc01397dbe6d52f996b93b8a3cf55d' + '0b838e5ff9bdef95353f6e7dcd259558' + 'b529eea7fba51b4384fde80b47e7bebc' + '4f7fd9e189de9df37ff69cf34fc99f02' + 'c43a7be1aa8a0f00023e024de46198c2' + 'a4122057c2b2d4cec5079fef3c195b69' + 'adf7ca92a9df2d80a150fba8f94d12ad' + 'ce406f27700d972231e6a58f137068e2' + '1183cf8ff60af67e723bf3279d45058f' + 'bf22f66d181f97f5d818b8a1cd708617' + 'a684274da448a765a47a9c945803ab4a' + '328a0a2affc13ec597233ab0011ea506' + '099cc06876fe8e59a50bedb498169721' + '2e4cfd617507d28fc7083cfd9a49b5c7' + '8065c4a6d1634f6571d8dd3b428d3e6b' + '03a8757b10ca780690b80685918d9fb3' + '650db5a5d7d84ee533a34d4e6927e7b4' + 'eafd888466b00b1130aa24ce3e5ff689' + '1904330faee4503f733e006aa4f70d12' + '2a9846c969feacdba46956b57231667a' + 'e28a0fdf769432fed614da3252f03b41' + '3268b4c75e04c8315c93c0c47fedc602' + '5a0358ed95f4be6a1fe2f7654ea97e38' + '9ab21ef94c416f0925dee7fa1bd7feb0' + 'bee9b7995ccefdfe76b911032aa91a1b' + '59e6062bc9b97ae55f33ac7354491ce1' + 'b449c0dd635d34005b72a0f8a6c6573e' + 'b21e26451d5fc860a58d8a4cc0b9be99' + 'b558424e457aff17c582d642aa85fc24' + '5b603ba3e3c54902057308cb09c80e4e' + '20c17f3d945614cc36916dcf0c479a5a' + 'a2178a56487c0449244f50763893583e' + 'e256a82b04816566e10c9d4c8cb62c57' + 'afc5407fae17c2e894216b2e649d230a' + '92f60bbe78aae87dfa2df2bf008db10a' + 'a02788678251a677c6cf7c2123391f2a' + '4f927451a8b375e0f5ddb291c1fb7b80' + 'bcd9dbdabbe837b615c3c94e664addc1' + '2b50509cf00c2fa27292b055c31fc415' + 'e7b48db429e08751ed60b9500bba9d7d' + 'cab6a762cb378503f797da42d47283ad' + '8be4595d4788114c9c167435a5bc8d3c' + 'd03539bb9460209fa474385060077032' + '2ce9415f8f11aa7e8498a1abfc3ef39f' + '4119ba2afd5db58625571a119c1f09cb' + '981e12b8649b4450c5ac1e9e8ffbac83' + '881032091c863b249d1f463a1f1ab58f' + '13b6072c1adf21a2b8363a77073c83ea' + 'ba3646116673d62583b03c8789b72370' + 'b40dfef3bf5c27673a600e22135a86d3' + 'f2d5b8b91a20ab2170c5c62db1179ad4' + 'badc3b2a5c87b9df2d4176b0542fa836' + '882799e21bf63baaf4b1d335ae3ffffa' + 'f0ff3990e05f7d7d4386a1dc9cc78423' + '7bff28a8b1dee5f603b582d0ecd51f35' + '015469155969f9c2bdb79a2bd0d41402' + '59a8ff29e9a15d6b174dea2c7995ab3f' + '63b5a9127a721dd40ed3ad8f78132ad5' + 'f3f2fcdd40ea556de88cff9edae0ee3d' + '0d07f11308c2c339b965389e221fb6d5' + 'ae002208626b4b52680f33f2645c1d47' + 'a170a839e3fae8ef76f80c30d5f136f1' + '16d6fa49650822e036c50892b4f0c3f1' + '6eb5c5b1caf73c6d4bc9ec60991db988' + '846e79dbc479856f919f264d9821233c' + '01bb7fe8b663610ef4a5813ff3f7d895' + '670495986ec1643302641ec214a6c38e' + '251ced2c35aed8d301b23922b35d5e7a' + 'ce1d7bc395ccec6b9d4b143d5b8c5ba7' + 'f90747e32f6414f3494219becd331eb3' + '8fba2382f07aecec5234608741fdb72d' + '9c06e17e2dbba42dbe01a1264c57e39e' + '0a3aff57dab8c018daf0d9e71211bbb5' + 'a15982154bccdb4abdedaa8a86edd259' + '92a75129f4dd1f9700bd355e2c15b393' + 'bb02b3047d33b870ca5f549ce5561d98') 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 d89e4d1ae..f561d5d39 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 @@ -3,7 +3,7 @@ Date: Tue, 5 Jun 2012 08:57:06 +0200 Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index 0e8ccf5..fa46c08 100644
+index 91c5c1c..2f8bd1a 100644
--- a/browser/components/migration/content/migration.js
+++ b/browser/components/migration/content/migration.js
@@ -249,7 +249,7 @@ var MigrationWizard = {
@@ -184,7 +184,7 @@ index 260bc29..52b32cc 100644 -64_firefox=Bookmarks Backups
+64_self=Bookmarks Backups
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index fa45115..1fcf3cd 100644
+index 0541ebf..f983ae4 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -42,7 +42,7 @@ toolkit.jar:
@@ -267,10 +267,10 @@ index f35c227..7062886 100644 %{C++
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index b08f8ce..446ee74 100644
+index 17f5598..0b9a24a 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3747,7 +3747,7 @@ XREMain::XRE_mainRun()
+@@ -3743,7 +3743,7 @@ XREMain::XRE_mainRun()
if (gDoProfileReset) {
// Automatically migrate from the current application if we just
// reset the profile.
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD index eebf10e57..359dd684b 100644 --- a/libre/iceweasel-libre/PKGBUILD +++ b/libre/iceweasel-libre/PKGBUILD @@ -1,10 +1,10 @@ +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org> # Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> -# Contributor (Parabola): André Silva <emulatorman@lavabit.com> -# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> # Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> @@ -14,7 +14,7 @@ _pgo=true # We're getting this from Debian Experimental _debname=iceweasel -_debver=21.0 +_debver=22.0 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -22,20 +22,21 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=iceweasel pkgname=iceweasel-libre pkgver=$_debver.$_debrel -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox." arch=(i686 x86_64 mips64el) license=(MPL GPL LGPL) depends=(alsa-lib dbus-glib desktop-file-utils gtk2 gstreamer0.10-base hicolor-icon-theme hunspell libevent libnotify libvpx libxt mime-types mozilla-common mozilla-searchplugins nss sqlite startup-notification) -makedepends=(autoconf2.13 diffutils imagemagick libidl2 librsvg libxslt mesa pkg-config python2 quilt unzip zip) +makedepends=(autoconf2.13 diffutils imagemagick libidl2 libpulse librsvg libxslt mesa pkg-config python2 quilt unzip zip) [ "$CARCH" != "mips64el" ] && makedepends+=('yasm') options=(!emptydirs !makeflags) if $_pgo; then makedepends+=(xorg-server-xvfb) options+=(!ccache) fi -optdepends=('networkmanager: Location detection via available WiFi networks') +optdepends=('networkmanager: Location detection via available WiFi networks' + 'libpulse: PulseAudio audio driver') url="http://packages.debian.org/experimental/${_pkgname}" install=iceweasel.install replaces=('firefox') @@ -51,18 +52,22 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2" vendor.js shared-libs.patch replace-urls.txt + $_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch + $_pkgname-20.0.1-fixed-loading-icon.png Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch) -md5sums=('0a7c51bb494463c327af918bae6c4ee4' - 'c17121a4ffd40f463e16d7828445d96e' - 'e1e903ca91997f18b428c54ef604f27d' +md5sums=('45d7121606cc3b21cd2797c87b5dc3bd' + 'bf0440dd8c31527359d797daaf0d3edd' + '2d7ac85c32df6a4ccfcc6de7a1420bf7' '383e8e2a97a8b13fe56d153adb6878b6' - '2930f3bffe0d7a6b9845f8c006821bc2' + '0bbedfc161291de9dc61c531bf062c22' '7b9e5996dd9fe0b186a43a297db1c6b5' 'abf5ecb74caa857abb42bcfbb3442d9c' '0c26941504d3f2abed759221e9bb5de1' '52e52f840a49eb1d14be1c0065b03a93' 'a8fc4658d45b6bf9350023e5c3f34e56' - '85e67561e0e491cd538ce018dfc2d948') + 'bc27a39d08ab3f6705e487c85598d8bf' + '6e335a517c68488941340ee1c23f97b0' + '86d4045285a9a15c20a62f46535809cb') prepare() { export DEBIAN_BUILD="mozilla-release" @@ -131,6 +136,10 @@ prepare() { echo 'ac_add_options --disable-jemalloc' >> .mozconfig fi + # Should be fixed in Iceweasel 23 + # https://bugzilla.mozilla.org/show_bug.cgi?id=817533 + patch -Np1 -i ../$_pkgname-22.0-do-not-fallback-to-manual-proxy-settings.patch + # Fix PRE_RELEASE_SUFFIX sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \ browser/base/Makefile.in @@ -143,15 +152,27 @@ prepare() { # configure script misdetects the preprocessor without an optimization level # https://bugs.archlinux.org/task/34644 sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure + + # Fix tab loading icon (flickers with libpng 1.6) + # https://bugzilla.mozilla.org/show_bug.cgi?id=841734 + cp "$srcdir/$_pkgname-20.0.1-fixed-loading-icon.png" \ + browser/themes/linux/tabbrowser/loading.png } build() { + export DEBIAN_BUILD="mozilla-release" + cd "$srcdir/$DEBIAN_BUILD" export PATH="$srcdir/path:$PATH" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname" export PYTHON="/usr/bin/python2" + # Work around memory address space exhaustion during linking on i686 + if [[ $CARCH == i686 ]]; then + LDFLAGS+=' -Wl,--no-keep-memory' + fi + if $_pgo; then export DISPLAY=:99 Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY & @@ -167,6 +188,8 @@ build() { } package() { + export DEBIAN_BUILD="mozilla-release" + cd "$srcdir/$DEBIAN_BUILD" make -f client.mk DESTDIR="$pkgdir" install diff --git a/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png Binary files differnew file mode 100644 index 000000000..55f25e591 --- /dev/null +++ b/libre/iceweasel-libre/iceweasel-20.0.1-fixed-loading-icon.png diff --git a/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch new file mode 100644 index 000000000..56e4bfc45 --- /dev/null +++ b/libre/iceweasel-libre/iceweasel-22.0-do-not-fallback-to-manual-proxy-settings.patch @@ -0,0 +1,36 @@ + +# HG changeset patch +# User Patrick McManus <mcmanus@ducksong.com> +# Date 1365623297 14400 +# Node ID 85f1d207f52546e0e5fe78990cdefe6efae485fb +# Parent 2bb26d742f5ffd2d946291fd3c688dc3d6d34f67 +bug 817533 - failed system proxy lookups should not fallback to manual configs r=jduell + +diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp +--- a/netwerk/base/src/nsProtocolProxyService.cpp ++++ b/netwerk/base/src/nsProtocolProxyService.cpp +@@ -1553,17 +1553,22 @@ nsProtocolProxyService::Resolve_Internal + + // Proxy auto config magic... + if (mProxyConfig == PROXYCONFIG_PAC || mProxyConfig == PROXYCONFIG_WPAD) { + // Do not query PAC now. + *usePACThread = true; + return NS_OK; + } + +- // proxy info values ++ // If we aren't in manual proxy configuration mode then we don't ++ // want to honor any manual specific prefs that might be still set ++ if (mProxyConfig != PROXYCONFIG_MANUAL) ++ return NS_OK; ++ ++ // proxy info values for manual configuration mode + const char *type = nullptr; + const nsACString *host = nullptr; + int32_t port = -1; + + uint32_t proxyFlags = 0; + + if ((flags & RESOLVE_PREFER_SOCKS_PROXY) && + !mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) { + diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch index 3bb39d215..b5f0a4126 100644 --- a/libre/iceweasel-libre/libre.patch +++ b/libre/iceweasel-libre/libre.patch @@ -1,7 +1,7 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/browser/app/profile/firefox.js ---- mozilla-release.orig/browser/app/profile/firefox.js 2013-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/app/profile/firefox.js 2013-05-18 13:47:28.091097903 -0300 -@@ -1203,12 +1203,6 @@ +--- mozilla-release.orig/browser/app/profile/firefox.js 2013-06-26 23:50:49.004052388 -0300 ++++ mozilla-release/browser/app/profile/firefox.js 2013-06-26 23:45:52.697802427 -0300 +@@ -1208,12 +1208,6 @@ // (This is intentionally on the high side; see bug 746055.) pref("image.mem.max_decoded_image_kb", 256000); @@ -11,12 +11,12 @@ diff -ruN mozilla-release.orig/browser/app/profile/firefox.js mozilla-release/br -pref("social.manifest.cliqz", "{\"builtin\": \"true\",\"origin\": \"https://mozsocial.cliqz.com\",\"name\": \"Cliqz\",\"description\": \"Cliqz for Firefox Social\",\"author\": \"Cliqz\",\"homepageURL\": \"https://mozsocial.cliqz.com/\",\"version\": \"0.9\",\"workerURL\": \"https://mozsocial.cliqz.com/worker\",\"sidebarURL\": \"https://mozsocial.cliqz.com/sidebar\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wKEgkPNcdyEiIAAANaSURBVDjLVZNPUJR1HMY/39/77vLXZYFhKf4sbEKRTlrjFFIzFgtlJmQyddAmrOlgjdIAt+yQp04Wzti9sUZwPFgzOdg0sIuThaGUOBROEqLAimsoiqy77Lvvt0s09ZyeZ+Z5ntPzCKvo2w+7Poe+/YXAQeBtEINqX9gX+2JT3mKpgznT0zhwpyvaTE/jAAACQG8H7D4CJ/YZHFkA/ICi4JW01FtXWFco5NjcPxweXMN/YADw/KMyEkHEj7qKugJQQZxlR4klUEvI74o0H/hfQXc0DG8cgd7uLah5Gle1oWSt7KzYyIH1WyXotYknYHBGJDIHk/fc1tXw5lPbsIaPXuXg2aZ1Wcn5L/3OzbKkeGVTyXpa86u044lmuRC7pkOxCbGMhTGqapuKqnfqArPHrvTP9k4inZFwgSLXz8cTvnDldj0zPcXrj+5gauZPQUT7fo9KVWUJo7f/wJDi2eoACSt1yxa79VzL6Z+lK9L0yVJ65cONpW26u/ZdOT87wUJqCUln9NvpC9IQXK8dT+2Qk5NDvFq7BdsYfWton4zfu9ydbbyHbYW2omw/raGXpGf4OP6cAurL6xCF0O0Ae598hUPnTuDPd4gtzVOc6xdLLIyx6tWYLAPUPJRbzuJyhkNj/fy6cFXzvblqWbZU+AM6Mjshlf4AP8Z+I+Wm+GFmmLG743iNXSyqxlZ0xWNl54SKgnzz2kfM3YnL7L1bpB1H60qCUr6mRPOycqTS9yZluaWMLPzC3sf28P3ckDt6+1LGatjzyDaQ4ONFm/jp2hQ3kotcvxvn1uJfYtse8myvLK08IJlOUVZQSI0vpM8FnuHFsudrkunUBemKNrcLenQxZeuxcVtWXME4GVh6oJlsj3Q07NQNxdXSffYzNqzNxRjFqKXv1bZLla/yvnFd97gqA/leR8r9adRRzSSSmlFXWF7WUEGpXIxfpcAnOLpC2nVIaWp810Bb9Wh87CsB6Iy+kJVlrA8u3+X9Gzfd0Mik8+9NPF6vbq57WJJ5N7FtC4X7ItI+vL3/awDpijbR0zgIQOdguEqMmU6kVCdiLhkX2Ri0UIuxiw88EYWMoB8Pt3yXWJ2zrJLOSBOHw4N0RppeFuGkCDkArnLJQrZ+2jgwv+ptOLWN4ZbTAPwNmUptT0KshT0AAAAASUVORK5CYII=\",\"icon32URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTOwK3bfUAAAj8SURBVFjDnZd5cFXlGcZ/7znnLslNCIEkQBJI2IksAWpcgmjFugRxA41lwFKmTgd0tB2qqVVpLXWGAk4V1y5IxRnRCR2tWIgwWhYxCJECYQmEVWQLSch2c7dz73n7x80NIVKgfn+d78x3zvu8z/d+z/e8wtWMt2YJkA88ATwA5AF+YBOwFKhk7orA02sLkkSwAP/ikhotqyhgcUnNZX8tVwgMc1fAW7OWAPMA47uLFNT8bEafHStzkyOliqQBu4EFi0tqzlwpN7mK4OuB2y9E6/aNQo5V5+9v1bmuywqrx1CvxFfUA/2B8OVYMK4QfFFHcL00YMUtkXCedSZJwVNV73EUHI2vzgTe+35b8NYsgBuArRdlrQoiF2U/xHWivbfZ7ANBFTK8sbYxvcOpjkriu75A3f8CcmkG5q4AeK87SJ/hBtuOA0EBgwyzydB4MAxRGsNmqj9itBmoCIoqpd9nC24FBnVE6kx39oiJzC+YDOqQl9SL61Iy2xx1kkTQYIzwcb/VXN1kNa086jM2nkmqP9zqag3G5AaA4vKi/wOAmmWoRFFT4ruviuNwU99hLPjRDCUQ4rMpT+u2GYt8PieFuqC0H26zjFZbegqaHoyJN6r0POF39djR6L35xvKiSZWlVVcH4NcVIxaOc1dPutazxxrlPtjgNcJ+VIRohCl5hQpItiadG9I7WzAw+voKA+fCZiqKSwQVEQTMlogREVAHegp8XlxeNOhSLFiJh7KKggGqbDsfNrIscQwR1SQCGePdNdGacH5bD7M3Pm9SaiQS0dPHq7MSxXm2LeQRcFQQVAURRNBWW+jlcUSMzhzXV5ZWDSkuL6IrG0ZZRQFlFQVeoFJE+zZHjLAhEAgHpL9ngLaEok6kqd64N+caF6Brd20WnADlX6+XxqbzbD6wL9Re394eCLRKRKMoiqMqLbYSdSKECBmKqqoOLi4v+nn3rTA6KvRlIEcAv23YkWhEl5e8S/n0D2XONfOt9kA0uaSg2APIJzVf8NTtj/HIyt8G+70ylZgZ1WWT/5B65vHN3N93Il7bIs1IZkzK0OTSQdOdZwqfc/tsn0j8+L74HR3oyD4IqIHK1joz+sS4F6xpYx4kbIfVdERcvxlHdHE1pmWS9quJ+sW85bK5dkfkiY1L3c8U/0QX3jlXAFr8rfr+rn/JDwYXUtRvZKd+LK98m2Wn/4yoABQC1QkmDGB253kX6O8bHp425kE9eOZI9HD9SQKREAOzCzAtk6bWZrvV9suYnKGMyx7mTnL5dOEdcwTgmVUvB9NSekhuj36c9Td26oeqkpGUgaNOIumpF9UAcGdiEtMYj46bGwPk2fVvRHPTsmTLsd1MG3UrAB/u2+T6cdHkMMDRxlM8XTxdEGHNzk3U2Oe8AEcaDzoBuyHQRb7jmV24SyZ0PwWjExPbjnFT3m0+gH/WVuL+eLHGVOWXEx6OA9i/iceKpynAmsNfsfSBeQDM3/A2f5zyuAB8fWpbtOXs2WS71c/EwTfH8jLzzb0NezDEAEWAEd11ICcxyU4ZqaYlZkNTQ9TRqPuDA5/Jqj3rKM6PY1xbs0VLht/oBTjeeFr7pPbG3+5nd+NR7hh2PXHg1U5LuJlRA0ZrXma+Wf1NNWvOrU7sP0Cf7gy4OwGkjhCAUNS2EFGX5aWw32AAak8dY1juYDEMg2AwqP0y+gjAp/u3UvbDRwDYeWQ/flzORw99TC9fljS3NTPn80eR1HgtAIiIqzsDwc7Lxp0OQG5mP56b8DPZMuNVxmcOAeDT2m3cOTSe5eZDO4LjBxQA4HG7eeHWeB2vOVjJu1N/n9zLl6XRqM2bX77OXcNLmNTnNgp7jsWHD9ux/V3vBgv4FhgOEIi0kKjcFyfPYd3eL7k+fxQA645sZ+rYeDF+XlvlDMobiKpyT+EttLb78VhuVtd+yYZJb6Ad1+Ozdz3fmWkoEuK0/xSvb301uerNXTmVpVWnEgzsSiyqqd8ExPUc0AUb3qE51AbAlm+rtTHQqgCVx3anNAZaAyLCifrTnGs7D0DV4e34vMkqIrgsl3al2uv2MjB9EH+6e6k81X/evsQZsYA1wMMAQRp4f/vzMijz7tjKnZVm5dnd7N14gnEZQ2gNnufFje9Er80a6jrceJJl2z+Woj7DdcG6ZbLlF3/j0Mlj4IXjdSelOdxgN9r1rohGsMRFmjuN3JRcstNzAGTRXUvSjqw49PeP+GS2lFUUJM6nAhKLRTnRmtqyaq8nFbdloIpHXITVhpDd5o4ZqVGN4VgExO1OnjKsmNUzF/GXzf9gzr9fJie5HyNy6traJZga1SimmHitJNI96QxMHshjY59kSOYQXbPrE7l3x72ZibtgQYdyqWlapCaFzZ5phOOQhDBRgBB2LCWiURwUomqoSeyW/LEKsOWbPSAmpwJ1rWFPyGu4DHW73ZguE1sinIvU8VXz1qr71kye/8Hulc7dY+9h9LmRs40O7/47oDoBoofLsfLSIyKidgc5NoGIdpU0VL2EIu15afHjuPXUXsVB8zPtmKO4uvlN7VDEsv2zD704a/PMCa99/cqx+0bff4fRxa/dAuwAxGupN8XlyLDMsE3MaCdg28QcL8iFwhJRIk7KquoNQUCP1B+TdF/U3zc96tbvel0BVleWVm0sLi8i8qRue2n3ohu2BiozzMSKCTMzQ4tLav46YWbmGYUs2zGCvb2xpGxPKHS8wUiL2+G44bgg8cK+s7XhHccPuo9Evm0fk20ni9dwuosNcBq4rv9DOZ1mZOT4gnY7K7LzIqhdW6l3vhqUeqDZ3WoKHKiz2rYcdVt1TaYLwUI6rLqCx6OhgtxQsGeaZQQxephes3v6a4GfVpZW1Xd9mXBGl23NyioKlqjylCFKKCrRpoBhH6izAu0R6e0yNDwg3WnPTY+lpXgcsR0xtrX5pqtQKiIZQC2wHPhPZWlVqLsVu2JrlmCjrKLgeEczqqBiCEhHi6LaYQbjL55cMrnmte7/+V+BL2/LoWtXOwHYFwcrOCrEVMRRUaWzJBYumVzzWoemXDQuF/yyALqwcAq4EXipq8noYO8b4DbguatpxS81/gvSJCNlZUMZjgAAAABJRU5ErkJggg==\",\"icon64URL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90DEgoTJxa2MboAABYBSURBVHjazZt5fFXlue+/z1p7SnYmMjHPMwJaNAhxQFTUWJHj0FBrK7W2tdajtYPYW/3ce+w5tz2N3rannh7s7amntLXHwxFbtYpinTUKQcFAEhAhEAghZCLJTva01nruH3vI3mEnjNL7fj7wgb3e913v83vm53mXcCbHmlVw11pYs8oAioFy4CZgITAJ8AD9wG7gTeC/gQbuWtuRtv4sDvkUiP8McC9wPVA4aJZmeOceYD3wKHetbTvbIMgZJv4nwLcA7zAEZxoakwy9hbt+9zzA6g2zvw9UAuOAZuBp4EdVFQ26esNsqioa/j8AYIDw/Lg4LzsJogdjoCAy09v82PJRzV8xRP0ZtrHjoDwDnBEQjNNaHSO+BHjvtIlXQya5DjYXaMfdtR2eABBWRQdNNOPqUlVV0cDqDbP/hhKwZlUCwEPAyFMnPjZKjfbmye5DY0FQhRy3c6CsJDTeUVGRjPveXlXR8Nu/DQAx4gV4A7j09I6gamJHLvTuCFtq5saJVUeRsdnWgZkFkUwgJMAuBjpORxWMUxZ9+D9x4vX06Ddkurup1cbISyFSDFFt7neNbg26OkRUhmDcv56uHThVCTgf2HL6NljVQAMXemtzHMxMZ1HLoXfpmKDPEPUMcdw8oPdUgTBOQfSJuyQ9ffpFRpttQQdjKEaIy9C87Z2e9mEOevfZU4GY1f/7eFR3fOlRe8DDDSGApWZnRFWGAVO0M2yOOhoxWjN4BQU+f3bc4AD3f3pC3FdleeEczN5wDKoECKrx5QrgZEl4VKqB0+TfiiqWrViOovVdHmxFog6W7RBBUVBR5dyzZwPWrPom8MsTmmtH2XL9P9B5tIurXnwE8v0Dz4JhvLaB5Qs2l/kbx2qcD6qoiIoq/V0RI9gdFaffMkKWUuAo/mm5dme2S51slxMs9dmlxT67s8DrjHWUOVUVOxs+fRWAfzhh3Y9EOX/cdJbNW8j3Z14d47wC4Qg7bvlnmr/5ODe6xrkUAR0gPhCVxp09LmnuN/MCUaPEUcYbkOsSNTrCRtQULQ1ZxsSmgNu3rcNbuq3du9ctOvXTVYE1q2DNbYtRSlAkBsHwOMwtnAQCqsqPl98Bnb2A8o/n38Q5oyZSmJXDU3f8vDTcGU3Iod0aNPbtCbgm20qWCG4RGPgjdEekQJVIzHwiirg6w+aUv7blrC5fVzYGoHxd2acAwF1rQd13ATbi9IMoaoLKEBZOuXri/JiOiYApzMsbC5EQ9y64GlVFRDDchiwbd7WKgd3UZxxpDZmTTBk6oDSErK6IEUh5LHGAzgU+KF9XNre6subMAJAaZz/08sxvnefZfukF3h1mmac+6wLvds711u8qMjt3ooYcIwyOzXXj56chkuXyUpJVRF52jooMUDB/1Dxp7OVQT9QYY8jw0bSI0hE2+g1SAqPYkjAwCqgpX1eWezJSMJwEeFZvmP3l+1+cHWoPmf/LLdZEQ1QNUTFExSeRmTPcTbMW+mr35BmBXhQnKQ1Rh8umpAEgTR9vazzHMvYOpjDPW9rXGWK8CHp8myz0W1KkYA3QryCE4v/1Ae8CcqIguIbgvAn8BVgmorSHXFGJnVwGXIdgIyro1DmePf2tdtHhRmvCGByr55Ks0ihCUdLoB4N6uPvA5Al9o9NqBKqqLf2dfpdpxJPhE+CYkBWIykG/i7EJ9ymGGCnyMA/4SXVlzepTkoB4VFUXT28RoC1kdqYeTuOMFpCYx5asUrNzzDjrkzr21JsVE+cXpVrJDVveFPKy2dK8MxbZJNaLyNY9uy0nZDTG4v3jOxgRpc+S0pT8wBZDxgxy6/eXryubdFIAJHR+9YbZzwAzUxAnEDUKBokcUTtKxIoko5ZDPZ5DB9uYAVbn8tkXozqgpy/UvQ1uNw4Wv3nzGUQGIr/1O14Lhdt0UvgozSBRTcZCmhoZpUWGPVHjiCSCaUNaMxgOBZ44KQDiBYY7gRtSXxuypVNiCQeqiqI4fQ7LS1fwxYmrcPWY0tjlaznQ5SlB1O3y55XOnTCDVEP359o3Yv+IRrnnhZ/yxGvrpT/Q59z+qwdp94aCGCpWQEf17e8+0t/VLf3BfhAh4sRdpKaRJkFbvPHtRd3qcsRJk8z4WFq+rmz+8WyBpHDfA4QHFzY6Q8b+2k7vRIn79Cmuaaz9/B/weDwA9Pf1WwUPX+WK+g0FleUTF/Hclx9JHqito52R378Ysrw8vbKKm9f9AFzSCozE7wPT6KE3lFvozuG52x6Vi+acr798aa3cs+VR7pi6nCcbX8bIcsWNBhhiIGowP9+xjYhpTiycFOgP9+U060HIjs2Jg6/A+urKms8d1wjGuf+zweGxKvTbkgNgOxbn55fx+I3/nmY5sv3ZrqrL79Rvv/crQeCzM8vTnPTzH7wOuTnML53OTRdfw/17a3mk7mmTbF/SEUwuHNu++e+fKC7OL0RV5e5rVrG+biO/vuVHnPPSVL734S+4anI5V41ZRGn2CCblj2FW6RQKCwoVyAF49v1nebj+IbJys1KZe3P5ujI3EB0qPjBWb5jN6g2z3cA3B2ucCBp1pFAE8p0RPPZ3a9KI19jgxnOXCsEghIOsmHVxmig+v+MtME2Wz4sVjqpuW02u5c1JvisU0tfu/GVRnPik6vzm1h8DcN81dzBDRjN/1AzuW7KKL5RdT/mMC7SwoNBM8SasWLSCaFs0E423DmsD4lb/7szJkUrYkoBlR/nh0h/hMl1J4roC3Y7EBiX5hWBZFGQXM2pESZr+v7DrXSUa5oZzLkus1RvnXOZDENThwUtul0nFYyU1GVRVJo+akHzXlZMXY9n2kElc4n1jfeMyldsrh4sOE/z8ekZ7C0RU+s/NW0D5tKRoa9OR/dHH/vqknVjTerQDXC5WzLgozVXu3LfbtoywZHlyOH/ynMRBZfyIkQDkGFk8fNXXSXWLL25+nT9UP59GmKgQtELHteh5nvzBLBSgYlgJWL1hdg4we6gYtDcUtL6z6P7kgUREbl17f/iCqfPdqiqqyvt7a8Hr4rrp6fr/yq7NXfj93Dzv8rQ9u/sDgPKDi76I6TIREVSVcCjMZ9fe3/KnHW8GUuc3tO3hcKDjuBlYtic74+/l68pmDicB1wy36VTfdD1nwjlJrn7c1MA7Bz8KTSscqwlC39q/DWyHilnlaWufrN1YjGOFV553VZpdqGvZA1GL715ySyr3eWDdT5Viz+jKCytyUufXtm4Pd/Yd2Juq85mGZVtDkXHhUO7QABYP3a9yuGXequwUruoT76/vpKC4+N39tZIQ0Q273mdqwST82SkccGBT83YQaf3svEvS7MLbB7Zzw8yleDyeJPejkSj/suUZwVZWzh+QmKZD+ykq6vX2RHZN6e3vSYCufcF+AsE0QaEr2DUUKecNZQdcwJyhmhr9oSAXTanIT7HO8vvtG724TL7yl5/gx0NleQX7uvfz7bI70vT/1Y/eBb+HZRPK8lN33ntwP1Gjj68vuC5NXf7vq+ugwMPyaRchhpHc5836mqP+An+BiMGq9V+Um8ZXsmV/jeT5c3sevvmfkgGaIOwJfkKRFmYyhNOGU4HJQ+l/kWuq5vpzzAT3jna3c6ivO4IqeF2sfPZBXN9bDHnZXDttUZo4/2VnNXhcesO8y/JT93y5rhr8fq6Zk64u//b+M4DNvRfenLbPf9W+7TcMM4zCQesA/1z/j4wYXaAP3/xPeaqadJ3/8sLPyB+fl0k9BJgwXCA0aqiHs0ZekgbM7ubGfrKzRhALCyE7BxuF/n6unLkwLZ17tu5tsIPy+flXpvn3l3dv4oopC9Pe09bRTn3XJ+SWjoztkwrY3vfck71mc2G2PSYYDsqPLq1i+dwVaXu+VfsWTx78He4i91CkFA8nATmZ9d9mXP7cNESbe7oE00hv6CKcM2oWidK+qhIMBtnXu5/xBRMYkZOfqv/60p7NVMxYlPau/968EQpyuG/hzWlq9ElTI5YnSm/YLLVtSx67fA3L565IiwMOt7dwz8Zv4C5yD2kc43WCIQEwMxZ1HYvS7OlpxksMMyuWEcWTd8cBhaunXZi29oWtb0Ken+tmpIv54bZWDdtHuWjsvLTDbty9OZbDXnxrmvi/vONdyPVrf9Db8eiSn7FkxmVpz1s7W7nlyZXkTMpJk4hMxZ3hAMgYPzqOTaE/XTsun7MQjvYKakNvD09UPACdnSyZeG7awV7c9R6YwrIpFyR/V1Verd8UJcvDBeNnpx323aZa7rngJnKz/Wm/v/zxJrAj8vvlPyxZMv3yNCL7+/v1tie/QP/IAI468crEkKN/OBvQBxQcA4A6eN3+tN9yc3J54cv/xp/q3+T+y7/IyJwivmJFuGzqgmMPLhEumXTeQDQnwmu7awLiy/O63OmFqHNLpvKL5d85houv7Klh8Tmf4fr5l5qpkWFvX69z82N/Z8g4YaprGoZjEFWLzmgHtmljmVGiGk0EbqjqsAC0ZAIABNuxBjV7lGsXXMq1C2KJzUtb3sJTOJo8f25yTiAQ4FB/C+TmUpw/Im39hrrq/tGjRhQN3vOvD/w6rfihqhw43ExI+vjaBcuPAeZw12F55r7n1e/LPkbmWztb2XF4O5uPvM8rjRvp8Xbj9XgPDKcCezM9ME2TrsBhMiUdifFcw9t8Zsz0NGJe2V4NednMLkz3PKFgiJaeg/jdvmP2VFU6urvS9n/xo7ch10v52LmDmaDTx02XTMQDjCwcyRVzruSBS3/A+pXPcoVrGX29fecveWFxXjllGQHYkVE0DDdNR2uHaPvFWPXEthfxmu40Yl7b8wG43eR4s9LmV9dvgWxfSW8kqIP3EhG27qlL22fjrk0ATBgxMt0Qi5xQO88wDAqyCvhJ5aPcO+k7/kib1cQzx9xawwCqM5eKTDbtfzpTqQkR4dG//AfhLIfa1r1pc97ZXwsKDe37kxwTEbY0NYDH4zvcc6R9cJiy9ZM6wthp73lp9yZwHHxu76k3PuPS9ZWld/CDeQ/l97YE3rs7cod50bqFaQC8NFQm0Gp/xLY9bx0j+h837eX+N9aA281Rq5c/ffBqcs62lp0xW2D369M1r2iCYzta9sRcp9rRmsYdmoziEK78+Tf47IIlyT2aW1sImrG6YNiKnt4NkDgI1y24Xr85/Z4Z7z1Z85t3KzenFUQiwNZjU03B5XLzxIdfY9OuDRzubNLG1mbnuQ9fZ87PvgB5WbFAyHRx47oHeWXHexxqbQFvvK5ruuRzf3ygd937L2FZFge6DsdLmq68rz1bJXuPHOTjln1cUfVVSqakFzJer9sEeX4Qk7ZAV7xwFNLWzlZnT+sn1LfUsb2llo8ObaPu8A52te7iQMcBugPdGVU1DoJ8Y9ldOjYwdlX5+rK5g4uidwKPZ9J1EQj2hckzx/BUQ0FgT1erH78v1g5LhMQCEna4qGQW73Q2gCvu5gKho4Qi+ZdM+IzsPtLEYe1VhA6y3cX5+LGtKAEJcs+ilfzium8n33v7rx/ity1vgRXlx4u+SmNrM2FjX6DbaQsfNbqKgk6QKFEsx8JrevEYXvLceRR5ihibNY6y4gu5/twVuL3HhsZ7D+3l2qeWfbjru3vPB5DErcvVG2brUBcdQDAN5andeQ2N7d7Zx1bhNVMm3UxfaFwSpERfSRVys5pBxwCCY/Pnyh+zYu6S5OJJ/+Na9vtiRRPsGJ8WTgz0uXJdhqI+QGLbSfyexLH5n9Nrc9O4lXxn2fcwTTNVGvSr/3G77C7eOc8K2TuMlPs1jwyhRMRb+IzJjRa4TKf9WG1J62PHxCYc8ZNogIik55sRKysepYAVYenkBakRGPu7mxIlSTAFhIDHJ0cRshJ1SEk26CQZ8CR+F0MwC1z6X0f/2HPJ2sVH/7j1DwSCAU2owl2L79Yjje3fra6sidUE432Bh4DQUGUnVfCbjjGjJOzgyHBXYwTb6cRyRmRMs0WUiOWL9yDw+wqSgZSqUl33wYB9iedXpqkd6jFKdZhs55hyqSJe0/uvdr61+Kd1jzx9x0u3ScPBehURzp91AcXR4i8li6JVFQ3EjeGdHNuLSeynBV6nIM9rl/p9dnNGmGJJkkMwoogMfTNKNRvL7gaYVzIlzWK/07gNsnyJ1FpRZHShZSjiPtEYIOX8P3Q5rp0ffKn2c81O8y23vrrSeWPX6wBcNulyc8lzixek9QarKhp+B/xnJhBUkQKP02arMKsklINof5ryxyxmlGC0HUeLj9voD0U9QLDQl5v2nk1NDSl1BRWPy+maUBT1ZLghdjw5eLS6siZcXVlD+boyqj9X85Q/N3vBt96/++Pff7hWrphyJR2HOpYO7g0CfAl4fTAIIjDCa4+2laDL1PwZxeFOHJE4l2LhXDjaQtQuHob7Awd0tICI3d3Y1ZIG1LbDHye7AzjSPXdU0I9p+Ia4LzwU94PAA4lCaAKEd27aXJuTk7Pw8d2/bNja8yGRgHWekaE1bldVNFweB8EZJFJmgcfpACjMtsaV5kbjqqA2YWsvYWtC3DrJCUQoSihS2nDk47YPGusH3FTH/qQBnF4a6nOb2o6QfxLEC/CF6soaJ7UQmvy3Q7dLXPP+89AfWgtHj5g01P0A4iDcA+xKlqOBcX4rW1WwVZhQGCkpyY7W0Wd1EY5OiXNeTkJMDdT0Xfbbe3vXbX4ZjdjgUnAITxgRaS32W2PEbbhPkvjHqytr/jxUGby6soa3Vr5nu93uiw23UXLcw8YbJwuBL6uyUEQL3jyU1Vnoc/qm5Ebn+lxqbqjzHqxvcU+O3x87mbuHiqrgMg66s7LGzXWP1q19+2TKaLupJMcep6qGmWP2AjknaABfqq6sqShfV8Zw7bDE8/J1ZTeeCADHfJnx4MuzfmU7fN2JeT31uFRervfu/fCge4zjiA85SRxUwe06INnmyGnFkZaiLGuio4KYHDCzzfEnuMsb1ZU1S49H/GAQTvq2eNxQlgBHEmKnirpNlX2dZucrO709bUfNScR6t8dBInY9EovQ7HHR3rIpFp/0uq2oI6MFxfSb3Qh5Q3A/de//Cfzv6soa56STpVPNslZvmP14PG5IIUXFUXEOdpmt6z/y9UWjMm3gC4CUA+sACQV+Z+vnFwSn5/o0W0QNVaH+qHtrW8Q1zpVtlhyH8HpgObD3ZO8HnhYAcSnwAV3EvhBLvVShhqh4XNDSYzTvOOQ62t5nlkQsSh0VDFHH5+bwmHy749yx0fG5Xi2I2ANHUUVNUWlzXIvqA76lIrIMKIq/JxIvcNYBv62urHknVZzPGgApQFwHPJ+ptZYAIpkigNqKJL4MUAVHYzYkxccnVOrbj1zb8PMUfc2NAx4Bek9F1D8VAOIg/DtwB6f50VTK+lerKhquPJPfBn6aEpCIIDdyWp/NJddtA8oA62wQf0YkIA6EN55D3HAKICTmbwaurKpo6OUsDuMM7ROuqmi4EfgVKfd4T3DYwItVFQ0XAmeV+DMmAYPUoQK4D7hqGPeVGO8Aa6oqGv7I32jImdwsBYQsYh8930rsktJcYtcYw8BOYCPwO2BfVUVDgL/h+H+8Ex3DrupO9wAAAABJRU5ErkJggg==\"}"); -pref("social.manifest.msnnow", "{\"builtin\": \"true\",\"origin\": \"https://now.msn.com\",\"name\": \"msnNOW\",\"workerURL\": \"https://now.msn.com/js/firefoxworker\",\"iconURL\": \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2RpVFh0WE1MomNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5RjUxOThGOTJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5RjUxOThGODJDRjkxMUUyQTQ5NzkxRkQxQjI1Mzg2NCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IFdpbmRvd3MiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMTVCMTdDQ0M1MkFFMjExODNDRENFQTc0Q0EwNzEyMCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDozMkY0QkZFREQxM0JFMTExQUE0MEYwQTFBRTFEN0QwMyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Ppp4JKMAAABiSURBVHjaYvz//z8DJYCJgULAAmNwJEwk2Sk/FuQzUuyCUQMGgwGM+FIitrQBintKXKCG0wVA27Cl0t9IfEUgfoDmGuwuAEkAAbLzJdE14/UC1DUwOW6ggS/ICkRiAECAAQBDhCEtt+sSkAAAAABJRU5ErkJggg==\",\"icon32URL\": \"data:image/gif;base64,R0lGODlhIAAgAMQAAABgkm+lwf///y99psDY5K/N3c/h6k+RtA9pmO/1+I+5zz+HrR9zn7/X5N/r8V+bu3+vyJ/D1oCwySB0oGCcu+Ht80CIrRBqmTB+pwAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAAAgACAAAAXAICCOZGmeaKqubOu+cCzPdG3fraDvfO//OhFwSNwJi0jfUQBpKCCRnQNCdQgMDV0iK9haBcvS4ooYIZyAAjMtUAC4YUYiwQAkDgBIAgIYJAAPAnWBDAxGAEZjAgtvYYgHCAYAFpEACoeJOowNZVZ/CAIFfRcOfQBfYIhBipsPfRADgDoTshgABzxhrG8JjCILCToBb21smEUODahIS0nOzc7MAATU1dbX1qjYBDUSOhQ4JN7g4SMS5OXp6uvs7eshADs=\",\"icon64URL\": \"data:image/gif;base64, R0lGODlhQABAAPcAAABgkonIVjuOhf///7tnLwhnmY6bU8/h6gGO/7/X5H+vyK/N3WBaW0+RtACSnF+buy6Gl0uy/9l7J6PXeV6HaO/1+PvIIwyNxY+5z02acCpfghaw6hR5mPh2FKlXUn/I8v+UcgJ2wSCwoyB0oD+HrfB5TpuZV4TDXsyyOiCc/9/r8Uuf0G+lwdtcPACvoESShBGt+Z/D1iN6hIbFUid/rQea/Ri79x2Cwt9VFZPRYf1bB3B8jHhmYwNnoD1tdjeIjwN7yG+0YK2oRQtokRGV/xKupgWcpLBoTx7E6QWAxy99pueyQJ3Rj1i5/+pJPUmahwl7qjBsjw2m+wC3qQGblftlDB9jgkCIrVGfgn1nUJrRbRzC9h9zn+eEIi+k/5HMYhi33iaqlsHZ5SaKyRBqmRa2+P9PBfH3+Quh+wCllzB+pwNupmC5+WCcuwWV/YrHWBFti4zJWxCUxKxPVJfPaQ5omYCwyabZfjBhfuHt83CmwgCZmQmGxgC8rdHj61CStLHP3YHK+QR4uhaX/1C0/w+TxASjo6HF1xCq+o3MWh7G9RKv+ZG70QOS/kSVgQme/Ad5yQCxo5rSbgqj+xOx+QSV/xKV/43JXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAHAP8ALAAAAABAAEAAAAj/AAEIHEiwoMGDCBMqXMiwocOHECNKnEixosWLGDNq3Mixo8ePIC2uCPSBRkiNYyJEaMKmwMmLPSzJTOHlxkuLIdzodIMA0s2IO6IITIKmKJoaQH5CBFECDwA+i6IikiJI6cMjZnAAuGCjaxlKazJeKTjW4BU1B0eUBcBAR5UshcCAUaRow8UrMQboTTAi714yAEYk0Lt37BU7ZwgnQEuggwQoVNIYQSLn4oAzba60SYxZ85kEABac+TNCzZ8YdgDotXPFswoAVrrM0bDHhQtDHCy3GdhmwJ+BegYASKAiM+CBAzAQ/DMArQ8nHhxM6RPmBByLA9ZeyT5wOwA1fggP//CD1jfB7WV5tIBQRISkS0Gwa+cu0Ht3zSr8qF4LAL1AIRYYwMQdWsQRgAAV0defgt7pgdZAC+in4IJlUWABCj9MQMcbiWCR4HzzhXZZAgkkttuE/glkwhIAvPDFDDk8UdEVxwFABo0D3VifHTzqMUJ9NdqIo0EyZODIEBWRqOSSTDbp5JNQRvmkQOJVaeWVWGap5ZZ6Ucnll2CGeaWXYpZpZpZknqmmmmmu6WaYbb4pp5ZxVlkBiQdoeecCCww2p5VxkmBjAoLmqICVKjxgEAsV6FWBApD6qZcKkPpFGAaVVhmoQg+Id0CQBCmhgl4/AqCEeMoJ1KheBwyEgaaqVf9ZqEANKNAAQX5WECQJSoSqV6oAjKpXrwJZysJAqxK2qY156hXDQJ0OoMBAorJKLAB5VeDqpAQ1QBgXAkUr3rIkVAkuAOUOcC4ZyQ7QKq163WrqrwU1+q6IsFpZaLqE7dslvFUSy4VeCww06rml5nVsYGPGKp6/DwtUrrYCHSorcnodh8G7IxQMgLfnWpzvxeiSnC60+mI8wMJKLMzCAMeBJpCwI0dcss3pHjeweBTf7O5A5+apKADnbtdwyj7rBfHQAIg7gLwAvErYgwKNQHBBltbcr8Qmc0utAiyca2O7zw70csY5tjuuw1snPQDEA5SNkKSOEtTsAEw7rbXSXONxLN4CYgN9t3hDW02YxwAMvre7eFZ5QONVLqDAAw8oQPefwrGN+ebKas755nV+Pmfoor9Jeulrno76mQJJ6frrSyZW5WevWzXQ5WdQbXtDdOe+O0SS+v77Q34KP7xDgxl/PO/KL8/QAro7L/301FcfUkAAOw==\",\"sidebarURL\": \"https://now.msn.com/sidebar\",\"description\": \"See what's trending in realtime on Twitter, Facebook, Bing, YouTube and more.\",\"author\": \"Microsoft\",\"homepageURL\": \"https://now.msn.com/now-for-firefox\"}"); - - pref("social.sidebar.open", true); - pref("social.sidebar.unload_timeout_ms", 10000); - pref("social.toast-notifications.enabled", true); + // 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 diff -ruN 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-05-11 16:19:20.000000000 -0300 -+++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-05-20 17:49:18.467307120 -0300 +--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js 2013-06-26 22:53:37.285513294 -0300 ++++ mozilla-release/browser/base/content/abouthome/aboutHome.js 2013-06-26 22:57:20.932228108 -0300 @@ -3,69 +3,41 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -130,7 +130,7 @@ diff -ruN mozilla-release.orig/browser/base/content/abouthome/aboutHome.js mozil , "https://www.gnu.org/software/gnuzilla/addons.html" ]; -@@ -139,10 +111,6 @@ +@@ -203,10 +175,6 @@ if (searchEngineInfo.image) { let logoElt = document.getElementById("searchEngineLogo"); logoElt.src = searchEngineInfo.image; @@ -155,9 +155,9 @@ diff -urN mozilla-release.orig/browser/base/content/abouthome/aboutHome.css mozi #searchText { diff -urN 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-02-15 19:14:45.000000000 -0200 -+++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-02-20 19:55:41.962705914 -0200 -@@ -3,19 +3,12 @@ +--- mozilla-release.orig/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-18 08:01:12.000000000 -0300 ++++ mozilla-release/browser/locales/en-US/chrome/browser-region/region.properties 2013-06-26 22:44:10.393864883 -0300 +@@ -3,17 +3,12 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # Default search engine @@ -171,17 +171,15 @@ diff -urN mozilla-release.orig/browser/locales/en-US/chrome/browser-region/regio - -# This is the default set of web based feed handlers shown in the reader -# selection UI --browser.contentHandlers.types.0.title=Google --browser.contentHandlers.types.0.uri=http://fusion.google.com/add?feedurl=%s --browser.contentHandlers.types.1.title=My Yahoo! --browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s +-browser.contentHandlers.types.0.title=My Yahoo! +-browser.contentHandlers.types.0.uri=http://add.my.yahoo.com/rss?url=%s +browser.search.order.1=DuckDuckGo HTML +browser.search.order.2=DuckDuckGo Lite +browser.search.order.3=Seeks Search # 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 -@@ -24,20 +17,10 @@ +@@ -22,20 +17,10 @@ # don't make any spelling errors here. gecko.handlerService.defaultHandlersVersion=3 diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig index 21d56e13c..a5af10e63 100644 --- a/libre/iceweasel-libre/mozconfig +++ b/libre/iceweasel-libre/mozconfig @@ -25,10 +25,10 @@ ac_add_options --enable-system-pixman # Features ac_add_options --enable-startup-notification ac_add_options --enable-gstreamer +ac_add_options --enable-pulseaudio ac_add_options --disable-crashreporter ac_add_options --disable-updater -ac_add_options --disable-tests ac_add_options --disable-installer # Parabola features diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD index 7db206be9..2d5f48040 100644 --- a/libre/iceweasel-noscript/PKGBUILD +++ b/libre/iceweasel-noscript/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90901 2013-05-15 12:56:28Z spupykin $ +# $Id: PKGBUILD 93410 2013-07-03 10:50:31Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=firefox-noscript pkgname=iceweasel-noscript -pkgver=2.6.6 -pkgrel=2 +pkgver=2.6.6.7 +pkgrel=1 pkgdesc="plugin for iceweasel which disables script" arch=('any') url="http://noscript.net/" @@ -14,7 +14,7 @@ depends=() provides=$_pkgname=$pkgver makedepends=('unzip') source=(https://secure.informaction.com/download/releases/noscript-$pkgver.xpi) -md5sums=('a018efb1fe0f722ff307382791bf3c98') +md5sums=('10b6704f34568d226fb5fe69b7d6043d') package() { # _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1 -d-` diff --git a/community/ipsec-tools/PKGBUILD b/libre/ipsec-tools-libre/PKGBUILD index e953aaebc..6de9bd7d5 100644 --- a/community/ipsec-tools/PKGBUILD +++ b/libre/ipsec-tools-libre/PKGBUILD @@ -1,18 +1,23 @@ -# $Id: PKGBUILD 91860 2013-05-28 17:37:17Z spupykin $ +# $Id: PKGBUILD 91859 2013-05-28 17:36:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Allan Henriksen <allan.henriksen@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -pkgname=ipsec-tools +_pkgname=ipsec-tools +pkgname=ipsec-tools-libre pkgver=0.8.1 pkgrel=4 -pkgdesc="KAME IPSec tools ported to Linux" +pkgdesc="KAME IPSec tools ported to Linux (built for the linux-libre-headers package)" arch=('i686' 'x86_64' 'mips64el') url="http://ipsec-tools.sourceforge.net/" depends=('readline' 'openssl' 'krb5') -makedepends=('linux-headers') +makedepends=('linux-libre-headers') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver license=('GPL') options=('!makeflags' '!libtool') -source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$pkgname-$pkgver.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/ipsec-tools/$_pkgname-$pkgver.tar.bz2 racoon.service ipsec.service ipsec-tools-linux-3.7-compat.patch) @@ -22,7 +27,7 @@ md5sums=('d38b39f291ba2962387c3232e7335dd8' 'ae1dd20c83dcfce3dedb46ee73e83613') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$_pkgname-$pkgver patch -p1 <$srcdir/ipsec-tools-linux-3.7-compat.patch sed -i 's#-Werror##' configure.ac @@ -31,12 +36,12 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --sbindir=/usr/bin \ --enable-security-context=no --enable-hybrid --enable-dpd --enable-natt \ --enable-adminport --enable-gssapi \ - --with-kernel-headers=/lib/modules/`pacman -Q linux-headers | cut -f2 -d\ `-ARCH/build/include + --with-kernel-headers=/lib/modules/`pacman -Q linux-libre-headers | cut -f2 -d\ `-LIBRE/build/include make } package() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$_pkgname-$pkgver make DESTDIR=$pkgdir install install -Dm0644 $srcdir/racoon.service $pkgdir/usr/lib/systemd/system/racoon.service install -Dm0644 $srcdir/ipsec.service $pkgdir/usr/lib/systemd/system/ipsec.service diff --git a/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch index 46b11ee51..46b11ee51 100644 --- a/community/ipsec-tools/ipsec-tools-linux-3.7-compat.patch +++ b/libre/ipsec-tools-libre/ipsec-tools-linux-3.7-compat.patch diff --git a/community/ipsec-tools/ipsec.service b/libre/ipsec-tools-libre/ipsec.service index 483a5b58d..483a5b58d 100644 --- a/community/ipsec-tools/ipsec.service +++ b/libre/ipsec-tools-libre/ipsec.service diff --git a/community/ipsec-tools/racoon.service b/libre/ipsec-tools-libre/racoon.service index 95324bd5d..95324bd5d 100644 --- a/community/ipsec-tools/racoon.service +++ b/libre/ipsec-tools-libre/racoon.service diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index d5a72e95c..f1264b0c7 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z 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.10.4 +pkgver=4.10.5 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=('5465fffdaea70a5ca225283f45b9504775d0432d' +sha1sums=('3953c441d508408becfbb1177d3a834775b92bf6' '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 4b6f40af9..224d304e1 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications, without non-privacy search providers" arch=('i686' 'x86_64' 'mips64el') @@ -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=('f406c8c9e42c2508a7acf88b9719f5fa5b4683a1' +sha1sums=('1d472ceff3a38ff778803817b9c0eeb5b1880db6' 'aa6f39f4b0ad3c110fd05cd6c41190afae9773dd' 'ac3bac94a2c4b1444642524bc5fb539c4c5dcc5b') diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index ea698dfd7..8cdf5228e 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.10.4 +pkgver=4.10.5 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -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=('b5db1b91bd96b44ebd1b5e71019bb95b59775237' +sha1sums=('6caab0c70ab742dd711b44dd3f9bfdcbf9be31eb' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 89ed6edf3..3b4295415 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 188552 2013-06-15 11:11:13Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.10.4 -pkgrel=2 +pkgver=4.10.5 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -17,7 +17,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr3' 'ppp' 'libktorrent' 'libmms' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'use-libotr3.patch') -sha1sums=('891277c8dcbf231452947e9b4c54324bad35fd1a' +sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4' '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384') prepare() { @@ -27,7 +27,7 @@ prepare() { # 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' "${pkgbase}-${pkgver}/kopete/protocols/CMakeLists.txt" rm -rf "${pkgbase}-${pkgver}/kopete/protocols/skype" - sed 's/, Skype//' -i "${pkgbase}-${pkgver}/doc/kopete/index.docbook" + sed 's/, Skype//' -i "${pkgbase}-${pkgver}/kopete/doc/index.docbook" } build() { @@ -56,6 +56,6 @@ package_kdenetwork-kopete-libre() { install='kdenetwork-kopete.install' cd $srcdir/build/kopete make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kopete + cd $srcdir/build/kopete/doc make DESTDIR=$pkgdir install } diff --git a/libre/kdepim-libre/PKGBUILD b/libre/kdepim-libre/PKGBUILD index 007ed7f74..3f9b3ce28 100644 --- a/libre/kdepim-libre/PKGBUILD +++ b/libre/kdepim-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -22,7 +22,7 @@ pkgname=('kdepim-akonadiconsole-libre' 'kdepim-ktimetracker-libre' 'kdepim-ktnef-libre' 'kdepim-libkdepim-libre') -pkgver=4.10.4 +pkgver=4.10.5 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') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgbase}-${pkgver}.tar.xz") -sha1sums=('b1b8bdefd8a7b21c3a4518285ef8fd73890e8cf3') +sha1sums=('a7c791e748558a194d020104dc62604ee9f632ae') build() { mkdir build diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index 6b7a264ae..5efee348d 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 186956 2013-06-01 13:20:19Z andrea $ +# $Id: PKGBUILD 189302 2013-07-02 21:26:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.10.4 +pkgver=4.10.5 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=('3b98f04817a31b14b8899ddf024b03ff14420ea7' +sha1sums=('8c50a864af0dbf62e3df46414c7bf9cd1d8c8620' 'a0a836950f185d9b2245204579f969203036fdec') build() { diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index dcf59bda4..80b154dff 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130622 -_libretools_commit=5dd6e17100a86b79a3fd6fedc8cce49dcc298356 +pkgver=20130627 +_libretools_commit=08375ed421d18b48388169c7fc7cf4ca076577ba _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f _packages_url=https://projects.parabolagnulinux.org/packages @@ -74,5 +74,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('a5a5029740cef767b8e731ab8c48890b' +md5sums=('acbdcd22c1b922f943651dbf7c320bbd' 'b28b1492fda205be7c577fc03cbc3399') diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index 461c0a3b2..a5a75d2e4 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 186254 2013-05-23 00:44:27Z eric $ +# $Id: PKGBUILD 188905 2013-06-25 03:54:44Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor (Parabola): bitlord # Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.14 +pkgver=1.8.15 pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions" arch=('i686' 'x86_64' 'mips64el') @@ -21,7 +21,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2 remove-non-free-suggestions.patch) -sha1sums=('980939a9f6483f4e9ca2353ffdba131cb9a88a6e' +sha1sums=('9a86773996d61d03c03e9a5137a2c0a3e2539f4f' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/lilo/PKGBUILD b/libre/lilo/PKGBUILD deleted file mode 100644 index a896613ee..000000000 --- a/libre/lilo/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id$ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> - -pkgname=lilo -pkgver=23.2 -pkgrel=3.2 -pkgdesc="A bootloader for GNU/Linux, Parabola rebranded" -arch=('i686' 'x86_64') -url="https://alioth.debian.org/projects/lilo/" -license=('BSD') -# While lilo should stay in the base category, -# it usually makes no sense if it is installed -# with pacman -S base, therefore, don't add -# the base group here. -#groups=('base') -backup=('etc/lilo.conf') -depends=('device-mapper' 'coreutils') -makedepends=('bin86' 'sharutils') -optdepends=('perl: to use keytab-lilo') -install=lilo.install -options=('!makeflags') -source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" - 'lilo.conf') -md5sums=('51b9b9db665d3b8724919e3d46054d12' - 'd06b3c4655577ed01fea79ec5743b4b0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - export LC_ALL=C - make all -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/lilo.conf" "${pkgdir}/etc/lilo.conf" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 99c54a1b2..4983604a4 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -2,12 +2,15 @@ # Contributor: Márcio Silva <coadde@lavabit.com> pkgname=linux-libre-firmware -pkgver=3.9 +_pkgver=3.9 +pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 pkgdesc='Free firmware files for Linux-libre' arch=('any') -url='http://linux-libre.fsfla.org/' -license=('GPL2') +url=('http://linux-libre.fsfla.org/' + 'http://wireless.kernel.org/en/users/Drivers/ath9k_htc') +license=('GPL2' 'BSD') +makedepends=('git' 'xtensa-unknown-elf-gcc') provides=('linux-firmware' 'kernel26-firmware=2.6.34.99') conflicts=('linux-firmware' @@ -35,15 +38,46 @@ replaces=('linux-firmware' 'rt2870usb-fw' 'rt2x00-rt61-fw' 'rt2x00-rt71w-fw') -source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz") -md5sums=('120df29f88622dabf7015a22c7cc8e25') +source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/linux-libre-$_pkgver-gnu.tar.xz" + "git://github.com/qca/open-ath9k-htc-firmware") +md5sums=('120df29f88622dabf7015a22c7cc8e25' + 'SKIP') -package() { - cd $srcdir/linux-$pkgver - +build() { + + cd $srcdir/open-ath9k-htc-firmware + + # create firmware folder to put the free firmware files there + install -d -m755 $pkgdir/usr/lib/firmware + + # fix path on configure file + sed -i 's|$PWD/../toolchain/inst|/usr|; + 's|xtensa-elf|xtensa-unknown-elf|; + ' target_firmware/configure + + # compile ath9k-htc-firmware + make -C target_firmware + + mv htc_{7010,9271}.fw $pkgdir/usr/lib/firmware + + cd $srcdir/linux-$_pkgver + + # compile free firmware files of linux-libre source code make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install - # move WHENCE file to linux-firmware license folder +} + +package() { + + # create licenses folder to put the licenses files there install -d -m755 $pkgdir/usr/share/licenses/$pkgname + + # move LICENSE.TXT from ath9k-htc firmware to linux-firmware license folder + cd $srcdir/open-ath9k-htc-firmware-1.3.2 + mv LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENCE.atheros_firmware + + # move WHENCE file to linux-firmware license folder + cd $srcdir/linux-$_pkgver mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname + } diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 8a224dfa3..56137aaf3 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.9.7 +_kernver=3.9.8 _kernrel=1 pkgname=('linux-libre-kmod-alx') _version=v3.9-rc4 _pkgver=3.9-rc4-2-su pkgver=3.9rc4.2 -pkgrel=8 +pkgrel=9 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 7be04b12f..434a922af 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188793 2013-06-21 07:29:45Z tpowa $ +# $Id: PKGBUILD 189000 2013-06-28 06:57:30Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,10 +8,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=83 +_sublevel=84 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.82 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.83 # 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 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2") md5sums=('f30a562307b6f71204370fcd33756466' - '43f2b35b0a8bbe8442627874b4179644' - 'fe0e9b4415b82f306fc1b63eb9a742a4' - '69a689019ea0b6ed46b387907f14bc8a' + 'a2ab5e3c758f35d0a2ffe33b23cfe04d' + '6ab0f1a509481d93117b7630105757cc' + '18dfa330a7da88d7c09c3e24a5cd608f' 'c072b17032e80debc6a8626299245d46' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' @@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'cc33faaec0f6c99ff03838a146d62250') + '1327df75d631529dcf29f46f474cf16d') 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 849fd016b..a1d065a1a 100644 --- a/libre/linux-libre-lts/config.i686 +++ b/libre/linux-libre-lts/config.i686 @@ -1438,8 +1438,8 @@ CONFIG_OF_PCI=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64 index fe5875138..a5dc36205 100644 --- a/libre/linux-libre-lts/config.x86_64 +++ b/libre/linux-libre-lts/config.x86_64 @@ -1381,8 +1381,8 @@ CONFIG_MTD_UBI_BEB_RESERVE=1 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 4e64f9872..c90c5a29f 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91131 2013-05-19 23:48:35Z seblu $ +# $Id: PKGBUILD 93323 2013-07-01 22:56:01Z seblu $ # Maintainer: Sébastien Luttringer <seblu@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,11 +8,11 @@ pkgname=('linux-libre-tools-meta' 'perf-libre' 'cpupower-libre' 'usbip-libre') -_basekernel=3.9 +_basekernel=3.10 #_sublevel=6 _pkgver=$_basekernel.$_sublevel pkgver=$_basekernel -pkgrel=3 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -33,13 +33,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/ 'cpupower.systemd' 'cpupower.service' 'usbipd.service') -sha256sums=('62f113b4bd9ee832e8906da970c5bf4585c057af4eab14ec6ad57e9b2fd084ef' +sha256sums=('abee814b92422cfa3df90b62ad9ba888697fcc03a713adc2c7f68e0d0c23c329' '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f' 'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e' 'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc' '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f') -build() { +prepare() { # apply stable patching set if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then msg2 'Applying stable patch set' @@ -47,7 +47,9 @@ build() { patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu cd .. fi +} +build() { msg2 'Build libtraceevent-libre' pushd linux-$pkgver/tools/lib/traceevent make diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 220530181..cc02f9c6f 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188791 2013-06-21 06:32:50Z tpowa $ +# $Id: PKGBUILD 188998 2013-06-28 05:50:01Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.9 -_sublevel=7 +_sublevel=8 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.6 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,15 +31,15 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'change-default-console-loglevel.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' - '4f5c670da16dc80fe9482892b636f99d' - 'e6c4e42d67aaff6d057983c499ebcace' - 'e23ad17eb5051f5ccd332bbb474df4d9' + 'b628d7ff09667dc5546993bb83461d45' + '5bb868d38a27edafac1eb114cd2f3659' + 'c180de34b0450d7eef8e0c1a68433d7c' 'e49ac236dfeef709f91a3d993ea7b62c' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '0375f682754ef52216fd522494875301') + '30092ce96affb12f89a9eddfad966741') 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/config.i686 b/libre/linux-libre/config.i686 index f6951a2b6..e84812997 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1581,8 +1581,8 @@ CONFIG_OF_MTD=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre/config.i686.3.10 b/libre/linux-libre/config.i686.3.10 index 129ab764f..9eaa84b4f 100644 --- a/libre/linux-libre/config.i686.3.10 +++ b/libre/linux-libre/config.i686.3.10 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-rc6 Kernel Configuration +# Linux/x86 3.10.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -1586,8 +1586,8 @@ CONFIG_OF_MTD=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m @@ -3924,7 +3924,6 @@ CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -3970,6 +3969,7 @@ CONFIG_SMS_SIANO_RC=y # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -4047,7 +4047,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4597,7 +4596,6 @@ CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # CONFIG_SND_SOC is not set -CONFIG_SND_SOC_SI476X=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index 44a03558f..0937bed6f 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1530,8 +1530,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m diff --git a/libre/linux-libre/config.x86_64.3.10 b/libre/linux-libre/config.x86_64.3.10 index 4c4838cca..ed592fa43 100644 --- a/libre/linux-libre/config.x86_64.3.10 +++ b/libre/linux-libre/config.x86_64.3.10 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-rc6 Kernel Configuration +# Linux/x86 3.10.0-rc7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1536,8 +1536,8 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_SERIAL=m -CONFIG_PARPORT_PC_FIFO=y -CONFIG_PARPORT_PC_SUPERIO=y +# CONFIG_PARPORT_PC_FIFO is not set +# CONFIG_PARPORT_PC_SUPERIO is not set CONFIG_PARPORT_PC_PCMCIA=m # CONFIG_PARPORT_GSC is not set CONFIG_PARPORT_AX88796=m @@ -3793,7 +3793,6 @@ CONFIG_RADIO_ADAPTERS=y CONFIG_RADIO_SI470X=y CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m -CONFIG_RADIO_SI476X=m CONFIG_USB_MR800=m CONFIG_USB_DSBR=m CONFIG_RADIO_MAXIRADIO=m @@ -3838,6 +3837,7 @@ CONFIG_SMS_SIANO_RC=y # Media ancillary drivers (tuners, sensors, i2c, frontends) # CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_ATTACH=y CONFIG_VIDEO_IR_I2C=m # @@ -3915,7 +3915,6 @@ CONFIG_VIDEO_M52790=m # # Sensors used on soc_camera driver # -CONFIG_MEDIA_ATTACH=y CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m @@ -4415,7 +4414,6 @@ CONFIG_SND_PCMCIA=y CONFIG_SND_VXPOCKET=m CONFIG_SND_PDAUDIOCF=m # CONFIG_SND_SOC is not set -CONFIG_SND_SOC_SI476X=m # CONFIG_SOUND_PRIME is not set CONFIG_AC97_BUS=m diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 91710f5eb..fc749260c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 188799 2013-06-21 08:04:28Z tpowa $ +# $Id: PKGBUILD 189186 2013-06-28 18:41:29Z foutrelis $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,14 +6,14 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=48 +pkgrel=49 epoch=1 _extramodules=extramodules-3.9-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-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-libre>=3.9' 'linux-libre-headers>=3.9' 'linux-libre-headers<3.10' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch diff --git a/libre/mkbootcd/PKGBUILD b/libre/mkbootcd/PKGBUILD deleted file mode 100644 index 8990fbae3..000000000 --- a/libre/mkbootcd/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 137619 2011-09-10 08:04:29Z pierre $ -# Maintainer : Tobias Powalowski <tpowa@archlinux.org> - -pkgname=mkbootcd -pkgver=2008.09 -pkgrel=2.2 -pkgdesc="Advanced, modular isolinux bootcd image creation utility (Parabola rebranded)" -arch=('any') -license=('GPL') -url="https://parabolagnulinux.org/" -depends=('mkinitcpio' 'cdrkit' 'syslinux') -source=('boot.msg' 'mkbootcd' 'mkbootcd.conf' 'options.msg') -backup=('etc/mkbootcd.conf') -md5sums=('2b55189d64e5263c5a3925a7b949c1f8' - '521107289007f0c3f11ddbb6fdfcbd22' - '4794673fa413eb5459b40172be7ae541' - '75b69407f88f2838c66f4dda4d8455e3') - -package() { - cd $srcdir - install -D -m755 mkbootcd $pkgdir/usr/sbin/mkbootcd - install -D -m644 mkbootcd.conf $pkgdir/etc/mkbootcd.conf - install -D -m644 boot.msg $pkgdir/usr/share/mkbootcd/boot.msg - install -D -m644 options.msg $pkgdir/usr/share/mkbootcd/options.msg -} diff --git a/libre/mkbootcd/boot.msg b/libre/mkbootcd/boot.msg deleted file mode 100644 index 5e441e746..000000000 --- a/libre/mkbootcd/boot.msg +++ /dev/null @@ -1,15 +0,0 @@ - - ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre -ISOLINUX BOOT -created with 'mkbootcd' written by Tobias Powalowski <tpowa@archlinux.org> -rebranded for Parabola by André Silva <emulatorman@lavabit.com> - -Press ENTER or type 'parabola' to boot the CD. - -If you wish to change your defaults to boot into your existing system, -type 'vmlinuz initrd=initrd.img <any_other_boot_option>' -Use the F2 key for troubleshooting and options. ------------------------------------------------------------------------------- - diff --git a/libre/mkbootcd/mkbootcd b/libre/mkbootcd/mkbootcd deleted file mode 100755 index 012267be9..000000000 --- a/libre/mkbootcd/mkbootcd +++ /dev/null @@ -1,144 +0,0 @@ -#! /bin/sh -# Created by Tobias Powalowski <tpowa@archlinux.org> -# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> -# Settings -APPNAME=$(basename "${0}") -CONFIG="/etc/mkbootcd.conf" -GENIMG="" -BURN="0" -BLANK="0" -GRUB="0" -TARNAME="" -export TEMPDIR=$(mktemp /tmp/mkbootcd.XXXX) -usage () -{ - echo "${APPNAME}: usage" - echo " -g=IMAGE Generate a ISO image as IMAGE" - echo " -c=CONFIG Use CONFIG file. default: /etc/mkbootcd.conf" - echo " -B Burn the ISO image after creation" - echo " -b Blanking media first" - echo " -grub Use grub instead of isolinux" - echo " -t=TARNAME Generate a tar image instead of an iso image" - echo " -h This message." - exit 1 -} - -[ "$1" == "" ] && usage - -while [ $# -gt 0 ]; do - case $1 in - -c=*|--c=*) CONFIG="$(echo $1 | awk -F= '{print $2;}')" ;; - -g=*|--g=*) GENIMG="$(echo $1 | awk -F= '{print $2;}')" ;; - -B|--B) BURN="1" ;; - -b|--b) BLANK="1" ;; - -grub|--grub) GRUB="1" ;; - -t=*|--t=*) TARNAME="$(echo $1 | awk -F= '{print $2;}')" ;; - -h|--h|?) usage ;; - *) usage ;; - esac - shift -done - -if [ "${TARNAME}" = "" -a "${GENIMG}" = "" ]; then - echo "ERROR: No image name specified, please use the -g option" - exit 1 -fi - -if [ ! -f "${CONFIG}" ]; then - echo "config file '${CONFIG}' cannot be found, aborting..." - exit 1 -fi - -. "${CONFIG}" -# export for mkinitcpio -[ -n "${APPENDBOOTMESSAGE}" ] && export APPENDBOOTMESSAGE -[ -n "${APPENDBOOTMESSAGE_SYSLINUX}" ] && export APPENDBOOTMESSAGE_SYSLINUX -[ -n "${APPENDBOOTMESSAGE_SYSLINUX_LOWMEM}" ] && export APPENDBOOTMESSAGE_SYSLINUX_LOWMEM -[ -n "${APPENDOPTIONSBOOTMESSAGE}" ] && export APPENDOPTIONSBOOTMESSAGE - -if [ "$GRUB" = "1" ]; then - export RUNPROGRAM="${APPNAME}-grub" - export BOOTDIRNAME="boot" -else - export RUNPROGRAM="${APPNAME}" - export BOOTDIRNAME="isolinux" -fi -[ "${BOOTMESSAGE}" = "" ] && export BOOTMESSAGE=$(mktemp /tmp/bootmessage.XXXX) -[ "${OPTIONSBOOTMESSAGE}" = "" ] && export OPTIONSBOOTMESSAGE=$(mktemp /tmp/optionsbootmessage.XXXX) -[ "${ISONAME}" = "" ] && export ISONAME=$(mktemp /tmp/isoname.XXXX) -export USEKERNEL=${VERSION} -# begin script -[ -e ${TEMPDIR} ] && rm -r ${TEMPDIR} -mkdir -p ${TEMPDIR}/${BOOTDIRNAME} -if [ "$GRUB" = "1" ]; then - mkdir ${TEMPDIR}/${BOOTDIRNAME}/grub - install -m755 /usr/share/grub/i386-pc/stage2_eltorito ${TEMPDIR}/${BOOTDIRNAME}/grub/stage2_eltorito -else - install -m755 /usr/lib/syslinux/isolinux.bin ${TEMPDIR}/${BOOTDIRNAME}/isolinux.bin -fi -# create isolinux.cfg -if [ "$GRUB" = "1" ]; then - echo ":: Creating menu.lst ..." - [ ! -e "${MENULST}" ] && echo "No menu.lst found" && exit 1 - sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ - ${MENULST} \ - > ${TEMPDIR}/${BOOTDIRNAME}/grub/menu.lst -else - echo ":: Creating isolinux.cfg ..." - if [ "${ISOLINUXCFG}" = "" ]; then - [ -e ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && rm ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "prompt ${PROMPT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "timeout ${TIMEOUT}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "display boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "F1 boot.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "F2 options.msg" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "default parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "label parabola" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "kernel vmlinuz" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - echo "append initrd=initrd.img ${KERNEL_BOOT_OPTIONS}" >> ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - else - sed "s|@@PROMPT@@|${PROMPT}|g;s|@@TIMEOUT@@|${TIMEOUT}|g;s|@@KERNEL_BOOT_OPTIONS@@|${KERNEL_BOOT_OPTIONS}|g" \ - ${ISOLINUXCFG} > ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg - fi - [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/isolinux.cfg ] && echo "No isolinux.cfg found" && exit 1 -fi -echo ":: Calling mkinitcpio CONFIG=${MKINITCPIO_CONFIG} KERNEL=${VERSION} ..." -# generate initramdisk -echo ":: Creating initramdisk ..." - mkinitcpio -c ${MKINITCPIO_CONFIG} -k ${VERSION} -g ${TEMPDIR}/${BOOTDIRNAME}/initrd.img -echo ":: Using ${KERNEL} as image kernel ..." - install -m644 ${KERNEL} ${TEMPDIR}/${BOOTDIRNAME}/vmlinuz - install -m644 ${BOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/boot.msg - install -m644 ${OPTIONSBOOTMESSAGE} ${TEMPDIR}/${BOOTDIRNAME}/options.msg - [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/boot.msg ] && echo 'ERROR:no boot.msg found, aborting!' && exit 1 - [ ! -s ${TEMPDIR}/${BOOTDIRNAME}/options.msg ] && echo 'ERROR:no options.msg found, aborting!' && exit 1 -# create image -if ! [ "${TARNAME}" = "" ]; then - echo ":: Creating tar image ..." - [ -e ${TARNAME} ] && rm ${TARNAME} - rm ${TEMPDIR}/parabola/pkg/*.pkg.tar.gz > /dev/null 2>&1 - tar cfv ${TARNAME} ${TEMPDIR} > /dev/null 2>&1 && echo ":: tar Image succesfull created at ${TARNAME}" -else - echo ":: Creating ISO image ..." - [ -e ${GENIMG} ] && rm ${GENIMG} - [ -s "${ISONAME}" ] && ISONAME=$(cat $ISONAME) || ISONAME="Parabola GNU/Linux-libre" - if [ "$GRUB" = "1" ]; then - mkisofs -RlDJLV "${ISONAME}" -b boot/grub/stage2_eltorito -c boot/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 - else - mkisofs -RlDJLV "${ISONAME}" -b isolinux/isolinux.bin -c isolinux/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table -o ${GENIMG} ${TEMPDIR}/ > /dev/null 2>&1 - fi - [ $? -ne 0 ] && echo ":: ISO Image succesfull created at ${GENIMG}" - # burning/blanking image - if [ "$BLANK" = "1" ]; then - echo ":: Blanking media DEVICE=${DEVICE}, BLANKMODE=${BLANKMODE}, SPEED=${SPEED} ..." - cdrecord dev=${DEVICE} speed=${SPEED} blank=${BLANKMODE} > /dev/null 2>&1 && echo ":: Successfull." - fi - if [ "$BURN" = "1" ]; then - echo ":: Burning ISO image DEVICE=${DEVICE}, SPEED=${SPEED} ..." - cdrecord dev=${DEVICE} speed=${SPEED} -eject ${GENIMG} > /dev/null 2>&1 && echo ":: Successfull." - fi -fi -# clean /tmp -rm -r ${TEMPDIR} diff --git a/libre/mkbootcd/mkbootcd.conf b/libre/mkbootcd/mkbootcd.conf deleted file mode 100644 index 5b287a6ea..000000000 --- a/libre/mkbootcd/mkbootcd.conf +++ /dev/null @@ -1,39 +0,0 @@ -# Created by Tobias Powalowski <tpowa@archlinux.org> -# Rebranded for Parabola by André Silva <emulatorman@lavabit.com> -# config file of mkbootcd - -# DEFAULT kernel boot options like root=/dev/hda3 etc. -# add your root= option, if you boot from a disk device -# and don't want to add it by hand on each boot -KERNEL_BOOT_OPTIONS="" - -# mkinitcpio config file, defaulted to stock config file -MKINITCPIO_CONFIG="/etc/mkinitcpio.conf" - -# kernel version, defaulted to build for runtime kernel -VERSION="$(uname -r)" - -# kernel image, defaulted to stock libre kernel -KERNEL="/boot/vmlinuz-linux-libre" - -# boot message files -BOOTMESSAGE="/usr/share/mkbootcd/boot.msg" -OPTIONSBOOTMESSAGE="/usr/share/mkbootcd/options.msg" - -# menu.lst or isolinux.cfg file to use -ISOLINUXCFG="" -MENULST="" - -# Prompt on CD boot, defaulted to yes, 1=yes 0=no -PROMPT="1" - -# Name of the ISO, if empty Parabola GNU/Linux-libre is used if not set by a HOOK later -ISONAME="" - -# Timeout in seconds on CD boot, defaulted to 0, because we prompt by default -TIMEOUT="0" - -# Setting cdrecord options -DEVICE="" -SPEED="" -BLANKMODE="" diff --git a/libre/mkbootcd/options.msg b/libre/mkbootcd/options.msg deleted file mode 100644 index 63f56e755..000000000 --- a/libre/mkbootcd/options.msg +++ /dev/null @@ -1,6 +0,0 @@ ------------------------------------------------------------------------------- -Parabola GNU/Linux-libre options and troubleshooting: - -- If your system hangs during the boot process, any combinations of the - boot options noapic acpi=off pci=routeirq nosmp may be useful. ------------------------------------------------------------------------------- diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 0d1d14cd0..b2e362899 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Figue <ffigue at gmail> # Contributor (Parabola): fauno <fauno@kiwwwi.com.ar> # Contributor (Parabola): vando <facundo@esdebian.org> -# Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> # Thank you very much to the older contributors: # Contributor: evr <evanroman at gmail> # Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com> diff --git a/community/newton-dynamics/PKGBUILD b/libre/newton-dynamics-libre/PKGBUILD index 5456ebce7..1702cca70 100644 --- a/community/newton-dynamics/PKGBUILD +++ b/libre/newton-dynamics-libre/PKGBUILD @@ -1,45 +1,49 @@ +# $Id: PKGBUILD 84449 2013-02-19 04:20:15Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Josh Taylor (deficite) <joshtaylor.mail@gmail.com> # Contributor: Christophe Robin (bombstrike) <crobin@php.net> -pkgname=newton-dynamics -pkgver=2.33 -pkgrel=2 +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +_pkgname=newton-dynamics +pkgname=newton-dynamics-libre +pkgver=2.36 +pkgrel=1 pkgdesc="A simple physics API" arch=('i686' 'x86_64' 'mips64el') url="http://www.newtondynamics.com" license=('custom') depends=() -makedepends=('unrar') -source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar" - 'assert-fix.patch') -md5sums=('b8394c7c3f4e8a1bd41ffa07c5979a9e' - 'fa747c99d0516d66f03175fca1f1ba34') +makedepends=('unar') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar") +noextract=("newton-dynamics-${pkgver}.rar") +md5sums=('0dffa112d0a6ea39ad9e904e555da69a') build() { _srcdir="${srcdir}/newton-dynamics-${pkgver}" - [ "$CARCH" = "i686" ] && platform="linux32" - [ "$CARCH" = "x86_64" ] && platform="linux64" + [[ "$CARCH" = "i686" ]] && platform="linux32" + [[ "$CARCH" = "x86_64" ]] && platform="linux64" builddir="${_srcdir}/coreLibrary_200/projets/${platform}" # clean build directory - [ -d "${_srcdir}" ] && rm -Rf "${_srcdir}" + [[ -d "${_srcdir}" ]] && rm -Rf "${_srcdir}" # decompress package cd "${srcdir}" - unrar x "newton-dynamics-${pkgver}.rar" + unar "newton-dynamics-${pkgver}.rar" # needed for building mkdir -p "${_srcdir}/packages/${platform}" - - # patch issue with an _ASSERT call instead of _ASSERTE - cd "${_srcdir}/coreLibrary_200" - patch -p0 < "${srcdir}/assert-fix.patch" ## build lib cd "${builddir}" sed -i 's/ -o libNewton.so/ -lpthread -lstdc++ -o libNewton.so/' makefile + sed -i 's/Debug\.cpp.*$/Debug \\/g' makefile make +} +package() { install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a" install -D -m755 "${builddir}/libNewton.so" "${pkgdir}/usr/lib/libNewton.so" install -D -m644 "${_srcdir}/coreLibrary_200/source/newton/Newton.h" "${pkgdir}/usr/include/Newton.h" diff --git a/community/newton-dynamics/assert-fix.patch b/libre/newton-dynamics-libre/assert-fix.patch index 83dfdd790..83dfdd790 100644 --- a/community/newton-dynamics/assert-fix.patch +++ b/libre/newton-dynamics-libre/assert-fix.patch diff --git a/community/oss/PKGBUILD b/libre/oss-libre/PKGBUILD index f1a0c40c0..32ee9db2e 100644 --- a/community/oss/PKGBUILD +++ b/libre/oss-libre/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 92254 2013-06-03 11:15:27Z allan $ +# $Id: PKGBUILD 92058 2013-05-31 02:02:47Z seblu $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Florian Pritz <bluewind@xinu.at> # Contributor: Paulo Matias <matiasΘarchlinux-br·org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -pkgbase=oss -pkgname=oss -true && pkgname=(oss libflashsupport-oss) +pkgname=oss-libre pkgver=4.2_2007 pkgrel=4 arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +19,7 @@ source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_ "linux-3.8.patch" "oss.service" ) -md5sums=('26b9d6951f3eb2eac39a0f42f0dbdae7' +md5sums=('f995118db1759fee3bcd38483940da6f' 'b9a380a0ac8896390d71ac13676f27e1' '65f07fe241bfbf912f76d8b6d8f276b5' 'cd7f1dc6166bba8c94d96f3a28e948a5' @@ -38,12 +37,6 @@ build() { unset LIBRARIES export NO_WARNING_CHECKS=yes - # Compile libflashsupport.so only in packaging time, so we avoid - # conflicts with other packages and ease package management. - msg "Building libflashsupport.so." - cd oss/lib - gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so - msg "Preparing the build environment." cd "${srcdir}" @@ -87,12 +80,13 @@ build() { usr/lib/oss/cuckoo/Makefile } -package_oss() { - pkgdesc="Open Sound System UNIX audio architecture" - depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed') - optdepends=('gtk2: for graphical mixer (ossxmix)' - 'libflashsupport-oss: Adobe flash plugin support') - conflicts=('oss-linux' 'oss-linux-free' 'oss-testing') +package() { + pkgdesc="Open Sound System UNIX audio architecture, without nonfree libflashsupport-oss recommendation (built for the linux-libre-headers package)" + depends=('gcc' 'make' 'linux-libre-headers' 'libtool' 'sed') + optdepends=('gtk2: for graphical mixer (ossxmix)') + replaces=('oss') + conflicts=('oss' 'oss-linux' 'oss-linux-free' 'oss-testing') + provides=("oss=${pkgver}") backup=('usr/lib/oss/soundon.user') install=oss.install @@ -107,15 +101,4 @@ package_oss() { install -Dm644 "$srcdir/oss.service" usr/lib/systemd/system/oss.service } -package_libflashsupport-oss() { - pkgdesc="Adobe flash plugin support lib (OSSv4)" - conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') - depends=('oss') - - cd "${srcdir}/${_dir}" - - install -dm755 "$pkgdir/usr/lib" - ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" -} - # vim:set ts=2 sw=2 et: diff --git a/community/oss/linux-3.8.patch b/libre/oss-libre/linux-3.8.patch index 46200e01a..46200e01a 100644 --- a/community/oss/linux-3.8.patch +++ b/libre/oss-libre/linux-3.8.patch diff --git a/community/oss/oss.install b/libre/oss-libre/oss.install index 672d63644..9bd4e1fbc 100644 --- a/community/oss/oss.install +++ b/libre/oss-libre/oss.install @@ -11,11 +11,6 @@ post_install() { post_upgrade() { echo "Running OSS update script..." sh /usr/lib/oss/build/install.sh &>/dev/null - - if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then - echo "libflashsupport.so has been split into a seperate package." - echo "If you want flash to use oss, please install libflashsupport-oss" - fi } pre_remove() { diff --git a/community/oss/oss.service b/libre/oss-libre/oss.service index 0200d2477..0200d2477 100644 --- a/community/oss/oss.service +++ b/libre/oss-libre/oss.service diff --git a/community/oss/remove-hal.patch b/libre/oss-libre/remove-hal.patch index 27e2ef2de..27e2ef2de 100644 --- a/community/oss/remove-hal.patch +++ b/libre/oss-libre/remove-hal.patch diff --git a/community/oss/rm-init-scripts.patch b/libre/oss-libre/rm-init-scripts.patch index 981ff605f..981ff605f 100644 --- a/community/oss/rm-init-scripts.patch +++ b/libre/oss-libre/rm-init-scripts.patch diff --git a/community/oss/soundon.patch b/libre/oss-libre/soundon.patch index 4702b8680..4702b8680 100644 --- a/community/oss/soundon.patch +++ b/libre/oss-libre/soundon.patch diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index d5a1e561d..af130b5c0 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,19 +1,18 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=parabola-keyring -pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgver=$(LC_ALL=C date -u +%Y%m%d).1 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') url='https://projects.parabolagnulinux.org/hackers.git/' license=('GPL') install="${pkgname}.install" -source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" - "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig") +source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig}) package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}/${pkgname}-"* make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('ad747cf1f710e5962aa6b0931fcb580f' - 'c1030ca1c960d2ee6cfe11d798a7b471') +md5sums=('007c35459478f86484f66323bf90b1e0' + 'SKIP') diff --git a/libre/python2-bencode/PKGBUILD b/libre/python2-bencode/PKGBUILD new file mode 100644 index 000000000..762d55cad --- /dev/null +++ b/libre/python2-bencode/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=bencode +pkgname=python2-bencode +pkgver=1.0 +pkgdesc="BitTorrent bencode module as leight-weight, standalone package" +url="http://pypi.python.org/pypi/BitTorrent-bencode" +license=('custom:BitTorrent Open Source License') + +pkgrel=1 +arch=('any') +depends=('python2') +makedepends=('python2-distribute') +source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz + bittorrent-osl.txt) + +package(){ + cd "$srcdir/$_pkgname-$pkgver" + python2 setup.py install --root="$pkgdir" --optimize=1 + install -Dm644 "$srcdir"/bittorrent-osl.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +md5sums=('400dd42ff346eb7db91245403f8f2b7b' + '016d959cb9f7a319e48d9699c4ef2f42') diff --git a/libre/python2-bencode/bittorrent-osl.txt b/libre/python2-bencode/bittorrent-osl.txt new file mode 100644 index 000000000..f0625f45c --- /dev/null +++ b/libre/python2-bencode/bittorrent-osl.txt @@ -0,0 +1,510 @@ +BitTorrent Open Source License + +Version 1.1 + +This BitTorrent Open Source License (the "License") applies to the +BitTorrent client and related software products as well as any updates +or maintenance releases of that software ("BitTorrent Products") that +are distributed by BitTorrent, Inc. ("Licensor"). Any BitTorrent +Product licensed pursuant to this License is a Licensed +Product. Licensed Product, in its entirety, is protected by +U.S. copyright law. This License identifies the terms under which you +may use, copy, distribute or modify Licensed Product. + +Preamble + +This Preamble is intended to describe, in plain English, the nature +and scope of this License. However, this Preamble is not a part of +this license. The legal effect of this License is dependent only upon +the terms of the License and not this Preamble. + +This License complies with the Open Source Definition and is derived +from the Jabber Open Source License 1.0 (the "JOSL"), which has been +approved by Open Source Initiative. Sections 4(c) and 4(f)(iii) from +the JOSL have been deleted. + +This License provides that: + +1. You may use or give away the Licensed Product, alone or as a +component of an aggregate software distribution containing programs +from several different sources. No royalty or other fee is required. + +2. Both Source Code and executable versions of the Licensed Product, +including Modifications made by previous Contributors, are available +for your use. (The terms "Licensed Product," "Modifications," +"Contributors" and "Source Code" are defined in the License.) + +3. You are allowed to make Modifications to the Licensed Product, and +you can create Derivative Works from it. (The term "Derivative Works" +is defined in the License.) + +4. By accepting the Licensed Product under the provisions of this +License, you agree that any Modifications you make to the Licensed +Product and then distribute are governed by the provisions of this +License. In particular, you must make the Source Code of your +Modifications available to others free of charge and without a +royalty. + +5. You may sell, accept donations or otherwise receive compensation +for executable versions of a Licensed Product, without paying a +royalty or other fee to the Licensor or any Contributor, provided that +such executable versions contain your or another Contributor?s +material Modifications. For the avoidance of doubt, to the extent your +executable version of a Licensed Product does not contain your or +another Contributor?s material Modifications, you may not sell, accept +donations or otherwise receive compensation for such executable. + +You may use the Licensed Product for any purpose, but the Licensor is +not providing you any warranty whatsoever, nor is the Licensor +accepting any liability in the event that the Licensed Product doesn't +work properly or causes you any injury or damages. + +6. If you sublicense the Licensed Product or Derivative Works, you may +charge fees for warranty or support, or for accepting indemnity or +liability obligations to your customers. You cannot charge for, sell, +accept donations or otherwise receive compensation for the Source +Code. + +7. If you assert any patent claims against the Licensor relating to +the Licensed Product, or if you breach any terms of the License, your +rights to the Licensed Product under this License automatically +terminate. + +You may use this License to distribute your own Derivative Works, in +which case the provisions of this License will apply to your +Derivative Works just as they do to the original Licensed Product. + +Alternatively, you may distribute your Derivative Works under any +other OSI-approved Open Source license, or under a proprietary license +of your choice. If you use any license other than this License, +however, you must continue to fulfill the requirements of this License +(including the provisions relating to publishing the Source Code) for +those portions of your Derivative Works that consist of the Licensed +Product, including the files containing Modifications. + +New versions of this License may be published from time to time in +connection with new versions of a Licensed Product or otherwise. You +may choose to continue to use the license terms in this version of the +License for the Licensed Product that was originally licensed +hereunder, however, the new versions of this License will at all times +apply to new versions of the Licensed Product released by Licensor +after the release of the new version of this License. Only the +Licensor has the right to change the License terms as they apply to +the Licensed Product. + +This License relies on precise definitions for certain terms. Those +terms are defined when they are first used, and the definitions are +repeated for your convenience in a Glossary at the end of the License. + +License Terms + +1. Grant of License From Licensor. Subject to the terms and conditions +of this License, Licensor hereby grants you a world-wide, +royalty-free, non-exclusive license, subject to third party +intellectual property claims, to do the following: + +a. Use, reproduce, modify, display, perform, sublicense and distribute +any Modifications created by a Contributor or portions thereof, in +both Source Code or as an executable program, either on an unmodified +basis or as part of Derivative Works. + +b. Under claims of patents now or hereafter owned or controlled by +Contributor, to make, use, sell, offer for sale, have made, and/or +otherwise dispose of Modifications or portions thereof, but solely to +the extent that any such claim is necessary to enable you to make, +use, sell, offer for sale, have made, and/or otherwise dispose of +Modifications or portions thereof or Derivative Works thereof. + +2. Grant of License to Modifications From Contributor. "Modifications" +means any additions to or deletions from the substance or structure of +(i) a file containing a Licensed Product, or (ii) any new file that +contains any part of a Licensed Product. Hereinafter in this License, +the term "Licensed Product" shall include all previous Modifications +that you receive from any Contributor. Subject to the terms and +conditions of this License, By application of the provisions in +Section 4(a) below, each person or entity who created or contributed +to the creation of, and distributed, a Modification (a "Contributor") +hereby grants you a world-wide, royalty-free, non-exclusive license, +subject to third party intellectual property claims, to do the +following: + +a. Use, reproduce, modify, display, perform, sublicense and distribute +any Modifications created by such Contributor or portions thereof, in +both Source Code or as an executable program, either on an unmodified +basis or as part of Derivative Works. + +b. Under claims of patents now or hereafter owned or controlled by +Contributor, to make, use, sell, offer for sale, have made, and/or +otherwise dispose of Modifications or portions thereof, but solely to +the extent that any such claim is necessary to enable you to make, +use, sell, offer for sale, have made, and/or otherwise dispose of +Modifications or portions thereof or Derivative Works thereof. + +3. Exclusions From License Grant. Nothing in this License shall be +deemed to grant any rights to trademarks, copyrights, patents, trade +secrets or any other intellectual property of Licensor or any +Contributor except as expressly stated herein. No patent license is +granted separate from the Licensed Product, for code that you delete +from the Licensed Product, or for combinations of the Licensed Product +with other software or hardware. No right is granted to the trademarks +of Licensor or any Contributor even if such marks are included in the +Licensed Product. Nothing in this License shall be interpreted to +prohibit Licensor from licensing under different terms from this +License any code that Licensor otherwise would have a right to +license. As an express condition for your use of the Licensed Product, +you hereby agree that you will not, without the prior written consent +of Licensor, use any trademarks, copyrights, patents, trade secrets or +any other intellectual property of Licensor or any Contributor except +as expressly stated herein. For the avoidance of doubt and without +limiting the foregoing, you hereby agree that you will not use or +display any trademark of Licensor or any Contributor in any domain +name, directory filepath, advertisement, link or other reference to +you in any manner or in any media. + +4. Your Obligations Regarding Distribution. + +a. Application of This License to Your Modifications. As an express +condition for your use of the Licensed Product, you hereby agree that +any Modifications that you create or to which you contribute, and +which you distribute, are governed by the terms of this License +including, without limitation, Section 2. Any Modifications that you +create or to which you contribute may be distributed only under the +terms of this License or a future version of this License released +under Section 7. You must include a copy of this License with every +copy of the Modifications you distribute. You agree not to offer or +impose any terms on any Source Code or executable version of the +Licensed Product or Modifications that alter or restrict the +applicable version of this License or the recipients' rights +hereunder. However, you may include an additional document offering +the additional rights described in Section 4(d). + +b. Availability of Source Code. You must make available, without +charge, under the terms of this License, the Source Code of the +Licensed Product and any Modifications that you distribute, either on +the same media as you distribute any executable or other form of the +Licensed Product, or via a mechanism generally accepted in the +software development community for the electronic transfer of data (an +"Electronic Distribution Mechanism"). The Source Code for any version +of Licensed Product or Modifications that you distribute must remain +available for as long as any executable or other form of the Licensed +Product is distributed by you. You are responsible for ensuring that +the Source Code version remains available even if the Electronic +Distribution Mechanism is maintained by a third party. + +c. Intellectual Property Matters. + +i. Third Party Claims. If you have knowledge that a license to a third +party's intellectual property right is required to exercise the rights +granted by this License, you must include a text file with the Source +Code distribution titled "LEGAL" that describes the claim and the +party making the claim in sufficient detail that a recipient will know +whom to contact. If you obtain such knowledge after you make any +Modifications available as described in Section 4(b), you shall +promptly modify the LEGAL file in all copies you make available +thereafter and shall take other steps (such as notifying appropriate +mailing lists or newsgroups) reasonably calculated to inform those who +received the Licensed Product from you that new knowledge has been +obtained. + +ii. Contributor APIs. If your Modifications include an application +programming interface ("API") and you have knowledge of patent +licenses that are reasonably necessary to implement that API, you must +also include this information in the LEGAL file. + +iii. Representations. You represent that, except as disclosed pursuant +to 4(c)(i) above, you believe that any Modifications you distribute +are your original creations and that you have sufficient rights to +grant the rights conveyed by this License. + +d. Required Notices. You must duplicate this License in any +documentation you provide along with the Source Code of any +Modifications you create or to which you contribute, and which you +distribute, wherever you describe recipients' rights relating to +Licensed Product. You must duplicate the notice contained in Exhibit A +(the "Notice") in each file of the Source Code of any copy you +distribute of the Licensed Product. If you created a Modification, you +may add your name as a Contributor to the Notice. If it is not +possible to put the Notice in a particular Source Code file due to its +structure, then you must include such Notice in a location (such as a +relevant directory file) where a user would be likely to look for such +a notice. You may choose to offer, and charge a fee for, warranty, +support, indemnity or liability obligations to one or more recipients +of Licensed Product. However, you may do so only on your own behalf, +and not on behalf of the Licensor or any Contributor. You must make it +clear that any such warranty, support, indemnity or liability +obligation is offered by you alone, and you hereby agree to indemnify +the Licensor and every Contributor for any liability incurred by the +Licensor or such Contributor as a result of warranty, support, +indemnity or liability terms you offer. + +e. Distribution of Executable Versions. You may distribute Licensed +Product as an executable program under a license of your choice that +may contain terms different from this License provided (i) you have +satisfied the requirements of Sections 4(a) through 4(d) for that +distribution, (ii) you include a conspicuous notice in the executable +version, related documentation and collateral materials stating that +the Source Code version of the Licensed Product is available under the +terms of this License, including a description of how and where you +have fulfilled the obligations of Section 4(b), and (iii) you make it +clear that any terms that differ from this License are offered by you +alone, not by Licensor or any Contributor. You hereby agree to +indemnify the Licensor and every Contributor for any liability +incurred by Licensor or such Contributor as a result of any terms you +offer. + +f. Distribution of Derivative Works. You may create Derivative Works +(e.g., combinations of some or all of the Licensed Product with other +code) and distribute the Derivative Works as products under any other +license you select, with the proviso that the requirements of this +License are fulfilled for those portions of the Derivative Works that +consist of the Licensed Product or any Modifications thereto. + +g. Compensation for Distribution of Executable Versions of Licensed +Products, Modifications or Derivative Works. Notwithstanding any +provision of this License to the contrary, by distributing, selling, +licensing, sublicensing or otherwise making available any Licensed +Product, or Modification or Derivative Work thereof, you and Licensor +hereby acknowledge and agree that you may sell, license or sublicense +for a fee, accept donations or otherwise receive compensation for +executable versions of a Licensed Product, without paying a royalty or +other fee to the Licensor or any other Contributor, provided that such +executable versions (i) contain your or another Contributor?s material +Modifications, or (ii) are otherwise material Derivative Works. For +purposes of this License, an executable version of the Licensed +Product will be deemed to contain a material Modification, or will +otherwise be deemed a material Derivative Work, if (a) the Licensed +Product is modified with your own or a third party?s software programs +or other code, and/or the Licensed Product is combined with a number +of your own or a third party?s software programs or code, +respectively, and (b) such software programs or code add or contribute +material value, functionality or features to the License Product. For +the avoidance of doubt, to the extent your executable version of a +Licensed Product does not contain your or another Contributor?s +material Modifications or is otherwise not a material Derivative Work, +in each case as contemplated herein, you may not sell, license or +sublicense for a fee, accept donations or otherwise receive +compensation for such executable. Additionally, without limitation of +the foregoing and notwithstanding any provision of this License to the +contrary, you cannot charge for, sell, license or sublicense for a +fee, accept donations or otherwise receive compensation for the Source +Code. + +5. Inability to Comply Due to Statute or Regulation. If it is +impossible for you to comply with any of the terms of this License +with respect to some or all of the Licensed Product due to statute, +judicial order, or regulation, then you must (i) comply with the terms +of this License to the maximum extent possible, (ii) cite the statute +or regulation that prohibits you from adhering to the License, and +(iii) describe the limitations and the code they affect. Such +description must be included in the LEGAL file described in Section +4(d), and must be included with all distributions of the Source +Code. Except to the extent prohibited by statute or regulation, such +description must be sufficiently detailed for a recipient of ordinary +skill at computer programming to be able to understand it. + +6. Application of This License. This License applies to code to which +Licensor or Contributor has attached the Notice in Exhibit A, which is +incorporated herein by this reference. + +7. Versions of This License. + +a. New Versions. Licensor may publish from time to time revised and/or +new versions of the License. + +b. Effect of New Versions. Once Licensed Product has been published +under a particular version of the License, you may always continue to +use it under the terms of that version, provided that any such license +be in full force and effect at the time, and has not been revoked or +otherwise terminated. You may also choose to use such Licensed Product +under the terms of any subsequent version (but not any prior version) +of the License published by Licensor. No one other than Licensor has +the right to modify the terms applicable to Licensed Product created +under this License. + +c. Derivative Works of this License. If you create or use a modified +version of this License, which you may do only in order to apply it to +software that is not already a Licensed Product under this License, +you must rename your license so that it is not confusingly similar to +this License, and must make it clear that your license contains terms +that differ from this License. In so naming your license, you may not +use any trademark of Licensor or any Contributor. + +8. Disclaimer of Warranty. LICENSED PRODUCT IS PROVIDED UNDER THIS +LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER +EXPRESS OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE +LICENSED PRODUCT IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A +PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE +QUALITY AND PERFORMANCE OF THE LICENSED PRODUCT IS WITH YOU. SHOULD +LICENSED PRODUCT PROVE DEFECTIVE IN ANY RESPECT, YOU (AND NOT THE +LICENSOR OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY +SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY +CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF LICENSED +PRODUCT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +9. Termination. + +a. Automatic Termination Upon Breach. This license and the rights +granted hereunder will terminate automatically if you fail to comply +with the terms herein and fail to cure such breach within ten (10) +days of being notified of the breach by the Licensor. For purposes of +this provision, proof of delivery via email to the address listed in +the ?WHOIS? database of the registrar for any website through which +you distribute or market any Licensed Product, or to any alternate +email address which you designate in writing to the Licensor, shall +constitute sufficient notification. All sublicenses to the Licensed +Product that are properly granted shall survive any termination of +this license so long as they continue to complye with the terms of +this License. Provisions that, by their nature, must remain in effect +beyond the termination of this License, shall survive. + +b. Termination Upon Assertion of Patent Infringement. If you initiate +litigation by asserting a patent infringement claim (excluding +declaratory judgment actions) against Licensor or a Contributor +(Licensor or Contributor against whom you file such an action is +referred to herein as Respondent) alleging that Licensed Product +directly or indirectly infringes any patent, then any and all rights +granted by such Respondent to you under Sections 1 or 2 of this +License shall terminate prospectively upon sixty (60) days notice from +Respondent (the "Notice Period") unless within that Notice Period you +either agree in writing (i) to pay Respondent a mutually agreeable +reasonably royalty for your past or future use of Licensed Product +made by such Respondent, or (ii) withdraw your litigation claim with +respect to Licensed Product against such Respondent. If within said +Notice Period a reasonable royalty and payment arrangement are not +mutually agreed upon in writing by the parties or the litigation claim +is not withdrawn, the rights granted by Licensor to you under Sections +1 and 2 automatically terminate at the expiration of said Notice +Period. + +c. Reasonable Value of This License. If you assert a patent +infringement claim against Respondent alleging that Licensed Product +directly or indirectly infringes any patent where such claim is +resolved (such as by license or settlement) prior to the initiation of +patent infringement litigation, then the reasonable value of the +licenses granted by said Respondent under Sections 1 and 2 shall be +taken into account in determining the amount or value of any payment +or license. + +d. No Retroactive Effect of Termination. In the event of termination +under Sections 9(a) or 9(b) above, all end user license agreements +(excluding licenses to distributors and resellers) that have been +validly granted by you or any distributor hereunder prior to +termination shall survive termination. + +10. Limitation of Liability. UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL +THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, +SHALL THE LICENSOR, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF LICENSED +PRODUCT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY +PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES +OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF +GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND +ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE +BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF +LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY +RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW +PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE +EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO +THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +11. Responsibility for Claims. As between Licensor and Contributors, +each party is responsible for claims and damages arising, directly or +indirectly, out of its utilization of rights under this License. You +agree to work with Licensor and Contributors to distribute such +responsibility on an equitable basis. Nothing herein is intended or +shall be deemed to constitute any admission of liability. + +12. U.S. Government End Users. The Licensed Product is a commercial +item, as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), +consisting of commercial computer software and commercial computer +software documentation, as such terms are used in 48 C.F.R. 12.212 +(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 +C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government +End Users acquire Licensed Product with only those rights set forth +herein. + +13. Miscellaneous. This License represents the complete agreement +concerning the subject matter hereof. If any provision of this License +is held to be unenforceable, such provision shall be reformed only to +the extent necessary to make it enforceable. This License shall be +governed by California law provisions (except to the extent applicable +law, if any, provides otherwise), excluding its conflict-of-law +provisions. You expressly agree that in any litigation relating to +this license the losing party shall be responsible for costs +including, without limitation, court costs and reasonable attorneys +fees and expenses. The application of the United Nations Convention on +Contracts for the International Sale of Goods is expressly +excluded. Any law or regulation that provides that the language of a +contract shall be construed against the drafter shall not apply to +this License. + +14. Definition of You in This License. You throughout this License, +whether in upper or lower case, means an individual or a legal entity +exercising rights under, and complying with all of the terms of, this +License or a future version of this License issued under Section +7. For legal entities, you includes any entity that controls, is +controlled by, is under common control with, or affiliated with, +you. For purposes of this definition, control means (i) the power, +direct or indirect, to cause the direction or management of such +entity, whether by contract or otherwise, or (ii) ownership of fifty +percent (50%) or more of the outstanding shares, or (iii) beneficial +ownership of such entity. You are responsible for advising any +affiliated entity of the terms of this License, and that any rights or +privileges derived from or obtained by way of this License are subject +to the restrictions outlined herein. + +15. Glossary. All defined terms in this License that are used in more +than one Section of this License are repeated here, in alphabetical +order, for the convenience of the reader. The Section of this License +in which each defined term is first used is shown in parentheses. + +Contributor: Each person or entity who created or contributed to the +creation of, and distributed, a Modification. (See Section 2) + +Derivative Works: That term as used in this License is defined under +U.S. copyright law. (See Section 1(b)) + +License: This BitTorrent Open Source License. (See first paragraph of License) + +Licensed Product: Any BitTorrent Product licensed pursuant to this +License. The term "Licensed Product" includes all previous +Modifications from any Contributor that you receive. (See first +paragraph of License and Section 2) + +Licensor: BitTorrent, Inc. (See first paragraph of License) + +Modifications: Any additions to or deletions from the substance or +structure of (i) a file containing Licensed Product, or (ii) any new +file that contains any part of Licensed Product. (See Section 2) + +Notice: The notice contained in Exhibit A. (See Section 4(e)) + +Source Code: The preferred form for making modifications to the +Licensed Product, including all modules contained therein, plus any +associated interface definition files, scripts used to control +compilation and installation of an executable program, or a list of +differential comparisons against the Source Code of the Licensed +Product. (See Section 1(a)) + +You: This term is defined in Section 14 of this License. + +EXHIBIT A + +The Notice below must appear in each file of the Source Code of any +copy you distribute of the Licensed Product or any +hereto. Contributors to any Modifications may add their own copyright +notices to identify their own contributions. + +License: + +The contents of this file are subject to the BitTorrent Open Source +License Version 1.0 (the License). You may not copy or use this file, +in either source code or executable form, except in compliance with +the License. You may obtain a copy of the License at +http://www.bittorrent.com/license/. + +Software distributed under the License is distributed on an AS IS +basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See +the License for the specific language governing rights and limitations +under the License. + +BitTorrent, Inc. diff --git a/libre/python2-cssmin-fredj/PKGBUILD b/libre/python2-cssmin-fredj/PKGBUILD index 0f155de89..ba21b8fc4 100644 --- a/libre/python2-cssmin-fredj/PKGBUILD +++ b/libre/python2-cssmin-fredj/PKGBUILD @@ -4,14 +4,13 @@ _pkgname=python2-cssmin pkgname=python2-cssmin-fredj pkgver=0.1.4.git4 # 0.1.4.git<number of commits after 0.1.4> _gitver='commit=3422b9962c5a6c2adb9597f418131d73e991c9b6' -pkgdesc="Provides a country field for Django models" -license=('custom:MIT') -url="http://bitbucket.org/smileychris/django-countries/" - +pkgdesc="A Python port of the YUI CSS compression algorithm" +license=('custom:MIT' 'custom:BSD3') +url="https://github.com/fredj/cssmin" provides=("$_pkgname=$pkgver") conflicts=("$_pkgname") -pkgrel=1 +pkgrel=2 arch=(any) makedepends=('python2-distribute') diff --git a/libre/python2-jsmin/PKGBUILD b/libre/python2-jsmin/PKGBUILD new file mode 100644 index 000000000..5c7646ec2 --- /dev/null +++ b/libre/python2-jsmin/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> + +_pkgname=jsmin +pkgname=python2-jsmin +pkgver=2.0.3 +pkgdesc="JavaScript minifier" +url="https://bitbucket.org/dcs/jsmin" +license=('MIT') + +pkgrel=1 +arch=('any') +depends=('python2') +makedepends=('python2-distribute') +source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz) + +build() { + cd "$srcdir/$_pkgname-$pkgver" + sed -rn 's/^#\s?//p' jsmin/__init__.py > license.txt +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + python2 setup.py install --root="$pkgdir" --optimize=1 + install -Dm644 license.txt "$pkgdir"/usr/share/licenses/$pkgname/LICENSE +} + +md5sums=('6bdce452c7508d9bd11b133e965fb64e') diff --git a/community/tomoyo-tools/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD index bb2f20f64..02a181b55 100644 --- a/community/tomoyo-tools/PKGBUILD +++ b/libre/tomoyo-tools-libre/PKGBUILD @@ -1,25 +1,30 @@ -# $Id: PKGBUILD 92639 2013-06-10 09:54:10Z spupykin $ +# $Id: PKGBUILD 92638 2013-06-10 09:53:54Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> -pkgname=tomoyo-tools +_pkgname=tomoyo-tools +pkgname=tomoyo-tools-libre _basever=2.5.0 _timestamp=20130406 _file=53357 pkgver=${_basever}.${_timestamp} pkgrel=1 -pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2' +pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2 (built for the linux-libre kernel package)' arch=('i686' 'x86_64' 'mips64el') url='http://tomoyo.sourceforge.jp' #url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818' license=('GPL') -depends=('ncurses' 'linux>=3.2') +depends=('ncurses' 'linux-libre>=3.2') +replaces=${_pkgname} +conflicts=${_pkgname} +provides=${_pkgname}=${pkgver} install=tomoyo-tools.install -source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${pkgname}-${_basever}-${_timestamp}.tar.gz") +source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/${_file}/${_pkgname}-${_basever}-${_timestamp}.tar.gz") md5sums=('8888f83fcb87823d714ff551e8680d0d') prepare() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${_pkgname}" sed -i \ -e 's|usr/sbin|usr/bin|g' \ -e 's|sbin|usr/bin|g' \ @@ -27,11 +32,11 @@ prepare() { } build() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${_pkgname}" make USRSBINDIR=/usr/bin SBINDIR=/usr/bin } package() { - cd "${srcdir}/${pkgname}" + cd "${srcdir}/${_pkgname}" make USRSBINDIR=/usr/bin SBINDIR=/usr/bin INSTALLDIR="${pkgdir}" install } diff --git a/community/tomoyo-tools/tomoyo-tools.install b/libre/tomoyo-tools-libre/tomoyo-tools.install index 8f769d0db..c23df1212 100644 --- a/community/tomoyo-tools/tomoyo-tools.install +++ b/libre/tomoyo-tools-libre/tomoyo-tools.install @@ -1,6 +1,6 @@ post_install () { echo - echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/sbin/init' to the kernel" + echo " * To enable TOMOYO Linux, append 'security=tomoyo TOMOYO_trigger=/usr/bin/init' to the kernel" echo " boot options and initialize policy with this command:" echo " /usr/lib/tomoyo/init_policy" echo diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index be76b876e..d1f32979d 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92980 2013-06-21 09:45:26Z tpowa $ +# $Id: PKGBUILD 93220 2013-06-28 18:55:23Z foutrelis $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=24 +pkgrel=25 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' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index 780c957b8..caa3016d1 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92982 2013-06-21 09:46:01Z tpowa $ +# $Id: PKGBUILD 93222 2013-06-28 18:56:50Z foutrelis $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.9-LIBRE -pkgrel=3 +pkgrel=4 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD index c6d47275d..5e11fd6df 100644 --- a/libre/virtualbox-libre-modules/PKGBUILD +++ b/libre/virtualbox-libre-modules/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 93048 2013-06-23 10:27:06Z bpiotrowski $ +# $Id: PKGBUILD 93205 2013-06-28 17:53:08Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> -# Maintainer: Sébastien Luttringer <seblu@archlinux.org> +# Maintainer: Sébastien Luttringer # Maintainer (Parabola): Jorge López <jorginho@lavabit.com> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgbase=virtualbox-libre-modules pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules') pkgver=4.2.14 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -19,6 +19,9 @@ makedepends=('linux-libre' 'sed' 'bc') +# remember to also adjust the .install files and the package deps below +_extramodules=extramodules-3.9-LIBRE + build() { _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/') _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version) diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD index 5241ea5e8..0d3f55edc 100644 --- a/libre/xarchiver-libre/PKGBUILD +++ b/libre/xarchiver-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=xarchiver pkgname=xarchiver-libre pkgver=0.5.2 -pkgrel=5 +pkgrel=5.1 pkgdesc="GTK+ frontend to various command line archivers" arch=('i686' 'x86_64' 'mips64el') url="http://xarchiver.sourceforge.net" @@ -21,7 +21,7 @@ optdepends=('tar: TAR support' 'bzip2: BZIP2 support' 'zip: ZIP support' 'unzip: ZIP support' - 'ununrar: RAR support' + 'unar: RAR support' 'p7zip: 7z support' 'arj: ARJ support' 'lha: LHA support' diff --git a/community/xbmc/ChangeLog b/libre/xbmc-libre/ChangeLog index 66ae97e3b..66ae97e3b 100644 --- a/community/xbmc/ChangeLog +++ b/libre/xbmc-libre/ChangeLog diff --git a/community/xbmc/PKGBUILD b/libre/xbmc-libre/PKGBUILD index 06bdca011..37fae91a9 100644 --- a/community/xbmc/PKGBUILD +++ b/libre/xbmc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92502 2013-06-07 09:29:03Z tomegun $ +# $Id: PKGBUILD 92439 2013-06-05 11:42:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> @@ -7,10 +7,11 @@ _prefix=/usr -pkgname=xbmc +_pkgname=xbmc +pkgname=xbmc-libre pkgver=12.2 -pkgrel=4 -pkgdesc="A software media player and entertainment hub for digital media" +pkgrel=4.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') @@ -27,9 +28,12 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' 'lirc: remote controller support' 'udisks: automount external drives' 'upower: used to trigger suspend functionality' - 'unrar: access compressed files without unpacking them' + 'libarchive: access compressed files without unpacking them' 'xorg-xinit: autostart xbmc') -install="${pkgname}.install" +install="${_pkgname}.install" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz" "xbmc.service") md5sums=('489f3877decae4e265ece54f9eaef0ba' @@ -101,9 +105,9 @@ package() { install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" # Licenses - install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}" + install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${_pkgname}" for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" + mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${_pkgname}" done # systemd stuff diff --git a/community/xbmc/xbmc.install b/libre/xbmc-libre/xbmc.install index b104b33e8..b104b33e8 100644 --- a/community/xbmc/xbmc.install +++ b/libre/xbmc-libre/xbmc.install diff --git a/community/xbmc/xbmc.service b/libre/xbmc-libre/xbmc.service index 431582f1b..431582f1b 100644 --- a/community/xbmc/xbmc.service +++ b/libre/xbmc-libre/xbmc.service diff --git a/libre/xtensa-unknown-elf-binutils/PKGBUILD b/libre/xtensa-unknown-elf-binutils/PKGBUILD new file mode 100644 index 000000000..deb8d4b0e --- /dev/null +++ b/libre/xtensa-unknown-elf-binutils/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 182407 2013-04-10 07:34:20Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +_pkgname=binutils +_target="xtensa-unknown-elf" + +pkgname=${_target}-binutils +pkgver=2.23.2 +pkgrel=2.4 +pkgdesc="A set of programs to assemble and manipulate binary and object files for the Xtensa architecture" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gnu.org/software/binutils/" +license=('GPL') +groups=("${_target}-base-devel") +depends=('glibc>=2.17' 'zlib') +options=('!libtool' '!distcc' '!ccache') +install=${_target}-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') + +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 + + mkdir ${srcdir}/binutils-build +} + +build() { + cd ${srcdir}/binutils-build + + ${srcdir}/binutils-${pkgver}/configure --prefix=/usr \ + --target=${_target} \ + --disable-nls \ + --with-lib-path=/usr/lib:/usr/local/lib \ + --with-bugurl=https://labs.parabola.nu/ \ + --enable-shared \ + --disable-werror --disable-multilib + + # check the host environment and makes sure all the necessary tools are available + make configure-host + + make tooldir=/usr +} + +package() { + cd ${srcdir}/binutils-build + make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install + + # Remove unwanted files + rm ${pkgdir}/usr/share/man/man1/${_target}-{dlltool,nlmconv,windres,windmc}* + + # Remove unnecessary files and folders + rm $pkgdir/usr/bin/{a{r,s},nm,obj{copy,dump},ranlib,strip} + rm $pkgdir/usr/lib/libiberty.a + rm $pkgdir/usr/$CHOST/${_target}/include/* && rmdir $pkgdir/usr/$CHOST/${_target}/include + rm $pkgdir/usr/share/info/* && rmdir $pkgdir/usr/share/info +} diff --git a/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch b/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch new file mode 100644 index 000000000..38dc19fb0 --- /dev/null +++ b/libre/xtensa-unknown-elf-binutils/binutils-2.23.2-texinfo-5.0.patch @@ -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/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install b/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install new file mode 100644 index 000000000..9de0533ee --- /dev/null +++ b/libre/xtensa-unknown-elf-binutils/xtensa-unknown-elf-binutils.install @@ -0,0 +1,17 @@ +infodir=usr/share/info +filelist=(as.info bfd.info binutils.info gprof.info ld.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +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/libre/xtensa-unknown-elf-gcc/PKGBUILD b/libre/xtensa-unknown-elf-gcc/PKGBUILD new file mode 100644 index 000000000..797f67f9e --- /dev/null +++ b/libre/xtensa-unknown-elf-gcc/PKGBUILD @@ -0,0 +1,136 @@ +# $Id: PKGBUILD 186915 2013-05-31 23:25:14Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +# Contributor (Parabola): Márcio Silva <coadde@lavabit.com> + +_pkgname=gcc +_target="xtensa-unknown-elf" +_sysroot="/usr/$CHOST/${_target}" + +pkgname=${_target}-gcc +pkgver=4.8.1 +pkgrel=1 +pkgdesc="The GNU Compiler Collection for Xtensa processors" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL' 'LGPL' 'FDL' 'custom') +url="http://gcc.gnu.org" +makedepends=("binutils>=2.23" 'libmpc' 'cloog' 'gcc-ada' 'doxygen') +checkdepends=('dejagnu' 'inetutils') +options=('!libtool' '!emptydirs') +source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) +md5sums=('3b2386c114cd74185aa3754b58a79304') + +_basedir=gcc-${pkgver} + +prepare() { + cd ${srcdir}/${_basedir} + + # Do not run fixincludes + sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + + # Parabola installs x86_64 libraries /lib + [[ $CARCH == "x86_64" ]] && sed -i '/m64=/s/lib64/lib/' gcc/config/i386/t-linux64 + + echo ${pkgver} > gcc/BASE-VER + + mkdir ${srcdir}/gcc-build +} + +build() { + cd ${srcdir}/gcc-build + + ${srcdir}/${_basedir}/configure --prefix=/home/marcio/src/xtensa-elf/tools \ + --target=${_target} \ + --disable-multilib \ + --disable-nls \ + --disable-shared \ + --disable-threads \ + --enable-languages=c \ + --disable-libquadmath \ + --disable-libssp \ + --with-newlib +# --disable-werror \ +# --libdir=/usr/lib --libexecdir=/usr/lib \ +# --mandir=/usr/share/man --infodir=/usr/share/info \ +# --with-bugurl=https://labs.parabola.nu/ \ +# --disable-shared --enable-threads=posix \ +# --with-system-zlib --enable-__cxa_atexit \ +# --disable-libunwind-exceptions --enable-clocale=gnu \ +# --disable-libstdcxx-pch \ +# --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 \ +# --with-linker-hash-style=gnu --disable-install-libiberty \ +# --enable-checking=release \ + make all-gcc + + # make documentation + cd ${_target}/libstdc++-v3 + make doc-man-doxygen +} + +package() +{ + pkgdesc="The GNU Compiler Collection" + depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.23' 'libmpc' 'cloog') + groups=("${_target}-devel") + install=${_target}-gcc.install + + cd ${srcdir}/gcc-build + + make -j1 DESTDIR=${pkgdir} install-gcc + + 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/{{${_target}-,}gfortran,{${_target}-,}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/${_target}-/${pkgver}/{ada{include,lib},finclude,include/objc} + rm $pkgdir/usr/lib/gcc/${_target}-/${pkgver}/{cc1obj{,plus},f951,gnat1,go1} + rm $pkgdir/usr/lib/gcc/${_target}-/${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 + + # many packages expect this symlinks + ln -s ${_target}-gcc ${pkgdir}/usr/bin/${_target}-cc + + # POSIX conformance launcher scripts for c89 and c99 + cat > $pkgdir/usr/bin/${_target}-c89 <<"EOF" +#!/bin/sh +fl="-std=c89" +for opt; do + case "$opt" in + -ansi|-std=c89|-std=iso9899:1990) fl="";; + -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2 + exit 1;; + esac +done +exec ${_target}-gcc $fl ${1+"$@"} +EOF + + cat > $pkgdir/usr/bin/${_target}-c99 <<"EOF" +#!/bin/sh +fl="-std=c99" +for opt; do + case "$opt" in + -std=c99|-std=iso9899:1999) fl="";; + -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2 + exit 1;; + esac +done +exec ${_target}-gcc $fl ${1+"$@"} +EOF + + chmod 755 $pkgdir/usr/bin/${_target}-c{8,9}9 + + + # Install Runtime Library Exception + install -Dm644 ${srcdir}/${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/${_target}/RUNTIME.LIBRARY.EXCEPTION +} diff --git a/~brendan/guile/guile.install b/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install index ed113ab8f..3407a5e1f 100644 --- a/~brendan/guile/guile.install +++ b/libre/xtensa-unknown-elf-gcc/xtensa-unknown-elf-gcc.install @@ -1,11 +1,10 @@ infodir=usr/share/info -filelist=(guile.info - r5rs.info) +filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info) post_install() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null + install-info $infodir/$file.gz $infodir/dir 2> /dev/null done } @@ -16,8 +15,6 @@ post_upgrade() { pre_remove() { [ -x usr/bin/install-info ] || return 0 for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/libre/xtensa-unknown-elf-glibc/PKGBUILD b/libre/xtensa-unknown-elf-glibc/PKGBUILD new file mode 100644 index 000000000..0a459b10b --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/PKGBUILD @@ -0,0 +1,155 @@ +# $Id: PKGBUILD 186623 2013-05-30 07:47:03Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc +# NOTE: valgrind requires rebuilt with each major glibc version + +_pkgname=glibc +_target="xtensa-unknown-elf" +_sysroot="usr/$CHOST/${_target}" + +pkgname=${_target}-glibc +pkgver=2.17 +pkgrel=6 +pkgdesc="GNU C Library for Xtensa processors" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/libc" +license=('GPL' 'LGPL') +groups=('base') +depends=("${_target}-linux-api-headers>=3.7" 'tzdata' 'filesystem>=2013.01') +makedepends=('gcc>=4.7') +backup=(etc/gai.conf + etc/locale.gen + etc/nscd.conf) +options=('!strip') +install=${_target}-glibc.install +source=(http://ftp.gnu.org/gnu/libc/${_pkgname}-${pkgver}.tar.xz{,.sig} + glibc-2.17-sync-with-linux37.patch + glibc-2.17-getaddrinfo-stack-overflow.patch + glibc-2.17-regexp-matcher-overrun.patch + nscd.service + nscd.tmpfiles + locale.gen.txt + locale-gen) +md5sums=('87bf675c8ee523ebda4803e8e1cec638' + 'SKIP' + 'fb99380d94598cc76d793deebf630022' + '56d5f2c09503a348281a20ae404b7de3' + '200acc05961b084ee00dde919e64f82d' + 'c1e07c0bec0fe89791bfd9d13fc85edf' + 'bccbe5619e75cf1d97312ec3681c605c' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') + + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + # combination of upstream commits 318cd0b, b540704 and fc1abbe + patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch + + # CVE-2013-1914 - upstream commit 1cef1b19 + patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch + + # CVE-2013-0242 - upstream commit a445af0b + patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch + + cd ${srcdir} + mkdir glibc-build + cd glibc-build + + if [[ ${CARCH} = "i686" ]]; then + # Hack to fix NPTL issues with Xen, only required on 32bit platforms + # TODO: make separate glibc-xen package for i686 + export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" + fi + + echo "slibdir=/usr/lib" >> configparms + echo "sbindir=/usr/bin" >> configparms + echo "rootsbindir=/usr/bin" >> configparms + + # remove hardening options for building libraries + CFLAGS=${CFLAGS/-fstack-protector/} + CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/} + + ${srcdir}/${_pkgname}-${pkgver}/configure --prefix=/usr \ + --libdir=/usr/lib --libexecdir=/usr/lib \ + --build=$CHOST --host=$_target \ + --with-headers=/${_sysroot}/include \ + --with-bugurl=https://labs.parabola.nu/ \ + --enable-add-ons=nptl,libidn \ + --enable-obsolete-rpc \ + --enable-kernel=2.6.32 \ + --enable-bind-now --disable-profile \ + --enable-stackguard-randomization \ + --enable-multi-arch + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms + make + + # re-enable hardening for programs + sed -i "/build-programs=/s#no#yes#" configparms + echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '4,6d' configparms +} + +check() { + # bug to file - the linker commands need to be reordered + LDFLAGS=${LDFLAGS/--as-needed,/} + + cd ${srcdir}/glibc-build + make check +} + +package() { + cd ${srcdir}/glibc-build + + install -dm755 ${pkgdir}/etc + touch ${pkgdir}/etc/ld.so.conf + + make install_root=${pkgdir} install + + rm -f ${pkgdir}/etc/ld.so.{cache,conf} + + install -dm755 ${pkgdir}/usr/lib/{locale,systemd/system,tmpfiles.d} + + install -m644 ${srcdir}/${_pkgname}-${pkgver}/nscd/nscd.conf ${pkgdir}/etc/nscd.conf + install -m644 ${srcdir}/nscd.service ${pkgdir}/usr/lib/systemd/system + install -m644 ${srcdir}/nscd.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/nscd.conf + + install -m644 ${srcdir}/${_pkgname}-${pkgver}/posix/gai.conf ${pkgdir}/etc/gai.conf + + install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/bin + + # create /etc/locale.gen + install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen + sed -e '1,3d' -e 's|/| |g' -e 's|\\| |g' -e 's|^|#|g' \ + ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen + + # Do not strip the following files for improved debugging support + # ("improved" as in not breaking gdb and valgrind...): + # ld-${pkgver}.so + # libc-${pkgver}.so + # libpthread-${pkgver}.so + # libthread_db-1.0.so + + cd $pkgdir + strip $STRIP_BINARIES usr/bin/{gencat,getconf,getent,iconv,iconvconfig} \ + usr/bin/{ldconfig,locale,localedef,nscd,makedb} \ + usr/bin/{pcprofiledump,pldd,rpcgen,sln,sprof} \ + usr/lib/getconf/* + [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4 + + strip $STRIP_STATIC usr/lib/*.a + + strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ + usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ + usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ + usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ + usr/lib/{pt_chown,{audit,gconv}/*.so} +} diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch new file mode 100644 index 000000000..aa916ac2c --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-getaddrinfo-stack-overflow.patch @@ -0,0 +1,47 @@ +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index d95c2d1..2309281 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service, + __typeof (once) old_once = once; + __libc_once (once, gaiconf_init); + /* Sort results according to RFC 3484. */ +- struct sort_result results[nresults]; +- size_t order[nresults]; ++ struct sort_result *results; ++ size_t *order; + struct addrinfo *q; + struct addrinfo *last = NULL; + char *canonname = NULL; ++ bool malloc_results; ++ ++ malloc_results ++ = !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t))); ++ if (malloc_results) ++ { ++ results = malloc (nresults * (sizeof (*results) + sizeof (size_t))); ++ if (results == NULL) ++ { ++ __free_in6ai (in6ai); ++ return EAI_MEMORY; ++ } ++ } ++ else ++ results = alloca (nresults * (sizeof (*results) + sizeof (size_t))); ++ order = (size_t *) (results + nresults); + + /* Now we definitely need the interface information. */ + if (! check_pf_called) +@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service, + + /* Fill in the canonical name into the new first entry. */ + p->ai_canonname = canonname; ++ ++ if (malloc_results) ++ free (results); + } + + __free_in6ai (in6ai); +-- +1.7.1 + diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch new file mode 100644 index 000000000..b108f9d42 --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-regexp-matcher-overrun.patch @@ -0,0 +1,137 @@ +diff --git a/posix/Makefile b/posix/Makefile +index 88d409f..2cacd21 100644 +--- a/posix/Makefile ++++ b/posix/Makefile +@@ -86,7 +86,7 @@ tests := tstgetopt testfnm runtests runptests \ + tst-rfc3484-3 \ + tst-getaddrinfo3 tst-fnmatch2 tst-cpucount tst-cpuset \ + bug-getopt1 bug-getopt2 bug-getopt3 bug-getopt4 \ +- bug-getopt5 tst-getopt_long1 ++ bug-getopt5 tst-getopt_long1 bug-regex34 + xtests := bug-ga2 + ifeq (yes,$(build-shared)) + test-srcs := globtest +@@ -199,5 +199,6 @@ bug-regex26-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex30-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex32-ENV = LOCPATH=$(common-objpfx)localedata + bug-regex33-ENV = LOCPATH=$(common-objpfx)localedata ++bug-regex34-ENV = LOCPATH=$(common-objpfx)localedata + tst-rxspencer-ARGS = --utf8 rxspencer/tests + tst-rxspencer-ENV = LOCPATH=$(common-objpfx)localedata +diff --git a/posix/bug-regex34.c b/posix/bug-regex34.c +new file mode 100644 +index 0000000..bb3b613 +--- /dev/null ++++ b/posix/bug-regex34.c +@@ -0,0 +1,46 @@ ++/* Test re_search with multi-byte characters in UTF-8. ++ Copyright (C) 2013 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library 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.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ ++#define _GNU_SOURCE 1 ++#include <stdio.h> ++#include <string.h> ++#include <locale.h> ++#include <regex.h> ++ ++static int ++do_test (void) ++{ ++ struct re_pattern_buffer r; ++ /* áá»á½ááºá¯ááºx */ ++ const char *s = "\xe1\x80\x80\xe1\x80\xbb\xe1\x80\xbd\xe1\x80\x94\xe1\x80\xba\xe1\x80\xaf\xe1\x80\x95\xe1\x80\xbax"; ++ ++ if (setlocale (LC_ALL, "en_US.UTF-8") == NULL) ++ { ++ puts ("setlocale failed"); ++ return 1; ++ } ++ memset (&r, 0, sizeof (r)); ++ ++ re_compile_pattern ("[^x]x", 5, &r); ++ /* This was triggering a buffer overflow. */ ++ re_search (&r, s, strlen (s), 0, strlen (s), 0); ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff --git a/posix/regexec.c b/posix/regexec.c +index 7f2de85..5ca2bf6 100644 +--- a/posix/regexec.c ++++ b/posix/regexec.c +@@ -197,7 +197,7 @@ static int group_nodes_into_DFAstates (const re_dfa_t *dfa, + static int check_node_accept (const re_match_context_t *mctx, + const re_token_t *node, int idx) + internal_function; +-static reg_errcode_t extend_buffers (re_match_context_t *mctx) ++static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) + internal_function; + + /* Entry point for POSIX code. */ +@@ -1160,7 +1160,7 @@ check_matching (re_match_context_t *mctx, int fl_longest_match, + || (BE (next_char_idx >= mctx->input.valid_len, 0) + && mctx->input.valid_len < mctx->input.len)) + { +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, next_char_idx + 1); + if (BE (err != REG_NOERROR, 0)) + { + assert (err == REG_ESPACE); +@@ -1738,7 +1738,7 @@ clean_state_log_if_needed (re_match_context_t *mctx, int next_state_log_idx) + && mctx->input.valid_len < mctx->input.len)) + { + reg_errcode_t err; +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, next_state_log_idx + 1); + if (BE (err != REG_NOERROR, 0)) + return err; + } +@@ -2792,7 +2792,7 @@ get_subexp (re_match_context_t *mctx, int bkref_node, int bkref_str_idx) + if (bkref_str_off >= mctx->input.len) + break; + +- err = extend_buffers (mctx); ++ err = extend_buffers (mctx, bkref_str_off + 1); + if (BE (err != REG_NOERROR, 0)) + return err; + +@@ -4102,7 +4102,7 @@ check_node_accept (const re_match_context_t *mctx, const re_token_t *node, + + static reg_errcode_t + internal_function __attribute_warn_unused_result__ +-extend_buffers (re_match_context_t *mctx) ++extend_buffers (re_match_context_t *mctx, int min_len) + { + reg_errcode_t ret; + re_string_t *pstr = &mctx->input; +@@ -4111,8 +4111,10 @@ extend_buffers (re_match_context_t *mctx) + if (BE (INT_MAX / 2 / sizeof (re_dfastate_t *) <= pstr->bufs_len, 0)) + return REG_ESPACE; + +- /* Double the lengthes of the buffers. */ +- ret = re_string_realloc_buffers (pstr, MIN (pstr->len, pstr->bufs_len * 2)); ++ /* Double the lengthes of the buffers, but allocate at least MIN_LEN. */ ++ ret = re_string_realloc_buffers (pstr, ++ MAX (min_len, ++ MIN (pstr->len, pstr->bufs_len * 2))); + if (BE (ret != REG_NOERROR, 0)) + return ret; + +-- +1.7.1 + diff --git a/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch new file mode 100644 index 000000000..24b25c997 --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/glibc-2.17-sync-with-linux37.patch @@ -0,0 +1,130 @@ +diff --git a/sysdeps/gnu/netinet/tcp.h b/sysdeps/gnu/netinet/tcp.h +index 06e8414..b62a696 100644 +--- a/sysdeps/gnu/netinet/tcp.h ++++ b/sysdeps/gnu/netinet/tcp.h +@@ -37,20 +37,29 @@ + /* + * User-settable options (used with setsockopt). + */ +-#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */ +-#define TCP_MAXSEG 2 /* Set maximum segment size */ +-#define TCP_CORK 3 /* Control sending of partial frames */ +-#define TCP_KEEPIDLE 4 /* Start keeplives after this period */ +-#define TCP_KEEPINTVL 5 /* Interval between keepalives */ +-#define TCP_KEEPCNT 6 /* Number of keepalives before death */ +-#define TCP_SYNCNT 7 /* Number of SYN retransmits */ +-#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */ +-#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */ +-#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */ +-#define TCP_INFO 11 /* Information about this connection. */ +-#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */ +-#define TCP_CONGESTION 13 /* Congestion control algorithm. */ +-#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */ ++#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */ ++#define TCP_MAXSEG 2 /* Set maximum segment size */ ++#define TCP_CORK 3 /* Control sending of partial frames */ ++#define TCP_KEEPIDLE 4 /* Start keeplives after this period */ ++#define TCP_KEEPINTVL 5 /* Interval between keepalives */ ++#define TCP_KEEPCNT 6 /* Number of keepalives before death */ ++#define TCP_SYNCNT 7 /* Number of SYN retransmits */ ++#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */ ++#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */ ++#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */ ++#define TCP_INFO 11 /* Information about this connection. */ ++#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */ ++#define TCP_CONGESTION 13 /* Congestion control algorithm. */ ++#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */ ++#define TCP_COOKIE_TRANSACTIONS 15 /* TCP Cookie Transactions */ ++#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/ ++#define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */ ++#define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout */ ++#define TCP_REPAIR 19 /* TCP sock is under repair right now */ ++#define TCP_REPAIR_QUEUE 20 /* Set TCP queue to repair */ ++#define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue. */ ++#define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */ ++#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */ + + #ifdef __USE_MISC + # include <sys/types.h> +@@ -173,7 +182,9 @@ enum + # define TCPI_OPT_TIMESTAMPS 1 + # define TCPI_OPT_SACK 2 + # define TCPI_OPT_WSCALE 4 +-# define TCPI_OPT_ECN 8 ++# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init */ ++# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with ECT */ ++# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd */ + + /* Values for tcpi_state. */ + enum tcp_ca_state +@@ -241,6 +252,49 @@ struct tcp_md5sig + u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */ + }; + ++/* For socket repair options. */ ++struct tcp_repair_opt ++{ ++ u_int32_t opt_code; ++ u_int32_t opt_val; ++}; ++ ++/* Queue to repair, for TCP_REPAIR_QUEUE. */ ++enum ++{ ++ TCP_NO_QUEUE, ++ TCP_RECV_QUEUE, ++ TCP_SEND_QUEUE, ++ TCP_QUEUES_NR, ++}; ++ ++/* For cookie transactions socket options. */ ++#define TCP_COOKIE_MIN 8 /* 64-bits */ ++#define TCP_COOKIE_MAX 16 /* 128-bits */ ++#define TCP_COOKIE_PAIR_SIZE (2*TCP_COOKIE_MAX) ++ ++/* Flags for both getsockopt and setsockopt */ ++#define TCP_COOKIE_IN_ALWAYS (1 << 0) /* Discard SYN without cookie */ ++#define TCP_COOKIE_OUT_NEVER (1 << 1) /* Prohibit outgoing cookies, ++ * supercedes everything. */ ++ ++/* Flags for getsockopt */ ++#define TCP_S_DATA_IN (1 << 2) /* Was data received? */ ++#define TCP_S_DATA_OUT (1 << 3) /* Was data sent? */ ++ ++#define TCP_MSS_DEFAULT 536U /* IPv4 (RFC1122, RFC2581) */ ++#define TCP_MSS_DESIRED 1220U /* IPv6 (tunneled), EDNS0 (RFC3226) */ ++ ++struct tcp_cookie_transactions ++{ ++ u_int16_t tcpct_flags; ++ u_int8_t __tcpct_pad1; ++ u_int8_t tcpct_cookie_desired; ++ u_int16_t tcpct_s_data_desired; ++ u_int16_t tcpct_used; ++ u_int8_t tcpct_value[TCP_MSS_DEFAULT]; ++}; ++ + #endif /* Misc. */ + + #endif /* netinet/tcp.h */ +diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h +index df8f167..eadd7d9 100644 +--- a/sysdeps/unix/sysv/linux/bits/socket.h ++++ b/sysdeps/unix/sysv/linux/bits/socket.h +@@ -1,6 +1,5 @@ + /* System-specific socket constants and types. Linux version. +- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012 +- Free Software Foundation, Inc. ++ Copyright (C) 1991-2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -208,6 +207,8 @@ enum + #define MSG_MORE MSG_MORE + MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/ + #define MSG_WAITFORONE MSG_WAITFORONE ++ MSG_FASTOPEN = 0x20000000, /* Send data in TCP SYN. */ ++#define MSG_FASTOPEN MSG_FASTOPEN + + MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file + descriptor received through diff --git a/libre/xtensa-unknown-elf-glibc/locale-gen b/libre/xtensa-unknown-elf-glibc/locale-gen new file mode 100644 index 000000000..5aff344c4 --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/locale-gen @@ -0,0 +1,42 @@ +#!/bin/sh + +set -e + +LOCALEGEN=/etc/locale.gen +LOCALES=/usr/share/i18n/locales +if [ -n "$POSIXLY_CORRECT" ]; then + unset POSIXLY_CORRECT +fi + + +[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0; + +# Remove all old locale dir and locale-archive before generating new +# locale data. +rm -rf /usr/lib/locale/* || true + +umask 022 + +is_entry_ok() { + if [ -n "$locale" -a -n "$charset" ] ; then + true + else + echo "error: Bad entry '$locale $charset'" + false + fi +} + +echo "Generating locales..." +while read locale charset; do \ + case $locale in \#*) continue;; "") continue;; esac; \ + is_entry_ok || continue + echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \ + echo -n ".$charset"; \ + echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \ + echo -n '...'; \ + if [ -f $LOCALES/$locale ]; then input=$locale; else \ + input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \ + localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \ + echo ' done'; \ +done < $LOCALEGEN +echo "Generation complete." diff --git a/libre/xtensa-unknown-elf-glibc/locale.gen.txt b/libre/xtensa-unknown-elf-glibc/locale.gen.txt new file mode 100644 index 000000000..ccdd81734 --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/locale.gen.txt @@ -0,0 +1,23 @@ +# Configuration file for locale-gen +# +# lists of locales that are to be generated by the locale-gen command. +# +# Each line is of the form: +# +# <locale> <charset> +# +# where <locale> is one of the locales given in /usr/share/i18n/locales +# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps +# +# Examples: +# en_US ISO-8859-1 +# en_US.UTF-8 UTF-8 +# de_DE ISO-8859-1 +# de_DE@euro ISO-8859-15 +# +# The locale-gen command will generate all the locales, +# placing them in /usr/lib/locale. +# +# A list of supported locales is included in this file. +# Uncomment the ones you need. +# diff --git a/libre/xtensa-unknown-elf-glibc/nscd.service b/libre/xtensa-unknown-elf-glibc/nscd.service new file mode 100644 index 000000000..bc80a0730 --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/nscd.service @@ -0,0 +1,17 @@ +[Unit] +Description=Name Service Cache Daemon +After=syslog.target + +[Service] +Type=forking +ExecStart=/usr/sbin/nscd +ExecStop=/usr/sbin/nscd --shutdown +ExecReload=/usr/sbin/nscd -i passwd +ExecReload=/usr/sbin/nscd -i group +ExecReload=/usr/sbin/nscd -i hosts +ExecReload=/usr/sbin/nscd -i services +Restart=always +PIDFile=/run/nscd/nscd.pid + +[Install] +WantedBy=multi-user.target diff --git a/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles new file mode 100644 index 000000000..8a24a785e --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/nscd.tmpfiles @@ -0,0 +1 @@ +d /run/nscd 0755 root root diff --git a/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install new file mode 100644 index 000000000..f8147a6cf --- /dev/null +++ b/libre/xtensa-unknown-elf-glibc/xtensa-unknown-elf-glibc.install @@ -0,0 +1,19 @@ +infodir=usr/share/info +filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11}) + +post_upgrade() { + ldconfig -r . + locale-gen + + [[ -x usr/bin/install-info ]] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +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/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD new file mode 100644 index 000000000..23dada50b --- /dev/null +++ b/libre/xtensa-unknown-elf-linux-libre-api-headers/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 180857 2013-03-27 11:11:40Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc +export ARCH=xtensa +_target=xtensa-unknown-elf +_sysroot="usr/$CHOST/${_target}" + +pkgname=${_target}-linux-libre-api-headers +_basekernel=3.8 +_sublevel=4 +pkgver=${_basekernel}.${_sublevel} +pkgrel=1 +pkgdesc="Kernel headers sanitized for use in userspace for Xtensa processors" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.gnu.org/software/libc" +license=('GPL2') +provides=("${_target}-linux-api-headers=${pkgver}") +conflicts=("${_target}-linux-api-headers") +replaces=("${_target}-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=('84c2a77910932ffc7d958744ac9cf2f5' + 'be610dd93dbe033cfe04018b27557c3e') + +build() { + cd ${srcdir}/linux-${_basekernel} + + if [ "${_basekernel}" != "${pkgver}" ]; then + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" + fi + + make mrproper + make headers_check +} + +package() { + cd ${srcdir}/linux-${_basekernel} + make ARCH=${ARCH} INSTALL_HDR_PATH=${pkgdir}/${_sysroot} headers_install + + # use headers from libdrm + rm -r ${pkgdir}/${_sysroot}/include/drm + + # clean-up unnecessary files generated during install + find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete +} diff --git a/pcr/amsynth/PKGBUILD b/pcr/amsynth/PKGBUILD index 2c874ed61..7af465551 100644 --- a/pcr/amsynth/PKGBUILD +++ b/pcr/amsynth/PKGBUILD @@ -1,26 +1,25 @@ # Maintainer : Guest One <theguestone at gmail dot com> pkgname=amsynth -pkgver=1.3.2 -pkgrel=2 +pkgver=1.4.0 +pkgrel=1 pkgdesc="Analogue Modeling SYNTHesizer" arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/amsynth/" +url="http://code.google.com/p/$pkgname/" license=('GPL') -depends=('gtkmm' 'jack' 'liblo') -makedepends=('desktop-file-utils' 'dssi' 'libtool' 'ladspa') +depends=('gtkmm' 'jack' 'liblo' 'ladspa') +makedepends=('desktop-file-utils' 'dssi' 'libtool') install="$pkgname.install" -source=("http://amsynth.googlecode.com/files/amSynth-$pkgver.tar.gz") -md5sums=('991329e433bb8c496f9ca5158faf0bca') +source=("http://$pkgname.googlecode.com/files/$pkgname-$pkgver.tar.gz") +md5sums=('9193d334c89996cf44e98422e03318bb') build() { - cd "$srcdir/amSynth-$pkgver" - libtoolize + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make } package() { - cd "$srcdir/amSynth-$pkgver" + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/pcr/chiliproject/PKGBUILD b/pcr/chiliproject/PKGBUILD index 4f933934a..976316dc4 100644 --- a/pcr/chiliproject/PKGBUILD +++ b/pcr/chiliproject/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=chiliproject pkgver=3.3.0 diff --git a/pcr/cinepaint-lts/PKGBUILD b/pcr/cinepaint-lts/PKGBUILD index c680ac904..da085729f 100644 --- a/pcr/cinepaint-lts/PKGBUILD +++ b/pcr/cinepaint-lts/PKGBUILD @@ -1,7 +1,7 @@ # $Id$ # Maintainer: tobias [tobias.archlinux.org] # Contributor: tobias [tobias.justdreams.de] -# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> pkgname=cinepaint-lts pkgver=1.0 diff --git a/pcr/cluster-glue/PKGBUILD b/pcr/cluster-glue/PKGBUILD index 1a81e15d4..2c45a3b0c 100644 --- a/pcr/cluster-glue/PKGBUILD +++ b/pcr/cluster-glue/PKGBUILD @@ -5,7 +5,7 @@ _pkgname1=${pkgname::7} _pkgname2=${pkgname:8} _pkgname=${_pkgname1^}_${_pkgname2^} pkgver=1.0.11 -pkgrel=12 +pkgrel=14 pkgdesc='Set of libraries, tools and utilities suitable for the Heartbeat/Pacemaker cluster stack (Linux-HA)' arch=( i686 @@ -31,14 +31,13 @@ depends=( openhpi openipmi openssh - python + python2 util-linux - #vacm !!Is VA-Cluster Manager abandonware? - http://vacm.sourceforge.net/ - ver 2.0.5a - 2001/10/03!! ) optdepends=net-tools makedepends=( help2man - #libxslt + libxslt lynx net-tools openssh @@ -50,8 +49,20 @@ provides=(ha-$_pkgname2) conflicts=ha-$_pkgname2 replaces=ha-$_pkgname2 install=$pkgname.install -source=http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 -sha512sums=35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 +source=( + http://hg.$group.org/$_pkgname2/archive/$_pkgname2-$pkgver.tar.bz2 + ha-log.service + fixing-path.sed + replace-linux_os-to-gnulinux_os-term.sed + replace-opensource-to-free-term.sed +) +sha512sums=( + 35ac8ac555c39f24c11e3a768cc50eba051fe617edf4cdc0429dac73f45a472f144cfe6ec5faff575606f2b04ff76a2f732556d848b61410c2683d93ba928413 + bb5bc5c5a9347302be583c43b100c0c3760ec4dcc3348a9f9708d5b2c58ec02dd5782c5ac9dcb86223258493ad3fba8ddd8dc5670390f0f602c34869b26bee6d + ce58a2af9f32265f12cc4984e9ae7f285fdb7737813ecccc0780015d048938d9dd79278635eb1cc6833f12f37a8c43211fec17411780220cf38fc44b91ecc076 + e59386aee4db5857fa131798327aa449a5efcd7d50c3ab45dadfa0becc31698a62367ce83b85ca739bdebaad4a9daf96d02c42673a4e26294ec0fa67323fdb5b + c82bd919d1cd02afccd10aea3e015f289ac97e387a1485097d681f9161a00c64859a5dce0ed36b98ad6a340264c2d854dcc83e3248e12828795b73c6ff67ef5b +) prepare() { export _CLUSTER_USER=hacluster @@ -85,131 +96,58 @@ prepare() { ' $(grep -rlI INCLUDES | grep Makefile.am) # fixing path - sed -i 's|bin/sh|usr/bin/bash|; - ' $(grep -rlI bin/sh) - sed -i 's| /bin| /usr/bin|; - ' $(grep -rlI ' /bin') - sed -i 's| /sbin| /usr/bin|; - ' $(grep -rlI ' /sbin') - sed -i 's|usr/sbin|usr/bin|; - ' $(grep -rlI usr/sbin) - #sed -i 's|/lib64|/lib|; - # ' $(grep -rlI /lib64) - #sed -i 's|usr/libexec|usr/lib|; - # ' $(grep -rlI usr/libexec) - sed -i 's|var/lock|run/lock|; - ' $(grep -rlI var/lock) - sed -i 's|var/run|run|; - ' $(grep -rlI var/run) + sed -i -f $srcdir/fixing-path.sed\ + $(grep -rlI /bin)\ + $(grep -rlI /sbin)\ + $(grep -rlI /lib)\ + $(grep -rlI /var) - # remove Open Source term - sed -i 's|Open Source / ||; - s|open source / ||; - s|Open Source|Free|; - s|open source|free|; - s|Free Software Development Lab|Open Source Development Lab|; - ' $(grep -rilI 'open source') - sed -i 's|OpenSource / ||; - s|opensource / ||; - s|OpenSource|Free|; - s|opensource|free|; - s|freesoftware.org|opensource.org|; - s|http://www.opensource.org/|http://www.gnu.org/philosophy/free-sw.html|; - s|http://www.gnu.org/philosophy/free-sw.htmllicenses/osl-|http://opensource.org/licenses/osl-|; - s|http://www.gnu.org/philosophy/free-sw.htmlosd|http://opensource.org/osd|; - ' $(grep -rilI opensource) + # fixing python2 path + sed -i 's|bin/env python|bin/env python2|g; + s|bin/python|bin/python2|g; + ' $(grep -rlI 'bin/env python')\ + $(grep -rlI bin/python) - # remove Linux term - sed -i 's|Linux,|GNU/Linux,|; - s|Linux and|GNU/Linux and|; - s|Linux distro|GNU/Linux distro|; - s|Linux distribution|GNU/Linux distribution|; - s|Linux machine|GNU/Linux machine|; - s|Linux Only|GNU/Linux Only|; - s|Linux only|GNU/Linux only|; - s|Linux operating|GNU/Linux operating|; - s|Linux OS|GNU/Linux OS|; - s|Linux platform|GNU/Linux platform|; - s|Linux software|GNU/Linux software|; - s|Linux specific|GNU/Linux specific|; - s|Linux system|GNU/Linux system|; - s|Linux will|GNU/Linux will|; - s|# Linux$|# GNU/Linux|; - s|# Linux.$|# GNU/Linux.|; - s|* Linux$|* GNU/Linux|; - s|* Linux.$|* GNU/Linux.|; - s|// Linux$|// GNU/Linux|; - s|// Linux.$|// GNU/Linux.|; - s|, Linux|, GNU/Linux|; - s|As Linux|As GNU/Linux|; - s|as Linux|as GNU/Linux|; - s|And Linux|And GNU/Linux|; - s|and Linux|and GNU/Linux|; - s|Be Linux|Be GNU/Linux|; - s|be Linux|be GNU/Linux|; - s|Because Linux|Because GNU/Linux|; - s|because Linux|because GNU/Linux|; - s|e.g. Linux|e.g. GNU/Linux|; - s|For Linux|For GNU/Linux|; - s|for Linux|for GNU/Linux|; - s|In Linux|In GNU/Linux|; - s|in Linux|in GNU/Linux|; - s|Like Linux|Like GNU/Linux|; - s|like Linux|like GNU/Linux|; - s|non-Linux|non GNU/Linux|; - s|Of Linux|Of GNU/Linux|; - s|of Linux|of GNU/Linux|; - s|On Linux|On GNU/Linux|; - s|on Linux|on GNU/Linux|; - s|OS type: Linux|OS type: GNU/Linux|; - s|Other Linux|Other GNU/Linux|; - s|other Linux|other GNU/Linux|; - s|The Linux|The GNU/Linux|; - s|the Linux|the GNU/Linux|; - s|Typically Linux|Typically GNU/Linux|; - s|typically Linux|typically GNU/Linux|; - s|To Linux|To GNU/Linux|; - s|to Linux|to GNU/Linux|; - s|Under Linux|Under GNU/Linux|; - s|under Linux|under GNU/Linux|; - s|ArchGNU/Linux|ArchLinux|; - s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|; - s|GNU/GNU|GNU|; - s|GNU/Linux device|Linux device|; - s|GNU/Linux Director Daemon|Linux Director Daemon|; - s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|; - s|GNU/Linux kernel|Linux kernel|; - s|GNU/Linux specific kernel|Linux specific kernel|; - s|GNU/Linux Standard Base|Linux Standard Base|; - s|GNU/Linux sysfs|Linux sysfs|; - s|GNU/Linux Virtual Server|Linux Virtual Server|; - s|GNU/Linux Watchdog|Linux Watchdog|; - s|GNU/Linux watchdog|Linux watchdog|; - s|GNU/LinuxHA|LinuxHA|; - s|GNU/Linux-HA|Linux-HA|; - s|GNU/LinuxSCSI|LinuxSCSI|; - s|HA GNU/Linux|HA Linux|; - s|High-Availability GNU/Linux|High-Availability Linux|; - s|MkGNU/Linux|MkLinux|; - s|SEGNU/Linux|SELinux|; - s|VA GNU/Linux Cluster|VA Linux Cluster|; - ' $(grep -rlI Linux) -} + # remove Linux (OS) term to GNU/Linux (OS) term + sed -i -f $srcdir/replace-linux_os-to-gnulinux_os-term.sed\ + $(grep -rlI Linux) + + # replace Open Source term to Free term + sed -i -f $srcdir/replace-opensource-to-free-term.sed\ + $(grep -rilI 'open.\{0,1\}source') +#} -build() { +#build() { # disabled, due that is needed internet for generating man pages with libxslt. cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver setarch $CARCH ./autogen.sh - setarch $CARCH ./configure --prefix=/usr\ + setarch $CARCH ./configure\ + --sysconfdir=/etc\ + --prefix=/usr\ + --exec-prefix=/usr\ + --bindir=/usr/bin\ + --sbindir=/usr/bin\ + --includedir=/usr/include\ + --oldincludedir=/usr/include\ + --libdir=/usr/lib\ + --libexecdir=/usr/lib\ + --datarootdir=/usr/share\ + --datadir=/usr/share\ + --docdir=/usr/share/doc/$pkgname\ + --dvidir=/usr/share/doc/$pkgname\ + --htmldir=/usr/share/doc/$pkgname\ + --pdfdir=/usr/share/doc/$pkgname\ + --psdir=/usr/share/doc/$pkgname\ + --infodir=/usr/share/info\ + --localedir=/usr/share/locale\ + --mandir=/usr/share/man\ + --localstatedir=/var\ --disable-ansi\ --disable-fatal-warnings\ --disable-static\ --enable-doc\ --enable-libnet\ + --enable-shared\ --enable-upstart\ - --libdir=/usr/lib\ - --localstatedir=/var\ - --sbindir=/usr/bin\ - --sysconfdir=/etc\ --with-daemon-group=haclient\ --with-daemon-user=hacluster\ --with-ocf-root=/usr/lib/ocf @@ -220,19 +158,8 @@ package() { cd $srcdir/Reusable-${_pkgname1^}-Components-$_pkgname2--$_pkgname2-$pkgver setarch $CARCH make DESTDIR=$pkgdir install - rm $pkgdir/etc/rc.d/logd && rmdir $pkgdir/etc{/rc.d,} - install -d $pkgdir/usr/lib/systemd/system - echo '[Unit]' > $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'Description=Startup script logd service' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'Requires=network.target remote-fs.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo '' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo '[Service]' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'Type=forking' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'ExecStart=/usr/lib/heartbeat/ha_logd' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo '' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo '[Install]' >> $pkgdir/usr/lib/systemd/system/ha_log.service - echo 'WantedBy=multi-user.target' >> $pkgdir/usr/lib/systemd/system/ha_log.service + install -m644 $srcdir/ha-log.service $pkgdir/usr/lib/systemd/system msg 'AFTER COMPILE THIS SOFTWARE YOU MUST DELETE A CLUSTER USER AND A CLUSTER GROUP, EXECUTE AS ROOT:' echo -e "# userdel $_CLUSTER_USER" diff --git a/pcr/cluster-glue/fixing-path.sed b/pcr/cluster-glue/fixing-path.sed new file mode 100644 index 000000000..43ef66253 --- /dev/null +++ b/pcr/cluster-glue/fixing-path.sed @@ -0,0 +1,29 @@ +s|/bin/sh|/bin/bash|g; +s| /bin| /usr/bin|g; +s|=/bin|=/usr/bin|g; +s|!/bin|!/usr/bin|g; +s|:/bin|:/usr/bin|g; +s|#/bin|#/usr/bin|g; +s| /sbin| /usr/bin|g; +s|=/sbin|=/usr/bin|g; +s|!/sbin|!/usr/bin|g; +s|:/sbin|:/usr/bin|g; +s|#/sbin|#/usr/bin|g; +s| /usr/sbin| /usr/bin|g; +s|=/usr/sbin|=/usr/bin|g; +s|!/usr/sbin|!/usr/bin|g; +s|:/usr/sbin|:/usr/bin|g; +s|#/usr/sbin|#/usr/bin|g; +s|:/usr/bin:/usr/bin|:/usr/bin|g; +s|lib64|lib|g; +s| /lib| /usr/lib|g; +s|=/lib|=/usr/lib|g; +s|#/lib|#/usr/lib|g; +s| /usr/libexec| /usr/lib|g; +s|=/usr/libexec|=/usr/lib|g; +s|#/usr/libexec|#/usr/lib|g; +s| /usr/var| /var|g; +s|=/usr/var|=/var|g; +s|#/usr/var|#/var|g; +s|/var/lock|/run/lock|g; +s|/var/run|/run|g; diff --git a/pcr/cluster-glue/ha-log.service b/pcr/cluster-glue/ha-log.service new file mode 100644 index 000000000..5115298d7 --- /dev/null +++ b/pcr/cluster-glue/ha-log.service @@ -0,0 +1,12 @@ +[Unit] +Description=Non-blocking logging daemon. +Requires=network.target remote-fs.target +Before=heartbeat.service openais.service corosync.service + +[Service] +Type=forking +ExecStart=/usr/lib/heartbeat/ha_logd -d >/dev/null 2>&1 +ExecStop=/usr/lib/heartbeat/ha_logd -k >/dev/null 2>&1 + +[Install] +WantedBy=multi-user.target diff --git a/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed new file mode 100644 index 000000000..2c9801c11 --- /dev/null +++ b/pcr/cluster-glue/replace-linux_os-to-gnulinux_os-term.sed @@ -0,0 +1,73 @@ +s|Linux,|GNU/Linux,|g; +s|Linux and|GNU/Linux and|g; +s|Linux distro|GNU/Linux distro|g; +s|Linux distribution|GNU/Linux distribution|g; +s|Linux machine|GNU/Linux machine|g; +s|Linux Only|GNU/Linux Only|g; +s|Linux only|GNU/Linux only|g; +s|Linux operating|GNU/Linux operating|g; +s|Linux OS|GNU/Linux OS|g; +s|Linux platform|GNU/Linux platform|g; +s|Linux software|GNU/Linux software|g; +s|Linux specific|GNU/Linux specific|g; +s|Linux system|GNU/Linux system|g; +s|Linux will|GNU/Linux will|g; +s|# Linux$|# GNU/Linux|g; +s|# Linux[.]$|# GNU/Linux.|g; +s|* Linux$|* GNU/Linux|g; +s|* Linux[.]$|* GNU/Linux.|g; +s|// Linux$|// GNU/Linux|g; +s|// Linux[.]$|// GNU/Linux.|g; +s|, Linux|, GNU/Linux|g; +s|As Linux|As GNU/Linux|g; +s|as Linux|as GNU/Linux|g; +s|And Linux|And GNU/Linux|g; +s|and Linux|and GNU/Linux|g; +s|Be Linux|Be GNU/Linux|g; +s|be Linux|be GNU/Linux|g; +s|Because Linux|Because GNU/Linux|g; +s|because Linux|because GNU/Linux|g; +s|e[.]g[.] Linux|e.g. GNU/Linux|g; +s|For Linux|For GNU/Linux|g; +s|for Linux|for GNU/Linux|g; +s|In Linux|In GNU/Linux|g; +s|in Linux|in GNU/Linux|g; +s|Like Linux|Like GNU/Linux|g; +s|like Linux|like GNU/Linux|g; +s|non-Linux|non GNU/Linux|g; +s|Of Linux|Of GNU/Linux|g; +s|of Linux|of GNU/Linux|g; +s|On Linux|On GNU/Linux|g; +s|on Linux|on GNU/Linux|g; +s|OS type: Linux|OS type: GNU/Linux|g; +s|Other Linux|Other GNU/Linux|g; +s|other Linux|other GNU/Linux|g; +s|The Linux|The GNU/Linux|g; +s|the Linux|the GNU/Linux|g; +s|Typically Linux|Typically GNU/Linux|g; +s|typically Linux|typically GNU/Linux|g; +s|To Linux|To GNU/Linux|g; +s|to Linux|to GNU/Linux|g; +s|Under Linux|Under GNU/Linux|g; +s|under Linux|under GNU/Linux|g; +s|e2fsprogs, typically GNU/Linux|e2fsprogs, typically Linux|g; +s|GNU/GNU|GNU|g; +s|ArchGNU/Linux|ArchLinux|g; +s|MkGNU/Linux|MkLinux|g; +s|GNU/Linux device|Linux device|g; +s|GNU/Linux Director Daemon|Linux Director Daemon|g; +s|GNU/Linux is a registered trademark of Linus Torvalds|Linux is a registered trademark of Linus Torvalds|g; +s|GNU/Linux kernel|Linux kernel|g; +s|GNU/Linux specific kernel|Linux specific kernel|g; +s|GNU/Linux Standard Base|Linux Standard Base|g; +s|GNU/Linux sysfs|Linux sysfs|g; +s|GNU/Linux Virtual Server|Linux Virtual Server|g; +s|GNU/Linux Watchdog|Linux Watchdog|g; +s|GNU/Linux watchdog|Linux watchdog|g; +s|GNU/LinuxHA|LinuxHA|g; +s|GNU/Linux-HA|Linux-HA|g; +s|GNU/LinuxSCSI|LinuxSCSI|g; +s|HA GNU/Linux|HA Linux|g; +s|High-Availability GNU/Linux|High-Availability Linux|g; +s|SEGNU/Linux|SELinux|g; +s|VA GNU/Linux Cluster|VA Linux Cluster|g; diff --git a/pcr/cluster-glue/replace-opensource-to-free-term.sed b/pcr/cluster-glue/replace-opensource-to-free-term.sed new file mode 100644 index 000000000..c086bb91e --- /dev/null +++ b/pcr/cluster-glue/replace-opensource-to-free-term.sed @@ -0,0 +1,19 @@ +s|Open Source Definition (Version [0-9].[0-9])|Free Software Definition|g; +s|Open Source Definition|Free Software Definition|g; +s|Open Source Initiative|Free Software Foundation|g; +s|OSI Certifi|FSF Certif|g; +s|OSI certifi|FSF certif|g; +s|opensource[.]org/osd-annotated|gnu.org/philosophy/free-sw.html|g; +s|opensource[.]org/osd|gnu.org/philosophy/free-sw.html|g; +s|opensource[.]org/|gnu.org/philosophy/free-sw.html|g; +s|[ _-].\{1,3\}[ _-][oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE]||g; +s|[oO][pP][eE][nN].\{0,1\}[sS][oO][uU][rR][cC][eE][ _-].\{1,3\}[ _-]||g; +s|OPEN.\{0,1\}SOURCE|FREE|g; +s|Open.\{0,1\}[sS]ource|Free|g; +s|open.\{0,1\}[sS]ource|free|g; +s|Free Development Lab|Open Source Development Lab|g; +s|free[.]org|opensource.org|g; +s|gnu[.]org/philosophy/free-sw[.]htmllicenses|opensource.org/licenses|g; +s|oss[.]software[.]ibm[.]com/developerworks/free|oss.software.ibm.com/developerworks/opensource|g; +s|oberhumer[.]com/free|oberhumer.com/opensource|g; +s|free@google[.]com|opensource@google.com|g; diff --git a/pcr/clusterit/PKGBUILD b/pcr/clusterit/PKGBUILD index c325a003b..59ef12be3 100644 --- a/pcr/clusterit/PKGBUILD +++ b/pcr/clusterit/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=clusterit pkgver=2.5 diff --git a/pcr/collada-dom/PKGBUILD b/pcr/collada-dom/PKGBUILD index ebcc90448..1b42c921c 100644 --- a/pcr/collada-dom/PKGBUILD +++ b/pcr/collada-dom/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=collada-dom pkgver=2.4.0 diff --git a/pcr/corosync/PKGBUILD b/pcr/corosync/PKGBUILD index 7bd87f791..a24064722 100644 --- a/pcr/corosync/PKGBUILD +++ b/pcr/corosync/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=corosync _pkgflag=lts diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD deleted file mode 100644 index 1e5634fb6..000000000 --- a/pcr/ffmpeg-static/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id$ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Paul Mattal <paul@archlinux.org> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -pkgname=ffmpeg-static -pkgver=1.0 -pkgrel=2 -epoch=1 -pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library' -arch=(i686 x86_64 mips64el) -url=http://${pkgname%-static}.org/ -license=(GPL) -depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib) -makedepends=(yasm libvdpau) -provides=(${pkgname%-static}) -conflicts=(${pkgname%-static}) -source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2) -md5sums=(3ed526cea20c1bffb5a37f7730f710bd) - -build() { - cd ${pkgname%-static}-$pkgver - - ./configure \ - --prefix=/usr \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libvpx \ - --enable-libtheora \ - --enable-libgsm \ - --enable-libspeex \ - --enable-postproc \ - --enable-shared \ - --enable-x11grab \ - --enable-libopencore_amrnb \ - --enable-libopencore_amrwb \ - --enable-libschroedinger \ - --enable-libopenjpeg \ - --enable-librtmp \ - --enable-libpulse \ - --enable-libv4l2 \ - --enable-gpl \ - --enable-version3 \ - --enable-runtime-cpudetect \ - --disable-debug \ - --enable-static - make - make tools/qt-faststart - make doc/ff{mpeg,play,server}.1 -} - -package() { - cd ${pkgname%-static}-$pkgver - make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD index 9fed072aa..efa005071 100644 --- a/pcr/ganglia/PKGBUILD +++ b/pcr/ganglia/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=ganglia pkgver=3.6.0 diff --git a/pcr/gimp-art/PKGBUILD b/pcr/gimp-art/PKGBUILD index 11c3b191b..cd38b329d 100644 --- a/pcr/gimp-art/PKGBUILD +++ b/pcr/gimp-art/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=gimp-art pkgver=2.8.2 diff --git a/pcr/gimp-art/gimp-splash-artwork.license b/pcr/gimp-art/gimp-splash-artwork.license index 64267a6c0..0f060c013 100644 --- a/pcr/gimp-art/gimp-splash-artwork.license +++ b/pcr/gimp-art/gimp-splash-artwork.license @@ -1,7 +1,7 @@ GIMP LIBRE SPLASH LICENSE -Logo and Effects is created by Zé Lara <ze.lara@adinet.com.uy> and Márcio Silva <coadde@adinet.com.uy> -Idea by André Silva <andre.paulista@adinet.com.uy> +Logo and Effects is created by Zé Lara <ze.miguel.lara@gmail.com> and Márcio Silva <coadde@lavabit.com> +Idea by André Silva <emulatorman@lavabit.com> The GIMP LIBRE splash screen is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send aletter to Creative Commons, 444 Castro Street, @@ -10,4 +10,4 @@ Suite 900, Mountain View, California, 94041, USA. Sangeno Waterfall Picture is created by Abedinali from Wikimedia Commons under the Creative Commons CC0 1.0 Universal license (Public Domain). To the extent possible under law, Abedinali from Wikimedia Commons has waived all copyright and related or neighboring rights to Sangeno Waterfall. This work is published from: United States. -https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg
\ No newline at end of file +https://upload.wikimedia.org/wikipedia/commons/8/8b/Sangeno.jpg diff --git a/pcr/gimp-toolkit-gps/PKGBUILD b/pcr/gimp-toolkit-gps/PKGBUILD new file mode 100644 index 000000000..9f5784608 --- /dev/null +++ b/pcr/gimp-toolkit-gps/PKGBUILD @@ -0,0 +1,53 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgname=gimp-toolkit-gps +_pkgname=${pkgname:13} +_reqname=${pkgname::4} +pkgver=2.0 +_pkgver=${pkgver/./_} +pkgrel=1 +_pkgsrc1=${_pkgname^^}%20$_pkgver%20final +_pkgsrc2=${_pkgname^^}%20extras +pkgdesc='GIMP Paint Studio is a collection of brushes and accompanying tool presets. highly useful feature of the GIMP.' +arch=any +license=( + GPL2 + CCPL:by-sa +) +url=https://code.google.com/p/$_pkgname-gimp-paint-studio +depends=gimp +conflicts=${pkgname/kit/set} +replaces=${pkgname/kit/set} +makedepends=unzip-libre +noextract=( + $_pkgsrc1.zip + $_pkgsrc2.zip +) +source=( + https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc1.zip + https://$_pkgname-gimp-paint-studio.googlecode.com/files/$_pkgsrc2.zip +) +sha512sums=( + b06016eab194db7862590940c6fb7e9c14bbb6d3ce83c2b85293da2c75ecf8b9e64585a38f749da36d63e2711a25a0073415568f10be4b997120d93ba2b5c112 + c3ef322898299bde60f2c8e29ebdd5fa47236f6b2859bf5d3d01a92290e1ad888ba71b0813f7325921c87bf57632cf794da31e8ccab0c46cb020be52d2c1135f +) + +prepare() { + a=$srcdir/$_pkgname-$pkgver + mkdir $a + unzip $srcdir/$_pkgsrc1.zip -d $a + unzip $srcdir/$_pkgsrc2.zip -d $a + # drop useless splashes + rm -v $a/splashes/* && rmdir -v $a/splashes + # fix perm for custom umask + find $srcdir/$_pkgname-$pkgver -type d -exec chmod 0755 -R {} \; &&\ + find $srcdir/$_pkgname-$pkgver -type f -exec chmod 0644 -R {} \; +} + +package() { + b=$pkgdir/usr/share/gimp/2.0 + install -d $b + cp -va $srcdir/$_pkgname-$pkgver/* $b +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/hiredis/ChangeLog b/pcr/hiredis/ChangeLog new file mode 100644 index 000000000..fbe55643a --- /dev/null +++ b/pcr/hiredis/ChangeLog @@ -0,0 +1,4 @@ +2013-06-07 Vladimir Tsanev <tsachev@gamil.com> + + * 0.11.0-1 : + Initial PKGBUILD. diff --git a/pcr/hiredis/PKGBUILD b/pcr/hiredis/PKGBUILD new file mode 100644 index 000000000..29762e87e --- /dev/null +++ b/pcr/hiredis/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Vladimir Tsanev <tsachev@gmail.com> + +pkgname=hiredis +pkgver=0.11.0 +pkgrel=1 +pkgdesc='minimalistic C client library for Redis' +arch=('x86_64' 'i686') +url="https://github.com/redis/hiredis/" +license=('BSD') +depends=('glibc') +changelog='ChangeLog' +source=(https://codeload.github.com/redis/${pkgname}/tar.gz/v${pkgver}) +md5sums=('e2ac29509823ccc96990b6fe765b5d46') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make +} + +# +#check() { +# cd "${srcdir}/${pkgname}-${pkgver}" +# make test check c +#} + +package() { + + cd "${srcdir}/${pkgname}-${pkgver}" + make PREFIX="$pkgdir/usr" clean dep install + + install -Dm 644 COPYING "$pkgdir/usr/share/licenses/${pkgname}/COPYING" + +} diff --git a/pcr/kamailio/PKGBUILD b/pcr/kamailio/PKGBUILD new file mode 100644 index 000000000..3e040a495 --- /dev/null +++ b/pcr/kamailio/PKGBUILD @@ -0,0 +1,36 @@ +# Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> + +pkgname=kamailio +pkgver=4.0.1 +pkgrel=1 +pkgdesc="Rock solid SIP server" +url="http://www.kamailio.org/" +license=('GPL2') +arch=('i686' 'x86_64') +makedepends=('flex' 'bison' 'docbook2x' 'mariadb' 'postgresql' 'libxml2' + 'radiusclient-ng' 'lua51' 'mono' 'hiredis' 'libpurple' 'net-snmp' + 'libunistring' 'python2') +optdepends=('mariadb: mysql support' + 'expat: xmpp/jabber support' + 'libxml2: cpl and presence modules support' + 'radiusclient-ng: radius support' + 'postgresql: postgresql backend') +source=(http://www.kamailio.org/pub/kamailio/$pkgver/src/kamailio-${pkgver}_src.tar.gz) +sha256sums=('dd8652f47a572c0b0e1e45bdd0f6f838a14e50f2dbbeed77726ec0c7076e1769') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make cfg prefix=/usr cfg_prefix=/ bin_dir=/usr/bin + make PYTHON="python2" all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix=${pkgdir}/usr \ + PYTHON="python2" \ + cfg_prefix=${pkgdir} \ + bind_dir=${pkgdir}/usr/bin \ + bingroup_include="standard standard-dep stable experimental" \ + skip_modules="iptrtpproxy osp dbtext oracle" \ + install +} diff --git a/pcr/lcmc/PKGBUILD b/pcr/lcmc/PKGBUILD index 538949f60..6b27ff5f4 100644 --- a/pcr/lcmc/PKGBUILD +++ b/pcr/lcmc/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=lcmc pkgver=1.5.1 diff --git a/pcr/libav-builder/PKGBUILD b/pcr/libav-builder/PKGBUILD deleted file mode 100644 index 5f7168f86..000000000 --- a/pcr/libav-builder/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> - -static=false -pkgbase=libav -if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then - pkgname=libav-static-builder -elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then - pkgname=libav-builder -fi -pkgflag=builder -pkgver=9.3 -pkgrel=1 -pkgdesc="Link files on /usr/include and /usr/lib dir (ONLY FOR BUILD OTHERS PACKAGES)" -arch=any -url="http://$pkgbase.org/" -license=GPL -depends=${pkgname%-$pkgflag}=$pkgver -conflicts=( - ffmpeg - ffmpeg-static -) -if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then - conflicts+=( - ${pkgname%-static-$pkgflag} - ) -elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then - conflicts+=( - ${pkgname%-$pkgflag}-static - ) -fi - -package() { - install -m755 -d $pkgdir/usr/{include,lib{,/pkgconfig}} - include_list=$(ls /opt/${pkgname%-$pkgflag}/include) - for i in $include_list; do - ln -s /opt/${pkgname%-$pkgflag}/include/$i $pkgdir/usr/include - done - lib_list=$(ls /opt/${pkgname%-$pkgflag}/lib | grep lib) - for l in $lib_list; do - ln -s /opt/${pkgname%-$pkgflag}/lib/$l $pkgdir/usr/lib - done - pkgconfig_list=$(ls /opt/${pkgname%-$pkgflag}/lib/pkgconfig) - for c in $pkgconfig_list; do - ln -s /opt/${pkgname%-$pkgflag}/lib/pkgconfig/$c $pkgdir/usr/lib/pkgconfig - done -} - -# vim:set ts=2 sw=2 et: diff --git a/pcr/libav/PKGBUILD b/pcr/libav/PKGBUILD index 05dd756c0..782e12a15 100644 --- a/pcr/libav/PKGBUILD +++ b/pcr/libav/PKGBUILD @@ -1,11 +1,7 @@ -# $Id$ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: Paul Mattal <paul@archlinux.org> -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> static=false -pkgbase=libav +_pkgname=libav if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then pkgname=libav-static pkgflag=-static @@ -13,7 +9,7 @@ if [[ $static == true ]] || [[ $static == 1 ]] || [[ $static == enable ]]; then elif [[ $static == false ]] || [[ $static == 0 ]] || [[ $static == disable ]]; then pkgname=libav fi -pkgver=9.3 +pkgver=9.7 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for GNU/Linux$staticdesc" arch=( @@ -21,10 +17,8 @@ arch=( x86_64 mips64el ) -url="http://$pkgbase.org/" -license=( - GPL -) +url=http://$_pkgname.org/ +license=GPL3 depends=( alsa-lib bzip2 @@ -37,7 +31,8 @@ depends=( libvorbis libvpx opencore-amr - openjpeg + #openjpeg + opus rtmpdump schroedinger sdl @@ -50,30 +45,29 @@ makedepends=( yasm libvdpau ) -source=( - http://$pkgbase.org/releases/$pkgbase-$pkgver.tar.gz -) -sha512sums=( - de3aaa571fed67d22ec2a0c53599af56684afa38445cf67fd09d26c23eeded5a184d045f472d414815d17783b421f937fd3d9565637e20f2050aaaf0081164fe -) +source=http://$_pkgname.org/releases/$_pkgname-$pkgver.tar.gz +sha512sums=6a446e8dceb9ee4f1fb7a7d68d254086990bbcab5b1014598b21c75e0add22dab47c30a95bc3129835cc40a8d32de9c61fb267b2fa2aa9353dbbfc4b716767e4 build() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver [[ $static == false ]] && sttcv=disable || sttcv=enable - ./configure\ + setarch $CARCH ./configure\ --prefix=/opt/$pkgname\ --disable-debug\ --$sttcv-static\ --enable-avresample\ + --enable-avserver\ + --enable-dxva2\ --enable-gpl\ --enable-libfreetype\ --enable-libgsm\ --enable-libmp3lame\ --enable-libopencore_amrnb\ --enable-libopencore_amrwb\ - --enable-libopenjpeg\ + --disable-libopenjpeg\ + --enable-libopus\ --enable-libpulse\ --enable-librtmp\ --enable-libschroedinger\ @@ -87,14 +81,13 @@ build() { --enable-shared\ --enable-version3\ --enable-x11grab - setarch $CARCH make setarch $CARCH make tools/qt-faststart setarch $CARCH make doc/av{conv,play,server}.1 } package() { - cd $pkgbase-$pkgver + cd $_pkgname-$pkgver setarch $CARCH make DESTDIR=$pkgdir install install-man install -m755 -d $pkgdir/etc/ld.so.conf.d install -m755 -d $pkgdir/usr/bin @@ -103,10 +96,12 @@ package() { ln -s /opt/$pkgname/bin/avconv $pkgdir/usr/bin/avconv$pkgflag ln -s /opt/$pkgname/bin/avplay $pkgdir/usr/bin/avplay$pkgflag ln -s /opt/$pkgname/bin/avprobe $pkgdir/usr/bin/avprobe$pkgflag + ln -s /opt/$pkgname/bin/avserver $pkgdir/usr/bin/avserver$pkgflag ln -s /opt/$pkgname/bin/qt-faststart $pkgdir/usr/bin/qt-faststart-$pkgname ln -s /opt/$pkgname/share/man/man1/avconv.1 $pkgdir/usr/share/man/man1/avconv$pkgflag.1 ln -s /opt/$pkgname/share/man/man1/avplay.1 $pkgdir/usr/share/man/man1/avplay$pkgflag.1 ln -s /opt/$pkgname/share/man/man1/avprobe.1 $pkgdir/usr/share/man/man1/avprobe$pkgflag.1 + ln -s /opt/$pkgname/share/man/man1/avserver.1 $pkgdir/usr/share/man/man1/avserver$pkgflag.1 echo /opt/libav$pkgflag/lib > $pkgdir/etc/ld.so.conf.d/libav$pkgflag.conf } diff --git a/pcr/lilo/PKGBUILD b/pcr/lilo/PKGBUILD new file mode 100644 index 000000000..10d334b05 --- /dev/null +++ b/pcr/lilo/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer: Connor Behan <connor.behan@gmail.com> +# Contributor: Eric Belanger <eric@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> + +pkgname=lilo +pkgver=24.0 +pkgrel=1 +pkgdesc="A bootloader for GNU/Linux (Parabola rebranded)" +arch=('i686' 'x86_64') +url="https://alioth.debian.org/projects/lilo/" +license=('BSD') +backup=('etc/lilo.conf') +depends=('device-mapper' 'coreutils') +makedepends=('bin86' 'sharutils') +optdepends=('perl: to use keytab-lilo') +install=lilo.install +options=('!makeflags') +source=("http://lilo.alioth.debian.org/ftp/sources/${pkgname}-${pkgver}.tar.gz" + 'lilo.conf') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + export LC_ALL=C + + sed -i -e 's/strip lilo.static/strip lilo.static || true/' src/Makefile + make all +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}"/lilo.conf "${pkgdir}"/etc/lilo.conf + install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE + + # All binaries in /usr/bin + mkdir "${pkgdir}"/usr/bin + mv "${pkgdir}"/sbin/lilo "${pkgdir}"/usr/bin/ + mv "${pkgdir}"/usr/sbin/* "${pkgdir}"/usr/bin/ + rm -rf "${pkgdir}"/sbin + rm -rf "${pkgdir}"/usr/sbin + + # Avoid conflict with syslinux + mv "${pkgdir}"/usr/bin/keytab-lilo "${pkgdir}"/usr/bin/keytab-lilo.pl +} +md5sums=('03d7090835a5675314082847f1ac7910' 'd06b3c4655577ed01fea79ec5743b4b0') diff --git a/libre/lilo/lilo.conf b/pcr/lilo/lilo.conf index 479390df5..479390df5 100644 --- a/libre/lilo/lilo.conf +++ b/pcr/lilo/lilo.conf diff --git a/libre/lilo/lilo.install b/pcr/lilo/lilo.install index 7375fddf8..7375fddf8 100644 --- a/libre/lilo/lilo.install +++ b/pcr/lilo/lilo.install diff --git a/pcr/mednafen-server/PKGBUILD b/pcr/mednafen-server/PKGBUILD index 0db1b1068..9968dde38 100644 --- a/pcr/mednafen-server/PKGBUILD +++ b/pcr/mednafen-server/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=mednafen-server _pkgname=${pkgname%-server} diff --git a/pcr/par/PKGBUILD b/pcr/par/PKGBUILD new file mode 100644 index 000000000..2a6c0fac3 --- /dev/null +++ b/pcr/par/PKGBUILD @@ -0,0 +1,38 @@ +# Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> +# Contributor: quantax -- contact via Arch Linux forum or AUR + +pkgname=par +pkgver=1.52 +pkgrel=3 +pkgdesc="Paragraph reformatter" +url="http://www.nicemice.net/par/" +depends=('glibc') +arch=(i686 x86_64) +license=('Custom') +source=(http://www.nicemice.net/par/Par152-autoconf.tar.gz + http://www.nicemice.net/par/par_1.52-i18n.3.diff.gz + http://www.nicemice.net/par/Par152.tar.gz ) +md5sums=('83e4d23a943ab07c44dd995b73195c70' + 'e79b448cb14323a39d817afce4847cdf' + '4ccacd824171ba2c2f14fb8aba78b9bf') + +prepare() { + cd $srcdir/Par152 + + patch -p1 -i $srcdir/par_1.52-i18n.3.diff +} + +build() { + cd $srcdir/Par152 + + ./configure --prefix=/usr + + make +} + +package() { + cd $srcdir/Par152 + install --mode=755 -D par "${pkgdir}/usr/bin/par" + install --mode=644 -D par.1 "${pkgdir}/usr/share/man/man1/par.1" + install --mode=644 -D par.doc "${pkgdir}/usr/share/licenses/${pkgname}/par.doc" +} diff --git a/pcr/perl-crypt-dh/PKGBUILD b/pcr/perl-crypt-dh/PKGBUILD new file mode 100644 index 000000000..e2c9b5a3c --- /dev/null +++ b/pcr/perl-crypt-dh/PKGBUILD @@ -0,0 +1,47 @@ +# Maintainer (AUR): Michael Witten +# +# Derived from perl-crypt-blowfish: +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Charles Mauch <cmauch@gmail.com> +# +# Contributor: Pedro Alejandro López-Valencia <palopezv@gmail.com> + +pkgname=perl-crypt-dh +pkgver=0.07 +pkgrel=3 + +pkgdesc='Perl/CPAN Module Crypt::DH: Diffie-Hellman key exchange system' + +_cpan_name=Crypt-DH-$pkgver +url=http://search.cpan.org/~mithaldu/$_cpan_name/lib/Crypt/DH.pm + +license=(GPL PerlArtistic) +source=("http://search.cpan.org/CPAN/authors/id/M/MI/MITHALDU/$_cpan_name.tar.gz") +md5sums=(5494c91420bf77de4af808fcafb6c3ce) + +arch=(any) +makedepends=(make) +depends=(perl perl-math-bigint-gmp) + +build() +{ + cd "$srcdir/$_cpan_name" + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() +{ + cd "$srcdir/$_cpan_name" + make test +} + +package() +{ + cd "$srcdir/$_cpan_name" + make pure_install DESTDIR="$pkgdir" + + cd "$pkgdir" + find . -name '.packlist' -delete + find . -name '*.pod' -delete +} diff --git a/pcr/perl-math-bigint-gmp/PKGBUILD b/pcr/perl-math-bigint-gmp/PKGBUILD new file mode 100644 index 000000000..32923d432 --- /dev/null +++ b/pcr/perl-math-bigint-gmp/PKGBUILD @@ -0,0 +1,37 @@ +# Maintainer (AUR): Pedro Alejandro López-Valencia <palopezv@gmail.com> + +_author=PJACKLAM +_perlmod=Math-BigInt-GMP +pkgname=perl-math-bigint-gmp +pkgver=1.37 +pkgrel=2 +pkgdesc="Big integer calculations using the GNU Multiple Precision Arithmetic Library." +arch=('i686' 'x86_64') +url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/" +license=('GPL' 'PerlArtistic') +depends=('perl>=5.16.2' 'gmp') +options=(!emptydirs) +source=(http://cpan.perl.org/modules/by-authors/id/P/PJ/$_author/$_perlmod-$pkgver.tar.gz) +md5sums=('d11bf69c0471e38191f33144079d0373') + +build() { + cd "$srcdir/$_perlmod-$pkgver" + # Install module in vendor directories. + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make +} + +check() { + cd "$srcdir/$_perlmod-$pkgver" + make test +} + +package() { + cd "$srcdir/$_perlmod-$pkgver" + make install DESTDIR="$pkgdir/" + + find ${pkgdir} -name '.packlist' -delete + find ${pkgdir} -name '*.pod' -delete +} + +# vim:set ts=2 sw=2 et ft=sh: diff --git a/pcr/pybonjour/PKGBUILD b/pcr/pybonjour/PKGBUILD index 9f77354b2..cb7d6bd45 100644 --- a/pcr/pybonjour/PKGBUILD +++ b/pcr/pybonjour/PKGBUILD @@ -16,4 +16,4 @@ md5sums=('30cbfd3e9e9721b39f6aa67df1c315a2') package() { cd $srcdir/$pkgname-$pkgver python2 setup.py install --root=$pkgdir - } +} diff --git a/pcr/python2-paramiko/PKGBUILD b/pcr/python2-paramiko/PKGBUILD deleted file mode 100644 index da62b4e28..000000000 --- a/pcr/python2-paramiko/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Chris Brannon <cmbrannon79@gmail.com> -# Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Contributor: Mario Danic <mario.danic@gmail.com> - -pkgbase=python-paramiko -pkgname=python2-paramiko -pkgver=1.9.0 -pkgrel=1 -pkgdesc="Python module that implements the SSH2 protocol" -url="http://www.lag.net/paramiko/" -license=('LGPL') -arch=('any') -depends=('python2-crypto') -conflicts=() -replaces=() -source=(http://pypi.python.org/packages/source/p/paramiko/paramiko-$pkgver.tar.gz) - - -package_python2-paramiko() { - cd "$srcdir/paramiko-$pkgver" - - python2 setup.py install --root="$pkgdir" --optimize=1 - install -Dm644 README "$pkgdir/usr/share/doc/$pkgname/README" - install -dm755 "$pkgdir/usr/share/doc/$pkgname/demos" - install -m644 demos/* "$pkgdir/usr/share/doc/$pkgname/demos" - chmod 755 "$pkgdir/usr/share/doc/$pkgname/demos/"*.py - - find "$pkgdir" -name '*.py' -print0 |xargs -0 \ - sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \ - -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,' -} -md5sums=('b78472021ff6586dd61ad6972032f54f') diff --git a/pcr/radiusclient-ng/PKGBUILD b/pcr/radiusclient-ng/PKGBUILD new file mode 100644 index 000000000..437030401 --- /dev/null +++ b/pcr/radiusclient-ng/PKGBUILD @@ -0,0 +1,31 @@ +# Contributor: Jonathan Liu <net147@gmail.com> +pkgname=radiusclient-ng +pkgver=0.5.6 +pkgrel=1 +pkgdesc="Client library and basic utilities for RADIUS AAA" +arch=(i686 x86_64) +url="http://wiki.freeradius.org/Radiusclient" +license=('custom:NetBSD') +depends=('bash') +conflicts=('freeradius-client') +source=(http://download.berlios.de/radiusclient-ng/$pkgname-$pkgver.tar.gz) +md5sums=('6fb7d4d0aefafaee7385831ac46a8e9c') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc + make + +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + + install -D -m644 "$srcdir/$pkgname-$pkgver/COPYRIGHT" \ + "$pkgdir/usr/share/licenses/${pkgver}/COPYRIGHT" + +} + +# vim:set ts=2 sw=2 et: diff --git a/pcr/ruby-haml/ruby-yard/PKGBUILD b/pcr/ruby-haml/ruby-yard/PKGBUILD deleted file mode 100644 index a686f937d..000000000 --- a/pcr/ruby-haml/ruby-yard/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Matt Harrison <matt at mistbyte dot com> -# Contributor: Renzo Carbonara <gnuk0001@gmail.com> - -pkgname=ruby-yard -_gemname=${pkgname#ruby-} -pkgver=0.8.2.1 -pkgrel=2 -pkgdesc="Documentation tool for consistent and usable documentation in Ruby." -arch=('any') -url="http://yardoc.org" -license=('MIT') -groups=() -depends=() -makedepends=('rubygems') -optdepends=() -provides=() -conflicts=() -replaces=() -backup=() -options=() -install= -source=("http://gems.rubyforge.org/gems/yard-${pkgver}.gem") -noextract=("yard-${pkgver}.gem") - -build() { - cd $srcdir - local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')" - gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" \ - -n "$pkgdir/usr/bin" ${_gemname}-$pkgver.gem - install -D "$pkgdir$_gemdir/gems/${_gemname}-$pkgver/LICENSE" \ - "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" -} - -md5sums=('08a48d23f8729b68945011cae7d121fe') - -# vim:set ts=2 sw=2 et: diff --git a/pcr/sipwitch/PKGBUILD b/pcr/sipwitch/PKGBUILD index 22852780c..eba2bb854 100644 --- a/pcr/sipwitch/PKGBUILD +++ b/pcr/sipwitch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Serban # Contributors: David Zaragoza, Andrea Scarpino -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=sipwitch pkgver=1.2.4 diff --git a/pcr/smtube/PKGBUILD b/pcr/smtube/PKGBUILD new file mode 100644 index 000000000..d54983bb0 --- /dev/null +++ b/pcr/smtube/PKGBUILD @@ -0,0 +1,22 @@ +# Maintainer: Guest One <theguestone at gmail dot com> +pkgname=smtube +pkgver=1.7 +pkgrel=1 +pkgdesc="Search and download videos from YouTube" +arch=('i686' 'x86_64') +url="http://smplayer.sourceforge.net" +license=('GPL') +depends=('qt4' 'smplayer') +source=(http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2) + +md5sums=('d9a954e1b337f0c850dcfc6063255056') + +build() { + cd "$srcdir/$pkgname-$pkgver" + make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr" DESTDIR="$pkgdir" install +}
\ No newline at end of file diff --git a/pcr/spacenav-daemon/PKGBUILD b/pcr/spacenav-daemon/PKGBUILD index 0f06af418..fb1229ae4 100644 --- a/pcr/spacenav-daemon/PKGBUILD +++ b/pcr/spacenav-daemon/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=spacenav-daemon _pkgname=${pkgname%-daemon} diff --git a/pcr/torque/PKGBUILD b/pcr/torque/PKGBUILD index 5f469fa5f..850aa3b7d 100644 --- a/pcr/torque/PKGBUILD +++ b/pcr/torque/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=torque pkgver=4.2.2 diff --git a/pcr/transmission-remote-cli/PKGBUILD b/pcr/transmission-remote-cli/PKGBUILD index 5e3699bce..dcabaa642 100644 --- a/pcr/transmission-remote-cli/PKGBUILD +++ b/pcr/transmission-remote-cli/PKGBUILD @@ -1,29 +1,25 @@ # Maintainer: fauno <fauno@kiwwwi.com.ar> pkgname=transmission-remote-cli -pkgver=0.10.4 +pkgver=1.5.0 pkgrel=1 pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission" arch=('any') url="https://github.com/fagga/transmission-remote-cli" license=('GPL3') depends=('python2') -optdepends=('transmission-daemon>=2.40: for local transmission management' +optdepends=('transmission-daemon: for local transmission management' 'adns-python: Resolve IPs to host names' - 'python-geoip: Guess which country peers come from') + 'python2-geoip: Guess which country peers come from') conflicts=('transmission-remote-cli-git' "transmission-remote-cli<=20111013") replaces=('transmission-remote-cli-git') -source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz - python2.patch) +source=(https://github.com/fagga/${pkgname}/archive/v${pkgver}.tar.gz) -build() { +package() { cd "${srcdir}/${pkgname}" msg "Starting make..." - patch -Np1 -i ${srcdir}/python2.patch - install -d ${pkgdir}/usr/bin/ install -Dm755 transmission-remote-cli.py ${pkgdir}/usr/bin/transmission-remote-cli } -md5sums=('b85382bc2e24c5733f9c3833098da668' - '6273609fb3a7294328aeaa526b76411c') +md5sums=('4c13aa8596d35ce5793ea65affa8a6e5') diff --git a/pcr/wuala/copyright b/pcr/wuala/copyright deleted file mode 100644 index 699b835e9..000000000 --- a/pcr/wuala/copyright +++ /dev/null @@ -1,16 +0,0 @@ -wuala - -Copyright (C) 2011 LaCie AG <deb@wuala.com> - -License: - -All rights reserved - -The home page of wuala is at: -http://www.wuala.com - -Licensing information and third party code: -http://www.wuala.com/about/thirdpartycode/ - -General Terms and Conditions: -http://www.wuala.com/about/terms/ diff --git a/pcr/wuala/loader3.jar b/pcr/wuala/loader3.jar Binary files differdeleted file mode 100644 index 70b2f8ae1..000000000 --- a/pcr/wuala/loader3.jar +++ /dev/null diff --git a/pcr/wuala/readme.txt b/pcr/wuala/readme.txt deleted file mode 100644 index e72fa8a8c..000000000 --- a/pcr/wuala/readme.txt +++ /dev/null @@ -1,17 +0,0 @@ -Installing & running Wuala - -1. Install Java (if not yet installed) - Make sure you have Java version 1.6 or later installed. - To check, type 'java -version'. If you can not install Java with the - package manager of your distro, Java can be downloaded from http://java.sun.com. - -2. Untar the downloaded wuala.tar.gz: tar -xzf wuala.tar.gz - -3. Start Wuala by executing the wuala script from extracted wuala directory. - -Used Directories: -~/.config/ Wuala will put its configuration file Wuala.cfg there -~/wuala/ Default program directory. - -Have fun! -For feedback or questions, feel free to contact support@wuala.com. diff --git a/pcr/wuala/wuala b/pcr/wuala/wuala deleted file mode 100755 index 939c783f5..000000000 --- a/pcr/wuala/wuala +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env bash - -export GDK_NATIVE_WINDOWS=true -export UBUNTU_MENUPROXY=0 -export LIBOVERLAY_SCROLLBAR=0 - -function launchWuala() { - if [ -z "$JAVA" ]; then - JAVA=`which java` - fi - echo $JAVA - pushd "$(dirname $0)" > /dev/null - $JAVA -ea -Xmx384m -Djava.net.preferIPv4Stack=true -jar loader3.jar -installed "$@" - popd > /dev/null -} - -if [ -z "$DISPLAY" ]; then - echo "Running on console" - launchWuala "-nogui" "$@" -else - echo "Running on display $DISPLAY" - launchWuala "$@" -fi diff --git a/pcr/wuala/wualacmd b/pcr/wuala/wualacmd deleted file mode 100755 index 41ef1d5c7..000000000 --- a/pcr/wuala/wualacmd +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -./wuala -nogui "$@" diff --git a/pcr/xf86-input-wizardpen/PKGBUILD b/pcr/xf86-input-wizardpen/PKGBUILD index 4b40ebea2..dfad17f34 100644 --- a/pcr/xf86-input-wizardpen/PKGBUILD +++ b/pcr/xf86-input-wizardpen/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> +# Maintainer: Márcio Silva <coadde@lavabit.com> pkgname=xf86-input-wizardpen _pkgname=${pkgname:11} diff --git a/social/asterisk/PKGBUILD b/social/asterisk/PKGBUILD index 896d5bacf..fe8204d0a 100644 --- a/social/asterisk/PKGBUILD +++ b/social/asterisk/PKGBUILD @@ -1,7 +1,7 @@ # Contributor: Alessio Biancalana <dottorblaster@gmail.com> pkgname=asterisk -pkgver=10.9.0 +pkgver=11.0.1 pkgrel=1 pkgdesc="A complete PBX solution" arch=('i686' 'x86_64') @@ -15,20 +15,20 @@ source=(http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-$ asterisk \ asterisk.logrotated) install=$pkgname.install -md5sums=('2fb85dc753584ac13692c27f9749c6cb' +md5sums=('3e80a5cef7b0f8808578efcc84c39fd7' '59146273738605f1e011d8e7bed3561a' '486e07a0a1405ea25ec5b1736034653e') build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make + make || return 1 } package(){ cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - make DESTDIR=${pkgdir} samples + make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} samples || return 1 (cd ${pkgdir}/etc/asterisk # for i in `ls`; do [ $i = "asterisk.conf" ] || mv $i $i.default; done diff --git a/social/miniupnpc/PKGBUILD b/social/miniupnpc/PKGBUILD deleted file mode 100644 index a28b9842f..000000000 --- a/social/miniupnpc/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# Contributor: Florian Loitsch <archlinux@florian.loitsch.com> -pkgname=miniupnpc -pkgver=1.7.20120830 -pkgrel=1 -pkgdesc='A small UPnP client library/tool to access Internet Gateway Devices' -arch=('i686' 'x86_64' 'mips64el') -url="http://miniupnp.free.fr" -license=('BSD') -depends=('sh') -source=("http://miniupnp.free.fr/files/$pkgname-$pkgver.tar.gz") -md5sums=('c74b24b906e11860005fc425b4979fe6') - -build() { - cd $srcdir/$pkgname-$pkgver - make -} - -package(){ - cd $srcdir/$pkgname-$pkgver - make INSTALLPREFIX=$pkgdir/usr install - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/social/openswan/PKGBUILD b/social/openswan/PKGBUILD deleted file mode 100644 index b60ca8401..000000000 --- a/social/openswan/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Contributor: Jan Fader <jan.fader@web.de> -pkgname=openswan -pkgver=2.6.36 -pkgrel=1 -pkgdesc="Open Source implementation of IPsec for the Linux operating system" -url="http://www.openswan.org" -license=('GPL' 'custom') -arch=('i686' 'x86_64') -depends=('iproute' 'gmp' 'perl') -backup=(etc/ipsec.conf \ - etc/ipsec.d/policies/{block,clear,clear-or-private,private,private-or-clear}) -source=(http://www.openswan.org/download/openswan-$pkgver.tar.gz - openswan.rc.d - compile.patch) - -build() { - # Create /etc/rc.d for init script, and license directory - mkdir -p $pkgdir/{etc/rc.d,usr/share/licenses/openswan} - - cd $srcdir/openswan-$pkgver - patch -p1 -i $srcdir/compile.patch - - # Change install paths to Arch defaults - sed -i 's|/usr/local|/usr|;s|libexec/ipsec|lib/openswan|' Makefile.inc - - make USE_XAUTH=true USE_OBJDIR=true programs -} - -package(){ - cd $srcdir/openswan-$pkgver - make DESTDIR=$pkgdir install - - # Change permissions in /var - chmod 755 $pkgdir/var/run/pluto - - # Copy License - cp LICENSE $pkgdir/usr/share/licenses/openswan - - # Install init script - install -Dm755 ../openswan.rc.d $pkgdir/etc/rc.d/openswan - # fix manpages - mv $pkgdir/usr/man $pkgdir/usr/share/ -} -md5sums=('b3a1733493520bb18729633b62ef8247' - '543d84162761b9cc9ec319e938c4dd2a' - '5540437bb334873da646e21ac9caa963') diff --git a/social/openswan/compile.patch b/social/openswan/compile.patch deleted file mode 100644 index 8ddff67f2..000000000 --- a/social/openswan/compile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- openswan-2.6.23/Makefile 2009-09-09 02:42:54.000000000 +0200 -+++ Makefile 2009-12-30 10:13:53.000000000 +0100 -@@ -12,6 +12,8 @@ - # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - # for more details. - # -+CFLAGS=-fno-strict-aliasing -+CXXFLAGS=-fno-strict-aliasing - - - OPENSWANSRCDIR?=$(shell pwd) diff --git a/social/openswan/openswan.rc.d b/social/openswan/openswan.rc.d deleted file mode 100755 index 30bd0d56e..000000000 --- a/social/openswan/openswan.rc.d +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting Openswan IPsec" - /etc/rc.d/ipsec --start - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon openswan - fi - ;; - stop) - stat_busy "Stopping Openswan IPsec" - /etc/rc.d/ipsec --stop - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - rm_daemon openswan - fi - ;; - restart) - stat_busy "Restarting Openswan IPsec" - /etc/rc.d/ipsec --restart - if [ $? -gt 0 ]; then - stat_fail - else - stat_done - add_daemon openswan - fi - ;; - status) - /etc/rc.d/ipsec --status - ;; - *) - echo "usage: $0 {start|stop|restart|status}" -esac - diff --git a/social/sipwitch/PKGBUILD b/social/sipwitch/PKGBUILD index 8cb84fad5..6ab789ccc 100644 --- a/social/sipwitch/PKGBUILD +++ b/social/sipwitch/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Dan Serban # Contributors: David Zaragoza, Andrea Scarpino -# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=sipwitch pkgver=1.2.4 diff --git a/~brendan/guile/PKGBUILD b/~brendan/guile/PKGBUILD deleted file mode 100644 index af8827563..000000000 --- a/~brendan/guile/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Patrick McCarty <pnorcks at gmail dot com> -# Contributor: Emmanuel 'guinness' Boudreault -# Parabola Maintainer: Brendan Tildesley (brendyn) -# -# This is `guile-devel' from AUR, with very little changes. -pkgname=guile -pkgver=2.0.5 -pkgrel=1 -pkgdesc="GNU Ubiquitous Intelligent Language for Extensions - a portable, embeddable Scheme implementation written in C" -url="http://www.gnu.org/software/guile/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gmp>=4.3.1' 'libtool' 'ncurses>=5.7' 'texinfo' - 'libunistring' 'gc' 'libffi') -conflicts=('guile' 'guile-git') -provides=("guile=$pkgver") -install=guile.install -options=('!libtool') -source=(ftp://ftp.gnu.org/pub/gnu/guile/guile-${pkgver}.tar.gz) -sha256sums=('2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956') - -build() { - cd "${srcdir}/guile-${pkgver}" - - ./configure --prefix=/usr - make LDFLAGS+="-lpthread" -} - -package() { - cd "${srcdir}/guile-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/libre/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD index a5b733e9f..256b6e9ae 100644 --- a/libre/mariadb/PKGBUILD +++ b/~coadde/mariadb/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> -# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> falsename=mysql _falsename=MySQL diff --git a/libre/mariadb/mariadb.install b/~coadde/mariadb/mariadb.install index f56a0dcaa..f56a0dcaa 100644 --- a/libre/mariadb/mariadb.install +++ b/~coadde/mariadb/mariadb.install diff --git a/libre/mariadb/mariadbd b/~coadde/mariadb/mariadbd index 3ae612096..3ae612096 100755 --- a/libre/mariadb/mariadbd +++ b/~coadde/mariadb/mariadbd diff --git a/libre/mariadb/my.cnf b/~coadde/mariadb/my.cnf index 9a41b4fc3..9a41b4fc3 100644 --- a/libre/mariadb/my.cnf +++ b/~coadde/mariadb/my.cnf diff --git a/libre/mariadb/mysql.install b/~coadde/mariadb/mysql.install index 9a4479215..9a4479215 100644 --- a/libre/mariadb/mysql.install +++ b/~coadde/mariadb/mysql.install diff --git a/libre/mariadb/mysqld b/~coadde/mariadb/mysqld index 1ac88a7cc..1ac88a7cc 100644 --- a/libre/mariadb/mysqld +++ b/~coadde/mariadb/mysqld diff --git a/~emulatorman/hunspell-gl/PKGBUILD b/~emulatorman/hunspell-gl/PKGBUILD index 210fda175..8c791a2fe 100644 --- a/~emulatorman/hunspell-gl/PKGBUILD +++ b/~emulatorman/hunspell-gl/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>, 2009-2010. -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=hunspell-gl pkgver=2.9b diff --git a/~emulatorman/raider/PKGBUILD b/~emulatorman/raider/PKGBUILD index 960164820..c5629e9fc 100644 --- a/~emulatorman/raider/PKGBUILD +++ b/~emulatorman/raider/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: M.Carreira <arch@carreira.com.pt> # Contributor: M.Carreira <arch@carreira.com.pt> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=raider pkgver=0.10.0 pkgrel=1 diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD index 977999a38..7ed44c2e3 100644 --- a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD +++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD @@ -1,5 +1,5 @@ # Contributor: Gökmen Görgen <gkmngrgn_gmail.com> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=xchat-xsys-noaudacious pkgver=2.2.0 pkgrel=3 diff --git a/~emulatorman/xonotic-data/PKGBUILD b/~emulatorman/xonotic-data/PKGBUILD index 114954fc3..13f4d5c12 100644 --- a/~emulatorman/xonotic-data/PKGBUILD +++ b/~emulatorman/xonotic-data/PKGBUILD @@ -1,7 +1,7 @@ # $Id: PKGBUILD 35989 2010-12-25 03:22:46Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Alexander Suhoverhov <cy at ngs dot ru> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=xonotic-data pkgver=0.5.0 diff --git a/~emulatorman/xonotic/PKGBUILD b/~emulatorman/xonotic/PKGBUILD index 236474d3d..a51606cd5 100644 --- a/~emulatorman/xonotic/PKGBUILD +++ b/~emulatorman/xonotic/PKGBUILD @@ -1,6 +1,6 @@ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Alexander Suhoverhov <cy at ngs dot ru> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> pkgname=xonotic pkgver=0.5.0 diff --git a/~lukeshu/not-working/codeanalyst/PKGBUILD b/~lukeshu/not-working/codeanalyst/PKGBUILD deleted file mode 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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 100755 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/openni-all/openni-git/PKGBUILD b/~lukeshu/openni-all/openni-git/PKGBUILD deleted file mode 100644 index 7ac6abb87..000000000 --- a/~lukeshu/openni-all/openni-git/PKGBUILD +++ /dev/null @@ -1,286 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> -# Contributor: bugix -# Contributor: Lubosz Sarnecki <lubosz at gmail> - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-git' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=20111121 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -_gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -#_gitbranch="unstable" -_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker" - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_platform}/Build/Makefile" - - - # BUILD - cd "Platform/${_platform}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-git() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-git-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-git-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-git-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-git-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_platform}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-git-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-git-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-git-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-git-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-git-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-git-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-git/openni.install b/~lukeshu/openni-all/openni-git/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-git/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD b/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD deleted file mode 100644 index 0ebfac2e5..000000000 --- a/~lukeshu/openni-all/openni-module-primesensor-git/PKGBUILD +++ /dev/null @@ -1,65 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: pallegro from the AUR - -_pkgname=openni-module-primesensor -pkgname=${_pkgname}-git -pkgver=20111115 -pkgrel=1 -pkgdesc="OpenNI PrimeSensor harware modules for the PrimeSense sensor device" -arch=('i686') -url="http://www.primesense.com/" -license=('GPL') -depends=('openni') -makedepends=('git') -provides=($_pkgname) -conflicts=($_pkgname) -install="sensorkinect.install" -source=() -md5sums=() - -_gitroot="https://github.com/PrimeSense/Sensor.git" -_gitname="primesensor" -_gitbranch="unstable" -#_gitbranch="master" - -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 -b $_gitbranch $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitname-build" - git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" - cd $srcdir/$_gitname-build - - # BUILD - cd Platform/Linux-x86/Build - make NI_CONF_DIR=/etc || return 1 -} - -package() { - install -d -m755 ${pkgdir}/usr/{lib,bin} - - cd $srcdir/$_gitname-build/Platform/Linux-x86/Bin/Release - install XnSensorServer ${pkgdir}/usr/bin - install libXnCore.so libXnDDK.so libXnDeviceFile.so libXnDeviceSensorV2KM.so libXnFormats.so ${pkgdir}/usr/lib - chmod +s ${pkgdir}/usr/bin/XnSensorServer - - cd $srcdir/$_gitname-build/Platform/Linux-x86/Install - install -d -m755 ${pkgdir}/etc/udev/rules.d - install 55-primesense-usb.rules ${pkgdir}/etc/udev/rules.d - - cd $srcdir/$_gitname-build/Data - install -d -m755 ${pkgdir}/etc/primesense - install GlobalDefaultsKinect.ini ${pkgdir}/etc/primesense - - install -d -m777 ${pkgdir}/var/log/primesense/XnSensorServer -} diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD b/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD deleted file mode 100644 index 2a2abbdc5..000000000 --- a/~lukeshu/openni-all/openni-module-sensorkinect-git/PKGBUILD +++ /dev/null @@ -1,77 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: pallegro from the AUR - -pkgname=openni-module-sensorkinect-git -pkgver=20111211 -pkgrel=2 -pkgdesc="OpenNI SensorKinect harware modules for the Xbox Kinect device" -arch=('i686' 'x86_64') -url="https://github.com/avin2/SensorKinect" -license=('GPL') -depends=('openni-unstable' 'kinect-udev') -makedepends=('git') -provides=('openni-module-sensorkinect') -conflicts=('openni-module-sensorkinect' 'openni-module-primesensor') -install="sensorkinect.install" -source=() -md5sums=() - -_gitroot="https://github.com/avin2/SensorKinect.git" -_gitname="sensorkinect" -_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - 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 - cd Platform/${_platform}/Build - make - make redist -} - -package() { - cd $srcdir/$_gitname-build - cd Platform/${_platform}/Redist - - # This is all cloned from ./install.sh, which can't be used for a number - # of reasons. - install -d $pkgdir/usr/{lib,bin} - install -m755 Lib/* $pkgdir/usr/lib - install -m755 Bin/* $pkgdir/usr/bin - - install -d $pkgdir/etc/primesense - install -m644 Config/GlobalDefaultsKinect.ini $pkgdir/etc/primesense - - chmod +s $pkgdir/usr/bin/XnSensorServer - - install -m777 -d $pkgdir/var/log/primesense/XnSensorServer -} diff --git a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install b/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install deleted file mode 100644 index d62d263d1..000000000 --- a/~lukeshu/openni-all/openni-module-sensorkinect-git/sensorkinect.install +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -export MODULES="libXnDeviceSensorV2KM.so libXnDeviceFile.so" - -post_install() { - for module in $MODULES; do - /usr/bin/niReg -r /usr/lib/$module /etc/primesense - done -} - -pre_remove() { - for module in $MODULES; do - /usr/bin/niReg -u /usr/lib/$module - done -} diff --git a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD b/~lukeshu/openni-all/openni-unstable-git/PKGBUILD deleted file mode 100644 index 07f276b02..000000000 --- a/~lukeshu/openni-all/openni-unstable-git/PKGBUILD +++ /dev/null @@ -1,286 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> -# Contributor: bugix -# Contributor: Lubosz Sarnecki <lubosz at gmail> - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-unstable-git' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=20111121 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -_gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -_gitbranch="unstable" -#_gitbranch="master" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${_gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker" - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_os}/Build/Makefile" - - - # BUILD - cd "Platform/${_os}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-unstable-git() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni' 'openni-unstable') - conflicts=('openni' 'openni-unstable') -} - -package_openni-unstable-git-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs' 'openni-unstable-docs') - conflicts=('openni-docs' 'openni-unstable-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-unstable-git-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core' 'openni-unstable-core') - conflicts=('openni-core' 'openni-unstable-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-unstable-git-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java' 'openni-unstable-java') - conflicts=('openni-java' 'openni-unstable-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-unstable-git-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono' 'openni-unstable-mono') - conflicts=('openni-mono' 'openni-unstable-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_os}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-unstable-git-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples' 'openni-unstable-core-samples') - conflicts=('openni-core-samples' 'openni-unstable-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-unstable-git-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source' 'openni-unstable-core-samples-source') - conflicts=('openni-core-samples-source' 'openni-unstable-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-unstable-git-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples' 'openni-unstable-java-samples') - conflicts=('openni-java-samples' 'openni-unstable-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-unstable-git-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source' 'openni-unstable-java-samples-source') - conflicts=('openni-java-samples-source' 'openni-unstable-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-unstable-git-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples' 'openni-unstable-mono-samples') - conflicts=('openni-mono-samples' 'openni-unstable-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-unstable-git-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source' 'openni-unstable-mono-samples-source') - conflicts=('openni-mono-samples-source' 'openni-unstable-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-unstable-git/openni.install b/~lukeshu/openni-all/openni-unstable-git/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-unstable-git/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-unstable/PKGBUILD b/~lukeshu/openni-all/openni-unstable/PKGBUILD deleted file mode 100644 index 19d1575a1..000000000 --- a/~lukeshu/openni-all/openni-unstable/PKGBUILD +++ /dev/null @@ -1,294 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> -# Contributor: bugix -# Contributor: Lubosz Sarnecki <lubosz at gmail> - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='-unstable' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=1.4.0.2 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -options+=('!strip') -source=() -md5sums=() - -__gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -_gitbranch="Unstable-$pkgver" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x64;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - #if [ -d ${_gitname} ] ; then - cd ${_gitname} - # git checkout master - # git pull origin - # msg "The local files are updated." - #else - # git clone ${__gitroot} ${_gitname} - # cd ${_gitname} - #fi - git checkout ${_gitbranch} - cd .. - - 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" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_os}/CreateRedist/RedistMaker" - - for sample in NiViewer NiSimpleViewer NiUserTracker NiUserSelection NiHandTracker; do - echo 'USED_LIBS += GL' >> "Platform/${_os}/Build/Samples/${sample}/Makefile" - done - - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_os}/Build/Makefile" - - - # BUILD - cd "Platform/${_os}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples - cd "../Bin/${_arch}-Release" - ln NiViewer Sample-NiViewer - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni-unstable() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-unstable-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-unstable-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni-core.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" - - install -d "${pkgdir}/var/lib/ni" -} - -package_openni-unstable-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-unstable-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - install="openni-mono.install" - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_os}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - HandTracker - RecordSynthetic - SimpleCreate - UserSelection - Viewer - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-unstable-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - for sample in $CORE_SAMPLES; do - install -m755 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-unstable-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-unstable-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-unstable-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-unstable-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_os}/Bin/${_arch}-Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-unstable-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni-unstable/openni-core.install b/~lukeshu/openni-all/openni-unstable/openni-core.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni-unstable/openni-core.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} diff --git a/~lukeshu/openni-all/openni-unstable/openni-mono.install b/~lukeshu/openni-all/openni-unstable/openni-mono.install deleted file mode 100644 index 72a6fb23d..000000000 --- a/~lukeshu/openni-all/openni-unstable/openni-mono.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - gacutil -i /usr/share/openni/mono/OpenNI.net.dll -gacdir /usr -} - -post_remove() { - gacutil -u OpenNI.net -gacdir /usr -} diff --git a/~lukeshu/openni-all/openni/PKGBUILD b/~lukeshu/openni-all/openni/PKGBUILD deleted file mode 100644 index 2cdc2fd7d..000000000 --- a/~lukeshu/openni-all/openni/PKGBUILD +++ /dev/null @@ -1,288 +0,0 @@ -# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> -# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com> -# Contributor: bugix -# Contributor: Lubosz Sarnecki <lubosz at gmail> - -# unfortunately we can't use $_suf in function names, but sed makes it ok -_suf='' -pkgname=( - openni$_suf - openni$_suf-docs - - openni$_suf-core - openni$_suf-core-samples - openni$_suf-core-samples-source - - openni$_suf-mono - openni$_suf-mono-samples - openni$_suf-mono-samples-source - - openni$_suf-java - openni$_suf-java-samples - openni$_suf-java-samples-source - ) -pkgver=1.3.3.6 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://www.openni.org/" -license=('GPL') -makedepends=('git' 'doxygen' 'graphviz') -source=() -md5sums=() - -__gitroot="git://github.com/OpenNI/OpenNI.git" -_gitname="openni" -#_gitbranch="unstable" -#_gitbranch="master" -_gitbranch="Stable-$pkgver" - -_os='Linux' -case "${CARCH}" in -'x86_64') _arch=x86;; -'i686') _arch=x86;; -'arm') _arch=Arm;; # untested -*) _arch=UNSUPPORTED_ARCH;; -esac -_platform="${_os}-${_arch}" - -export MAKEFLAGS+=' -j1 ' - -build() { - cd "${srcdir}" - msg "Connecting to GIT server...." - - if [ -d ${_gitname} ] ; then - cd ${_gitname} - git checkout master - git pull origin - msg "The local files are updated." - else - git clone ${__gitroot} ${_gitname} - cd ${_gitname} - fi - git checkout ${_gitbranch} - cd .. - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "${srcdir}/${_gitname}-build" - git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build" - cd "${srcdir}/${_gitname}-build" - - # PATCH - sed -i 's/python /python2 /' "Platform/${_platform}/CreateRedist/RedistMaker" - mv Wrappers/OpenNI.java/src/org/OpenNI/AlternativeView{p,P}ointCapability.java - echo ' -abs_core: $(ALL_MODULES) $(ALL_UTILS) -abs_core_samples: $(CORE_SAMPLES) -abs_java: $(ALL_JAVA_PROJS) -abs_java_samples: $(JAVA_SAMPLES) -abs_mono: $(ALL_MONO_PROJS) -abs_mono_samples: $(MONO_SAMPLES) $(MONO_FORMS_SAMPLES) -' >> "Platform/${_platform}/Build/Makefile" - - - # BUILD - cd "Platform/${_platform}/Build" - make -j1 \ - abs_core abs_core_samples \ - abs_java abs_java_samples \ - abs_mono abs_mono_samples || return 1 - - cd '../../../Source/DoxyGen' - mkdir html - doxygen Doxyfile - rm -rf html/*.map html*.md5 html/*.hhc html/*.hhp -} - -package_openni() { - pkgdesc="Open Natural Interface framework" - depends=("openni$_suf-core") - optdepends=("openni$_suf-docs: programmer documentation") - provides=('openni') - conflicts=('openni') -} - -package_openni-docs() { - pkgdesc="OpenNI programmer documentation" - arch=('any') - provides=('openni-docs') - conflicts=('openni-docs') - - cd "${srcdir}/${_gitname}-build/Source/DoxyGen/" - install -d "${pkgdir}/usr/share/openni" - cp -r html "${pkgdir}/usr/share/openni" -} - -package_openni-core() { - pkgdesc="OpenNI core libraries" - depends=('libusb' 'freeglut') - install="openni.install" - provides=('openni-core') - conflicts=('openni-core') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - LIB_FILES=' - libnimCodecs.so - libnimMockNodes.so - libnimRecorder.so - libOpenNI.so - ' - install -d "${pkgdir}/usr/lib" - install -m755 $LIB_FILES "${pkgdir}/usr/lib" - - BIN_FILES='niReg niLicense' - install -d "${pkgdir}/usr/bin" - install -m755 $BIN_FILES "${pkgdir}/usr/bin" - - cd "${srcdir}/${_gitname}-build/Include" - install -d "${pkgdir}/usr/include/ni" - install -m644 *.h "${pkgdir}/usr/include/ni" - cp -r "${_platform}" "${pkgdir}/usr/include/ni" - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Build" - install -d "${pkgdir}/usr/share" - cp -r Common "${pkgdir}/usr/share/common" -} - -package_openni-java() { - pkgdesc="OpenNI java wrapper" - depends=("openni$_suf" 'java-environment') - provides=('openni-java') - conflicts=('openni-java') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/lib" - install -m755 libOpenNI.jni.so "${pkgdir}/usr/lib" - - install -d "${pkgdir}/usr/share/openni/java" - install -m755 org.OpenNI.jar "${pkgdir}/usr/share/openni/java" -} - -package_openni-mono() { - pkgdesc="OpenNI mono wrapper" - depends=("openni$_suf" 'mono') - provides=('openni-mono') - conflicts=('openni-mono') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - - install -d "${pkgdir}/usr/share/openni/mono" - install -m755 OpenNI.net.dll "${pkgdir}/usr/share/openni/mono" -} - -# SAMPLES - -_install_sample_source() { - sample=$1 - makefile="Platform/${_platform}/Build/Samples/$sample/Makefile" - install -d "${pkgdir}/usr/share/openni/samples" - cp -r "Samples/$sample" "${pkgdir}/usr/share/openni/samples/$sample" - install -m644 "$makefile" "${pkgdir}/usr/share/openni/samples/$sample" -} - -# Leave out NiViewer, it's set up wrong -CORE_SAMPLES=' - AudioSample - BackRecorder - CRead - ConvertXToONI - RecordSynthetic - SimpleCreate - SimpleRead SimpleViewer UserTracker' -MONO_SAMPLES='SimpleRead SimpleViewer UserTracker' -JAVA_SAMPLES='SimpleRead SimpleViewer UserTracker' - -package_openni-core-samples() { - pkgdesc="OpenNI sample programs" - depends=("openni$_suf-core") - optdepends=('openni-core-samples-source: source code for the samples') - provides=('openni-core-samples') - conflicts=('openni-core-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -m755 NiViewer "${pkgdir}/usr/bin/niSample-Viewer" - for sample in $CORE_SAMPLES; do - install -m766 Sample-Ni$sample "${pkgdir}/usr/bin/niSample-$sample" - done -} -package_openni-core-samples-source() { - pkgdesc="OpenNI sample programs source code" - depends=("openni$_suf-core") - provides=('openni-core-samples-source') - conflicts=('openni-core-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in Viewer $CORE_SAMPLES; do - _install_sample_source Ni$sample - done -} - -package_openni-java-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-java") - optdepends=("openni$_suf-java-samples-source: source code for the samples") - arch=('any') - provides=('openni-java-samples') - conflicts=('openni-java-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/java" - for sample in $JAVA_SAMPLES; do - install -m644 org.OpenNI.Samples.$sample.jar "${pkgdir}/usr/share/openni/java" - echo "#/bin/sh -java -jar /usr/share/openni/java/org.OpenNI.Samples.$sample.jar $@ -" > "${pkgdir}/usr/bin/niSample-$sample.jar" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.jar" - done -} -package_openni-java-samples-source() { - pkgdesc="OpenNI java wrapper sample programs source code" - depends=("openni$_suf-java") - provides=('openni-java-samples-source') - conflicts=('openni-java-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $JAVA_SAMPLES; do - _install_sample_source $sample.java - done -} - -package_openni-mono-samples() { - pkgdesc="OpenNI java wrapper sample programs" - depends=("openni$_suf-mono") - optdepends=("openni$_suf-mono-samples-source: source code for the samples") - provides=('openni-mono-samples') - conflicts=('openni-mono-samples') - - cd "${srcdir}/${_gitname}-build/Platform/${_platform}/Bin/Release" - install -d "${pkgdir}/usr/bin" - install -d "${pkgdir}/usr/share/openni/mono" - for sample in $MONO_SAMPLES; do - install -m755 $sample.net.exe "${pkgdir}/usr/share/openni/mono" - echo "#/bin/sh -cd /usr/share/openni/mono -mono $sample.net.exe $@ -" > "${pkgdir}/usr/bin/niSample-$sample.net" - chmod 755 "${pkgdir}/usr/bin/niSample-$sample.net" - done -} -package_openni-mono-samples-source() { - pkgdesc="OpenNI mono wrapper sample programs source code" - depends=("openni$_suf-mono") - provides=('openni-mono-samples-source') - conflicts=('openni-mono-samples-source') - options+=('!strip') - - cd "${srcdir}/${_gitname}-build" - for sample in $MONO_SAMPLES; do - _install_sample_source $sample.net - done -} diff --git a/~lukeshu/openni-all/openni/openni.install b/~lukeshu/openni-all/openni/openni.install deleted file mode 100644 index 8470f4512..000000000 --- a/~lukeshu/openni-all/openni/openni.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so" - for module in $MODULES - do - /usr/bin/niReg /usr/lib/$module - done -} - -pre_remove() { - rm /var/lib/ni/modules.xml -} |
