diff options
Diffstat (limited to 'extra')
30 files changed, 555 insertions, 92 deletions
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD index a032792f9..c1f17feea 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' 'mips64el') 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 f087d047d..b810534a3 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' 'mips64el') 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 2b3868c2d..d47d62396 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' 'mips64el') @@ -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 fdee27f9d..f805e9727 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 'mips64el') license=('LGPL' 'MPL') @@ -16,11 +16,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 5abf9bdf7..dc21f98a3 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' 'mips64el') 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 2fd805cdb..61e54a8c4 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' 'mips64el') url="http://dvdauthor.sourceforge.net/" diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD index ff24aadfb..36c7e995f 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' 'mips64el') url="http://www.gnu.org/software/emacs/emacs.html" diff --git a/extra/gptfdisk/PKGBUILD b/extra/gptfdisk/PKGBUILD index fff033be4..f60942924 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' 'mips64el') url="http://www.rodsbooks.com/gdisk/" diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD index c1ec92531..9edf2f2db 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' 'mips64el') url="http://www.freedesktop.org/wiki/Software/HarfBuzz" diff --git a/extra/icu/PKGBUILD b/extra/icu/PKGBUILD index 51adcbf4f..0f82798e6 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 'mips64el') @@ -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 3e829f516..e4cb9459f 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' 'mips64el') 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 aef40371f..9535463c4 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 20eb465f3..391b80fe0 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> @@ -13,17 +13,17 @@ _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' 'mips64el') 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' 'systemd') -[[ "$CARCH" != "mips64el" ]] && makedepends+=('llvm' 'libvdpau>=0.5') +[[ "$CARCH" != "mips64el" ]] && makedepends+=('llvm-amdgpu-snapshot' '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') @@ -34,12 +34,11 @@ if [ "${_git}" = "true" ]; then ) fi source+=(mesa-loongson.patch) -md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - '97d6554c05ea7449398afe3a0ede7018' - '598c24dccfcdcc99c07d883f7c09f36a') build() { cd ${srcdir}/?esa-* + + patch -Np1 -i ${srcdir}/llvm32.patch if [ "$CARCH" = "mips64el" ]; then extraconf="--with-gallium-drivers=swrast --with-dri-drivers=swrast --disable-gallium-llvm --disable-vdpau" @@ -88,6 +87,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 1d60dca1b..5e90c9eff 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' 'mips64el') url="http://wiki.muiline.com/obex-data-server" diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD index ff800f317..64ac59d08 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' 'mips64el') license=('PHP') url='http://www.php.net' diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD index a7053b1d3..4d47b2ad5 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' 'mips64el') url="http://software.frodo.looijaard.name/psiconv/" diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD index 1ccea5f67..93b16da0e 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" 'mips64el') url="http://www.pstoedit.net/" diff --git a/extra/qt/PKGBUILD b/extra/qt/PKGBUILD index 821676247..7dd56f0c2 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' 'mips64el') url='http://qt-project.org/' license=('GPL3' 'LGPL') @@ -105,14 +105,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 a57a39c55..b5250c08a 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' 'mips64el') 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/scribus/PKGBUILD b/extra/scribus/PKGBUILD index d64942b22..195391d4f 100644 --- a/extra/scribus/PKGBUILD +++ b/extra/scribus/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 164496 2012-08-01 06:55:11Z remy $ +# $Id: PKGBUILD 175912 2013-01-24 08:14:06Z remy $ # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Contributor: Ben <ben@benmazer.net> # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scribus -pkgver=1.4.1 +pkgver=1.4.2 pkgrel=1 pkgdesc="A desktop publishing program" arch=('i686' 'x86_64' 'mips64el') @@ -14,23 +14,24 @@ license=('GPL') install=scribus.install depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \ 'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \ - 'desktop-file-utils' 'shared-mime-info') -makedepends=('cmake') + 'desktop-file-utils' 'shared-mime-info' \ + 'hyphen' 'aspell' 'boost-libs') +makedepends=('cmake' 'boost') options=(!libtool) source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('c79593dc61bc137d9e7968b37d070993') -sha1sums=('fb48bc492d79abc2275b1903692defe9b3931adf') +md5sums=('5c2a6bb7107e67a0083e32275bdb1a13') +sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb') build() { cd "${srcdir}" sed -i -e 's|#!/usr/bin/python|#!/usr/bin/python2|' \ -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \ - Scribus/scribus/plugins/scriptplugin/{samples,scripts}/* + scribus-${pkgver}/scribus/plugins/scriptplugin/{samples,scripts}/* mkdir build cd build - cmake ../Scribus \ + cmake ../scribus-${pkgver} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ @@ -45,8 +46,8 @@ package() { # fix icon path in .desktop file sed -i 's|Icon=scribus|Icon=/usr/share/scribus/icons/scribus.png|' \ - "${srcdir}/Scribus/scribus.desktop" + "${srcdir}/scribus-${pkgver}/scribus.desktop" - install -Dm644 "${srcdir}/Scribus/scribus.desktop" \ + install -Dm644 "${srcdir}/scribus-${pkgver}/scribus.desktop" \ "${pkgdir}/usr/share/applications/scribus.desktop" } diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 4060fa97c..7d71e1bd1 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' 'mips64el') license=('GPL') diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD index 56f7909b1..6ccf48d1d 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' 'mips64el') url="http://tcforge.berlios.de/" diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 137bcf98d..ea93ba2b0 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' 'mips64el') url="http://webkitgtk.org/" license=('custom') diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 2d744a5d7..379315f4e 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' 'mips64el') url="http://www.xine-project.org" diff --git a/extra/xorg-xsetroot/PKGBUILD b/extra/xorg-xsetroot/PKGBUILD index 543dfbf55..545c33bc4 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.1 +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' 'mips64el') 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}" |