diff options
46 files changed, 699 insertions, 172 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index 8a84fc0e9..b36205e09 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com> # Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com> pkgname=0ad -pkgver=a8 -_pkgver=r10803-alpha +pkgver=a9 +_pkgver=r11339-alpha pkgrel=1 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') @@ -12,17 +12,13 @@ license=('GPL2' 'CCPL') depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data') makedepends=('boost' 'cmake' 'mesa') source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") -md5sums=('92ac750c433a8aea4db602019b27a274') +md5sums=('6db1e62215654269516f5eb1eec371f1') build() { cd "$srcdir/$pkgname-$_pkgver/build/workspaces" - sed -i 's/unix_names = { "boost_signals-mt", "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_signals", "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" - - # next version use this - # sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" - # sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" - + sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" + sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" ./update-workspaces.sh \ --with-system-enet \ diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 587e24193..1a61266cc 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 67477 2012-03-12 10:39:06Z giovanni $ +# $Id: PKGBUILD 67895 2012-03-15 23:14:18Z ebelanger $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Petrov Roman <nwhisper@gmail.com> # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> pkgname=calibre pkgver=0.8.42 -pkgrel=1 +pkgrel=2 pkgdesc="Ebook management application" arch=('i686' 'x86_64' 'mips64el') url="http://calibre-ebook.com/" license=('GPL3') depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' - 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' - 'python-imaging' 'desktop-file-utils' 'shared-mime-info' - 'python-dnspython' 'libunrar' 'python2-pyqt' 'icu') + 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusb' + 'python-imaging' 'shared-mime-info' 'python-dnspython' + 'libunrar' 'python2-pyqt' 'icu') makedepends=('python2-pycountry') optdepends=('ipython: to use calibre-debug') install=calibre.install diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index cfce51ca6..5f2813c43 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 67566 2012-03-13 12:32:57Z lcarlier $ +# $Id: PKGBUILD 67882 2012-03-15 16:59:01Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee pkgver=1.99.08 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>=10.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>=11.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver chmsee) @@ -23,7 +23,7 @@ build() { cp Makefile.arch Makefile #sed -i -e 's/python/python2/g' common.mk - #sed -i -e 's/5.0/10.0/g' Makefile + sed -i -e 's/10.*/11.*/g' ../application.ini make } diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD index 78654bcb3..811417a38 100644 --- a/community/darktable/PKGBUILD +++ b/community/darktable/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 63524 2012-02-05 11:53:20Z ibiru $ +# $Id: PKGBUILD 67862 2012-03-15 15:26:31Z 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=0.9.3 -_pkgver=0.9 -pkgrel=5 +pkgver=1.0 +_pkgver=1.0 +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.gz) -md5sums=('49253a3a2990a4bf8e0b0a19295f19bd') +md5sums=('b72375782519b7a4a6b8efcad1bfcf6b') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/imdbpy/PKGBUILD b/community/imdbpy/PKGBUILD index 8082a46bc..ebd2c9b23 100644 --- a/community/imdbpy/PKGBUILD +++ b/community/imdbpy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 63916 2012-02-06 17:44:54Z schiv $ +# $Id: PKGBUILD 67897 2012-03-15 23:14:25Z ebelanger $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> @@ -7,14 +7,14 @@ pkgname=imdbpy _realname=IMDbPY pkgver=4.8.2 -pkgrel=1 +pkgrel=2 pkgdesc="Python bindings for the Internet Movie Database (IMDb)" url="http://imdbpy.sourceforge.net/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('python2') makedepends=('python2-distribute') -optdepends=('python-lxml' 'python2-sqlalchemy' 'python2-sqlobject') +optdepends=('python2-lxml' 'python2-sqlalchemy' 'python2-sqlobject') source=(http://downloads.sourceforge.net/$pkgname/$_realname-$pkgver.tar.gz) md5sums=('6644540206c5023cb332637089d5342d') diff --git a/community/jbig2dec/jbig2dec-0.11-libpng15.patch b/community/jbig2dec/jbig2dec-0.11-libpng15.patch new file mode 100644 index 000000000..c18ccb7af --- /dev/null +++ b/community/jbig2dec/jbig2dec-0.11-libpng15.patch @@ -0,0 +1,31 @@ +--- configure.ac ++++ configure.ac +@@ -45,7 +45,7 @@ + fi + dnl libpng requires pow() which may be in libm + AC_SEARCH_LIBS([pow], [m]) +- AC_CHECK_LIB([png], [png_check_sig], [ ++ AC_CHECK_LIB([png], [png_sig_cmp], [ + AC_CHECK_LIB([z], [deflate], [ + AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)]) + LIBS="-lpng -lz $LIBS" +--- jbig2_image_png.c ++++ jbig2_image_png.c +@@ -33,7 +33,7 @@ + { + png_size_t check; + +- check = fwrite(data, 1, length, (png_FILE_p)png_ptr->io_ptr); ++ check = fwrite(data, 1, length, (png_FILE_p)png_get_io_ptr(png_ptr)); + if (check != length) { + png_error(png_ptr, "Write Error"); + } +@@ -43,7 +43,7 @@ + jbig2_png_flush(png_structp png_ptr) + { + png_FILE_p io_ptr; +- io_ptr = (png_FILE_p)CVT_PTR((png_ptr->io_ptr)); ++ io_ptr = (png_FILE_p)png_get_io_ptr(png_ptr); + if (io_ptr != NULL) + fflush(io_ptr); + } diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 8e2875a96..a558800ba 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67192 2012-03-05 08:57:49Z ibiru $ +# $Id: PKGBUILD 67899 2012-03-15 23:14:31Z ebelanger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=0.7.1 -pkgrel=14 +pkgrel=15 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps." arch=('i686' 'x86_64' 'mips64el') url="http://mapnik.org/" @@ -15,7 +15,7 @@ depends=('boost-libs' 'icu' 'libpng' 'libjpeg' 'libtiff' 'freetype2' 'postgresql-libs' 'postgis' 'gdal' 'curl' 'libtool') # already in core ('zlib' 'sqlite3') optdepends=('libxslt: Web Map Service' - 'python-lxml: Web Map Service' + 'python2-lxml: Web Map Service' 'python-imaging: Web Map Service' 'python-nose: Web Map Service' 'apache: Web Map Service' diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 69703ea49..3a2461b55 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66708 2012-02-27 17:31:49Z ibiru $ +# $Id: PKGBUILD 67901 2012-03-15 23:14:42Z ebelanger $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mythtv pkgver=0.24.2 -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ license=('GPL') depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' 'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' - 'python-lxml' 'wget' 'qtwebkit') + 'python2-lxml' 'wget' 'qtwebkit') makedepends=('yasm') optdepends=('xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') diff --git a/community/nginx/PKGBUILD b/community/nginx/PKGBUILD index dcfc98a5e..a6a7b6939 100644 --- a/community/nginx/PKGBUILD +++ b/community/nginx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67272 2012-03-06 06:31:05Z bpiotrowski $ +# $Id: PKGBUILD 67860 2012-03-15 15:25:27Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> # Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> pkgname=nginx -pkgver=1.0.13 +pkgver=1.0.14 pkgrel=1 pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" arch=('i686' 'x86_64' 'mips64el') @@ -36,6 +36,8 @@ _tmp_path=/var/spool/nginx _log_path=/var/log/nginx _user=http _group=http +md5sums=('019844e48c34952253ca26dd6e28c35c' + '0e8032d3ba26c3276e8c7c30588d375f') build() { cd "$srcdir/nginx-${pkgver}" diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 7cd403639..58724e18a 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66966 2012-03-02 23:22:53Z tdziedzic $ +# $Id: PKGBUILD 67907 2012-03-16 00:38:17Z tdziedzic $ # Maintainer: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -7,7 +7,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.6.12 +pkgver=0.6.13 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('a12766ae4003c9712927d1fa134ed9f6') +md5sums=('87078586e226fd7a4db60d38bea9aad6') build() { cd node-v${pkgver} @@ -43,6 +43,7 @@ check() { cd node-v${pkgver} # test failures in 0.6 are known + # specifically https://github.com/joyent/node/pull/1699 make test || true } diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index 49ab732b2..837fbf183 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67198 2012-03-05 08:58:24Z ibiru $ +# $Id: PKGBUILD 67891 2012-03-15 20:13:49Z svenstaro $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> _pkg=OpenImageIO pkgname=openimageio -pkgver=0.10.4 -pkgrel=6 +pkgver=1.0.1 +pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications." arch=(i686 x86_64) url="http://www.openimageio.org/" @@ -14,19 +14,12 @@ depends=('openexr' 'boost-libs' 'jasper' 'glew') makedepends=('cmake' 'qt' 'python2' 'boost') optdepends=('qt: iv image viewer' 'python2: bindings support') options=(!buildflags) -source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}" - "openimageio-0.10.2-libpng15.patch") -md5sums=('08a1bc2b82862ad5547bba569f4f633f' - 'd12829808610a54b6bc3350dc5419db3') +source=("https://github.com/$_pkg/oiio/tarball/Release-${pkgver/_/-}") +md5sums=('5b74d7bda23f4b0e33c5104fd8dbdf79') build() { cd "$srcdir"/$_pkg* - # remove insecure rpath - sed -i "/RPATH/d" src/CMakeLists.txt - - patch -d src/ -Np0 < $srcdir/openimageio-0.10.2-libpng15.patch - # strange bug on i686, see https://github.com/OpenImageIO/oiio/issues/204 [[ $CARCH == "i686" ]] && make debug || make } @@ -46,6 +39,9 @@ package() { # python module cp -r python/* "$pkgdir/usr/lib/python2.7/site-packages" + pwd + cd ../.. # license + pwd install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/pigeonhole/PKGBUILD b/community/pigeonhole/PKGBUILD index a92054bdf..c62d94fac 100644 --- a/community/pigeonhole/PKGBUILD +++ b/community/pigeonhole/PKGBUILD @@ -4,12 +4,12 @@ # This must be built against the version of dovecot being used, # else mail delivery will fail. # Specify the version of dovecot to be used here: -_dcpkgver=2.1.1 +_dcpkgver=2.1.2 # Make sure to bump pkgrel if changing this. pkgname=pigeonhole pkgver=0.3.0 -pkgrel=2 +pkgrel=3 pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1" arch=('i686' 'x86_64' 'mips64el') url="http://pigeonhole.dovecot.org/" diff --git a/community/yagf/PKGBUILD b/community/yagf/PKGBUILD index 5b7944a45..830d41838 100644 --- a/community/yagf/PKGBUILD +++ b/community/yagf/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 60972 2011-12-19 21:35:06Z spupykin $ +# $Id: PKGBUILD 67880 2012-03-15 16:16:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: das-ich <das-ich@yandex.ru> pkgname=yagf -pkgver=0.8.9 +pkgver=0.9 pkgrel=1 pkgdesc="QT4-based GUI for Cuneiform OCR" arch=(i686 x86_64 'mips64el') @@ -14,7 +14,7 @@ optdepends=('xsane: acquire images from a scanner into YAGF directly') makedepends=('cmake') install=yagf.install source=(http://symmetrica.net/cuneiform-linux/${pkgname}-${pkgver}.tar.gz) -md5sums=('1ccb66b978162366fb608dbc31b4a946') +md5sums=('47ddc8dfe9539242073312dcf098fa86') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/zathura/PKGBUILD b/community/zathura/PKGBUILD index 6b94ca20a..ac68dfad2 100644 --- a/community/zathura/PKGBUILD +++ b/community/zathura/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 67724 2012-03-14 09:06:05Z spupykin $ +# $Id: PKGBUILD 67873 2012-03-15 15:50:48Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: ML <neldoreth> pkgname=zathura pkgver=0.1.1 -pkgrel=3 +pkgrel=4 pkgdesc="a document viewer" arch=('i686' 'x86_64' 'mips64el') url="http://pwmt.org/projects/zathura/" license=('custom') depends=('girara-gtk2' 'cairo' 'sqlite3') makedepends=('docutils') +optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') install=zathura.install source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz) md5sums=('1379dfb1657b323da3b521ed251bb87a') diff --git a/community/zathura/zathura.install b/community/zathura/zathura.install index 077d7a179..f450cf9b8 100644 --- a/community/zathura/zathura.install +++ b/community/zathura/zathura.install @@ -6,7 +6,6 @@ post_install() { post_upgrade() { post_install - echo ">> pdf/djvu/ps support is in plugins now. Search for additional zathura-plugin-* packages." } post_remove() { diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index ac9aa8b6c..0ff620ff9 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 143250 2011-11-24 01:36:23Z allan $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 153500 2012-03-15 08:12:48Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=bash _basever=4.2 -_patchlevel=020 #prepare for some patches +_patchlevel=024 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="The GNU Bourne Again shell" @@ -118,4 +118,12 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '1195d85447f3d048d2c9bcd075fa765c' 'b0f3a651ce29a1feee687d93177870f1' 'b09000bba08da6ac753124593850cdf7' - '204bb5054d1f8bafe2b446d4e5d0d99a') + '204bb5054d1f8bafe2b446d4e5d0d99a' + '09d3f96a16b881334cfaee0cf320b47e' + 'aab415350bcc2bb0c29943b413499d96' + '597bf71a2aac6feb510b7505cdd3d4f7' + 'b0db384bdedecafbdd70c8d22c56af5f' + '3fab459b4e09daea529cacad025b13b3' + 'bab99835ad6198cb1109fac89a085262' + '4ad8d11e72afc6090e701073ff034cf4' + '5658ef10c9d0d804126ec1ce700e4e2c') diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index fb410714b..d2cc1bd32 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151833 2012-03-03 08:49:08Z allan $ +# $Id: PKGBUILD 153502 2012-03-15 08:12:52Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_ver=1.8.4p2 +_ver=1.8.4p4 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool' '!makeflags') source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} sudo.pam) -md5sums=('c0cc9334246d4f34128660b6c5463e94' - 'bb692de8ecb24d8bfab00c45292536c5' +md5sums=('b9be6df7ecefedff2263052ed9fc5e93' + '24da0bf96506b81678726778aad9ea4c' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD index 3fe65e8c4..b1445cda9 100644 --- a/core/usbutils/PKGBUILD +++ b/core/usbutils/PKGBUILD @@ -1,30 +1,26 @@ -# $Id: PKGBUILD 136054 2011-08-22 06:28:37Z tpowa $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 153529 2012-03-15 17:34:25Z tomegun $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributor: Tom Gundersen <teg@jklm.no> +# Contributor: Judd Vinet <jvinet@zeroflux.org> # Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com> pkgname=usbutils -pkgver=004 +pkgver=005 pkgrel=1 -_usb_ids_date=2011.08.17 pkgdesc="USB Device Utilities" arch=(i686 x86_64 'mips64el') license=('GPL') groups=('base') -makedepends=('wget') -depends=('glibc' 'libusb') +depends=('libusb') optdepends=('python2: for lsusb.py usage' - 'coreutils: for lsusb.py usage') + 'coreutils: for lsusb.py usage' + 'wget: for update-usbids.sh usage') url="http://linux-usb.sourceforge.net/" -source=(http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz - fix-python2.patch - usb.ids-${_usb_ids_date}) # from http://linux-usb.sourceforge.net/usb.ids -md5sums=('481e1de453bcabbd5f43125bb4df2ab7' - '45766196895b4cc50b53cd56e1bbf3d1' - 'f04c301b5363ef618f0ec776deff3117') +# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + fix-python2.patch) build() { cd $srcdir/$pkgname-$pkgver - rm usb.ids - cp $srcdir/usb.ids-${_usb_ids_date} usb.ids # patch lsusb.py to use correct usb.ids file and python2 interpreter patch -Np1 -i $srcdir/fix-python2.patch ./configure --prefix=/usr --datadir=/usr/share/hwdata --disable-zlib @@ -34,10 +30,6 @@ build() { package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install - # fix pkgconfig file - install -dm755 $pkgdir/usr/lib - mv $pkgdir/usr/share/pkgconfig $pkgdir/usr/lib/ } -md5sums=('481e1de453bcabbd5f43125bb4df2ab7' - '45766196895b4cc50b53cd56e1bbf3d1' - 'f04c301b5363ef618f0ec776deff3117') +md5sums=('6a21f7b6c02b76df5e8a7c208d746654' + '45766196895b4cc50b53cd56e1bbf3d1') diff --git a/extra/bzr/PKGBUILD b/extra/bzr/PKGBUILD index d68c778a5..8fb18e305 100644 --- a/extra/bzr/PKGBUILD +++ b/extra/bzr/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141925 2011-11-03 07:48:25Z andrea $ +# $Id: PKGBUILD 153560 2012-03-16 02:18:57Z eric $ # Maintainer : # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=bzr -pkgver=2.4.2 +pkgver=2.5.0 pkgrel=1 pkgdesc="A decentralized revision control system (bazaar)" arch=('i686' 'x86_64' 'mips64el') @@ -12,8 +12,8 @@ license=('GPL') depends=('python2') optdepends=('python-paramiko: for sftp support') source=("http://launchpad.net/${pkgname}/${pkgver%.*}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('cfc06fddd348445c65a247c0b33a05db' - '90294e34a45df20b16be47a32c800c89') +md5sums=('44eb47b77995098a28f017e2daa606b6' + 'b0d4a26a3dde94f30e142868b896fed5') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD index f6dcb12f2..b3547eb01 100644 --- a/extra/dovecot/PKGBUILD +++ b/extra/dovecot/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 151572 2012-02-27 18:19:51Z andyrtr $ +# $Id: PKGBUILD 153549 2012-03-15 21:48:10Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Paul Mattal <paul@mattal.com> # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com> # Contributor: GARETTE Emmanuel <gnunux at laposte dot net> pkgname=dovecot -pkgver=2.1.1 -pkgrel=3 +pkgver=2.1.2 +pkgrel=1 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64' 'mips64el') url="http://dovecot.org/" @@ -20,8 +20,8 @@ provides=('imap-server' 'pop3-server') options=('!libtool') install=$pkgname.install source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh) -md5sums=('db41a4de848d2bc834c30af0eb5575fd' - 'e3bf2c4989ccb8a30a5d80ae89b06f76' +md5sums=('6ab61b962ff7e732ea9faa0fa41a28cb' + 'fb097826d991cd70894a914d01b0e2a1' '587159e84e2da6f83d70b3c706ba87cc') build() { diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 9d8416a66..d4e1868ee 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 148644 2012-02-05 01:57:05Z eric $ +# $Id: PKGBUILD 153564 2012-03-16 02:38:35Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.2.0 +pkgver=4.2.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/fcitx/" license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'dbus-glib' 'icu') -source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('b3c09f1eda7fb71208d348c34389dc824d6b2a80') +source=("http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz") +sha1sums=('74ad009cde48fb1efd48f8d2490fa36ddf36d215') build() { cd "${srcdir}" diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD index 7dfb92f6c..069ed910f 100644 --- a/extra/fsarchiver/PKGBUILD +++ b/extra/fsarchiver/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 149589 2012-02-08 15:14:51Z andrea $ +# $Id: PKGBUILD 153566 2012-03-16 02:52:32Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=fsarchiver -pkgver=0.6.12 -pkgrel=2 +pkgver=0.6.13 +pkgrel=1 pkgdesc="A safe and flexible file-system backup and deployment tool" arch=('i686' 'x86_64' 'mips64el') url="http://www.fsarchiver.org/" license=('GPL') depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('dc54cefcf9c2bc331063d82a7ad54133') +md5sums=('49e974cbb18332bb67e6089d942eac66') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 76fc82d19..e6ef1bc54 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 150685 2012-02-20 07:56:26Z bisson $ +# $Id: PKGBUILD 153551 2012-03-15 23:11:38Z eric $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.3.1 -pkgrel=1 +pkgrel=2 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') @@ -16,7 +16,7 @@ depends=('gc' 'gsl' 'gtkmm' 'gtkspell' 'imagemagick' 'libxslt' 'poppler-glib' 'p optdepends=('pstoedit: latex formulas' 'texlive-core: latex formulas' 'python2-numpy: some extensions' - 'python-lxml: some extensions and filters' + 'python2-lxml: some extensions and filters' 'pyxml: some extensions' 'uniconvertor: reading/writing to some proprietary formats') options=('!libtool') diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD index 52f2e3306..97b4dc9b1 100644 --- a/extra/kdepim/PKGBUILD +++ b/extra/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153196 2012-03-12 09:37:49Z andrea $ +# $Id: PKGBUILD 153547 2012-03-15 21:42:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,17 +20,23 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-libkdepim') pkgver=4.8.1 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') url='http://pim.kde.org' license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdepim') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" + 'fix-kalarm-issue-with-alarms.patch') +sha1sums=('93222d56f9adde015cb202a1ad3b194ac52e6bda' + 'e9761e98fc5486a1a33cfa1eb122b54ca3446ded') build() { + # (FS#28891) + cd "${srcdir}"/${pkgbase}-${pkgver} + patch -p1 -i "${srcdir}"/fix-kalarm-issue-with-alarms.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdepim/fix-kalarm-issue-with-alarms.patch b/extra/kdepim/fix-kalarm-issue-with-alarms.patch new file mode 100644 index 000000000..a69778b06 --- /dev/null +++ b/extra/kdepim/fix-kalarm-issue-with-alarms.patch @@ -0,0 +1,48 @@ +From: David Jarvie <djarvie@kde.org> +Date: Wed, 07 Mar 2012 22:08:50 +0000 +Subject: Fix error saving changed alarms when closing Edit Alarm dialogue +X-Git-Url: http://quickgit.kde.org/?p=kdepim.git&a=commitdiff&h=ae66e32fb194e01e06521c78e9c72d772d291261 +--- +Fix error saving changed alarms when closing Edit Alarm dialogue +--- + + +--- a/kalarm/Changelog ++++ b/kalarm/Changelog +@@ -1,6 +1,10 @@ + KAlarm Change Log + +-=== Version 2.8.1 --- 19 February 2012 === ++=== Version 2.8.2 --- 7 March 2012 === ++- [Akonadi] Fix error saving changed alarms when closing Edit Alarm dialogue. ++- [Akonadi] Show old-format calendars in read-only colour in calendar list. ++ ++=== Version 2.8.1 (KDE 4.8.1) --- 19 February 2012 === + - [Akonadi] Don't give option to save new alarms in old format calendars. + - [Akonadi] Prevent duplicate prompts to update format of new calendar resource. + - [Akonadi] Automatically disable duplicated calendar resources. + +--- a/kalarm/akonadimodel.cpp ++++ b/kalarm/akonadimodel.cpp +@@ -1284,7 +1284,7 @@ KAEvent AkonadiModel::event(const Item& + if (e.isValid()) + { + +- Collection c = data(index, ParentCollectionRole).value<Collection>(); ++ Collection c = data(ix, ParentCollectionRole).value<Collection>(); + // Set collection ID using a const method, to avoid unnecessary copying of KAEvent + e.setCollectionId_const(c.id()); + if (collection) + +--- a/kalarm/kalarm.h ++++ b/kalarm/kalarm.h +@@ -28,7 +28,7 @@ + #else + #define VERSION_SUFFIX "-res" + #endif +-#define KALARM_VERSION "2.8.1" VERSION_SUFFIX ++#define KALARM_VERSION "2.8.2" VERSION_SUFFIX + + #define KALARM_NAME "KAlarm" + #define KALARM_DBUS_SERVICE "org.kde.kalarm" // D-Bus service name of KAlarm application + diff --git a/extra/libsocialweb/PKGBUILD b/extra/libsocialweb/PKGBUILD index 4d85c1103..da3b61637 100644 --- a/extra/libsocialweb/PKGBUILD +++ b/extra/libsocialweb/PKGBUILD @@ -1,33 +1,34 @@ -# $Id: PKGBUILD 139385 2011-10-01 19:00:09Z ibiru $ -# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# $Id: PKGBUILD 153544 2012-03-15 18:27:40Z ibiru $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + pkgname=libsocialweb -pkgver=0.25.19 -pkgrel=2 +pkgver=0.25.20 +pkgrel=0 pkgdesc="A personal social data server" arch=('i686' 'x86_64' 'mips64el') url="http://www.gtk.org/" license=('GPL2') depends=('glib2' 'gconf' 'libsoup-gnome' 'rest' 'dbus-glib' 'libgnome-keyring' - 'json-glib') + 'json-glib' 'networkmanager') makedepends=('intltool' 'gtk-doc' 'vala' 'gobject-introspection') options=('!libtool') source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-${pkgver}.tar.xz) -sha256sums=('377b165fed92e1d4f6c7a2430191388633ad25421a72d640e9e60dfdf1d54625') +sha256sums=('eb0078f44eb5fc4570fcee26c5670a433ca1bb83be0cead421a4a03e7d838ff5') build() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib/libsocialweb \ --enable-all-services=yes \ - --with-online=always \ + --with-online=networkmanager \ --enable-vala-bindings make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="${pkgdir}" install } diff --git a/extra/lm_sensors/PKGBUILD b/extra/lm_sensors/PKGBUILD index d2ea6d729..1c0515059 100644 --- a/extra/lm_sensors/PKGBUILD +++ b/extra/lm_sensors/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134304 2011-08-02 20:34:25Z eric $ +# $Id: PKGBUILD 153558 2012-03-16 01:14:35Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=lm_sensors -pkgver=3.3.1 -pkgrel=2 +pkgver=3.3.2 +pkgrel=1 pkgdesc="Collection of user space tools for general SMBus access and hardware monitoring" arch=('i686' 'x86_64' 'mips64el') url="http://www.lm-sensors.org/" @@ -13,20 +13,11 @@ makedepends=('rrdtool') optdepends=('rrdtool: for logging with sensord') backup=('etc/sensors3.conf' 'etc/conf.d/healthd' 'etc/conf.d/sensord') options=('!emptydirs') -source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2 \ +source=(http://dl.lm-sensors.org/lm-sensors/releases/lm_sensors-${pkgver}.tar.bz2{,.sig} \ sensors.rc fancontrol.rc healthd healthd.conf healthd.rc sensord.conf \ sensord.rc daemonarg.patch linux_3.0.patch) -md5sums=('8c0eebda8524fc87da1393b4564d279b' - 'c370f5e620bfe41113354a1e22c0c18c' - '232bedf043dd5dedde82df1a399c682c' - '6549050897c237514aeaa2bb6cfd29ea' - 'f8af587038b0e2a89c441f7eeaa5e640' - '970408d2e509dc4138927020efefe323' - '96a8dd468e81d455ec9b165bdf33e0b7' - '41a5c20854bbff00ea7174bd2276b736' - '40c8eb16af8249a0f1d851fc1057ea15' - '5c1be382963145f7191d9c4e45ca9f67') -sha1sums=('cb819e5a93adb36ef00e6d3c5363f5f474efa78a' +sha1sums=('5d0f026ad763124e8c2ad733b6e1ad5e6473993d' + 'a486d9fb6c5b0aff4520f6312106c67f5163f1cf' 'b2e664b9b87759991f02d0a1e8cac5e95098c0a5' 'a068ac0a3115a6191a487e11422506baa922b40a' '78b5cd36c3cb8e98b972cdd8c4a12687d79a79a8' diff --git a/extra/modemmanager/PKGBUILD b/extra/modemmanager/PKGBUILD index bf6bc7c58..0c4ffa285 100644 --- a/extra/modemmanager/PKGBUILD +++ b/extra/modemmanager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 134371 2011-08-03 08:01:01Z ibiru $ +# $Id: PKGBUILD 153526 2012-03-15 14:49:43Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=modemmanager _realname=ModemManager -pkgver=0.5 +pkgver=0.5.2.0 pkgrel=1 pkgdesc="Mobile broadband modem management service" arch=('i686' 'x86_64' 'mips64el') @@ -11,12 +11,12 @@ license=('GPL2') depends=('dbus-glib' 'udev' 'ppp') makedepends=('intltool') options=('!libtool') -source=(http://download.gnome.org/sources/${_realname}/0.5/${_realname}-${pkgver}.tar.xz) +source=(http://download.gnome.org/sources/$_realname/0.5/$_realname-$pkgver.tar.xz) optdepends=('usb_modeswitch: install if your modem shows up as a storage drive') -sha256sums=('e7c7aed7c1484adee22f04dac358c1f971985f8413096c4d412d084aa2cd7c7f') +sha256sums=('7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8') build() { - cd "$srcdir/${_realname}-${pkgver}" + cd "$_realname-$pkgver" ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -25,6 +25,6 @@ build() { } package() { - cd "$srcdir/${_realname}-${pkgver}" + cd "$_realname-$pkgver" make DESTDIR="$pkgdir" install } diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 50653df35..ec44b2d94 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,21 +1,14 @@ -# $Id: PKGBUILD 146500 2012-01-12 05:14:02Z eric $ +# $Id: PKGBUILD 153553 2012-03-15 23:11:41Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Guillem Rieu <guillemr@gmx.net> -pkgname=python-lxml +pkgname=('python-lxml' 'python2-lxml') pkgver=2.3.3 -pkgrel=1 +pkgrel=2 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'custom') url="http://lxml.de/" -depends=('python2' 'libxslt') -optdepends=('python-beautifulsoup: support for parsing not well formed HTML') -conflicts=('lxml') -replaces=('lxml') +makedepends=('python2' 'python' 'libxslt') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) md5sums=('a7825793c69d004f388ec6600bad7a6f' '5c4b1a05f6e46a4dd7ebed8b5ad9e32e') @@ -23,11 +16,14 @@ md5sums=('a7825793c69d004f388ec6600bad7a6f' check() { cd "${srcdir}"/lxml-$pkgver make PYTHON=python2 test + make PYTHON=python test } -package() { - cd "${srcdir}"/lxml-$pkgver +package_python2-lxml() { + depends=('python2' 'libxslt') + optdepends=('python-beautifulsoup: support for parsing not well formed HTML') + cd "${srcdir}"/lxml-$pkgver python2 setup.py install --root="${pkgdir}" --optimize=1 install -Dm644 LICENSES.txt \ @@ -37,3 +33,17 @@ package() { install -Dm644 doc/licenses/elementtree.txt \ "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt } + +package_python-lxml() { + depends=('python' 'libxslt') + + cd "${srcdir}"/lxml-$pkgver + python setup.py install --root="${pkgdir}" --optimize=1 + + install -Dm644 LICENSES.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 doc/licenses/BSD.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt + install -Dm644 doc/licenses/elementtree.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt +} diff --git a/extra/subversion/PKGBUILD b/extra/subversion/PKGBUILD index 07621fb23..d9c01b475 100644 --- a/extra/subversion/PKGBUILD +++ b/extra/subversion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150870 2012-02-23 13:25:51Z stephane $ +# $Id: PKGBUILD 153509 2012-03-15 09:58:34Z stephane $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=subversion -pkgver=1.7.3 +pkgver=1.7.4 pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64' 'mips64el') @@ -22,8 +22,8 @@ provides=('svn') options=('!makeflags' '!libtool') source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc} svnserve svn svnserve.conf subversion.rpath.fix.patch) -sha1sums=('624d4070361c0e8d7cf4f5c667629e72459b122d' - 'cac344ec6e717bab3d97e2f3f1206289d83b8e05' +sha1sums=('57a3cd351c1dbedddd020e7a1952df6cd2674527' + 'eebe0be6d539bf7dc37cf01b3c738072f1d9197b' '64ba3e6ebafc08ac62f59d788f7a825fdce69573' '73b36c046c09cec2093354911c89e3ba8056af6c' 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41' diff --git a/extra/xdg-user-dirs/PKGBUILD b/extra/xdg-user-dirs/PKGBUILD new file mode 100644 index 000000000..c3098d5df --- /dev/null +++ b/extra/xdg-user-dirs/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 153519 2012-03-15 14:03:02Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Stefan Husmann <stefan-husmann@t-online.de> +# Contributor: <mathieu.clabaut@gmail.com> + +pkgname=xdg-user-dirs +pkgver=0.14 +pkgrel=3 +pkgdesc="Manage user directories like ~/Desktop and ~/Music" +arch=('i686' 'x86_64') +depends=('sh') +url="http://www.freedesktop.org/wiki/Software/xdg-user-dirs" +license=('GPL') +backup=('etc/xdg/user-dirs.conf' 'etc/xdg/user-dirs.defaults') +source=(http://user-dirs.freedesktop.org/releases/$pkgname-$pkgver.tar.gz + xdg-user-dirs) +sha256sums=('5f4e84f57c113f642ffdd646126855f45f1da955103119dbd2382edb516e6255' + 'f0f27de23d849b2fa4ebf59e448b5a843b577d14dc2c1070e228999091fa7f5e') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -D ../xdg-user-dirs "$pkgdir/etc/X11/xinit/xinitrc.d/xdg-user-dirs" +} diff --git a/extra/xdg-user-dirs/xdg-user-dirs b/extra/xdg-user-dirs/xdg-user-dirs new file mode 100755 index 000000000..dbe8abb48 --- /dev/null +++ b/extra/xdg-user-dirs/xdg-user-dirs @@ -0,0 +1,4 @@ +#!/bin/sh + +# Set up user directories like ~/Desktop and ~/Music +[ -x /usr/bin/xdg-user-dirs-update ] && /usr/bin/xdg-user-dirs-update diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index dfb8f66c9..c106f6f25 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 150446 2012-02-17 22:05:32Z ibiru $ +# $Id: PKGBUILD 153514 2012-03-15 13:26:26Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner -pkgver=10.0.2 +pkgver=11.0 pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/fi libvpx.patch) options=('!emptydirs') replaces=('xulrunner-oss') -md5sums=('5ce038d591964f72c534fa33b75a62f5' +md5sums=('4b07acf47857aff72776d805409cdd1b' '8dfb78c5bd0581c8cf4753813132bf0b' '27271ce647a83906ef7a24605e840d61' '5d418ecdbdb9f40597df6b978b0b5ee5') diff --git a/gnome-unstable/colord/PKGBUILD b/gnome-unstable/colord/PKGBUILD new file mode 100644 index 000000000..e1790b6c9 --- /dev/null +++ b/gnome-unstable/colord/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 153538 2012-03-15 18:02:11Z ibiru $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> + +pkgname=colord +pkgver=0.1.18 +pkgrel=1 +pkgdesc="Color daemon" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/software/colord" +license=('GPL2') +depends=('lcms2' 'libgusb' 'polkit' 'sane' 'shared-color-profiles' 'sqlite3' 'udev') +makedepends=('intltool' 'gobject-introspection' 'vala' 'docbook2x') +source=($url/releases/$pkgname-$pkgver.tar.xz) +options=('!libtool') +sha1sums=('6127e723a9beb932aae7a43b6e6b5fdb84c39611') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --sysconfdir=/etc --libexecdir=/usr/lib/colord \ + --localstatedir=/var --disable-static \ + --with-systemdsystemunitdir=/lib/systemd/system + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD index e47ce7523..01f49a93e 100644 --- a/libre/pacman/PKGBUILD +++ b/libre/pacman/PKGBUILD @@ -1,11 +1,11 @@ # vim: set ts=2 sw=2 et: -# $Id: PKGBUILD 146568 2012-01-13 16:47:02Z dreisner $ +# $Id: PKGBUILD 150148 2012-02-13 14:49:35Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> # Maintainer: Dave Reisner <dave@archlinux.org> pkgname=pacman -pkgver=4.0.1 -pkgrel=4 +pkgver=4.0.2 +pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') url="http://www.archlinux.org/pacman/" @@ -18,15 +18,16 @@ optdepends=('fakeroot: for makepkg usage as normal user') backup=(etc/pacman.conf etc/makepkg.conf) install=pacman.install options=(!libtool) -source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz +source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig} pacman.conf pacman.conf.x86_64 pacman.conf.mips64el makepkg.conf) -md5sums=('76bd88eff8cd94bc9899faa091822dc1' +md5sums=('289ba4a19a16393096e065cec1cb9b0a' + '575140dce3ea597d91b6d081aa3f6a00' '858d1ffb284afc6b15f72578ba3cac50' '7dade0c0a4d597c480d779afa4f5097c' - '150a2854816cd67b1608e00f99701c1c' + 'd4ca1a1d8e6708c0302a225628a489eb' 'debc512689a1aa8c124fe0ccf27f5758') # keep an upgrade path for older installations @@ -40,6 +41,10 @@ build() { make } +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=$pkgdir install @@ -59,14 +64,14 @@ package() { mycarch="x86_64" mychost="x86_64-unknown-linux-gnu" myflags="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" - myldflags="-Wl,--hash-style=gnu -Wl,--as-needed" + myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro,--hash-style=gnu" ;; mips64el) install -m644 $srcdir/pacman.conf.mips64el $pkgdir/etc/pacman.conf mycarch="mips64el" mychost="mips64el-unknown-linux-gnu" myflags="-O2 -march=loongson2f -mabi=n32 -pipe -mplt -Wa,-mfix-loongson2f-nop -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" - myldflags="-Wl,--as-needed" + myldflags="-Wl,-O1,--sort-common,--as-needed,-z,relro" ;; esac install -m644 $srcdir/makepkg.conf $pkgdir/etc/ diff --git a/libre/pacman/pacman.conf.mips64el b/libre/pacman/pacman.conf.mips64el index 82955b965..a74f2d3da 100644 --- a/libre/pacman/pacman.conf.mips64el +++ b/libre/pacman/pacman.conf.mips64el @@ -13,11 +13,14 @@ #DBPath = /var/lib/pacman/ #CacheDir = /var/cache/pacman/pkg/ #LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc # If upgrades are available for these packages they will be asked for first -SyncFirst = pacman -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +# Don't list pacman here unless you want it broken when there is a +# libarchive or glibc update. +#SyncFirst = #XferCommand = /usr/bin/curl -C - -f %u > %o +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled Architecture = mips64el @@ -28,12 +31,25 @@ Architecture = mips64el #NoUpgrade = #NoExtract = -# Misc options (all disabled by default) +# Misc options #UseSyslog -#ShowSize #UseDelta #TotalDownload #CheckSpace +#VerbosePkgLists + +# PGP signature checking +# NOTE: None of this will work without running `pacman-key --init` first. +# The compiled in default is equivalent to the following line. This requires +# you to locally sign and trust packager keys using `pacman-key` for them to be +# considered valid. +#SigLevel = Optional TrustedOnly +# If you wish to check signatures but avoid local sign and trust issues, use +# the following line. This will treat any key imported into pacman's keyring as +# trusted. +#SigLevel = Optional TrustAll +# For now, off by default unless you read the above. +SigLevel = Never # # REPOSITORIES @@ -59,24 +75,31 @@ Architecture = mips64el # after the header, and they will be used before the default mirrors. #[libre-testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [libre] +#SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist #[testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [core] +#SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [extra] +#SigLevel = PackageOptional Include = /etc/pacman.d/mirrorlist #[community-testing] +#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [community] +#SigLevel = PackageOptional Include = /etc/pacman.d/mirrorlist # Parabola also supports community projects and personal repositories, to find @@ -85,5 +108,6 @@ Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] +#SigLevel = Optional TrustAll #Server = file:///home/custompkgs diff --git a/testing/neon/PKGBUILD b/testing/neon/PKGBUILD new file mode 100644 index 000000000..7fa3af41d --- /dev/null +++ b/testing/neon/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 153541 2012-03-15 18:19:26Z pierre $ +# Maintainer: +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: Juergen Hoetzel <juergen@archlinux.org> + +pkgname=neon +pkgver=0.29.6 +pkgrel=4 +pkgdesc="HTTP and WebDAV client library with a C interface" +arch=('i686' 'x86_64') +license=('GPL' 'LGPL') +depends=('krb5' 'expat' 'ca-certificates') +url="http://www.webdav.org/neon/" +source=("http://www.webdav.org/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('591e0c82e6979e7e615211b386b8f6bc') +options=('libtool') # FS#16067 + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + ./configure --prefix=/usr \ + --with-expat \ + --enable-shared \ + --disable-static \ + --with-ssl=openssl \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + make + + # fix invalid .so links in man pages (FS#24902) + sed -i '/^\.so/s|\.so \([^.]\+\)\.\([[:digit:]]\)|.so man\2/\1.\2|' doc/man/* +} + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} diff --git a/testing/nx-common/NXproto.h.64bit.diff b/testing/nx-common/NXproto.h.64bit.diff new file mode 100644 index 000000000..ac326ebcd --- /dev/null +++ b/testing/nx-common/NXproto.h.64bit.diff @@ -0,0 +1,66 @@ +--- nxcomp.old/NXproto.h 2006-06-19 19:55:56.000000000 +0200 ++++ nxcomp/NXproto.h 2007-02-12 18:17:41.000000000 +0100 +@@ -26,6 +26,30 @@ + #include <X11/Xmd.h> + #include <X11/Xproto.h> + ++/* ++ Copied from Xproto.h ++ */ ++ ++/* For the purpose of the structure definitions in this file, ++we must redefine the following types in terms of Xmd.h's types, which may ++include bit fields. All of these are #undef'd at the end of this file, ++restoring the definitions in X.h. */ ++ ++#define Window CARD32 ++#define Drawable CARD32 ++#define Font CARD32 ++#define Pixmap CARD32 ++#define Cursor CARD32 ++#define Colormap CARD32 ++#define GContext CARD32 ++#define Atom CARD32 ++#define VisualID CARD32 ++#define Time CARD32 ++#define KeyCode CARD8 ++#define KeySym CARD32 ++ ++/* End copied from Xproto.h */ ++ + #define sz_xNXGetControlParametersReq 4 + #define sz_xNXGetCleanupParametersReq 4 + #define sz_xNXGetImageParametersReq 4 +@@ -343,9 +367,9 @@ + CARD8 dstDepth; + CARD32 srcLength B32; + CARD32 dstLength B32; +- INT16 srcX B16, srcY B16; ++ CARD16 srcX B16, srcY B16; + CARD16 srcWidth B16, srcHeight B16; +- INT16 dstX B16, dstY B16; ++ CARD16 dstX B16, dstY B16; + CARD16 dstWidth B16, dstHeight B16; + } xNXPutPackedImageReq; + +@@ -463,4 +487,20 @@ + } + #endif + ++/* Copied from Xproto.h */ ++ ++/* restore these definitions back to the typedefs in X.h */ ++#undef Window ++#undef Drawable ++#undef Font ++#undef Pixmap ++#undef Cursor ++#undef Colormap ++#undef GContext ++#undef Atom ++#undef VisualID ++#undef Time ++#undef KeyCode ++#undef KeySym ++ + #endif /* NXproto_H */ diff --git a/testing/nx-common/PKGBUILD b/testing/nx-common/PKGBUILD new file mode 100644 index 000000000..8de3917c8 --- /dev/null +++ b/testing/nx-common/PKGBUILD @@ -0,0 +1,59 @@ +# $Id: PKGBUILD 153543 2012-03-15 18:23:51Z pierre $ +# Maintainer: Tobias Powalowski <tpowa@archlinux.org> +# Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> + +pkgname=nx-common +pkgver=3.5.0 +pkgrel=4 +pkgdesc="NoMachine NX common package for client and server" +arch=('i686' 'x86_64') +license=('GPL') +url="http://nomachine.com/" +depends=('libjpeg-turbo' 'libpng' 'openssl' 'gcc-libs' 'bash') +makedepends=('xorg-server-devel') +source=( #Compression libs and proxy sources + http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxcompsh-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz + nxcompsh-gcc43.patch + nx-3.5.0-libpng15.patch) +options=(!libtool) +md5sums=('ad8c0f133122c6d07732ca69c8759410' + '84ade443b79ea079380b754aba9d392e' + 'f52fcdb38e09f8dcfb9ff0344dfbbbd6' + 'b6c279654dac421fc3dd1a27d66ff53c' + '2966353cabb96829eab291212ef078dc') + +build() { + # nxcomp + cd ${srcdir}/nxcomp + patch -Np1 -i ${srcdir}/nx-3.5.0-libpng15.patch + + ./configure --prefix=/opt/NX + make + # nxcompsh + cd ${srcdir}/nxcompsh + patch -Np1 -i ${srcdir}/nxcompsh-gcc43.patch + + ./configure --prefix=/opt/NX + make + # nxssh + cd ${srcdir}/nxssh + ./configure --prefix=/opt/NX + make +} + +package() { + mkdir -p ${pkgdir}/opt/NX/bin + mkdir -p ${pkgdir}/opt/NX/lib + + # nxcomp + cd ${srcdir}/nxcomp + cp -a libXcomp.so* ${pkgdir}/opt/NX/lib + # nxcompsh + cd ${srcdir}/nxcompsh + cp -a libXcompsh.so* ${pkgdir}/opt/NX/lib + # nxssh + cd ${srcdir}/nxssh + install -D -m755 nxssh ${pkgdir}/opt/NX/bin/nxssh +} diff --git a/testing/nx-common/nx-3.5.0-libpng15.patch b/testing/nx-common/nx-3.5.0-libpng15.patch new file mode 100644 index 000000000..c8f2a9559 --- /dev/null +++ b/testing/nx-common/nx-3.5.0-libpng15.patch @@ -0,0 +1,30 @@ +diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp +--- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } diff --git a/testing/nx-common/nxcompsh-gcc43.patch b/testing/nx-common/nxcompsh-gcc43.patch new file mode 100644 index 000000000..681a0dab5 --- /dev/null +++ b/testing/nx-common/nxcompsh-gcc43.patch @@ -0,0 +1,19 @@ +--- nxcompsh/Misc.h~ 2007-06-04 13:39:49.000000000 +0200 ++++ nxcompsh/Misc.h 2008-04-12 12:46:24.000000000 +0200 +@@ -18,10 +18,12 @@ + #ifndef Misc_H + #define Misc_H + +-#include <iostream.h> ++#include <iostream> + +-#include <errno.h> +-#include <string.h> ++#include <cerrno> ++#include <cstring> ++ ++using namespace std; + + // + // Error handling macros. + diff --git a/testing/proftpd/PKGBUILD b/testing/proftpd/PKGBUILD new file mode 100644 index 000000000..6dfb27d2c --- /dev/null +++ b/testing/proftpd/PKGBUILD @@ -0,0 +1,51 @@ +# $Id: PKGBUILD 153556 2012-03-16 00:18:26Z eric $ +# Maintainer: +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> + +pkgname=proftpd +pkgver=1.3.4a +pkgrel=4 +epoch=1 +pkgdesc="A high-performance, scalable FTP server" +arch=('i686' 'x86_64') +url="http://www.proftpd.org" +license=('GPL') +depends=('libldap' 'libmysqlclient' 'postgresql-libs') +backup=('etc/proftpd.conf' 'etc/conf.d/proftpd') +source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc} + 'proftpd' 'proftpd.logrotate' 'proftpd.conf.d') +sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25' + '195b06e28e503f5e5ef355c3332884cc5e7954a9' + 'b7819d725817e55b69c73e2572c21a05db48cc86' + '83c38ec40efb7cc09d9824b98e65cd948a195cc6' + 'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr \ + --libexecdir=/usr/lib \ + --disable-pam \ + --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \ + --sysconfdir=/etc \ + --localstatedir=/var/run \ + --enable-ctrls \ + --enable-ipv6 \ + --with-includes=/usr/include/mysql:/usr/include/postgresql \ + --with-libraries=/usr/lib/mysql:/usr/lib/postgresql \ + --enable-nls + + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf" + + install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd" + install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd" + install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd" + install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats" +} diff --git a/testing/proftpd/proftpd b/testing/proftpd/proftpd new file mode 100755 index 000000000..357a7663d --- /dev/null +++ b/testing/proftpd/proftpd @@ -0,0 +1,41 @@ +#!/bin/bash + +# source application-specific settings +PROFTPD_ARGS= +[ -f /etc/conf.d/proftpd ] && . /etc/conf.d/proftpd + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting ProFTPd Server" + /usr/sbin/proftpd ${PROFTPD_ARGS} + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon proftpd + stat_done + fi + ;; + stop) + stat_busy "Stopping ProFTPd Server" + [ -f /var/run/proftpd.pid ] && kill $(cat /var/run/proftpd.pid) &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm -f /var/run/proftpd.pid + rm_daemon proftpd + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 + diff --git a/testing/proftpd/proftpd.conf.d b/testing/proftpd/proftpd.conf.d new file mode 100644 index 000000000..1a5a8a201 --- /dev/null +++ b/testing/proftpd/proftpd.conf.d @@ -0,0 +1,4 @@ +# +# Parameters to be passed to proftpd +# +PROFTPD_ARGS="" diff --git a/testing/proftpd/proftpd.logrotate b/testing/proftpd/proftpd.logrotate new file mode 100644 index 000000000..7b6d7a87b --- /dev/null +++ b/testing/proftpd/proftpd.logrotate @@ -0,0 +1,5 @@ +/var/log/xferlog { + postrotate + /bin/kill -HUP `cat /var/run/proftpd.pid 2>/dev/null` 2>/dev/null || true + endscript +} diff --git a/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch b/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch new file mode 100644 index 000000000..fee383855 --- /dev/null +++ b/testing/xf86-input-synaptics/synaptics-Fix-inverted-circular-scrolling-direction.patch @@ -0,0 +1,40 @@ +From patchwork Wed Mar 14 03:27:29 2012 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Subject: [synaptics] Fix inverted circular scrolling direction +Date: Wed, 14 Mar 2012 03:27:29 -0000 +From: Peter Hutterer <peter.hutterer@who-t.net> +X-Patchwork-Id: 9512 +Message-Id: <20120314032729.GA16614@yabbi.bne.redhat.com> +To: "X.Org Devel List" <xorg-devel@lists.freedesktop.org> +Cc: Thomas =?iso-8859-1?Q?B=E4chler?= <thomas@archlinux.org> + +Introduced in 26831a6eeac6762ad4d99532f62ebbab0827de10. +In said commit, the old-style button events were changed to delta +accumulation. Alas, for circular scrolling, a positive delta is up whereas +for everything else a positive delta is down. + +Reported-by: Thomas Bächler <thomas@archlinux.org> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +--- +src/synaptics.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/synaptics.c b/src/synaptics.c +index fa46f0d..c9609cd 100644 +--- a/src/synaptics.c ++++ b/src/synaptics.c +@@ -2554,9 +2554,9 @@ HandleScrolling(SynapticsPrivate *priv, struct SynapticsHwState *hw, + double diff = diffa(priv->scroll.last_a, angle(priv, hw->x, hw->y)); + if (delta >= 0.005 && diff != 0.0) { + if (priv->circ_scroll_vert) +- priv->scroll.delta_y += diff / delta * para->scroll_dist_vert; ++ priv->scroll.delta_y -= diff / delta * para->scroll_dist_vert; + else +- priv->scroll.delta_x += diff / delta * para->scroll_dist_horiz;; ++ priv->scroll.delta_x -= diff / delta * para->scroll_dist_horiz;; + priv->scroll.last_a = angle(priv, hw->x, hw->y); + DBG(priv, 10, "circ scoll delta: %.2f diff %.2f angle %.2f\n", delta, diff, priv->scroll.last_a); + } |