summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community/assimp/PKGBUILD23
-rw-r--r--community/cantata/PKGBUILD7
-rw-r--r--community/dd_rescue/PKGBUILD9
-rw-r--r--community/gerbv/PKGBUILD9
-rw-r--r--community/gerbv/gerbv.install8
-rw-r--r--community/patchage/PKGBUILD12
-rw-r--r--community/processing/PKGBUILD8
-rw-r--r--community/profanity/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch32
-rw-r--r--community/profanity/PKGBUILD6
-rw-r--r--community/prosody/PKGBUILD22
-rw-r--r--community/prosody/fix-config.patch22
-rw-r--r--community/squashfs-tools/PKGBUILD8
-rw-r--r--community/units/PKGBUILD6
-rw-r--r--community/warmux/PKGBUILD41
-rw-r--r--community/warmux/gcc-fix.patch36
-rw-r--r--community/warmux/include-zlib.patch11
-rw-r--r--community/xcircuit/PKGBUILD12
-rw-r--r--core/binutils/PKGBUILD13
-rw-r--r--core/binutils/binutils-2.24-static-pie-hang.patch78
-rw-r--r--core/glibc/PKGBUILD21
-rw-r--r--core/glibc/glibc-2.19-tzselect-default.patch13
-rw-r--r--extra/ffmpeg/PKGBUILD5
-rw-r--r--extra/kdegraphics-okular/PKGBUILD6
-rw-r--r--extra/perl-net-ssleay/PKGBUILD6
-rw-r--r--extra/qtcreator/PKGBUILD4
25 files changed, 206 insertions, 212 deletions
diff --git a/community/assimp/PKGBUILD b/community/assimp/PKGBUILD
index 6a5087a83..682049e94 100644
--- a/community/assimp/PKGBUILD
+++ b/community/assimp/PKGBUILD
@@ -2,29 +2,30 @@
# Contributor: jepaan <jepaan at hotmail dot com>
pkgname=assimp
-pkgver=3.0.1270
+pkgver=3.1
pkgrel=1
pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner"
arch=('i686' 'x86_64')
license=('BSD')
-depends=('libxmu' 'zlib' 'freeglut')
+depends=('zlib' 'gcc-libs')
makedepends=('cmake' 'boost')
url=('http://assimp.sourceforge.net/index.html')
-source=("http://downloads.sourceforge.net/assimp/assimp--$pkgver-source-only.zip")
-md5sums=('52aa4cf4e34e6b2a9c5f6c0b3c319af1')
+source=("https://github.com/assimp/assimp/archive/v${pkgver}.tar.gz")
+md5sums=('b2d382a5fb15f247d0d8c8afd5744f5e')
build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}--${pkgver}-source-only \
- -DCMAKE_INSTALL_PREFIX=/usr
+ cd ${srcdir}/${pkgname}-${pkgver}
+
+ mkdir build && cd build
+ cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DASSIMP_BUILD_SAMPLES=OFF
make
}
package() {
- cd ${srcdir}/build
+ cd ${srcdir}/${pkgname}-${pkgver}/build
make DESTDIR=$pkgdir install
- install -Dm644 ${srcdir}/${pkgname}--${pkgver}-source-only/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+ install -Dm644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
}
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
index 20b2b5fb8..c6e123fde 100644
--- a/community/cantata/PKGBUILD
+++ b/community/cantata/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 109795 2014-04-18 17:39:03Z bpiotrowski $
+# $Id: PKGBUILD 111588 2014-05-20 18:23:55Z jelle $
# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
# Contributor: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Mcder3 <mcder3[at]gmail[dot]com>
# Contributor: MisterFred <mister.fred[at]free[dot]fr>
pkgname=cantata
-pkgver=1.3.3
-pkgrel=2
+pkgver=1.3.4
+pkgrel=1
pkgdesc="Qt5 client for the music player daemon (MPD)"
arch=('i686' 'x86_64')
url="https://code.google.com/p/cantata/"
@@ -38,3 +38,4 @@ package() {
make DESTDIR="$pkgdir" PREFIX="/usr" install
}
+md5sums=('5b21329a4b00716f7feb827805f215b5')
diff --git a/community/dd_rescue/PKGBUILD b/community/dd_rescue/PKGBUILD
index 44b4964b5..3de269ff7 100644
--- a/community/dd_rescue/PKGBUILD
+++ b/community/dd_rescue/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 106460 2014-03-04 02:06:59Z fyan $
+# $Id: PKGBUILD 111576 2014-05-20 16:05:05Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: Zerial <fernando@zerial.org>
# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net>
# Contributor: Jose Riha <jose1711 gmail com>
pkgname=dd_rescue
-pkgver=1.42
+pkgver=1.43
pkgrel=1
pkgdesc="A dd version that is very useful for data-recovery"
url="http://www.garloff.de/kurt/linux/ddrescue/"
license=("GPL")
depends=('glibc')
+optdepends=('lzo2: for libddr_lzo')
arch=('x86_64' 'i686')
source=("http://www.garloff.de/kurt/linux/ddrescue/$pkgname-${pkgver}.tar.gz")
prepare() {
cd $pkgname
# Don't install to /usr/lib64
- sed -i '/LIBDIR = \/usr\/lib64/d' Makefile
+ sed -i '/LIB = lib64/d' Makefile
}
build() {
@@ -30,4 +31,4 @@ package() {
make DESTDIR="$pkgdir" INSTALLDIR="$pkgdir/usr/bin" install
}
-sha512sums=('ef9475c8b64d7d2faeee01544994746e91e7068041a2bd381e28588c15b722daebe142f9d87afe354a3d16783951b8c14a8db665b063d3891f99c60e32c7eaa8')
+sha512sums=('d0c090d5d94916cda4bd046b22324ea5c44cfd2f856af56b698ea0e9ab4b622564a652869e50fa4e2e3d59b8d10bbffd00b826453bed06d778e7326ebf72e87d')
diff --git a/community/gerbv/PKGBUILD b/community/gerbv/PKGBUILD
index 9c8af3255..2e07f3b70 100644
--- a/community/gerbv/PKGBUILD
+++ b/community/gerbv/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 99098 2013-10-24 12:43:42Z kkeen $
+# $Id: PKGBUILD 111554 2014-05-20 01:32:22Z eric $
# Maintainer: Kyle Keen <keenerd@gmail.com>
# Contributor: Jared Casper <jaredcasper@gmail.com>
# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=gerbv
pkgver=2.6.1
-pkgrel=2
+pkgrel=3
pkgdesc="An open source Gerber file (RS-274X only) viewer"
#url="http://gerbv.gpleda.org/"
url="http://gerbv.geda-project.org/"
license=('GPL')
arch=('i686' 'x86_64')
-depends=('gtk2' 'shared-mime-info' 'hicolor-icon-theme')
-optdepends=('gdk-pixbuf: export of images' 'cairo: for better graphics')
+depends=('gtk2')
+optdepends=('cairo: for better graphics')
makedepends=('cvs' 'gettext')
# cvs for autopoint
install=$pkgname.install
+changelog=ChangeLog
source=("http://downloads.sourceforge.net/gerbv/$pkgname-$pkgver.tar.gz"
"reautopointissues.diff")
md5sums=('9a8af19574025fb15f987c3df610f8ae'
diff --git a/community/gerbv/gerbv.install b/community/gerbv/gerbv.install
index 8cfe0686c..fd07f0807 100644
--- a/community/gerbv/gerbv.install
+++ b/community/gerbv/gerbv.install
@@ -1,21 +1,17 @@
post_install() {
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- echo Updating icon cache...
- /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor
+ /usr/bin/gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
fi
if [ -x /usr/bin/update-desktop-database ]; then
- echo Updating desktop database..
/usr/bin/update-desktop-database /usr/share/applications
fi
}
post_upgrade() {
if [ -x /usr/bin/gtk-update-icon-cache ]; then
- echo Updating icon cache...
- /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor
+ /usr/bin/gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
fi
if [ -x /usr/bin/update-desktop-database ]; then
- echo Updating desktop database..
/usr/bin/update-desktop-database /usr/share/applications
fi
}
diff --git a/community/patchage/PKGBUILD b/community/patchage/PKGBUILD
index a8bca221e..fe5ecb763 100644
--- a/community/patchage/PKGBUILD
+++ b/community/patchage/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110454 2014-04-30 10:43:42Z speps $
+# $Id: PKGBUILD 111582 2014-05-20 17:26:05Z speps $
# Maintainer: Ray Rashif <schiv@archlinux.org>
# Maintainer: speps <speps at aur dot archlinux dot org>
# Contributor: Max Pray a.k.a. Synthead <synthead@gmail.com>
@@ -6,7 +6,7 @@
pkgname=patchage
pkgver=1.0.0
-pkgrel=1
+pkgrel=2
pkgdesc="A modular patch bay for audio and MIDI systems based on Jack and Alsa"
arch=('i686' 'x86_64')
url="http://drobilla.net/software/patchage"
@@ -17,6 +17,14 @@ install="$pkgname.install"
source=("http://download.drobilla.net/$pkgname-$pkgver.tar.bz2")
md5sums=('d16a3fc045faff7fd70f3b4769b65698')
+prepare() {
+ cd $pkgname-$pkgver
+
+ # FS#40311
+ # disable jack metadata support for jack2 capability
+ sed -i '/jack_get_property/,/False/d' wscript
+}
+
build() {
cd $pkgname-$pkgver
python2 waf configure --prefix=/usr
diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
index 393ba8c6e..04db3f0fe 100644
--- a/community/processing/PKGBUILD
+++ b/community/processing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 111103 2014-05-13 21:14:49Z arodseth $
+# $Id: PKGBUILD 111591 2014-05-20 18:43:49Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
pkgname=processing
-pkgver=2.2
+pkgver=2.2.1
pkgrel=1
arch=('x86_64' 'i686')
pkgdesc='Programming environment for creating images, animations and interactions'
@@ -15,12 +15,12 @@ options=('!strip')
if [[ $CARCH == "x86_64" ]]; then
source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz"
"$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
- sha256sums=('262756a040def3e23a32db2838b313193918cb15cafccc6e9fbd88358d5d8832'
+ sha256sums=('bbb8831f251ed87dd1faefde43159494859452a2aaf7c75bca467e5afb7b9ec3'
'019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
else
source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz"
"$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
- sha256sums=('89bf7739ba97f8150c3a6e3c02e3602ed70d93aba29def8f4eddc755fc5d5ae0'
+ sha256sums=('922db76c15682c5454226dd0cdd4fd680e1549d33ad4c7c27efbc345285fab42'
'019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
fi
diff --git a/community/profanity/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch b/community/profanity/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch
deleted file mode 100644
index f68db6c6c..000000000
--- a/community/profanity/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9815ef3b02dfc05ed2e2dbe40d017b91f4f4fa41 Mon Sep 17 00:00:00 2001
-From: James Booth <boothj5@gmail.com>
-Date: Mon, 24 Mar 2014 21:02:10 +0000
-Subject: [PATCH] Change libotr 4.0.0 code to use only OTR spec v2
-
----
- src/otr/otrlibv4.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c
-index 80013af..01afa86 100644
---- a/src/otr/otrlibv4.c
-+++ b/src/otr/otrlibv4.c
-@@ -29,13 +29,13 @@
- OtrlPolicy
- otrlib_policy(void)
- {
-- return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 | OTRL_POLICY_ALLOW_V3;
-+ return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2;
- }
-
- char *
- otrlib_start_query(void)
- {
-- return "?OTR?v23?";
-+ return "?OTR?v2?";
- }
-
- static const char*
---
-1.9.1
-
diff --git a/community/profanity/PKGBUILD b/community/profanity/PKGBUILD
index 106d00854..05f979087 100644
--- a/community/profanity/PKGBUILD
+++ b/community/profanity/PKGBUILD
@@ -3,17 +3,17 @@
# Contributor: jason ryan <jasonwryan@gmail.com>
pkgname=profanity
-pkgver=0.4.0
+pkgver=0.4.1
pkgrel=1
epoch=1
pkgdesc='Console based XMPP client'
arch=('i686' 'x86_64')
url='http://www.profanity.im'
license=('GPL3')
-depends=('curl' 'expat' 'glib2' 'libotr')
+depends=('curl' 'expat' 'glib2' 'libotr' 'gnutls')
makedepends=('doxygen' 'libstrophe')
source=(http://www.profanity.im/profanity-$pkgver.tar.gz)
-md5sums=('1ac10474d7c36eb546f7085003049ec5')
+md5sums=('d50c3a69165e3daa243c149f93cf32fc')
build() {
cd $pkgname-$pkgver
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index f9e77e89c..7e1a3d7b7 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 108773 2014-04-03 10:22:59Z spupykin $
+# $Id: PKGBUILD 111566 2014-05-20 15:03:27Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Dwayne Bent <dbb@dbb.io>
# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
@@ -6,7 +6,7 @@
pkgname=prosody
pkgver=0.9.4
-pkgrel=1
+pkgrel=3
pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
arch=('i686' 'x86_64')
url="http://prosody.im/"
@@ -22,18 +22,12 @@ source=("http://prosody.im/downloads/source/${pkgname}-${pkgver}.tar.gz"{,.asc}
'fix-config.patch'
'prosody.tmpfile.d'
'prosody.service')
-sha256sums=('22d2427fae4858d15b4f695348fb7781e4c65c04a24171837985024e76799ea0'
- 'SKIP'
- '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
- 'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
- '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
- '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
-sha256sums=('be87cf31901a25477869b4ebd52e298f63a5effacae526911a0be876cc82e1c6'
- 'SKIP'
- '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
- 'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
- '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
- '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
+md5sums=('94f9a613c834c276352ac5b142fb72e0'
+ 'SKIP'
+ '5b44aee99f1fa9e7f055e067688cafbd'
+ '01b6aa0b1e1e3067756c45b0751bee78'
+ 'e2f5a1df410b05696a30dcb058841084'
+ 'e74045f27cb60908d535969906781f75')
prepare() {
cd ${pkgname}-${pkgver}
diff --git a/community/prosody/fix-config.patch b/community/prosody/fix-config.patch
index 9b837c85b..fb7251c04 100644
--- a/community/prosody/fix-config.patch
+++ b/community/prosody/fix-config.patch
@@ -1,16 +1,17 @@
-diff -wbBur prosody-0.9.0.q/prosody.cfg.lua.dist prosody-0.9.0/prosody.cfg.lua.dist
---- prosody-0.9.0.q/prosody.cfg.lua.dist 2013-08-19 23:37:36.000000000 +0400
-+++ prosody-0.9.0/prosody.cfg.lua.dist 2013-08-21 16:17:49.175521891 +0400
-@@ -11,6 +11,8 @@
+diff -wbBur prosody-0.9.4/prosody.cfg.lua.dist prosody-0.9.4.my/prosody.cfg.lua.dist
+--- prosody-0.9.4/prosody.cfg.lua.dist 2014-04-01 20:05:32.000000000 +0400
++++ prosody-0.9.4.my/prosody.cfg.lua.dist 2014-05-20 19:00:36.414576199 +0400
+@@ -11,6 +11,9 @@
-- The only thing left to do is rename this file to remove the .dist ending, and fill in the
-- blanks. Good luck, and happy Jabbering!
+daemonize = true
+pidfile = "/run/prosody/prosody.pid"
++s2s_require_encryption = true
---------- Server-wide settings ----------
-- Settings in this section apply to the whole server and are the default settings
-@@ -63,7 +65,7 @@
+@@ -63,7 +66,7 @@
--"http_files"; -- Serve static files from a directory over HTTP
-- Other specific functionality
@@ -19,7 +20,16 @@ diff -wbBur prosody-0.9.0.q/prosody.cfg.lua.dist prosody-0.9.0/prosody.cfg.lua.d
--"groups"; -- Shared roster support
--"announce"; -- Send announcement to all online users
--"welcome"; -- Welcome users who register accounts
-@@ -139,9 +141,9 @@
+@@ -94,7 +97,7 @@
+ -- Force clients to use encrypted connections? This option will
+ -- prevent clients from authenticating unless they are using encryption.
+
+-c2s_require_encryption = false
++c2s_require_encryption = true
+
+ -- Force certificate authentication for server-to-server connections?
+ -- This provides ideal security, but requires servers you communicate
+@@ -139,9 +142,9 @@
-- Logging configuration
-- For advanced logging see http://prosody.im/doc/logging
log = {
diff --git a/community/squashfs-tools/PKGBUILD b/community/squashfs-tools/PKGBUILD
index 79c049be2..e8017d7d6 100644
--- a/community/squashfs-tools/PKGBUILD
+++ b/community/squashfs-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 111215 2014-05-15 14:18:32Z spupykin $
+# $Id: PKGBUILD 111584 2014-05-20 17:53:58Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Original TU: Jeff Mickey <j@codemac.net>
@@ -6,18 +6,18 @@
pkgname=squashfs-tools
pkgver=4.3
-pkgrel=1
+pkgrel=2
pkgdesc="Tools for squashfs, a highly compressed read-only filesystem for Linux."
url="http://squashfs.sourceforge.net"
license=("GPL")
arch=('i686' 'x86_64')
-depends=('zlib' 'lzo2' 'xz')
+depends=('zlib' 'lzo2' 'xz' 'lz4')
source=("http://downloads.sourceforge.net/sourceforge/squashfs/squashfs${pkgver}.tar.gz")
md5sums=('d92ab59aabf5173f2a59089531e30dbf')
build() {
cd ${srcdir}/squashfs${pkgver}/${pkgname}
- make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1
+ make XZ_SUPPORT=1 LZO_SUPPORT=1 LZMA_XZ_SUPPORT=1 LZ4_SUPPORT=1
}
package() {
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index 795146b5d..82add178c 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 111480 2014-05-19 09:51:28Z spupykin $
+# $Id: PKGBUILD 111559 2014-05-20 11:21:42Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Jeff Mickey <jeff@archlinux.org>
# Contributor: Steve Sansom <snsansom@gmail.com>
pkgname=units
pkgver=2.11
-pkgrel=2
+pkgrel=3
pkgdesc="converts between different units"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/units/units.html"
-depends=('readline' 'python')
+depends=('readline' 'python' 'python-unidecode')
license=("GPL")
options=('!makeflags')
install=units.install
diff --git a/community/warmux/PKGBUILD b/community/warmux/PKGBUILD
deleted file mode 100644
index 9d94d0609..000000000
--- a/community/warmux/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 100935 2013-11-13 12:48:40Z heftig $
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: pukyxd
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-
-pkgname=warmux
-pkgver=11.04.1
-pkgrel=7
-pkgdesc="A clone of the worms game"
-arch=('i686' 'x86_64')
-url="http://gna.org/projects/warmux/"
-license=('GPL')
-makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2')
-replaces=('wormux')
-source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
- include-zlib.patch
- gcc-fix.patch)
-md5sums=('26ff65c43a9bb61a3f0529c98b943e35'
- 'c8285955e880f80e3c68312715a3061c'
- 'ab50d613d3fa3f71262b1d2fc71641b1')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
- # libpng 1.5 fix
- patch -Np1 -i ../include-zlib.patch
- # gcc fix
- patch -Np1 -i ../gcc-fix.patch
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}")
-
- cd "${srcdir}/${pkgname}-${pkgver/.1/}"
-
- make DESTDIR="${pkgdir}" install
- rm -r ${pkgdir}/usr/share/warmux
-}
diff --git a/community/warmux/gcc-fix.patch b/community/warmux/gcc-fix.patch
deleted file mode 100644
index 1ac476b92..000000000
--- a/community/warmux/gcc-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-## i-love-you-lordheavy.patch [diff]
-diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp
---- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100
-@@ -81,7 +81,7 @@
- }
-
- // Build an action from a network packet
--Action::Action(const char *buffer, DistantComputer* _creator)
-+Action::Action(char *buffer, DistantComputer* _creator)
- {
- m_creator = _creator;
-
-diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h
---- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200
-+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100
-@@ -168,7 +168,7 @@
- Action(Action_t type, Double value1, Double value2);
-
- // Build an action from a network packet
-- Action(const char* buffer, DistantComputer* _creator);
-+ Action(char* buffer, DistantComputer* _creator);
-
- ~Action();
-
-Description: Fix FTBFS with gcc 4.7.
-Author: Felix Geyer <debfx-pkg@fobos.de>
-
---- warmux-11.04.1+repack.orig/tools/list_games/main.cpp
-+++ warmux-11.04.1+repack/tools/list_games/main.cpp
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <unistd.h>
- #include <WARMUX_types.h>
- #include <WARMUX_network.h>
- #include <WARMUX_index_server.h>
diff --git a/community/warmux/include-zlib.patch b/community/warmux/include-zlib.patch
deleted file mode 100644
index c7e77aba1..000000000
--- a/community/warmux/include-zlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp
---- warmux-11.04.orig/src/graphic/surface.cpp 2011-09-19 09:26:52.392650465 +0200
-+++ warmux-11.04/src/graphic/surface.cpp 2011-09-19 09:26:19.417648189 +0200
-@@ -25,6 +25,7 @@
- #include <SDL_image.h>
- #include <SDL_rotozoom.h>
- #include <png.h>
-+#include <zlib.h>
-
- #include "graphic/surface.h"
- #include "tool/math_tools.h"
diff --git a/community/xcircuit/PKGBUILD b/community/xcircuit/PKGBUILD
index 8ad20ed8f..61df3684c 100644
--- a/community/xcircuit/PKGBUILD
+++ b/community/xcircuit/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110889 2014-05-09 08:37:50Z spupykin $
+# $Id: PKGBUILD 111586 2014-05-20 17:54:15Z spupykin $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Maintainer: Giovanni Scafora <linuxmania@gmail.com>
# Contributor: simo <simo@archlinux.org>
pkgname=xcircuit
-pkgver=3.7.57
+pkgver=3.8.58
pkgrel=1
pkgdesc="A program for drawing publishable-quality electrical circuit schematic diagrams"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('GPL2')
depends=('tk' 'libxpm' 'zlib')
makedepends=('chrpath')
source=(http://opencircuitdesign.com/xcircuit/archive/$pkgname-$pkgver.tgz)
-md5sums=('45079ceecb2ebc3b9626c68a0820e39d')
+md5sums=('23053de9e386dc88d6fbffad025be4ff')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -25,7 +25,7 @@ package() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=$pkgdir install
mkdir -p $pkgdir/usr/share/man/man1
- mv $pkgdir/usr/lib/xcircuit-3.7/man/* $pkgdir/usr/share/man/man1/
- rm -rf $pkgdir/usr/lib/xcircuit-3.7/man/
- chrpath -d $pkgdir/usr/lib/xcircuit-3.7/xcircexec
+ mv $pkgdir/usr/lib/xcircuit-3.8/man/* $pkgdir/usr/share/man/man1/
+ rm -rf $pkgdir/usr/lib/xcircuit-3.8/man/
+ chrpath -d $pkgdir/usr/lib/xcircuit-3.8/xcircexec
}
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index a7af4afb9..6ad6fe5e3 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 211964 2014-05-02 08:39:43Z allan $
+# $Id: PKGBUILD 213325 2014-05-20 08:17:35Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
pkgname=binutils
pkgver=2.24
-pkgrel=3
+pkgrel=4
pkgdesc="A set of programs to assemble and manipulate binary and object files"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/binutils/"
@@ -18,10 +18,12 @@ replaces=('binutils-multilib')
options=('staticlibs' '!distcc' '!ccache')
install=binutils.install
source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig}
- binutils-2.24-lto-testsuite.patch)
+ binutils-2.24-lto-testsuite.patch
+ binutils-2.24-static-pie-hang.patch)
md5sums=('e0f71a7b2ddab0f8612336ac81d9636b'
'SKIP'
- 'b16e895c24ff80acd98a21021eccefad')
+ 'b16e895c24ff80acd98a21021eccefad'
+ '4d2cf591560c3d25265778146bbe1941')
prepare() {
cd ${srcdir}/binutils-${pkgver}
@@ -32,6 +34,9 @@ prepare() {
# fix lto testsuite with gcc-4.9 - commit b35d44f1
patch -p1 -i $srcdir/binutils-2.24-lto-testsuite.patch
+ # fix autoconf hang with -static -fPIE -pie - commits d1ec1e40 and 818d220a
+ patch -p1 -i $srcdir/binutils-2.24-static-pie-hang.patch
+
mkdir ${srcdir}/binutils-build
}
diff --git a/core/binutils/binutils-2.24-static-pie-hang.patch b/core/binutils/binutils-2.24-static-pie-hang.patch
new file mode 100644
index 000000000..512485e7c
--- /dev/null
+++ b/core/binutils/binutils-2.24-static-pie-hang.patch
@@ -0,0 +1,78 @@
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index 4d391e1..d7f59e5 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -2368,8 +2368,13 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+
+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+ {
+- p->count -= p->pc_count;
+- p->pc_count = 0;
++ /* Don't update reloc count if there are any non
++ pc-relative relocs. */
++ if (!h->pointer_equality_needed)
++ {
++ p->count -= p->pc_count;
++ p->pc_count = 0;
++ }
+ if (p->count == 0)
+ *pp = p->next;
+ else
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index edee8ec..999011b 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -2463,8 +2463,13 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
+
+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; )
+ {
+- p->count -= p->pc_count;
+- p->pc_count = 0;
++ /* Don't update reloc count if there are any non
++ pc-relative relocs. */
++ if (!h->pointer_equality_needed)
++ {
++ p->count -= p->pc_count;
++ p->pc_count = 0;
++ }
+ if (p->count == 0)
+ *pp = p->next;
+ else
+diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
+index 4d391e1..e834a5a 100644
+--- a/bfd/elf32-i386.c
++++ b/bfd/elf32-i386.c
+@@ -2390,9 +2390,12 @@ elf_i386_allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf)
+ }
+
+ /* Also discard relocs on undefined weak syms with non-default
+- visibility. */
++ visibility. Don't discard relocs against __ehdr_start which
++ will be defined by assign_file_positions_for_non_load_sections
++ later. */
+ if (eh->dyn_relocs != NULL
+- && h->root.type == bfd_link_hash_undefweak)
++ && h->root.type == bfd_link_hash_undefweak
++ && strcmp (h->root.root.string, "__ehdr_start") != 0)
+ {
+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+ eh->dyn_relocs = NULL;
+diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c
+index edee8ec..f364fe4 100644
+--- a/bfd/elf64-x86-64.c
++++ b/bfd/elf64-x86-64.c
+@@ -2473,9 +2473,12 @@ elf_x86_64_allocate_dynrelocs (struct elf_link_hash_entry *h, void * inf)
+ }
+
+ /* Also discard relocs on undefined weak syms with non-default
+- visibility. */
++ visibility. Don't discard relocs against __ehdr_start which
++ will be defined by assign_file_positions_for_non_load_sections
++ later. */
+ if (eh->dyn_relocs != NULL
+- && h->root.type == bfd_link_hash_undefweak)
++ && h->root.type == bfd_link_hash_undefweak
++ && strcmp (h->root.root.string, "__ehdr_start") != 0)
+ {
+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT)
+ eh->dyn_relocs = NULL;
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index f60da76e4..ef20dde91 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 211961 2014-05-02 08:39:40Z allan $
+# $Id: PKGBUILD 213324 2014-05-20 08:17:34Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -8,7 +8,7 @@
pkgname=glibc
pkgver=2.19
-pkgrel=4
+pkgrel=5
pkgdesc="GNU C Library"
arch=('i686' 'x86_64')
url="http://www.gnu.org/software/libc"
@@ -24,12 +24,14 @@ install=glibc.install
source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
glibc-2.19-xattr_header.patch
glibc-2.19-fix-sign-in-bsloww1-input.patch
+ glibc-2.19-tzselect-default.patch
locale.gen.txt
locale-gen)
md5sums=('e26b8cc666b162f999404b03970f14e4'
'SKIP'
'39a4876837789e07746f1d84cd8cb46a'
'755a1a9d7844a5e338eddaa9a5d974cd'
+ 'c772dc99ddd8032ecbf43884ae0cf42e'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -42,6 +44,9 @@ prepare() {
# fix issues in sin/cos slow path calculation - commit ffe768a9
patch -p1 -i $srcdir/glibc-2.19-fix-sign-in-bsloww1-input.patch
+ # fix tzselect with missing TZDIR - commit 893b4f37/c72399fb
+ patch -p1 -i $srcdir/glibc-2.19-tzselect-default.patch
+
mkdir ${srcdir}/glibc-build
}
@@ -59,7 +64,7 @@ build() {
echo "rootsbindir=/usr/bin" >> configparms
# remove hardening options for building libraries
- CFLAGS=${CFLAGS/-fstack-protector/}
+ CFLAGS=${CFLAGS/-fstack-protector-strong/}
CPPFLAGS=${CPPFLAGS/-D_FORTIFY_SOURCE=2/}
${srcdir}/${pkgname}-${pkgver}/configure --prefix=/usr \
@@ -80,8 +85,8 @@ build() {
# re-enable hardening for programs
sed -i "/build-programs=/s#no#yes#" configparms
- echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
+ echo "CC += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms
+ echo "CXX += -fstack-protector-strong -D_FORTIFY_SOURCE=2" >> configparms
make
# remove harding in preparation to run test-suite
@@ -93,9 +98,9 @@ check() {
LDFLAGS=${LDFLAGS/--as-needed,/}
cd ${srcdir}/glibc-build
-
- # only acceptable testsuite error is some small libm ulp failures on i686 with gcc-4.9
- # TODO: fix upstream and provide patch
+
+ # ULP failures on i686 are all small and can be ignored
+ # tst-cleanupx4.out failure on i686 needs investigating...
make -k check || true
}
diff --git a/core/glibc/glibc-2.19-tzselect-default.patch b/core/glibc/glibc-2.19-tzselect-default.patch
new file mode 100644
index 000000000..ccafb0b60
--- /dev/null
+++ b/core/glibc/glibc-2.19-tzselect-default.patch
@@ -0,0 +1,13 @@
+diff --git a/timezone/Makefile b/timezone/Makefile
+index 998cd14..d5f647c 100644
+--- a/timezone/Makefile
++++ b/timezone/Makefile
+@@ -118,7 +118,7 @@ $(testdata)/Asia/Tokyo: asia $(zic-deps)
+
+ $(objpfx)tzselect: tzselect.ksh $(common-objpfx)config.make
+ sed -e 's|/bin/bash|$(KSH)|g' \
+- -e '/TZDIR=/s|\$$(pwd)|$(zonedir)|' \
++ -e 's|TZDIR=[^}]*|TZDIR=$(zonedir)|' \
+ -e '/TZVERSION=/s|see_Makefile|"$(version)"|' \
+ -e '/PKGVERSION=/s|=.*|="$(PKGVERSION)"|' \
+ -e '/REPORT_BUGS_TO=/s|=.*|="$(REPORT_BUGS_TO)"|' \
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 8b20c50c3..1b157404e 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212100 2014-05-07 11:11:14Z bpiotrowski $
+# $Id: PKGBUILD 213341 2014-05-20 15:13:56Z bpiotrowski $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
@@ -6,7 +6,7 @@
pkgname=ffmpeg
pkgver=2.2.2
-pkgrel=2
+pkgrel=3
epoch=1
pkgdesc='Complete and free Internet live audio and video broadcasting solution'
arch=('i686' 'x86_64')
@@ -30,6 +30,7 @@ build() {
--prefix=/usr \
--disable-debug \
--disable-static \
+ --enable-avisynth \
--enable-avresample \
--enable-dxva2 \
--enable-fontconfig \
diff --git a/extra/kdegraphics-okular/PKGBUILD b/extra/kdegraphics-okular/PKGBUILD
index 18e439a10..c7677cdc3 100644
--- a/extra/kdegraphics-okular/PKGBUILD
+++ b/extra/kdegraphics-okular/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 213149 2014-05-19 15:00:37Z svenstaro $
+# $Id: PKGBUILD 213329 2014-05-20 08:55:47Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgname=kdegraphics-okular
pkgver=4.13.1
-pkgrel=1
+pkgrel=2
pkgdesc='Document Viewer'
arch=('i686' 'x86_64')
url="http://kde.org/applications/graphics/okular/"
license=('GPL' 'LGPL' 'FDL')
groups=('kde' 'kdegraphics')
depends=('kdebase-runtime' 'qimageblitz' 'chmlib' 'djvulibre' 'libspectre'
- 'libkexiv2')
+ 'libkexiv2' 'poppler-qt4')
makedepends=('cmake' 'automoc4')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz")
diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD
index a5babd832..cab816a80 100644
--- a/extra/perl-net-ssleay/PKGBUILD
+++ b/extra/perl-net-ssleay/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 213017 2014-05-17 10:20:36Z giovanni $
+# $Id: PKGBUILD 213343 2014-05-20 20:15:20Z giovanni $
# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=perl-net-ssleay
_cpanname=Net-SSLeay
-pkgver=1.61
+pkgver=1.63
pkgrel=1
pkgdesc="Perl extension for using OpenSSL"
arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ options=(!emptydirs)
replaces=('net-ssleay')
provides=('net-ssleay')
source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz")
-md5sums=('95f73786e0a3935232d278f8530b1895')
+md5sums=('9b95548e1ed415f8aeed0e004fa68226')
prepare() {
cd ${srcdir}/${_cpanname}-${pkgver}
diff --git a/extra/qtcreator/PKGBUILD b/extra/qtcreator/PKGBUILD
index 83b091604..0d206267e 100644
--- a/extra/qtcreator/PKGBUILD
+++ b/extra/qtcreator/PKGBUILD
@@ -7,8 +7,8 @@
# Contributor: delor <bartekpiech gmail com>
pkgname=qtcreator
-pkgver=3.1.0
-_pkgver=v3.1.0
+pkgver=3.1.1
+_pkgver=v3.1.1
pkgrel=1
pkgdesc='Lightweight, cross-platform integrated development environment'
arch=('i686' 'x86_64')