summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/cegui/PKGBUILD4
-rw-r--r--community/converseen/PKGBUILD4
-rw-r--r--community/cuneiform/PKGBUILD4
-rw-r--r--community/darktable/PKGBUILD4
-rw-r--r--community/devil/PKGBUILD4
-rw-r--r--community/dwb/PKGBUILD8
-rw-r--r--community/fb-client/PKGBUILD8
-rw-r--r--community/freewrl/PKGBUILD6
-rw-r--r--community/gambas3/PKGBUILD10
-rw-r--r--community/gmic/PKGBUILD4
-rw-r--r--community/gource/PKGBUILD4
-rw-r--r--community/luminancehdr/PKGBUILD10
-rw-r--r--community/luxrays/PKGBUILD5
-rw-r--r--community/luxrender/PKGBUILD4
-rw-r--r--community/megaglest/PKGBUILD6
-rw-r--r--community/mtpaint/PKGBUILD4
-rw-r--r--community/nodejs/PKGBUILD22
-rw-r--r--community/openimageio/PKGBUILD12
-rw-r--r--community/performous/PKGBUILD8
-rw-r--r--community/projectm/PKGBUILD31
-rw-r--r--community/rss-glx/PKGBUILD4
-rw-r--r--community/sfml/PKGBUILD8
-rw-r--r--community/spring/PKGBUILD6
-rw-r--r--community/supertux/PKGBUILD8
-rw-r--r--community/vdrift/PKGBUILD4
-rw-r--r--community/virtualbox-modules-lts/PKGBUILD4
-rwxr-xr-xcommunity/virtualbox-modules-lts/build.sh6
-rw-r--r--community/virtualbox-modules/PKGBUILD6
-rwxr-xr-xcommunity/virtualbox-modules/build.sh6
-rw-r--r--community/widelands/PKGBUILD9
-rw-r--r--community/xbmc/PKGBUILD14
-rw-r--r--community/xbmc/xbmc.install6
-rw-r--r--community/xbmc/xbmc.service2
-rw-r--r--extra/bzflag/PKGBUILD5
-rw-r--r--extra/calligra/PKGBUILD4
-rw-r--r--extra/cinepaint/PKGBUILD4
-rw-r--r--extra/dvdauthor/PKGBUILD4
-rw-r--r--extra/emacs/PKGBUILD4
-rw-r--r--extra/enblend-enfuse/PKGBUILD6
-rw-r--r--extra/fyre/PKGBUILD4
-rw-r--r--extra/gegl/PKGBUILD6
-rw-r--r--extra/glew/PKGBUILD8
-rw-r--r--extra/hugin/PKGBUILD6
-rw-r--r--extra/ilmbase/PKGBUILD24
-rw-r--r--extra/ilmbase/ilmbase-IexMath.patch12
-rw-r--r--extra/imagemagick/PKGBUILD12
-rw-r--r--extra/inkscape/PKGBUILD4
-rw-r--r--extra/kdelibs3/PKGBUILD4
-rw-r--r--extra/live-media/PKGBUILD6
-rw-r--r--extra/obex-data-server/PKGBUILD8
-rw-r--r--extra/opencv/PKGBUILD15
-rw-r--r--extra/openexr/PKGBUILD6
-rw-r--r--extra/phonon/PKGBUILD17
-rw-r--r--extra/phonon/fix-qmake.patch27
-rw-r--r--extra/psiconv/PKGBUILD10
-rw-r--r--extra/pstoedit/PKGBUILD4
-rw-r--r--extra/transcode/PKGBUILD6
-rw-r--r--extra/transcode/ffmpeg-0.11.patch11
-rw-r--r--extra/xine-lib/PKGBUILD4
-rw-r--r--libre/iceape-i18n/PKGBUILD50
-rw-r--r--libre/iceape-libre/PKGBUILD6
-rw-r--r--libre/iceweasel-i18n/PKGBUILD181
-rw-r--r--libre/parabolaweb-utils/PKGBUILD25
-rw-r--r--libre/parabolaweb-utils/parabolaweb-download47
-rw-r--r--libre/parabolaweb-utils/parabolaweb-update62
-rw-r--r--libre/virtualbox-libre-modules-lts/PKGBUILD4
-rwxr-xr-xlibre/virtualbox-libre-modules-lts/build.sh6
-rw-r--r--libre/virtualbox-libre-modules/PKGBUILD4
-rwxr-xr-xlibre/virtualbox-libre-modules/build.sh6
-rw-r--r--libre/virtualbox-libre/PKGBUILD19
-rw-r--r--libre/xulrunner-libre/PKGBUILD6
71 files changed, 479 insertions, 403 deletions
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index c6c4da4a1..f05f0f169 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77052 2012-10-04 03:54:27Z svenstaro $
+# $Id: PKGBUILD 78921 2012-10-27 23:43:46Z ebelanger $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>,
@@ -6,7 +6,7 @@
pkgname=cegui
pkgver=0.7.7
-pkgrel=1
+pkgrel=2
pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
arch=('i686' 'x86_64')
url="http://crayzedsgui.sourceforge.net"
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 95e10cc13..3a37fbbae 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73175 2012-07-03 06:23:26Z giovanni $
+# $Id: PKGBUILD 78924 2012-10-27 23:44:03Z ebelanger $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: archtux <antonio.arias99999 at gmail.com>
pkgname=converseen
pkgver=0.5.1
-pkgrel=1
+pkgrel=2
pkgdesc="The batch image converter and resizer"
arch=('i686' 'x86_64')
url="http://converseen.sourceforge.net/"
diff --git a/community/cuneiform/PKGBUILD b/community/cuneiform/PKGBUILD
index 2c5f9afb0..b59c0c3bd 100644
--- a/community/cuneiform/PKGBUILD
+++ b/community/cuneiform/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 55513 2011-09-13 21:33:06Z ebelanger $
+# $Id: PKGBUILD 78925 2012-10-27 23:44:06Z ebelanger $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Maxim Vuets <maxim.vuets@gmail.com>
pkgname=cuneiform
pkgver=1.1.0
_dpkgver=1.1
-pkgrel=2
+pkgrel=4
pkgdesc="Linux port of an OCR system developed in Russia. Supports more than 20 languages."
arch=('i686' 'x86_64')
url="https://launchpad.net/cuneiform-linux"
diff --git a/community/darktable/PKGBUILD b/community/darktable/PKGBUILD
index 636950019..db75f8f2c 100644
--- a/community/darktable/PKGBUILD
+++ b/community/darktable/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77602 2012-10-13 07:54:00Z ebelanger $
+# $Id: PKGBUILD 78926 2012-10-27 23:44:11Z ebelanger $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Christian Himpel <chressie at gmail dot com>
# Contributor: Johannes Hanika <hanatos at gmail dot com>
@@ -6,7 +6,7 @@
pkgname=darktable
pkgver=1.0.5
_pkgver=1.0
-pkgrel=3
+pkgrel=4
pkgdesc="Utility to organize and develop raw images"
arch=('i686' 'x86_64')
url=http://darktable.sf.net/
diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD
index d4c342474..94624a3e2 100644
--- a/community/devil/PKGBUILD
+++ b/community/devil/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77600 2012-10-13 07:27:55Z allan $
+# $Id: PKGBUILD 78927 2012-10-27 23:44:18Z ebelanger $
# Maintainer: Laurent Carlier <lordheavym@gmail.org>
# Contributor: damir <damir@archlinux.org>
# Contributor: TheHoff <forums>
pkgname=devil
pkgver=1.7.8
-pkgrel=13
+pkgrel=14
pkgdesc="Library for reading several different image formats"
arch=('i686' 'x86_64')
url="http://openil.sourceforge.net/"
diff --git a/community/dwb/PKGBUILD b/community/dwb/PKGBUILD
index 5d8cd77f3..fc644ea86 100644
--- a/community/dwb/PKGBUILD
+++ b/community/dwb/PKGBUILD
@@ -1,10 +1,10 @@
-$Id: PKGBUILD 76661 2012-09-25 22:31:13Z dwallace $
+#$Id: PKGBUILD 78955 2012-10-28 00:21:35Z dwallace $
# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: portix <portix at gmx.net>
pkgname=dwb
-pkgver=2012.08.22
-pkgrel=3
+pkgver=2012.10.27_3
+pkgrel=1
pkgdesc="A webkit web browser with vi-like keyboard shortcuts, stable snapshot"
url="http://portix.bitbucket.org/dwb/"
arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ install=dwb.install
license=('GPL')
depends=('libwebkit' 'desktop-file-utils')
source=(https://bitbucket.org/portix/"${pkgname}"/downloads/"${pkgname}"-"${pkgver}".tar.gz)
-md5sums=('5cdf3a2b3f8845071529b44e2d93d653')
+md5sums=('2d544b01d3cbee81cc9f6c1c77ca7528')
build() {
cd "${srcdir}"/"${pkgname}"-"${pkgver}"
diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD
index a53c79215..37694b417 100644
--- a/community/fb-client/PKGBUILD
+++ b/community/fb-client/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Florian "Bluewind" Pritz <flo@xssn.at>
pkgname=fb-client
-pkgver=1.0.5
-pkgrel=1
+pkgver=1.1
+pkgrel=2
pkgdesc="Client for paste.xinu.at"
arch=('i686' 'x86_64')
url="http://paste.xinu.at"
@@ -9,8 +9,8 @@ license=('GPL3')
depends=('curl')
optdepends=('xclip: for automatically copying the URL into the clipboard')
source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig})
-md5sums=('7e9a5436b138f67c6b75209034d8a729'
- '816da30af8582407adf9701890257b8d')
+md5sums=('32551de21b82d2dbd1bb96ad2ecb5fc7'
+ '04357f4b0d6a84f1de51e275220a042b')
build() {
cd "$srcdir/fb-$pkgver"
diff --git a/community/freewrl/PKGBUILD b/community/freewrl/PKGBUILD
index 78e66da80..ec562da65 100644
--- a/community/freewrl/PKGBUILD
+++ b/community/freewrl/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 77634 2012-10-13 11:42:27Z allan $
+# $Id: PKGBUILD 78928 2012-10-27 23:44:21Z ebelanger $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=freewrl
pkgver=1.22.13.1
_pkgver=1.22.13
-pkgrel=2
+pkgrel=3
pkgdesc="VRML viewer"
arch=('i686' 'x86_64')
url="http://freewrl.sourceforge.net/"
license=('GPL')
depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox'
'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js' 'glu')
-makedepends=('java-environment' 'xulrunner' 'wget')
+makedepends=('java-environment' 'xulrunner' 'wget' 'mesa')
options=(!libtool)
source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
md5sums=('27f4bf163011d8ac2088a535cb58a13d')
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index 5f8f938cc..71c2eb3c3 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78525 2012-10-20 09:33:20Z heftig $
+# $Id: PKGBUILD 78930 2012-10-27 23:44:36Z ebelanger $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
# Contributor : sebikul <sebikul@gmail.com>
@@ -15,7 +15,7 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc'
'gambas3-gb-xml-xslt' 'gambas3-gb-web')
pkgver=3.3.3
-pkgrel=2
+pkgrel=3
pkgdesc="A free development environment based on a Basic interpreter."
arch=('i686' 'x86_64')
url="http://gambas.sourceforge.net/"
@@ -27,7 +27,8 @@ makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils
'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring'
'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm'
- 'gmime' 'glu')
+ 'gmime' 'glu' 'pangox-compat')
+# pangox-compat to remove when added in gtkglext package dependency
options=('!emptydirs')
source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
'gambas3-script.install' 'gambas3-runtime.install')
@@ -633,7 +634,8 @@ package_gambas3-gb-gtk() {
}
package_gambas3-gb-gtk-opengl() {
- depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu')
+ depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu' 'pangox-compat')
+# pangox-compat to remove when added in gtkglext package dependency
pkgdesc="GTK+ toolkit OpenGL component"
## workaround for splitting
diff --git a/community/gmic/PKGBUILD b/community/gmic/PKGBUILD
index a240f9acf..293954169 100644
--- a/community/gmic/PKGBUILD
+++ b/community/gmic/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77710 2012-10-13 20:01:04Z ebelanger $
+# $Id: PKGBUILD 78931 2012-10-27 23:44:41Z ebelanger $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
# Contributor: farid <farid at archlinuc-br.org>
@@ -7,7 +7,7 @@
pkgbase=gmic
pkgname=("gmic" "gimp-plugin-gmic" "zart")
pkgver=1.5.1.8
-pkgrel=3
+pkgrel=4
arch=("i686" "x86_64")
url="http://gmic.sourceforge.net"
license=("custom:CeCILL")
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index 110b73b03..7df9b6b1d 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77645 2012-10-13 11:43:38Z allan $
+# $Id: PKGBUILD 78932 2012-10-27 23:44:44Z ebelanger $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Jose Valecillos <valecillosjg (at) gmail (dot) com>
# Contributor: Olivier Ramonat <olivier at ramonat dot fr>
pkgname=gource
pkgver=0.38
-pkgrel=4
+pkgrel=5
pkgdesc="software version control visualization"
license=(GPL3)
arch=(i686 x86_64)
diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD
index cff63eca8..bd8037b50 100644
--- a/community/luminancehdr/PKGBUILD
+++ b/community/luminancehdr/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77594 2012-10-13 06:46:05Z allan $
+# $Id: PKGBUILD 78933 2012-10-27 23:44:52Z ebelanger $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Contributor: Dmitry N. Shilov <stormblast@land.ru>
pkgname=luminancehdr
pkgver=2.3.0
-pkgrel=3
+pkgrel=4
pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
arch=('i686' 'x86_64')
url='http://qtpfsgui.sourceforge.net/'
@@ -20,14 +20,14 @@ source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/lumin
sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676')
build() {
- cd ${srcdir}/luminance-hdr-${pkgver}
+ cd "${srcdir}/luminance-hdr-${pkgver}"
cmake -DCMAKE_INSTALL_PREFIX=/usr
make
}
package() {
- cd ${srcdir}/luminance-hdr-${pkgver}
+ cd "${srcdir}/luminance-hdr-${pkgver}"
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
}
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index 704adc119..5ad24ef05 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,10 +1,9 @@
-# $Id: PKGBUILD 78368 2012-10-17 15:33:35Z stativ $
+# $Id: PKGBUILD 78934 2012-10-27 23:44:55Z ebelanger $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=luxrays
pkgver=1.1
_pkgver=589aa5dac899
-pkgrel=2
-epoch=0
+pkgrel=3
pkgdesc="Accelerate the ray intersection process by using GPUs"
arch=('i686' 'x86_64')
url="http://www.luxrender.net/"
diff --git a/community/luxrender/PKGBUILD b/community/luxrender/PKGBUILD
index be12d5880..34aabbc87 100644
--- a/community/luxrender/PKGBUILD
+++ b/community/luxrender/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78304 2012-10-17 13:34:29Z stativ $
+# $Id: PKGBUILD 78935 2012-10-27 23:44:58Z ebelanger $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
# Initial contributor: flixie <69one@gmx.net>
# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
pkgname=luxrender
pkgver=1.1
_pkgver=4b4289cda943
-pkgrel=2
+pkgrel=3
pkgdesc="Rendering system for physically correct, unbiased image synthesis"
arch=('i686' 'x86_64')
url="http://www.luxrender.net/"
diff --git a/community/megaglest/PKGBUILD b/community/megaglest/PKGBUILD
index 928544444..32b62368a 100644
--- a/community/megaglest/PKGBUILD
+++ b/community/megaglest/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 77649 2012-10-13 11:43:58Z allan $
+# $Id: PKGBUILD 78936 2012-10-27 23:45:03Z ebelanger $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
pkgname=megaglest
pkgver=3.6.0.3
-pkgrel=4
+pkgrel=5
pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world."
arch=('i686' 'x86_64')
url="http://sourceforge.net/projects/megaglest/"
@@ -20,7 +20,7 @@ md5sums=('5a4a2429435031d9f9cc5d9535a9de9d'
build() {
cd "${srcdir}"/"${pkgname}"-"${pkgver}"/
- patch -Np1 < $srcdir/lol.patch
+ patch -Np1 < "$srcdir/lol.patch"
[[ -d build ]] && rm -r build
mkdir build && cd build
diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD
index 1d8672a8e..13eb7a574 100644
--- a/community/mtpaint/PKGBUILD
+++ b/community/mtpaint/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73778 2012-07-15 13:21:04Z arodseth $
+# $Id: PKGBUILD 78951 2012-10-27 23:57:00Z ebelanger $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Roman Kyrylych <roman@archlinux.org>
# Contributor: yosh64 <yosh64.at.gmail.dot.com>
pkgname=mtpaint
pkgver=3.40
-pkgrel=4
+pkgrel=5
pkgdesc="Simple GTK2 paint program for creating icons and pixel based artwork"
arch=('x86_64' 'i686')
url="http://mtpaint.sourceforge.net/"
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 79fcf098c..7cada4d07 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78788 2012-10-24 19:44:32Z bpiotrowski $
+# $Id: PKGBUILD 78912 2012-10-27 18:07:12Z bpiotrowski $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Thomas Dziedzic < gostrc at gmail >
# Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,8 +8,8 @@
# Contributor: TIanyi Cui <tianyicui@gmail.com>
pkgname=nodejs
-pkgver=0.8.12
-pkgrel=2
+pkgver=0.8.14
+pkgrel=1
pkgdesc='Evented I/O for V8 javascript'
arch=('i686' 'x86_64')
url='http://nodejs.org/'
@@ -18,27 +18,23 @@ depends=('openssl' 'python2' 'v8')
checkdepends=('curl') # curl used for check()
options=('!emptydirs')
source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-md5sums=('2d053e4d08e6b44747ed2f519a8b20be')
+md5sums=('284fd2c7578064c339d9cf6a3a475ac7')
build() {
cd node-v${pkgver}
msg 'Fixing for python2 name'
- find -type f -exec \
- sed -e 's_^#!/usr/bin/env python$_&2_' \
+ find -type f -exec sed \
+ -e 's_^#!/usr/bin/env python$_&2_' \
-e 's_^\(#!/usr/bin/python2\).[45]$_\1_' \
-e 's_^#!/usr/bin/python$_&2_' \
- -e "s_'python'_'python2'_" \
- -e 's_python _python2 _' -i {} \;
-
+ -e "s_'python'_'python2'_" -i {} \;
+ find test/ -type f -exec sed 's_python _python2 _' -i {} \;
export PYTHON=python2
./configure \
--prefix=/usr \
- --shared-openssl \
- --shared-v8 \
- --shared-v8-libpath=/usr/lib \
- --shared-v8-includes=/usr/include
+ --shared-openssl
make
}
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index d76723397..070f0c8cf 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 77692 2012-10-13 14:45:45Z svenstaro $
+# $Id: PKGBUILD 78937 2012-10-27 23:45:06Z ebelanger $
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=openimageio
pkgver=1.0.9
-pkgrel=3
+pkgrel=4
pkgdesc="A library for reading and writing images, including classes, utilities, and applications."
arch=(i686 x86_64)
url="http://www.openimageio.org/"
license=('custom')
depends=('openexr' 'boost-libs' 'jasper' 'glew')
-makedepends=('cmake' 'qt' 'python2' 'boost')
+makedepends=('cmake' 'qt' 'python2' 'boost' 'mesa')
optdepends=('qt: iv image viewer'
'python2: bindings support')
source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
@@ -21,16 +21,14 @@ build() {
[[ -d build ]] && rm -r build
mkdir build && cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DPYLIB_INSTALL_DIR=lib/python2.7/site-packages ..
make
}
package() {
cd "$srcdir"/$_pkgname*/src/build
- make DESTDIR=$pkgdir install
-
- mv $pkgdir/usr/lib/python $pkgdir/usr/lib/python2.7
+ make DESTDIR="$pkgdir" install
# license
cd ../..
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index 8c7ed8a70..a6e25c9f7 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,18 +1,16 @@
-# $Id: PKGBUILD 74622 2012-07-31 19:56:30Z ebelanger $
+# $Id: PKGBUILD 78938 2012-10-27 23:45:17Z ebelanger $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=performous
pkgver=0.6.1
-pkgrel=16
+pkgrel=17
pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
arch=('i686' 'x86_64')
url="http://performous.org/"
license=('GPL')
depends=('boost-libs' 'imagemagick' 'glew' 'libxml++' 'portaudio' 'portmidi' 'opencv' 'librsvg')
-#depends=('boost-libs>=1.48' 'sdl' 'jack' 'imagemagick' 'ffmpeg' 'glew>=1.7.0' 'libxml++' 'portaudio' 'portmidi' \
-# 'opencv' 'librsvg' 'libjpeg' 'libpng' 'cairo')
-makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50')
+makedepends=('cmake' 'pkgconfig' 'help2man' 'boost>=1.50' 'mesa')
optdepends=('performous-freesongs: free songs for performous')
source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/Performous-$pkgver-Source.tar.bz2
boost-filesystem-v3.patch
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index 7f17289f9..65abc3baf 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,38 +1,41 @@
-# $Id: PKGBUILD 75395 2012-08-21 20:06:54Z ebelanger $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# $Id: PKGBUILD 78939 2012-10-27 23:45:21Z ebelanger $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgbase=projectm
pkgname=('projectm' 'libvisual-projectm')
pkgver=2.1.0
-pkgrel=1
-arch=('i686' 'x86_64')
+pkgrel=2
+arch=('x86_64' 'i686')
url='http://projectm.sourceforge.net/'
license=('LGPL')
makedepends=('cmake' 'ftgl' 'glew' 'gtkglext' 'libvisual' 'sdl' 'libxext')
-source=("http://downloads.sourceforge.net/${pkgname}/projectM-complete-${pkgver}-Source.tar.gz")
-md5sums=('debf30f7ce94ff0102f06fbb0cc4e92b')
+source=("http://downloads.sourceforge.net/$pkgname/projectM-complete-$pkgver-Source.tar.gz")
+sha256sums=('513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee')
build() {
- cd "${srcdir}/projectM-complete-${pkgver}-Source/src"
+ cd $srcdir/projectM-complete-$pkgver-Source/src
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DINCLUDE-PROJECTM-QT=OFF \
-DINCLUDE-PROJECTM-PULSEAUDIO=OFF -DINCLUDE-PROJECTM-TEST=OFF
make
}
package_projectm() {
- pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.'
+ pkgdesc='Music visualizer which uses 3D accelerated iterative image based rendering'
depends=('ftgl' 'glew' 'gtkglext')
- cd "${srcdir}/projectM-complete-${pkgver}-Source/src/libprojectM"
- make DESTDIR="${pkgdir}" install
- install -m644 fonts/Vera.ttf "${pkgdir}/usr/share/projectM/fonts/Vera.ttf"
+ cd $srcdir/projectM-complete-$pkgver-Source/src/libprojectM
+ make DESTDIR=$pkgdir install
+ install -m644 fonts/Vera.ttf $pkgdir/usr/share/projectM/fonts/Vera.ttf
}
package_libvisual-projectm() {
- pkgdesc='ProjectM XMMS plugin.'
+ pkgdesc='ProjectM XMMS plugin'
depends=("projectm>=$pkgver" 'libvisual' 'sdl')
- cd "${srcdir}/projectM-complete-${pkgver}-Source/src/projectM-libvisual"
- make DESTDIR="${pkgdir}" install
+ cd $srcdir/projectM-complete-$pkgver-Source/src/projectM-libvisual
+ make DESTDIR=$pkgdir install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/rss-glx/PKGBUILD b/community/rss-glx/PKGBUILD
index 3886c1660..c90e25ac1 100644
--- a/community/rss-glx/PKGBUILD
+++ b/community/rss-glx/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 77864 2012-10-15 10:12:56Z spupykin $
+# $Id: PKGBUILD 78940 2012-10-27 23:45:28Z ebelanger $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
# Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au>
pkgname=rss-glx
pkgver=0.9.1
-pkgrel=11
+pkgrel=12
pkgdesc="The Really Slick Screensavers port to GLX"
arch=('i686' 'x86_64')
url="http://rss-glx.sourceforge.net/"
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index cf004610c..8856014b4 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74625 2012-07-31 19:56:49Z ebelanger $
+# $Id: PKGBUILD 78941 2012-10-27 23:45:33Z ebelanger $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Ondrej Martinak <omartinak@gmail.com>
pkgname=sfml
pkgver=2.0rc1
-pkgrel=2
+pkgrel=3
pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
arch=('i686' 'x86_64')
url='http://www.sfml-dev.org/'
@@ -33,8 +33,6 @@ package() {
install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake"
- install -Dm644 ../license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-
- make clean
+ install -Dm644 ../license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index 8eec37a2d..a361ff4a5 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 77576 2012-10-12 19:50:28Z svenstaro $
+# $Id: PKGBUILD 78942 2012-10-27 23:45:40Z ebelanger $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,14 +6,14 @@
pkgname=spring
pkgver=0.91.0
_pkgver=91.0
-pkgrel=2
+pkgrel=3
pkgdesc='A free 3D real-time-strategy (RTS) game engine'
arch=('i686' 'x86_64')
url="http://springrts.com/"
license=('GPL')
depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment')
+makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment' 'mesa')
optdepends=('python2: python-based bots'
'java-runtime: java-based bots')
install=spring.install
diff --git a/community/supertux/PKGBUILD b/community/supertux/PKGBUILD
index 9f3f95509..3a9c88b88 100644
--- a/community/supertux/PKGBUILD
+++ b/community/supertux/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74627 2012-07-31 19:57:01Z ebelanger $
+# $Id: PKGBUILD 78943 2012-10-27 23:45:45Z ebelanger $
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Eric Bélanger <eric@archlinux.org>
# Contributor: vande198
@@ -6,13 +6,13 @@
pkgname=supertux
pkgver=0.3.3
-pkgrel=6
+pkgrel=7
pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games"
arch=('i686' 'x86_64')
url="http://super-tux.sourceforge.net/"
license=('GPL')
-depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew')
-makedepends=('cmake' 'boost')
+depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'glew')
+makedepends=('cmake' 'boost' 'mesa')
source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2
supertux2-0.3.3-squirrel-gcc47.patch)
md5sums=('f3f803e629ee51a9de0b366a036e393d'
diff --git a/community/vdrift/PKGBUILD b/community/vdrift/PKGBUILD
index f30ed8bdb..e721b176c 100644
--- a/community/vdrift/PKGBUILD
+++ b/community/vdrift/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78854 2012-10-26 01:19:11Z ebelanger $
+# $Id: PKGBUILD 78946 2012-10-27 23:46:16Z ebelanger $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
# Contributor: Lone_Wolf lonewolf@xs4all.nl
pkgname=vdrift
pkgver=2012.07.22
-pkgrel=2
+pkgrel=3
pkgdesc="Open source driving simulation made with drift racing in mind"
arch=('i686' 'x86_64')
url="http://vdrift.net/"
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index aa1f3d890..e172e043a 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78541 2012-10-20 11:53:48Z seblu $
+# $Id: PKGBUILD 78917 2012-10-27 18:38:36Z seblu $
# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
# Contributor: Ionut Biru <ibiru@archlinux.org>
# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgbase=virtualbox-modules-lts
pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.2
+pkgver=4.2.4
pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
diff --git a/community/virtualbox-modules-lts/build.sh b/community/virtualbox-modules-lts/build.sh
index 828448cab..bbf855c1a 100755
--- a/community/virtualbox-modules-lts/build.sh
+++ b/community/virtualbox-modules-lts/build.sh
@@ -6,13 +6,11 @@ if (( $# != 1 )); then
exit 1
fi
-$1-i686-build
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
-$1-x86_64-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
makechrootpkg -r /var/lib/archbuild/$1-x86_64
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 7a49a61e8..163b27a39 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78754 2012-10-24 07:11:32Z tpowa $
+# $Id: PKGBUILD 78915 2012-10-27 18:36:55Z seblu $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
pkgbase=virtualbox-modules
pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.2
-pkgrel=2
+pkgver=4.2.4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/community/virtualbox-modules/build.sh b/community/virtualbox-modules/build.sh
index 828448cab..371c9b982 100755
--- a/community/virtualbox-modules/build.sh
+++ b/community/virtualbox-modules/build.sh
@@ -6,13 +6,11 @@ if (( $# != 1 )); then
exit 1
fi
-$1-i686-build
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
-$1-x86_64-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
makechrootpkg -r /var/lib/archbuild/$1-x86_64
diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD
index 79f3db71c..b4a28fd15 100644
--- a/community/widelands/PKGBUILD
+++ b/community/widelands/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75822 2012-09-01 20:40:05Z heftig $
+# $Id: PKGBUILD 78944 2012-10-27 23:46:00Z ebelanger $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <rabyte*gmail>
@@ -6,13 +6,13 @@
pkgname=widelands
pkgver=17
_realver=build17
-pkgrel=4
+pkgrel=5
pkgdesc="A realtime strategy game with emphasis on economy and transport"
arch=('i686' 'x86_64')
url="http://widelands.org/"
license=('GPL')
-depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2' 'widelands-data')
-makedepends=('cmake' 'boost')
+depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2')
+makedepends=('cmake' 'boost' 'mesa')
source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2"
$pkgname.desktop
$pkgname.png
@@ -38,6 +38,7 @@ build() {
}
package() {
+ depends=(${depends[@]} 'widelands-data')
cd $srcdir/$pkgname-$_realver-src/build/compile
make DESTDIR="$pkgdir" install
diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD
index ce775bbd8..dc2a29e62 100644
--- a/community/xbmc/PKGBUILD
+++ b/community/xbmc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 78434 2012-10-18 10:03:49Z spupykin $
+# $Id: PKGBUILD 78945 2012-10-27 23:46:09Z ebelanger $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Brad Fanella <bradfanella@archlinux.us>
# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -9,7 +9,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=11.0
-pkgrel=9
+pkgrel=11
pkgdesc="A software media player and entertainment hub for digital media"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -33,16 +33,8 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
install="${pkgname}.install"
source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
"xbmc.service")
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19')
sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
- '395ca1afd3430ad66239bafbffde0eedf9c43409b77f65341ef387f09cd65588')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
- '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
- '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
-sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19'
- '75ae8eb37e334ae1383bf897b08dd5f70df12d79ce46cdbe4a7e0d3c82bce3af')
+ '82ebca3d66155f889a3d70311b000ac8b911b062af8df308d6a86aecc6b1b52b')
build() {
cd "${srcdir}/xbmc-$pkgver"
diff --git a/community/xbmc/xbmc.install b/community/xbmc/xbmc.install
index a3ae3d0d8..23535f662 100644
--- a/community/xbmc/xbmc.install
+++ b/community/xbmc/xbmc.install
@@ -1,13 +1,13 @@
post_install() {
[[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
[[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
- groupadd xbmc
- useradd -G xbmc -d /var/empty xbmc
+ getent group xbmc > /dev/null || groupadd xbmc
+ getent passwd xbmc > /dev/null || useradd -d /var/empty xbmc
+ usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
}
post_upgrade() {
post_install $1
- echo "You may want to add xbmc user and group to use xbmc standalone"
}
post_remove() {
diff --git a/community/xbmc/xbmc.service b/community/xbmc/xbmc.service
index b66e35c80..23756cf03 100644
--- a/community/xbmc/xbmc.service
+++ b/community/xbmc/xbmc.service
@@ -7,7 +7,7 @@ User = xbmc
Group = xbmc
Type = simple
ExecStart = /usr/bin/xinit /usr/bin/xbmc-standalone -- :0
-Restart = on-failure
+Restart = always
[Install]
WantedBy = multi-user.target
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index 742ce8d48..a565f2d7c 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 168598 2012-10-13 11:46:40Z andyrtr $
+# $Id: PKGBUILD 169739 2012-10-27 23:41:24Z eric $
# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
# Contributor: Kevin Piche <kevin@archlinux.org>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=bzflag
pkgver=2.4.2
-pkgrel=1
+pkgrel=2
pkgdesc='Multiplayer 3D tank battle game'
url='http://bzflag.org/'
license=('LGPL')
options=('!libtool')
arch=('i686' 'x86_64')
depends=('curl' 'glew' 'glu' 'sdl')
+makedepends=('mesa') # glu requires <GL/gl.h>
source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 73b65af15..c28947f5c 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 169384 2012-10-20 09:31:33Z andyrtr $
+# $Id: PKGBUILD 169740 2012-10-27 23:41:30Z eric $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
@@ -18,7 +18,7 @@ pkgname=('calligra-filters'
'calligra-braindump'
'calligra-flow')
pkgver=2.5.3
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://www.calligra-suite.org/'
license=('FDL1.2' 'GPL2' 'LGPL')
diff --git a/extra/cinepaint/PKGBUILD b/extra/cinepaint/PKGBUILD
index 58326a439..9473111c1 100644
--- a/extra/cinepaint/PKGBUILD
+++ b/extra/cinepaint/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 168510 2012-10-13 05:14:52Z allan $
+# $Id: PKGBUILD 169741 2012-10-27 23:41:34Z eric $
# Maintainer: tobias [tobias.archlinux.org]
# Contributor: tobias [tobias.justdreams.de]
pkgname=cinepaint
pkgver=1.3
-pkgrel=4
+pkgrel=5
pkgdesc="Sophisticated graphics manipulation programm supporting > 8bit pictures"
arch=('i686' 'x86_64')
license=('LGPL' 'GPL' 'MIT')
diff --git a/extra/dvdauthor/PKGBUILD b/extra/dvdauthor/PKGBUILD
index 003bebf9a..99c3dc596 100644
--- a/extra/dvdauthor/PKGBUILD
+++ b/extra/dvdauthor/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165483 2012-08-20 17:27:32Z giovanni $
+# $Id: PKGBUILD 169742 2012-10-27 23:41:37Z eric $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Travis Willard <travisw@wmpub.ca>
# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
@@ -6,7 +6,7 @@
pkgname=dvdauthor
pkgver=0.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="DVD authoring tools"
arch=('i686' 'x86_64')
url="http://dvdauthor.sourceforge.net/"
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index edf3e6e19..6f900fb06 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165687 2012-08-29 09:08:38Z juergen $
+# $Id: PKGBUILD 169743 2012-10-27 23:41:39Z eric $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
pkgname=emacs
pkgver=24.2
-pkgrel=1
+pkgrel=2
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/emacs/emacs.html"
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index f6c195dd7..8cbd04764 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168516 2012-10-13 05:28:59Z allan $
+# $Id: PKGBUILD 169744 2012-10-27 23:41:41Z eric $
# Maintainer: tobias <tobias@archlinux.org>
# Contributor: Dominik Ryba <domryba@post.pl>
pkgname=enblend-enfuse
pkgver=4.0
-pkgrel=7
+pkgrel=8
pkgdesc="Intelligent blend tool for overlapping picture"
arch=("i686" "x86_64")
license=('GPL')
url="http://enblend.sourceforge.net"
depends=('openexr' 'glew' 'libxmi' 'freeglut' 'lcms' 'libpng' 'boost-libs')
-makedepends=('boost')
+makedepends=('boost' 'mesa')
replaces=('enblend')
conflicts=('enblend')
provides=('enblend')
diff --git a/extra/fyre/PKGBUILD b/extra/fyre/PKGBUILD
index f922b5fd9..061d99698 100644
--- a/extra/fyre/PKGBUILD
+++ b/extra/fyre/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168512 2012-10-13 05:22:49Z eric $
+# $Id: PKGBUILD 169745 2012-10-27 23:41:44Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=fyre
pkgver=1.0.1
-pkgrel=5
+pkgrel=6
pkgdesc="Rendering of the Peter de Jong map"
arch=('i686' 'x86_64')
url="http://fyre.navi.cx/"
diff --git a/extra/gegl/PKGBUILD b/extra/gegl/PKGBUILD
index 6d7acc87e..6e9cfd9ea 100644
--- a/extra/gegl/PKGBUILD
+++ b/extra/gegl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168518 2012-10-13 05:42:21Z allan $
+# $Id: PKGBUILD 169746 2012-10-27 23:41:47Z eric $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
pkgname=gegl
pkgver=0.2.0
-pkgrel=4
+pkgrel=5
pkgdesc="Graph based image processing framework"
arch=('i686' 'x86_64')
url="http://www.gegl.org/"
@@ -21,7 +21,7 @@ sha1sums=('764cc66cb3c7b261b8fc18a6268a0e264a91d573'
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < ${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff
+ patch -p1 < "${srcdir}/gegl-0.2.0-ffmpeg-0.11.diff"
./configure --prefix=/usr --with-sdl --with-openexr --with-librsvg \
--with-libavformat --with-jasper --disable-docs
make
diff --git a/extra/glew/PKGBUILD b/extra/glew/PKGBUILD
index 03a734f82..bb4cde357 100644
--- a/extra/glew/PKGBUILD
+++ b/extra/glew/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 168601 2012-10-13 11:47:03Z andyrtr $
+# $Id: PKGBUILD 169747 2012-10-27 23:41:49Z eric $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: SleepyDog
pkgname=glew
-pkgver=1.8.0
-pkgrel=2
+pkgver=1.9.0
+pkgrel=1
pkgdesc="The OpenGL Extension Wrangler Library"
arch=('i686' 'x86_64')
url="http://glew.sourceforge.net"
license=('BSD' 'MIT' 'GPL')
depends=('libxmu' 'libxi' 'glu')
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tgz)
-sha1sums=('641c6bb3f924ec786e1e6cf2b1b230f594e0f0e4')
+sha1sums=('9291f5c5afefd482c7f3e91ffb3cd4716c6c9ffe')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index e6e29aed9..c6c81350d 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 168523 2012-10-13 06:26:15Z allan $
+# $Id: PKGBUILD 169748 2012-10-27 23:41:52Z eric $
# Maintainer: Tobias Kieslich <tobias@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Dominik Ryba <domryba@post.pl>
pkgname=hugin
pkgver=2011.4.0
-pkgrel=6
+pkgrel=7
pkgdesc="A frontend to the panorama-tools"
arch=('i686' 'x86_64')
url="http://hugin.sourceforge.net/"
license=('GPL')
depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
-makedepends=('zip' 'cmake' 'boost' 'tclap')
+makedepends=('zip' 'cmake' 'boost' 'tclap' 'mesa')
install=hugin.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
gcc47.patch)
diff --git a/extra/ilmbase/PKGBUILD b/extra/ilmbase/PKGBUILD
index fd95d6f4f..fe1618f48 100644
--- a/extra/ilmbase/PKGBUILD
+++ b/extra/ilmbase/PKGBUILD
@@ -2,34 +2,34 @@
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=ilmbase
-pkgver=1.0.2
+pkgver=1.0.3
pkgrel=1
depends=('gcc-libs')
pkgdesc="Base libraries from ILM for OpenEXR"
arch=(i686 x86_64)
+url="http://www.openexr.com"
license=('custom')
options=('!libtool')
-source=(http://savannah.nongnu.org/download/openexr/$pkgname-$pkgver.tar.gz
- tests-compile-fixes.patch)
-url="http://www.openexr.com"
-md5sums=('26c133ee8ca48e1196fbfb3ffe292ab4'
- '2687ab9ac01b417ee5cf8c0174b72e43')
+source=(https://github.com/downloads/openexr/openexr/$pkgname-$pkgver.tar.gz
+ ilmbase-IexMath.patch)
+md5sums=('d99962ec7e2bfac0647aaabf6b91d5de'
+ '9c8efaf15f60bccf79749ec879657962')
build() {
- cd ${srcdir}/$pkgname-$pkgver
- patch -Np1 -i ${srcdir}/tests-compile-fixes.patch
+ cd "${srcdir}/$pkgname-$pkgver"
+ patch -p0 -i "${srcdir}/ilmbase-IexMath.patch"
./configure --prefix=/usr
make
}
check() {
- cd ${srcdir}/$pkgname-$pkgver
+ cd "${srcdir}/$pkgname-$pkgver"
# one of the tests fails randomly for an unknown reason
make check || true
}
package() {
- cd ${srcdir}/$pkgname-$pkgver
- make DESTDIR=${pkgdir} install
- install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
+ cd "${srcdir}/$pkgname-$pkgver"
+ make DESTDIR="${pkgdir}" install
+ install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
diff --git a/extra/ilmbase/ilmbase-IexMath.patch b/extra/ilmbase/ilmbase-IexMath.patch
new file mode 100644
index 000000000..546034966
--- /dev/null
+++ b/extra/ilmbase/ilmbase-IexMath.patch
@@ -0,0 +1,12 @@
+--- IexMath/IexMathFpu.cpp.orig 2012-07-26 20:51:55.000000000 +0200
++++ IexMath/IexMathFpu.cpp 2012-10-04 15:30:47.000000000 +0200
+@@ -27,8 +27,7 @@
+ #endif
+
+
+-#ifdef HAVE_UCONTEXT_H
+-
++#if defined(HAVE_UCONTEXT_H) && (defined(x86_64) || defined(i386_))
+
+ #include <ucontext.h>
+ #include <signal.h>
diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD
index 812cdbb46..887383eaa 100644
--- a/extra/imagemagick/PKGBUILD
+++ b/extra/imagemagick/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 168520 2012-10-13 05:48:33Z eric $
+# $Id: PKGBUILD 169750 2012-10-27 23:41:58Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgbase=imagemagick
pkgname=('imagemagick' 'imagemagick-doc')
-pkgver=6.7.9.8
-pkgrel=2
+pkgver=6.8.0.3
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.imagemagick.org/"
license=('custom')
makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \
'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr')
-source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
+source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \
perlmagick.rpath.patch)
-sha1sums=('dc61335f931ea637e7bd2e711b520d221bfe464c'
+sha1sums=('3f3dfa63445081ece9a47825a2d692ca11d97cab'
'23405f80904b1de94ebd7bd6fe2a332471b8c283')
build() {
@@ -33,7 +33,7 @@ build() {
check() {
cd "${srcdir}"/ImageMagick-${pkgver%.*}-${pkgver##*.}
-# make check
+ make check
}
package_imagemagick() {
diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 6811af51b..420e93e58 100644
--- a/extra/inkscape/PKGBUILD
+++ b/extra/inkscape/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 169386 2012-10-20 09:31:39Z andyrtr $
+# $Id: PKGBUILD 169751 2012-10-27 23:42:02Z eric $
# Contributor: tobias <tobias@archlinux.org>
# Contributor: Tobias Kieslich <tobias@justdreams.de>
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=inkscape
pkgver=0.48.3.1
-pkgrel=6
+pkgrel=7
pkgdesc='Vector graphics editor using the SVG file format'
url='http://inkscape.sourceforge.net/'
license=('GPL' 'LGPL')
diff --git a/extra/kdelibs3/PKGBUILD b/extra/kdelibs3/PKGBUILD
index 22ae21842..b8e4ebbe7 100644
--- a/extra/kdelibs3/PKGBUILD
+++ b/extra/kdelibs3/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168525 2012-10-13 06:35:43Z eric $
+# $Id: PKGBUILD 169753 2012-10-27 23:42:09Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
pkgname=kdelibs3
pkgver=3.5.10
-pkgrel=14
+pkgrel=15
pkgdesc='KDE3 Core Libraries'
arch=('i686' 'x86_64')
url='http://www.kde.org'
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index f7a737f08..bf9a5c9eb 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169079 2012-10-17 18:31:25Z giovanni $
+# $Id: PKGBUILD 169731 2012-10-27 18:57:25Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2012.10.17
+pkgver=2012.10.24
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
url="http://live555.com/liveMedia"
depends=('gcc-libs')
source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('c9319c87a768c01f8007965db5453ca1')
+md5sums=('4cda836ab242a31eb1b117b1b05cc572')
build() {
cd ${srcdir}/live
diff --git a/extra/obex-data-server/PKGBUILD b/extra/obex-data-server/PKGBUILD
index 41737577b..938cb289d 100644
--- a/extra/obex-data-server/PKGBUILD
+++ b/extra/obex-data-server/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137991 2011-09-13 21:30:11Z eric $
+# $Id: PKGBUILD 169754 2012-10-27 23:42:12Z 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=2
+pkgrel=3
pkgdesc="A D-Bus service providing high-level OBEX client and server side functionality"
arch=('i686' 'x86_64')
url="http://wiki.muiline.com/obex-data-server"
@@ -16,13 +16,13 @@ source=("http://tadas.dailyda.com/software/${pkgname}-${pkgver}.tar.gz")
md5sums=('961ca5db6fe9c97024e133cc6203cc4d')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
--sysconfdir=/etc
make
}
package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 19d032381..9bc79f877 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168644 2012-10-13 18:33:04Z schiv $
+# $Id: PKGBUILD 169755 2012-10-27 23:42:14Z eric $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -6,14 +6,14 @@ pkgbase=opencv
pkgname=('opencv' 'opencv-docs' 'opencv-samples')
_realname=OpenCV
pkgver=2.4.2
-pkgrel=4
+pkgrel=5
pkgdesc="Open Source Computer Vision Library"
arch=('i686' 'x86_64')
license=('BSD')
url="http://opencv.org/"
depends=('jasper' 'gstreamer0.10-base' 'openexr>=1.7.0'
- 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
+ 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils' 'ilmbase>=1.0.3')
+makedepends=('cmake' 'python2-numpy' 'eigen2')
optdepends=('opencv-docs'
'opencv-samples'
'eigen2'
@@ -69,13 +69,6 @@ package_opencv() {
cd "$pkgdir/usr/share"
- # prepare FSH-friendly dirs
- #if [ -d OpenCV ]; then
- # mv opencv/samples OpenCV/
- # rm -r opencv
- # mv OpenCV opencv
- #fi
-
# separate docs package; also be -R friendly
[ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc"
diff --git a/extra/openexr/PKGBUILD b/extra/openexr/PKGBUILD
index 16b281613..55a64ac24 100644
--- a/extra/openexr/PKGBUILD
+++ b/extra/openexr/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168476 2012-10-12 12:47:54Z tpowa $
+# $Id: PKGBUILD 169756 2012-10-27 23:42:17Z eric $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=openexr
pkgver=1.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="An high dynamic-range image file format library"
url="http://www.openexr.com/"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ source=("https://github.com/downloads/${pkgname}/${pkgname}/${pkgname}-${pkgver}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 -i ${srcdir}/gcc43.patch
+ patch -p0 -i "${srcdir}/gcc43.patch"
./configure --prefix=/usr
make
}
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD
index 4b8e99ac5..64418b965 100644
--- a/extra/phonon/PKGBUILD
+++ b/extra/phonon/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149569 2012-02-08 14:44:08Z andrea $
+# $Id: PKGBUILD 169725 2012-10-27 10:50:17Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=phonon
pkgver=4.6.0
-pkgrel=2
+pkgrel=3
epoch=1
arch=('i686' 'x86_64')
url='http://phonon.kde.org/'
@@ -13,15 +13,18 @@ depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist')
optdepends=('pulseaudio: PulseAudio support')
makedepends=('cmake' 'automoc4' 'pulseaudio' 'qtwebkit')
source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
- 'fix-plugindir-for-qt-app.patch')
+ 'fix-plugindir-for-qt-app.patch'
+ 'fix-qmake.patch')
md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
- 'e37d67038c2501f25ac7ee7c2de54a9a')
+ 'e37d67038c2501f25ac7ee7c2de54a9a'
+ 'c17d8617e9482f02b3e098842946b679')
build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
+ patch -p1 -i "${srcdir}"/fix-qmake.patch
+ cd ../
- cd "${srcdir}"
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
@@ -34,6 +37,6 @@ build() {
}
package(){
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
}
diff --git a/extra/phonon/fix-qmake.patch b/extra/phonon/fix-qmake.patch
new file mode 100644
index 000000000..2add588d4
--- /dev/null
+++ b/extra/phonon/fix-qmake.patch
@@ -0,0 +1,27 @@
+From: Oswald Buddenhagen <ossi@kde.org>
+Date: Sat, 27 Oct 2012 07:58:16 +0000
+Subject: remove unnecessary if() statement
+X-Git-Url: http://quickgit.kde.org/?p=phonon.git&amp;a=commitdiff&amp;h=a8c431494d2a6f3785c132f14d00d38ea0e5b328
+---
+remove unnecessary if() statement
+
+as it happens, this works around a qmake breakage relating to parsing if()
+
+BUG: 295037
+FIXED-IN: 4.6.1
+---
+
+
+--- a/qt_phonon.pri
++++ b/qt_phonon.pri
+@@ -3,7 +3,7 @@
+ # the next build of Qt. So pretend we're not there in this case.
+ # This file is loaded by qt_config.prf, before .qmake.cache has been loaded.
+ # Consequently, we have to do some stunts to get values out of the cache.
+-if(!exists($$_QMAKE_CACHE_)| \
+- !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
++!exists($$_QMAKE_CACHE_)| \
++ !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \
+ QT_CONFIG += phonon
+
+
diff --git a/extra/psiconv/PKGBUILD b/extra/psiconv/PKGBUILD
index dff1ba5b2..5bb1cbfa8 100644
--- a/extra/psiconv/PKGBUILD
+++ b/extra/psiconv/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143959 2011-11-30 22:26:38Z giovanni $
+# $Id: PKGBUILD 169757 2012-10-27 23:42:19Z eric $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=psiconv
pkgver=0.9.8
-pkgrel=9
+pkgrel=10
pkgdesc="Converts Psion 5(MX) files to more commonly used file formats"
arch=('i686' 'x86_64')
url="http://software.frodo.looijaard.name/psiconv/"
@@ -17,7 +17,7 @@ source=("http://software.frodo.looijaard.name/${pkgname}/files/${pkgname}-${pkgv
md5sums=('8d7548e3c6b9cd408544736133728acd')
build() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man
@@ -25,6 +25,6 @@ build() {
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
}
diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 32396dba4..e82b9666d 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 137995 2011-09-13 21:30:18Z eric $
+# $Id: PKGBUILD 169758 2012-10-27 23:42:22Z 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=2
+pkgrel=3
pkgdesc="Translates PostScript and PDF graphics into other vector formats"
arch=('i686' 'x86_64')
url="http://www.pstoedit.net/"
diff --git a/extra/transcode/PKGBUILD b/extra/transcode/PKGBUILD
index d750d6db4..0ac14ee1f 100644
--- a/extra/transcode/PKGBUILD
+++ b/extra/transcode/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 163161 2012-07-08 09:32:37Z ibiru $
+# $Id: PKGBUILD 169759 2012-10-27 23:42:25Z 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=5
+pkgrel=6
pkgdesc="A video/DVD ripper and encoder for the terminal/console"
arch=('i686' 'x86_64')
url="http://tcforge.berlios.de/"
@@ -23,7 +23,7 @@ sha1sums=('e35df68b960eb56ef0a59a4cdbed1491be56aee6'
'd93ff3578dd5f722c8f4ef16bc0903eec5781a0d'
'fa05aa1770d9350d90b7cf315aa7c4a1fd921ac7'
'591943a33235342a66c3df0625a164a1479c09ae'
- '765dacce5ee463adf5c124556d68bb873ef436c6')
+ '3d2dcdc23f14938e87d14cfc03000bb3b649b85e')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/transcode/ffmpeg-0.11.patch b/extra/transcode/ffmpeg-0.11.patch
index 24beb1069..b5601fe2f 100644
--- a/extra/transcode/ffmpeg-0.11.patch
+++ b/extra/transcode/ffmpeg-0.11.patch
@@ -128,3 +128,14 @@ diff -Naur transcode-1.1.7/libtc/tcavcodec.h fixed-tc/libtc/tcavcodec.h
avcodec_register_all(); \
TC_UNLOCK_LIBAVCODEC; \
} while (0)
+--- transcode-1.1.7/export/export_ffmpeg.c.orig 2012-10-19 23:25:16.442303175 -0400
++++ transcode-1.1.7/export/export_ffmpeg.c 2012-10-19 23:26:23.904268733 -0400
+@@ -1249,7 +1249,7 @@
+ return TC_EXPORT_ERROR;
+ }
+
+- if (lavc_venc_context->codec->encode == NULL) {
++ if (lavc_venc_context->codec->encode2 == NULL) {
+ tc_log_warn(MOD_NAME, "could not open FFMPEG codec "
+ "(lavc_venc_context->codec->encode == NULL)");
+ return TC_EXPORT_ERROR;
diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD
index 682321d85..e511a998f 100644
--- a/extra/xine-lib/PKGBUILD
+++ b/extra/xine-lib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168614 2012-10-13 11:49:44Z andyrtr $
+# $Id: PKGBUILD 169760 2012-10-27 23:42:28Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=xine-lib
pkgver=1.2.2
-pkgrel=2
+pkgrel=3
pkgdesc="A multimedia playback engine"
arch=('i686' 'x86_64')
url="http://www.xine-project.org"
diff --git a/libre/iceape-i18n/PKGBUILD b/libre/iceape-i18n/PKGBUILD
index 78ac80d82..6aaa1aa04 100644
--- a/libre/iceape-i18n/PKGBUILD
+++ b/libre/iceape-i18n/PKGBUILD
@@ -11,7 +11,7 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceape
-_debver=2.7.9
+_debver=2.7.10
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ pkgbase=iceape-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=2.7.9
+_pkgver=2.7.10
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -58,26 +58,26 @@ package_iceape-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('9ac6e3351e0d3d32e351a359e4f91062'
- '9c2e0cbcd9759554d78fd050c2c30fa7'
- '0ebf63ad1eeb338bc87f1abd34bc59e4'
- '70c3e008980aad34875c62a8c4d1857a'
- '7811bc669dd7f2ba73331b3b65258d2b'
- 'd50a27578ea43b9cc926e7cae5ef4b6f'
- '9afe72fe36fe5da2c1246d19e43e8158'
- '9a7b0c16665e4b7b6ea20267cb7dfeaf'
- 'd79e0f519763edb4c9c88528241c49f4'
- '714f8c028b633e25be32c0c60f5d4ee9'
- 'b84f5f9616b37c4f6b868255d214b029'
- '5725445a70d4e6e1f18438e6b164eaa0'
- '839ea776b1d21990bcaf67bfefbbdeeb'
- '14b20bf9388eb918ed094836306ea424'
- '0fcc5b00ad23e2fd823b6e32a4d5fa86'
- 'd9ee55e4b53d182be6ecda64bac3686b'
- '44d6a193b3c3b6a95898a455ff8d092a'
- 'ebe5a81f03658b44c301a15ba2a7c7e4'
- '8c4c87c2e944f850b7f6561c866bef0d'
- '8072fd0512358da3bd679afb0f7b5d68'
- '292b42caa14502f420bc400291af075d'
- 'cbe874781488f0b95f4a84bb33b3e4c2'
- 'faabe8d25b70381d6620716450203cdf')
+md5sums=('6499aa420d5fa855a3884c657066c443'
+ 'c4b98806b5a6cce75878bdf0668f5a4a'
+ 'ac1a19ed29bda42f66e533ca9ee79fac'
+ '6116bd1b7c51d9414c68e1807d264f35'
+ '621dc719068050b479ad0fb9060d39e6'
+ 'b184194c4e69dc00ee9f3b15dee71d92'
+ '84058513ab8884d0f279aa2990c10327'
+ '5be7810ca391eb31d26f5ab46c2f8fea'
+ '58737d11a2c0852d6701549d22f071b6'
+ 'ac5994cd318ca2692823f91908eee101'
+ '5a07c756674b24b0b33af1e26a8e59ee'
+ '9178d335fa9f998f157a2e7f27384b15'
+ '2e40229a1ef5386574d98b243260f266'
+ 'ff8c27d6afc9911af03737c23a0eae5d'
+ '611702c6dd5638154ff8a5c99e909da0'
+ '217fd6fd1e46eefb524457566f124074'
+ '09bb4d6d36403f97b923625055767884'
+ 'cebd80d880c87862d9a8baf97c3c5b7b'
+ '023750f204d9f0ac89c62987b41532f4'
+ '0d753213210d92a8f751b3221fe34dad'
+ '4b180802effa63316c54e5ec904405c7'
+ '8be48ada576dfd9a37e6b3c0bc55c298'
+ 'af08b7f96b175c560bba71ab59e1a3dc')
diff --git a/libre/iceape-libre/PKGBUILD b/libre/iceape-libre/PKGBUILD
index 69711ed71..eedd8f584 100644
--- a/libre/iceape-libre/PKGBUILD
+++ b/libre/iceape-libre/PKGBUILD
@@ -3,7 +3,7 @@
# We're getting this from Debian Sid
_debname=iceape
-_debver=2.7.9
+_debver=2.7.10
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -29,8 +29,8 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
${_pkgname}-2.0-lang.patch
clrf.patch
libre.patch)
-md5sums=('5fb6b60dd8a87057c04fd8ff5251883b'
- '0412e9645fc06264955b78613cea0e4b'
+md5sums=('63596601fd01000c842d9543ea8dfd56'
+ 'f8de6b9e1906c8349e8799f819503897'
'60ba9e8f2fafd20e41268af534a55ea7'
'7266333e31731af8bb50c2eca8d0bd26'
'25b6fe16ac24cd5c852213e5c1adb272'
diff --git a/libre/iceweasel-i18n/PKGBUILD b/libre/iceweasel-i18n/PKGBUILD
index 899c009f6..6fd6aaf03 100644
--- a/libre/iceweasel-i18n/PKGBUILD
+++ b/libre/iceweasel-i18n/PKGBUILD
@@ -9,18 +9,18 @@
# - Run 'make'. It will take care of everything else for you.
_debname=iceweasel
-_debver=16.0.1
+_debver=16.0.2
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-_langpacks=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
+_langpacks=(ach af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en-GB en-ZA eo es-AR es-CL es-ES es-MX et eu fa ff fi fr fy-NL ga-IE gd gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko ku lg lij lt lv mai mk ml mr nb-NO nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta-LK ta te th tr uk vi zh-CN zh-TW zu)
pkgbase=iceweasel-i18n
pkgname=($(for lang in ${_langpacks[@]}
do echo $pkgbase-$lang | tr A-Z a-z
done))
-_pkgver=16.0.1
+_pkgver=16.0.2
pkgver=${_debver}.${_debrel}
pkgrel=1
@@ -56,90 +56,91 @@ package_iceweasel-i18n-$(echo $lang | tr A-Z a-z)() {
"
done
-md5sums=('2f40a462c2850b50a604371e875fc47c'
- 'b49d42e9000a1163fd74d213624d8e86'
- '385aa5d0bb43d43abb5ccddaae45bdf6'
- 'fce90fb3c7fddc26aa50978182f8b831'
- '163277191a666f36a2885cf92a163961'
- 'e99bb607fd025990604e3229ce9aa8f6'
- '35dcd2dd926b6e87dda1c11405b66472'
- 'debafd1aeb232448241953c66b89e63b'
- 'd23722619bb0d7f94894d2357060f629'
- 'cad3e2bf6d1d97fc8dd76426591e4511'
- '72b529f4aa744b2368703c19080940f7'
- 'f0b1b1ee217230bd735c80b881657c92'
- '9335e2678d66366a03ddfb4028b5c15e'
- 'a173f9f07df4cc614e23694b0e2f3ca1'
- '5cd9492c24fe0476431ecb83dfa660ee'
- '9f7c84b8269c756ac9feb96e59e4c903'
- 'a7dc03ef8409f2da04fc3a0a52016631'
- '10e89e4953f1b9269e873345f03b867b'
- 'd893c8d240fc27a60b39f91f53a309cc'
- '34b2d538d41fdcfd01d34a7cfb147135'
- '1ce5f6b8a2e3e4921263d5af004f40bb'
- 'e59d36431f7f12eed4b7c89e2597fa6e'
- '68684fce0eb66875f6d64f93b2e5fb4f'
- 'ecbf294dc3ac7bc558969479b3619501'
- 'a6226b0ab4b404d5e15194b7fd613604'
- 'a7234e85380e6cb647026a40275416e9'
- '7b2877ea2915bdbabd2748ef4b180755'
- '2adee8f256369fe890445eeffcd361c6'
- 'd9b1853f350d4124e5ebc2561beb8814'
- 'df6fa75a7165973d426c7d74e6c06cee'
- '8ca0f965013836a32e4583da92149099'
- 'f007c9402015858a7a817be7f9038bbe'
- 'a7e87b3320cfea4d7b5d95b3f6769cd7'
- '05659f1784f63c55dfe6735823b2e23a'
- 'a08a8a2504a8b5f2e419ed9f969a32be'
- 'ce7d8708af5982b26d645b7cd7e5b33b'
- '77d7d6a32bffdcd46e8d4444f05b645d'
- '5fcf6fd003938edeea07be704c92de74'
- '8a83c45d55ee7b69cb895e33db3cfeb4'
- '561255aeb09362d5ed5b3c4bfdf8f293'
- '77f3d9c38dca64141d32babed3c4afb7'
- 'c30689f2cf263d4780bd106af2a68d0c'
- 'd25d040fd7d824f848b3b9a5fbddb446'
- '30af6b1339fdda31b1acffa87a914363'
- '582116acc9c6e38226bc8e256ab6bb9b'
- '51811e3139cc4e514cf3d8c29e468e7c'
- '987fab8eccf60ffbbb685e7af297030b'
- '60f217af071d95743aad066daadc1a95'
- '649e1a6e583aed2811427f3493b0aa74'
- '33ba3c51cff806110324d0f27a63848f'
- '8dbd143d46cc51b373f6b61f1a27d6f4'
- '3fb0bec111ccc6dabe6c785810c40620'
- 'fc71d03873e7e1d4099702c1ab24c6da'
- '775894f40a434b91f3489ff19f8237ee'
- '71416fc9bf41b2c6719bc0b3c55e7b7b'
- '30f988322526cfc25b15cb9179d69be4'
- '195a1099a613215160c8be5f63169ce3'
- 'b59a10c70e33920d08750b76349ae764'
- 'd9f0b1dd204b34a78faca8b0de73fe2a'
- 'dd3eae36828975d87477fe465406e1e6'
- 'f8fbcee8171a6f7e0e81f8e0e3a381df'
- 'd5e5b6d7f4018b34fe01980548221332'
- '7db06a1a09551d6ad943feb398affe57'
- '7e7e0ccae292b3423d5d1a5dd848abe0'
- '8397c0e05c04c6b054de4fe524a95c42'
- '89becfa004fb398d2409800f5fb15179'
- 'd90fbc489d9993177a36ae788f9f23ed'
- 'b5aa84fbfa8e7ab12417b23f003fb17e'
- 'faf8056065dcf815e9a305b2739d0063'
- '2e42ba1813720717da72041989c02880'
- 'a37d32a8cd3b8a5d4247527e6bc82380'
- 'd651717b27c2ffd4ce52d3c51b18dd85'
- '2cc13f741a6910db6c3d00e7c53fb575'
- '31755af06ea85ac187588076d20fa991'
- 'ff2ff3b748ef2dab4371897bfdc96dd4'
- '2f38fda847f928bee7fba4772360699b'
- '4e8c459c0c5d009c633e843a0420d113'
- '4ce85d3534267db686f7d8181c499f17'
- '465dd984f2f96407213c174ec832e51d'
- 'aade2355978099d9fc25d0aebb3add7f'
- 'c66934fca336e18aa90938b0bc5991d7'
- 'cc128b35d45e14047f769ee6f0c7af76'
- '2357b049d7a7eb241b1a86f359aaa576'
- '78f9371eb4c4c48a9ecd35f9e5c90461'
- '9c06a7d81fb49995b56a3dfb4c77db9d'
- '4af51a779abaa49a6bae6b90ccdb3fd8'
- '3ee205c981dcc548f3e501aa06167df4')
+md5sums=('7917e479db04573f738d25d9a57cb049'
+ 'ec1fadd5879ebbd7884b00c15e8148a8'
+ 'fc281450b90d5e7861ac4f555d5ea871'
+ '1fe8f0d56b76f2bd627627098813ace2'
+ 'fb3a5c73b806bbd7bd50a64a5894c831'
+ '84e222c9a5caa3cfd30b8c79cf49ae20'
+ '7a8b1160c2ac40dac7bb3ef788d7e2d0'
+ '3b974c5d14de638a36ee6b6e3a1fab94'
+ '6b40f968cd7c4a19ddc252fedf88dcbc'
+ 'd6f533690c8570150ea193e4784fa37e'
+ '75bcfbbacde730ec498345994d5da699'
+ '322971c545da5815bfaf9c9f5b380ea4'
+ '7da8514ff56ad89db85cf160bc02d8cc'
+ '8b748543ca637db910531f35fcc7eb1e'
+ '3a5188077b07d50a60c19a9be34fef2e'
+ 'c2f01b10da3a49049dadf13e7d62194b'
+ '97045cfea1caf0730557171a2dbc1384'
+ '969c813859367a254d7edbb16e323d62'
+ '479b9f915480af5c4cda1477bcc745f6'
+ '081f3d13f05b9d44d5bb2d7842998d68'
+ 'c527200432799e3a37180439074f7616'
+ '6b688e726d273c21bb08f9e09a3dae48'
+ 'b912eedaed384be13d99cbe769bb3683'
+ '9d828a0459fbb3997ade5a2c4bcfff35'
+ '67b79482d42d8057d0e66a8d00314efb'
+ 'da9661e6211765ca9d503d1ff0aaeec1'
+ 'e31f997e78fc2069b91a25cf71ee4a43'
+ '5207746c0154fc737d3bbeb5d468651b'
+ '191e284c168827fd4344f25c287f21d1'
+ 'ebcb9f2fb2571d045d3e19ee9d8cbb9f'
+ '81c5e660d89148f0ca7da1186f1cda3a'
+ 'ca8a2f10358da70d30c8a6af7bc44d54'
+ '8581d1f7e7e3a850d360e4da7506d166'
+ 'd4811aef8cdc90b6661a669ffad2ead8'
+ '41a9cd0e8ea9d71f4d82ac0f4e4911c0'
+ 'e00759dd17ea1647afe40c1b9f676187'
+ 'b145a19de88d7c62e319e5719cc079d5'
+ '817beaa2dab8f01cfcc5f034d537f97b'
+ '48257dba1a8ca1ccd9e75cf5d00819df'
+ '2036c221e16ea942795eae837a690615'
+ 'fc879e816fd4e831f47d14a3ed2442d7'
+ '1851131108d0f9665cddaf636c5de826'
+ '557c1a2d9176bde516c45112ae4632e8'
+ '9142dcd98b5ec1783d72ffcb1326aae7'
+ 'f4c0f20255fd7f715a923cd6f81301ca'
+ '1f65f925300b5e4317018d80d147fb46'
+ '955cba749d29a3608fb70e5914835f2b'
+ '7ad38d60e90f96404860ef281bddfe17'
+ 'd14126daf1067c19297ff1a94dc91e27'
+ 'a1e55184abcd990206c5c82d7445b53e'
+ '9e1eeb91fb680c4b09ed1439c8af4265'
+ 'b313eb3158561713f00eec0b3ff82739'
+ 'e42c798d9371109be8595653c87a96e6'
+ '499cb790565eb93e4387120815bc0d3f'
+ 'efed1f452372a569002282819f2828e8'
+ '6e6e1215ffcc77fbd5deac9b3856ecff'
+ '5905c1911035d9576e84791ac4416f23'
+ 'd7a49fa9daec5c4c403633e04ec03b49'
+ '58d91d27d4e9bb8106534bac2562c566'
+ '73fe09d52c99ede62bd8fd07c4780ee4'
+ '19eb3d4c88d80035645bbd6a992bf938'
+ '51a35fae949c997b5a300211a967d36d'
+ '579a02556b1200fc749600390dfb9d97'
+ '2d7f14c47a9b974a69bfb5f821c6f04b'
+ '8622ac1bb52fb56af89e26f2d2a98ffd'
+ 'f5073a3e7bbbc71184a29d567c3d0914'
+ '8979aaa64b9300ef245cb6368f1e3275'
+ '1444fd6ec5639b51fc4c15c3fc7d41ec'
+ '0eb171065c77b27c5aed4aa11fa2a6f4'
+ '4b2a490537405ceb2935225807d4bde9'
+ '69db8437023d658c5da0cf7388b1f579'
+ '8d6bf855d5070624268cc175f3e86a14'
+ '3edd9eea3d25fecb21787ce83499c994'
+ '3ab336a082a86f9c7df7a7873f40a6e9'
+ 'b798317e831b5b9a06161bdaf119ad4d'
+ 'e86a78e5bfcba6f45b9f0bbf42c5ad89'
+ '8f0a46cdd135c0d8858c409cbca4e9cd'
+ '0a78294d15ef47fb1916ca129c5348c0'
+ '625fb622c634c035f4b326928c776392'
+ '6b528ef1c3427e799d924b12a5e1fb39'
+ 'c790339622a85b5b307fb4a8fa496fe7'
+ '56021c871cce43c64bc6ddff5f794f31'
+ 'babbd7cde37d24463ea5d8a389abd512'
+ '6eb58fc54626a3b8d58c03f37dfc2ec1'
+ '782d556e773cb97298592fedabdc9a7f'
+ 'f2cf5e5a2b244d0afab2edd193209039'
+ '973c9e08c3329ba51625272db30d9d6c'
+ '28055c70eda06dcf371f0399dce94e8b')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 9c6da333a..c1beccdf9 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -8,7 +8,7 @@
pkgname=parabolaweb-utils
pkgver=`_get_pkgver`
-pkgrel=3
+pkgrel=4
pkgdesc="Utils for the Parabola website"
arch=('any')
url="https://projects.parabolagnulinux.org/parabolaweb.git/"
@@ -25,6 +25,7 @@ backup=('etc/conf.d/parabolaweb')
export pkgver
source=(git://parabolagnulinux.org/parabolaweb.git
+ parabolaweb-download
parabolaweb-update
parabolaweb-fcgi
parabolaweb.rc
@@ -37,16 +38,18 @@ build() {
package() {
cd "${srcdir}"
- install -Dm755 parabolaweb-update "${pkgdir}/usr/sbin/parabolaweb-update"
- install -Dm755 parabolaweb-fcgi "${pkgdir}/usr/sbin/parabolaweb-fcgi"
- install -Dm755 parabolaweb.rc "${pkgdir}/etc/rc.d/parabolaweb"
- install -Dm644 parabolaweb.service "${pkgdir}/usr/lib/systemd/system/parabolaweb.service"
- install -Dm644 parabolaweb.conf "${pkgdir}/etc/conf.d/parabolaweb"
+ install -Dm755 parabolaweb-download "${pkgdir}/usr/sbin/parabolaweb-download"
+ install -Dm755 parabolaweb-update "${pkgdir}/usr/sbin/parabolaweb-update"
+ install -Dm755 parabolaweb-fcgi "${pkgdir}/usr/sbin/parabolaweb-fcgi"
+ install -Dm755 parabolaweb.rc "${pkgdir}/etc/rc.d/parabolaweb"
+ install -Dm644 parabolaweb.service "${pkgdir}/usr/lib/systemd/system/parabolaweb.service"
+ install -Dm644 parabolaweb.conf "${pkgdir}/etc/conf.d/parabolaweb"
}
md5sums=('SKIP'
- 'dd05d6a4ea7cff7fdd789f59aeb9059a'
- '520e20b8bbca64042b3afa76b0bec55f'
- '1bce8fb832ad9e61cf8b96426ce843b5'
- '80ee438224b4d67677d0980d5bc57005'
- 'fb291168d3f57a85f82216c4e74c9ccf')
+ '01bed679a4fd768e720bfd0f3c7d6694'
+ 'a73063b14746720b77fdbab851f5c161'
+ 'd5294495f42df29d29519ebd0a8f6093'
+ 'cc15e153f99fba82e7bb032896f655c2'
+ 'a468016a7155b5da46521dcfc6428384'
+ '9b565ef07e44d395bf7a0e484e3d19d1')
diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download
new file mode 100644
index 000000000..823a18811
--- /dev/null
+++ b/libre/parabolaweb-utils/parabolaweb-download
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. /etc/conf.d/parabolaweb
+. /usr/bin/libremessages
+
+dir=$WEBDIR
+repo=git://parabolagnulinux.org/parabolaweb.git
+ref=master
+
+cd_safe() {
+ if ! cd "$1"; then
+ error "$(gettext "Failed to change to directory %s")" "$1"
+ plain "$(gettext "Aborting...")"
+ exit 1
+ fi
+}
+
+download_git() {
+ if [[ ! -d "$dir/.git" ]] ; then
+ msg2 "$(gettext "Cloning %s %s repo...")" "${repo}" "git"
+ if ! git clone "$repo" "$dir"; then
+ error "$(gettext "Failure while downloading %s %s repo")" "${repo}" "git"
+ plain "$(gettext "Aborting...")"
+ exit 1
+ fi
+ else
+ cd_safe "$dir"
+ # Make sure we are fetching the right repo
+ # if [[ "$repo" != "$(git config --get remote.origin.url)" ]] ; then
+ # error "$(gettext "%s is not a clone of %s")" "$dir" "$repo"
+ # plain "$(gettext "Aborting...")"
+ # exit 1
+ # fi
+ msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
+ if ! git pull origin "$ref"; then
+ # only warn on failure to allow offline builds
+ warning "$(gettext "Failure while updating %s %s repo")" "${repo}" "git"
+ fi
+ fi
+}
+
+main() {
+ [[ -d "${dir%/*}" ]] || mkdir -p "${dir%/*}"
+ download_git
+}
+
+main "$@"
diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
index b8ac5bf5e..45e17c4f2 100644
--- a/libre/parabolaweb-utils/parabolaweb-update
+++ b/libre/parabolaweb-utils/parabolaweb-update
@@ -2,39 +2,30 @@
set -e
. /etc/conf.d/parabolaweb
-
-
-_install_dir=${WEBDIR%/*}
-_gitname=${WEBDIR##*/}
-_gitroot=git://parabolagnulinux.org/parabolaweb.git
-_gitbranch=master
-
. /usr/bin/libremessages
-download() {
- msg "Connecting to GIT server...."
- cd "$_install_dir"
- if [[ -d ${_gitname} ]]; then
- msg2 "Updating existing tree"
- cd ${_gitname} && git pull ${_gitroot}
- else
- msg2 "Cloning tree"
- git clone ${_gitroot} ${_gitname}
- cd ${_gitname}
- fi
- git checkout ${_gitbranch}
- msg "GIT checkout done or server timeout"
+find_makefiles() {
+ pushd "$WEBDIR" > /dev/null
+ echo ./sitestatic
+ find . -name static -type d | while read dir; do
+ if [[ -e "$WEBDIR/$dir/Makefile" ]]; then
+ printf '%s\n' "$dir"
+ fi
+ done
}
clean() {
msg "Purging old .pyc files...."
- cd "$_install_dir/$_gitname"
+ cd "$WEBDIR"
find . -name '*.pyc' -delete
+ for dir in `find_makefiles`; do
+ make -C "$WEBDIR/$dir" clean
+ done
}
configure() {
msg "Checking configuration...."
- cd "$_install_dir/$_gitname"
+ cd "$WEBDIR"
if [[ ! -f local_settings.py ]]; then
msg2 "Configuration file missing, opening editor..."
cp local_settings.py.example local_settings.tmp.$$.py
@@ -52,33 +43,38 @@ configure() {
fi
}
-migrate() {
+update-database() {
msg "Updating database...."
+ cd "$WEBDIR"
msg2 "Running migrations...."
./manage.py migrate
msg2 "Loading fixtures...."
./manage.py loaddata */fixtures/*.json
}
+update-filesystem() {
+ msg "Updating filesystem..."
+ for dir in `find_makefiles`; do
+ msg2 "Updating $dir with GNU Make..."
+ make -C "$WEBDIR/$dir"
+ done
+ cd "$WEBDIR"
+ msg2 "Collecting static files..."
+ echo yes | ./manage.py collectstatic -l
+}
+
main() {
if [[ -z "$EDITOR" ]]; then
error 'Please set the $EDITOR variable'
exit 1
fi
- [[ ! -d "$_install_dir" ]] && mkdir "$_install_dir"
-
- download
+ parabolaweb-download
clean
configure
clean
- migrate
-
- msg "Checking media/admin_media symlink...."
- if [ ! -e media/admin-media ]; then
- rm media/admin_media
- ln -s /usr/lib/python2.7/site-packages/django/contrib/admin/media media/admin_media
- fi
+ update-database
+ update-filesystem
}
main "$@"
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 238121c0c..e080feb02 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -7,8 +7,8 @@
pkgbase=virtualbox-libre-modules-lts
pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.2
-pkgrel=1.2
+pkgver=4.2.4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh
index 87aefbff0..4c3c29e30 100755
--- a/libre/virtualbox-libre-modules-lts/build.sh
+++ b/libre/virtualbox-libre-modules-lts/build.sh
@@ -6,13 +6,11 @@ if (( $# != 1 )); then
exit 1
fi
-$1-i686-build
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
-$1-x86_64-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cu -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
makechrootpkg -r /var/lib/archbuild/$1-x86_64
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 7c8a53bb5..d48e9d9ab 100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,8 +6,8 @@
pkgbase=virtualbox-libre-modules
pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.2
-pkgrel=2
+pkgver=4.2.4
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh
index 87aefbff0..f798a615d 100755
--- a/libre/virtualbox-libre-modules/build.sh
+++ b/libre/virtualbox-libre-modules/build.sh
@@ -6,13 +6,11 @@ if (( $# != 1 )); then
exit 1
fi
-$1-i686-build
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
-$1-x86_64-build
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
makechrootpkg -r /var/lib/archbuild/$1-x86_64
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 9e1d74cac..54978ea3c 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-host-source'
'virtualbox-libre-guest-utils'
'virtualbox-libre-guest-source')
-pkgver=4.2.2
+pkgver=4.2.4
pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
@@ -58,7 +58,6 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'vboxweb.service'
'001-vboxdrv-reference.patch'
'002-change_default_driver_dir.patch'
- '003-remove_qt_fa_IR.patch'
'os_blag_64.png'
'os_blag.png'
'os_dragora_64.png'
@@ -79,7 +78,7 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'os_venenux.png'
'libre.patch'
'free-distros.patch')
-md5sums=('2b65dcd9649e56ac6338670b3fb4a14d'
+md5sums=('d1ec2d2a3f2f3f0b277dfe2c520c2e33'
'5f85710e0b8606de967716ded7b2d351'
'ed1341881437455d9735875ddf455fbe'
'58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
@@ -91,7 +90,6 @@ md5sums=('2b65dcd9649e56ac6338670b3fb4a14d'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'4f1692638d6740df4c4ad9766ba4e179'
'97e193f050574dd272a38e5ee5ebe62b'
- '866ce76a94fb22cc7b625e07e571f0ad'
'8538dba8686d7449cb481c9bae9d722a'
'545c925b46f2ac95e5f8ae407fad101a'
'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -113,9 +111,6 @@ md5sums=('2b65dcd9649e56ac6338670b3fb4a14d'
'85141ccd2621a8e004b8f55c9a1f83eb'
'c7b29fbf4c24a00e8646ca6dd73f38a1')
-#_extramodules=extramodules-3.5-LIBRE
-#_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
-
build() {
cd "VirtualBox-$pkgver"
@@ -169,7 +164,15 @@ build() {
package_virtualbox-libre() {
pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
- depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng')
+ depends=('curl'
+ 'libpng'
+ 'libvncserver'
+ 'libxcursor'
+ 'libxinerama'
+ 'libxml2'
+ 'libxmu'
+ 'sdl-libre'
+ 'virtualbox-libre-host-modules')
optdepends=('qt: VirtualBox GUI support'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-libre-sdk: Developer kit'
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 0d5f817e6..745723604 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,7 +6,7 @@
# We're getting this from Debian Experimental
_debname=iceweasel
-_debver=16.0.1
+_debver=16.0.2
_debrel=1
_debrepo=http://ftp.debian.org/debian/pool/main/
debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -30,8 +30,8 @@ options=('!emptydirs')
conflicts=('xulrunner')
provides=("xulrunner=${_debver}")
replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('33e50f7ddfa7274e5a3bd393c37fb3b3'
- 'ddfcf225ea0e3d7b4b377f4a63d5e8c4'
+md5sums=('4a4f19048e34f7f0a2d28adc351df1ed'
+ 'ee38477dd7ede1c32e559ee74139b5c9'
'f2f4f4a573f549e8b494e33b3ad226bc'
'27271ce647a83906ef7a24605e840d61'
'0a31239f1008038df5057982fe745dec')