summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/converseen/PKGBUILD8
-rw-r--r--community/filezilla/PKGBUILD8
-rw-r--r--community/gnome-do/PKGBUILD6
-rw-r--r--community/libftdi/PKGBUILD18
-rw-r--r--community/luasec/PKGBUILD17
-rw-r--r--community/rubinius/PKGBUILD6
-rw-r--r--community/sage-mathematics/PKGBUILD13
-rw-r--r--community/scratch/PKGBUILD22
-rw-r--r--community/scratch/scratch.install4
-rw-r--r--community/xulrunner/PKGBUILD23
-rw-r--r--community/xulrunner/mozconfig4
-rw-r--r--community/xwax/PKGBUILD6
-rw-r--r--core/libsasl/PKGBUILD19
-rw-r--r--core/libsasl/cyrus-sasl-sql.patch39
-rw-r--r--core/pam/PKGBUILD10
-rw-r--r--core/sudo/PKGBUILD12
-rw-r--r--core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch35
-rw-r--r--core/sudo/sudo.pam5
-rw-r--r--extra/apr-util/PKGBUILD10
-rw-r--r--extra/cyrus-sasl/PKGBUILD19
-rw-r--r--extra/cyrus-sasl/cyrus-sasl-sql.patch39
-rw-r--r--extra/festival/PKGBUILD60
-rw-r--r--extra/festival/festival-2.1-bettersonamehack.patch35
-rw-r--r--extra/festival/festival-shared-build.patch50
-rw-r--r--extra/festival/festival.gcc47.patch121
-rw-r--r--extra/gtkmathview/PKGBUILD45
-rw-r--r--extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch56
-rw-r--r--extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch67
-rw-r--r--extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch67
-rw-r--r--extra/gtkmathview/gtkmathview-0.8.0-includes.patch12
-rw-r--r--extra/mono/PKGBUILD24
-rw-r--r--extra/mono/mini_amd64.patch13
-rw-r--r--extra/mono/mono.install7
-rw-r--r--extra/redland/PKGBUILD14
-rw-r--r--extra/shared-mime-info/PKGBUILD9
-rw-r--r--libre/abuse-libre/abuse.install13
-rw-r--r--libre/abuse-libre/abuse.sh15
-rw-r--r--libre/abuse-libre/default.abuserc37
-rw-r--r--libre/abuse-libre/default.gamma.lsp1
-rw-r--r--libre/vim-runtime/PKGBUILD105
40 files changed, 591 insertions, 483 deletions
diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 0073cfef7..f4bbe250e 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104501 2014-01-22 01:50:14Z eric $
+# $Id: PKGBUILD 105507 2014-02-09 12:50:32Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: archtux <antonio.arias99999 at gmail.com>
pkgname=converseen
-pkgver=0.6.6
-pkgrel=2
+pkgver=0.6.7
+pkgrel=1
pkgdesc="The batch image converter and resizer"
arch=('i686' 'x86_64')
url="http://converseen.sourceforge.net/"
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr' 'libwebp')
makedepends=('cmake')
install=converseen.install
source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('500c5aedec23a13e119ad0ece1ebca1d')
+md5sums=('325fbb2dafeae826efe1c2b8fdca823c')
build() {
cd "${srcdir}"
diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index 9820e5256..9da270edb 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 105169 2014-02-02 09:46:45Z bluewind $
+# $Id: PKGBUILD 105534 2014-02-09 21:18:21Z bluewind $
# Contributor: Alexander Fehr <pizzapunk gmail com>
# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=filezilla
-pkgver=3.7.3
-pkgrel=3
+pkgver=3.7.4
+pkgrel=1
pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
arch=('i686' 'x86_64')
url="http://filezilla-project.org/"
@@ -33,4 +33,4 @@ package() {
make DESTDIR="${pkgdir}" install
}
-md5sums=('df7828739a852ac3adbc1c010303115d')
+md5sums=('8419418f1f473bf153369d7a834e39e7')
diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD
index 2e56ea5a5..93f8ff58a 100644
--- a/community/gnome-do/PKGBUILD
+++ b/community/gnome-do/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103497 2014-01-06 21:06:24Z bgyorgy $
+# $Id: PKGBUILD 105487 2014-02-09 06:17:37Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Doehni <dohny@gmx.de>
pkgname=gnome-do
-pkgver=0.95
+pkgver=0.95.1
pkgrel=1
pkgdesc="Quickly search for many items present on your desktop or the web, and perform useful actions on those items"
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('gconf-sharp' 'gnome-desktop2' 'gnome-keyring-sharp' 'mono-addins' 'not
makedepends=('intltool' 'gio-sharp')
install=$pkgname.install
source=(http://launchpad.net/do/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz)
-md5sums=('60309cd42dcdfc25e215346b3346095f')
+md5sums=('1f61376718d75d3defcdf81958754296')
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libftdi/PKGBUILD b/community/libftdi/PKGBUILD
index 08d225b72..23ff6bc06 100644
--- a/community/libftdi/PKGBUILD
+++ b/community/libftdi/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105380 2014-02-06 10:28:29Z bpiotrowski $
-# Maintainer:
+# $Id: PKGBUILD 105529 2014-02-09 17:42:22Z kkeen $
+# Maintainer: Kyle Keen <keenerd@gmail.com>
pkgname=libftdi
pkgver=1.1
-pkgrel=1
+pkgrel=2
pkgdesc="A library to talk to FTDI chips"
arch=('i686' 'x86_64')
url="http://www.intra2net.com/en/developer/libftdi/download.php"
@@ -15,22 +15,20 @@ sha1sums=('f05ade5614aa31e64f91a30ce3782f7ca3704d18'
'SKIP')
prepare() {
- cd ${pkgname}1-$pkgver
+ cd "${pkgname}1-$pkgver"
sed -i 's|LIB_SUFFIX 64|LIB_SUFFIX ""|' CMakeLists.txt
}
build() {
- cd ${pkgname}1-$pkgver
+ cd "${pkgname}1-$pkgver"
mkdir build
cd build
- cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_BUILD_TYPE=Release
+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_BUILD_RPATH=ON \
+ -DCMAKE_BUILD_TYPE=Release -DEXAMPLES=OFF -DFTDI_EEPROM=OFF
make
}
package() {
- cd ${pkgname}1-$pkgver/build
+ cd "${pkgname}1-$pkgver/build"
make DESTDIR="$pkgdir" install
- find examples -type f -perm -755 -exec install {} "$pkgdir/usr/bin" \;
- # Remove eepreom (conflict with i2c-tools FS#37925)
- rm "$pkgdir/usr/bin/eeprom"
}
diff --git a/community/luasec/PKGBUILD b/community/luasec/PKGBUILD
index 70bc0ffe6..6e5a16e32 100644
--- a/community/luasec/PKGBUILD
+++ b/community/luasec/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 105077 2014-01-31 09:22:07Z spupykin $
+# $Id: PKGBUILD 105499 2014-02-09 10:04:32Z bpiotrowski $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Dwayne Bent <dbb.1@liqd.org>
+# Contributor: Dwayne Bent <dbb.1@liqd.org>
# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
pkgbase=luasec
pkgname=(lua-sec lua51-sec)
pkgver=0.5
pkgrel=1
+epoch=1
pkgdesc='Lua bindings for OpenSSL library to provide TLS/SSL communication.'
arch=('i686' 'x86_64')
url='https://github.com/brunoos/luasec/wiki'
license=('MIT')
-makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket' 'git')
+makedepends=('openssl' 'lua' 'lua-socket' 'lua51' 'lua51-socket')
+options=('!buildflags')
source=("https://github.com/brunoos/luasec/archive/luasec-$pkgver.tar.gz")
md5sums=('0518f4524f399f33424c6f450e1d06db')
-build() {
+prepare() {
cp -a luasec-luasec-$pkgver luasec-luasec-$pkgver-51
+}
- unset CFLAGS
- unset LDFLAGS
-
+build() {
msg2 'Building with lua 5.2'
cd luasec-luasec-$pkgver
make linux
@@ -56,4 +57,4 @@ package_lua51-sec() {
install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
-# vim:set ts=4 sw=4 et:
+# vim:set ts=2 sw=2 et:
diff --git a/community/rubinius/PKGBUILD b/community/rubinius/PKGBUILD
index 501f2cf41..bf7ead370 100644
--- a/community/rubinius/PKGBUILD
+++ b/community/rubinius/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 105200 2014-02-02 18:40:56Z heftig $
+# $Id: PKGBUILD 105511 2014-02-09 13:50:07Z heftig $
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=rubinius
pkgname=(rubinius rubinius-ruby)
-pkgver=2.2.4
+pkgver=2.2.5
pkgrel=1
pkgdesc="Ruby runtime written in Ruby, designed for concurrency"
arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=(llvm rubinius-ruby)
options=(!emptydirs)
source=(http://releases.rubini.us/${pkgbase}-${pkgver}.tar.bz2
gemrc dirs.patch)
-sha256sums=('7d06d63d12d9eecff196d8f53953bd520c17fbb9baa921c5481c43af8129d85e'
+sha256sums=('42cfae89d481dfa5e0ccb53a67720f109fc6c2e1b6ca68a8ae9676be6d0457de'
'4bb7eb2fe66e396ed16b589cdb656831407b39ad4e138d88536754c0448ac614'
'93f3918dc2a5679e281e724f9b3cb712ffa784c1e52e6fa7ce75f74ce6655a66')
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index a4fd5c450..1ec59806e 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 105329 2014-02-05 06:14:45Z arcanis $
+# $Id: PKGBUILD 105532 2014-02-09 18:40:24Z arcanis $
# Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
# Contributor: Antonio Rojas <nqn1976 at gmail dot com>
@@ -8,15 +8,15 @@
# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
pkgname=sage-mathematics
-pkgver=6.1
-pkgrel=3
+pkgver=6.1.1
+pkgrel=1
pkgdesc="Open Source Mathematics Software, free alternative to Magma, Maple, Mathematica, and Matlab"
arch=('i686' 'x86_64')
url="http://www.sagemath.org"
license=('GPL')
#depends=('desktop-file-utils' 'java-environment=7' 'libjpeg-turbo' 'libtiff' 'libxmu' 'sqlite' 'xz')
depends=('freetype2>=2.3.5')
-makedepends=('gcc-fortran' 'gendesk' 'desktop-file-utils')
+makedepends=('desktop-file-utils' 'gcc-fortran' 'gendesk')
optdepends=('imagemagick: some plotting functionality benefits from it'
'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
'openssh: to use the notebook in secure mode'
@@ -25,7 +25,7 @@ optdepends=('imagemagick: some plotting functionality benefits from it'
source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
"sage.service")
install="${pkgname}.install"
-md5sums=('75130374fcdb9395955db81f1ed28422'
+md5sums=('800c59f7cfa32c012f358ae240cdb2e6'
'985da1c1d1dcdc3ea9aa73035cb7996b')
prepare() {
@@ -48,7 +48,6 @@ X-KDE-Username="
mkdir "${srcdir}/build"
# according to FS#34769
- rm -rf freetype-*
sed -i -e 's/FREETYPE/#FREETYPE/' "${srcdir}/sage-${pkgver}/build/install"
}
@@ -125,7 +124,7 @@ package() {
# install *.desktop and icon files
install -Dm644 "${srcdir}/sage-notebook.desktop" \
"${pkgdir}/usr/share/applications/sage-notebook.desktop"
- install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.7.2-py2.7.egg/sagenb/data/sage/images/icon128x128.png" \
+ install -Dm644 "${pkgdir}/opt/sage/local/lib/python2.7/site-packages/sagenb-0.10.8.2-py2.7.egg/sagenb/data/sage/images/icon48x48.png" \
"${pkgdir}/usr/share/pixmaps/sage-notebook.png"
}
diff --git a/community/scratch/PKGBUILD b/community/scratch/PKGBUILD
index 508442874..4ea7e23ad 100644
--- a/community/scratch/PKGBUILD
+++ b/community/scratch/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 77468 2012-10-10 18:12:07Z jsteel $
-# Maintainer: Jonathan Steel <mail at jsteel dot org>
+# $Id: PKGBUILD 105503 2014-02-09 11:46:59Z jsteel $
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
# Contributor: Muhammed Uluyol <muhammedu@gmail.com>
pkgname=scratch
pkgver=1.4.0.7
-pkgrel=2
+pkgrel=3
pkgdesc="Create and share your own interactive stories, games, music and art"
arch=('i686' 'x86_64')
url="http://scratch.mit.edu"
license=('GPL2')
install=$pkgname.install
-depends=('squeak-vm' 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils' 'pango'
- 'gtk-update-icon-cache')
+depends=('squeak-vm' 'shared-mime-info' 'desktop-file-utils' 'pango'
+ 'gtk-update-icon-cache')
source=(http://download.scratch.mit.edu/$pkgname-$pkgver.src.tar.gz)
md5sums=('f948e9e6de3ec9c7c7b4cc2a1975eb5a')
-build() {
+prepare() {
cd "$srcdir"/$pkgname-$pkgver.src
sed -i 's/-vm-sound-pulse/-vm-sound-ALSA/' src/$pkgname
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver.src
make build
}
@@ -35,6 +39,10 @@ package() {
install -dm755 "$pkgdir"/usr/share/{$pkgname,icons/hicolor}
cp -rp Help locale Media Projects README "$pkgdir"/usr/share/$pkgname/
- cp -rp src/icons/* "$pkgdir"/usr/share/icons/hicolor/
cp -rp Plugins "$pkgdir"/usr/lib/$pkgname/
+
+ for res in 32 48 128; do
+ install -D -m644 src/icons/${res}x${res}/$pkgname.png \
+ "$pkgdir"/usr/share/icons/hicolor/${res}x${res}/apps/$pkgname.png
+ done
}
diff --git a/community/scratch/scratch.install b/community/scratch/scratch.install
index 7fe49829c..8db29369c 100644
--- a/community/scratch/scratch.install
+++ b/community/scratch/scratch.install
@@ -4,6 +4,10 @@ post_install() {
gtk-update-icon-cache -qf /usr/share/icons/hicolor
}
+post_upgrade() {
+ post_install
+}
+
post_remove() {
post_install
}
diff --git a/community/xulrunner/PKGBUILD b/community/xulrunner/PKGBUILD
index a636fe5cf..8fe4e064a 100644
--- a/community/xulrunner/PKGBUILD
+++ b/community/xulrunner/PKGBUILD
@@ -1,29 +1,27 @@
-# $Id: PKGBUILD 103367 2014-01-04 06:59:57Z cbehan $
+# $Id: PKGBUILD 105483 2014-02-09 04:20:46Z cbehan $
# Maintainer: Connor Behan <connor.behan@gmail.com>
# Contributor: Jan de Groot <jgc@archlinux.org>
# Contributor: Alexander Baldeck <alexander@archlinux.org>
pkgname=xulrunner
-pkgver=25.0
+pkgver=27.0
pkgrel=1
pkgdesc="Mozilla Runtime Environment"
arch=('i686' 'x86_64')
license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.15' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gstreamer0.10-base>=0.10.25')
+depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'libvpx' 'python2')
+makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'gstreamer0.10-base')
url="http://wiki.mozilla.org/XUL:Xul_Runner"
source=(ftp://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$pkgver/source/xulrunner-$pkgver.source.tar.bz2
mozconfig
mozilla-pkgconfig.patch
- shared-libs.patch
- freetype-headers.patch)
-options=('!emptydirs' 'staticlibs')
+ shared-libs.patch)
+options=('!emptydirs' '!makeflags' 'staticlibs')
replaces=('xulrunner-oss')
-sha256sums=('796614f7a7a02ae4bceb5d1f2dce2de5096f9e390e91ec09fa5a40bcdff45cb1'
- 'b5e66890e991b194d9a6d2179bccd5ac0015d4aab0a8411c55c6ecfd06576c24'
+sha256sums=('4f6125c053e12c4ac3317b075e289b10ce470dd90ed6fc43c4572bf1acc64981'
+ '8455f7bc00e8ad6e69bba43171083c778420a8b1c566347ed5381ae9cf98191a'
'23485d937035648add27a7657f6934dc5b295e886cdb0506eebd02a43d07f269'
- 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1'
- 'b62975b25fa3a0dc3e57e32c2b980daf2ee2497eff1d9661595b8e8bafbaa5f8')
+ 'e2b4a00d14f4ba69c62b3f9ef9908263fbab179ba8004197cbc67edbd916fdf1')
prepare() {
cd "$srcdir/mozilla-release"
@@ -32,7 +30,6 @@ prepare() {
#fix libdir/sdkdir - fedora
patch -Np1 -i ../mozilla-pkgconfig.patch
patch -Np1 -i ../shared-libs.patch
- patch -Np1 -i ../freetype-headers.patch
# WebRTC build tries to execute "python" and expects Python 2
# Workaround taken from chromium PKGBUILD
@@ -51,7 +48,7 @@ build() {
export LDFLAGS="$LDFALGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
export PYTHON="/usr/bin/python2"
- make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+ make -j1 -f client.mk build
}
package() {
diff --git a/community/xulrunner/mozconfig b/community/xulrunner/mozconfig
index 8fca560db..d2078e936 100644
--- a/community/xulrunner/mozconfig
+++ b/community/xulrunner/mozconfig
@@ -22,8 +22,10 @@ ac_add_options --with-pthreads
# Features
ac_add_options --enable-startup-notification
ac_add_options --enable-gstreamer
-
ac_add_options --disable-crashreporter
ac_add_options --disable-updater
ac_add_options --disable-tests
ac_add_options --disable-installer
+
+# https://bugzilla.mozilla.org/show_bug.cgi?id=955876
+ac_add_options --enable-release
diff --git a/community/xwax/PKGBUILD b/community/xwax/PKGBUILD
index 0dbd50eae..c6ce32769 100644
--- a/community/xwax/PKGBUILD
+++ b/community/xwax/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92791 2013-06-15 08:44:39Z lfleischer $
+# $Id: PKGBUILD 105538 2014-02-09 21:37:01Z lfleischer $
# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
# Contributor: sputnick <gilles DOT quenot AT gmail DOT com>
pkgname=xwax
-pkgver=1.4
+pkgver=1.5
pkgrel=1
pkgdesc='Open-source vinyl emulation software for Linux.'
arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('cdparanoia: for CD import'
'mpg123: for MP3 import'
'ffmpeg: for video fallback import')
source=("http://www.xwax.co.uk/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('01afde1f1222fca38eab736e0b3df116')
+md5sums=('7c2f30c3a9a71c4dba107e3eb9b40430')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/core/libsasl/PKGBUILD b/core/libsasl/PKGBUILD
index e8cd341aa..beb08d3c7 100644
--- a/core/libsasl/PKGBUILD
+++ b/core/libsasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197827 2013-10-30 11:05:21Z allan $
+# $Id: PKGBUILD 205603 2014-02-09 10:29:30Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# This package spans multiple repositories.
@@ -8,13 +8,13 @@
#pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
pkgname=libsasl
pkgver=2.1.26
-pkgrel=6
+pkgrel=7
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
arch=('i686' 'x86_64')
url="http://cyrusimap.web.cmu.edu/"
license=('custom')
options=('!makeflags')
-makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite')
source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
cyrus-sasl-2.1.22-qa.patch
cyrus-sasl-2.1.26-size_t.patch
@@ -26,7 +26,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
saslauthd.service
saslauthd.conf.d
tmpfiles.conf
- CVE-2013-4122.patch)
+ CVE-2013-4122.patch
+ cyrus-sasl-sql.patch)
md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
'79b8a5e8689989e2afd4b7bda595a7b1'
'f45aa8c42b32e0569ab3d14a83485b37'
@@ -38,7 +39,8 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
'3499dcd610ad1ad58e0faffde2aa7a23'
'49219af5641150edec288a3fdb65e7c1'
'45bb0192d2f188066240b9a66ee6365f'
- 'c5f0ec88c584a75c14d7f402eaeed7ef')
+ 'c5f0ec88c584a75c14d7f402eaeed7ef'
+ '82c0f66fdc5c1145eb48ea9116c27931')
prepare() {
cd cyrus-sasl-$pkgver
@@ -50,6 +52,7 @@ prepare() {
patch -Np1 -i ../0026_drop_krb5support_dependency.patch
patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
patch -Np1 -i ../CVE-2013-4122.patch
+ patch -Np0 -i ../cyrus-sasl-sql.patch
sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
}
@@ -100,11 +103,15 @@ build() {
--enable-ntlm \
--disable-passdss \
--enable-sql \
+ --with-mysql \
+ --with-pgsql=/usr/lib \
+ --with-sqlite3=/usr/lib \
--enable-ldapdb \
--disable-macos-framework \
--with-pam \
--with-saslauthd=/var/run/saslauthd \
--with-ldap \
+ --with-dblib=gdbm \
--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
--sysconfdir=/etc \
--with-devrandom=/dev/urandom
@@ -174,7 +181,7 @@ package_cyrus-sasl-ldap() {
package_cyrus-sasl-sql() {
pkgdesc="SQL auxprop module for Cyrus SASL"
- depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
+ depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite')
replaces=('cyrus-sasl-plugins')
cd cyrus-sasl-$pkgver/plugins
diff --git a/core/libsasl/cyrus-sasl-sql.patch b/core/libsasl/cyrus-sasl-sql.patch
new file mode 100644
index 000000000..2dcdad822
--- /dev/null
+++ b/core/libsasl/cyrus-sasl-sql.patch
@@ -0,0 +1,39 @@
+--- configure.in 2012-10-12 16:05:48.000000000 +0200
++++ configure.in 2013-05-11 18:48:59.021848013 +0200
+@@ -861,9 +860,9 @@
+ notfound) AC_WARN([SQLite Library not found]); true;;
+ *)
+ if test -d ${with_sqlite}/lib; then
+- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++ LIB_SQLITE="-L${with_sqlite}/lib"
+ else
+- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++ LIB_SQLITE="-L${with_sqlite}"
+ fi
+
+ LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -913,9 +912,9 @@
+ notfound) AC_WARN([SQLite3 Library not found]); true;;
+ *)
+ if test -d ${with_sqlite3}/lib; then
+- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++ LIB_SQLITE3="-L${with_sqlite3}/lib"
+ else
+- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++ LIB_SQLITE3="-L${with_sqlite3}"
+ fi
+
+ LIB_SQLITE3_DIR=$LIB_SQLITE3
+--- configure.in
++++ configure.in
+@@ -674,7 +674,9 @@
+ LIB_PGSQL_DIR=$LIB_PGSQL
+ LIB_PGSQL="$LIB_PGSQL -lpq"
+
+- if test -d ${with_pgsql}/include/pgsql; then
++ if test -d ${with_pgsql}/include/postgresql/pgsql; then
++ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql"
++ elif test -d ${with_pgsql}/include/pgsql; then
+ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+ elif test -d ${with_pgsql}/pgsql/include; then
+ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD
index ed09c6a0c..9f4968505 100644
--- a/core/pam/PKGBUILD
+++ b/core/pam/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 197836 2013-10-30 11:06:23Z allan $
+# $Id: PKGBUILD 205604 2014-02-09 10:29:31Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=pam
pkgver=1.1.8
-pkgrel=2
+pkgrel=3
pkgdesc="PAM (Pluggable Authentication Modules) library"
arch=('i686' 'x86_64')
license=('GPL2')
-url="http://www.kernel.org/pub/linux/libs/pam/"
-depends=('glibc' 'db' 'cracklib' 'libtirpc' 'pambase')
+url="http://linux-pam.org"
+depends=('glibc' 'cracklib' 'libtirpc' 'pambase')
makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl')
backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/default/passwd etc/environment)
source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2
@@ -23,7 +23,7 @@ md5sums=('35b6091af95981b1b2cd60d813b5e4ee'
build() {
cd $srcdir/Linux-PAM-$pkgver
- ./configure --libdir=/usr/lib --sbindir=/usr/bin
+ ./configure --libdir=/usr/lib --sbindir=/usr/bin --disable-db
make
cd $srcdir/pam_unix2-2.9.1
diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD
index 4e5c7e5bf..451604289 100644
--- a/core/sudo/PKGBUILD
+++ b/core/sudo/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204571 2014-01-23 02:27:37Z foutrelis $
+# $Id: PKGBUILD 205612 2014-02-09 15:37:47Z foutrelis $
# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: Allan McRae <allan@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
pkgname=sudo
-_sudover=1.8.9p4
+_sudover=1.8.9p5
pkgver=${_sudover/p/.p}
pkgrel=1
pkgdesc="Give certain users the ability to run some commands as root"
@@ -12,13 +12,13 @@ arch=('i686' 'x86_64')
url="http://www.sudo.ws/sudo/"
license=('custom')
groups=('base-devel')
-depends=('glibc' 'pam')
+depends=('glibc' 'pam' 'libldap')
backup=('etc/sudoers' 'etc/pam.d/sudo')
source=(http://www.sudo.ws/sudo/dist/$pkgname-$_sudover.tar.gz{,.sig}
sudo.pam)
-sha256sums=('1943f9e9409c6542935d2e2d862c48d0d69dcf27288b294b8b537c02f52ac7a7'
+sha256sums=('bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21'
'SKIP'
- 'e7de79d2c73f2b32b20a8e797e54777a2bf19788ec03e48decd6c15cd93718ae')
+ 'd1738818070684a5d2c9b26224906aad69a4fea77aabd960fc2675aee2df1fa2')
build() {
cd "$srcdir/$pkgname-$_sudover"
@@ -29,6 +29,8 @@ build() {
--libexecdir=/usr/lib \
--with-logfac=auth \
--with-pam \
+ --with-ldap \
+ --with-ldap-conf-file=/etc/openldap/ldap.conf \
--with-env-editor \
--with-passprompt="[sudo] password for %p: " \
--with-all-insults
diff --git a/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch b/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch
deleted file mode 100644
index 684aedaec..000000000
--- a/core/sudo/sudo-1.8.9p3-remove-backchannel-event-if-we-get-eof.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Todd C. Miller <Todd.Miller@courtesan.com>
-# Date 1389722096 25200
-# Node ID a204b69d91f786444899ce3fc95ed535b6e32d33
-# Parent 987087ce465828da121b9d67412f42feaea06d56
-If not logging I/O we may get EOF when the command is executed and
-the other end of the backchannel is closed. Just remove the
-backchannel event in this case or we will continue to receive
-the event. Bug #631
-
-diff -r 987087ce4658 -r a204b69d91f7 src/exec.c
---- a/src/exec.c Tue Jan 14 09:26:14 2014 -0700
-+++ b/src/exec.c Tue Jan 14 10:54:56 2014 -0700
-@@ -230,11 +230,14 @@
- /* Short read or EOF. */
- sudo_debug_printf(SUDO_DEBUG_ERROR,
- "failed to read child status: %s", n ? "short read" : "EOF");
-- /*
-- * If not logging I/O we may get EOF when the command is
-- * executed and sv is closed. It is safe to ignore this.
-- */
-- if (ec->log_io || n != 0) {
-+ if (!ec->log_io && n == 0) {
-+ /*
-+ * If not logging I/O we may get EOF when the command is
-+ * executed and the other end of the backchannel is closed.
-+ * Just remove the event in this case.
-+ */
-+ (void)sudo_ev_del(ec->evbase, backchannel_event);
-+ } else {
- /* XXX - need new CMD_ type for monitor errors. */
- errno = n ? EIO : ECONNRESET;
- ec->cstat->type = CMD_ERRNO;
-
diff --git a/core/sudo/sudo.pam b/core/sudo/sudo.pam
index 4e586cd22..ab053c543 100644
--- a/core/sudo/sudo.pam
+++ b/core/sudo/sudo.pam
@@ -1,3 +1,4 @@
#%PAM-1.0
-auth required pam_unix.so
-auth required pam_nologin.so
+auth include system-auth
+account include system-auth
+session include system-auth
diff --git a/extra/apr-util/PKGBUILD b/extra/apr-util/PKGBUILD
index 172a62a08..9a9e76bb9 100644
--- a/extra/apr-util/PKGBUILD
+++ b/extra/apr-util/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 200761 2013-12-04 19:37:05Z jgc $
+# $Id: PKGBUILD 205605 2014-02-09 10:29:36Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Pierre Schmitz <pierre@archlinux.de>
pkgname=apr-util
pkgver=1.5.3
-pkgrel=1
+pkgrel=2
pkgdesc="The Apache Portable Runtime"
arch=('i686' 'x86_64')
url="http://apr.apache.org/"
-depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
+depends=('apr' 'gdbm' 'expat' 'libldap' 'unixodbc')
license=('APACHE')
source=(http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2{,.asc})
md5sums=('6f3417691c7a27090f36e7cf4d94b36e'
@@ -17,8 +17,8 @@ md5sums=('6f3417691c7a27090f36e7cf4d94b36e'
build() {
cd "${srcdir}/apr-util-${pkgver}"
./configure --prefix=/usr --with-apr=/usr \
- --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
- --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
+ --with-ldap \
+ --with-gdbm=/usr
make
}
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index c00a0962e..293fb9a9c 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 197903 2013-10-30 11:35:00Z allan $
+# $Id: PKGBUILD 205606 2014-02-09 10:29:38Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
# This package spans multiple repositories.
@@ -8,13 +8,13 @@ pkgbase=('cyrus-sasl')
pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
#pkgname=libsasl
pkgver=2.1.26
-pkgrel=6
+pkgrel=7
pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
arch=('i686' 'x86_64')
url="http://cyrusimap.web.cmu.edu/"
license=('custom')
options=('!makeflags')
-makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite2')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl' 'sqlite')
source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
cyrus-sasl-2.1.22-qa.patch
cyrus-sasl-2.1.26-size_t.patch
@@ -26,7 +26,8 @@ source=(ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-${pkgver}.tar.gz
saslauthd.service
saslauthd.conf.d
tmpfiles.conf
- CVE-2013-4122.patch)
+ CVE-2013-4122.patch
+ cyrus-sasl-sql.patch)
md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
'79b8a5e8689989e2afd4b7bda595a7b1'
'f45aa8c42b32e0569ab3d14a83485b37'
@@ -38,7 +39,8 @@ md5sums=('a7f4e5e559a0e37b3ffc438c9456e425'
'3499dcd610ad1ad58e0faffde2aa7a23'
'49219af5641150edec288a3fdb65e7c1'
'45bb0192d2f188066240b9a66ee6365f'
- 'c5f0ec88c584a75c14d7f402eaeed7ef')
+ 'c5f0ec88c584a75c14d7f402eaeed7ef'
+ '82c0f66fdc5c1145eb48ea9116c27931')
prepare() {
cd cyrus-sasl-$pkgver
@@ -50,6 +52,7 @@ prepare() {
patch -Np1 -i ../0026_drop_krb5support_dependency.patch
patch -Np1 -i ../0030-dont_use_la_files_for_opening_plugins.patch
patch -Np1 -i ../CVE-2013-4122.patch
+ patch -Np0 -i ../cyrus-sasl-sql.patch
sed 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' -i configure.in
}
@@ -100,11 +103,15 @@ build() {
--enable-ntlm \
--disable-passdss \
--enable-sql \
+ --with-mysql \
+ --with-pgsql=/usr/lib \
+ --with-sqlite3=/usr/lib \
--enable-ldapdb \
--disable-macos-framework \
--with-pam \
--with-saslauthd=/var/run/saslauthd \
--with-ldap \
+ --with-dblib=gdbm \
--with-configdir=/etc/sasl2:/etc/sasl:/usr/lib/sasl2 \
--sysconfdir=/etc \
--with-devrandom=/dev/urandom
@@ -174,7 +181,7 @@ package_cyrus-sasl-ldap() {
package_cyrus-sasl-sql() {
pkgdesc="SQL auxprop module for Cyrus SASL"
- depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite2')
+ depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient' 'sqlite')
replaces=('cyrus-sasl-plugins')
cd cyrus-sasl-$pkgver/plugins
diff --git a/extra/cyrus-sasl/cyrus-sasl-sql.patch b/extra/cyrus-sasl/cyrus-sasl-sql.patch
new file mode 100644
index 000000000..2dcdad822
--- /dev/null
+++ b/extra/cyrus-sasl/cyrus-sasl-sql.patch
@@ -0,0 +1,39 @@
+--- configure.in 2012-10-12 16:05:48.000000000 +0200
++++ configure.in 2013-05-11 18:48:59.021848013 +0200
+@@ -861,9 +860,9 @@
+ notfound) AC_WARN([SQLite Library not found]); true;;
+ *)
+ if test -d ${with_sqlite}/lib; then
+- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
++ LIB_SQLITE="-L${with_sqlite}/lib"
+ else
+- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
++ LIB_SQLITE="-L${with_sqlite}"
+ fi
+
+ LIB_SQLITE_DIR=$LIB_SQLITE
+@@ -913,9 +912,9 @@
+ notfound) AC_WARN([SQLite3 Library not found]); true;;
+ *)
+ if test -d ${with_sqlite3}/lib; then
+- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
++ LIB_SQLITE3="-L${with_sqlite3}/lib"
+ else
+- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
++ LIB_SQLITE3="-L${with_sqlite3}"
+ fi
+
+ LIB_SQLITE3_DIR=$LIB_SQLITE3
+--- configure.in
++++ configure.in
+@@ -674,7 +674,9 @@
+ LIB_PGSQL_DIR=$LIB_PGSQL
+ LIB_PGSQL="$LIB_PGSQL -lpq"
+
+- if test -d ${with_pgsql}/include/pgsql; then
++ if test -d ${with_pgsql}/include/postgresql/pgsql; then
++ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql"
++ elif test -d ${with_pgsql}/include/pgsql; then
+ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+ elif test -d ${with_pgsql}/pgsql/include; then
+ CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"
diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD
index 1124eb914..53a7bde44 100644
--- a/extra/festival/PKGBUILD
+++ b/extra/festival/PKGBUILD
@@ -1,26 +1,27 @@
-# $Id: PKGBUILD 137968 2011-09-13 09:17:12Z eric $
+# $Id: PKGBUILD 205607 2014-02-09 10:29:39Z andyrtr $
# Maintainer:
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Simo Leone <neotuli@gmail.com>
pkgname=festival
pkgver=2.1
-_suffix=release
-pkgrel=3
+pkgrel=4
pkgdesc="A general multi-lingual speech synthesis system"
arch=('i686' 'x86_64')
url="http://www.cstr.ed.ac.uk/projects/festival/"
license=('BSD' 'GPL' 'custom')
depends=('perl')
options=('!makeflags')
-source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-${_suffix}.tar.gz"
- "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-${_suffix}.tar.gz"
- "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz"
- "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz"
- "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz"
- 'speechconfig.patch'
- 'festconfig.patch'
- 'festival-shared-build.patch')
+source=(http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pkgver}-release.tar.gz
+ http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-${pkgver}-release.tar.gz
+ http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz
+ http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz
+ http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz
+ speechconfig.patch
+ festconfig.patch
+ festival-shared-build.patch
+ festival.gcc47.patch
+ festival-2.1-bettersonamehack.patch)
md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
'6920ddc75b042910a3bcfee3ab106938'
'6a2ee4fed7c3ebedf197a3b8524ccb87'
@@ -28,31 +29,38 @@ md5sums=('c93eb3e389ed171ab9abd46afe8897a8'
'aa80f9250065b318325f16fdad3a4484'
'c30ae990baca40c9c2b1d5cd27502139'
'348cc033430aee7989463198818ae74c'
- '46132b1cd86a982007312def49ab176a')
+ '02f589688182527308e3fe8d1a82c056'
+ 'ed738fdf981aaddbae6d00c3a0120d62'
+ '85367db2b57bae214d1032e2fc896753')
+
+prepare() {
+ cd $srcdir
+ patch -Np0 -i ${srcdir}/speechconfig.patch
+ patch -Np0 -i ${srcdir}/festconfig.patch
+
+ # fix build with new gcc versions and build shared libs - taken from Mageia
+ patch -Np0 -i ${srcdir}/festival-shared-build.patch
+ patch -Np0 -i ${srcdir}/festival-2.1-bettersonamehack.patch
+ patch -Np0 -i ${srcdir}/festival.gcc47.patch
+
+ # Avoid make failure on making scripts and docs
+ sed -i "s#examples bin doc#examples#" festival/Makefile
+}
build() {
- cd "$srcdir"
- patch -Np0 -i "$srcdir/festival-shared-build.patch"
-
# Build Speech Tools first
cd "$srcdir/speech_tools"
- patch -Np1 -i "$srcdir/speechconfig.patch"
./configure --prefix=/usr --sysconfdir=/etc
- make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
+ make OPTIMISE_CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing" OPTIMISE_CCFLAGS="${CFLAGS} -fno-strict-aliasing"
# Build Festival itself
cd "$srcdir/festival"
- patch -Np1 -i "$srcdir/festconfig.patch"
-
- # Avoid make failure on making scripts and docs
- sed -i "s#examples bin doc#examples#" Makefile
-
./configure --prefix=/usr --sysconfdir=/etc
make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}"
}
package() {
- # Install Speech Tools first
+ # Install Speech Tools first
cd "$srcdir/speech_tools"
install -dm755 "$pkgdir"/usr/{bin,lib,include/speech_tools/{,instantiate,ling_class,rxp,sigpr,unix}}
@@ -69,7 +77,6 @@ package() {
ln -sf libestbase.so.${pkgver}.1 "$pkgdir"/usr/lib/libestbase.so
ln -sf libestools.so.${pkgver}.1 "$pkgdir"/usr/lib/libestools.so
ln -sf libeststring.so.1.2 "$pkgdir"/usr/lib/libeststring.so
- install -m644 -t "$pkgdir"/usr/lib lib/lib*.a
#headers
for dir in {.,instantiate,ling_class,rxp,sigpr,unix}; do
@@ -95,7 +102,6 @@ package() {
install -m755 examples/text2wave "$pkgdir"/usr/bin
#libraries
- install -m644 src/lib/libFestival.a "$pkgdir"/usr/lib/
install -m755 src/lib/libFestival.so.* "$pkgdir"/usr/lib/
ln -sf libFestival.so.2.1.0 "$pkgdir"/usr/lib/libFestival.so
@@ -105,8 +111,8 @@ package() {
mkdir -p "$pkgdir"/usr/share/festival
cp -aR lib/* "$pkgdir"/usr/share/festival
- rm -f $(find "$pkgdir"/usr/share/festival -name Makefile)
- rm -f $(find "$pkgdir"/usr/bin -name Makefile)
+ rm -fv $(find "$pkgdir"/usr/share/festival -name Makefile)
+ rm -fv $(find "$pkgdir"/usr/bin -name Makefile)
#create voices directory
install -dm755 "$pkgdir"/usr/share/festival/voices
diff --git a/extra/festival/festival-2.1-bettersonamehack.patch b/extra/festival/festival-2.1-bettersonamehack.patch
new file mode 100644
index 000000000..0830168c6
--- /dev/null
+++ b/extra/festival/festival-2.1-bettersonamehack.patch
@@ -0,0 +1,35 @@
+diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
+--- speech_tools/config/compilers/gcc_defaults.mak.bettersoname 2010-12-06 10:25:35.000000000 +0100
++++ speech_tools/config/compilers/gcc_defaults.mak 2010-12-06 10:27:51.000000000 +0100
+@@ -78,7 +78,7 @@ SHARED_CXXFLAGS = -fPIC
+ SHARED_LINKFLAGS =
+
+ ifndef GCC_MAKE_SHARED_LIB
+- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname,YYY
+ else
+ MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
+ endif
+diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
+--- speech_tools/config/rules/library.mak.bettersoname 2001-04-04 13:55:32.000000000 +0200
++++ speech_tools/config/rules/library.mak 2010-12-06 10:25:35.000000000 +0100
+@@ -103,14 +103,14 @@ endif
+ ###########################################################################
+
+ lib%.so : lib%.a
+- @echo Make Shared Library $*
++ @echo Make Shared Library $(*F)
+ @if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
+ @(cd shared_space ; $(AR) x ../$< )
+- @echo Link Shared Library $*
+- if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
+- $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
++ @echo Link Shared Library $(*F)
++ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
++ $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
+ @$(RM) -f shared_space/*.o $@
+- @ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
++ @ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
+
+ ###########################################################################
+ ## ##
diff --git a/extra/festival/festival-shared-build.patch b/extra/festival/festival-shared-build.patch
index edfa38b17..ee824d458 100644
--- a/extra/festival/festival-shared-build.patch
+++ b/extra/festival/festival-shared-build.patch
@@ -1,3 +1,18 @@
+--- speech_tools/config/project.mak.orig 2007-03-13 15:27:53.000000000 -0400
++++ speech_tools/config/project.mak 2007-03-13 15:29:12.000000000 -0400
+@@ -99,8 +99,9 @@
+ PROJECT_LIBRARY_DIR_eststring = $(TOP)/lib
+ PROJECT_LIBRARY_DIR_estjava = $(TOP)/lib
+
+-PROJECT_LIBRARY_USES_estbase = eststring
+-
++PROJECT_LIBRARY_USES_estbase = eststring m
++PROJECT_LIBRARY_USES_estools = estbase m ncurses
++PROJECT_LIBRARY_USES_eststring = m
+ PROJECT_LIBRARY_USES_estjava = estbase eststring
+
+ PROJECT_LIBRARY_VERSION_estools = $(PROJECT_VERSION).1
+
--- speech_tools/config/rules/defaults.mak.orig 2007-03-16 12:39:12.000000000 -0400
+++ speech_tools/config/rules/defaults.mak 2007-03-16 12:39:19.000000000 -0400
@@ -69,15 +69,21 @@
@@ -35,38 +50,3 @@
# Libraries used from other projects
REQUIRED_LIBRARIES = estools estbase eststring
-diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak
---- speech_tools/config/compilers/gcc_defaults.mak.bettersoname 2010-12-06 10:25:35.000000000 +0100
-+++ speech_tools/config/compilers/gcc_defaults.mak 2010-12-06 10:27:51.000000000 +0100
-@@ -78,7 +78,7 @@ SHARED_CXXFLAGS = -fPIC
- SHARED_LINKFLAGS =
-
- ifndef GCC_MAKE_SHARED_LIB
-- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
-+ MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname,YYY
- else
- MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
- endif
-diff -p -up festival/speech_tools/config/rules/library.mak.bettersoname festival/speech_tools/config/rules/library.mak
---- speech_tools/config/rules/library.mak.bettersoname 2001-04-04 13:55:32.000000000 +0200
-+++ speech_tools/config/rules/library.mak 2010-12-06 10:25:35.000000000 +0100
-@@ -103,14 +103,14 @@ endif
- ###########################################################################
-
- lib%.so : lib%.a
-- @echo Make Shared Library $*
-+ @echo Make Shared Library $(*F)
- @if [ ! -d shared_space ] ; then mkdir shared_space ; else $(RM) -f shared_space/*.o ; fi
- @(cd shared_space ; $(AR) x ../$< )
-- @echo Link Shared Library $*
-- if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$*)" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
-- $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$*),$(MAKE_SHARED_LIB)) shared_space/*.o $(PROJECT_LIBRARY_USES_$*:%=-L. -l%) $$libs
-+ @echo Link Shared Library $(*F)
-+ if [ -n "$(PROJECT_LIBRARY_NEEDS_SYSLIBS_$(*F))" ] ; then libs='$(JAVA_PROJECT_LIBS)' ; fi ;\
-+ $(subst XXX,$@.$(PROJECT_LIBRARY_VERSION_$(*F)),$(subst YYY,$(@F).$(PROJECT_LIBRARY_VERSION_$(*F)),$(MAKE_SHARED_LIB))) shared_space/*.o $(PROJECT_LIBRARY_USES_$(*F):%=-L. -l%) $$libs
- @$(RM) -f shared_space/*.o $@
-- @ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
-+ @ln -s $(@F).$(PROJECT_LIBRARY_VERSION_$(*F)) $@
-
- ###########################################################################
- ## ##
diff --git a/extra/festival/festival.gcc47.patch b/extra/festival/festival.gcc47.patch
new file mode 100644
index 000000000..40c8c72b8
--- /dev/null
+++ b/extra/festival/festival.gcc47.patch
@@ -0,0 +1,121 @@
+--- speech_tools/base_class/EST_TSimpleMatrix.cc.gcc 2009-02-18 20:56:24.000000000 +0800
++++ speech_tools/base_class/EST_TSimpleMatrix.cc 2012-10-14 13:06:35.000000000 +0800
+@@ -44,6 +44,7 @@
+ #include "EST_TVector.h"
+ #include <fstream>
+ #include <iostream>
++#include <cstring>
+ #include "EST_cutils.h"
+
+ template<class T>
+@@ -98,7 +99,7 @@
+ {
+ int copy_r = Lof(this->num_rows(), new_rows);
+
+- just_resize(new_rows, new_cols, &old_vals);
++ this->just_resize(new_rows, new_cols, &old_vals);
+
+ for (q=0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */
+ ((char *)this->p_memory)[q] = ((char *)old_vals)[q];
+@@ -127,9 +128,9 @@
+ int copy_r = Lof(this->num_rows(), new_rows);
+ int copy_c = Lof(this->num_columns(), new_cols);
+
+- just_resize(new_rows, new_cols, &old_vals);
++ this->just_resize(new_rows, new_cols, &old_vals);
+
+- set_values(old_vals,
++ this->set_values(old_vals,
+ old_row_step, old_column_step,
+ 0, copy_r,
+ 0, copy_c);
+--- speech_tools/base_class/EST_TSimpleVector.cc.gcc 2009-02-18 20:52:55.000000000 +0800
++++ speech_tools/base_class/EST_TSimpleVector.cc 2012-10-14 13:09:37.000000000 +0800
+@@ -43,6 +43,7 @@
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
+ #include <fstream>
++#include <cstring>
+ #include "EST_cutils.h"
+
+ template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
+@@ -70,7 +71,7 @@
+ int old_offset = this->p_offset;
+ unsigned int q;
+
+- just_resize(newn, &old_vals);
++ this->just_resize(newn, &old_vals);
+
+ if (set && old_vals)
+ {
+--- speech_tools/include/EST_TIterator.h.gcc 2004-05-04 08:00:16.000000000 +0800
++++ speech_tools/include/EST_TIterator.h 2012-10-14 12:52:52.000000000 +0800
+@@ -101,7 +101,7 @@
+
+ /// Create an iterator ready to run over the given container.
+ EST_TIterator(const Container &over)
+- { begin(over); }
++ { this->begin(over); }
+
+ /// Copy an iterator by assignment
+ Iter &operator = (const Iter &orig)
+@@ -109,7 +109,7 @@
+
+ /// Assigning a container to an iterator sets it ready to start.
+ Iter &operator = (const Container &over)
+- { begin(over); return *this;}
++ { this->begin(over); return *this;}
+
+ /// Set the iterator ready to run over this container.
+ void begin(const Container &over)
+@@ -209,7 +209,7 @@
+
+ /// Create an iterator ready to run over the given container.
+ EST_TStructIterator(const Container &over)
+- { begin(over); }
++ { this->begin(over); }
+
+ const Entry *operator ->() const
+ {return &this->current();}
+@@ -239,7 +239,7 @@
+
+ /// Create an iterator ready to run over the given container.
+ EST_TRwIterator(Container &over)
+- { begin(over); }
++ { this->begin(over); }
+
+ /// Set the iterator ready to run over this container.
+ void begin(Container &over)
+@@ -289,7 +289,7 @@
+
+ /// Create an iterator ready to run over the given container.
+ EST_TRwStructIterator(Container &over)
+- { begin(over); }
++ { this->begin(over); }
+
+ Entry *operator ->() const
+ {return &this->current();}
+--- speech_tools/include/EST_TNamedEnum.h.gcc 2004-09-30 20:53:36.000000000 +0800
++++ speech_tools/include/EST_TNamedEnum.h 2012-10-14 12:52:52.000000000 +0800
+@@ -130,7 +130,7 @@
+ {this->initialise((const void *)defs); };
+ EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *))
+ {this->initialise((const void *)defs, conv); };
+- const char *name(ENUM tok, int n=0) const {return value(tok,n); };
++ const char *name(ENUM tok, int n=0) const {return this->value(tok,n); };
+
+ };
+
+--- festival/src/modules/Text/text_modes.cc.gcc 2012-10-14 13:08:54.000000000 +0800
++++ festival/src/modules/Text/text_modes.cc 2012-10-14 13:09:09.000000000 +0800
+@@ -59,8 +59,8 @@
+ void tts_file_user_mode(LISP filename, LISP params)
+ {
+
+- volatile EST_String tmpname = make_tmp_filename();
+- volatile EST_String inname = (EST_String)get_c_string(filename);
++ EST_String tmpname = make_tmp_filename();
++ EST_String inname = (EST_String)get_c_string(filename);
+ volatile EST_String filter;
+ volatile EST_TokenStream ts;
+ volatile LISP func;
diff --git a/extra/gtkmathview/PKGBUILD b/extra/gtkmathview/PKGBUILD
index b09710324..d5e123ef6 100644
--- a/extra/gtkmathview/PKGBUILD
+++ b/extra/gtkmathview/PKGBUILD
@@ -1,33 +1,48 @@
-# $Id: PKGBUILD 198078 2013-10-30 12:40:13Z allan $
+# $Id: PKGBUILD 205608 2014-02-09 10:29:40Z andyrtr $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Jan de Groot <jgc@archlinux.org>
pkgname=gtkmathview
pkgver=0.8.0
-pkgrel=3
+pkgrel=4
pkgdesc="C++ rendering engine for MathML documents"
arch=('i686' 'x86_64')
url="http://helm.cs.unibo.it/mml-widget/"
-license=('GPL')
-depends=('popt' 'gtk2' 't1lib' 'gmetadom')
-source=("http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz"
- 'gtkmathview-0.8.0-gcc44.patch'
- 'gtkmathview-0.8.0-cond-t1.patch')
+license=('LGPL3')
+depends=('popt' 'gtk2' 't1lib' 'gmetadom' 'pangox-compat')
+source=(http://helm.cs.unibo.it/mml-widget/sources/${pkgname}-${pkgver}.tar.gz
+ gtkmathview-0.8.0-gcc43.patch
+ gtkmathview-0.8.0-cond-t1.patch
+ gtkmathview-0.8.0-gcc47.patch
+ gtkmathview-0.8.0-includes.patch)
md5sums=('b53564e553728d4b69f7d366dfeb5299'
- '9fd261db865336c89ebf0f3545af9bc4'
- 'a79a27e00908e75712bc9453b669fe61')
+ '92eb2870c1922cbebd5566900cde220b'
+ 'a79a27e00908e75712bc9453b669fe61'
+ '8c8620aee002b30975e1e175ef9af7a7'
+ '4fc8daefbf27d49067b0c66bba54f428')
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc44.patch
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc43.patch
+ patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-gcc47.patch
+ patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-includes.patch
patch -Np1 -i ${srcdir}/gtkmathview-0.8.0-cond-t1.patch
+
+ # AM_BINRELOC missing, just ignore
+ echo 'AC_DEFUN([AM_BINRELOC], [])' > acinclude.m4
+ autoreconf -if
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
./configure --prefix=/usr \
- --sysconfdir=/etc
- make
+ --sysconfdir=/etc \
+ --disable-static
+ make LIBTOOL=/usr/bin/libtool
}
package() {
- cd ${srcdir}/${pkgname}-${pkgver}
+ cd ${pkgname}-${pkgver}
make DESTDIR=${pkgdir}/ install
}
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch
new file mode 100644
index 000000000..437e3e2b1
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-gcc43.patch
@@ -0,0 +1,56 @@
+diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc43 gtkmathview-0.8.0/mathmlps/main.cc
+--- gtkmathview-0.8.0/mathmlps/main.cc.gcc43 2008-07-29 16:40:04.000000000 -0400
++++ gtkmathview-0.8.0/mathmlps/main.cc 2008-07-29 16:40:14.000000000 -0400
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <cassert>
+ #include <fstream>
+
+diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43 gtkmathview-0.8.0/mathmlsvg/main.cc
+--- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc43 2007-08-17 06:02:46.000000000 -0400
++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-07-29 16:33:03.000000000 -0400
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <cassert>
+ #include <fstream>
+
+diff -up gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43 gtkmathview-0.8.0/mathmlsvg/SMS.cc
+--- gtkmathview-0.8.0/mathmlsvg/SMS.cc.gcc43 2008-07-29 16:39:01.000000000 -0400
++++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-07-29 16:39:07.000000000 -0400
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <sstream>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
+diff -up gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43 gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
+--- gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc.gcc43 2008-07-29 16:35:24.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-07-29 16:35:28.000000000 -0400
+@@ -19,7 +19,7 @@
+ #include <t1lib.h>
+ #include <config.h>
+ #include <map>
+-#include <string>
++#include <cstring>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <list>
+diff -up gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43 gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
+--- gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc.gcc43 2007-08-17 06:02:38.000000000 -0400
++++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-07-29 16:33:03.000000000 -0400
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <cassert>
+
+ #include "mathVariantAux.hh"
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch
deleted file mode 100644
index a9069056b..000000000
--- a/extra/gtkmathview/gtkmathview-0.8.0-gcc44.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff -urN gtkmathview-0.8.0-orig/mathmlps/main.cc gtkmathview-0.8.0/mathmlps/main.cc
---- gtkmathview-0.8.0-orig/mathmlps/main.cc 2008-04-03 22:43:06.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlps/main.cc 2008-04-03 23:53:16.000000000 +0400
-@@ -20,6 +20,7 @@
-
- #include <cassert>
- #include <fstream>
-+#include <cstring>
-
- #include <popt.h>
-
-diff -urN gtkmathview-0.8.0-orig/mathmlsvg/main.cc gtkmathview-0.8.0/mathmlsvg/main.cc
---- gtkmathview-0.8.0-orig/mathmlsvg/main.cc 2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlsvg/main.cc 2008-04-03 23:43:31.000000000 +0400
-@@ -20,6 +20,7 @@
-
- #include <cassert>
- #include <fstream>
-+#include <cstring>
-
- #include <popt.h>
-
-diff -urN gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc gtkmathview-0.8.0/mathmlsvg/SMS.cc
---- gtkmathview-0.8.0-orig/mathmlsvg/SMS.cc 2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/mathmlsvg/SMS.cc 2008-04-03 23:25:12.000000000 +0400
-@@ -19,6 +19,7 @@
- #include <config.h>
-
- #include <sstream>
-+#include <cstring>
- #include "defs.h"
- #include "AbstractLogger.hh"
- #include "ValueConversion.hh"
-diff -urN gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc
---- gtkmathview-0.8.0-orig/src/engine/mathml/mathVariantAux.cc 2008-04-03 22:43:05.000000000 +0400
-+++ gtkmathview-0.8.0/src/engine/mathml/mathVariantAux.cc 2008-04-03 23:10:05.000000000 +0400
-@@ -20,6 +20,8 @@
-
- #include <cassert>
-
-+#include <cstring>
-+
- #include "mathVariantAux.hh"
-
- static MathVariantAttributes vattr[] = {
-diff -urN gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc
---- gtkmathview-0.8.0-orig/src/backend/ps/T1_FontDataBase.cc 2007-08-17 12:02:40.000000000 +0200
-+++ gtkmathview-0.8.0/src/backend/ps/T1_FontDataBase.cc 2008-06-07 12:26:01.000000000 +0200
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <iostream>
- #include <list>
-+#include <cstring>
-
- #include "String.hh"
- #include "T1_FontDataBase.hh"
---- a/src/common/AbstractLogger.cc 2009-06-12 16:29:57.000000000 -0700
-+++ b/src/common/AbstractLogger.cc 2009-06-12 16:29:57.000000000 -0700
-@@ -18,6 +18,8 @@
-
- #include <config.h>
-
-+#include <cstdio>
-+
- #include <stdarg.h>
-
- #include "AbstractLogger.hh"
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch b/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch
new file mode 100644
index 000000000..958617886
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-gcc47.patch
@@ -0,0 +1,67 @@
+diff -up gtkmathview-0.8.0/mathmlps/main.cc.gcc47 gtkmathview-0.8.0/mathmlps/main.cc
+--- gtkmathview-0.8.0/mathmlps/main.cc.gcc47 2012-02-27 13:12:01.218602317 -0500
++++ gtkmathview-0.8.0/mathmlps/main.cc 2012-02-27 13:12:06.596555579 -0500
+@@ -21,6 +21,13 @@
+ #include <cstring>
+ #include <cassert>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+
+ #include <popt.h>
+
+diff -up gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47 gtkmathview-0.8.0/mathmlsvg/main.cc
+--- gtkmathview-0.8.0/mathmlsvg/main.cc.gcc47 2012-02-27 13:10:33.335366105 -0500
++++ gtkmathview-0.8.0/mathmlsvg/main.cc 2012-02-27 13:10:33.374365766 -0500
+@@ -21,6 +21,13 @@
+ #include <cstring>
+ #include <cassert>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+
+ #include <popt.h>
+
+diff -up gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh
+--- gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh.gcc47 2007-08-17 06:02:34.000000000 -0400
++++ gtkmathview-0.8.0/src/frontend/common/TemplateBuilder.hh 2012-02-27 13:10:33.376365750 -0500
+@@ -47,12 +47,13 @@ protected:
+ SmartPtr<typename ElementBuilder::type>
+ getElement(const typename Model::Element& el) const
+ {
+- if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++ SmartPtr<typename ElementBuilder::type> elem;
++ if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+ return elem;
+ else
+ {
+- SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+- linkerAdd(el, elem);
++ elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++ this->linkerAdd(el, elem);
+ return elem;
+ }
+ }
+diff -up gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47 gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh
+--- gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh.gcc47 2007-08-17 06:02:34.000000000 -0400
++++ gtkmathview-0.8.0/src/frontend/common/TemplateElementIterator.hh 2012-02-27 13:10:33.377365741 -0500
+@@ -43,7 +43,7 @@ protected:
+ findValidNodeForward(const typename Model::Node& p0) const
+ {
+ for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+- if (valid(p)) return Model::asElement(p);
++ if (this->valid(p)) return Model::asElement(p);
+ return typename Model::Element();
+ }
+
+
diff --git a/extra/gtkmathview/gtkmathview-0.8.0-includes.patch b/extra/gtkmathview/gtkmathview-0.8.0-includes.patch
new file mode 100644
index 000000000..665c7827e
--- /dev/null
+++ b/extra/gtkmathview/gtkmathview-0.8.0-includes.patch
@@ -0,0 +1,12 @@
+diff -ru gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc gtkmathview-0.8.0/src/common/AbstractLogger.cc
+--- gtkmathview-0.8.0.orig/src/common/AbstractLogger.cc 2009-02-28 13:56:00.000000000 +0000
++++ gtkmathview-0.8.0/src/common/AbstractLogger.cc 2009-02-28 13:56:28.000000000 +0000
+@@ -19,6 +19,7 @@
+ #include <config.h>
+
+ #include <stdarg.h>
++#include <stdio.h>
+
+ #include "AbstractLogger.hh"
+
+
diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD
index 6e2ba74c1..ab930d5c2 100644
--- a/extra/mono/PKGBUILD
+++ b/extra/mono/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 198325 2013-10-30 14:10:51Z allan $
+# $Id: PKGBUILD 205609 2014-02-09 10:29:41Z andyrtr $
# Maintainer: Daniel Isenmann <daniel@archlinux.org>
# Contributor: Brice Carpentier <brice@dlfp.org>
pkgname=mono
pkgver=3.2.3
-pkgrel=1
+pkgrel=2
pkgdesc="Free implementation of the .NET platform including runtime and compiler"
arch=(i686 x86_64)
-license=('GPL' 'LGPL2' 'MPL' 'custom:MITX11')
+license=('GPL' 'LGPL2.1' 'MPL' 'custom:MITX11')
url="http://www.mono-project.com/"
-depends=('zlib' 'libgdiplus>=2.10' 'sh')
-makedepends=('pkgconfig')
+depends=('zlib' 'libgdiplus>=2.10' 'sh' 'python')
options=('!makeflags')
provides=('monodoc')
conflicts=('monodoc')
-install=mono.install
source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2
mono.binfmt.d
- mono.install
- sgen_fix.patch)
+ sgen_fix.patch)
md5sums=('a66c6309fad071e21f77f4c6b67a0f10'
'b9ef8a65fea497acf176cca16c1e2402'
- 'ca1108e9638b01c26453ee663592a4e5'
'8a700b94bff7a913f920e95890d2fb4c')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
patch -p1 < ../sgen_fix.patch
# build mono
- ./configure --prefix=/usr --sysconfdir=/etc --bindir=/usr/bin --sbindir=/usr/bin
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --bindir=/usr/bin \
+ --sbindir=/usr/bin \
+ --disable-static
make
# build jay
@@ -41,9 +41,9 @@ package() {
make DESTDIR="${pkgdir}" install
# install jay
- cd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
+ pushd "${srcdir}"/${pkgname}-${pkgver}/mcs/jay
make DESTDIR="${pkgdir}" prefix=/usr INSTALL=../../install-sh install
- cd "${srcdir}"/${pkgname}-${pkgver}
+ popd
# install binfmt conf file and pathes
install -D -m644 "${srcdir}"/mono.binfmt.d "${pkgdir}"/usr/lib/binfmt.d/mono.conf
diff --git a/extra/mono/mini_amd64.patch b/extra/mono/mini_amd64.patch
deleted file mode 100644
index f8685c337..000000000
--- a/extra/mono/mini_amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- mono/mini/mini-amd64.c 2009-03-19 21:08:18 UTC (rev 129824)
-+++ mono/mini/mini-amd64.c 2009-03-19 21:09:53 UTC (rev 129825)
-@@ -1009,7 +1009,7 @@
- locals_size += mono_type_size (ins->inst_vtype, &ialign);
- }
-
-- if ((cfg->num_varinfo > 10000) || (locals_size >= (1 << 15))) {
-+ if ((cfg->num_varinfo > 5000) || (locals_size >= (1 << 15)) || (header->code_size > 110000)) {
- /* Avoid hitting the stack_alloc_size < (1 << 16) assertion in emit_epilog () */
- cfg->arch.omit_fp = FALSE;
- }
-
-
diff --git a/extra/mono/mono.install b/extra/mono/mono.install
deleted file mode 100644
index 6a57c2a70..000000000
--- a/extra/mono/mono.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-ln -sf /bin/mono-sgen /bin/mono
-}
-
-post_upgrade() {
-post_install
-}
diff --git a/extra/redland/PKGBUILD b/extra/redland/PKGBUILD
index facd62271..0d44296a0 100644
--- a/extra/redland/PKGBUILD
+++ b/extra/redland/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 204645 2014-01-24 14:22:15Z tomegun $
+# $Id: PKGBUILD 205610 2014-02-09 10:29:42Z andyrtr $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: AndyRTR <andyrtr@archlinux.org>
# Contributor: Francois Charette <francois.archlinux.org>
pkgbase=redland
epoch=1
+# maybe rename redland-storage-mysql to redland-storage-mariadb or add a provide tag
pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
pkgver=1.0.17
-pkgrel=1
+pkgrel=2
url="http://librdf.org/"
license=("GPL")
arch=('i686' 'x86_64')
-makedepends=('rasqal' 'raptor' 'db' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
+makedepends=('rasqal' 'raptor' 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite')
source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
rpath.diff)
sha256sums=('de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681'
@@ -25,7 +26,8 @@ build() {
--disable-static \
--with-raptor=system \
--with-rasqal=system \
- --with-sqlite=3
+ --with-sqlite=3 \
+ --with-bdb=no
# nuke rpath
patch -Np0 -i "${srcdir}/rpath.diff"
@@ -62,7 +64,7 @@ package_redland-storage-postgresql() {
package_redland-storage-virtuoso() {
pkgdesc="Virtuoso storage support for Redland"
- depends=('redland' 'unixodbc' 'db')
+ depends=('redland' 'unixodbc')
cd "${srcdir}/${pkgbase}-${pkgver}"
install -dm755 "${pkgdir}/usr/lib/redland"
@@ -71,7 +73,7 @@ package_redland-storage-virtuoso() {
package_redland-storage-sqlite() {
pkgdesc="SQLite storage support for Redland"
- depends=('redland' 'sqlite3' 'db')
+ depends=('redland' 'sqlite3')
cd "${srcdir}/${pkgbase}-${pkgver}"
install -dm755 "${pkgdir}/usr/lib/redland"
diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD
index 014f72778..a68b03c25 100644
--- a/extra/shared-mime-info/PKGBUILD
+++ b/extra/shared-mime-info/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 197506 2013-10-26 08:14:56Z andyrtr $
+# $Id: PKGBUILD 205611 2014-02-09 10:29:43Z andyrtr $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=shared-mime-info
pkgver=1.2
-pkgrel=1
+pkgrel=2
pkgdesc="Freedesktop.org Shared MIME Info"
arch=('i686' 'x86_64')
-license=('GPL')
+license=('GPL2')
depends=('libxml2' 'glib2')
makedepends=('intltool' 'pkgconfig')
install=shared-mime-info.install
@@ -17,6 +17,9 @@ options=(!makeflags)
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
+ # https://bugs.archlinux.org/task/38836
+ # https://bugs.freedesktop.org/show_bug.cgi?id=70366
+ export ac_cv_func_fdatasync=no
./configure --prefix=/usr --disable-update-mimedb
make
}
diff --git a/libre/abuse-libre/abuse.install b/libre/abuse-libre/abuse.install
deleted file mode 100644
index ad97d7bab..000000000
--- a/libre/abuse-libre/abuse.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_install() {
- post_upgrade
-}
-
-post_remove() {
- post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/abuse-libre/abuse.sh b/libre/abuse-libre/abuse.sh
deleted file mode 100644
index 228bb6f7b..000000000
--- a/libre/abuse-libre/abuse.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# Use sane configuration files, unless they already exists
-
-if [ ! -d $HOME/.abuse ]; then
- mkdir -p $HOME/.abuse
-fi
-if [ ! -f $HOME/.abuse/abuserc ]; then
- cp /usr/share/abuse/default.abuserc $HOME/.abuse/abuserc
-fi
-if [ ! -f $HOME/.abuse/gamma.lsp ]; then
- cp /usr/share/abuse/default.gamma.lsp $HOME/.abuse/gamma.lsp
-fi
-
-exec /usr/bin/abuse.elf
diff --git a/libre/abuse-libre/default.abuserc b/libre/abuse-libre/default.abuserc
deleted file mode 100644
index ff116819f..000000000
--- a/libre/abuse-libre/default.abuserc
+++ /dev/null
@@ -1,37 +0,0 @@
-; Abuse-SDL Configuration file
-
-; Startup fullscreen
-fullscreen=0
-
-; Use DoubleBuffering
-doublebuf=1
-
-; Use OpenGL
-gl=1
-
-; Location of the datafiles
-datadir=/usr/share/abuse/orig
-
-; Use mono audio only
-mono=0
-
-; Grab the mouse to the window
-grabmouse=0
-
-; Set the scale factor
-scale=2
-
-; Use anti-aliasing (with gl=1 only)
-antialias=0
-
-; Disable the SDL parachute in the case of a crash
-nosdlparachute=0
-
-; Key mappings
-left=a
-right=d
-up=w
-down=s
-fire=Space
-weapprev=q
-weapnext=e
diff --git a/libre/abuse-libre/default.gamma.lsp b/libre/abuse-libre/default.gamma.lsp
deleted file mode 100644
index 9a77afa27..000000000
--- a/libre/abuse-libre/default.gamma.lsp
+++ /dev/null
@@ -1 +0,0 @@
-(setq darkest_gray 20)
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
deleted file mode 100644
index ac2bcb58b..000000000
--- a/libre/vim-runtime/PKGBUILD
+++ /dev/null
@@ -1,105 +0,0 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: tobias [ tobias at archlinux org ]
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
-
-pkgbase=vim
-pkgname=vim-runtime
-_topver=7.4
-_patchlevel=135
-__hgrev=de28b1568fc2
-_versiondir="vim${_topver//./}"
-pkgver=${_topver}.${_patchlevel}
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('custom:vim')
-url="http://www.vim.org"
-makedepends=('gpm' 'python2' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' 'lua')
-source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz"
- "ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz.sig"
- 'vimrc'
- 'parabola.vim')
-md5sums=('be672ce2a929503412378c998fc3dc27'
- 'SKIP'
- '27820c2bdc34624674c561ae6476bc6a'
- 'a8c21928eefd766e211f987879a9199c')
-
-build() {
- cp -a ${pkgbase}-${pkgver} vim-build
-
- # define the place for the global (g)vimrc file (set to /etc/vimrc)
- sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \
- vim-build/src/feature.h
- sed -i 's|^.*\(#define VIMRC_FILE.*"\) .*$|\1|' \
- vim-build/src/feature.h
-
- (cd vim-build/src && autoconf)
-
- cd "${srcdir}"/vim-build
-
- ./configure \
- --prefix=/usr \
- --localstatedir=/var/lib/vim \
- --with-features=huge \
- --with-compiledby='Parabola GNU/Linux-libre' \
- --enable-gpm \
- --enable-acl \
- --with-x=yes \
- --enable-gui=gtk2 \
- --enable-multibyte \
- --enable-cscope \
- --enable-netbeans \
- --enable-perlinterp \
- --enable-pythoninterp \
- --disable-python3interp \
- --enable-rubyinterp \
- --enable-luainterp
-
- make
-}
-
-package_vim-runtime() {
- pkgdesc='Runtime for vim and gvim (Parabola rebranded)'
- depends=('perl' 'gawk')
- backup=('etc/vimrc')
-
- cd "${srcdir}"/vim-build
-
- make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" install
-
- # delete binaries and manuals files
- rm -vr "${pkgdir}"/usr/bin
- rm -vr "${pkgdir}"/usr/share/man
-
- # Don't forget logtalk.dict
- install -Dm644 "${srcdir}"/vim-build/runtime/ftplugin/logtalk.dict \
- "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
-
- # fix FS#17216
- sed -i 's|messages,/var|messages,/var/log/messages.log,/var|' \
- "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
-
- # patch filetype.vim for better handling of pacman related files
- sed -i "s/rpmsave/pacsave/;s/rpmnew/pacnew/;s/,\*\.ebuild/\0,PKGBUILD*,*.install/" \
- "${pkgdir}"/usr/share/vim/${_versiondir}/filetype.vim
- sed -i "/find the end/,+3{s/changelog_date_entry_search/changelog_date_end_entry_search/}" \
- "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/changelog.vim
-
- # rc files
- install -Dm644 "${srcdir}"/vimrc "${pkgdir}"/etc/vimrc
- install -Dm644 "${srcdir}"/parabola.vim \
- "${pkgdir}"/usr/share/vim/vimfiles/parabola.vim
-
- # rgb.txt file
- install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \
- "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt
-
- # license
- install -dm755 "${pkgdir}"/usr/share/licenses/vim-runtime
- ln -s /usr/share/vim/${_versiondir}/doc/uganda.txt \
- "${pkgdir}"/usr/share/licenses/vim-runtime/license.txt
-}
-
-# vim:set sw=2 sts=2 et: