From 1350233b6dc1924ba29a42462447995f26dae0dc Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Oct 2012 01:32:13 -0700 Subject: Wed Oct 3 01:31:01 PDT 2012 --- extra/cairo/PKGBUILD | 10 ++++-- ...o-1.12.2-ignore-charset-for-non-cid-fonts.patch | 37 ++++++++++++++++++++++ extra/dbus/PKGBUILD | 9 +++--- extra/dcraw/PKGBUILD | 13 ++++---- extra/fcitx/PKGBUILD | 6 ++-- extra/freenx/PKGBUILD | 9 ++++-- extra/mercurial/PKGBUILD | 6 ++-- extra/perl-yaml-syck/PKGBUILD | 8 ++--- extra/xf86-video-intel/PKGBUILD | 6 ++-- 9 files changed, 73 insertions(+), 31 deletions(-) create mode 100644 extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch (limited to 'extra') diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 52ff6100b..ee34626b9 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161326 2012-06-09 14:55:04Z foutrelis $ +# $Id: PKGBUILD 167546 2012-10-02 15:03:57Z foutrelis $ # Maintainer: Jan de Groot # Contributor: Brice Carpentier @@ -6,7 +6,7 @@ pkgname=cairo #_gitdate=20120426 #_gitver=957a9cc619965178a8927d114fe852034fc2385c pkgver=1.12.2 -pkgrel=2 +pkgrel=3 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') @@ -21,11 +21,13 @@ source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz cairo-1.10.0-buggy_gradients.patch cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch + cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch #git_fixes.patch ) md5sums=('87649eb75789739d517c743e94879e51' '9b323790dab003e228c6955633cb888e' - '75ec73746cfaefcbed0e9b2a9f76bf00') + '75ec73746cfaefcbed0e9b2a9f76bf00' + '56f64466fd70ead732b00691464144f2') build() { cd "$srcdir/$pkgname-$pkgver" @@ -33,6 +35,8 @@ build() { patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch # https://bugs.freedesktop.org/show_bug.cgi?id=50852 patch -Np1 -i ${srcdir}/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch + # https://bugs.freedesktop.org/show_bug.cgi?id=51443 + patch -Np1 -i ${srcdir}/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch # status is 2012-04-26 last commit: image: Fix typo in _blit_spans() #patch -Np1 -i ${srcdir}/git_fixes.patch autoreconf -vfi diff --git a/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch new file mode 100644 index 000000000..e43a10312 --- /dev/null +++ b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch @@ -0,0 +1,37 @@ +From 2f1d6b27e8b78c77346a5b603114b54400e57d83 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson +Date: Thu, 07 Jun 2012 09:48:52 +0000 +Subject: cff-subsetting: Ignore charset for non cid fonts + +Fixes crash in https://bugzilla.gnome.org/show_bug.cgi?id=677422 +--- +diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c +index db6fdf7..6f0cd66 100644 +--- a/src/cairo-cff-subset.c ++++ b/src/cairo-cff-subset.c +@@ -1178,14 +1178,16 @@ cairo_cff_font_read_top_dict (cairo_cff_font_t *font) + goto fail; + font->num_glyphs = _cairo_array_num_elements (&font->charstrings_index); + +- operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); +- if (font->is_cid && !operand) +- return CAIRO_INT_STATUS_UNSUPPORTED; ++ if (font->is_cid) { ++ operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); ++ if (!operand) ++ return CAIRO_INT_STATUS_UNSUPPORTED; + +- decode_integer (operand, &offset); +- font->charset = font->data + offset; +- if (font->charset >= font->data_end) +- return CAIRO_INT_STATUS_UNSUPPORTED; ++ decode_integer (operand, &offset); ++ font->charset = font->data + offset; ++ if (font->charset >= font->data_end) ++ return CAIRO_INT_STATUS_UNSUPPORTED; ++ } + + if (!font->is_opentype) + cairo_cff_font_read_font_metrics (font, font->top_dict); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index 0f9977539..54b0e62b3 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 163993 2012-07-23 14:58:54Z andyrtr $ +# $Id: PKGBUILD 167558 2012-10-02 18:43:55Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus -pkgver=1.6.4 +pkgver=1.6.8 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') depends=("dbus-core>=$pkgver" 'libx11') -source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc} +source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz #{,.asc} 30-dbus) -md5sums=('5ec43dc4554cba638917317b2b4f7640' - '3d4482ee39b49da334441c76f83bf1cb' +md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2' '9fafe8b28460aeaa6054309ef4c5ed92') build() { diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index 9c2571bd3..1a28c41ce 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 162767 2012-06-29 22:10:56Z eric $ +# $Id: PKGBUILD 167554 2012-10-02 18:35:41Z eric $ # Maintainer: tobias # Contributor: Tobias Kieslich pkgname=dcraw -pkgver=9.15 +pkgver=9.16 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64') url="http://www.cybercom.net/~dcoffin/dcraw/" license=('custom') depends=('lcms' 'jasper') -source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz - license.txt) -sha1sums=('0b06047603640fe19b5d3b2461319d6ba22eee6a' - '502c8f0ac7434d48f5dcb2eefe7599627cb69454') +source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz) +sha1sums=('fb73ca3ccd703bd522a759e0366814f0a3411902') build() { cd "${srcdir}/${pkgname}" @@ -44,5 +42,6 @@ package() { msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po done - install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt + install -d "${pkgdir}"/usr/share/licenses/${pkgname} + head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 42e234dc9..c726e14b3 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166605 2012-09-12 22:49:29Z eric $ +# $Id: PKGBUILD 167680 2012-10-02 22:57:36Z eric $ # Maintainer: Andrea Scarpino # Contributor: csslayer pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.2.6 +pkgver=4.2.6.1 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" @@ -12,7 +12,7 @@ license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' 'wget' \ 'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant') source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz) -sha1sums=('3abc1d5f8725b7e700b347d1ba19b4f40ba7be14') +sha1sums=('dc4577bb6bd6de41317f978196f377fc801cc63a') build() { cd "${srcdir}" diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD index b62092a0f..f686b0bb1 100644 --- a/extra/freenx/PKGBUILD +++ b/extra/freenx/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 157437 2012-04-28 09:58:42Z andyrtr $ +# $Id: PKGBUILD 167672 2012-10-02 21:03:34Z andyrtr $ # Maintainer: Tobias Powalowski #Contributed: eliott , Andre Naumann pkgname=freenx pkgver=0.7.3 -pkgrel=11 +pkgrel=13 pkgdesc="Free Software (GPL) Implementation of the NX Server" arch=(i686 x86_64) url="http://freenx.berlios.de" license=('GPL') -depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python' +depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') optdepends=('cups: adds printing support') makedepends=('imake') @@ -65,6 +65,9 @@ build() { sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog + # python2 fix + sed -i -e 's:\/usr\/bin\/env\ python:\/usr\/bin\/env\ python2:' nx-session-launcher/nx-session-launcher + # fix key generation sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 527f2d9d9..a5c916b24 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166022 2012-09-04 11:54:18Z giovanni $ +# $Id: PKGBUILD 167548 2012-10-02 17:15:26Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Douglas Soares de Andrade pkgname=mercurial -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('22a46a3ae64a5d625f068e588b4d6ec2' +md5sums=('6e90450ab3886bc650031e0d9aef367a' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 1b3f73adf..fe8dc26e9 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160567 2012-06-02 10:28:42Z bluewind $ +# $Id: PKGBUILD 167670 2012-10-02 21:01:45Z eric $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin pkgname=perl-yaml-syck _realname=YAML-Syck -pkgver=1.20 -pkgrel=2 +pkgver=1.21 +pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') license=('custom') @@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('8f6d04ee5817b8479e1234264a8d458d') +md5sums=('e9f8d4f9cea7def4d0b132dbf66516b2') build() { cd "${srcdir}/${_realname}-$pkgver" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 6a9b87fdc..98739e106 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166751 2012-09-17 16:20:14Z andyrtr $ +# $Id: PKGBUILD 167556 2012-10-02 18:42:38Z andyrtr $ # Maintainer: AndyRTR # Maintainer: Jan de Groot pkgname=xf86-video-intel -pkgver=2.20.8 +pkgver=2.20.9 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2a126b2bb93b8d9db5eef68f1496e83713fd51ac435a7fafc7a36ff9c7ca83e7') +sha256sums=('b9830c9fdaf2f64648cd45807883821f14dd91f9ff1cfa59af11035f62dc9389') build() { cd "${srcdir}/${pkgname}-${pkgver}" -- cgit v1.2.3-54-g00ecf