diff options
| author | root <root@rshg054.dnsready.net> | 2013-01-24 00:06:07 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-01-24 00:06:07 -0800 |
| commit | cb33decb284fa3b08652b04f7290d9d4140a927f (patch) | |
| tree | e7f2c99536d9a7bc61ca30107cf99cb22064b61f | |
| parent | 91fea2e90c87b282a3bb39b080b8c51eb52cdbbe (diff) | |
Thu Jan 24 00:06:07 PST 2013
60 files changed, 1441 insertions, 183 deletions
diff --git a/community/audex/PKGBUILD b/community/audex/PKGBUILD index 780896cf1..fcc03eedc 100644 --- a/community/audex/PKGBUILD +++ b/community/audex/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 74830 2012-08-06 23:08:31Z andrea $ +# $Id: PKGBUILD 82705 2013-01-23 09:18:31Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: mightyjaym <jmambrosino@gmail.com> # Contributor: moostik <mooostik_at_gmail.com> pkgname=audex -pkgver=0.74b1 -pkgrel=4 +pkgver=0.76b2 +pkgrel=1 pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" arch=('i686' 'x86_64') url="http://kde-apps.org/content/show.php?content=77125" @@ -18,15 +18,16 @@ optdepends=('vorbis-tools: OGG encoder' 'flac: FLAC encoder' 'lame: MP3 encoder') install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz" +#source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz" +source=("http://kde.maniatek.com/${pkgname}/files/${pkgname}-${pkgver}.tar.xz" "google_regex.patch" 'gcc47.patch') -md5sums=('20fdf9a0f89c08f44a151b6bdaab8782' +md5sums=('c971bbfa113e4d54b0dcaae8afbf70fb' '77b33d8daead89d5f4f15b78a1cd1d55' '64107bcf90e22910e57804be774822dd') build() { # fix bug FS#25193 - patch -Np0 -i "${srcdir}"/google_regex.patch + # patch -Np0 -i "${srcdir}"/google_regex.patch cd ${pkgname}-${pkgver} patch -p1 -i "${srcdir}"/gcc47.patch diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD index 2646818bf..e555b60e2 100644 --- a/community/converseen/PKGBUILD +++ b/community/converseen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 79808 2012-11-12 22:07:56Z giovanni $ +# $Id: PKGBUILD 82692 2013-01-23 00:16:02Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: archtux <antonio.arias99999 at gmail.com> pkgname=converseen pkgver=0.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="The batch image converter and resizer" arch=('i686' 'x86_64') url="http://converseen.sourceforge.net/" @@ -21,7 +21,10 @@ build() { cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DImageMagick_Magick++_LIBRARY:FILEPATH=/usr/lib/libMagick++-Q16.so \ + -DImageMagick_MagickWand_LIBRARY:FILEPATH=/usr/lib/libMagickWand-Q16.so \ + -DImageMagick_MagickCore_LIBRARY:FILEPATH=/usr/lib/libMagickCore-Q16.so make } diff --git a/community/couchdb/PKGBUILD b/community/couchdb/PKGBUILD index fec729680..c09195ce1 100644 --- a/community/couchdb/PKGBUILD +++ b/community/couchdb/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 82191 2013-01-11 10:20:37Z spupykin $ +# $Id: PKGBUILD 82681 2013-01-23 00:15:50Z eric $ # 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.1 -pkgrel=1 +pkgrel=2 pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON" arch=('i686' 'x86_64') url="http://couchdb.apache.org" diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD index b59c0c3bd..fb3658edb 100644 --- a/community/cuneiform/PKGBUILD +++ b/community/cuneiform/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78925 2012-10-27 23:44:06Z ebelanger $ +# $Id: PKGBUILD 82693 2013-01-23 00:16:03Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Maxim Vuets <maxim.vuets@gmail.com> pkgname=cuneiform pkgver=1.1.0 _dpkgver=1.1 -pkgrel=4 +pkgrel=5 pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages." arch=('i686' 'x86_64') url="https://launchpad.net/cuneiform-linux" @@ -16,6 +16,7 @@ source=(http://launchpad.net/cuneiform-linux/${_dpkgver}/${_dpkgver}/+download/c md5sums=('09fd160cdfc512f26442a7e91246598d') _SRC_ROOT="${srcdir}/${pkgname}-linux-${pkgver}" +md5sums=('09fd160cdfc512f26442a7e91246598d') build() { cd "${_SRC_ROOT}" diff --git a/community/dee/PKGBUILD b/community/dee/PKGBUILD index 19cb7576d..b0f6440a6 100644 --- a/community/dee/PKGBUILD +++ b/community/dee/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80236 2012-11-18 10:29:58Z andrea $ +# $Id: PKGBUILD 82682 2013-01-23 00:15:51Z eric $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=dee pkgver=1.0.14 -pkgrel=3 +pkgrel=4 pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" arch=('i686' 'x86_64') url="https://launchpad.net/dee" diff --git a/community/dwdiff/PKGBUILD b/community/dwdiff/PKGBUILD index 620f4ab66..ef766763b 100644 --- a/community/dwdiff/PKGBUILD +++ b/community/dwdiff/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80237 2012-11-18 10:30:05Z andrea $ +# $Id: PKGBUILD 82683 2013-01-23 00:15:52Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=dwdiff pkgver=2.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" arch=('i686' 'x86_64') url="http://os.ghalkes.nl/dwdiff.html" diff --git a/community/fcitx/PKGBUILD b/community/fcitx/PKGBUILD index 4aea87ec8..e8b8cac7f 100644 --- a/community/fcitx/PKGBUILD +++ b/community/fcitx/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81502 2012-12-22 13:42:19Z fyan $ +# $Id: PKGBUILD 82684 2013-01-23 00:15:53Z eric $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> @@ -6,7 +6,7 @@ pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') pkgver=4.2.6.1 -pkgrel=4 +pkgrel=5 groups=('fcitx-im') arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" diff --git a/community/hevea/PKGBUILD b/community/hevea/PKGBUILD index d03059046..7a807f97e 100644 --- a/community/hevea/PKGBUILD +++ b/community/hevea/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 75888 2012-09-04 15:42:07Z spupykin $ +# $Id: PKGBUILD 82724 2013-01-23 15:18:44Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Brian Nguyen <bhnguyen@gmail.com> # Original Packager: Tom K <tomk@runbox.com> pkgname=hevea -pkgver=2.00 +pkgver=2.01 pkgrel=1 pkgdesc="A quite complete and fast LATEX to HTML translator" arch=(i686 x86_64) @@ -13,7 +13,7 @@ license=('GPL') url="http://pauillac.inria.fr/~maranget/hevea/" install=hevea.install source=(http://pauillac.inria.fr/~maranget/$pkgname/distri/$pkgname-$pkgver.tar.gz) -md5sums=('5cf0070c7cf5c7c020a657c513eaa0b5') +md5sums=('81f6fba8918ccc319e508983eff374fb') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/ibus-qt/PKGBUILD b/community/ibus-qt/PKGBUILD index aed97d135..9b320aed4 100644 --- a/community/ibus-qt/PKGBUILD +++ b/community/ibus-qt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80239 2012-11-18 10:30:25Z andrea $ +# $Id: PKGBUILD 82685 2013-01-23 00:15:54Z eric $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: garion < garion @ mailoo.org > @@ -6,7 +6,7 @@ pkgname=ibus-qt pkgver=1.3.1 -pkgrel=6 +pkgrel=7 pkgdesc='IBus qt library and IBus qt input method plugin' arch=('i686' 'x86_64') license=('LGPL') @@ -28,7 +28,7 @@ build() { } package() { - cd "${srcdir}//${pkgname}-${pkgver}-Source/build" + cd "${srcdir}/${pkgname}-${pkgver}-Source/build" make DESTDIR="${pkgdir}" install } md5sums=('769e8872ca8a59327b2073ce2f142589' diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD index e9d2c6f33..c4ce385b7 100644 --- a/community/kadu/PKGBUILD +++ b/community/kadu/PKGBUILD @@ -1,34 +1,37 @@ -# $Id: PKGBUILD 76360 2012-09-16 14:56:37Z bpiotrowski $ +# $Id: PKGBUILD 82749 2013-01-23 20:16:18Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> pkgname=kadu pkgver=0.12.3 -pkgrel=1 -pkgdesc='A Qt-based Jabber/XMPP and Gadu-Gadu client' +pkgrel=2 +pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client' arch=('i686' 'x86_64') url='http://www.kadu.net/' license=('GPL') -depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils') +depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl' + 'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils') makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl') install=kadu.install source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2) -md5sums=('c5d6f0bd384cd96090819ea018eb8ad8') +sha256sums=('d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8') build() { cd $srcdir mkdir build cd build + cmake ../$pkgname-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib make } package() { cd $srcdir/build - make DESTDIR=$pkgdir install - mv $pkgdir/usr/sdk "$pkgdir"/usr/share/kadu/sdk + make DESTDIR=$pkgdir LIBDIR=/usr/lib install + + mv $pkgdir/usr/sdk $pkgdir/usr/share/kadu/sdk rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig} - rm -rf $pkgdir/usr/share/kadu/{HISTORY,README} } diff --git a/community/libfbclient/PKGBUILD b/community/libfbclient/PKGBUILD index 969cb6ecb..0d7520599 100644 --- a/community/libfbclient/PKGBUILD +++ b/community/libfbclient/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80240 2012-11-18 10:30:33Z andrea $ +# $Id: PKGBUILD 82686 2013-01-23 00:15:55Z eric $ # Maintainer: Carlier Laurent <lordheavym@gmail.com> # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> pkgname=libfbclient pkgver=2.5.2.26539 -pkgrel=1 +pkgrel=2 pkgdesc="Client library for Firebird." arch=('i686' 'x86_64') url="http://www.firebirdsql.org/" diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD index 4088d1020..9d3b7ebee 100644 --- a/community/mapnik/PKGBUILD +++ b/community/mapnik/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 80294 2012-11-19 14:11:03Z spupykin $ +# $Id: PKGBUILD 82687 2013-01-23 00:15:56Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: David Dent <thewinch@gmail.com> # Contributor: orbisvicis <orbisvicis@gmail.com> pkgname=mapnik pkgver=2.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps" arch=('i686' 'x86_64') url="http://mapnik.org/" diff --git a/community/mingw32-binutils/PKGBUILD b/community/mingw32-binutils/PKGBUILD index 608f75fb3..f8266faec 100644 --- a/community/mingw32-binutils/PKGBUILD +++ b/community/mingw32-binutils/PKGBUILD @@ -1,19 +1,21 @@ -# $Id: PKGBUILD 80285 2012-11-19 12:16:35Z spupykin $ +# $Id: PKGBUILD 82709 2013-01-23 10:13:43Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Ondrej Jirman <megous@megous.com> # Contributor: mosra <mosra@centrum.cz> pkgname=mingw32-binutils pkgver=2.23.1 -pkgrel=1 +pkgrel=2 _uprel=1 arch=(i686 x86_64) url="https://sourceforge.net/projects/mingw/files/MinGW/Base/binutils/" pkgdesc="A set of programs to assemble and manipulate binary and object files (mingw)" depends=('glibc' 'zlib') license=(GPL) -source=(https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma) -md5sums=('5d76604f545b151230d1c86e1b8cfab3') +source=("https://downloads.sourceforge.net/project/mingw/MinGW/Base/binutils/binutils-$pkgver/binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma" + "http://sourceware.org/git/?p=binutils.git;a=patch;h=260cd95271cdf002ed8e419898fd29c42e257841") +md5sums=('5d76604f545b151230d1c86e1b8cfab3' + '9226501a8258a12c81956252ba3b4ba1') build() { [ $NOEXTRACT -eq 1 ] || tar --lzma -xf binutils-$pkgver-${_uprel}-mingw32-src.tar.lzma diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD index 75a653a32..f7198378c 100644 --- a/community/mpdscribble/PKGBUILD +++ b/community/mpdscribble/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 75389 2012-08-21 18:46:41Z bpiotrowski $ +# $Id: PKGBUILD 82753 2013-01-23 20:52:45Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowwski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: evr <evanroman at gmail> @@ -6,21 +6,20 @@ pkgname=mpdscribble pkgver=0.22 -pkgrel=5 -pkgdesc='An mpd client which submits track info to last.fm' +pkgrel=6 +pkgdesc='MPD client which submits track info to Last.fm' url='http://mpd.wikia.com/wiki/Client:Mpdscribble' arch=('i686' 'x86_64') license=('GPL') depends=('libsoup' 'glib2' 'libmpdclient') -install='mpdscribble.install' +install=$pkgname.install source=(http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2 - rc.d service) -md5sums=('652ee927b797e9a4cef45494e77047db' - 'f54c937c7b3ab8e4d39e4b903c2993fc' - '7e0a80c12225b0fe7be9c993f0079e95') + service) +sha256sums=('1cde2b5f8c70f0e3e6f059d01bf0b0f2eac2b29fbcd14b01a8a5103e603feb41' + '8a6568235e8b2ac7535a6f99f4401450a4162bac0cacb938af2ec39a808e1132') build() { - cd mpdscribble-${pkgver} + cd mpdscribble-$pkgver ./configure \ --prefix=/usr \ @@ -31,13 +30,10 @@ build() { } package() { - cd mpdscribble-${pkgver} + cd mpdscribble-$pkgver make DESTDIR="${pkgdir}" install - install -D "${srcdir}"/rc.d \ - "${pkgdir}"/etc/rc.d/mpdscribble - install -Dm644 "${srcdir}"/service \ "${pkgdir}"/usr/lib/systemd/system/mpdscribble.service diff --git a/community/mpdscribble/service b/community/mpdscribble/service index 1475866ce..25f64d7d5 100644 --- a/community/mpdscribble/service +++ b/community/mpdscribble/service @@ -1,12 +1,9 @@ [Unit] Description=last.fm updater for MPD -Wants=mpd.service After=mpd.service [Service] -Type=forking -PIDFile=/run/mpdscribble.pid -ExecStart=/usr/bin/mpdscribble --pidfile /run/mpdscribble.pid +ExecStart=/usr/bin/mpdscribble --no-daemon [Install] WantedBy=multi-user.target diff --git a/community/openttd/PKGBUILD b/community/openttd/PKGBUILD index a71f62515..bbcfdc26d 100644 --- a/community/openttd/PKGBUILD +++ b/community/openttd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80243 2012-11-18 10:31:01Z andrea $ +# $Id: PKGBUILD 82688 2013-01-23 00:15:57Z eric $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=openttd pkgver=1.2.3 -pkgrel=2 +pkgrel=3 pkgdesc='An engine for running Transport Tycoon Deluxe.' arch=('i686' 'x86_64') url='http://www.openttd.org' diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index 4843f8b55..3e7a72a0c 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 81903 2013-01-03 10:07:48Z spupykin $ +# $Id: PKGBUILD 82738 2013-01-23 16:27:21Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.11.0 -#_rel=stable -_rel=devel -pkgrel=1 +pkgver=5.0.0 +_rel=stable +#_rel=devel +pkgrel=2 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686') url="http://www.parrotcode.org/" @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('fd2e9c0145e224ca022783e61caf6fc5') +md5sums=('4f16127f539e019a30d21b4d1ea7196f') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD index 6150853ed..945a20355 100644 --- a/community/performous/PKGBUILD +++ b/community/performous/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80212 2012-11-17 17:48:39Z lcarlier $ +# $Id: PKGBUILD 82694 2013-01-23 00:16:04Z eric $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> pkgname=performous pkgver=0.7.0 -pkgrel=1 +pkgrel=2 pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"' arch=('i686' 'x86_64') url="http://performous.org/" diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD index c90e25ac1..6caa46a48 100644 --- a/community/rss-glx/PKGBUILD +++ b/community/rss-glx/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 78940 2012-10-27 23:45:28Z ebelanger $ +# $Id: PKGBUILD 82695 2013-01-23 00:16:05Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> # Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> pkgname=rss-glx pkgver=0.9.1 -pkgrel=12 +pkgrel=13 pkgdesc="The Really Slick Screensavers port to GLX" arch=('i686' 'x86_64') url="http://rss-glx.sourceforge.net/" diff --git a/community/tigervnc/PKGBUILD b/community/tigervnc/PKGBUILD index 7e050085e..5719e84e8 100644 --- a/community/tigervnc/PKGBUILD +++ b/community/tigervnc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 79431 2012-11-04 20:22:06Z spupykin $ +# $Id: PKGBUILD 82711 2013-01-23 10:24:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Uroš Vampl <mobile.leecher at gmail dot com> pkgname=tigervnc pkgver=1.2.0 -pkgrel=9 -_xorgver=1.12.3 +pkgrel=10 +_xorgver=1.13.1 pkgdesc="suite of VNC servers and clients. VNC 4 branch of TightVNC." arch=('i686' 'x86_64') url="http://www.tigervnc.org" @@ -24,14 +24,20 @@ source=(http://downloads.sourceforge.net/tigervnc/${pkgname}-${pkgver}.tar.gz vncserver.service xorg111.patch xorg112.patch + xorg113.patch + xserver113.patch + glx.patch gnutls.patch gethomedir.patch cmakelists.patch) md5sums=('3a5755b4ed600a81c3a17976c6f8420d' - '65a53b11bc01dcc97ee9b201dc620c32' + 'a13d8876e3e804189392119638a07a1f' '0903d5a0dfa38e0b04964505b644585c' 'b680b55f7f9f569cd26ac0b330012a8b' 'f73e055153889ae7b5aac8e697f7a841' + 'ef4078ba31a583dc3134e9090fbd30d0' + 'fabbe561d4ac845317ffdbf1bb2eeb02' + '4b86c015c78a0360205fdcf511ea1c39' '1a5fe8867ab3e49e20aafc70c415494f' 'fa059baabe72308bf82622bca73cb3e0' '6ef923c71cc0e79c4b37eb3b124eea75') @@ -45,20 +51,22 @@ build() { patch -Np1 -i ${srcdir}/cmakelists.patch patch -Np1 -i ${srcdir}/xorg111.patch patch -Np1 -i ${srcdir}/xorg112.patch + patch -Np1 -i ${srcdir}/xorg113.patch + patch -Np1 -i ${srcdir}/glx.patch cmake -G "Unix Makefiles" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_INCLUDED_FLTK=yes make cd unix/xserver - patch -Np1 -i ../xserver110.patch + patch -Np3 -i ${srcdir}/xserver113.patch autoreconf -fiv ./configure --prefix=/usr \ --disable-static --disable-xinerama --without-dtrace \ --disable-xorg --disable-xnest --disable-xvfb --disable-dmx \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ --disable-config-dbus --disable-config-hal --disable-config-udev \ - --disable-unit-tests --disable-devel-docs --disable-dri \ - --enable-dri2 --enable-glx --enable-glx-tls + --disable-unit-tests --disable-devel-docs --disable-selective-werror \ + --disable-dri --enable-dri2 --enable-glx --enable-glx-tls make } diff --git a/community/tigervnc/glx.patch b/community/tigervnc/glx.patch new file mode 100644 index 000000000..b2ecb672f --- /dev/null +++ b/community/tigervnc/glx.patch @@ -0,0 +1,85 @@ +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/Makefile.am 2011-10-31 09:14:40.000000000 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/Makefile.am 2013-01-21 03:39:14.924841615 +0100 +@@ -7,6 +7,10 @@ + XREGION_LIB=$(LIB_DIR)/Xregion/libXregion.la + COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) + ++if GLX ++GLX_LIB = $(top_srcdir)/glx/libglx.la ++endif ++ + noinst_LTLIBRARIES = libvnccommon.la + + HDRS = RegionHelper.h vncExtInit.h vncHooks.h XserverDesktop.h xorg-version.h \ +@@ -34,7 +38,8 @@ + -UHAVE_CONFIG_H \ + -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ + -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common \ +- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) ++ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) \ ++ -I$(top_srcdir)/glx + + Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ + $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 +@@ -55,7 +60,7 @@ + + libvnc_la_LDFLAGS = -module -avoid-version + +-libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) ++libvnc_la_LIBADD = libvnccommon.la $(COMMON_LIBS) $(GLX_LIB) + + EXTRA_DIST = Xvnc.man + +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc 2012-03-09 21:34:29.000000000 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2013-01-21 03:38:38.187300899 +0100 +@@ -87,6 +87,17 @@ + #include "version-config.h" + #include "site.h" + #endif ++ ++#if XORG >= 113 ++#ifdef GLXEXT ++/* C++ really is the worst */ ++#define private _private ++#include "glxserver.h" ++#undef private ++#include "glx_extinit.h" ++#endif ++#endif ++ + #undef class + #undef public + } +@@ -1305,6 +1316,16 @@ + dispatchException &= ~DE_RESET; + } + ++#if XORG >= 113 ++#ifdef GLXEXT ++static ExtensionModule vnc_glx_ext = { ++ GlxExtensionInit, ++ "GLX", ++ &noGlxExtension ++}; ++#endif ++#endif ++ + void + InitOutput(ScreenInfo *screenInfo, int argc, char **argv) + { +@@ -1314,6 +1335,13 @@ + int i; + int NumFormats = 0; + ++#if XORG >= 113 ++#ifdef GLXEXT ++ if (serverGeneration == 1) ++ LoadExtension(&vnc_glx_ext, TRUE); ++#endif ++#endif ++ + /* initialize pixmap formats */ + + /* must have a pixmap depth to match every screen depth */ diff --git a/community/tigervnc/xorg113.patch b/community/tigervnc/xorg113.patch new file mode 100644 index 000000000..505e0a758 --- /dev/null +++ b/community/tigervnc/xorg113.patch @@ -0,0 +1,275 @@ +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncHooks.cc tigervnc-1.2.0/unix/xserver/hw/vnc/vncHooks.cc +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/vncHooks.cc 2012-01-23 16:54:11.000000000 +0100 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/vncHooks.cc 2012-09-06 18:53:26.392282102 +0200 +@@ -116,7 +116,11 @@ + + // screen functions + ++#if XORG < 112 + static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen); ++#else ++static Bool vncHooksCloseScreen(ScreenPtr pScreen); ++#endif + static Bool vncHooksCreateGC(GCPtr pGC); + static void vncHooksCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, + RegionPtr pOldRegion); +@@ -133,8 +137,13 @@ + DeviceIntPtr pDev, + #endif + ScreenPtr pScreen, CursorPtr cursor); ++#if XORG < 112 + static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, + pointer pReadmask); ++#else ++static void vncHooksBlockHandler(ScreenPtr pScreen, pointer pTimeout, ++ pointer pReadmask); ++#endif + #ifdef RENDER + static void vncHooksComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, + PicturePtr pDst, INT16 xSrc, INT16 ySrc, INT16 xMask, +@@ -335,7 +344,11 @@ + // CloseScreen - unwrap the screen functions and call the original CloseScreen + // function + ++#if XORG < 112 + static Bool vncHooksCloseScreen(int i, ScreenPtr pScreen_) ++#else ++static Bool vncHooksCloseScreen(ScreenPtr pScreen_) ++#endif + { + SCREEN_UNWRAP(pScreen_, CloseScreen); + +@@ -366,7 +379,11 @@ + + DBGPRINT((stderr,"vncHooksCloseScreen: unwrapped screen functions\n")); + ++#if XORG < 112 + return (*pScreen->CloseScreen)(i, pScreen); ++#else ++ return (*pScreen->CloseScreen)(pScreen); ++#endif + } + + // CreateGC - wrap the "GC funcs" +@@ -531,14 +548,27 @@ + // BlockHandler - ignore any changes during the block handler - it's likely + // these are just drawing the cursor. + ++#if XORG < 112 + static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, + pointer pReadmask) ++#else ++static void vncHooksBlockHandler(ScreenPtr pScreen_, pointer pTimeout, ++ pointer pReadmask) ++#endif + { ++#if XORG < 112 + SCREEN_UNWRAP(screenInfo.screens[i], BlockHandler); ++#else ++ SCREEN_UNWRAP(pScreen_, BlockHandler); ++#endif + + vncHooksScreen->desktop->ignoreHooks(true); + ++#if XORG < 112 + (*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask); ++#else ++ (*pScreen->BlockHandler) (pScreen, pTimeout, pReadmask); ++#endif + + vncHooksScreen->desktop->ignoreHooks(false); + +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xf86vncModule.cc 2012-09-06 18:52:54.668284962 +0200 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xf86vncModule.cc 2012-09-06 18:53:26.393282091 +0200 +@@ -53,8 +53,10 @@ + { + vncExtensionInitWithParams, + "VNC", ++#if XORG < 112 + NULL, + NULL, ++#endif + NULL + }; + +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xorg-version.h 2012-09-06 18:52:54.669284923 +0200 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xorg-version.h 2012-09-06 18:53:26.393282091 +0200 +@@ -40,8 +40,10 @@ + #define XORG 111 + #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (12 * 100000) + (99 * 1000)) + #define XORG 112 ++#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (13 * 100000) + (99 * 1000)) ++#define XORG 113 + #else +-#error "X.Org newer than 1.10 is not supported" ++#error "X.Org newer than 1.13 is not supported" + #endif + + #endif +diff -ur tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc +--- tigervnc-1.2.0.orig/unix/xserver/hw/vnc/xvnc.cc 2012-09-06 18:52:51.896283812 +0200 ++++ tigervnc-1.2.0/unix/xserver/hw/vnc/xvnc.cc 2012-09-06 18:59:25.784263082 +0200 +@@ -285,7 +285,11 @@ + } + + void ++#if XORG < 113 + OsVendorFatalError() ++#else ++OsVendorFatalError(const char *f, va_list args) ++#endif + { + } + +@@ -626,14 +630,25 @@ + } + #endif + ++#if XORG < 113 + static ColormapPtr InstalledMaps[MAXSCREENS]; ++#else ++static DevPrivateKeyRec cmapScrPrivateKeyRec; ++#define cmapScrPrivateKey (&cmapScrPrivateKeyRec) ++#define GetInstalledColormap(s) ((ColormapPtr) dixLookupPrivate(&(s)->devPrivates, cmapScrPrivateKey)) ++#define SetInstalledColormap(s,c) (dixSetPrivate(&(s)->devPrivates, cmapScrPrivateKey, c)) ++#endif + + static int + vfbListInstalledColormaps(ScreenPtr pScreen, Colormap *pmaps) + { + /* By the time we are processing requests, we can guarantee that there + * is always a colormap installed */ ++#if XORG < 113 + *pmaps = InstalledMaps[pScreen->myNum]->mid; ++#else ++ *pmaps = GetInstalledColormap(pScreen)->mid; ++#endif + return (1); + } + +@@ -641,8 +656,16 @@ + static void + vfbInstallColormap(ColormapPtr pmap) + { ++#if XORG < 113 + int index = pmap->pScreen->myNum; +- ColormapPtr oldpmap = InstalledMaps[index]; ++#endif ++ ColormapPtr oldpmap; ++ ++#if XORG < 113 ++ oldpmap = InstalledMaps[index]; ++#else ++ oldpmap = GetInstalledColormap(pmap->pScreen); ++#endif + + if (pmap != oldpmap) + { +@@ -656,7 +679,11 @@ + if(oldpmap != (ColormapPtr)None) + WalkTree(pmap->pScreen, TellLostMap, (char *)&oldpmap->mid); + /* Install pmap */ ++#if XORG < 113 + InstalledMaps[index] = pmap; ++#else ++ SetInstalledColormap(pmap->pScreen, pmap); ++#endif + WalkTree(pmap->pScreen, TellGainedMap, (char *)&pmap->mid); + + entries = pmap->pVisual->ColormapEntries; +@@ -692,7 +719,11 @@ + static void + vfbUninstallColormap(ColormapPtr pmap) + { ++#if XORG < 113 + ColormapPtr curpmap = InstalledMaps[pmap->pScreen->myNum]; ++#else ++ ColormapPtr curpmap = GetInstalledColormap(pmap->pScreen); ++#endif + + if(pmap == curpmap) + { +@@ -1153,31 +1184,66 @@ + #endif + + static Bool ++#if XORG < 113 + vfbCloseScreen(int index, ScreenPtr pScreen) ++#else ++vfbCloseScreen(ScreenPtr pScreen) ++#endif + { ++#if XORG < 113 + vfbScreenInfoPtr pvfb = &vfbScreens[index]; ++#else ++ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; ++#endif + int i; + + pScreen->CloseScreen = pvfb->closeScreen; + + /* + * XXX probably lots of stuff to clean. For now, +- * clear InstalledMaps[] so that server reset works correctly. ++ * clear installed colormaps so that server reset works correctly. + */ ++#if XORG < 113 + for (i = 0; i < MAXSCREENS; i++) + InstalledMaps[i] = NULL; + + return pScreen->CloseScreen(index, pScreen); ++#else ++ for (i = 0; i < screenInfo.numScreens; i++) ++ SetInstalledColormap(screenInfo.screens[i], NULL); ++ ++ /* ++ * fb overwrites miCloseScreen, so do this here ++ */ ++ if (pScreen->devPrivate) ++ (*pScreen->DestroyPixmap) ((PixmapPtr) pScreen->devPrivate); ++ pScreen->devPrivate = NULL; ++ ++ return pScreen->CloseScreen(pScreen); ++#endif + } + + static Bool ++#if XORG < 113 + vfbScreenInit(int index, ScreenPtr pScreen, int argc, char **argv) ++#else ++vfbScreenInit(ScreenPtr pScreen, int argc, char **argv) ++#endif + { ++#if XORG < 113 + vfbScreenInfoPtr pvfb = &vfbScreens[index]; ++#else ++ vfbScreenInfoPtr pvfb = &vfbScreens[pScreen->myNum]; ++#endif + int dpi; + int ret; + void *pbits; + ++#if XORG >= 113 ++ if (!dixRegisterPrivateKey(&cmapScrPrivateKeyRec, PRIVATE_SCREEN, 0)) ++ return FALSE; ++#endif ++ + /* 96 is the default used by most other systems */ + dpi = 96; + if (monitorResolution) +@@ -1185,8 +1251,13 @@ + + pbits = vfbAllocateFramebufferMemory(&pvfb->fb); + if (!pbits) return FALSE; ++#if XORG < 113 + vncFbptr[index] = pbits; + vncFbstride[index] = pvfb->fb.paddedWidth; ++#else ++ vncFbptr[pScreen->myNum] = pbits; ++ vncFbstride[pScreen->myNum] = pvfb->fb.paddedWidth; ++#endif + + miSetPixmapDepths(); + diff --git a/community/tigervnc/xserver113.patch b/community/tigervnc/xserver113.patch new file mode 100644 index 000000000..e4fabf3b0 --- /dev/null +++ b/community/tigervnc/xserver113.patch @@ -0,0 +1,92 @@ +diff -up tigervnc-1.2.0/unix/xserver/configure.ac.vnc tigervnc-1.2.0/unix/xserver/configure.ac +--- tigervnc-1.2.0/unix/xserver/configure.ac.vnc 2012-08-28 15:35:23.778810954 +0200 ++++ tigervnc-1.2.0/unix/xserver/configure.ac 2012-08-28 15:54:46.396743431 +0200 +@@ -31,7 +31,6 @@ RELEASE_DATE="2012-08-21" + RELEASE_NAME="Splashing Orca" + AC_CONFIG_SRCDIR([Makefile.am]) + AM_INIT_AUTOMAKE([foreign dist-bzip2]) +-AM_MAINTAINER_MODE + + # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS + m4_ifndef([XORG_MACROS_VERSION], +@@ -73,6 +72,7 @@ dnl forcing an entire recompile.x + AC_CONFIG_HEADERS(include/version-config.h) + + AM_PROG_AS ++AC_PROG_CXX + AC_PROG_LN_S + AC_LIBTOOL_WIN32_DLL + AC_DISABLE_STATIC +@@ -1561,6 +1561,10 @@ if test "x$XVFB" = xyes; then + AC_SUBST([XVFB_SYS_LIBS]) + fi + ++dnl Xvnc DDX ++AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) ++AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) ++AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) + + dnl Xnest DDX + +@@ -1596,6 +1600,8 @@ if test "x$XORG" = xauto; then + fi + AC_MSG_RESULT([$XORG]) + ++AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) ++ + if test "x$XORG" = xyes; then + XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' + XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' +@@ -1815,7 +1821,6 @@ if test "x$XORG" = xyes; then + AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) + AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) + AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) +- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) + AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) + AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) + AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) +@@ -2280,6 +2285,7 @@ hw/dmx/Makefile + hw/dmx/man/Makefile + hw/vfb/Makefile + hw/vfb/man/Makefile ++hw/vnc/Makefile + hw/xnest/Makefile + hw/xnest/man/Makefile + hw/xwin/Makefile +diff -up tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc tigervnc-1.2.0/unix/xserver/hw/Makefile.am +--- tigervnc-1.2.0/unix/xserver/hw/Makefile.am.vnc 2012-08-28 15:35:23.856810890 +0200 ++++ tigervnc-1.2.0/unix/xserver/hw/Makefile.am 2012-08-28 15:35:42.272795917 +0200 +@@ -33,7 +33,8 @@ SUBDIRS = \ + $(XNEST_SUBDIRS) \ + $(DMX_SUBDIRS) \ + $(KDRIVE_SUBDIRS) \ +- $(XQUARTZ_SUBDIRS) ++ $(XQUARTZ_SUBDIRS) \ ++ vnc + + DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive + +diff -up tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c +--- tigervnc-1.2.0/unix/xserver/mi/miinitext.c.vnc 2012-08-28 15:35:23.000000000 +0200 ++++ tigervnc-1.2.0/unix/xserver/mi/miinitext.c 2012-09-05 15:07:40.714953972 +0200 +@@ -112,6 +112,10 @@ SOFTWARE. + #include "micmap.h" + #include "globals.h" + ++#ifdef TIGERVNC ++extern void vncExtensionInit(INITARGS); ++#endif ++ + /* The following is only a small first step towards run-time + * configurable extensions. + */ +@@ -299,6 +303,9 @@ static ExtensionModule staticExtensions[ + #ifdef XSELINUX + {SELinuxExtensionInit, SELINUX_EXTENSION_NAME, &noSELinuxExtension}, + #endif ++#ifdef TIGERVNC ++ {vncExtensionInit, "VNC-EXTENSION", NULL}, ++#endif + }; + + static ExtensionModule *ExtensionModuleList = NULL; diff --git a/community/ubuntuone-client/PKGBUILD b/community/ubuntuone-client/PKGBUILD index 6d95a2a4a..798331ad9 100644 --- a/community/ubuntuone-client/PKGBUILD +++ b/community/ubuntuone-client/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 79225 2012-11-01 10:28:41Z bgyorgy $ +# $Id: PKGBUILD 82715 2013-01-23 12:42:21Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=ubuntuone-client pkgver=4.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Ubuntu One helps you store, sync and share files between your computers" arch=('i686' 'x86_64') url="https://launchpad.net/ubuntuone-client" @@ -14,10 +14,12 @@ options=('!libtool') install=$pkgname.install source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz 1339_1338.diff - fix-notify-hint.patch) + fix-notify-hint.patch + lp1093111.patch) md5sums=('738039703d4dcf54518a725f8ffbc4de' 'e82e80c229de06692988c1f938a34fb9' - '54dfeb2be011f0a12ea7cfa0f0c19bec') + '54dfeb2be011f0a12ea7cfa0f0c19bec' + 'ca79cb558231639e28be7276017ae91c') build() { cd "$srcdir/$pkgname-$pkgver" @@ -30,6 +32,10 @@ build() { # https://bugzilla.gnome.org/show_bug.cgi?id=665166 patch -Np1 -i "$srcdir/fix-notify-hint.patch" + # Fix compatibility with glibc 2.17 + # https://bugs.launchpad.net/ubuntuone-client/+bug/1093111 + patch -Np1 -i "$srcdir/lp1093111.patch" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --disable-static \ PYTHON=python2 diff --git a/community/ubuntuone-client/lp1093111.patch b/community/ubuntuone-client/lp1093111.patch new file mode 100644 index 000000000..8663915d3 --- /dev/null +++ b/community/ubuntuone-client/lp1093111.patch @@ -0,0 +1,10 @@ +--- a/ubuntuone/syncdaemon/tritcask.py 2013-01-18 18:27:41.809017000 +0200 ++++ b/ubuntuone/syncdaemon/tritcask.py 2013-01-22 15:08:15.015987671 +0200 +@@ -300,6 +300,7 @@ + self.fd.seek(0, os.SEEK_END) + self.fd.write(crc32 + header) + self.fd.write(key) ++ self.fd.flush() + value_pos = self.fd.tell() + self.fd.write(value) + self.fd.flush() diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD index c1fcbe5c5..b75cd8b0e 100644 --- a/community/virtualbox-modules-lts/PKGBUILD +++ b/community/virtualbox-modules-lts/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 81642 2012-12-25 14:12:06Z seblu $ +# $Id: PKGBUILD 82760 2013-01-23 21:19:41Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules-lts pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') pkgver=4.2.6 -pkgrel=3 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/yaz/PKGBUILD b/community/yaz/PKGBUILD index a6463eede..8861c7966 100644 --- a/community/yaz/PKGBUILD +++ b/community/yaz/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80246 2012-11-18 10:31:25Z andrea $ +# $Id: PKGBUILD 82691 2013-01-23 00:16:01Z eric $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -7,16 +7,17 @@ # Contributor: Robert Emil Berge <filoktetes@linuxophic.org> pkgname=yaz -pkgver=4.2.43 -pkgrel=2 +pkgver=4.2.49 +pkgrel=1 pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers" arch=('i686' 'x86_64') url="http://www.indexdata.dk/yaz" license=('BSD') depends=('openssl' 'libxslt' 'icu') options=('!libtool') +changelog=$pkgname.changelog source=(http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('849419a3e647568f2cc9a6097e009f0be8f379759d6d13274eb5d19314b1bfc2') +sha256sums=('b4dd27100fdf18219a0e1fde53eaf385e426db6795ab4fbb4a01796d4c9056a1') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/yaz/yaz.changelog b/community/yaz/yaz.changelog new file mode 100644 index 000000000..2124e895e --- /dev/null +++ b/community/yaz/yaz.changelog @@ -0,0 +1,2 @@ +2013-01-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * yaz 4.2.49-1 diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index 11efb802a..a28446d18 100644 --- a/extra/boost/PKGBUILD +++ b/extra/boost/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171511 2012-11-18 10:27:36Z andyrtr $ +# $Id: PKGBUILD 175865 2013-01-23 00:12:56Z eric $ # Maintainer: kevin <kevin@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Kritoke <kritoke@gamebox.net> @@ -8,10 +8,10 @@ pkgbase=boost pkgname=('boost-libs' 'boost') pkgver=1.50.0 _boostver=${pkgver//./_} -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="http://www.boost.org/" -makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') +makedepends=('icu>=50.1.2' 'python' 'python2' 'bzip2' 'zlib' 'openmpi') source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz) license=('custom') md5sums=('dbc07ab0254df3dda6300fd737b3f264') diff --git a/extra/brltty/PKGBUILD b/extra/brltty/PKGBUILD index 87de7f300..45b854d34 100644 --- a/extra/brltty/PKGBUILD +++ b/extra/brltty/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 173838 2012-12-25 00:34:16Z foutrelis $ +# $Id: PKGBUILD 175866 2013-01-23 00:12:57Z eric $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=brltty pkgver=4.4 -pkgrel=2 +pkgrel=3 pkgdesc="Braille display driver for Linux/Unix" arch=('i686' 'x86_64') url="http://mielke.cc/brltty" license=('GPL' 'LGPL') -depends=('libxaw' 'at-spi2-core' 'gpm' 'icu' 'tcl' 'atk' 'pyrex') +depends=('libxaw' 'at-spi2-core' 'gpm' 'icu>=50.1.2' 'tcl' 'atk' 'pyrex') makedepends=('bluez') optdepends=('bluez: bluetooth support') backup=(etc/brltty.conf etc/conf.d/brltty.conf) diff --git a/extra/c-ares/PKGBUILD b/extra/c-ares/PKGBUILD index e047a5611..865d13f06 100644 --- a/extra/c-ares/PKGBUILD +++ b/extra/c-ares/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161977 2012-06-17 22:25:00Z dreisner $ +# $Id: PKGBUILD 175878 2013-01-23 00:23:32Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=c-ares -pkgver=1.9.0 +pkgver=1.9.1 pkgrel=1 pkgdesc='C library that performs DNS requests and name resolves asynchronously' arch=('i686' 'x86_64') @@ -15,8 +15,8 @@ depends=('glibc') options=('!libtool') source=("http://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} 'LICENSE') -md5sums=('c1a61a5a9db15129ba538f724de50ded' - '5cfadabe6c9cb1e0aa879803129bcfe3' +md5sums=('389db4917a3b58c4ce4ebfe961fd84c4' + '8a180aabbd7565e1a9f3ca5c6be6e99c' 'c69f2042941b708ce3e7121424d0b7e6') build() { diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index aee810485..1597c2d64 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 175769 2013-01-21 16:00:59Z andyrtr $ +# $Id: PKGBUILD 175889 2013-01-23 11:37:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo pkgver=1.12.10 -pkgrel=1 +pkgrel=2 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') @@ -15,11 +15,17 @@ optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') options=('!libtool') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('be06d5aaa272bbbd08380f71ca710d5612881493') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz + revert-xlib-map-to-image-requires-an-extents.patch + revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch) +sha1sums=('be06d5aaa272bbbd08380f71ca710d5612881493' + '8bc096dd16a885ad041cb2137a64757f32d1cc88' + 'fd8ffd9aba3679c344e4f25494f199a51b0ae62c') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -R -i ../revert-xlib-map-to-image-requires-an-extents.patch + patch -Np1 -R -i ../revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch b/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch new file mode 100644 index 000000000..ffd324252 --- /dev/null +++ b/extra/cairo/revert-xlib-Simplify-source-creation-by-use-of-map-to-image.patch @@ -0,0 +1,144 @@ +From a73e7ff0186176bc82cd3ae1432c054c1fd3aebd Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Sun, 06 Jan 2013 11:29:27 +0000 +Subject: xlib: Simplify source creation by use of map-to-image + +We were open-coding the functionality of map-to-image inside the source +creation routines. so refactor to actually use map-to-image instead. + +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +--- +diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c +index e312222..d08052a 100644 +--- a/src/cairo-xlib-source.c ++++ b/src/cairo-xlib-source.c +@@ -898,9 +898,6 @@ surface_source (cairo_xlib_surface_t *dst, + cairo_surface_pattern_t local_pattern; + cairo_status_t status; + cairo_rectangle_int_t upload, limit; +- cairo_matrix_t m; +- pixman_format_code_t format; +- int draw_x, draw_y; + + src = pattern->surface; + if (src->type == CAIRO_SURFACE_TYPE_IMAGE && +@@ -910,7 +907,6 @@ surface_source (cairo_xlib_surface_t *dst, + + cairo_surface_reference (src); + +-prepare_shm_image: + proxy = malloc (sizeof(*proxy)); + if (unlikely (proxy == NULL)) { + cairo_surface_destroy (src); +@@ -954,46 +950,47 @@ prepare_shm_image: + } + } + +- if (_cairo_surface_is_image (src)) +- format = ((cairo_image_surface_t *)src)->pixman_format; +- else +- format = _cairo_format_to_pixman_format_code (_cairo_format_from_content (src->content)); +- src = _cairo_xlib_surface_create_shm (dst, format, +- upload.width, upload.height); +- if (src == NULL) { +- if (_cairo_surface_is_image (pattern->surface)) { +- draw_x = upload.x; +- draw_y = upload.y; +- src = cairo_surface_reference (pattern->surface); +- goto skip_paint; +- } +- +- src = _cairo_image_surface_create_with_pixman_format (NULL, +- format, +- upload.width, +- upload.height, +- 0); ++ xsrc = (cairo_xlib_surface_t *) ++ _cairo_surface_create_similar_scratch (&dst->base, ++ src->content, ++ upload.width, ++ upload.height); ++ if (xsrc->base.type != CAIRO_SURFACE_TYPE_XLIB) { ++ cairo_surface_destroy (src); ++ cairo_surface_destroy (&xsrc->base); ++ return None; + } + +- _cairo_pattern_init_for_surface (&local_pattern, pattern->surface); +- cairo_matrix_init_translate (&local_pattern.base.matrix, +- upload.x, upload.y); ++ if (_cairo_surface_is_image (src)) { ++ status = _cairo_xlib_surface_draw_image (xsrc, (cairo_image_surface_t *)src, ++ upload.x, upload.y, ++ upload.width, upload.height, ++ 0, 0); ++ } else { ++ cairo_image_surface_t *image; + +- status = _cairo_surface_paint (src, +- CAIRO_OPERATOR_SOURCE, +- &local_pattern.base, +- NULL); +- _cairo_pattern_fini (&local_pattern.base); ++ image = _cairo_surface_map_to_image (&xsrc->base, NULL); + +- if (unlikely (status)) { +- cairo_surface_destroy (src); +- return _cairo_surface_create_in_error (status); ++ _cairo_pattern_init_for_surface (&local_pattern, pattern->surface); ++ cairo_matrix_init_translate (&local_pattern.base.matrix, ++ upload.x, upload.y); ++ ++ status = _cairo_surface_paint (&image->base, ++ CAIRO_OPERATOR_SOURCE, ++ &local_pattern.base, ++ NULL); ++ _cairo_pattern_fini (&local_pattern.base); ++ ++ status = _cairo_surface_unmap_image (&xsrc->base, image); ++ if (unlikely (status)) { ++ cairo_surface_destroy (src); ++ return _cairo_surface_create_in_error (status); ++ } + } + +- draw_x = draw_y = 0; +-skip_paint: + _cairo_pattern_init_static_copy (&local_pattern.base, &pattern->base); + if (upload.x | upload.y) { ++ cairo_matrix_t m; + cairo_matrix_init_translate (&m, -upload.x, -upload.y); + cairo_matrix_multiply (&local_pattern.base.matrix, + &local_pattern.base.matrix, +@@ -1001,29 +998,6 @@ skip_paint: + } + + *src_x = *src_y = 0; +- if (src->device == dst->base.device && +- _cairo_xlib_shm_surface_get_pixmap (src)) { +- pattern = &local_pattern; +- goto prepare_shm_image; +- } +- +- xsrc = (cairo_xlib_surface_t *) +- _cairo_surface_create_similar_scratch (&dst->base, +- src->content, +- upload.width, +- upload.height); +- if (xsrc->base.type != CAIRO_SURFACE_TYPE_XLIB) { +- cairo_surface_destroy (src); +- cairo_surface_destroy (&xsrc->base); +- return None; +- } +- +- status = _cairo_xlib_surface_draw_image (xsrc, (cairo_image_surface_t *)src, +- draw_x, draw_y, +- upload.width, upload.height, +- 0, 0); +- cairo_surface_destroy (src); +- + _cairo_xlib_surface_ensure_picture (xsrc); + if (! picture_set_properties (xsrc->display, + xsrc->picture, +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch b/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch new file mode 100644 index 000000000..ccc1ebf47 --- /dev/null +++ b/extra/cairo/revert-xlib-map-to-image-requires-an-extents.patch @@ -0,0 +1,24 @@ +From dd20c1f4d6419238bbb37fb93a48986f83c6e6c2 Mon Sep 17 00:00:00 2001 +From: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed, 09 Jan 2013 12:38:09 +0000 +Subject: xlib: map-to-image requires an extents + +Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> +--- +diff --git a/src/cairo-xlib-source.c b/src/cairo-xlib-source.c +index d08052a..0689d82 100644 +--- a/src/cairo-xlib-source.c ++++ b/src/cairo-xlib-source.c +@@ -968,8 +968,9 @@ surface_source (cairo_xlib_surface_t *dst, + 0, 0); + } else { + cairo_image_surface_t *image; ++ cairo_rectangle_int_t map_extents = { 0,0, upload.width,upload.height }; + +- image = _cairo_surface_map_to_image (&xsrc->base, NULL); ++ image = _cairo_surface_map_to_image (&xsrc->base, &map_extents); + + _cairo_pattern_init_for_surface (&local_pattern, pattern->surface); + cairo_matrix_init_translate (&local_pattern.base.matrix, +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 0c9b69a58..99d3e374f 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175030 2013-01-12 08:15:19Z andyrtr $ +# $Id: PKGBUILD 175909 2013-01-23 21:19:46Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> @@ -17,8 +17,8 @@ pkgname=('calligra-filters' 'calligra-handbook' 'calligra-braindump' 'calligra-flow') -pkgver=2.5.4 -pkgrel=2 +pkgver=2.5.5 +pkgrel=1 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') @@ -28,7 +28,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('54f4677a9b00eec5951fa2386ba271a1') +md5sums=('0fcf72319d0a5a806aed50e3a2f3ceb4') build() { mkdir build diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD index 99c3dc596..d2cacfd57 100644 --- a/extra/dvdauthor/PKGBUILD +++ b/extra/dvdauthor/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 169742 2012-10-27 23:41:37Z eric $ +# $Id: PKGBUILD 175858 2013-01-23 00:12:49Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Travis Willard <travisw@wmpub.ca> +# Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> # Contributor: Nicolai Lissner <nlissne@linux01.gwdg.de> pkgname=dvdauthor pkgver=0.7.1 -pkgrel=2 +pkgrel=3 pkgdesc="DVD authoring tools" arch=('i686' 'x86_64') url="http://dvdauthor.sourceforge.net/" diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index f22828aea..6f7daae8b 100644 --- a/extra/emacs/PKGBUILD +++ b/extra/emacs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 171502 2012-11-18 08:01:29Z eric $ +# $Id: PKGBUILD 175859 2013-01-23 00:12:50Z eric $ # Maintainer: Juergen Hoetzel <juergen@archlinux.org> # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu> pkgname=emacs pkgver=24.2 -pkgrel=3 +pkgrel=4 pkgdesc="The extensible, customizable, self-documenting real-time display editor" arch=('i686' 'x86_64') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index cd8657f0d..17ddcae4a 100644 --- a/extra/gptfdisk/PKGBUILD +++ b/extra/gptfdisk/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171514 2012-11-18 10:27:45Z andyrtr $ +# $Id: PKGBUILD 175868 2013-01-23 00:13:01Z eric $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Hokum <hokum_at_mail_dot_ru> pkgname=gptfdisk pkgver=0.8.5 -pkgrel=2 +pkgrel=3 pkgdesc="A text-mode partitioning tool that works on Globally Unique Identifier (GUID) Partition Table (GPT) disks" arch=('i686' 'x86_64') url="http://www.rodsbooks.com/gdisk/" diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index 7d778ab28..69ec71c15 100644 --- a/extra/harfbuzz/PKGBUILD +++ b/extra/harfbuzz/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173764 2012-12-22 16:44:27Z andyrtr $ +# $Id: PKGBUILD 175869 2013-01-23 00:13:03Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=harfbuzz pkgver=0.9.9 -pkgrel=2 +pkgrel=3 pkgdesc="OpenType text shaping engine." arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index 10cb4a791..8122fc58c 100644 --- a/extra/icu/PKGBUILD +++ b/extra/icu/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 173319 2012-12-18 21:27:40Z andyrtr $ +# $Id: PKGBUILD 175870 2013-01-23 00:13:04Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Art Gramlich <art@gramlich-net.com> pkgname=icu -pkgver=50.1.1 +pkgver=50.1.2 pkgrel=1 pkgdesc="International Components for Unicode library" arch=(i686 x86_64) @@ -14,7 +14,7 @@ depends=('gcc-libs>=4.7.1-5' 'sh') source=(#http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver/./_}-src.tgz http://download.icu-project.org/files/${pkgname}4c/${pkgver}/${pkgname}4c-${pkgver//./_}-src.tgz icu.8198.revert.icu5431.patch) -md5sums=('c721c2e0c8f86975ccea620d09aedc81' +md5sums=('beb98aa972219c9fcd9c8a71314943c9' 'ebd5470fc969c75e52baf4af94a9ee82') build() { diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index ff3b04f1d..b14551014 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 172929 2012-12-07 05:50:58Z eric $ +# $Id: PKGBUILD 175860 2013-01-23 00:12:51Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.0.7 +pkgver=6.8.1.9 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('aafa7934a663547f4f9ae38c20e7a60db92da6ae' +sha1sums=('3d5178ae2b2d819d5f7923031f0f3602a12adf96' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 2f38a9b85..93b8e2916 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 175033 2013-01-12 08:15:28Z andyrtr $ +# $Id: PKGBUILD 175856 2013-01-23 00:12:47Z eric $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: tobias <tobias@archlinux.org> pkgname=inkscape pkgver=0.48.4 -pkgrel=2 +pkgrel=3 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index c7d4da8b8..06c51e68c 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175034 2013-01-12 08:15:36Z andyrtr $ +# $Id: PKGBUILD 175871 2013-01-23 00:13:07Z eric $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -26,7 +26,7 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=3.6.4.3 pkgver=3.6.4 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -37,9 +37,9 @@ makedepends=( # makedepends 'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1.1" + 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=50.1.2" 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite>=1.2.0' 'lcms2' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'translate-toolkit' 'xdg-utils' 'ttf-dejavu') # to satisfy regression tests # http://download.documentfoundation.org/mirrors/all.html @@ -275,8 +275,8 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" - 'nspr' 'libsm' 'redland' 'hyphen' 'graphite>=1.2.0' "icu>=50.1.1" 'clucene' 'lcms2' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') + 'nspr' 'libsm' 'redland' 'hyphen' 'graphite>=1.2.0' "icu>=50.1.2" 'clucene' 'lcms2' + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' diff --git a/extra/libreoffice/PKGBUILD.40 b/extra/libreoffice/PKGBUILD.40 index c21efe929..c91b2a251 100644 --- a/extra/libreoffice/PKGBUILD.40 +++ b/extra/libreoffice/PKGBUILD.40 @@ -19,9 +19,9 @@ pkgname=('libreoffice-common' 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.0.0.beta2 +_LOver=4.0.0.1 pkgver=4.0.0 -pkgrel=0.beta2.1 +pkgrel=0.rc1.1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -109,9 +109,9 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 libcdr-0.0.9.tar.bz2 libmspub-0.0.3.tar.bz2 libvisio-0.0.24.tar.bz2) -md5sums=('f0abec2ab5b8a31ba47b00f9cfea0305' - '847b75db75e5b0a501216bb5420083d2' - 'b6caba12606c6616ff283fea4575d118' +md5sums=('4713fda4b085ef1203457b7e8597c3ea' + 'f7b4afe09fe2df154aeb9e503d39488a' + '28ad48c32050d35d4fbb87e6df05a22d' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 1be812e93..e7c0a4029 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171458 2012-11-17 21:07:48Z andyrtr $ +# $Id: PKGBUILD 175899 2013-01-23 16:58:37Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -12,16 +12,16 @@ _git=false if [ "${_git}" = "true" ]; then pkgver=8.99.git_$_gitdate else - pkgver=9.0.1 + pkgver=9.0.2 fi pkgrel=1 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' - 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5') + 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm-amdgpu-snapshot' 'systemd' 'libvdpau>=0.5') url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(LICENSE) +source=(LICENSE llvm32.patch) if [ "${_git}" = "true" ]; then # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') @@ -32,10 +32,13 @@ if [ "${_git}" = "true" ]; then ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '97d6554c05ea7449398afe3a0ede7018') + '5fe9ad0c5beed19bc98d8c34aaad4ade' + 'dc45d1192203e418163e0017640e1cfc') build() { cd ${srcdir}/?esa-* + + patch -Np1 -i ${srcdir}/llvm32.patch COMMONOPTS="--prefix=/usr \ --sysconfdir=/etc \ @@ -74,6 +77,9 @@ if [ "${_git}" = "true" ]; then $COMMONOPTS fi + # fix a build break with new llvm + sed -i "s:-Werror=implicit-function-declaration::" src/gallium/drivers/r600/Makefile + make } diff --git a/extra/mesa/llvm32.patch b/extra/mesa/llvm32.patch new file mode 100644 index 000000000..946c07849 --- /dev/null +++ b/extra/mesa/llvm32.patch @@ -0,0 +1,284 @@ +From 8d9778589f4b3a174e884338adb0fe1bdeca5eb7 Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Thu, 10 May 2012 14:21:54 +0000 +Subject: radeon: Support LLVM 3.2 + +LLVM 3.2 and newer requires that the R600/SI backend be part of the +LLVM tree. +--- +diff --git a/configure.ac b/configure.ac +index 896f98a..32f412b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1661,6 +1661,7 @@ if test "x$enable_gallium_llvm" = xyes; then + if $LLVM_CONFIG --components | grep -q '\<mcjit\>'; then + LLVM_COMPONENTS="${LLVM_COMPONENTS} mcjit" + fi ++ LLVM_COMPONENTS="${LLVM_COMPONENTS} all-targets" + if test "x$enable_opencl" = xyes; then + LLVM_COMPONENTS="${LLVM_COMPONENTS} ipo linker instrumentation" + fi +@@ -1782,6 +1783,23 @@ gallium_require_drm_loader() { + fi + } + ++radeon_llvm_check() { ++ LLVM_VERSION_MAJOR=`echo $LLVM_VERSION | cut -d. -f1` ++ if test "$LLVM_VERSION_MAJOR" -lt "3" -o "x$LLVM_VERSION" = "x3.0"; then ++ AC_MSG_ERROR([LLVM 3.1 or newer is required for the r600/radeonsi llvm compiler.]) ++ fi ++ if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then ++ AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from: ++ git://people.freedesktop.org/~tstellar/llvm master ++ and build with --enable-experimental-targets==AMDGPU]) ++ fi ++ if test "$LLVM_VERSION" = "3.2"; then ++ dnl LLVM 3.2 does not add experimental libraries to llvm-config's ++ dnl library list. ++ LLVM_LIBS="$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`" ++ fi ++} ++ + dnl Gallium drivers + dnl Duplicates in GALLIUM_DRIVERS_DIRS are removed by sorting it after this block + if test "x$with_gallium_drivers" != x; then +@@ -1812,9 +1830,7 @@ if test "x$with_gallium_drivers" != x; then + gallium_require_drm_loader + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS r600" + if test "x$enable_r600_llvm" = xyes -o "x$enable_opencl" = xyes; then +- if test "x$LLVM_VERSION" != "x3.1"; then +- AC_MSG_ERROR([LLVM 3.1 is required for the r600 llvm compiler.]) +- fi ++ radeon_llvm_check + NEED_RADEON_GALLIUM=yes; + fi + if test "x$enable_r600_llvm" = xyes; then +@@ -1829,9 +1845,7 @@ if test "x$with_gallium_drivers" != x; then + PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED]) + gallium_require_drm_loader + GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS radeonsi" +- if test "x$LLVM_VERSION" != "x3.1"; then +- AC_MSG_ERROR([LLVM 3.1 is required to build the radeonsi driver.]) +- fi ++ radeon_llvm_check + NEED_RADEON_GALLIUM=yes; + gallium_check_st "radeon/drm" "dri-radeonsi" "xorg-radeonsi" "" "" "vdpau-radeonsi" "" + ;; +diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile +index 7f1c613..bcc2646 100644 +--- a/src/gallium/drivers/radeon/Makefile ++++ b/src/gallium/drivers/radeon/Makefile +@@ -12,6 +12,12 @@ TBLGEN = $(LLVM_BINDIR)/llvm-tblgen + + CXXFLAGS+= $(LLVM_CXXFLAGS) + ++ifeq ($(LLVM_VERSION),3.1) ++ CPP_SOURCES += $(LLVM_CPP_SOURCES) ++else ++ CXXFLAGS+= -DEXTERNAL_LLVM ++endif ++ + include ../../Makefile.template + + CXXFLAGS := $(filter-out -DDEBUG, $(CXXFLAGS)) +diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources +index c5d1207..5e79342 100644 +--- a/src/gallium/drivers/radeon/Makefile.sources ++++ b/src/gallium/drivers/radeon/Makefile.sources +@@ -23,8 +23,7 @@ TD_FILES := \ + SIRegisterInfo.td \ + SISchedule.td + +- +-GENERATED_SOURCES := \ ++LLVM_GENERATED_SOURCES := \ + R600Intrinsics.td \ + R600RegisterInfo.td \ + SIRegisterInfo.td \ +@@ -41,7 +40,7 @@ GENERATED_SOURCES := \ + AMDGPUGenMCCodeEmitter.inc \ + AMDGPUGenDFAPacketizer.inc + +-CPP_SOURCES := \ ++LLVM_CPP_SOURCES := \ + AMDIL7XXDevice.cpp \ + AMDILCFGStructurizer.cpp \ + AMDILDevice.cpp \ +@@ -81,6 +80,8 @@ CPP_SOURCES := \ + MCTargetDesc/SIMCCodeEmitter.cpp \ + MCTargetDesc/R600MCCodeEmitter.cpp \ + TargetInfo/AMDGPUTargetInfo.cpp \ ++ ++CPP_SOURCES := \ + radeon_llvm_emit.cpp + + C_SOURCES := \ +diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp +index 1b67bfe..625b0b4 100644 +--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp ++++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp +@@ -90,6 +90,7 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, + /* XXX: Can we just initialize the AMDGPU target here? */ + InitializeAllTargets(); + InitializeAllTargetMCs(); ++ InitializeAllAsmPrinters(); + #else + LLVMInitializeAMDGPUTargetInfo(); + LLVMInitializeAMDGPUTarget(); +-- +cgit v0.9.0.2-2-gbebe +From 67fcb3c2b4ecbd87e465b6c6b316be44811ea116 Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Mon, 01 Oct 2012 21:00:00 +0000 +Subject: configure.ac: Use amdgpu component for LLVM 3.2 + +The amdgpu component actually does exist. I must have been using an +older version of llvm-config by accident when I first made this change. +--- +diff --git a/configure.ac b/configure.ac +index 32f412b..0de506d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1793,10 +1793,8 @@ radeon_llvm_check() { + git://people.freedesktop.org/~tstellar/llvm master + and build with --enable-experimental-targets==AMDGPU]) + fi +- if test "$LLVM_VERSION" = "3.2"; then +- dnl LLVM 3.2 does not add experimental libraries to llvm-config's +- dnl library list. +- LLVM_LIBS="$LLVM_LIBS -lLLVMAMDGPUCodeGen -lLLVMAMDGPUDesc -lLLVMAMDGPUAsmPrinter -lLLVMAMDGPUInfo `$LLVM_CONFIG --libs mc`" ++ if test "x$LLVM_VERSION" = "x3.2"; then ++ LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`" + fi + } + +-- +cgit v0.9.0.2-2-gbebe +From 4cc530f452436a5304a628d1428ed7f07247a175 Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Wed, 10 Oct 2012 21:00:13 +0000 +Subject: radeon/llvm: Fix build with LLVM 3.2 + +--- +diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp +index 2f2eb4c..21661a0 100644 +--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp ++++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp +@@ -36,13 +36,16 @@ + #include <llvm/Support/TargetRegistry.h> + #include <llvm/Support/TargetSelect.h> + #include <llvm/Support/Threading.h> +-#include <llvm/Target/TargetData.h> + #include <llvm/Target/TargetMachine.h> +- + #include <llvm/Transforms/Scalar.h> +- + #include <llvm-c/Target.h> + ++#if HAVE_LLVM < 0x0302 ++#include <llvm/Target/TargetData.h> ++#else ++#include <llvm/DataLayout.h> ++#endif ++ + #include <iostream> + #include <stdlib.h> + #include <stdio.h> +@@ -120,7 +123,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, + )); + TargetMachine &AMDGPUTargetMachine = *tm.get(); + PassManager PM; ++#if HAVE_LLVM < 0x0302 + PM.add(new TargetData(*AMDGPUTargetMachine.getTargetData())); ++#else ++ PM.add(new DataLayout(*AMDGPUTargetMachine.getDataLayout())); ++#endif + PM.add(createPromoteMemoryToRegisterPass()); + AMDGPUTargetMachine.setAsmVerbosityDefault(true); + +-- +cgit v0.9.0.2-2-gbebe +From b21455f27db6e55e708f8e264f4a15412ee8fa52 Mon Sep 17 00:00:00 2001 +From: Dmitry Cherkasov <dcherkassov@gmail.com> +Date: Wed, 17 Oct 2012 18:03:13 +0000 +Subject: configure.ac: Fix LLVM 3.2 r600/radeonsi error message + +Reviewed-by: Tom Stellard <thomas.stellard@amd.com> +Signed-off-by: Dmitry Cherkasov <Dmitrii.Cherkasov@amd.com> +--- +diff --git a/configure.ac b/configure.ac +index aefa142..ca24856 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1757,7 +1757,7 @@ radeon_llvm_check() { + if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then + AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from: + git://people.freedesktop.org/~tstellar/llvm master +- and build with --enable-experimental-targets==AMDGPU]) ++ and build with --enable-experimental-targets=AMDGPU]) + fi + if test "x$LLVM_VERSION" = "x3.2"; then + LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`" +-- +cgit v0.9.0.2-2-gbebe +From d2b0338e3354fadc90a3751520f4aa44ba01954f Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Wed, 17 Oct 2012 19:21:48 +0000 +Subject: r600g: Remove special handling of PRED_SET* insructions for LLVM 3.2 + +The 3.2 version of the backend now sets all the correct fields for +PRED_SET* instructions. +--- +diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c +index 053a988..58b7fb2 100644 +--- a/src/gallium/drivers/r600/r600_shader.c ++++ b/src/gallium/drivers/r600/r600_shader.c +@@ -330,6 +330,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx, + alu.src[src_idx].sel += 512; + } + ++#if HAVE_LLVM < 0x0302 + if (alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETNE) || + alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE) || + alu.inst == CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_PRED_SETE_INT) || +@@ -340,6 +341,7 @@ static unsigned r600_alu_from_byte_stream(struct r600_shader_ctx *ctx, + alu.src[1].chan = 0; + alu.last = 1; + } ++#endif + + if (alu.execute_mask) { + alu.pred_sel = 0; +-- +cgit v0.9.0.2-2-gbebe +From f2f17fc348c847bbf5c54bb75b76e1661e8ced60 Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Mon, 01 Oct 2012 21:01:06 +0000 +Subject: radeon/llvm: Only initialize the AMDGPU target + +--- +diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp +index 625b0b4..2f2eb4c 100644 +--- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp ++++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp +@@ -86,17 +86,11 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes, + + Triple AMDGPUTriple(sys::getDefaultTargetTriple()); + +-#ifdef EXTERNAL_LLVM +- /* XXX: Can we just initialize the AMDGPU target here? */ +- InitializeAllTargets(); +- InitializeAllTargetMCs(); +- InitializeAllAsmPrinters(); +-#else + LLVMInitializeAMDGPUTargetInfo(); + LLVMInitializeAMDGPUTarget(); + LLVMInitializeAMDGPUTargetMC(); + LLVMInitializeAMDGPUAsmPrinter(); +-#endif ++ + std::string err; + const Target * AMDGPUTarget = TargetRegistry::lookupTarget("r600", err); + if(!AMDGPUTarget) { +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD index 938cb289d..0287ce662 100644 --- a/extra/obex-data-server/PKGBUILD +++ b/extra/obex-data-server/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169754 2012-10-27 23:42:12Z eric $ +# $Id: PKGBUILD 175864 2013-01-23 00:12:55Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> @@ -6,7 +6,7 @@ pkgname=obex-data-server pkgver=0.4.6 -pkgrel=3 +pkgrel=4 pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality" arch=('i686' 'x86_64') url="http://wiki.muiline.com/obex-data-server" diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index 079af06d2..802054263 100644 --- a/extra/php/PKGBUILD +++ b/extra/php/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 175519 2013-01-17 21:13:35Z pierre $ +# $Id: PKGBUILD 175873 2013-01-23 00:13:10Z eric $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgbase=php @@ -22,7 +22,7 @@ pkgname=('php' 'php-tidy' 'php-xsl') pkgver=5.4.11 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('PHP') url='http://www.php.net' diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index 5bb1cbfa8..ebd00c0fe 100644 --- a/extra/psiconv/PKGBUILD +++ b/extra/psiconv/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169757 2012-10-27 23:42:19Z eric $ +# $Id: PKGBUILD 175861 2013-01-23 00:12:52Z eric $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=psiconv pkgver=0.9.8 -pkgrel=10 +pkgrel=11 pkgdesc="Converts Psion 5(MX) files to more commonly used file formats" arch=('i686' 'x86_64') url="http://software.frodo.looijaard.name/psiconv/" diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index e82b9666d..41d5560cc 100644 --- a/extra/pstoedit/PKGBUILD +++ b/extra/pstoedit/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169758 2012-10-27 23:42:22Z eric $ +# $Id: PKGBUILD 175857 2013-01-23 00:12:48Z eric $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Tobias Powalowski <t.powa@gmx.de> pkgname=pstoedit pkgver=3.60 -pkgrel=3 +pkgrel=4 pkgdesc="Translates PostScript and PDF graphics into other vector formats" arch=('i686' 'x86_64') url="http://www.pstoedit.net/" diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 81bc33e83..ab0a1edc7 100644 --- a/extra/qt/PKGBUILD +++ b/extra/qt/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172171 2012-11-30 15:30:26Z andrea $ +# $Id: PKGBUILD 175874 2013-01-23 00:13:11Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgbase=qt pkgname=('qt' 'qt-private-headers') pkgver=4.8.4 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -94,14 +94,16 @@ package_qt() { # install missing icons and desktop files for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do size=$(echo $(basename ${icon}) | cut -d- -f2) - install -p -D -m644 ${icon} \ + install -D -m644 ${icon} \ "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png" done - install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \ + install -D -m644 src/gui/dialogs/images/qtlogo-64.png \ "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png" - install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \ + install -D -m644 tools/assistant/tools/assistant/images/assistant.png \ "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png" - install -p -D -m644 tools/designer/src/designer/images/designer.png \ + install -D -m644 tools/assistant/tools/assistant/images/assistant-128.png \ + "${pkgdir}/usr/share/icons/hicolor/128x128/apps/assistant.png" + install -D -m644 tools/designer/src/designer/images/designer.png \ "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png" install -d "${pkgdir}/usr/share/applications" install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \ diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index 477ab5531..c87ffb225 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171519 2012-11-18 10:28:05Z andyrtr $ +# $Id: PKGBUILD 175875 2013-01-23 00:13:12Z eric $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> @@ -6,11 +6,11 @@ pkgname=raptor pkgver=2.0.8 -pkgrel=2 +pkgrel=3 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') url="http://librdf.org/raptor" -depends=('curl' 'libxslt' 'icu') +depends=('curl' 'libxslt' 'icu>=50.1.2') license=('LGPL') options=('!libtool') source=("http://librdf.org/dist/source/raptor2-$pkgver.tar.gz") diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index b33312b05..44d98296c 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 171520 2012-11-18 10:28:08Z andyrtr $ +# $Id: PKGBUILD 175872 2013-01-23 00:13:08Z eric $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> @@ -7,7 +7,7 @@ pkgbase=tracker pkgname=(tracker libtracker-sparql) pkgver=0.14.4 _tver=${pkgver%.*} -pkgrel=2 +pkgrel=3 pkgdesc="All-in-one indexer, search tool and metadata database" arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 0ac14ee1f..5bd5ad81e 100644 --- a/extra/transcode/PKGBUILD +++ b/extra/transcode/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 169759 2012-10-27 23:42:25Z eric $ +# $Id: PKGBUILD 175862 2013-01-23 00:12:53Z eric $ # Maintainer: # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: roberto <roberto@archlinux.org> @@ -6,7 +6,7 @@ pkgname=transcode _sripver=0.3-4 pkgver=1.1.7 -pkgrel=6 +pkgrel=7 pkgdesc="A video/DVD ripper and encoder for the terminal/console" arch=('i686' 'x86_64') url="http://tcforge.berlios.de/" diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index e8243d0b6..8a2d586a6 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 173076 2012-12-10 11:26:50Z andyrtr $ +# $Id: PKGBUILD 175876 2013-01-23 00:13:13Z eric $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=webkitgtk pkgname=('webkitgtk2' 'webkitgtk3') pkgver=1.10.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://webkitgtk.org/" license=('custom') diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 20aec1e29..756c34f90 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 175150 2013-01-15 11:34:28Z jgc $ +# $Id: PKGBUILD 175863 2013-01-23 00:12:54Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.2 -pkgrel=4 +pkgrel=5 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64') url="http://www.xine-project.org" diff --git a/extra/xorg-xsetroot/PKGBUILD b/extra/xorg-xsetroot/PKGBUILD index 3af6da325..ab156de7d 100644 --- a/extra/xorg-xsetroot/PKGBUILD +++ b/extra/xorg-xsetroot/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 151001 2012-02-24 13:02:20Z allan $ +# $Id: PKGBUILD 175904 2013-01-23 19:17:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xsetroot -pkgver=1.1.0 -pkgrel=3 +pkgver=1.1.1 +pkgrel=1 pkgdesc="Classic X utility to set your root window background to a given pattern or color" arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" @@ -12,7 +12,7 @@ depends=('libxmu' 'libx11' 'libxcursor') makedepends=('xorg-util-macros' 'xbitmaps') groups=('xorg-apps' 'xorg') source=(http://xorg.freedesktop.org/archive/individual/app/xsetroot-${pkgver}.tar.bz2) -sha1sums=('1ef9ddd80c7013dc6d33e5c421537eb8b0427da4') +sha256sums=('ba215daaa78c415fce11b9e58c365d03bb602eaa5ea916578d76861a468cc3d9') build() { cd "${srcdir}/xsetroot-${pkgver}" diff --git a/pcr/pandoc/PKGBUILD b/pcr/pandoc/PKGBUILD index 009d47398..47c9788c9 100644 --- a/pcr/pandoc/PKGBUILD +++ b/pcr/pandoc/PKGBUILD @@ -4,15 +4,17 @@ # Run `makepkg -sp SRCBUILD` if you want to update the source tarball pkgname=pandoc -pkgver=1.9.4.5 -pkgrel=5 +pkgver=1.10.0.4 +pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') arch=('i686' 'x86_64') makedepends=('ghc' 'sh' 'cabal-install') -options=(strip !makeflags !distcc) -source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD) +options=(strip !makeflags !distcc !emptydirs) +source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} + SRCBUILD + citeproc-hs-pre-0.3.7.patch) conflicts=('haskell-pandoc') optdepends=('texlive-most: for pdf creation') @@ -21,7 +23,17 @@ build() { mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}} cd ${srcdir}/${pkgname}-${pkgver} +# Patches from the next citeproc-hs release +# These are needed because 0.3.6 with embed_data_files is broken +# darcs diff --from-tag=0.3.6 + pushd ${srcdir}/${pkgname}-${pkgver}/citeproc-hs-0.3.6 + patch -Np1 -i ${srcdir}/citeproc-hs-pre-0.3.7.patch + popd + while read _hkpkg; do +# Skip already built + [ -d ${srcdir}/build/usr/lib/$_hkpkg ] && continue + pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null msg2 "Building $_hkpkg" @@ -59,16 +71,23 @@ package() { runghc Setup.hs copy --destdir=${pkgdir}/ +# For some reason the library is installed anyway +# Remove all files and !emptydirs takes care of the rest msg2 "Removing lib files..." - rm -rfv ${pkgdir}/build + find ${pkgdir} -iname lib -print0 | xargs -0 rm -rvf # EC is unfree and makes Parabola TeXLive cry # besides, it's unneeded - sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex + sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/data/templates/default.latex find ${pkgdir}/usr/share -type f -exec chmod 644 {} \; find ${pkgdir}/usr/share -type d -exec chmod 755 {} \; + + msg2 "Installing licenses" + install -d ${pkgdir}/usr/share + cp -rv ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/ } -md5sums=('af01e55daded42fa54e8a2bb142c0a78' - '96d0ba0d9060574e56e3f23c996d0e8e' - '54b521d5c3ed5e2b53c4ca3206f6c941') +md5sums=('94c36d52ee6d7e33b16d75048f6617d3' + '2958854a387ea0845720e9456f814845' + 'd159a34656b7a1e13df5e6149b2f898b' + 'd389fc323eeaced767cea53edcfc0127') diff --git a/pcr/pandoc/SRCBUILD b/pcr/pandoc/SRCBUILD index 1eb01acc1..c1cfbfa5c 100644 --- a/pcr/pandoc/SRCBUILD +++ b/pcr/pandoc/SRCBUILD @@ -2,12 +2,11 @@ # Based on haskell-pandoc pkgname=pandoc -pkgver=1.9.4.5 -# 0.3.6 fails with embed_data_files -_citeproc=0.3.5 +pkgver=1.10.0.4 # 0.4 doesn't work with ghc 7.6 +# Use blaze_html_0_5 flag in the future _blaze_html=0.5.1.3 -pkgrel=5 +pkgrel=1 pkgdesc='Conversion between markup formats (no Haskell libs)' url='http://johnmacfarlane.net/pandoc/' license=('GPL') @@ -25,12 +24,12 @@ build() { cabal --verbose=3 update HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} + cabal --verbose=3 fetch file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} msg2 "Getting the dependency build order" # Ignore the cabal messages HOME=${srcdir}/${pkgname}-${pkgver} \ - cabal install --dry-run file-embed blaze-html-${_blaze_html} citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER + cabal install --dry-run file-embed blaze-html-${_blaze_html} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER } package() { diff --git a/pcr/pandoc/citeproc-hs-pre-0.3.7.patch b/pcr/pandoc/citeproc-hs-pre-0.3.7.patch new file mode 100644 index 000000000..754a9ac2e --- /dev/null +++ b/pcr/pandoc/citeproc-hs-pre-0.3.7.patch @@ -0,0 +1,292 @@ +Fri Nov 9 09:31:27 ART 2012 Andrea Rossato <andrea.rossato@unitn.it> + * fix issue #28 + add support for generating links to the DOI database. +Thu Nov 8 21:05:02 ART 2012 Andrea Rossato <andrea.rossato@unitn.it> + * fix issue #35 +Thu Nov 8 18:24:16 ART 2012 Andrea Rossato <andrea.rossato@unitn.it> + * a simple script for creating tests +Thu Nov 8 18:21:56 ART 2012 Andrea Rossato <andrea.rossato@unitn.it> + * fix a bug in convertQuoted which was producing stack overflows with long strings +Thu Nov 8 17:27:38 ART 2012 Andrea Rossato <andrea.rossato@unitn.it> + * fix editJsonInput in order to read the native JSON bibliographic data format +Thu Nov 8 14:03:26 ART 2012 Andrea Rossato <andrea.rossato@unitn.it> + * fix issue #37 +Fri Oct 26 18:45:09 ART 2012 Andrea Rossato <andrea.rossato@unitn.it> + * bump version number +Fri Oct 26 13:53:20 ART 2012 Andrea Rossato <andrea.rossato@unitn.it> + tagged 0.3.6 +diff -rN -u old-citeproc-hs/README new-citeproc-hs/README +--- old-citeproc-hs/README 2013-01-22 22:19:52.097159333 -0300 ++++ new-citeproc-hs/README 2013-01-22 22:19:52.107159567 -0300 +@@ -169,6 +169,21 @@ + + Summer, 2001 (the season) + ++### The DOI variable ++ ++If the DOI variable is prefixed by a `doi:` like: ++ ++ doi = {doi:10.1038/171737a0} ++ ++the processor will generate a link and produce this pandoc native ++representation: ++ ++ Link [Str "10.1038/171737a0"] ("http://dx.doi.org/10.1038/171737a0", "10.1038/171737a0") ++ ++that produces a link like: ++ ++ <a href="http://dx.doi.org/10.1038/171737a0">10.1038/171737a0</a> ++ + ### Running the test-suite + + To run the test suite, you first need to grab it with [mercurial] by +diff -rN -u old-citeproc-hs/citeproc-hs.cabal new-citeproc-hs/citeproc-hs.cabal +--- old-citeproc-hs/citeproc-hs.cabal 2013-01-22 22:19:52.103826157 -0300 ++++ new-citeproc-hs/citeproc-hs.cabal 2013-01-22 22:19:52.107159567 -0300 +@@ -1,5 +1,5 @@ + name: citeproc-hs +-version: 0.3.6 ++version: 0.3.7 + homepage: http://gorgias.mine.nu/repos/citeproc-hs/ + synopsis: A Citation Style Language implementation in Haskell + +diff -rN -u old-citeproc-hs/src/Text/CSL/Eval/Output.hs new-citeproc-hs/src/Text/CSL/Eval/Output.hs +--- old-citeproc-hs/src/Text/CSL/Eval/Output.hs 2013-01-22 22:19:52.097159333 -0300 ++++ new-citeproc-hs/src/Text/CSL/Eval/Output.hs 2013-01-22 22:19:52.123826603 -0300 +@@ -29,7 +29,11 @@ + appendOutput fm xs = if xs /= [] then [Output xs fm] else [] + + outputList :: Formatting -> Delimiter -> [Output] -> [Output] +-outputList fm d = appendOutput fm . addDelim d ++outputList fm d = appendOutput fm . addDelim d . map cleanOutput' ++ where ++ cleanOutput' o ++ | Output xs f <- o = Output (cleanOutput xs) f ++ | otherwise = rmEmptyOutput o + + cleanOutput :: [Output] -> [Output] + cleanOutput = flatten +@@ -37,12 +41,16 @@ + flatten [] = [] + flatten (o:os) + | ONull <- o = flatten os +- | Output [] _ <- o = flatten os +- | OStr [] _ <- o = flatten os +- | OUrl [] _ <- o = flatten os + | Output xs f <- o + , f == emptyFormatting = flatten xs ++ flatten os +- | otherwise = o : flatten os ++ | otherwise = rmEmptyOutput o : flatten os ++ ++rmEmptyOutput :: Output -> Output ++rmEmptyOutput o ++ | Output [] _ <- o = ONull ++ | OStr [] _ <- o = ONull ++ | OUrl t _ <- o = if null (fst t) then ONull else o ++ | otherwise = o + + addDelim :: String -> [Output] -> [Output] + addDelim d = foldr (\x xs -> if length xs < 1 then x : xs else check x xs) [] +diff -rN -u old-citeproc-hs/src/Text/CSL/Eval.hs new-citeproc-hs/src/Text/CSL/Eval.hs +--- old-citeproc-hs/src/Text/CSL/Eval.hs 2013-01-22 22:19:52.093825923 -0300 ++++ new-citeproc-hs/src/Text/CSL/Eval.hs 2013-01-22 22:19:52.120493193 -0300 +@@ -25,6 +25,7 @@ + import Control.Applicative ( (<$>) ) + import Control.Monad.State + import Data.Char ++import Data.List + import qualified Data.Map as M + import Data.Maybe + +@@ -153,7 +154,12 @@ + "title" -> formatTitle f fm + "locator" -> getLocVar >>= formatRange fm . snd + "url" -> getStringVar "url" >>= \k -> +- if null k then return [] else return [OUrl k fm] ++ if null k then return [] else return [OUrl (k,k) fm] ++ "doi" -> getStringVar "doi" >>= \d -> ++ if "doi:" `isPrefixOf` d ++ then let d' = drop 4 d in ++ return [OUrl ("http://dx.doi.org/" ++ d', d') fm] ++ else return [OStr d fm] + _ -> gets (env >>> options &&& abbrevs) >>= \(opts,as) -> + getVar [] (getFormattedValue opts as f fm s) s >>= \r -> + consumeVariable s >> return r +diff -rN -u old-citeproc-hs/src/Text/CSL/Input/Json.hs new-citeproc-hs/src/Text/CSL/Input/Json.hs +--- old-citeproc-hs/src/Text/CSL/Input/Json.hs 2013-01-22 22:19:52.100492747 -0300 ++++ new-citeproc-hs/src/Text/CSL/Input/Json.hs 2013-01-22 22:19:52.123826603 -0300 +@@ -106,6 +106,7 @@ + , JSObject js <- j = (camel s , JSArray (editDate $ fromJSObject js)) + | "family" <- s = ("familyName" , j) + | "suffix" <- s = ("nameSuffix" , j) ++ | "URL" <- s = ("url" , j) + | "edition" <- s = ("edition" , toString j) + | "volume" <- s = ("volume" , toString j) + | "issue" <- s = ("issue" , toString j) +@@ -122,7 +123,7 @@ + camel x + | '-':y:ys <- x = toUpper y : camel ys + | '_':y:ys <- x = toUpper y : camel ys +- | y:ys <- x = toLower y : camel ys ++ | y:ys <- x = y : camel ys + | otherwise = [] + + format (x:xs) = toUpper x : xs +diff -rN -u old-citeproc-hs/src/Text/CSL/Output/Pandoc.hs new-citeproc-hs/src/Text/CSL/Output/Pandoc.hs +--- old-citeproc-hs/src/Text/CSL/Output/Pandoc.hs 2013-01-22 22:19:52.100492747 -0300 ++++ new-citeproc-hs/src/Text/CSL/Output/Pandoc.hs 2013-01-22 22:19:52.123826603 -0300 +@@ -60,7 +60,7 @@ + | FS str fm <- fo = toPandoc fm $ toStr str + | FN str fm <- fo = toPandoc fm $ toStr $ rmZeros str + | FO fm xs <- fo = toPandoc fm $ rest xs +- | FUrl u fm <- fo = toPandoc fm [Link (toStr u) (u,u)] ++ | FUrl u fm <- fo = toPandoc fm [Link (toStr $ snd u) u] + | otherwise = [] + where + addSuffix f i +@@ -176,8 +176,10 @@ + | Quoted t inls <- i + , b = case headInline is of + [x] -> if isPunctuation x +- then Quoted t (reverseQuoted t inls ++ [Str [x]]) : clean' s b (tailInline is) +- else Quoted t (reverseQuoted t inls ) : clean' s b is ++ then if lastInline inls `elem` [".",",",";",":","!","?"] ++ then Quoted t (reverseQuoted t inls ) : clean' s b (tailInline is) ++ else Quoted t (reverseQuoted t inls ++ [Str [x]]) : clean' s b (tailInline is) ++ else Quoted t (reverseQuoted t inls) : clean' s b is + _ -> Quoted t (reverseQuoted t inls) : clean' s b is + | Quoted t inls <- i = Quoted t (reverseQuoted t inls) : clean' s b is + | otherwise = if lastInline [i] == headInline is && isPunct +@@ -232,7 +234,7 @@ + startWithPunct = and . map (`elem` ".,;:!?") . headInline + + convertQuoted :: Style -> [Inline] -> [Inline] +-convertQuoted s = proc convertQuoted' ++convertQuoted s = convertQuoted' + where + locale = let l = styleLocale s in case l of [x] -> x; _ -> Locale [] [] [] [] [] + getQuote x y = entityToChar . fst . fromMaybe (x,[]) . lookup (y,Long) . localeTermMap $ locale +diff -rN -u old-citeproc-hs/src/Text/CSL/Parser.hs new-citeproc-hs/src/Text/CSL/Parser.hs +--- old-citeproc-hs/src/Text/CSL/Parser.hs 2013-01-22 22:19:52.103826157 -0300 ++++ new-citeproc-hs/src/Text/CSL/Parser.hs 2013-01-22 22:19:52.120493193 -0300 +@@ -23,7 +23,6 @@ + #ifdef EMBED_DATA_FILES + import Data.FileEmbed + import qualified Data.ByteString as S +-import Data.ByteString.UTF8 ( toString ) + #else + import Paths_citeproc_hs ( getDataFileName ) + import System.Directory ( doesFileExist ) +@@ -69,7 +68,7 @@ + return s { styleLocale = mergeLocales (styleDefaultLocale s) l (styleLocale s)} + + #ifdef EMBED_DATA_FILES +-localeFiles :: [(FilePath, L.ByteString)] ++localeFiles :: [(FilePath, S.ByteString)] + localeFiles = $(embedDir "locales/") + #endif + +@@ -86,7 +85,7 @@ + | otherwise -> case lookup ("locales-" ++ take 5 x ++ ".xml") localeFiles of + Just x' -> return x' + _ -> error "could not load the locale file" +- return $ readXmlString xpLocale f ++ return $ readXmlString xpLocale $ L.fromChunks [f] + #else + f <- case s of + x | length x == 2 -> getDataFileName ("locales/locales-" ++ +diff -rN -u old-citeproc-hs/src/Text/CSL/Style.hs new-citeproc-hs/src/Text/CSL/Style.hs +--- old-citeproc-hs/src/Text/CSL/Style.hs 2013-01-22 22:19:52.093825923 -0300 ++++ new-citeproc-hs/src/Text/CSL/Style.hs 2013-01-22 22:19:52.120493193 -0300 +@@ -20,7 +20,7 @@ + , everywhere', everything, mkT, mkQ) + import qualified Data.Map as M + import Text.JSON +-import Text.Pandoc.Definition ( Inline ) ++import Text.Pandoc.Definition ( Inline, Target ) + + -- | The representation of a parsed CSL style. + data Style +@@ -309,8 +309,8 @@ + = FO Formatting [FormattedOutput] -- ^ List of 'FormatOutput' items + | FN String Formatting -- ^ Formatted number + | FS String Formatting -- ^ Formatted string +- | FUrl String Formatting -- ^ Formatted uniform resource locator (URL) + | FDel String -- ^ Delimeter string ++ | FUrl Target Formatting -- ^ Formatted URL + | FPan [Inline] -- ^ Pandoc inline elements + | FNull -- ^ Null formatting item + deriving ( Eq, Show ) +@@ -331,7 +331,7 @@ + | OContrib String String [Output] [Output] [[Output]] -- ^ The citation key, the role (author, editor, etc.), the contributor(s), + -- the output needed for year suf. disambiguation, and everything used for + -- name disambiguation. +- | OUrl String Formatting -- ^ A uniform resource locator (URL) ++ | OUrl Target Formatting -- ^ An URL + | OLoc [Output] Formatting -- ^ The citation's locator + | Output [Output] Formatting -- ^ Some nested 'Output' + deriving ( Eq, Ord, Show, Typeable, Data ) +diff -rN -u old-citeproc-hs/src/Text/CSL/Test.hs new-citeproc-hs/src/Text/CSL/Test.hs +--- old-citeproc-hs/src/Text/CSL/Test.hs 2013-01-22 22:19:52.103826157 -0300 ++++ new-citeproc-hs/src/Text/CSL/Test.hs 2013-01-22 22:19:52.120493193 -0300 +@@ -45,7 +45,8 @@ + import Text.CSL.Style + import Text.Pandoc.Definition + #ifdef EMBED_DATA_FILES +-import Data.ByteString.UTF8 ( toString ) ++import qualified Data.ByteString.Lazy as L ++import qualified Data.ByteString.UTF8 as U + import Text.CSL.Parser ( localeFiles ) + #else + import System.IO.Unsafe +@@ -217,7 +218,7 @@ + | otherwise -> take 5 x + #ifdef EMBED_DATA_FILES + ls <- case lookup ("locales-" ++ locale ++ ".xml") localeFiles of +- Just x' -> return $ readXmlString xpLocale (toString x') ++ Just x' -> return $ readXmlString xpLocale $ L.fromChunks [x'] + _ -> return $ Locale [] [] [] [] [] + #else + ls' <- getCachedLocale locale +diff -rN -u old-citeproc-hs/test/createTest.hs new-citeproc-hs/test/createTest.hs +--- old-citeproc-hs/test/createTest.hs 1969-12-31 21:00:00.000000000 -0300 ++++ new-citeproc-hs/test/createTest.hs 2013-01-22 22:19:52.123826603 -0300 +@@ -0,0 +1,37 @@ ++import System.Environment ++import Text.CSL ++import Text.CSL.Test ++import Text.JSON.Generic ++ ++main :: IO () ++main = do ++ args <- getArgs ++ case args of ++ [c,r] -> readStruff c r [] >>= putStrLn ++ _ -> error "usage: kljlkjljlkjlkjl" ++ ++readStruff :: String -> String -> String -> IO String ++readStruff c r s = do ++ c' <- readFile c ++ r' <- readBiblioFile r ++ return $ mode "citation" ++ result [] ++ citationItems r' ++ csl c' ++ input r' ++ ++mode :: String -> String ++mode s = ">>===== MODE =====>>\n" ++ s ++ "\n<<===== MODE =====<<\n\n" ++ ++result :: String -> String ++result s = ">>===== RESULT =====>>\n" ++ s ++ "\n<<===== RESULT =====<<\n\n" ++ ++citationItems :: [Reference] -> String ++citationItems l = ">>===== CITATION-ITEMS =====>>\n[\n [\n" ++ toId ++ ++ "\n ]\n]\n<<===== CITATION-ITEMS =====<<\n\n" ++ where ++ toId = foldr addComma [] toStringList ++ addComma x xs = if length xs < 1 then x ++ xs else x ++ ",\n" ++ xs ++ toStringList = flip map l $ \x -> " {\n \"id\": \"" ++ refId x ++ "\"\n }" ++ ++csl :: String -> String ++csl s = ">>===== CSL =====>>\n" ++ s ++ "<<===== CSL =====<<\n\n" ++ ++input :: [Reference] -> String ++input s = ">>===== INPUT =====>>\n" ++ encodeJSON s ++ "\n<<===== INPUT =====<<\n\n" +\ No newline at end of file |