diff options
Diffstat (limited to 'extra')
63 files changed, 965 insertions, 249 deletions
diff --git a/extra/a52dec/PKGBUILD b/extra/a52dec/PKGBUILD index a5743a79e..2c9483fc3 100644 --- a/extra/a52dec/PKGBUILD +++ b/extra/a52dec/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 122062 2011-05-02 05:42:16Z andrea $ +# $Id: PKGBUILD 149328 2012-02-06 20:28:08Z stephane $ # Maintainer: # Contributor: Thomas Baechler <thomas@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> pkgname=a52dec pkgver=0.7.4 -pkgrel=5 +pkgrel=6 pkgdesc="A free library for decoding ATSC A/52 streams" url="http://liba52.sourceforge.net/" arch=('i686' 'x86_64') diff --git a/extra/arj/PKGBUILD b/extra/arj/PKGBUILD index 7c2b457ca..4f07f5617 100644 --- a/extra/arj/PKGBUILD +++ b/extra/arj/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 124090 2011-05-16 15:11:39Z andrea $ +# $Id: PKGBUILD 149330 2012-02-06 20:41:57Z stephane $ # Maintainer: # Contributor: Travis Willard <travisw@wmpub.ca> # Contributor: Gergely Tamas <dice@mfa.kfki.hu> pkgname=arj pkgver=3.10.22 -pkgrel=6 +pkgrel=7 pkgdesc="Free and portable clone of the ARJ archiver" url="http://arj.sourceforge.net/" arch=('i686' 'x86_64') license=('GPL') options=('!makeflags') depends=('glibc') -source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz" +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 001_arches_align.patch 002_no_remove_static_const.patch 003_64_bit_clean.patch diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index fe1ad2144..6761ba925 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145858 2012-01-03 09:33:26Z eric $ +# $Id: PKGBUILD 149270 2012-02-06 17:33:22Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.6 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') license=('GPL') url="http://fixounet.free.fr/avidemux/" diff --git a/extra/cdparanoia/PKGBUILD b/extra/cdparanoia/PKGBUILD index c51bd4ce0..05bf0989d 100644 --- a/extra/cdparanoia/PKGBUILD +++ b/extra/cdparanoia/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 122077 2011-05-02 05:53:24Z andrea $ +# $Id: PKGBUILD 149332 2012-02-06 20:43:48Z stephane $ # Maintainer: # Contributor: Alexander Fehr <pizzapunk gmail com> pkgname=cdparanoia pkgver=10.2 -pkgrel=3 +pkgrel=4 pkgdesc="Compact Disc Digital Audio extraction tool" arch=('i686' 'x86_64') url="http://www.xiph.org/paranoia/" diff --git a/extra/cups-pk-helper/PKGBUILD b/extra/cups-pk-helper/PKGBUILD index aaeec33b6..f56f035f1 100644 --- a/extra/cups-pk-helper/PKGBUILD +++ b/extra/cups-pk-helper/PKGBUILD @@ -1,17 +1,17 @@ -#$Id: PKGBUILD 119655 2011-04-13 10:39:02Z ibiru $ +#$Id: PKGBUILD 149302 2012-02-06 18:14:45Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=cups-pk-helper -pkgver=0.1.2 +pkgver=0.2.1 pkgrel=1 pkgdesc="A helper that makes system-config-printer use PolicyKit" arch=(i686 x86_64) url="http://www.freedesktop.org/software/cups-pk-helper/releases/" license=('GPL') -depends=(dbus-glib polkit libcups) +depends=(polkit libcups) makedepends=(intltool) install= -source=(http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ccc5f35c5232b83c16929431b352775dd4c63cb92759ec45a525edb6fcb805df') +source=(http://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.bz2) +sha256sums=('b620abc83d5e8595c533264c00c6f6d9f44ec020b62968797747687857679c9c ') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/cvsps/PKGBUILD b/extra/cvsps/PKGBUILD index 5caa4b2f1..72a624c20 100644 --- a/extra/cvsps/PKGBUILD +++ b/extra/cvsps/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 124095 2011-05-16 15:14:02Z andrea $ +# $Id: PKGBUILD 149335 2012-02-06 20:45:16Z stephane $ # Maintainer: # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=cvsps pkgver=2.1 -pkgrel=3 +pkgrel=4 pkgdesc="Generating 'patchset' information from a CVS repository" url="http://www.cobite.com/cvsps/" license=('GPL') diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 7aef0c8f6..3e3f66aa6 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 114401 2011-03-13 10:05:11Z allan $ +# $Id: PKGBUILD 149338 2012-02-06 20:53:31Z stephane $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=elfutils pkgver=0.152 -pkgrel=1 +pkgrel=2 pkgdesc="Collection of libraries and utilities for working with ELF object files and DWARF debugging information" arch=('i686' 'x86_64') url="https://fedorahosted.org/elfutils/" @@ -19,7 +19,7 @@ md5sums=('39739ed58a0fa1862eff8735f111fe5c') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --program-prefix="eu-" make make check @@ -27,6 +27,6 @@ build() package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 62b506d67..22629e605 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147716 2012-01-27 11:08:09Z ibiru $ +# $Id: PKGBUILD 149272 2012-02-06 17:33:26Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg pkgver=20120127 -pkgrel=1 +pkgrel=2 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') url="http://ffmpeg.org/" diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 9ec05bb6d..2b98f4cb6 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142666 2011-11-12 17:45:39Z ibiru $ +# $Id: PKGBUILD 149278 2012-02-06 17:33:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD index afb9ec494..d53b1518d 100644 --- a/extra/gtk2/PKGBUILD +++ b/extra/gtk2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 148770 2012-02-05 11:49:51Z ibiru $ +# $Id: PKGBUILD 149300 2012-02-06 18:07:32Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.9 -pkgrel=3 +pkgver=2.24.10 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -12,18 +12,14 @@ makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxc options=('!libtool' '!docs') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz - xid-collision-debug.patch cups-custom-print.patch) -sha256sums=('84204bf24cac739fd979943127e7b29cb46b1017684aa24dce630faa01bcb61d' - 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558' - '9535c9df19338cbea98ec4b2b5c8e4cef718455938f05c9cf8a08a3805d6b85d') + xid-collision-debug.patch) +sha256sums=('ea56e31bb9d6e19ed2e8911f4c7ac493cb804431caa21cdcadae625d375a0e89' + 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { cd "$srcdir/gtk+-$pkgver" patch -Np1 -i "$srcdir/xid-collision-debug.patch" - # https://bugzilla.gnome.org/show_bug.cgi?id=543520 - patch -Rp1 -i "$srcdir/cups-custom-print.patch" - CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/extra/gtk2/gtk2.install b/extra/gtk2/gtk2.install index 4e2b72f1b..a988c645b 100644 --- a/extra/gtk2/gtk2.install +++ b/extra/gtk2/gtk2.install @@ -1,5 +1,5 @@ post_install() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules + gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules } pre_upgrade() { @@ -11,6 +11,6 @@ post_upgrade() { } pre_remove() { - rm -f etc/gtk-2.0/gtk.immodules &>/dev/null - rm -f etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null + rm -f /etc/gtk-2.0/gtk.immodules &>/dev/null + rm -f /etc/gtk-2.0/gdk-pixbuf.loaders &>/dev/null } diff --git a/extra/libsexy/PKGBUILD b/extra/libsexy/PKGBUILD index 86536f8b3..42cd0945e 100644 --- a/extra/libsexy/PKGBUILD +++ b/extra/libsexy/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141654 2011-11-01 10:11:25Z pierre $ +# $Id: PKGBUILD 149220 2012-02-06 13:45:35Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libsexy pkgver=0.1.11 -pkgrel=3 +pkgrel=4 pkgdesc="Doing naughty things to good widgets." arch=('i686' 'x86_64') license=('GPL') diff --git a/extra/libvpx/PKGBUILD b/extra/libvpx/PKGBUILD index 5bab60077..66834c06c 100644 --- a/extra/libvpx/PKGBUILD +++ b/extra/libvpx/PKGBUILD @@ -1,8 +1,7 @@ -# $Id: PKGBUILD 135632 2011-08-16 21:19:30Z ibiru $ +# $Id: PKGBUILD 149274 2012-02-06 17:33:28Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=libvpx -pkgver=0.9.7.p1 -realver=0.9.7-p1 +pkgver=1.0.0 pkgrel=1 pkgdesc="The VP8 Codec SDK" arch=('i686' 'x86_64') @@ -10,11 +9,11 @@ url="http://www.webmproject.org/" license=('BSD') depends=('glibc') makedepends=('yasm') -source=(http://webm.googlecode.com/files/${pkgname}-v${realver}.tar.bz2) -sha1sums=('dacfefaf3363f781de43858f09cdd0b0d469e6fc') +source=(http://webm.googlecode.com/files/$pkgname-v$pkgver.tar.bz2) +sha1sums=('2919e11074fef72fc61ef1a75160050ffaad6074') build() { - cd "${srcdir}/${pkgname}-v${realver}" + cd "$srcdir/$pkgname-v$pkgver" ./configure --prefix=/usr --enable-vp8 \ --enable-runtime-cpu-detect \ --enable-shared \ @@ -26,7 +25,7 @@ build() { } package() { - cd "${srcdir}/${pkgname}-v${realver}" + cd "$srcdir/$pkgname-v$pkgver" make DIST_DIR="$pkgdir/usr" install - install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" + install -D -m 0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/libxfce4menu/PKGBUILD b/extra/libxfce4menu/PKGBUILD index b4dbbc21e..0d3b42eb2 100644 --- a/extra/libxfce4menu/PKGBUILD +++ b/extra/libxfce4menu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 80821 2010-05-22 13:24:17Z andyrtr $ +# $Id: PKGBUILD 149268 2012-02-06 17:05:53Z foutrelis $ # Maintainer: tobias <tobias funnychar archlinux.org> pkgname=libxfce4menu pkgver=4.6.2 -pkgrel=1 -pkgdesc="a freedesktop.org compliant menu implementation for Xfce" +pkgrel=2 +pkgdesc="A freedesktop.org compliant menu implementation for Xfce" arch=('i686' 'x86_64') license=('GPL2') url="http://www.xfce.org/" @@ -16,12 +16,15 @@ md5sums=('ff10cacb76803ee37159e3a43345f0d1') build() { cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \ - --localstatedir=/var --disable-static - make || return 1 + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install } diff --git a/extra/libxml2/CVE-2011-0216.patch b/extra/libxml2/CVE-2011-0216.patch new file mode 100644 index 000000000..dfc99d4de --- /dev/null +++ b/extra/libxml2/CVE-2011-0216.patch @@ -0,0 +1,31 @@ +commit 69f04562f75212bfcabecd190ea8b06ace28ece2 +Author: Daniel Veillard <veillard@redhat.com> +Date: Fri Aug 19 11:05:04 2011 +0800 + + Fix an off by one error in encoding + + this off by one error doesn't seems to reproduce on linux + but the error is real. + +diff --git a/encoding.c b/encoding.c +index d1140bf..fb0c38a 100644 +--- a/encoding.c ++++ b/encoding.c +@@ -1928,7 +1928,7 @@ xmlCharEncFirstLineInt(xmlCharEncodingHandler *handler, xmlBufferPtr out, + if (in == NULL) return(-1); + + /* calculate space available */ +- written = out->size - out->use; ++ written = out->size - out->use - 1; /* count '\0' */ + toconv = in->use; + /* + * echo '<?xml version="1.0" encoding="UCS4"?>' | wc -c => 38 +@@ -2059,7 +2059,7 @@ xmlCharEncInFunc(xmlCharEncodingHandler * handler, xmlBufferPtr out, + toconv = in->use; + if (toconv == 0) + return (0); +- written = out->size - out->use; ++ written = out->size - out->use -1; /* count '\0' */ + if (toconv * 2 >= written) { + xmlBufferGrow(out, out->size + toconv * 2); + written = out->size - out->use - 1; diff --git a/extra/libxml2/CVE-2011-1944.patch b/extra/libxml2/CVE-2011-1944.patch new file mode 100644 index 000000000..62dd5d229 --- /dev/null +++ b/extra/libxml2/CVE-2011-1944.patch @@ -0,0 +1,100 @@ +commit d7958b21e7f8c447a26bb2436f08402b2c308be4 +Author: Chris Evans <scarybeasts@gmail.com> +Date: Wed Mar 23 08:13:06 2011 +0800 + + Fix some potential problems on reallocation failures + + The count was incremented before the allocation + and not fixed in case of failure + * xpath.c: corrects a few instances where the available count of some + structure is updated before we know the allocation actually + succeeds + +diff --git a/xpath.c b/xpath.c +index 8b56189..608fe00 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -3522,13 +3522,13 @@ xmlXPathNodeSetAddNs(xmlNodeSetPtr cur, xmlNodePtr node, xmlNsPtr ns) { + } else if (cur->nodeNr == cur->nodeMax) { + xmlNodePtr *temp; + +- cur->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "growing nodeset\n"); + return; + } ++ cur->nodeMax *= 2; + cur->nodeTab = temp; + } + cur->nodeTab[cur->nodeNr++] = xmlXPathNodeSetDupNs(node, ns); +@@ -3627,14 +3627,14 @@ xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) { + } else if (cur->nodeNr == cur->nodeMax) { + xmlNodePtr *temp; + +- cur->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(cur->nodeTab, cur->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "growing nodeset\n"); + return; + } + cur->nodeTab = temp; ++ cur->nodeMax *= 2; + } + if (val->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) val; +@@ -3738,14 +3738,14 @@ xmlXPathNodeSetMerge(xmlNodeSetPtr val1, xmlNodeSetPtr val2) { + } else if (val1->nodeNr == val1->nodeMax) { + xmlNodePtr *temp; + +- val1->nodeMax *= 2; +- temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * ++ temp = (xmlNodePtr *) xmlRealloc(val1->nodeTab, val1->nodeMax * 2 * + sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + val1->nodeTab = temp; ++ val1->nodeMax *= 2; + } + if (n2->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) n2; +@@ -3907,14 +3907,14 @@ xmlXPathNodeSetMergeAndClear(xmlNodeSetPtr set1, xmlNodeSetPtr set2, + } else if (set1->nodeNr >= set1->nodeMax) { + xmlNodePtr *temp; + +- set1->nodeMax *= 2; + temp = (xmlNodePtr *) xmlRealloc( +- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); ++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + set1->nodeTab = temp; ++ set1->nodeMax *= 2; + } + if (n2->type == XML_NAMESPACE_DECL) { + xmlNsPtr ns = (xmlNsPtr) n2; +@@ -3991,14 +3991,14 @@ xmlXPathNodeSetMergeAndClearNoDupls(xmlNodeSetPtr set1, xmlNodeSetPtr set2, + } else if (set1->nodeNr >= set1->nodeMax) { + xmlNodePtr *temp; + +- set1->nodeMax *= 2; + temp = (xmlNodePtr *) xmlRealloc( +- set1->nodeTab, set1->nodeMax * sizeof(xmlNodePtr)); ++ set1->nodeTab, set1->nodeMax * 2 * sizeof(xmlNodePtr)); + if (temp == NULL) { + xmlXPathErrMemory(NULL, "merging nodeset\n"); + return(NULL); + } + set1->nodeTab = temp; ++ set1->nodeMax *= 2; + } + set1->nodeTab[set1->nodeNr++] = n2; + } diff --git a/extra/libxml2/CVE-2011-2834.patch b/extra/libxml2/CVE-2011-2834.patch new file mode 100644 index 000000000..cfc61e0c9 --- /dev/null +++ b/extra/libxml2/CVE-2011-2834.patch @@ -0,0 +1,61 @@ +commit 1d4526f6f4ec8d18c40e2a09b387652a6c1aa2cd +Author: Daniel Veillard <veillard@redhat.com> +Date: Tue Oct 11 16:34:34 2011 +0800 + + Fix missing error status in XPath evaluation + + Started by Chris Evans, I added a few more place where the + error should have been set in the evaluation context. + +diff --git a/xpath.c b/xpath.c +index bcee2ea..d9d902c 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -2485,6 +2485,7 @@ valuePush(xmlXPathParserContextPtr ctxt, xmlXPathObjectPtr value) + sizeof(ctxt->valueTab[0])); + if (tmp == NULL) { + xmlGenericError(xmlGenericErrorContext, "realloc failed !\n"); ++ ctxt->error = XPATH_MEMORY_ERROR; + return (0); + } + ctxt->valueMax *= 2; +@@ -9340,6 +9341,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { + if ( (ch & 0xc0) != 0xc0 ) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathTranslateFunction: Invalid UTF8 string\n"); ++ /* not asserting an XPath error is probably better */ + break; + } + /* then skip over remaining bytes for this char */ +@@ -9347,6 +9349,7 @@ xmlXPathTranslateFunction(xmlXPathParserContextPtr ctxt, int nargs) { + if ( (*cptr++ & 0xc0) != 0x80 ) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathTranslateFunction: Invalid UTF8 string\n"); ++ /* not asserting an XPath error is probably better */ + break; + } + if (ch & 0x80) /* must have had error encountered */ +@@ -13410,6 +13413,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: variable %s bound to undefined prefix %s\n", + (char *) op->value4, (char *)op->value5); ++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; + return (total); + } + val = xmlXPathVariableLookupNS(ctxt->context, +@@ -13464,6 +13468,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", + (char *)op->value4, (char *)op->value5); + xmlXPathPopFrame(ctxt, frame); ++ ctxt->error = XPATH_UNDEF_PREFIX_ERROR; + return (total); + } + func = xmlXPathFunctionLookupNS(ctxt->context, +@@ -14042,6 +14047,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + } + xmlGenericError(xmlGenericErrorContext, + "XPath: unknown precompiled operation %d\n", op->op); ++ ctxt->error = XPATH_INVALID_OPERAND; + return (total); + } + diff --git a/extra/libxml2/CVE-2011-3905.patch b/extra/libxml2/CVE-2011-3905.patch new file mode 100644 index 000000000..53373b7da --- /dev/null +++ b/extra/libxml2/CVE-2011-3905.patch @@ -0,0 +1,61 @@ +commit 77404b8b69bc122d12231807abf1a837d121b551 +Author: Chris Evans <scarybeasts@gmail.com> +Date: Wed Dec 14 16:18:25 2011 +0800 + + Make sure the parser returns when getting a Stop order + + patch backported from chromiun bug fixes, assuming author is Chris + +diff --git a/parser.c b/parser.c +index 21d7aa3..4e5dcb9 100644 +--- a/parser.c ++++ b/parser.c +@@ -4949,7 +4949,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + (ctxt->sax->processingInstruction != NULL)) + ctxt->sax->processingInstruction(ctxt->userData, + target, NULL); +- ctxt->instate = state; ++ if (ctxt->instate != XML_PARSER_EOF) ++ ctxt->instate = state; + return; + } + buf = (xmlChar *) xmlMallocAtomic(size * sizeof(xmlChar)); +@@ -5029,7 +5030,8 @@ xmlParsePI(xmlParserCtxtPtr ctxt) { + } else { + xmlFatalErr(ctxt, XML_ERR_PI_NOT_STARTED, NULL); + } +- ctxt->instate = state; ++ if (ctxt->instate != XML_PARSER_EOF) ++ ctxt->instate = state; + } + } + +@@ -9589,6 +9591,8 @@ xmlParseElement(xmlParserCtxtPtr ctxt) { + else + name = xmlParseStartTag(ctxt); + #endif /* LIBXML_SAX1_ENABLED */ ++ if (ctxt->instate == XML_PARSER_EOF) ++ return; + if (name == NULL) { + spacePop(ctxt); + return; +@@ -10975,6 +10979,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { + else + name = xmlParseStartTag(ctxt); + #endif /* LIBXML_SAX1_ENABLED */ ++ if (ctxt->instate == XML_PARSER_EOF) ++ goto done; + if (name == NULL) { + spacePop(ctxt); + ctxt->instate = XML_PARSER_EOF; +@@ -11161,7 +11167,9 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) { + else + xmlParseEndTag1(ctxt, 0); + #endif /* LIBXML_SAX1_ENABLED */ +- if (ctxt->nameNr == 0) { ++ if (ctxt->instate == XML_PARSER_EOF) { ++ /* Nothing */ ++ } else if (ctxt->nameNr == 0) { + ctxt->instate = XML_PARSER_EPILOG; + } else { + ctxt->instate = XML_PARSER_CONTENT; diff --git a/extra/libxml2/CVE-2011-3919.patch b/extra/libxml2/CVE-2011-3919.patch new file mode 100644 index 000000000..b307e57d2 --- /dev/null +++ b/extra/libxml2/CVE-2011-3919.patch @@ -0,0 +1,19 @@ +commit 5bd3c061823a8499b27422aee04ea20aae24f03e +Author: Daniel Veillard <veillard@redhat.com> +Date: Fri Dec 16 18:53:35 2011 +0800 + + Fix an allocation error when copying entities + +diff --git a/parser.c b/parser.c +index 4e5dcb9..c55e41d 100644 +--- a/parser.c ++++ b/parser.c +@@ -2709,7 +2709,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len, + + buffer[nbchars++] = '&'; + if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) { +- growBuffer(buffer, XML_PARSER_BUFFER_SIZE); ++ growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE); + } + for (;i > 0;i--) + buffer[nbchars++] = *cur++; diff --git a/extra/libxml2/PKGBUILD b/extra/libxml2/PKGBUILD index c5da2c5d2..d70c24cef 100644 --- a/extra/libxml2/PKGBUILD +++ b/extra/libxml2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101089 2010-11-27 15:26:13Z ibiru $ +# $Id: PKGBUILD 149232 2012-02-06 15:50:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=libxml2 pkgver=2.7.8 -pkgrel=1 +pkgrel=2 pkgdesc="XML parsing library, version 2" arch=(i686 x86_64) license=('custom') @@ -13,24 +13,57 @@ makedepends=('python2') options=('!libtool') url="http://www.xmlsoft.org/" source=(ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz - largefile64.patch shared_library_versionning.patch) + http://www.w3.org/XML/Test/xmlts20080205.tar.gz + largefile64.patch + shared_library_versionning.patch + libxml2-2.7.8-xpath-freeing.patch + libxml2-2.7.8-xpath-freeing2.patch + CVE-2011-1944.patch + libxml2-2.7.8-xpath-hardening.patch + CVE-2011-0216.patch + CVE-2011-2834.patch + CVE-2011-3905.patch + CVE-2011-3919.patch) md5sums=('8127a65e8c3b08856093099b52599c86' + 'b255be9a1c7f7021e52448e4ec8d7a0d' '5ad4915665608ebfa5b89f7908467a72' - '84aeb7c6db023eae044e95d9211dba53') + '84aeb7c6db023eae044e95d9211dba53' + 'f1df70c66dac94233932baf2737465e0' + 'c22af2643840da65dea618bf6cd33b25' + 'd2b2b362a8681c30be98c4a2e7f2d2ea' + '5709a1408becc1f0c6f1c7513a254dd2' + '4f0f2d3a11329ebee0907be6002a160e' + '88e9c95a813d4f0cb392acc000bae366' + '28f3022a0d63ee408774eb5e4914b07e' + 'a9b901d9ff095a266d3a5c601db142b1') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/largefile64.patch" patch -Np1 -i "${srcdir}/shared_library_versionning.patch" + patch -Np1 -i "${srcdir}/libxml2-2.7.8-xpath-freeing.patch" + patch -Np1 -i "${srcdir}/libxml2-2.7.8-xpath-freeing2.patch" + patch -Np1 -i "${srcdir}/CVE-2011-1944.patch" + patch -Np1 -i "${srcdir}/libxml2-2.7.8-xpath-hardening.patch" + patch -Np1 -i "${srcdir}/CVE-2011-0216.patch" + patch -Np1 -i "${srcdir}/CVE-2011-2834.patch" + patch -Np1 -i "${srcdir}/CVE-2011-3905.patch" + patch -Np1 -i "${srcdir}/CVE-2011-3919.patch" autoreconf -fi + sed -e 's|/usr/bin/python -u|/usr/bin/python2 -u|g' -e 's|/usr/bin/python$|/usr/bin/python2|g' -i python/tests/*.py ./configure --prefix=/usr --with-threads --with-history \ - --with-python=/usr/bin/python2.7 + --with-python=/usr/bin/python2 make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + mv "${srcdir}/xmlconf" . + make check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } - diff --git a/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch b/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch new file mode 100644 index 000000000..2844f4a74 --- /dev/null +++ b/extra/libxml2/libxml2-2.7.8-xpath-freeing.patch @@ -0,0 +1,30 @@ +commit df83c17e5a2646bd923f75e5e507bc80d73c9722 +Author: Daniel Veillard <veillard@redhat.com> +Date: Wed Nov 17 14:12:14 2010 +0100 + + Fix a potential freeing error in XPath + +diff --git a/xpath.c b/xpath.c +index 81e33f6..1447be5 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11763,11 +11763,15 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { + xmlXPathObjectPtr tmp; +- /* pop the result */ ++ /* pop the result if any */ + tmp = valuePop(ctxt); +- xmlXPathReleaseObject(xpctxt, tmp); +- /* then pop off contextObj, which will be freed later */ +- valuePop(ctxt); ++ if (tmp != contextObj) ++ /* ++ * Free up the result ++ * then pop off contextObj, which will be freed later ++ */ ++ xmlXPathReleaseObject(xpctxt, tmp); ++ valuePop(ctxt); + goto evaluation_error; + } + diff --git a/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch b/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch new file mode 100644 index 000000000..714954dba --- /dev/null +++ b/extra/libxml2/libxml2-2.7.8-xpath-freeing2.patch @@ -0,0 +1,26 @@ +commit fec31bcd452e77c10579467ca87a785b41115de6 +Author: Daniel Veillard <veillard@redhat.com> +Date: Thu Nov 18 11:07:24 2010 +0100 + + Small fix for previous commit + +diff --git a/xpath.c b/xpath.c +index 1447be5..8b56189 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -11765,13 +11765,14 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr tmp; + /* pop the result if any */ + tmp = valuePop(ctxt); +- if (tmp != contextObj) ++ if (tmp != contextObj) { + /* + * Free up the result + * then pop off contextObj, which will be freed later + */ + xmlXPathReleaseObject(xpctxt, tmp); + valuePop(ctxt); ++ } + goto evaluation_error; + } + diff --git a/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch b/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch new file mode 100644 index 000000000..7a4ad8659 --- /dev/null +++ b/extra/libxml2/libxml2-2.7.8-xpath-hardening.patch @@ -0,0 +1,223 @@ +commit 0f136dcd18c287073a4d67b03fdb9696d7010940 +Author: Daniel Veillard <veillard@redhat.com> +Date: Thu Aug 18 17:10:13 2011 +0800 + + Hardening of XPath evaluation + + Add a mechanism of frame for XPath evaluation when entering a function + or a scoped evaluation, also fix a potential problem in predicate + evaluation. + +diff --git a/include/libxml/xpath.h b/include/libxml/xpath.h +index 1a9e30e..ddd9dd8 100644 +--- a/include/libxml/xpath.h ++++ b/include/libxml/xpath.h +@@ -68,7 +68,8 @@ typedef enum { + XPATH_UNDEF_PREFIX_ERROR, + XPATH_ENCODING_ERROR, + XPATH_INVALID_CHAR_ERROR, +- XPATH_INVALID_CTXT ++ XPATH_INVALID_CTXT, ++ XPATH_STACK_ERROR + } xmlXPathError; + + /* +@@ -380,6 +381,8 @@ struct _xmlXPathParserContext { + xmlXPathCompExprPtr comp; /* the precompiled expression */ + int xptr; /* it this an XPointer expression */ + xmlNodePtr ancestor; /* used for walking preceding axis */ ++ ++ int valueFrame; /* used to limit Pop on the stack */ + }; + + /************************************************************************ +diff --git a/xpath.c b/xpath.c +index b59ac5a..bcee2ea 100644 +--- a/xpath.c ++++ b/xpath.c +@@ -252,6 +252,7 @@ static const char *xmlXPathErrorMessages[] = { + "Encoding error\n", + "Char out of XML range\n", + "Invalid or incomplete context\n", ++ "Stack usage errror\n", + "?? Unknown error ??\n" /* Must be last in the list! */ + }; + #define MAXERRNO ((int)(sizeof(xmlXPathErrorMessages) / \ +@@ -2398,6 +2399,42 @@ xmlXPathCacheConvertNumber(xmlXPathContextPtr ctxt, xmlXPathObjectPtr val) { + ************************************************************************/ + + /** ++ * xmlXPathSetFrame: ++ * @ctxt: an XPath parser context ++ * ++ * Set the callee evaluation frame ++ * ++ * Returns the previous frame value to be restored once done ++ */ ++static int ++xmlXPathSetFrame(xmlXPathParserContextPtr ctxt) { ++ int ret; ++ ++ if (ctxt == NULL) ++ return(0); ++ ret = ctxt->valueFrame; ++ ctxt->valueFrame = ctxt->valueNr; ++ return(ret); ++} ++ ++/** ++ * xmlXPathPopFrame: ++ * @ctxt: an XPath parser context ++ * @frame: the previous frame value ++ * ++ * Remove the callee evaluation frame ++ */ ++static void ++xmlXPathPopFrame(xmlXPathParserContextPtr ctxt, int frame) { ++ if (ctxt == NULL) ++ return; ++ if (ctxt->valueNr < ctxt->valueFrame) { ++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); ++ } ++ ctxt->valueFrame = frame; ++} ++ ++/** + * valuePop: + * @ctxt: an XPath evaluation context + * +@@ -2412,6 +2449,12 @@ valuePop(xmlXPathParserContextPtr ctxt) + + if ((ctxt == NULL) || (ctxt->valueNr <= 0)) + return (NULL); ++ ++ if (ctxt->valueNr <= ctxt->valueFrame) { ++ xmlXPatherror(ctxt, __FILE__, __LINE__, XPATH_STACK_ERROR); ++ return (NULL); ++ } ++ + ctxt->valueNr--; + if (ctxt->valueNr > 0) + ctxt->value = ctxt->valueTab[ctxt->valueNr - 1]; +@@ -6154,6 +6197,7 @@ xmlXPathCompParserContext(xmlXPathCompExprPtr comp, xmlXPathContextPtr ctxt) { + ret->valueNr = 0; + ret->valueMax = 10; + ret->value = NULL; ++ ret->valueFrame = 0; + + ret->context = ctxt; + ret->comp = comp; +@@ -11711,6 +11755,7 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathObjectPtr contextObj = NULL, exprRes = NULL; + xmlNodePtr oldContextNode, contextNode = NULL; + xmlXPathContextPtr xpctxt = ctxt->context; ++ int frame; + + #ifdef LIBXML_XPTR_ENABLED + /* +@@ -11730,6 +11775,8 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + */ + exprOp = &ctxt->comp->steps[op->ch2]; + for (i = 0; i < set->nodeNr; i++) { ++ xmlXPathObjectPtr tmp; ++ + if (set->nodeTab[i] == NULL) + continue; + +@@ -11757,23 +11804,25 @@ xmlXPathCompOpEvalPositionalPredicate(xmlXPathParserContextPtr ctxt, + xmlXPathNodeSetAddUnique(contextObj->nodesetval, + contextNode); + ++ frame = xmlXPathSetFrame(ctxt); + valuePush(ctxt, contextObj); + res = xmlXPathCompOpEvalToBoolean(ctxt, exprOp, 1); ++ tmp = valuePop(ctxt); ++ xmlXPathPopFrame(ctxt, frame); + + if ((ctxt->error != XPATH_EXPRESSION_OK) || (res == -1)) { +- xmlXPathObjectPtr tmp; +- /* pop the result if any */ +- tmp = valuePop(ctxt); +- if (tmp != contextObj) { ++ while (tmp != contextObj) { + /* + * Free up the result + * then pop off contextObj, which will be freed later + */ + xmlXPathReleaseObject(xpctxt, tmp); +- valuePop(ctxt); ++ tmp = valuePop(ctxt); + } + goto evaluation_error; + } ++ /* push the result back onto the stack */ ++ valuePush(ctxt, tmp); + + if (res) + pos++; +@@ -13377,7 +13426,9 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlXPathFunction func; + const xmlChar *oldFunc, *oldFuncURI; + int i; ++ int frame; + ++ frame = xmlXPathSetFrame(ctxt); + if (op->ch1 != -1) + total += + xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]); +@@ -13385,15 +13436,18 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } +- for (i = 0; i < op->value; i++) ++ for (i = 0; i < op->value; i++) { + if (ctxt->valueTab[(ctxt->valueNr - 1) - i] == NULL) { + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: parameter error\n"); + ctxt->error = XPATH_INVALID_OPERAND; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } ++ } + if (op->cache != NULL) + XML_CAST_FPTR(func) = op->cache; + else { +@@ -13409,6 +13463,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + xmlGenericError(xmlGenericErrorContext, + "xmlXPathCompOpEval: function %s bound to undefined prefix %s\n", + (char *)op->value4, (char *)op->value5); ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } + func = xmlXPathFunctionLookupNS(ctxt->context, +@@ -13430,6 +13485,7 @@ xmlXPathCompOpEval(xmlXPathParserContextPtr ctxt, xmlXPathStepOpPtr op) + func(ctxt, op->value); + ctxt->context->function = oldFunc; + ctxt->context->functionURI = oldFuncURI; ++ xmlXPathPopFrame(ctxt, frame); + return (total); + } + case XPATH_OP_ARG: +@@ -14333,6 +14389,7 @@ xmlXPathRunEval(xmlXPathParserContextPtr ctxt, int toBool) + ctxt->valueNr = 0; + ctxt->valueMax = 10; + ctxt->value = NULL; ++ ctxt->valueFrame = 0; + } + #ifdef XPATH_STREAMING + if (ctxt->comp->stream) { +diff --git a/xpointer.c b/xpointer.c +index 7a42d02..37afa3a 100644 +--- a/xpointer.c ++++ b/xpointer.c +@@ -1269,6 +1269,7 @@ xmlXPtrEvalXPointer(xmlXPathParserContextPtr ctxt) { + ctxt->valueNr = 0; + ctxt->valueMax = 10; + ctxt->value = NULL; ++ ctxt->valueFrame = 0; + } + SKIP_BLANKS; + if (CUR == '/') { diff --git a/extra/mediastreamer/PKGBUILD b/extra/mediastreamer/PKGBUILD index 1f81cc302..986b6b0fd 100644 --- a/extra/mediastreamer/PKGBUILD +++ b/extra/mediastreamer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145637 2011-12-25 11:01:07Z andrea $ +# $Id: PKGBUILD 149288 2012-02-06 17:33:52Z ibiru $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> @@ -6,7 +6,7 @@ pkgname=mediastreamer pkgver=2.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A library written in C that allows you to create and run audio and video streams" arch=('i686' 'x86_64') url="http://www.linphone.org/" diff --git a/extra/mutter/PKGBUILD b/extra/mutter/PKGBUILD index a8521c886..7d0440991 100644 --- a/extra/mutter/PKGBUILD +++ b/extra/mutter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 146802 2012-01-18 16:22:42Z ibiru $ +# $Id: PKGBUILD 149222 2012-02-06 13:47:09Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Michael Kanis <mkanis_at_gmx_dot_de> pkgname=mutter pkgver=3.2.2 -pkgrel=1 +pkgrel=2 pkgdesc="A window manager for GNOME" arch=(i686 x86_64) license=('GPL') diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index 3ae5df87d..369ba7820 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 142672 2011-11-12 17:47:17Z ibiru $ +# $Id: PKGBUILD 149282 2012-02-06 17:33:40Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.2 -pkgrel=3 +pkgrel=4 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64) url="http://www.ekiga.org" diff --git a/extra/orc/PKGBUILD b/extra/orc/PKGBUILD index bddf53c9f..dcdde8be1 100644 --- a/extra/orc/PKGBUILD +++ b/extra/orc/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 121322 2011-04-30 15:14:10Z ibiru $ +# $Id: PKGBUILD 149305 2012-02-06 18:30:33Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=orc -pkgver=0.4.14 +pkgver=0.4.16 pkgrel=1 pkgdesc="The Oild Runtime Compiler" arch=('i686' 'x86_64') @@ -9,16 +9,17 @@ license=('custom') url="http://code.entropywave.com/projects/orc/" depends=('glibc') options=('!libtool') -source=(http://code.entropywave.com/download/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('6b3ff209e9763ebe40e152538884bd71') +source=(http://code.entropywave.com/download/$pkgname/$pkgname-$pkgver.tar.gz) +md5sums=('e482932e544c847761449b106ecbc483') build () { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --disable-static make } + package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install - install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/extra/pixman/PKGBUILD b/extra/pixman/PKGBUILD index d956f7741..f3f4d22c2 100644 --- a/extra/pixman/PKGBUILD +++ b/extra/pixman/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 147073 2012-01-21 15:12:23Z andyrtr $ +# $Id: PKGBUILD 149216 2012-02-06 13:29:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=pixman pkgver=0.24.2 -pkgrel=1 -pkgdesc="Pixman library" +pkgrel=2 +pkgdesc="The pixel-manipulation library for X and cairo" arch=(i686 x86_64) url="http://xorg.freedesktop.org" license=('custom') depends=('glibc') options=('!libtool') -source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418') +source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2 +revert-reject-trapezoids-where-top-is-above-the-edges.patch) +sha1sums=('233eed3cd16ee1b2a842140477503d2c68b74418' + 'ee36251d47ccefd5e276cabdba9917fbb2be787a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/revert-reject-trapezoids-where-top-is-above-the-edges.patch" ./configure --prefix=/usr --disable-static make } diff --git a/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch b/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch new file mode 100644 index 000000000..e661db57c --- /dev/null +++ b/extra/pixman/revert-reject-trapezoids-where-top-is-above-the-edges.patch @@ -0,0 +1,47 @@ +From e5555d7a749c90288463ed1c294f58963c607e52 Mon Sep 17 00:00:00 2001 +From: Søren Sandmann Pedersen <ssp@redhat.com> +Date: Wed, 25 Jan 2012 19:03:05 +0000 +Subject: Revert "Reject trapezoids where top (botttom) is above (below) the edges" + +Cairo 1.10 will sometimes generate trapezoids like this, so we can't +consider them invalid. Fixes bug 45009, reported by Michael Biebl. + +This reverts commit 2437ae80e5066dec9fe52f56b016bf136d7cea06. +--- +diff --git a/pixman/pixman.h b/pixman/pixman.h +index 20ff496..18d9513 100644 +--- a/pixman/pixman.h ++++ b/pixman/pixman.h +@@ -908,14 +908,10 @@ struct pixman_triangle + }; + + /* whether 't' is a well defined not obviously empty trapezoid */ +-#define pixman_trapezoid_valid(t) \ +- ((t)->left.p1.y != (t)->left.p2.y && \ +- (t)->right.p1.y != (t)->right.p2.y && \ +- (int) ((t)->bottom - (t)->top) > 0 && \ +- (t)->bottom <= (t)->left.p2.y && \ +- (t)->bottom <= (t)->right.p2.y && \ +- (t)->top >= (t)->left.p1.y && \ +- (t)->top >= (t)->right.p1.y) ++#define pixman_trapezoid_valid(t) \ ++ ((t)->left.p1.y != (t)->left.p2.y && \ ++ (t)->right.p1.y != (t)->right.p2.y && \ ++ (int) ((t)->bottom - (t)->top) > 0) + + struct pixman_span_fix + { +diff --git a/test/composite-traps-test.c b/test/composite-traps-test.c +index de518d8..ff03b50 100644 +--- a/test/composite-traps-test.c ++++ b/test/composite-traps-test.c +@@ -251,6 +251,6 @@ test_composite (int testnum, + int + main (int argc, const char *argv[]) + { +- return fuzzer_test_main("composite traps", 40000, 0x4346479C, ++ return fuzzer_test_main("composite traps", 40000, 0xE3112106, + test_composite, argc, argv); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/schroedinger/PKGBUILD b/extra/schroedinger/PKGBUILD index 22fc3e9b2..7a8e01134 100644 --- a/extra/schroedinger/PKGBUILD +++ b/extra/schroedinger/PKGBUILD @@ -1,25 +1,29 @@ -# $Id: PKGBUILD 103964 2010-12-24 15:29:22Z ibiru $ +# $Id: PKGBUILD 149308 2012-02-06 18:45:09Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Timm Preetz <timm@preetz.us> # Contributor: rabyte <rabyte__gmail> pkgname=schroedinger -pkgver=1.0.10 +pkgver=1.0.11 pkgrel=1 pkgdesc="An implemenation of the Dirac video codec in ANSI C code" arch=('i686' 'x86_64') url="http://www.diracvideo.org/" -license=('GPL2' 'LGPL2' 'MPL' 'MIT') -depends=('orc>=0.4.11') +license=('GPL2' 'LGPL2.1' 'MPL' 'MIT') +depends=('orc' 'gcc-libs') options=(!libtool) -source=(http://www.diracvideo.org/download/schroedinger/${pkgname}-${pkgver}.tar.gz) -md5sums=('9de088ccc314bb9e766cb3aa6510a0ef') +source=(http://www.diracvideo.org/download/schroedinger/$pkgname-$pkgver.tar.gz) +md5sums=('da6af08e564ca1157348fb8d92efc891') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make - make DESTDIR=${pkgdir} install +} + +package() { + cd "$srcdir/$pkgname-$pkgver" - install -m644 -D COPYING.MIT ${pkgdir}/usr/share/licenses/${pkgname}/COPYING.MIT + make DESTDIR="$pkgdir" install + install -m644 -D COPYING.MIT "$pkgdir/usr/share/licenses/$pkgname/COPYING.MIT" } diff --git a/extra/thunar-archive-plugin/PKGBUILD b/extra/thunar-archive-plugin/PKGBUILD index 2f3a99803..40c811891 100644 --- a/extra/thunar-archive-plugin/PKGBUILD +++ b/extra/thunar-archive-plugin/PKGBUILD @@ -1,33 +1,36 @@ -# $Id: PKGBUILD 107340 2011-01-23 18:55:43Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 149175 2012-02-06 06:27:04Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=thunar-archive-plugin pkgver=0.3.0 -pkgrel=1 -pkgdesc="create and deflate archives in thunar" -arch=(i686 x86_64) -license=('GPL2') +pkgrel=2 +pkgdesc="Create and deflate archives in thunar" +arch=('i686' 'x86_64') url="http://goodies.xfce.org/projects/thunar-plugins/thunar-archive-plugin" +license=('GPL2') groups=('xfce4-goodies') -depends=('thunar>=1.2.0' 'hicolor-icon-theme') +depends=('thunar' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/thunar-plugins/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2) -md5sums=('afeb3f1c65a4529dbdadc6e7b349a712') +install=$pkgname.install +source=(http://archive.xfce.org/src/thunar-plugins/$pkgname/0.3/$pkgname-$pkgver.tar.bz2) +sha256sums=('74be7c6e242ba240b9477e9cf4ccc9190769c2717c5b5bf26788d1847adaf896') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/thunar-archive-plugin/thunar-archive-plugin.install b/extra/thunar-archive-plugin/thunar-archive-plugin.install index 2538109de..bf6c3fe76 100644 --- a/extra/thunar-archive-plugin/thunar-archive-plugin.install +++ b/extra/thunar-archive-plugin/thunar-archive-plugin.install @@ -9,9 +9,11 @@ EOF } post_upgrade() { - post_install $1 + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_upgrade } + +# vim:set ts=2 sw=2 et: diff --git a/extra/thunar-volman/PKGBUILD b/extra/thunar-volman/PKGBUILD index 8679d8273..bb5144802 100644 --- a/extra/thunar-volman/PKGBUILD +++ b/extra/thunar-volman/PKGBUILD @@ -1,34 +1,37 @@ -# $Id: PKGBUILD 112913 2011-03-07 18:34:43Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 149177 2012-02-06 06:29:06Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=thunar-volman pkgver=0.6.0 -pkgrel=2 -pkgdesc="automatic management for removeable devices in thunar" +pkgrel=3 +pkgdesc="Automatic management of removeable devices in Thunar" arch=('i686' 'x86_64') -license=('GPL2') url="http://foo-projects.org/~benny/projects/thunar-volman" +license=('GPL2') groups=('xfce4-goodies') -depends=('thunar>=1.2.0' 'libxfce4ui' 'hicolor-icon-theme') +depends=('thunar' 'libxfce4ui' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/${pkgname}/0.6/${pkgname}-${pkgver}.tar.bz2) -md5sums=('2f166662dd100d5195da238af417f305') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$pkgver.tar.bz2) +sha256sums=('b1afd2b3b285cfcf07c11caa3d37fa5ff1fc06f7dc68fcca07f9a0d70daa694f') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/xfce4 \ - --localstatedir=/var \ - --disable-static \ - --disable-debug + --sysconfdir=/etc \ + --libexecdir=/usr/lib/xfce4 \ + --localstatedir=/var \ + --disable-static \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/thunar-volman/thunar-volman.install b/extra/thunar-volman/thunar-volman.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/thunar-volman/thunar-volman.install +++ b/extra/thunar-volman/thunar-volman.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/vdpau-video/PKGBUILD b/extra/vdpau-video/PKGBUILD index b426e758e..e1003f451 100644 --- a/extra/vdpau-video/PKGBUILD +++ b/extra/vdpau-video/PKGBUILD @@ -1,23 +1,28 @@ -# $Id: PKGBUILD 117134 2011-03-28 20:41:09Z ibiru $ +# $Id: PKGBUILD 149310 2012-02-06 18:56:13Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=vdpau-video pkgver=0.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="VDPAU backend for VA API" arch=('i686' 'x86_64') -url="http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/" +url="http://cgit.freedesktop.org/vaapi/vdpau-driver/" license=('GPL') depends=('libva' 'libvdpau') makedepends=('mesa') options=('!libtool') -source=(http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/${pkgname}-${pkgver}.tar.gz) +source=(http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/$pkgname-$pkgver.tar.gz) md5sums=('18870e007ecdc50a528861fa55556364') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr make - make DESTDIR="${pkgdir}" install +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 21fdca9d7..e23ab3a67 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 148956 2012-02-05 11:57:41Z ibiru $ +# $Id: PKGBUILD 149284 2012-02-06 17:33:43Z ibiru $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=1.1.13 -pkgrel=5 +pkgrel=6 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" diff --git a/extra/vorbis-tools/PKGBUILD b/extra/vorbis-tools/PKGBUILD index 706d8a8fb..7b54e44d6 100644 --- a/extra/vorbis-tools/PKGBUILD +++ b/extra/vorbis-tools/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 77125 2010-04-10 21:21:48Z andrea $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Judd Vinet <jvinet@zeroflux.org> +# $Id: PKGBUILD 149348 2012-02-07 02:25:07Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=vorbis-tools pkgver=1.4.0 -pkgrel=2 +pkgrel=3 pkgdesc="Extra tools for Ogg-Vorbis" arch=('i686' 'x86_64') url='http://www.xiph.org/vorbis/' @@ -17,11 +16,11 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --without-speex \ - --enable-vcut || return 1 - make || return 1 + --enable-vcut + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install } diff --git a/extra/w3m/PKGBUILD b/extra/w3m/PKGBUILD index 6b6976e42..438d25c4f 100644 --- a/extra/w3m/PKGBUILD +++ b/extra/w3m/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149052 2012-02-05 15:37:14Z bisson $ +# $Id: PKGBUILD 149346 2012-02-07 01:25:49Z bisson $ # Contributor: dorphell <dorphell@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=w3m pkgver=0.5.3 -pkgrel=2 +pkgrel=3 pkgdesc='Text-based Web browser, as well as pager' url='http://w3m.sourceforge.net/' license=('custom') @@ -12,13 +12,16 @@ arch=('i686' 'x86_64') makedepends=('imlib2') optdepends=('imlib2: for graphics support') depends=('openssl' 'gc' 'ncurses') -source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz") -sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237') +source=("http://downloads.sourceforge.net/sourceforge/w3m/${pkgname}-${pkgver}.tar.gz" + 'https-segfault.patch') +sha1sums=('444b6c8cf7094ee95f8e9de96b37f814b9d83237' + '66affb2f695fe0bdde25cf774642bfd6a9404e88') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed 's/file_handle/file_handle_rofl/g' -i istream.* + patch -p1 -i ../https-segfault.patch ./configure \ --prefix=/usr \ diff --git a/extra/w3m/https-segfault.patch b/extra/w3m/https-segfault.patch new file mode 100644 index 000000000..31286a70d --- /dev/null +++ b/extra/w3m/https-segfault.patch @@ -0,0 +1,19 @@ +Fedora patch; see https://bugzilla.redhat.com/show_bug.cgi?id=707994 + +--- old/url.c 2011-01-04 14:52:24.000000000 +0530 ++++ new/url.c 2011-09-02 18:25:43.305652690 +0530 +@@ -82,11 +82,11 @@ + {"ftp", SCM_FTP}, + {"local", SCM_LOCAL}, + {"file", SCM_LOCAL}, +- /* {"exec", SCM_EXEC}, */ ++ {"exec", SCM_EXEC}, + {"nntp", SCM_NNTP}, +- /* {"nntp", SCM_NNTP_GROUP}, */ ++ {"nntp", SCM_NNTP_GROUP}, + {"news", SCM_NEWS}, +- /* {"news", SCM_NEWS_GROUP}, */ ++ {"news", SCM_NEWS_GROUP}, + {"data", SCM_DATA}, + #ifndef USE_W3MMAILER + {"mailto", SCM_MAILTO}, diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD index 3d2af63f9..d09b67951 100644 --- a/extra/windowmaker/PKGBUILD +++ b/extra/windowmaker/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 148960 2012-02-05 11:57:55Z ibiru $ +# $Id: PKGBUILD 149306 2012-02-06 18:35:19Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=windowmaker -pkgver=0.95.0 -pkgrel=2 +pkgver=0.95.1 +pkgrel=1 pkgdesc="An X11 window manager with a NEXTSTEP look and feel" arch=(i686 x86_64) url="http://www.windowmaker.org/" @@ -11,7 +11,7 @@ license=('GPL' 'custom') depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib') options=('!libtool') source=(ftp://ftp.archlinux.org/other/windowmaker/windowmaker-$pkgver.tar.gz wmaker.desktop) -md5sums=('2d89834b4019e0a08641709ea7235db2' +md5sums=('1b0d0aa2ac53a7a98ef80a35e507b082' '2fba97bebfd691836b92b8f0db79ff13') build() { diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index dc8f17316..4979b34ce 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142608 2011-11-12 17:14:58Z ibiru $ +# $Id: PKGBUILD 149276 2012-02-06 17:33:31Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20111030 +pkgver=20120204 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64') @@ -12,15 +12,19 @@ url="http://www.videolan.org/developers/x264.html" license=('GPL') depends=('glibc') makedepends=('yasm') -source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('fa52ad09dcb7d4e1a66adcaa2dab26bc') +source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2) +md5sums=('4d793ecc4f9d308724ea47edf400f312') build() { - cd "$srcdir/$pkgname-snapshot-$pkgver-2245" + cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable" ./configure --enable-shared make +} +package() { + cd "$srcdir/$pkgname-snapshot-$pkgver-2245-stable" + make DESTDIR="$pkgdir" \ bindir=/usr/bin \ libdir=/usr/lib \ diff --git a/extra/xfce4-appfinder/PKGBUILD b/extra/xfce4-appfinder/PKGBUILD index 9eac46486..cd5e0270f 100644 --- a/extra/xfce4-appfinder/PKGBUILD +++ b/extra/xfce4-appfinder/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 106402 2011-01-16 17:26:11Z andyrtr $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 149234 2012-02-06 16:14:59Z foutrelis $ +# Maintainer: +# Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-appfinder pkgver=4.8.0 -pkgrel=1 -pkgdesc="Xfce application finder" +pkgrel=2 +pkgdesc="An application finder for Xfce" arch=('i686' 'x86_64') license=('GPL2') -url="http://www.xfce.org/" +url='http://www.xfce.org/projects/xfce4-appfinder' groups=('xfce4') depends=('libxfce4ui' 'garcon' 'hicolor-icon-theme') -makedepends=('pkgconfig' 'intltool') -options=('!libtool') +makedepends=('intltool') install=${pkgname}.install -source=(http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2) +source=("http://archive.xfce.org/src/xfce/${pkgname}/4.8/${pkgname}-${pkgver}.tar.bz2") md5sums=('fb4797ef91b90d111b989e98c3e000e0') build() { diff --git a/extra/xfce4-battery-plugin/PKGBUILD b/extra/xfce4-battery-plugin/PKGBUILD index 62e2ae5bd..16fa2e0cb 100644 --- a/extra/xfce4-battery-plugin/PKGBUILD +++ b/extra/xfce4-battery-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104733 2011-01-04 20:09:27Z andyrtr $ +# $Id: PKGBUILD 149238 2012-02-06 16:19:07Z foutrelis $ # Maintainer: aurelien <aurelien@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-battery-plugin pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A battery monitor plugin for the Xfce panel" arch=(i686 x86_64) license=('GPL2') diff --git a/extra/xfce4-cpufreq-plugin/PKGBUILD b/extra/xfce4-cpufreq-plugin/PKGBUILD index bea6bf602..8b2989b16 100644 --- a/extra/xfce4-cpufreq-plugin/PKGBUILD +++ b/extra/xfce4-cpufreq-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 107296 2011-01-23 10:18:21Z andyrtr $ +# $Id: PKGBUILD 149240 2012-02-06 16:20:19Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfce4-cpufreq-plugin pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="CPU frequency plugin for the Xfce4 panel" arch=('i686' 'x86_64') license=('GPL2') diff --git a/extra/xfce4-cpugraph-plugin/PKGBUILD b/extra/xfce4-cpugraph-plugin/PKGBUILD index f775fcce7..e68b3dd7f 100644 --- a/extra/xfce4-cpugraph-plugin/PKGBUILD +++ b/extra/xfce4-cpugraph-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106953 2011-01-19 20:30:45Z andyrtr $ +# $Id: PKGBUILD 149242 2012-02-06 16:21:17Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-cpugraph-plugin pkgver=1.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="CPU graph plugin for the Xfce4 panel" arch=('i686' 'x86_64') license=('GPL' 'custom') diff --git a/extra/xfce4-dict/PKGBUILD b/extra/xfce4-dict/PKGBUILD index 344d7f37d..bcbd2d467 100644 --- a/extra/xfce4-dict/PKGBUILD +++ b/extra/xfce4-dict/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 108109 2011-01-29 13:43:49Z andyrtr $ +# $Id: PKGBUILD 149262 2012-02-06 16:57:54Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-dict pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="A dictionary plugin for the Xfce panel" arch=('i686' 'x86_64') license=('GPL2') @@ -12,16 +12,20 @@ url="http://goodies.xfce.org/projects/applications/xfce4-dict" groups=('xfce4-goodies') depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme' 'librsvg') makedepends=('intltool') +provides=('xfce4-dict-plugin') +conflicts=('xfce4-dict-plugin') +replaces=('xfce4-dict-plugin') options=('!libtool') install=${pkgname}.install source=(http://archive.xfce.org/src/apps/xfce4-dict/0.6/xfce4-dict-${pkgver}.tar.bz2) md5sums=('c371c5c0bbe45a2bfac336cfe01dfe01') -provides=('xfce4-dict-plugin') -conflicts=('xfce4-dict-plugin') -replaces=('xfce4-dict-plugin') build() { cd ${srcdir}/xfce4-dict-${pkgver} + + # Work around DSO linking issue + LDFLAGS+=' -Wl,--copy-dt-needed-entries' + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/xfce4-diskperf-plugin/PKGBUILD b/extra/xfce4-diskperf-plugin/PKGBUILD index 11af81a49..620708779 100644 --- a/extra/xfce4-diskperf-plugin/PKGBUILD +++ b/extra/xfce4-diskperf-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 107127 2011-01-21 14:53:20Z andyrtr $ +# $Id: PKGBUILD 149264 2012-02-06 17:00:23Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-diskperf-plugin pkgver=2.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Plugin for the Xfce4 panel displaying instant disk/partition performance" arch=('i686' 'x86_64') license=('custom') @@ -17,6 +17,10 @@ md5sums=('c6ece8123c762ee203cbc6fd5450b503') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # Work around DSO linking issue + LDFLAGS+=' -Wl,--copy-dt-needed-entries' + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD index 454c329c4..f2ffecff5 100644 --- a/extra/xfce4-eyes-plugin/PKGBUILD +++ b/extra/xfce4-eyes-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104745 2011-01-04 20:33:13Z andyrtr $ +# $Id: PKGBUILD 149244 2012-02-06 16:25:23Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-eyes-plugin pkgver=4.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel" arch=(i686 x86_64) license=('GPL2') diff --git a/extra/xfce4-fsguard-plugin/PKGBUILD b/extra/xfce4-fsguard-plugin/PKGBUILD index 11202e348..7fde834e8 100644 --- a/extra/xfce4-fsguard-plugin/PKGBUILD +++ b/extra/xfce4-fsguard-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104748 2011-01-04 20:38:08Z andyrtr $ +# $Id: PKGBUILD 149246 2012-02-06 16:26:23Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Ben <ben@benmazer.net> pkgname=xfce4-fsguard-plugin pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="File system usage monitor plugin for the Xfce4 panel" arch=(i686 x86_64) license=('GPL2') diff --git a/extra/xfce4-mixer/PKGBUILD b/extra/xfce4-mixer/PKGBUILD index dd0e3337f..7cc19647a 100644 --- a/extra/xfce4-mixer/PKGBUILD +++ b/extra/xfce4-mixer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 111572 2011-02-27 18:15:06Z andyrtr $ +# $Id: PKGBUILD 149248 2012-02-06 16:27:50Z foutrelis $ # Maintainer: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-mixer pkgver=4.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="The volume control plugin for the Xfce panel" arch=(i686 x86_64) license=('GPL2') diff --git a/extra/xfce4-mount-plugin/PKGBUILD b/extra/xfce4-mount-plugin/PKGBUILD index 72cd37aca..9e463a867 100644 --- a/extra/xfce4-mount-plugin/PKGBUILD +++ b/extra/xfce4-mount-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105777 2011-01-11 18:27:59Z andyrtr $ +# $Id: PKGBUILD 149250 2012-02-06 16:29:16Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-mount-plugin pkgver=0.5.5 -pkgrel=1 +pkgrel=2 pkgdesc="plugin for the Xfce4 panel to mount and unmount volumes" arch=('i686' 'x86_64') license=('GPL2') diff --git a/extra/xfce4-mpc-plugin/PKGBUILD b/extra/xfce4-mpc-plugin/PKGBUILD index 13a03f4e2..65307a384 100644 --- a/extra/xfce4-mpc-plugin/PKGBUILD +++ b/extra/xfce4-mpc-plugin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 105780 2011-01-11 18:35:22Z andyrtr $ +# $Id: PKGBUILD 149252 2012-02-06 16:30:37Z foutrelis $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: aurelien <aurelien@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-mpc-plugin pkgver=0.3.6 -pkgrel=1 +pkgrel=2 pkgdesc="plugin to control the music player daemon from the xfce4-panel" arch=(i686 x86_64) license=('GPL2') diff --git a/extra/xfce4-power-manager/PKGBUILD b/extra/xfce4-power-manager/PKGBUILD index 9992fc0a4..bb2067066 100644 --- a/extra/xfce4-power-manager/PKGBUILD +++ b/extra/xfce4-power-manager/PKGBUILD @@ -1,41 +1,44 @@ -# $Id: PKGBUILD 112918 2011-03-07 18:39:50Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# $Id: PKGBUILD 149179 2012-02-06 06:31:48Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Tobias Kieslich <tobias funnychar archlinux.org> pkgname=xfce4-power-manager pkgver=1.0.10 -pkgrel=2 -pkgdesc="power manager for xfce4 desktop" -arch=(i686 x86_64) -license=('GPL2') +pkgrel=3 +pkgdesc="Power manager for Xfce desktop" +arch=('i686' 'x86_64') url="http://xfce-goodies.berlios.de/" +license=('GPL2') groups=('xfce4-goodies') -depends=('xfce4-panel>=4.7.4' 'upower' 'udisks' 'libnotify>=0.7.1' 'hicolor-icon-theme' 'librsvg') +depends=('xfce4-panel' 'upower' 'udisks' 'libnotify' 'hicolor-icon-theme' + 'librsvg') makedepends=('pkgconfig' 'intltool') options=('!libtool') -install=${pkgname}.install -source=(http://archive.xfce.org/src/apps/${pkgname}/1.0/${pkgname}-${pkgver}.tar.bz2 - xfce4-power-manager-1.0.10-libnotify-0.7.patch) -md5sums=('38cbd272eb30e36ae538d9f38858bd38' - 'c790f973c29654701bb0748f842be4f7') +install=$pkgname.install +source=(http://archive.xfce.org/src/apps/$pkgname/1.0/$pkgname-$pkgver.tar.bz2 + xfce4-power-manager-1.0.10-libnotify-0.7.patch) +sha256sums=('80e4bb44f81c485ec09654dde432d6e28667d49a787625632a4413aac30422f0' + '8bebb7830a4a7d9a49f5f06280aaf7bd703aceaecddcd9e2069e7c2c45dbc013') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 -i "$srcdir/xfce4-power-manager-1.0.10-libnotify-0.7.patch" - patch -Np1 -i ${srcdir}/xfce4-power-manager-1.0.10-libnotify-0.7.patch - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-network-manager \ - --enable-polkit \ - --enable-dpms \ - --disable-debug + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-network-manager \ + --enable-polkit \ + --enable-dpms \ + --disable-debug make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-power-manager/xfce4-power-manager.install b/extra/xfce4-power-manager/xfce4-power-manager.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-power-manager/xfce4-power-manager.install +++ b/extra/xfce4-power-manager/xfce4-power-manager.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-systemload-plugin/PKGBUILD b/extra/xfce4-systemload-plugin/PKGBUILD index a499ab317..3cd62a4dc 100644 --- a/extra/xfce4-systemload-plugin/PKGBUILD +++ b/extra/xfce4-systemload-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104779 2011-01-04 21:58:54Z andyrtr $ +# $Id: PKGBUILD 149256 2012-02-06 16:36:25Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-systemload-plugin pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="A system load plugin for the Xfce4 panel" arch=('i686' 'x86_64') license=('custom') diff --git a/extra/xfce4-taskmanager/PKGBUILD b/extra/xfce4-taskmanager/PKGBUILD index 477abe743..36560f8e6 100644 --- a/extra/xfce4-taskmanager/PKGBUILD +++ b/extra/xfce4-taskmanager/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 85565 2010-07-15 21:51:22Z andyrtr $ +# $Id: PKGBUILD 149254 2012-02-06 16:35:11Z foutrelis $ # Maintainer: pkgname=xfce4-taskmanager pkgver=1.0.0 -pkgrel=2 +pkgrel=3 pkgdesc="Easy to use task manager" arch=(i686 x86_64) license=('GPL2') @@ -23,6 +23,6 @@ build() { } package() { - cd ${startdir}/src/${pkgname}-${pkgver} - make DESTDIR=${startdir}/pkg install + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/extra/xfce4-time-out-plugin/PKGBUILD b/extra/xfce4-time-out-plugin/PKGBUILD index 119084172..bf7dfc644 100755 --- a/extra/xfce4-time-out-plugin/PKGBUILD +++ b/extra/xfce4-time-out-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104784 2011-01-04 22:25:16Z andyrtr $ +# $Id: PKGBUILD 149258 2012-02-06 16:37:33Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> pkgname=xfce4-time-out-plugin pkgver=1.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="Take a break from your computer with this plugin for XFCE4." arch=(i686 x86_64) url="http://xfce-goodies.berlios.de/" diff --git a/extra/xfce4-timer-plugin/PKGBUILD b/extra/xfce4-timer-plugin/PKGBUILD index 97abd1269..95f738dbc 100644 --- a/extra/xfce4-timer-plugin/PKGBUILD +++ b/extra/xfce4-timer-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 108093 2011-01-29 12:51:59Z andyrtr $ +# $Id: PKGBUILD 149260 2012-02-06 16:38:59Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-timer-plugin pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="plugin to track time for the Xfce4 panel" arch=(i686 x86_64) license=('GPL2') diff --git a/extra/xfce4-wavelan-plugin/PKGBUILD b/extra/xfce4-wavelan-plugin/PKGBUILD index 69976a7b2..3f8a24f2a 100644 --- a/extra/xfce4-wavelan-plugin/PKGBUILD +++ b/extra/xfce4-wavelan-plugin/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105584 2011-01-10 18:02:21Z andyrtr $ +# $Id: PKGBUILD 149266 2012-02-06 17:02:00Z foutrelis $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Tobias Kieslich <tobias (at) archlinux.org> pkgname=xfce4-wavelan-plugin pkgver=0.5.6 -pkgrel=1 +pkgrel=2 pkgdesc="plugin to monitor wifi connectivity for the Xfce4 panel" arch=('i686' 'x86_64') license=('custom') @@ -17,13 +17,17 @@ source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/0.5/${pkgname}-${pk md5sums=('b23a4c9c2a206242ee4db8186dd01801') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} + + # Work around DSO linking issue + LDFLAGS+=' -Wl,--copy-dt-needed-entries' + ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ --localstatedir=/var \ --disable-static \ - --disable-debug + --disable-debug make } diff --git a/extra/xorg-luit/PKGBUILD b/extra/xorg-luit/PKGBUILD index 48b3446d8..01b80a4de 100644 --- a/extra/xorg-luit/PKGBUILD +++ b/extra/xorg-luit/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 113665 2011-03-10 14:31:25Z jgc $ +# $Id: PKGBUILD 149218 2012-02-06 13:34:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xorg-luit pkgver=1.1.0 -pkgrel=2 -pkgdesc="Filter that can be run between an arbitrary application and -a UTF-8 terminal emulator" +pkgrel=3 +pkgdesc="Filter that can be run between an arbitrary application and a UTF-8 terminal emulator" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -19,6 +18,10 @@ build() { cd "${srcdir}/luit-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/luit-${pkgver}" make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" diff --git a/extra/xorg-xfontsel/PKGBUILD b/extra/xorg-xfontsel/PKGBUILD index cca0d453e..2ca62abd6 100644 --- a/extra/xorg-xfontsel/PKGBUILD +++ b/extra/xorg-xfontsel/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 149201 2012-02-06 08:23:09Z bisson $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xorg-xfontsel pkgver=1.0.3 -pkgrel=1 -pkgdesc="Point and click selection of X11 font names" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/" +pkgrel=2 +pkgdesc='Point and click selection of X11 font names' +url='http://xorg.freedesktop.org/' +arch=('i686' 'x86_64') license=('custom') -depends=('libxaw' 'libxmu' 'libxt' 'libx11') makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/xfontsel-${pkgver}.tar.bz2) +depends=('libxaw' 'libxmu' 'libxt' 'libx11') +source=("http://xorg.freedesktop.org/archive/individual/app/xfontsel-${pkgver}.tar.bz2") sha1sums=('df2eb12b90339b7091bd362b095344015ec8b6fa') build() { - cd "${srcdir}/xfontsel-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + cd "${srcdir}/xfontsel-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/xfontsel-${pkgver}" + make DESTDIR="${pkgdir}" install + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 56196484e..12b5873eb 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,23 +1,25 @@ -# $Id: PKGBUILD 148986 2012-02-05 11:59:04Z ibiru $ +# $Id: PKGBUILD 149294 2012-02-06 17:34:06Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xulrunner pkgver=10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') -makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa') +makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13') url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 mozconfig - mozilla-pkgconfig.patch) + mozilla-pkgconfig.patch + libvpx.patch) options=('!emptydirs') replaces=('xulrunner-oss') md5sums=('13c61203ccfa583e5a54b4dc22f41233' '8dfb78c5bd0581c8cf4753813132bf0b' - '27271ce647a83906ef7a24605e840d61') + '27271ce647a83906ef7a24605e840d61' + '5d418ecdbdb9f40597df6b978b0b5ee5') build() { cd "$srcdir/mozilla-release" @@ -25,6 +27,7 @@ build() { #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" + patch -Np1 -i "$srcdir/libvpx.patch" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" diff --git a/extra/xulrunner/libvpx.patch b/extra/xulrunner/libvpx.patch new file mode 100644 index 000000000..f883b8e08 --- /dev/null +++ b/extra/xulrunner/libvpx.patch @@ -0,0 +1,12 @@ +diff -Nur mozilla-release.orig/configure.in mozilla-release/configure.in +--- mozilla-release.orig/configure.in 2012-02-05 16:01:35.722024142 +0000 ++++ mozilla-release/configure.in 2012-02-05 16:03:34.871064547 +0000 +@@ -5629,7 +5629,7 @@ + dnl v0.9.6 one to check for. + AC_TRY_COMPILE([ + #include <vpx/vpx_decoder.h> +- #if !defined(VPX_CODEC_USE_INPUT_PARTITION) ++ #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS) + #error "test failed." + #endif + ], |