Sat Apr 13 00:05:58 PDT 2013

12 files changed, 77 insertions, 166 deletions

diff --git a/community/fcitx-mozc/PKGBUILD b/community/fcitx-mozc/PKGBUILD
index 11c3384b2..9c2807e88 100644
--- a/community/fcitx-mozc/PKGBUILD
+++ b/community/fcitx-mozc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87458 2013-04-01 05:08:23Z fyan $
+# $Id: PKGBUILD 88116 2013-04-12 03:06:47Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 
@@ -12,8 +12,8 @@ _pkgbase=mozc
 pkgname=fcitx-mozc
 pkgdesc="Fcitx Module of A Japanese Input Method for Chromium OS, Windows, Mac and Linux (the Open Source Edition of Google Japanese Input)"
 pkgver=1.10.1390.102
-_patchver=${pkgver}.1
-pkgrel=1
+_patchver=${pkgver}.2
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/mozc/"
 license=('custom')
@@ -26,15 +26,14 @@ source=(http://mozc.googlecode.com/files/mozc-${pkgver}.tar.bz2
         http://downloads.sourceforge.net/pnsft-aur/jigyosyo-${_zipcoderel}.zip
         http://protobuf.googlecode.com/files/protobuf-${_protobuf_ver}.tar.bz2
         http://fcitx.googlecode.com/files/fcitx-mozc-${_patchver}.patch
+	mozc_1.10.1390.102_remove_warn_as_error.patch
 )
 
 build() {
   cd "$srcdir"
-  ln -sf `which python2` ./python
-  PATH="${srcdir}:${PATH}"
 
   #source /etc/profile.d/qt4.sh
-  
+
   # Update: Fix qt4 include path too
   # Fix compatibility with google-glog 0.3.3 (symbol conflict)
   #CFLAGS="${CFLAGS} -DFLAGS_log_dir=FLAGS_mozc_log_dir"
@@ -52,6 +51,13 @@ build() {
   sed -i 's|(qt_dir)/bin|(qt_dir)/lib/qt4/bin|' gui/*.gyp{,i}
   sed -i 's|(qt_dir_env)/bin|(qt_dir_env)/lib/qt4/bin|' gui/*.gyp{,i}
 
+  # Patch for gcc>=4.8
+  patch -p0 -i "${srcdir}/mozc_1.10.1390.102_remove_warn_as_error.patch"
+
+  # Adjust to use python2
+  find . -name  \*.py        -type f -exec sed -i -e "1s|python.*$|python2|"  {} +
+  find . -regex '.*\.gypi?$' -type f -exec sed -i -e "s|'python'|'python2'|g" {} +
+
   # Generate zip code seed
   msg "Generating zip code seed..."
   python2 dictionary/gen_zip_code_seed.py --zip_code="${srcdir}/KEN_ALL.CSV" --jigyosyo="${srcdir}/JIGYOSYO.CSV" >> data/dictionary_oss/dictionary09.txt
@@ -104,9 +110,9 @@ package() {
   install -m 644 data/images/unix/ui-properties.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-properties.png"
   install -m 644 data/images/unix/ui-tool.png "${pkgdir}/usr/share/fcitx/mozc/icon/mozc-tool.png"
 }
-
 md5sums=('ff1611354703cbaa76cd562007ba57e9'
          '63310f8bad30f528ba10a6574b807952'
          'bb9fa83c00dece4de5f92ca1773e2bc5'
          'a72001a9067a4c2c4e0e836d0f92ece4'
-         'b3e15acd43b41cb5383508250707292b')
+         '1d94b16b5379f0ccd9f4e372c59b8190'
+         '36689e236c97e570c1a8c98f947755bb')
diff --git a/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch
new file mode 100644
index 000000000..ff6e9f09b
--- /dev/null
+++ b/community/fcitx-mozc/mozc_1.10.1390.102_remove_warn_as_error.patch
@@ -0,0 +1,12 @@
+Index: gyp/common.gypi

+===================================================================

+--- gyp/common.gypi	(revision 151)

++++ gyp/common.gypi	(working copy)

+@@ -58,7 +58,6 @@

+     # warning_cflags will be shared with Mac and Linux.
+     'warning_cflags': [
+       '-Wall',
+-      '-Werror',
+       '-Wno-char-subscripts',
+       '-Wno-sign-compare',
+       '-Wno-deprecated-declarations',
diff --git a/community/instead/PKGBUILD b/community/instead/PKGBUILD
index 738cebc2a..001b3ccf2 100644
--- a/community/instead/PKGBUILD
+++ b/community/instead/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83203 2013-01-28 10:07:31Z spupykin $
+# $Id: PKGBUILD 88145 2013-04-12 13:33:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Peter Kosyh <p.kosyhgmail.com>
 
 pkgname=instead
-pkgver=1.8.3
+pkgver=1.9.0
 pkgrel=1
 pkgdesc="a quest interpreter"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('sdl_image' 'sdl_mixer' 'sdl_ttf' 'lua')
 optdepends=('instead-launcher: install and update INSTEAD games from net')
 source=(http://instead.googlecode.com/files/instead_${pkgver}.tar.gz)
-md5sums=('4ec9f3e9f3300ce5a01b0d2b98974868')
+md5sums=('c7082772f7cb972d825e8e183e9af90f')
 
 build() {
   cd "${srcdir}/instead-${pkgver}"
diff --git a/community/kradio/PKGBUILD b/community/kradio/PKGBUILD
deleted file mode 100644
index 66a5f20dc..000000000
--- a/community/kradio/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 83293 2013-01-28 23:02:36Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=kradio
-pkgver=4.0.7
-pkgrel=1
-arch=('x86_64' 'i686')
-license=('GPL2')
-pkgdesc='Comfortable KDE internet and AM/FM radio application'
-url='http://kradio.sourceforge.net/'
-depends=('kdebase-runtime' 'lirc-utils' 'libmms' 'ffmpeg')
-makedepends=('automoc4' 'cmake' 'boost')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/kradio4-$pkgver.tar.bz2"{,.asc})
-sha256sums=('53d1a706f08cfd5a405142cf34cf9c0b03397b03961936651dfae7206003959c'
-            'cc6e801e10dbb7971cd09f2083d9fad0dc20ffc59ce3301486a985b8718d0c97')
-
-build() {
-  cd "$srcdir"
-
-  mkdir build
-  cd build
-  cmake "../${pkgname}4-$pkgver" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/kradio/kradio.install b/community/kradio/kradio.install
deleted file mode 100644
index 364567b9d..000000000
--- a/community/kradio/kradio.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/kshutdown/PKGBUILD b/community/kshutdown/PKGBUILD
index d46b40b1b..e54f7026d 100644
--- a/community/kshutdown/PKGBUILD
+++ b/community/kshutdown/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84190 2013-02-13 13:42:33Z arodseth $
+# $Id: PKGBUILD 88132 2013-04-12 11:15:41Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kshutdown
-pkgver=3.0beta6
+pkgver=3.0beta7
 pkgrel=1
 pkgdesc='Shutdown Utility for KDE'
 arch=('x86_64' 'i686')
@@ -11,9 +11,9 @@ url='http://kshutdown.sourceforge.net/'
 license=('GPL')
 depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
-install='kshutdown.install'
+install="$pkgname.install"
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-source-$pkgver.zip")
-sha256sums=('dfe89f124e68ae3f5b859fc02ad4d37726b3e001ee6b02f1bb1f6281fbef45cf')
+sha256sums=('5de50c532a9fd2e65706376232b7e641b05bbc5f54677f06d27bce0e0f9825ac')
 
 build() {
   mkdir "$srcdir/build"
diff --git a/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch b/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch
deleted file mode 100644
index 3119e34ac..000000000
--- a/community/quagga/0001-doc-fix-makeinfo-errors-and-one-warning.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9e26f1c5a00c93b7a5dadb634d4452c769e48048 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 22 Mar 2013 11:54:44 +0200
-Subject: [PATCH] doc: fix makeinfo errors and one warning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 4afa50b added few lines that are syntactically incorrect
-with leading plus sign.
-
-Cc: Denis Ovsienko <infrastation@yandex.ru>
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- doc/ipv6.texi   | 4 ++--
- doc/quagga.texi | 6 +++---
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/doc/ipv6.texi b/doc/ipv6.texi
-index b6cc437..2482c1c 100644
---- a/doc/ipv6.texi
-+++ b/doc/ipv6.texi
-@@ -136,8 +136,8 @@ for the lowest preference possible.
- Default: 0
- @end deffn
- 
--+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {}
--+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {}
-+@deffn {Interface Command} {ipv6 nd home-agent-lifetime <0-65520>} {}
-+@deffnx {Interface Command} {no ipv6 nd home-agent-lifetime [<0-65520>]} {}
- The value to be placed in Home Agent Option, when Home Agent config flag is set, 
- which indicates to hosts Home Agent Lifetime. The default value of 0 means to
- place the current Router Lifetime value.
-diff --git a/doc/quagga.texi b/doc/quagga.texi
-index ff913aa..b4105ac 100644
---- a/doc/quagga.texi
-+++ b/doc/quagga.texi
-@@ -1,13 +1,13 @@
- \input texinfo @c -*- texinfo -*-
-+@c Set variables - sourced from defines.texi
-+@include defines.texi
-+
- @c %**start of header
- @setchapternewpage odd
- @settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}}
- @setfilename quagga.info
- @c %**end of header
- 
--@c Set variables - sourced from defines.texi
--@include defines.texi
--
- @c automake will automatically generate version.texi
- @c and set EDITION, VERSION, UPDATED and UPDATED-MONTH
- @include version.texi
--- 
-1.8.2
-
diff --git a/community/quagga/PKGBUILD b/community/quagga/PKGBUILD
index 5167a45b6..3a350e3ed 100644
--- a/community/quagga/PKGBUILD
+++ b/community/quagga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87783 2013-04-06 13:02:55Z seblu $
+# $Id: PKGBUILD 88141 2013-04-12 12:11:57Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=quagga
-pkgver=0.99.22
-pkgrel=3
+pkgver=0.99.22.1
+pkgrel=1
 pkgdesc='BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite'
 arch=('i686' 'x86_64')
 url='http://www.quagga.net'
@@ -19,9 +19,8 @@ source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar
         'ospfd.service'
         'ripd.service'
         'ripngd.service'
-        'zebra.service'
-        '0001-doc-fix-makeinfo-errors-and-one-warning.patch')
-md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
+        'zebra.service')
+md5sums=('d9ab848661720d6da2551c7a4a19c731'
          '87bf4ae8aca3b3cf70e3986bc669aa78'
          '9b14110bed4982baa801808db6ac9135'
          'b685b5c12637cb963e1fb78ecd926e14'
@@ -29,8 +28,7 @@ md5sums=('3057bf3a91116a1017dd0df7e5e8ef93'
          '4d95a4af1ddb4ae21b867bebbedc77d5'
          '7e33c2a2e1c12309ba28d75a34294ed0'
          '6c682c0cd06c109bc10d29c1d9af3e38'
-         '18964536b7ed012aa5b22f2fa9fb3e87'
-         '214ed8ae0d58d080dcba9a176a94eb51')
+         '18964536b7ed012aa5b22f2fa9fb3e87')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 2ca7ffe45..f4e3a4b08 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85517 2013-03-02 12:31:53Z arodseth $
+# $Id: PKGBUILD 88149 2013-04-12 13:59:38Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=3.2.5
+pkgver=3.3.1
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('x86_64' 'i686')
@@ -15,13 +15,11 @@ license=('custom:scite')
 depends=('desktop-file-utils' 'gtk2')
 makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
-install=$pkgname.install
+install="$pkgname.install"
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('ac3ca9588bb23ef21da2e22f6ef21416bbd7bf6957130a8e4057b3e5f3c58bef')
-
-build() {
-  cd "$srcdir"
+sha256sums=('96f1b74f728375e405a39f210b34dfabbbd2654b9c30ba886d8c3b4acbafc717')
 
+prepare() {
   if [ $?CXXBASEFLAGS == 1 ]; then 
     sed '0,/CXXTFLAGS=/s//nop=/' -i scite/gtk/makefile
     setconf scite/gtk/makefile CXXTFLAGS "-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)"
@@ -31,10 +29,11 @@ build() {
     "-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)"
   setconf scintilla/gtk/makefile CXXBASEFLAGS \
     "-Wno-missing-braces -Wno-char-subscripts ${CXXFLAGS} -DGTK -DSCI_LEXER \$(INCLUDEDIRS)"
-  cd "$srcdir/scintilla/gtk"
-  make
-  cd "$srcdir/$pkgname/gtk"
-  make
+}
+
+build() {
+  make -C "$srcdir/scintilla/gtk"
+  make -C "$srcdir/$pkgname/gtk"
 }
 
 package() {
diff --git a/community/sfml/PKGBUILD b/community/sfml/PKGBUILD
index 8856014b4..2cd8af622 100644
--- a/community/sfml/PKGBUILD
+++ b/community/sfml/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78941 2012-10-27 23:45:33Z ebelanger $
+# $Id: PKGBUILD 88118 2013-04-12 07:50:02Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Ondrej Martinak <omartinak@gmail.com>
 
 pkgname=sfml
-pkgver=2.0rc1
-pkgrel=3
+pkgver=2.0
+pkgrel=1
 pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API'
 arch=('i686' 'x86_64')
 url='http://www.sfml-dev.org/'
@@ -12,22 +12,23 @@ license=('zlib')
 depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2')
 makedepends=('mesa' 'cmake' 'doxygen')
 install=sfml.install
-source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc")
-md5sums=('03c8e6817f4525092b94a3d44e8eada8')
+source=("https://github.com/LaurentGomila/SFML/archive/2.0.tar.gz")
+md5sums=('294fd8563a319e06f68bbca0eedc905e')
 
 build() {
-  cd "$srcdir"/Laurent*
+  cd "$srcdir"/SFML-${pkgver}
 
   mkdir build && cd build
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .. \
-        -DBUILD_DOC=true \
-        -DBUILD_EXAMPLES=true
+  cmake .. \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DSFML_BUILD_EXAMPLES=true \
+      -DSFML_BUILD_DOC=true
   make
   make doc
 }
 
 package() {
-  cd "$srcdir"/Laurent*/build
+  cd "$srcdir"/SFML-${pkgver}/build
 
   make DESTDIR="$pkgdir/" install
 
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 2f9772d2d..dd6ecae95 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 87866 2013-04-08 09:34:56Z tpowa $
+# $Id: PKGBUILD 88157 2013-04-12 15:58:47Z seblu $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.10
-pkgrel=3
+pkgver=4.2.12
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index e36fd36e4..3941dbe84 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 87865 2013-04-08 09:34:55Z tpowa $
+# $Id: PKGBUILD 88161 2013-04-12 16:17:46Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.10
-_extramodules=extramodules-3.8-ARCH
-pkgrel=4
+pkgver=4.2.12
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -17,7 +16,7 @@ makedepends=('linux-headers'
              'bc')
 
 build() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  _kernver=$(expac -Q '%v' linux-headers)-ARCH
 
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
@@ -31,7 +30,8 @@ build() {
 }
 
 package_virtualbox-host-modules(){
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _extraver=extramodules-${_kernver%.*}-ARCH
 
   pkgdesc='Host kernel modules for VirtualBox'
   depends=("linux>=${_kernver%.*}" "linux<$(echo "${_kernver%.*}+0.1"|bc)")
@@ -39,15 +39,16 @@ package_virtualbox-host-modules(){
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-host-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install"
 }
 
 package_virtualbox-guest-modules(){
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+  _kernver=$(expac -Q '%v' linux-headers)-ARCH
+  _extraver=extramodules-${_kernver%.*}-ARCH
 
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
@@ -56,11 +57,11 @@ package_virtualbox-guest-modules(){
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" "$startdir/virtualbox-guest-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install"
 }
 
 # vim:set ts=2 sw=2 et: