summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/0ad/PKGBUILD4
-rw-r--r--community/bitcoin/PKGBUILD4
-rw-r--r--community/cclive/PKGBUILD4
-rw-r--r--community/cegui/PKGBUILD4
-rw-r--r--community/cinnamon/PKGBUILD13
-rw-r--r--community/cinnamon/fix-keyboard-settings.patch83
-rw-r--r--community/cppcheck/PKGBUILD10
-rw-r--r--community/easystroke/PKGBUILD8
-rw-r--r--community/electricsheep/PKGBUILD6
-rw-r--r--community/encfs/PKGBUILD4
-rw-r--r--community/fatrat/PKGBUILD19
-rw-r--r--community/fatrat/QTBUG-22829-workaround.diff12
-rw-r--r--community/freeorion/PKGBUILD18
-rw-r--r--community/gigi/PKGBUILD4
-rw-r--r--community/glob2/PKGBUILD4
-rw-r--r--community/glom/PKGBUILD4
-rw-r--r--community/gnash/PKGBUILD4
-rw-r--r--community/gnome-subtitles/PKGBUILD27
-rw-r--r--community/gnome-subtitles/fix-help.patch31
-rw-r--r--community/gource/PKGBUILD4
-rw-r--r--community/gpsdrive/PKGBUILD4
-rw-r--r--community/librime/PKGBUILD6
-rw-r--r--community/luxrays/PKGBUILD9
-rw-r--r--community/mapnik/PKGBUILD16
-rw-r--r--community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch36
-rw-r--r--community/mongodb/PKGBUILD4
-rw-r--r--community/mygui/PKGBUILD4
-rw-r--r--community/openimageio/PKGBUILD8
-rw-r--r--community/openshadinglanguage/PKGBUILD2
-rw-r--r--community/pdns/PKGBUILD13
-rw-r--r--community/performous/PKGBUILD4
-rw-r--r--community/picard/PKGBUILD8
-rw-r--r--community/pingus/PKGBUILD4
-rw-r--r--community/pinot/PKGBUILD4
-rw-r--r--community/pion/PKGBUILD4
-rw-r--r--community/python-pyopencl/PKGBUILD6
-rw-r--r--community/python2-tagpy/PKGBUILD48
-rw-r--r--community/schroot/PKGBUILD4
-rw-r--r--community/shotwell/PKGBUILD4
-rw-r--r--community/sigil/PKGBUILD4
-rw-r--r--community/smc/PKGBUILD4
-rw-r--r--community/spring/PKGBUILD4
-rw-r--r--community/springlobby/PKGBUILD6
-rw-r--r--community/stuntrally/PKGBUILD25
-rw-r--r--community/stuntrally/stuntrally.install8
-rw-r--r--community/wesnoth/PKGBUILD4
-rw-r--r--community/wt/PKGBUILD4
-rw-r--r--extra/akonadi/PKGBUILD4
-rw-r--r--extra/avogadro/PKGBUILD17
-rw-r--r--extra/avogadro/boost153.patch60
-rw-r--r--extra/barcode/PKGBUILD19
-rw-r--r--extra/barcode/barcode.install6
-rw-r--r--extra/boost/PKGBUILD12
-rw-r--r--extra/boost/boost-1.53.0-python3.patch (renamed from extra/boost/boost-1.52.0-python3.patch)0
-rw-r--r--extra/ekiga/PKGBUILD4
-rw-r--r--extra/enblend-enfuse/PKGBUILD4
-rw-r--r--extra/hugin/PKGBUILD4
-rw-r--r--extra/kdeedu-kig/PKGBUILD7
-rw-r--r--extra/libkolabxml/PKGBUILD4
-rw-r--r--extra/libpst/PKGBUILD4
-rw-r--r--extra/libtorrent-rasterbar/PKGBUILD4
-rw-r--r--extra/licq/PKGBUILD6
-rw-r--r--extra/live-media/PKGBUILD6
-rw-r--r--extra/lyx/PKGBUILD6
-rw-r--r--extra/mkvtoolnix/PKGBUILD4
-rw-r--r--extra/source-highlight/PKGBUILD4
-rw-r--r--extra/vigra/PKGBUILD4
-rw-r--r--extra/xf86-video-savage/PKGBUILD11
-rw-r--r--extra/xf86-video-savage/git_fixes.diff64
-rw-r--r--extra/xsd/PKGBUILD4
-rw-r--r--pcr/openjdk6/PKGBUILD85
71 files changed, 522 insertions, 335 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD
index 8b99ab009..765c524df 100644
--- a/community/0ad/PKGBUILD
+++ b/community/0ad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 83239 2013-01-28 16:49:23Z stephane $
+# $Id: PKGBUILD 87402 2013-03-31 19:18:04Z stephane $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: t3ddy <t3ddy1988 "at" gmail {dot} com>
# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
pkgname=0ad
pkgver=a12
_pkgver=0.0.12-alpha
-pkgrel=2
+pkgrel=3
pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
arch=('i686' 'x86_64')
url="http://play0ad.com/"
diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index 12f5930c1..bfbf734f7 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86527 2013-03-18 17:04:57Z tredaelli $
+# $Id: PKGBUILD 87403 2013-03-31 19:18:05Z stephane $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: shahid <helllamer@gmail.com>
pkgbase=bitcoin
pkgname=('bitcoin-daemon' 'bitcoin-qt')
pkgver=0.8.1
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://www.bitcoin.org/"
makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
diff --git a/community/cclive/PKGBUILD b/community/cclive/PKGBUILD
index bfe9bec07..ac0471939 100644
--- a/community/cclive/PKGBUILD
+++ b/community/cclive/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84279 2013-02-15 14:08:16Z lfleischer $
+# $Id: PKGBUILD 87405 2013-03-31 19:18:08Z stephane $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: joyfulgirl@archlinux.us
# Contributor: nathan owe ndowens04 at gmail dot com
pkgname=cclive
pkgver=0.7.12
-pkgrel=1
+pkgrel=2
pkgdesc='Commandline downloader for popular video websites.'
arch=('i686' 'x86_64' 'mips64el')
url='http://cclive.sourceforge.net/'
diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD
index be9769642..636e4284c 100644
--- a/community/cegui/PKGBUILD
+++ b/community/cegui/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84404 2013-02-18 16:22:44Z svenstaro $
+# $Id: PKGBUILD 87406 2013-03-31 19:18:09Z stephane $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: William Rea <sillywilly@gmail.com>,
@@ -7,7 +7,7 @@
pkgbase=cegui
pkgname=('cegui' 'cegui-docs')
pkgver=0.7.9
-pkgrel=1
+pkgrel=2
pkgdesc="A free library providing windowing and widgets for graphics APIs/engines"
arch=('i686' 'x86_64' 'mips64el')
url="http://crayzedsgui.sourceforge.net"
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 41bd6698c..dacad0d41 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86852 2013-03-22 21:33:07Z faidoc $
+# $Id: PKGBUILD 87446 2013-03-31 19:54:32Z faidoc $
# Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
# Contributor: M0Rf30
# Contributor: unifiedlinux
@@ -6,7 +6,7 @@
pkgname=cinnamon
pkgver=1.7.3
-pkgrel=1
+pkgrel=2
pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
arch=('i686' 'x86_64' 'mips64el')
url="http://cinnamon.linuxmint.com/"
@@ -25,10 +25,12 @@ options=('!libtool' '!emptydirs')
install=${pkgname}.install
source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
"keyboard_applet.patch"
- "fix-control-center-check.patch")
+ "fix-control-center-check.patch"
+ "fix-keyboard-settings.patch")
md5sums=('c733e2a2280508aecf3ee010587e6743'
'2b1ece84416c3e4de030be15f1774d82'
- 'c3f25b06d345d9d36c197cd96e08f496')
+ 'c3f25b06d345d9d36c197cd96e08f496'
+ 'c36138eddde544b5c27b66d19451e7a5')
build() {
cd ${srcdir}/linuxmint-Cinnamon*
@@ -40,6 +42,9 @@ build() {
# Check for the cc-panel path, not for the unneeded binary
patch -Np1 -i ${srcdir}/fix-control-center-check.patch
+ # Fix Keyboard settings (https://bugs.archlinux.org/task/34472)
+ patch -Np1 -i ${srcdir}/fix-keyboard-settings.patch
+
./autogen.sh --prefix=/usr \
--sysconfdir=/etc \
diff --git a/community/cinnamon/fix-keyboard-settings.patch b/community/cinnamon/fix-keyboard-settings.patch
new file mode 100644
index 000000000..b606939c9
--- /dev/null
+++ b/community/cinnamon/fix-keyboard-settings.patch
@@ -0,0 +1,83 @@
+From 034f9c886a4b08e214193576b11fb97ba3d62922 Mon Sep 17 00:00:00 2001
+From: Lusito <core@roughael.net>
+Date: Sun, 10 Mar 2013 21:01:07 +0100
+Subject: [PATCH] fix for broken keyboard settings
+
+---
+ files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py | 2 +-
+ files/usr/lib/cinnamon-settings/modules/cs_keyboard.py | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py b/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py
+index b8842fe..cdccf46 100644
+--- a/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py
++++ b/files/usr/lib/cinnamon-settings/bin/SettingsWidgets.py
+@@ -9,7 +9,7 @@
+ import gettext
+ from gi.repository import Gio, Gtk, GObject, Gdk
+ from gi.repository import GdkPixbuf
+-# import gconf
++ from gi.repository import GConf
+ import json
+ import dbus
+ import time
+diff --git a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
+index 27a75ae..1ea8fd9 100644
+--- a/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
++++ b/files/usr/lib/cinnamon-settings/modules/cs_keyboard.py
+@@ -8,7 +8,7 @@
+ gettext.install("cinnamon", "/usr/share/cinnamon/locale")
+
+ # Keybindings page - check if we need to store custom
+-# keybindings to gsettings key as well as gconf (In Mint 14 this is changed)
++# keybindings to gsettings key as well as GConf (In Mint 14 this is changed)
+ CUSTOM_KEYS_BASENAME = "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings"
+ CUSTOM_KEYS_SCHEMA = "org.gnome.settings-daemon.plugins.media-keys.custom-keybinding"
+ CUSTOM_KEYBINDINGS_GSETTINGS = False
+@@ -160,7 +160,7 @@ def __init__(self, content_box):
+ first_run_completed = schema.get_boolean("custom-keybindings-to-3-6")
+
+ if CUSTOM_KEYBINDINGS_GSETTINGS and not first_run_completed:
+- gclient = gconf.client_get_default()
++ gclient = GConf.Client.get_default()
+ path = "/desktop/gnome/keybindings"
+ subdirs = gclient.all_dirs(path)
+ for subdir in subdirs:
+@@ -251,7 +251,7 @@ def setBinding(self, index, val):
+ self.writeSettings()
+
+ def writeSettings(self):
+- gclient = gconf.client_get_default()
++ gclient = GConf.Client.get_default()
+ gclient.set_string(self.path + "/name", self.label)
+ gclient.set_string(self.path + "/action", self.action)
+ gclient.set_string(self.path + "/binding", self.entries[0])
+@@ -537,7 +537,7 @@ def loadCustoms(self):
+ for category in self.main_store:
+ if category.int_name is "custom":
+ category.clear()
+- gclient = gconf.client_get_default()
++ gclient = GConf.Client.get_default()
+ path = "/desktop/gnome/keybindings"
+ subdirs = gclient.all_dirs(path)
+ for subdir in subdirs:
+@@ -645,7 +645,7 @@ def onAddCustomButtonClicked(self, button):
+ dialog.destroy()
+ return
+
+- gclient = gconf.client_get_default()
++ gclient = GConf.Client.get_default()
+ path = "/desktop/gnome/keybindings/custom"
+ i = 0
+ while gclient.dir_exists(path + str(i)):
+@@ -670,7 +670,7 @@ def onRemoveCustomButtonClicked(self, button):
+ keybindings, iter = self.kb_tree.get_selection().get_selected()
+ if iter:
+ keybinding = keybindings[iter][1]
+- gclient = gconf.client_get_default()
++ gclient = GConf.Client.get_default()
+ if gclient.dir_exists(keybinding.path):
+ gclient.unset(keybinding.path + "/name")
+ gclient.unset(keybinding.path + "/action")
+--
+1.8.1.5
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 46bba2d05..e32af2610 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 85339 2013-03-01 10:29:27Z andrea $
+# $Id: PKGBUILD 87448 2013-03-31 20:30:15Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgname=cppcheck
-pkgver=1.58
-pkgrel=2
+pkgver=1.59
+pkgrel=1
pkgdesc="A tool for static C/C++ code analysis"
arch=('i686' 'x86_64' 'mips64el')
url="http://cppcheck.wiki.sourceforge.net/"
@@ -11,7 +11,7 @@ license=('GPL')
depends=('pcre' 'qt4')
makedepends=('docbook-xsl')
source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('c7f597c600c30b1a5e9c6b3228a11e9872d562e5')
+sha1sums=('686effdfa6f2ca3369d7d52e54c6fd2db2d06d97')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -20,7 +20,7 @@ build() {
cd gui
export HAVE_RULES=yes
- qmake
+ qmake-qt4
make
}
diff --git a/community/easystroke/PKGBUILD b/community/easystroke/PKGBUILD
index a657d3cee..78ca9a910 100644
--- a/community/easystroke/PKGBUILD
+++ b/community/easystroke/PKGBUILD
@@ -2,17 +2,17 @@
# Contributor: Kevin Sullivan <ksullivan@archlinux.us>
pkgname=easystroke
-pkgver=0.5.6
-pkgrel=2
+pkgver=0.6.0
+pkgrel=1
pkgdesc='Use mouse gestures to initiate commands and hotkeys.'
arch=('i686' 'x86_64' 'mips64el')
url='http://easystroke.sourceforge.net/'
license=('custom:ISC')
-depends=('gtkmm' 'boost-libs' 'libxtst' 'dbus-glib' 'xorg-server')
+depends=('gtkmm3' 'boost-libs' 'libxtst' 'dbus-glib' 'xorg-server')
makedepends=('boost' 'inputproto' 'intltool' 'gettext' 'xorg-server-devel' 'help2man')
install=easystroke.install
source=("http://downloads.sourceforge.net/easystroke/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a9f06576a47deaf6f612bb993685af0f')
+md5sums=('3b4f25d02a6b5ac57a8b7a06545869db')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 7d6f29083..b045cc8d7 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84347 2013-02-16 22:50:26Z ioni $
+# $Id: PKGBUILD 87408 2013-03-31 19:18:11Z stephane $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=electricsheep
pkgver=2.7b33
-pkgrel=6
+pkgrel=7
pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet"
arch=('i686' 'x86_64' 'mips64el')
url="http://community.electricsheep.org/"
@@ -44,7 +44,7 @@ build() {
./autogen.sh
CPPFLAGS+="-I/usr/include/lua5.1" ./configure --prefix=/usr
sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile
- make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1"
+ make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" GLEE_LIBS="-lGLee"
}
package() {
diff --git a/community/encfs/PKGBUILD b/community/encfs/PKGBUILD
index 347f59027..d338ce110 100644
--- a/community/encfs/PKGBUILD
+++ b/community/encfs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83246 2013-01-28 16:49:32Z stephane $
+# $Id: PKGBUILD 87409 2013-03-31 19:18:12Z stephane $
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Sven Kauber, <celeon@gmail.com>
@@ -6,7 +6,7 @@
pkgname=encfs
pkgver=1.7.4
-pkgrel=9
+pkgrel=10
pkgdesc='Encrypted filesystem in user-space'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.arg0.net/encfs'
diff --git a/community/fatrat/PKGBUILD b/community/fatrat/PKGBUILD
index a4e19c4cc..6c45639ea 100644
--- a/community/fatrat/PKGBUILD
+++ b/community/fatrat/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 85341 2013-03-01 10:29:45Z andrea $
+# $Id: PKGBUILD 87410 2013-03-31 19:18:13Z stephane $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=fatrat
pkgver=1.2.0_beta2
-pkgrel=5
+pkgrel=6
pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
arch=('i686' 'x86_64' 'mips64el')
url="http://fatrat.dolezel.info/"
license=('GPL')
-depends=('gloox' 'libtorrent-rasterbar' 'pion' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
+depends=('gloox' 'libtorrent-rasterbar' 'pion' 'qtwebkit' 'curl')
+optdepends=('geoip: GeoIP support' 'java-runtime: Java plugins')
makedepends=('boost' 'cmake' 'java-environment')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz)
-md5sums=('ad823d2a81f0583316ece815b928c71b')
+source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz \
+ QTBUG-22829-workaround.diff)
+md5sums=('ad823d2a81f0583316ece815b928c71b'
+ '9c017f227437b8a72e92219ee6d58578')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # workaround the moc bug (QTBUG-22829) with new boost
+ patch -Np1 < "$srcdir/QTBUG-22829-workaround.diff" || true
+ # fix help generation with qt4
+ sed -s 's|qcollectiongenerator|qcollectiongenerator-qt4|' -i CMakeLists.txt
+
cmake \
-DWITH_EVERYTHING=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/community/fatrat/QTBUG-22829-workaround.diff b/community/fatrat/QTBUG-22829-workaround.diff
new file mode 100644
index 000000000..dc0ed0c3f
--- /dev/null
+++ b/community/fatrat/QTBUG-22829-workaround.diff
@@ -0,0 +1,12 @@
+diff -rup fatrat-1.2.0_beta2/CMakeLists.txt fatrat-1.2.0_beta2.new/CMakeLists.txt
+--- fatrat-1.2.0_beta2/CMakeLists.txt 2012-07-14 11:44:27.000000000 +0000
++++ fatrat-1.2.0_beta2.new/CMakeLists.txt 2013-03-25 16:21:03.143596960 +0000
+@@ -552,7 +552,7 @@ if(WITH_DOCUMENTATION)
+ )
+ endif(WITH_DOCUMENTATION)
+
+-qt4_wrap_cpp(fatrat_MOC_SRCS ${fatrat_MOC_HDRS})
++qt4_wrap_cpp(fatrat_MOC_SRCS ${fatrat_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED -DBOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
+
+ set(fatrat_RCS
+ gfx/resources.qrc
diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD
index c491ff590..6c13a2e3f 100644
--- a/community/freeorion/PKGBUILD
+++ b/community/freeorion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85311 2013-02-28 21:00:16Z arodseth $
+# $Id: PKGBUILD 87411 2013-03-31 19:18:15Z stephane $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Elmo Todurov <todurov@gmail.com>
# Contributor: guini <sidtrun@googlemail.com>
@@ -8,7 +8,7 @@
pkgname=freeorion
pkgver=0.4.2
-pkgrel=2
+pkgrel=4
pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
arch=('x86_64' 'i686')
url='http://www.freeorion.org/'
@@ -19,8 +19,8 @@ then
else
depends=('nvidia-cg-toolkit')
fi
-depends=('bullet>=2.81' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl')
-makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-12' 'graphviz' 'mesa-libgl'
+depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils' 'libgl')
+makedepends=('boost' 'ogre=1.8.1-4' 'sdl' 'gigi>0.8.0-18' 'graphviz' 'mesa-libgl'
'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion' 'libogg')
options=('!strip' '!emptydirs')
install=$pkgname.install
@@ -66,12 +66,12 @@ build() {
-G "Unix Makefiles"
msg2 'GLU fix...'
- setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
- "'-march=x86-64 -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
+ if [ "$CARCH" == "x86_64" ]
+ then
+ setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
+ "'-march=native -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU -rpath=/usr/lib '"
+ fi
- #msg2 'Boost fix...'
- #sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp
-
msg2 'Compiling...'
make -j1
diff --git a/community/gigi/PKGBUILD b/community/gigi/PKGBUILD
index ed430d7b6..1ee55cbb8 100644
--- a/community/gigi/PKGBUILD
+++ b/community/gigi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85249 2013-02-28 09:21:43Z arodseth $
+# $Id: PKGBUILD 87412 2013-03-31 19:18:16Z stephane $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: fana-m <geminin@gmx.net>
@@ -7,7 +7,7 @@
pkgname=gigi
pkgver=0.8.0
-pkgrel=18
+pkgrel=19
_fixedrevision=5780 #5407
pkgdesc='Small, efficient and feature rich GUI for OpenGL and C++ (freeorion fork)'
#url='http://gigi.sourceforge.net/'
diff --git a/community/glob2/PKGBUILD b/community/glob2/PKGBUILD
index e9ac32d0f..98c8c8c3c 100644
--- a/community/glob2/PKGBUILD
+++ b/community/glob2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85280 2013-02-28 12:06:25Z arodseth $
+# $Id: PKGBUILD 87413 2013-03-31 19:18:17Z stephane $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
pkgname=glob2
pkgver=0.9.4.4
-pkgrel=16
+pkgrel=17
pkgdesc='RTS game which minimizes micro-management by automatically assigning tasks to units'
arch=('x86_64' 'i686' 'mips64el')
url='http://www.globulation2.org/'
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 0b897d52d..29bdf76b6 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87025 2013-03-25 19:19:10Z bpiotrowski $
+# $Id: PKGBUILD 87414 2013-03-31 19:18:18Z stephane $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -6,7 +6,7 @@
pkgname=glom
pkgver=1.22.0
-pkgrel=4
+pkgrel=5
pkgdesc="An easy-to-use database designer and user interface"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.glom.org/"
diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index bd3f7d791..0eb992ba1 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83253 2013-01-28 16:49:39Z stephane $
+# $Id: PKGBUILD 87415 2013-03-31 19:18:19Z stephane $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=gnash
pkgname=(gnash-common gnash-gtk)
pkgver=0.8.10
-pkgrel=6
+pkgrel=7
arch=(i686 x86_64 mips64el)
url="http://www.gnu.org/software/gnash/"
license=(GPL3)
diff --git a/community/gnome-subtitles/PKGBUILD b/community/gnome-subtitles/PKGBUILD
index b2f9fc5d9..3e4363d8e 100644
--- a/community/gnome-subtitles/PKGBUILD
+++ b/community/gnome-subtitles/PKGBUILD
@@ -1,34 +1,31 @@
-# $Id: PKGBUILD 69058 2012-04-08 21:20:04Z bgyorgy $
+# $Id: PKGBUILD 87454 2013-03-31 21:57:58Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
pkgname=gnome-subtitles
-pkgver=1.2
-pkgrel=3
+pkgver=1.3
+pkgrel=1
pkgdesc="Video subtitle editor for GNOME"
arch=('i686' 'x86_64')
url="http://gnomesubtitles.org/"
license=('GPL')
-depends=('gstreamer0.10-base-plugins' 'gconf-sharp' 'gtkspell' 'desktop-file-utils')
+depends=('gst-plugins-base' 'gconf-sharp' 'gtkspell' 'desktop-file-utils')
makedepends=('intltool' 'gnome-doc-utils')
-optdepends=('gstreamer0.10-good-plugins: Extra media codecs'
- 'gstreamer0.10-bad-plugins: Extra media codecs'
- 'gstreamer0.10-ugly-plugins: Extra media codecs'
- 'gstreamer0.10-ffmpeg: Extra media codecs')
+optdepends=('gst-plugins-good: Extra media codecs'
+ 'gst-plugins-bad: Extra media codecs'
+ 'gst-plugins-ugly: Extra media codecs'
+ 'gst-libav: Extra media codecs')
options=('!libtool')
install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
- fix-help.patch)
-md5sums=('b7f3175b7a189471821d809171121d62'
- '7645bc18812ea52137adddd6e87942d5')
+source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('b0570134af6626d4e6c018c5f7774964')
build() {
cd "$srcdir/$pkgname-$pkgver"
- patch -Np1 -i "$srcdir/fix-help.patch"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --disable-static --disable-schemas-install --disable-scrollkeeper \
+ --disable-static --disable-schemas-install \
--with-gconf-schema-file-dir=/usr/share/gconf/schemas
- make
+ make -j1
}
package() {
diff --git a/community/gnome-subtitles/fix-help.patch b/community/gnome-subtitles/fix-help.patch
deleted file mode 100644
index e888bfb41..000000000
--- a/community/gnome-subtitles/fix-help.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0b66f14b812bb83ca149bc29906716c17f388da1 Mon Sep 17 00:00:00 2001
-From: Pedro Castro <pedro@gnomesubtitles.org>
-Date: Sat, 10 Mar 2012 11:32:28 +0000
-Subject: Fix #671567 (Fix opening help), based on a patch from György Balló.
-
-Fix keyboard shortcuts url.
----
-diff --git a/src/GnomeSubtitles/Core/EventHandlers.cs b/src/GnomeSubtitles/Core/EventHandlers.cs
-index 014fc54..6de82b0 100644
---- a/src/GnomeSubtitles/Core/EventHandlers.cs
-+++ b/src/GnomeSubtitles/Core/EventHandlers.cs
-@@ -392,15 +392,11 @@ public class EventHandlers {
- /* Help Menu */
-
- public void OnHelpContents (object o, EventArgs args) {
-- const string arg = "ghelp:gnome-subtitles";
-- if ((!Util.OpenUrl("gnome-help " + arg)) && (!Util.OpenUrl("yelp " + arg))) {
-- BasicErrorDialog errorDialog = new BasicErrorDialog(Catalog.GetString("The Gnome Subtitles Manual could not be found."), Catalog.GetString("Please verify that your installation has been completed successfully."));
-- errorDialog.Show();
-- }
-+ Util.OpenUrl("ghelp:gnome-subtitles");
- }
-
- public void OnHelpKeyboardShortcuts (object o, EventArgs args) {
-- Util.OpenUrl("http://gnome-subtitles.sourceforge.net/shortcuts");
-+ Util.OpenUrl("http://gnomesubtitles.org/shortcuts");
- }
-
- public void OnHelpRequestFeature (object o, EventArgs args) {
---
-cgit v0.9.0.2
diff --git a/community/gource/PKGBUILD b/community/gource/PKGBUILD
index e04878246..d72df1bab 100644
--- a/community/gource/PKGBUILD
+++ b/community/gource/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83364 2013-01-30 11:48:44Z svenstaro $
+# $Id: PKGBUILD 87416 2013-03-31 19:18:20Z stephane $
# 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.39
-pkgrel=1
+pkgrel=2
pkgdesc="software version control visualization"
license=(GPL3)
arch=(i686 x86_64 'mips64el')
diff --git a/community/gpsdrive/PKGBUILD b/community/gpsdrive/PKGBUILD
index 37fd51a52..56eef566e 100644
--- a/community/gpsdrive/PKGBUILD
+++ b/community/gpsdrive/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86225 2013-03-13 15:08:23Z spupykin $
+# $Id: PKGBUILD 87417 2013-03-31 19:18:21Z stephane $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
# Maintainer: damir <damir@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=gpsdrive
pkgver=2.11
_pkgver=20120928
-pkgrel=16
+pkgrel=17
pkgdesc="A car (bike, ship, plane) navigation system"
arch=("i686" "x86_64" 'mips64el')
url="http://www.gpsdrive.de/"
diff --git a/community/librime/PKGBUILD b/community/librime/PKGBUILD
index 2e0957917..9e9f3822d 100644
--- a/community/librime/PKGBUILD
+++ b/community/librime/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 83484 2013-02-02 03:46:07Z fyan $
+# $Id: PKGBUILD 87418 2013-03-31 19:18:22Z stephane $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: GONG Chen <chen dot sst at gmail dot com>
# Contributor: 網軍總司令
pkgname=librime
pkgver=0.9.8
-pkgrel=1
+pkgrel=2
pkgdesc="Rime input method engine"
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/rimeime/"
license=('GPL3')
-depends=('boost' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp0.3')
+depends=('boost' 'google-glog' 'kyotocabinet' 'opencc' 'yaml-cpp')
optdepends=('brise: Rime schema repository')
makedepends=('cmake')
source=("http://rimeime.googlecode.com/files/$pkgname-$pkgver.tar.gz")
diff --git a/community/luxrays/PKGBUILD b/community/luxrays/PKGBUILD
index b7821797a..166c74c70 100644
--- a/community/luxrays/PKGBUILD
+++ b/community/luxrays/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 85444 2013-03-01 18:09:53Z stativ $
+# $Id: PKGBUILD 87419 2013-03-31 19:18:23Z stephane $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=luxrays
pkgver=1.2
_pkgver=475fbf15f0ca
-pkgrel=1
+pkgrel=2
pkgdesc="Accelerate the ray intersection process by using GPUs"
arch=('i686' 'x86_64')
url="http://www.luxrender.net/"
license=('GPL')
depends=('freeimage' 'libcl' 'libgl')
-optdepends=('glew: slg, slg2, smallppmgpu' 'freeglut: slg, slg2, smallppmgpu')
+optdepends=('glew: demos (SmallLuxGPU etc.)' 'freeglut: demos (SmallLuxGPU etc.)'
+ 'boost-libs: demos (SmallLuxGPU etc.)')
makedepends=('cmake' 'boost' 'mesa' 'opencl-headers' 'glew' 'freeglut')
source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2)
-md5sums=('e7c24e8407514f2f2211ded105756b2a')
+md5sums=('ac98e9a42ecc20d97d4c12dcdf17e315')
build() {
cd "$srcdir/luxrender-$pkgname-$_pkgver"
diff --git a/community/mapnik/PKGBUILD b/community/mapnik/PKGBUILD
index f88963df0..2d1d0983e 100644
--- a/community/mapnik/PKGBUILD
+++ b/community/mapnik/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 87049 2013-03-26 11:49:43Z foutrelis $
+# $Id: PKGBUILD 87421 2013-03-31 19:18:26Z stephane $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: David Dent <thewinch@gmail.com>
# Contributor: orbisvicis <orbisvicis@gmail.com>
pkgname=mapnik
pkgver=2.1.0
-pkgrel=8
+pkgrel=9
pkgdesc="Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps"
arch=('i686' 'x86_64' 'mips64el')
url="http://mapnik.org/"
@@ -23,11 +23,17 @@ optdepends=('libxslt: Web Map Service'
'mod_wsgi2: Web Map Service')
makedepends=('scons' 'boost')
install="mapnik.install"
-source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2")
-md5sums=('d580c558a957444873bec9e24526b0a0')
+source=("https://github.com/downloads/mapnik/mapnik/mapnik-v$pkgver.tar.bz2"
+ "mapnik-2.1.0-compile-fix-for-boost-1.53.patch")
+md5sums=('d580c558a957444873bec9e24526b0a0'
+ 'fb456216b052742319428f65f1c979d6')
build() {
cd "$srcdir/$pkgname-v$pkgver"
+
+ # https://github.com/mapnik/mapnik/issues/1658
+ patch -Np1 -i "$srcdir/mapnik-2.1.0-compile-fix-for-boost-1.53.patch"
+
sed -i 's|lib64|lib|g' SConstruct
sed -i 's|python|python2|' \
utils/performance/mapnik-speed-check \
@@ -36,7 +42,7 @@ build() {
PREFIX="/usr" \
INPUT_PLUGINS=all \
DESTDIR="$pkgdir"
- scons
+ scons $MAKEFLAGS
}
package(){
diff --git a/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch b/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
new file mode 100644
index 000000000..00b37c08f
--- /dev/null
+++ b/community/mapnik/mapnik-2.1.0-compile-fix-for-boost-1.53.patch
@@ -0,0 +1,36 @@
+From cf70b9959a45b9ab6af4a34824a5e4e80ce1d05c Mon Sep 17 00:00:00 2001
+From: Dane Springmeyer <dane@dbsgeo.com>
+Date: Sun, 10 Feb 2013 07:24:35 -0800
+Subject: [PATCH] fix compile of json feature_collection grammar when building
+ against >= boost 1.52 - refs #1658 and #1716
+
+---
+ src/json/feature_collection_parser.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/json/feature_collection_parser.cpp b/src/json/feature_collection_parser.cpp
+index 3faeda7..51ad824 100644
+--- a/src/json/feature_collection_parser.cpp
++++ b/src/json/feature_collection_parser.cpp
+@@ -20,12 +20,17 @@
+ *
+ *****************************************************************************/
+
++// TODO https://github.com/mapnik/mapnik/issues/1658
++#include <boost/version.hpp>
++#if BOOST_VERSION >= 105200
++#define BOOST_SPIRIT_USE_PHOENIX_V3
++#endif
++
+ // mapnik
+ #include <mapnik/json/feature_collection_parser.hpp>
+ #include <mapnik/json/feature_collection_grammar.hpp>
+
+ // boost
+-#include <boost/version.hpp>
+ #include <boost/spirit/include/qi.hpp>
+ #include <boost/spirit/include/support_multi_pass.hpp>
+
+--
+1.8.1.5
+
diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index a1c60f59a..afa9019e0 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86909 2013-03-24 11:55:43Z fyan $
+# $Id: PKGBUILD 87422 2013-03-31 19:18:27Z stephane $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
pkgname=mongodb
pkgver=2.4.1
-pkgrel=1
+pkgrel=2
pkgdesc='A high-performance, open source, schema-free document-oriented database'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.mongodb.org'
diff --git a/community/mygui/PKGBUILD b/community/mygui/PKGBUILD
index 0654fb335..86ca0ac94 100644
--- a/community/mygui/PKGBUILD
+++ b/community/mygui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83261 2013-01-28 16:49:48Z stephane $
+# $Id: PKGBUILD 87423 2013-03-31 19:18:29Z stephane $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Andrew Belitsky <belitsky.a@gmail.com>
pkgbase=mygui
pkgname=('mygui' 'mygui-docs')
pkgver=3.2.0
-pkgrel=4
+pkgrel=5
pkgdesc="A multilayer and overlappable GUI System for OGRE"
arch=('i686' 'x86_64' 'mips64el')
url="http://mygui.info/"
diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD
index c9a74bf78..583bda8a4 100644
--- a/community/openimageio/PKGBUILD
+++ b/community/openimageio/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85378 2013-03-01 10:36:19Z andrea $
+# $Id: PKGBUILD 87425 2013-03-31 19:18:31Z stephane $
# Contributor: SpepS <dreamspepser at yahoo dot it>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=openimageio
-pkgver=1.1.7
-pkgrel=2
+pkgver=1.1.8
+pkgrel=1
pkgdesc="A library for reading and writing images, including classes, utilities, and applications"
arch=(i686 x86_64)
url="http://www.openimageio.org/"
@@ -14,7 +14,7 @@ makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa')
optdepends=('qt4: iv image viewer'
'python2: bindings support')
source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver)
-md5sums=('5fafac9b5f9f7edc9bd0507477c12e0d')
+md5sums=('2d816e0ff48f12dfc0491d39a4918456')
build() {
cd "$srcdir"/$_pkgname*
diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD
index 853c15ac9..1070ca369 100644
--- a/community/openshadinglanguage/PKGBUILD
+++ b/community/openshadinglanguage/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=openshadinglanguage
pkgver=1.3.0
-pkgrel=2
+pkgrel=3
pkgdesc="Advanced shading language for production GI renderers"
arch=(i686 x86_64)
url="http://code.google.com/p/openshadinglanguage/"
diff --git a/community/pdns/PKGBUILD b/community/pdns/PKGBUILD
index 813e8d534..d42718ede 100644
--- a/community/pdns/PKGBUILD
+++ b/community/pdns/PKGBUILD
@@ -1,21 +1,21 @@
-# $Id: PKGBUILD 87014 2013-03-25 19:16:55Z bpiotrowski $
+# $Id: PKGBUILD 87427 2013-03-31 19:18:34Z stephane $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
pkgname=pdns
pkgver=3.2
-pkgrel=4
+pkgrel=5
pkgdesc='Modern, advanced and high performance authoritative-only nameserver'
arch=('x86_64' 'i686' 'mips64el')
url='http://www.powerdns.com/'
license=('GPL')
-depends=('gcc-libs' 'zlib' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua51' 'boost-libs')
+depends=('boost-libs' 'gcc-libs' 'postgresql-libs' 'libmariadbclient' 'sqlite' 'libldap' 'lua51')
makedepends=('boost')
provides=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
replaces=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
conflicts=('pdns-ldap' 'pdns-mysql' 'pdns-sqlite' 'pdns-pgsql')
-install=pdns.install
+install="$pkgname.install"
options=('!makeflags' '!libtool')
backup=('etc/powerdns/pdns.conf')
source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.gz"
@@ -31,7 +31,8 @@ build() {
cd "$srcdir/$pkgname-$pkgver"
touch AUTHORS NEWS
- ./configure --prefix=/usr \
+ ./configure \
+ --prefix=/usr \
--sysconfdir=/etc/powerdns \
--libexecdir=/usr/lib \
--libdir=/usr/lib/powerdns \
@@ -48,11 +49,11 @@ package() {
make DESTDIR="$pkgdir" install
install -m755 -d "$pkgdir/etc/rc.d"
- rm "$pkgdir/etc/powerdns/pdns.conf-dist"
install -m644 "$srcdir/pdns.conf" "$pkgdir/etc/powerdns/"
install -m755 "$srcdir/pdns.rc" "$pkgdir/etc/rc.d/pdns"
install -Dm644 "$srcdir/pdns.service" \
"$pkgdir/usr/lib/systemd/system/pdns.service"
+ rm "$pkgdir/etc/powerdns/pdns.conf-dist"
}
# vim:set ts=2 sw=2 et:
diff --git a/community/performous/PKGBUILD b/community/performous/PKGBUILD
index f21cfa0a4..cff8c664e 100644
--- a/community/performous/PKGBUILD
+++ b/community/performous/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84361 2013-02-16 22:50:39Z ioni $
+# $Id: PKGBUILD 87428 2013-03-31 19:18:35Z stephane $
# Maintainer : Laurent Carlier <lordheavym@gmail.com>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
pkgname=performous
pkgver=0.7.0
-pkgrel=4
+pkgrel=5
pkgdesc='A free game like "Singstar", "Rockband" or "Stepmania"'
arch=('i686' 'x86_64' 'mips64el')
url="http://performous.org/"
diff --git a/community/picard/PKGBUILD b/community/picard/PKGBUILD
index 5f413e5d8..8e5035ba6 100644
--- a/community/picard/PKGBUILD
+++ b/community/picard/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 75870 2012-09-04 08:06:47Z bisson $
+# $Id: PKGBUILD 87401 2013-03-31 13:44:28Z bisson $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Mateusz Herych <heniekk@gmail.com>
# Contributor: sysrq
pkgname=picard
-pkgver=1.1
+pkgver=1.2
pkgrel=1
pkgdesc='Official MusicBrainz tagger'
url='http://musicbrainz.org/doc/MusicBrainz_Picard'
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
-depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg')
+depends=('python2-pyqt' 'mutagen')
optdepends=('libdiscid: CD lookup'
'chromaprint: fingerprinting')
source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('8f4a65a2a2df2f371b907fdea7958c5bd0de6bd7')
+sha1sums=('323e22adef321a8fb80d617eb86a880f7d546fca')
install=install
diff --git a/community/pingus/PKGBUILD b/community/pingus/PKGBUILD
index a5ba78bbd..2977922a5 100644
--- a/community/pingus/PKGBUILD
+++ b/community/pingus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 83266 2013-01-28 16:49:53Z stephane $
+# $Id: PKGBUILD 87429 2013-03-31 19:18:38Z stephane $
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=pingus
pkgver=0.7.6
-pkgrel=6
+pkgrel=7
pkgdesc="A Lemmings clone, i.e. a level-based puzzle game."
arch=('i686' 'x86_64' 'mips64el')
url="http://pingus.seul.org"
diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index 1391462d6..13633cbc0 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83267 2013-01-28 16:49:57Z stephane $
+# $Id: PKGBUILD 87430 2013-03-31 19:18:40Z stephane $
# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Contributor: William Rea <sillywilly@gmail.com>
@@ -7,7 +7,7 @@
pkgname=pinot
pkgver=1.03
-pkgrel=1
+pkgrel=2
pkgdesc='Personal search and metasearch tool'
arch=('i686' 'x86_64' 'mips64el')
url='http://code.google.com/p/pinot-search/'
diff --git a/community/pion/PKGBUILD b/community/pion/PKGBUILD
index 154b35f2a..094c7f756 100644
--- a/community/pion/PKGBUILD
+++ b/community/pion/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87053 2013-03-26 11:49:47Z foutrelis $
+# $Id: PKGBUILD 87431 2013-03-31 19:18:42Z stephane $
# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgname=pion
pkgver=4.0.13.1
# use the git snapshot until a new version is out
_pkgver=dddce5e02d8a60f958e466e690d38eee924475b0
-pkgrel=3
+pkgrel=4
pkgdesc="A C++ development library for implementing lightweight HTTP interfaces"
url="http://www.cloudmeter.com/pion/support/"
arch=('i686' 'x86_64' 'mips64el')
diff --git a/community/python-pyopencl/PKGBUILD b/community/python-pyopencl/PKGBUILD
index 156e96187..8e9407c26 100644
--- a/community/python-pyopencl/PKGBUILD
+++ b/community/python-pyopencl/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 83272 2013-01-28 16:50:04Z stephane $
+# $Id: PKGBUILD 87434 2013-03-31 19:18:48Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
pkgbase=python-pyopencl
pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers')
pkgver=2012.1
-pkgrel=7
+pkgrel=8
pkgdesc="A complete, object-oriented language binding of OpenCL to Python"
arch=('i686' 'x86_64')
url="http://mathema.tician.de/software/pyopencl"
license=('custom')
-makedepends=('ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost>=1.52.0' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy')
+makedepends=('ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost>=1.53.0' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy')
source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz"
'LICENSE.txt')
sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff'
diff --git a/community/python2-tagpy/PKGBUILD b/community/python2-tagpy/PKGBUILD
index 2fdb534f6..c122c14af 100644
--- a/community/python2-tagpy/PKGBUILD
+++ b/community/python2-tagpy/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 83273 2013-01-28 16:50:06Z stephane $
+# $Id: PKGBUILD 87435 2013-03-31 19:18:49Z stephane $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
# Contributor: Scott Horowitz <stonecrest@gmail.com>
pkgname=python2-tagpy
pkgver=0.94.8
-pkgrel=2
-pkgdesc="Python bindings for TagLib"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pypi.python.org/pypi/tagpy"
+pkgrel=3
+pkgdesc='Python bindings for TagLib'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://pypi.python.org/pypi/tagpy'
license=('MIT')
depends=('python2' 'taglib' 'boost-libs')
makedepends=('python2-distribute' 'boost')
@@ -16,32 +17,37 @@ replaces=('tagpy')
conflicts=('tagpy')
source=("http://pypi.python.org/packages/source/t/tagpy/tagpy-$pkgver.tar.gz"
'taglib1.7.patch')
-md5sums=('6baff63318cf90b9bc5a2497a0597802'
- '5b47cefe5fad98a093232256779da345')
+sha256sums=('56eab8dd81510f8af18e19375a0ffd5cd25c8e555104be46a92c3dc08634a0dc'
+ 'f6cc34f8d4d1186270943cd7e1ad3c9478ae7064ab9b2cddf7760d493295cd26')
build() {
- cd tagpy-${pkgver}
+ cd "tagpy-$pkgver"
- patch -p1 -i "${srcdir}"/taglib1.7.patch
+ patch -p1 -i "$srcdir/taglib1.7.patch"
sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
$(find . -name '*.py')
- ./configure.py --taglib-lib-dir=/usr/lib/ \
- --taglib-inc-dir=/usr/include/taglib/ \
- --boost-inc-dir=/usr/include/boost/ \
- --boost-lib-dir=/usr/lib/ \
- --boost-python-libname=boost_python
+ ./configure.py \
+ --taglib-lib-dir=/usr/lib/ \
+ --taglib-inc-dir=/usr/include/taglib/ \
+ --boost-inc-dir=/usr/include/boost/ \
+ --boost-lib-dir=/usr/lib/ \
+ --boost-python-libname=boost_python
python2 setup.py build
}
-package(){
- cd tagpy-${pkgver}
- python2 setup.py install --root="${pkgdir}" --optimize=1
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE"
-}
-
check(){
- cd tagpy-${pkgver}
+ cd "tagpy-$pkgver"
+
python2 setup.py test
}
+
+package(){
+ cd "tagpy-$pkgver"
+
+ python2 setup.py install --root="$pkgdir" --optimize=1
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD
index 4e5af849e..caeabc279 100644
--- a/community/schroot/PKGBUILD
+++ b/community/schroot/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83274 2013-01-28 16:50:07Z stephane $
+# $Id: PKGBUILD 87436 2013-03-31 19:18:51Z stephane $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de>
pkgname=schroot
pkgver=1.6.5
-pkgrel=1
+pkgrel=2
pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)."
url="http://packages.qa.debian.org/s/schroot.html"
license=('GPL3')
diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD
index 477f29775..eb9f541c7 100644
--- a/community/shotwell/PKGBUILD
+++ b/community/shotwell/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 86560 2013-03-19 11:35:15Z spupykin $
+# $Id: PKGBUILD 87399 2013-03-31 09:37:31Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com>
pkgname=shotwell
pkgver=0.14.0
-pkgrel=1
+pkgrel=2
pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
arch=('i686' 'x86_64' 'mips64el')
url="http://yorba.org/shotwell/"
diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD
index 4db41c5f5..880874649 100644
--- a/community/sigil/PKGBUILD
+++ b/community/sigil/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 85597 2013-03-03 19:43:42Z giovanni $
+# $Id: PKGBUILD 87437 2013-03-31 19:18:53Z stephane $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
pkgname=sigil
pkgver=0.7.1
-pkgrel=1
+pkgrel=2
pkgdesc="WYSIWYG ebook editor"
arch=('i686' 'x86_64' 'mips64el')
url="http://code.google.com/p/sigil/"
diff --git a/community/smc/PKGBUILD b/community/smc/PKGBUILD
index 927c91ebd..c14281c8e 100644
--- a/community/smc/PKGBUILD
+++ b/community/smc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 85525 2013-03-02 19:49:53Z svenstaro $
+# $Id: PKGBUILD 87438 2013-03-31 19:18:55Z stephane $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Juergen Hoetzel <juergen@archlinux.org>
# Contributor: Kritoke <typeolinux@yahoo.com>
pkgname=smc
pkgver=1.9
-pkgrel=19
+pkgrel=20
pkgdesc="Secret Maryo Chronicles"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.secretmaryo.org/"
diff --git a/community/spring/PKGBUILD b/community/spring/PKGBUILD
index d9d6c75d5..9e93a8fb1 100644
--- a/community/spring/PKGBUILD
+++ b/community/spring/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 87141 2013-03-27 23:35:41Z svenstaro $
+# $Id: PKGBUILD 87439 2013-03-31 19:18:57Z stephane $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Arkham <arkham at archlinux dot us>
# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
@@ -6,7 +6,7 @@
pkgname=spring
pkgver=0.94.1
_pkgver=94.1
-pkgrel=1
+pkgrel=2
pkgdesc='A free 3D real-time-strategy (RTS) game engine'
arch=('i686' 'x86_64' 'mips64el')
url="http://springrts.com/"
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index ab150c54f..f5d7593a6 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 84408 2013-02-18 18:31:08Z svenstaro $
+# $Id: PKGBUILD 87440 2013-03-31 19:18:58Z stephane $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: DuGi <dugi@irc.pl>
pkgname=springlobby
-pkgver=0.168
+pkgver=0.169
pkgrel=1
pkgdesc="A free cross-platform lobby client for the Spring RTS project."
arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
makedepends=('boost' 'asio' 'cmake')
install=springlobby.install
source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e8ab284a3ec1036b126676ed866dc4a3')
+md5sums=('1eb265268ac39d9b7e8fec90df92ff3d')
build() {
cd $srcdir/${pkgname}-$pkgver
diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD
index 1cc321145..168bbc623 100644
--- a/community/stuntrally/PKGBUILD
+++ b/community/stuntrally/PKGBUILD
@@ -1,34 +1,35 @@
+# $Id$
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
# Contributor: Jason Melton <jason.melton@gmail.com>
pkgname=stuntrally
pkgver=1.9
-pkgrel=2
-pkgdesc="Stunt Rally game with track editor, based on VDrift"
-arch=('i686' 'x86_64')
+pkgrel=3
+pkgdesc='Stunt Rally game with track editor, based on VDrift'
+arch=('x86_64' 'i686')
license=('GPL3')
-url="http://code.google.com/p/vdrift-ogre"
+url='http://code.google.com/p/vdrift-ogre'
depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stuntrally-data')
makedepends=('cmake' 'boost')
install=stuntrally.install
-source=(src_${pkgver}.tar.gz::https://nodeload.github.com/${pkgname}/stuntrally/tar.gz/${pkgver})
-md5sums=('3253c5a64a6d3f4fc4b756ea431286de')
+source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/$pkgname/$pkgname/tar.gz/$pkgver")
+sha256sums=('651d10aa00cf73b275198f08b0360a34ff98e6b520013041863854babeb20da7')
build() {
- cd "${srcdir}/stuntrally-${pkgver}/"
+ cd "$srcdir/stuntrally-$pkgver/"
rm -rf build
mkdir build && cd build
-
cmake -DCMAKE_INSTALL_PREFIX="/usr" -DSHARE_INSTALL="share/stuntrally" ..
make
}
package() {
- cd "${srcdir}/stuntrally-${pkgver}/build/"
-
- make DESTDIR="${pkgdir}" install
+ cd "$srcdir/stuntrally-$pkgver/build/"
- rm -rf "${pkgdir}/usr/share/stuntrally/"
+ make DESTDIR="$pkgdir" install
+ rm -rf "$pkgdir/usr/share/stuntrally/"
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/stuntrally/stuntrally.install b/community/stuntrally/stuntrally.install
index 547348418..3a13ff305 100644
--- a/community/stuntrally/stuntrally.install
+++ b/community/stuntrally/stuntrally.install
@@ -1,11 +1,13 @@
post_install() {
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
}
post_upgrade() {
- post_install
+ post_install
}
post_remove() {
- post_install
+ post_install
}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/wesnoth/PKGBUILD b/community/wesnoth/PKGBUILD
index 71d6d9981..2a89d9d27 100644
--- a/community/wesnoth/PKGBUILD
+++ b/community/wesnoth/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86797 2013-03-22 11:00:44Z svenstaro $
+# $Id: PKGBUILD 87442 2013-03-31 19:19:03Z stephane $
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Tobias Powalowski <tpowa@archlinux.org>
@@ -7,7 +7,7 @@
pkgname=wesnoth
pkgver=1.10.6
-pkgrel=1
+pkgrel=2
pkgdesc="A turn-based strategy game on a fantasy world"
arch=('i686' 'x86_64')
license=('GPL')
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 95d72f4ba..274db783a 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86485 2013-03-18 11:06:47Z andrea $
+# $Id: PKGBUILD 87443 2013-03-31 19:19:06Z stephane $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
# Contributor: Denis Martinez <deuns.martinez@gmail.com>
@@ -6,7 +6,7 @@
pkgname=wt
pkgver=3.2.3
_pkgver=3.2.3
-pkgrel=5
+pkgrel=6
pkgdesc="a C++ library and application server for developing and deploying web applications"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.webtoolkit.eu/"
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index a96d56400..a2ed61a4a 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180678 2013-03-25 19:15:27Z bpiotrowski $
+# $Id: PKGBUILD 181115 2013-03-31 19:16:36Z stephane $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=akonadi
pkgver=1.9.1
-pkgrel=2
+pkgrel=3
pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
arch=('i686' 'x86_64' 'mips64el')
url='http://community.kde.org/KDE_PIM/Akonadi'
diff --git a/extra/avogadro/PKGBUILD b/extra/avogadro/PKGBUILD
index 39d1d61cc..9631d7030 100644
--- a/extra/avogadro/PKGBUILD
+++ b/extra/avogadro/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 176282 2013-01-28 16:48:15Z stephane $
+# $Id: PKGBUILD 181116 2013-03-31 19:16:38Z stephane $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Nick B <Shirakawasuna at gmail _dot_com>
pkgname=avogadro
pkgver=1.1.0
-pkgrel=3
+pkgrel=4
pkgdesc="An advanced molecular editor based on Qt"
arch=('i686' 'x86_64' 'mips64el')
url="http://avogadro.openmolecules.net/wiki/Main_Page"
license=('GPL2')
depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy')
-makedepends=('cmake' 'boost' 'doxygen' 'mesa')
+makedepends=('cmake' 'boost' 'doxygen' 'mesa-libgl')
install=avogadro.install
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- "avogadro-1.1.0-textrel.patch")
+ 'boost153.patch')
md5sums=('f4fbef5ffc69cc312b2316426c36a78d'
- '88c68540c0ccce7007e515f1b3fd03ed')
+ 'aa2573f78d5dbd85b3cb79e08acde8ab')
build() {
- patch -Np0 -i ${srcdir}/avogadro-1.1.0-textrel.patch
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/boost153.patch
+ cd ../
+
mkdir build
cd build
cmake ../${pkgname}-${pkgver} \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DPYTHON_EXECUTABLE=/usr/bin/python2 \
- -DQT_MKSPECS_RELATIVE=share/qt/mkspecs
+ -DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
make
}
diff --git a/extra/avogadro/boost153.patch b/extra/avogadro/boost153.patch
new file mode 100644
index 000000000..fd8685974
--- /dev/null
+++ b/extra/avogadro/boost153.patch
@@ -0,0 +1,60 @@
+--- avogadro-1.1.0/libavogadro/src/pythonengine_p.h~ 2013-03-29 12:46:16.306165881 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonengine_p.h 2013-03-29 12:45:43.123089622 +0000
+@@ -27,7 +27,9 @@
+
+ #include <avogadro/global.h>
+ #include <avogadro/engine.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+
+ namespace Avogadro {
+
+--- avogadro-1.1.0/libavogadro/src/pythonextension_p.h~ 2013-03-29 12:46:32.156043085 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonextension_p.h 2013-03-29 12:47:07.265771087 +0000
+@@ -29,7 +29,9 @@
+ #include <avogadro/extension.h>
+ #include <avogadro/primitive.h>
+ #include <avogadro/glwidget.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+
+ #include <QWidget>
+ #include <QList>
+--- avogadro-1.1.0/libavogadro/src/pythontool_p.h~ 2013-03-29 12:47:33.335569185 +0000
++++ avogadro-1.1.0/libavogadro/src/pythontool_p.h 2013-03-29 12:47:50.732101147 +0000
+@@ -27,7 +27,9 @@
+
+ #include <avogadro/global.h>
+ #include <avogadro/tool.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+
+ #include <QObject>
+ #include <QAction>
+--- avogadro-1.1.0/libavogadro/src/pythoninterpreter.h~ 2013-03-29 12:50:46.550738652 +0000
++++ avogadro-1.1.0/libavogadro/src/pythoninterpreter.h 2013-03-29 12:51:00.853961341 +0000
+@@ -26,7 +26,9 @@
+ #define PYTHONINTERPRETER_H
+
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+ #include <avogadro/primitive.h>
+ #include <QString>
+
+--- avogadro-1.1.0/libavogadro/src/pythonscript.h~ 2013-03-29 12:52:00.723488935 +0000
++++ avogadro-1.1.0/libavogadro/src/pythonscript.h 2013-03-29 12:52:11.676745364 +0000
+@@ -27,7 +27,9 @@
+ #define PYTHONSCRIPT_H
+
+ #include <avogadro/global.h>
++#ifndef Q_MOC_RUN
+ #include <boost/python.hpp>
++#endif
+
+ #include "pythonerror.h"
+
diff --git a/extra/barcode/PKGBUILD b/extra/barcode/PKGBUILD
index 9a884127c..53e113990 100644
--- a/extra/barcode/PKGBUILD
+++ b/extra/barcode/PKGBUILD
@@ -1,31 +1,28 @@
-# $Id: PKGBUILD 143715 2011-11-28 16:39:50Z giovanni $
+# $Id: PKGBUILD 181063 2013-03-31 07:43:24Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
pkgname=barcode
-pkgver=0.98
-pkgrel=4.2
+pkgver=0.99
+pkgrel=1
pkgdesc="A tool to convert text strings to printed bars"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/barcode/"
license=('GPL')
depends=('glibc')
install=barcode.install
-source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7f10c3307b84a19a4ab2fa4b3f2974da')
+source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz")
+md5sums=('cdc504ee1020e27fbfeebcb0718de054')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info
+ ./configure --prefix=/usr
+
make
}
package() {
cd "${srcdir}/${pkgname}-${pkgver}"
- make prefix="${pkgdir}/usr" MAN1DIR="${pkgdir}/usr/share/man/man1" \
- MAN3DIR="${pkgdir}/usr/share/man/man3" INFODIR="${pkgdir}/usr/share/info" install || return 1
- gzip ${pkgdir}/usr/share/info/barcode.info
+ make prefix="${pkgdir}/usr" install
}
diff --git a/extra/barcode/barcode.install b/extra/barcode/barcode.install
index 2f566fcfd..83966a37d 100644
--- a/extra/barcode/barcode.install
+++ b/extra/barcode/barcode.install
@@ -2,18 +2,18 @@ infodir=/usr/share/info
filelist=(barcode.info.gz)
post_install() {
- [ -x usr/bin/install-info ] || return 0
+ [ -x usr/bin/install-info ]
for file in ${filelist[@]}; do
install-info $infodir/$file $infodir/dir 2> /dev/null
done
}
post_upgrade() {
- post_install $1
+ post_install
}
pre_remove() {
- [ -x usr/bin/install-info ] || return 0
+ [ -x usr/bin/install-info ]
for file in ${filelist[@]}; do
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
done
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 9fb33d90f..023748a1a 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180862 2013-03-27 13:30:16Z stephane $
+# $Id: PKGBUILD 181117 2013-03-31 19:16:40Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Contributor: kevin <kevin@archlinux.org>
@@ -8,16 +8,16 @@
pkgbase=boost
pkgname=('boost-libs' 'boost')
-pkgver=1.52.0
+pkgver=1.53.0
_boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=2
url="http://www.boost.org/"
arch=('i686' 'x86_64' 'mips64el')
license=('custom')
makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
- boost-1.52.0-python3.patch)
-sha1sums=('1120430030315b0a94b6d63fc04662960db2444c'
+ boost-1.53.0-python3.patch)
+sha1sums=('0e4ef26cc7780c6bbc63987ef2f29be920e2395b'
'34026072a7cb2534164f20e77bb71a5c75093307')
_stagedir="${srcdir}/stagedir"
@@ -29,7 +29,7 @@ build() {
# Fix build errors with python 3
sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
- patch -Np1 -i ../boost-1.52.0-python3.patch
+ patch -Np1 -i ../boost-1.53.0-python3.patch
# Shut up strict aliasing warnings
echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam
diff --git a/extra/boost/boost-1.52.0-python3.patch b/extra/boost/boost-1.53.0-python3.patch
index 8d2f59269..8d2f59269 100644
--- a/extra/boost/boost-1.52.0-python3.patch
+++ b/extra/boost/boost-1.53.0-python3.patch
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index cff5090d8..7032bce9b 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178391 2013-02-21 05:39:42Z heftig $
+# $Id: PKGBUILD 181118 2013-03-31 19:16:41Z stephane $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Contributor: Tom K <tomk@runbox.com>
pkgname=ekiga
pkgver=4.0.1
-pkgrel=1
+pkgrel=2
pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
url="http://www.ekiga.org"
license=(GPL)
diff --git a/extra/enblend-enfuse/PKGBUILD b/extra/enblend-enfuse/PKGBUILD
index 53bf7c365..52e9768cb 100644
--- a/extra/enblend-enfuse/PKGBUILD
+++ b/extra/enblend-enfuse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176285 2013-01-28 16:48:18Z stephane $
+# $Id: PKGBUILD 181119 2013-03-31 19:16:43Z stephane $
# Maintainer: tobias <tobias@archlinux.org>
# Contributor: Dominik Ryba <domryba@post.pl>
pkgname=enblend-enfuse
pkgver=4.0
-pkgrel=9
+pkgrel=10
pkgdesc="Intelligent blend tool for overlapping picture"
arch=("i686" "x86_64" 'mips64el')
license=('GPL')
diff --git a/extra/hugin/PKGBUILD b/extra/hugin/PKGBUILD
index 6addcfeb1..7d4e24c23 100644
--- a/extra/hugin/PKGBUILD
+++ b/extra/hugin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176286 2013-01-28 16:48:18Z stephane $
+# $Id: PKGBUILD 181120 2013-03-31 19:16:44Z stephane $
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
# Contributor: Tobias Kieslich <tobias@archlinux.org>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
@@ -6,7 +6,7 @@
pkgname=hugin
pkgver=2012.0.0
-pkgrel=3
+pkgrel=4
pkgdesc='Panorama photo stitcher'
url='http://hugin.sourceforge.net/'
license=('GPL')
diff --git a/extra/kdeedu-kig/PKGBUILD b/extra/kdeedu-kig/PKGBUILD
index 37eb66cc0..a24281892 100644
--- a/extra/kdeedu-kig/PKGBUILD
+++ b/extra/kdeedu-kig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179377 2013-03-05 15:31:42Z andrea $
+# $Id: PKGBUILD 181121 2013-03-31 19:16:45Z stephane $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdeedu-kig
pkgver=4.10.1
-pkgrel=1
+pkgrel=2
pkgdesc="Interactive Geometry"
url="http://kde.org/applications/education/kig/"
arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,6 @@ source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz")
sha1sums=('44b6c9d6585d42cb1b5d9970fd6a43c9c0610ca1')
build() {
- cd "${srcdir}"
mkdir build
cd build
cmake ../kig-${pkgver} \
@@ -27,7 +26,7 @@ build() {
}
package() {
- cd "${srcdir}"/build
+ cd build
make DESTDIR="${pkgdir}" install
# Use the python2 executable
diff --git a/extra/libkolabxml/PKGBUILD b/extra/libkolabxml/PKGBUILD
index b74af5c13..9b2e2b7c9 100644
--- a/extra/libkolabxml/PKGBUILD
+++ b/extra/libkolabxml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179113 2013-03-03 18:40:24Z andrea $
+# $Id: PKGBUILD 181122 2013-03-31 19:16:46Z stephane $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=libkolabxml
pkgver=0.8.3
-pkgrel=1
+pkgrel=2
pkgdesc="Kolab XML Format Schema Definitions Library"
url='http://git.kolab.org/libkolabxml/'
arch=('i686' 'x86_64' 'mips64el')
diff --git a/extra/libpst/PKGBUILD b/extra/libpst/PKGBUILD
index 8df864d61..c1027932f 100644
--- a/extra/libpst/PKGBUILD
+++ b/extra/libpst/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176290 2013-01-28 16:48:23Z stephane $
+# $Id: PKGBUILD 181123 2013-03-31 19:16:47Z stephane $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgbase=libpst
pkgname=('libpst' 'libpst-docs')
pkgver=0.6.54
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64' 'mips64el')
url="http://www.five-ten-sg.com/libpst/"
license=('GPL')
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 9fc4f3a74..728f89d57 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 180922 2013-03-28 12:43:45Z ioni $
+# $Id: PKGBUILD 181124 2013-03-31 19:16:50Z stephane $
# Maintainer : Ionut Biru <ibiru@archlinux.org>
# Contributor: Hugo Doria <hugo@archlinux.org>
pkgname=libtorrent-rasterbar
pkgver=0.16.9
-pkgrel=1
+pkgrel=2
epoch=1
pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
url="http://www.rasterbar.com/products/libtorrent/"
diff --git a/extra/licq/PKGBUILD b/extra/licq/PKGBUILD
index 0b6da790e..1e87777ff 100644
--- a/extra/licq/PKGBUILD
+++ b/extra/licq/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178969 2013-03-01 10:22:04Z andrea $
+# $Id: PKGBUILD 181125 2013-03-31 19:16:53Z stephane $
# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
pkgname=licq
pkgver=1.7.1
-pkgrel=2
+pkgrel=3
pkgdesc="Advanced graphical ICQ clone and more for Unix"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.licq.org"
@@ -17,8 +17,6 @@ md5sums=('701e57efedc2b7ece64c3d2d2e9f9e16')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- . /etc/profile.d/qt4.sh
-
# licq
mkdir build
cd build
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 793c7a359..b26646c89 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180835 2013-03-26 16:00:15Z giovanni $
+# $Id: PKGBUILD 181055 2013-03-31 07:01:25Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
pkgname=live-media
-pkgver=2013.03.23
+pkgver=2013.03.31
pkgrel=1
pkgdesc="A set of C++ libraries for multimedia streaming"
arch=('i686' 'x86_64' 'mips64el')
@@ -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=('e9a75e0cfbf4f25aedd4ee4a10a7c26f')
+md5sums=('710afff186631aa7f6a28b7c105b92ab')
build() {
cd ${srcdir}/live
diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD
index b2fb5240b..a1be32613 100644
--- a/extra/lyx/PKGBUILD
+++ b/extra/lyx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 178970 2013-03-01 10:22:14Z andrea $
+# $Id: PKGBUILD 181126 2013-03-31 19:16:54Z stephane $
# Maintainer: Ronald van Haren <ronald.archlinux.org>
# Contributor: Jason Chu <jason@archlinux.org>
pkgname=lyx
pkgver=2.0.5.1
-pkgrel=2
+pkgrel=3
pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.lyx.org"
@@ -23,8 +23,6 @@ sha1sums=('a822e99484c1652c4df5df717819dd7048fcff75'
'56416642cc3da2a13b87b84e6b87c1a239f3d09a')
build() {
- . /etc/profile.d/qt4.sh
-
cd "${srcdir}/${pkgname}-${pkgver}"
find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 83323b226..ef50eb94a 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 179090 2013-03-03 11:15:28Z giovanni $
+# $Id: PKGBUILD 181127 2013-03-31 19:16:55Z stephane $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: xduugu <xduugu@gmx.com>
pkgbase=mkvtoolnix
pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
pkgver=6.1.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
license=('GPL')
url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
diff --git a/extra/source-highlight/PKGBUILD b/extra/source-highlight/PKGBUILD
index 498bbeaf6..5328e64ea 100644
--- a/extra/source-highlight/PKGBUILD
+++ b/extra/source-highlight/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176932 2013-02-02 19:24:03Z giovanni $
+# $Id: PKGBUILD 181128 2013-03-31 19:16:57Z stephane $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
pkgname=source-highlight
pkgver=3.1.7
-pkgrel=4
+pkgrel=5
pkgdesc="Convert source code to syntax highlighted document"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.gnu.org/software/src-highlite/"
diff --git a/extra/vigra/PKGBUILD b/extra/vigra/PKGBUILD
index 61ffeb9d1..f4ebc938b 100644
--- a/extra/vigra/PKGBUILD
+++ b/extra/vigra/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180557 2013-03-23 09:37:02Z andyrtr $
+# $Id: PKGBUILD 181129 2013-03-31 19:16:58Z stephane $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
pkgbase=vigra
pkgname=('vigra' 'vigra-doc')
pkgver=1.9.0
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64' 'mips64el')
url="http://hci.iwr.uni-heidelberg.de/vigra/"
license=('custom:MIT')
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index d31735366..d5f9a2eea 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180213 2013-03-18 16:09:19Z andyrtr $
+# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=xf86-video-savage
pkgver=2.3.6
-pkgrel=3
+pkgrel=4
pkgdesc="X.org savage video driver"
arch=(i686 x86_64)
url="http://xorg.freedesktop.org/"
@@ -14,11 +14,14 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
optdepends=('savage-dri: DRI1 support from community repo')
options=(!libtool)
groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+ git_fixes.diff)
+sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6'
+ 'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ${srcdir}/git_fixes.diff
./configure --prefix=/usr
make
}
diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff
new file mode 100644
index 000000000..8d5ef49b0
--- /dev/null
+++ b/extra/xf86-video-savage/git_fixes.diff
@@ -0,0 +1,64 @@
+From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Wed, 18 Jul 2012 08:52:38 +0000
+Subject: savage: move compat-api.h down to proper place.
+
+This screws up when DRI isn't enabled.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index b604292..ec4b1ea 100644
+--- a/src/savage_driver.h
++++ b/src/savage_driver.h
+@@ -85,8 +85,6 @@
+ #include "GL/glxint.h"
+ #include "xf86drm.h"
+
+-#include "compat-api.h"
+-
+ /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
+ * to 32 clients. */
+ #define SAVAGE_NUM_BUFFERS 32
+@@ -153,6 +151,8 @@ typedef struct _server{
+
+ #endif
+
++#include "compat-api.h"
++
+ typedef enum {
+ MT_NONE,
+ MT_CRT,
+--
+cgit v0.9.0.2-2-gbebe
+From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Sat, 22 Dec 2012 10:00:00 +0000
+Subject: savage: fix default accel arch when built with no XAA
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index 026bf5c..5b49e60 100644
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+ from = X_DEFAULT;
+ char *strptr;
+ if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
++#ifdef HAVE_XAA_H
+ if(!xf86NameCmp(strptr,"XAA")) {
+ from = X_CONFIG;
+ psav->useEXA = FALSE;
+@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+ from = X_CONFIG;
+ psav->useEXA = TRUE;
+ }
++#else
++ psav->useEXA = TRUE;
++#endif
+ }
+ xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
+ psav->useEXA ? "EXA" : "XAA");
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xsd/PKGBUILD b/extra/xsd/PKGBUILD
index 117543842..4a0cf2a7f 100644
--- a/extra/xsd/PKGBUILD
+++ b/extra/xsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 176296 2013-01-28 16:48:29Z stephane $
+# $Id: PKGBUILD 181130 2013-03-31 19:17:00Z stephane $
# Maintainer:
# Contributor: kevku <kevku@gmx.com>
pkgname=xsd
pkgver=3.3.0
_pkgver=3.3.0-2+dep
-pkgrel=7
+pkgrel=8
pkgdesc="An open-source, cross-platform W3C XML Schema to C++ data binding compiler"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.codesynthesis.com/products/xsd"
diff --git a/pcr/openjdk6/PKGBUILD b/pcr/openjdk6/PKGBUILD
index 8c70bb72a..03cdba0aa 100644
--- a/pcr/openjdk6/PKGBUILD
+++ b/pcr/openjdk6/PKGBUILD
@@ -2,20 +2,26 @@
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
-pkgname=('openjdk6-old' 'openjdk6-old-src')
+pkgname='openjdk6-old'
pkgbase="openjdk6"
_javaver=6
_icedteaver=1.12.3
_openjdk_version=b27
_openjdk_date=26_oct_2012
pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
+pkgrel=1.1
url='http://icedtea.classpath.org'
arch=('i686' 'x86_64')
license=('custom')
-makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
- 'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt'
- 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'java-environment' 'inetutils' 'wget')
+pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
+backup=(etc/profile.d/openjdk6.sh)
+depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
+makedepends=('alsa-lib' 'giflib' 'libxp' 'gtk2'
+ 'nspr' 'zlib' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxslt'
+ 'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6-old' 'inetutils' 'wget')
+optdepends=('alsa-lib: for sound'
+ 'giflib: for gif format support')
+install=openjdk6.install
options=('!emptydirs')
source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
@@ -81,7 +87,6 @@ build() {
--with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \
--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
- --enable-bootstrap \
--with-abs-install-dir=${_jvmdir} \
--with-jdk-home="$JAVA_HOME"
@@ -91,17 +96,7 @@ build() {
LD_PRELOAD="" make
}
-package_openjdk6-old() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
- backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
- 'alsa-lib: for sound'
- 'giflib: for gif format support')
- conflicts=('java-environment' 'java-runtime')
- provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6')
- install=openjdk6.install
-
+package() {
if [ "${CARCH}" = "x86_64" ]; then
_arch=amd64
else
@@ -127,41 +122,6 @@ package_openjdk6-old() {
rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
- # Install man pages.
- install -m755 -d ${pkgdir}/usr/share/man/man1
- install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/
-
- # Install demos and samples.
- cp -a demo ${pkgdir}/${_jvmdir}/
- install -m755 -d sample/rmi
- mv bin/java-rmi.cgi sample/rmi
- cp -a sample ${pkgdir}/${_jvmdir}/
- popd
-
- # Install icons and menu entries.
- for s in 16 24 32 48 ; do
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
- install -m644 openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
- ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
- done
-
- # Install desktop files.
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-
- # link binaries into /usr/bin
- install -m755 -d ${pkgdir}/usr/bin
- pushd ${pkgdir}/${_jvmdir}/bin
- for file in *; do
- ln -sf ${_jvmdir}/bin/${file} \
- ${pkgdir}/usr/bin
- done
- popd
-
- # link JKS keystore from ca-certificates-java
- rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
- ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
-
# set some variables
install -m755 -d ${pkgdir}/etc/profile.d
install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh
@@ -170,24 +130,3 @@ package_openjdk6-old() {
# install license
install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
-
-package_openjdk6-old-src() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
- depends=('openjdk6-old')
-
- if [ "${CARCH}" = "x86_64" ]; then
- _arch=amd64
- else
- _arch=i586
- fi
-
- _javaver=6
- _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
- cd ${srcdir}/icedtea6-${_icedteaver}
- install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
- pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
- # Install src.zip file
- cp -a src.zip ${pkgdir}/${_jvmdir}/
-}