diff options
author | root <root@rshg054.dnsready.net> | 2013-09-23 02:41:50 -0700 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2013-09-23 02:41:50 -0700 |
commit | 7960b4f8054657774cc0636aa8ddf2fa48570622 (patch) | |
tree | e3151a1379b8cc5a923f4284a6877f51f6d0ad48 | |
parent | fbd9603c619db8a960bd9c091211a8abd16c9534 (diff) |
Mon Sep 23 02:35:56 PDT 2013
-rw-r--r-- | community/doublecmd/PKGBUILD | 6 | ||||
-rw-r--r-- | community/gendesk/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/elfutils/PKGBUILD | 23 | ||||
-rw-r--r-- | extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch | 16 | ||||
-rw-r--r-- | extra/live-media/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/mono/PKGBUILD | 13 | ||||
-rw-r--r-- | extra/mono/sgen_fix.patch | 112 | ||||
-rw-r--r-- | extra/rtkit/PKGBUILD | 10 | ||||
-rw-r--r-- | extra/rtkit/systemd205.patch | 16 |
9 files changed, 160 insertions, 48 deletions
diff --git a/community/doublecmd/PKGBUILD b/community/doublecmd/PKGBUILD index 366cfdf1c..18bccd8f3 100644 --- a/community/doublecmd/PKGBUILD +++ b/community/doublecmd/PKGBUILD @@ -1,11 +1,11 @@ # vim:set ft=sh: -# $Id: PKGBUILD 94328 2013-07-20 16:51:21Z idevolder $ +# $Id: PKGBUILD 97499 2013-09-22 18:09:18Z idevolder $ # Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com> # Contributor: (sirocco AT ngs.ru) pkgbase=doublecmd pkgname=('doublecmd-gtk2' 'doublecmd-qt') -pkgver=0.5.6 +pkgver=0.5.7 _helpver=0.5.5 pkgrel=1 url="http://doublecmd.sourceforge.net/" @@ -23,7 +23,7 @@ source=( "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-$pkgver-src.tar.gz" "http://downloads.sourceforge.net/project/$pkgbase/Double%20Commander%20Source/$pkgbase-help-$_helpver-src.tar.gz" ) -sha256sums=('b909ee5c57cb2803e4393163f5c44513144cb32e304fa2e1dfee6f33d0999bc5' +sha256sums=('8e2059f986fff26da5d7b98af95be64b12c5cef6b50fe3cacd9a2805947aa343' '5c5d00187df811df0734bf751a581bce7e1bdd4cf4639b2a1101f1da8743daaf') build() { diff --git a/community/gendesk/PKGBUILD b/community/gendesk/PKGBUILD index 468529e4f..c8b0d9211 100644 --- a/community/gendesk/PKGBUILD +++ b/community/gendesk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97340 2013-09-18 11:57:55Z arodseth $ +# $Id: PKGBUILD 97501 2013-09-22 21:35:55Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> pkgname=gendesk -pkgver=0.5.4 +pkgver=0.5.5 pkgrel=1 pkgdesc='Utility to generate .desktop files and download icons' arch=('x86_64' 'i686') @@ -12,7 +12,7 @@ makedepends=('go') depends=('glibc') source=("http://roboticoverlords.org/$pkgname/$pkgname-$pkgver.tar.xz" 'http://roboticoverlords.org/images/default.png') -sha256sums=('cc065c6285a685daf9eb0d16b035f6420b2ef204a447e750bcd03ab12a240c56' +sha256sums=('52a13d3952f0c00a65f05d01a9ca0fc1f5337f3379ff6017aafb686e5caf0942' '4d96eded48e536d02e35727c36dc20844c2e44654e81baf78e10aee4eb48e837') build() { diff --git a/extra/elfutils/PKGBUILD b/extra/elfutils/PKGBUILD index 3c4cd5a6d..57a45fb85 100644 --- a/extra/elfutils/PKGBUILD +++ b/extra/elfutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189328 2013-07-03 01:24:05Z eric $ +# $Id: PKGBUILD 194689 2013-09-22 08:17:23Z lcarlier $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu> pkgname=elfutils -pkgver=0.155 +pkgver=0.156 pkgrel=1 pkgdesc="Libraries and utilities to handle ELF object files and DWARF debugging information" arch=('i686' 'x86_64') @@ -13,32 +13,27 @@ depends=('gcc-libs' 'zlib' 'bzip2' 'xz') provides=('libelf') replaces=('libelf') conflicts=('libelf') -options=('!makeflags') -source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig} - elfutils-0.155-binutils-pr-ld-13621.patch) -sha1sums=('1b96084cd9fe037c1c0bd2c280aaa701f913462b' - 'fcd0ebd029b305bf030983daf151a2a1ab5294af' - '8a8be7c0686c6311c1ce969ba10494e704ead48c') - -prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i ../elfutils-0.155-binutils-pr-ld-13621.patch - sed -i -e 's:-Werror::g' $(find -name Makefile.in) -} +source=(https://fedorahosted.org/releases/e/l/elfutils/${pkgver}/elfutils-${pkgver}.tar.bz2{,.sig}) +sha1sums=('48b30828eb0fb47787e45d80db05c05bbe0eaa76' + 'SKIP') build() { cd ${pkgname}-${pkgver} + CFLAGS+=" -g" # required for test-suite success ./configure --prefix=/usr --program-prefix="eu-" + make } check() { cd ${pkgname}-${pkgver} + make check } package() { cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install } diff --git a/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch b/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch deleted file mode 100644 index 7f99ac0be..000000000 --- a/extra/elfutils/elfutils-0.155-binutils-pr-ld-13621.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tests/run-elflint-self.sh b/tests/run-elflint-self.sh -index 4b01008..7a5f0c8 100755 ---- a/tests/run-elflint-self.sh -+++ b/tests/run-elflint-self.sh -@@ -18,4 +18,11 @@ - - . $srcdir/test-subr.sh - -+# Makes sure we exit cleanly even when we don't... -+clean_exit() -+{ -+ if test $? != 0; then echo "binutils PR ld/13621 workaround"; exit 0; fi -+} -+trap clean_exit EXIT -+ - testrun_on_self ../src/elflint --quiet --gnu-ld diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index cb3a8d257..86605b99a 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194542 2013-09-18 07:51:52Z giovanni $ +# $Id: PKGBUILD 194693 2013-09-22 12:59:18Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.09.11 +pkgver=2013.09.18 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('ea497490920aa0e67aa69c3d1dc41ed5') +md5sums=('082ebd8f4cab6194db268b77780056d9') build() { cd ${srcdir}/live diff --git a/extra/mono/PKGBUILD b/extra/mono/PKGBUILD index 0f70626e5..b22cb8b88 100644 --- a/extra/mono/PKGBUILD +++ b/extra/mono/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 194343 2013-09-13 22:42:57Z daniel $ +# $Id: PKGBUILD 194705 2013-09-22 21:22:23Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Brice Carpentier <brice@dlfp.org> pkgname=mono -pkgver=3.2.1 +pkgver=3.2.3 pkgrel=1 pkgdesc="Free implementation of the .NET platform including runtime and compiler" arch=(i686 x86_64) @@ -17,13 +17,16 @@ conflicts=('monodoc') install=mono.install source=(http://download.mono-project.com/sources/mono/${pkgname}-${pkgver}.tar.bz2 mono.binfmt.d - mono.install) -md5sums=('bb613f9c93f57c29abcb7270f3215eb2' + mono.install + sgen_fix.patch) +md5sums=('a66c6309fad071e21f77f4c6b67a0f10' 'b9ef8a65fea497acf176cca16c1e2402' - 'ca1108e9638b01c26453ee663592a4e5') + '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 make diff --git a/extra/mono/sgen_fix.patch b/extra/mono/sgen_fix.patch new file mode 100644 index 000000000..40cb9fba7 --- /dev/null +++ b/extra/mono/sgen_fix.patch @@ -0,0 +1,112 @@ +From d2cc22580898df5d4a15e0f99ab513e1570a6082 Mon Sep 17 00:00:00 2001 +From: Zoltan Varga <vargaz@gmail.com> +Date: Fri, 20 Sep 2013 19:06:34 +0200 +Subject: [PATCH] [sgen] Use __builtin_ctzl () in OBJ_BITMAP_FOREACH_PTR () on + 64 bit platforms. Fixes #14834. + +--- + mono/metadata/sgen-descriptor.h | 28 +++++++++++++++++++++++++--- + mono/tests/sgen-descriptors.cs | 15 +++++++++++++-- + 2 files changed, 38 insertions(+), 5 deletions(-) + +diff --git a/mono/metadata/sgen-descriptor.h b/mono/metadata/sgen-descriptor.h +index cd53a86..3a00589 100644 +--- a/mono/metadata/sgen-descriptor.h ++++ b/mono/metadata/sgen-descriptor.h +@@ -170,21 +170,43 @@ enum { + } \ + } while (0) + +-#ifdef __GNUC__ ++#if defined(__GNUC__) && SIZEOF_VOID_P==4 ++#define OBJ_BITMAP_FOREACH_PTR(desc,obj) do { \ ++ /* there are pointers */ \ ++ void **_objptr = (void**)(obj); \ ++ gsize _bmap = (desc) >> 16; \ ++ _objptr += OBJECT_HEADER_WORDS; \ ++ { \ ++ int _index = __builtin_ctz (_bmap); \ ++ _objptr += _index; \ ++ _bmap >>= (_index + 1); \ ++ HANDLE_PTR (_objptr, (obj)); \ ++ _objptr ++; \ ++ } \ ++ while (_bmap) { \ ++ int _index = __builtin_ctz (_bmap); \ ++ _objptr += _index; \ ++ _bmap >>= (_index + 1); \ ++ HANDLE_PTR (_objptr, (obj)); \ ++ _objptr ++; \ ++ } \ ++ } while (0) ++#elif defined(__GNUC__) && SIZEOF_VOID_P==8 ++/* Same as above, but use _builtin_ctzl () */ + #define OBJ_BITMAP_FOREACH_PTR(desc,obj) do { \ + /* there are pointers */ \ + void **_objptr = (void**)(obj); \ + gsize _bmap = (desc) >> 16; \ + _objptr += OBJECT_HEADER_WORDS; \ + { \ +- int _index = __builtin_ctz (_bmap); \ ++ int _index = __builtin_ctzl (_bmap); \ + _objptr += _index; \ + _bmap >>= (_index + 1); \ + HANDLE_PTR (_objptr, (obj)); \ + _objptr ++; \ + } \ + while (_bmap) { \ +- int _index = __builtin_ctz (_bmap); \ ++ int _index = __builtin_ctzl (_bmap); \ + _objptr += _index; \ + _bmap >>= (_index + 1); \ + HANDLE_PTR (_objptr, (obj)); \ +diff --git a/mono/tests/sgen-descriptors.cs b/mono/tests/sgen-descriptors.cs +index ae00084..246e5aa 100644 +--- a/mono/tests/sgen-descriptors.cs ++++ b/mono/tests/sgen-descriptors.cs +@@ -1,4 +1,5 @@ + using System; ++using System.Runtime.InteropServices; + + public struct SmallMixed + { +@@ -47,6 +48,13 @@ public class HugePtrFree { + public LargeStruct2 c; + } + ++[StructLayout (LayoutKind.Sequential)] ++public class Non32bitBitmap { ++ public object o; ++ public long i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15, i16, i17, i18, i19, i20, i21, i22, i23, i24, i25, i26, i27, i28, i29, i30, i31, i32, i33, i34, i35; ++ public object o2; ++} ++ + /* + This is a stress test for descriptors. + */ +@@ -54,10 +62,10 @@ class Driver { + static char[] FOO = new char[] { 'f', 'o', 'b' }; + + static void Fill (int cycles) { +- object[] root = new object [12]; ++ object[] root = new object [13]; + object[] current = root; + for (int i = 0; i < cycles; ++i) { +- current [0] = new object [12]; ++ current [0] = new object [13]; + current [1] = new int [6]; + current [2] = new int [2,3]; + current [3] = new string (FOO); +@@ -72,6 +80,9 @@ class Driver { + current [10] = new HugePtrFree (); + if ((i % 10000) == 0) + current [11] = new LargeStruct2 [1]; ++ ++ /* Test for 64 bit bitmap descriptors (#14834) */ ++ current [12] = new Non32bitBitmap () { o = new object (), i32 = 1, i33 = 1, i34 = 1, i35 = 1, o2 = new object () }; + + current = (object[])current [0]; + } +-- +1.8.4 + diff --git a/extra/rtkit/PKGBUILD b/extra/rtkit/PKGBUILD index 7d5f551d7..d79889c7e 100644 --- a/extra/rtkit/PKGBUILD +++ b/extra/rtkit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 185307 2013-05-13 06:17:53Z heftig $ +# $Id: PKGBUILD 194685 2013-09-22 00:26:14Z dreisner $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=rtkit pkgver=0.11 -pkgrel=2 +pkgrel=3 pkgdesc="Realtime Policy and Watchdog Daemon" arch=(i686 x86_64) url="http://git.0pointer.de/?p=rtkit.git" @@ -12,13 +12,15 @@ license=(GPL 'custom:BSD') depends=(dbus polkit systemd) install=rtkit.install source=(http://0pointer.de/public/$pkgname-$pkgver.tar.xz - libsystemd.patch) + libsystemd.patch systemd205.patch) md5sums=('a96c33b9827de66033d2311f82d79a5d' - '35089c0a284005f4abcf45168415857e') + '35089c0a284005f4abcf45168415857e' + '95195a70551057aca833da6bdbf2e35b') prepare() { cd $pkgname-$pkgver patch -Np1 -i ../libsystemd.patch + patch -Np1 -i ../systemd205.patch autoreconf -fi } diff --git a/extra/rtkit/systemd205.patch b/extra/rtkit/systemd205.patch new file mode 100644 index 000000000..3f17b2ddb --- /dev/null +++ b/extra/rtkit/systemd205.patch @@ -0,0 +1,16 @@ +diff -u -r rtkit-0.11/rtkit-daemon.service.in rtkit-0.11-sd205/rtkit-daemon.service.in +--- rtkit-0.11/rtkit-daemon.service.in 2012-05-15 15:25:40.000000000 +0200 ++++ rtkit-0.11-sd205/rtkit-daemon.service.in 2013-07-25 10:27:37.790884664 +0200 +@@ -24,12 +24,7 @@ + BusName=org.freedesktop.RealtimeKit1 + NotifyAccess=main + CapabilityBoundingSet=CAP_SYS_NICE CAP_DAC_READ_SEARCH CAP_SYS_PTRACE CAP_SYS_CHROOT CAP_SETGID CAP_SETUID +-PrivateTmp=yes + PrivateNetwork=yes + +-# Work around the fact that the Linux currently doesn't assign any RT +-# budget to CPU control groups that have none configured explicitly +-ControlGroup=cpu:/ +- + [Install] + WantedBy=graphical.target |