From 6b87f8519dc037f4fd4c19d8f36b7d7565559bd3 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 19 Jul 2012 00:01:52 +0000 Subject: Thu Jul 19 00:01:52 UTC 2012 --- ...each-symlink-to-relative-name-in-properly.patch | 135 +++++++++++++++++++++ core/coreutils/PKGBUILD | 17 +-- core/gpm/PKGBUILD | 6 +- core/gpm/gpm.service | 7 +- core/grep/PKGBUILD | 7 +- core/kbd/PKGBUILD | 10 +- 6 files changed, 157 insertions(+), 25 deletions(-) create mode 100644 core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch (limited to 'core') diff --git a/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch b/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch new file mode 100644 index 000000000..087b87cdb --- /dev/null +++ b/core/coreutils/0001-ls-color-each-symlink-to-relative-name-in-properly.patch @@ -0,0 +1,135 @@ +From 6124a3842dfa8484b52e067a8ab8105c3875a4f7 Mon Sep 17 00:00:00 2001 +From: Jim Meyering +Date: Thu, 10 May 2012 19:43:00 +0200 +Subject: [PATCH] ls: color each symlink-to-relative-name in / properly + +In order for ls --color to color each symlink, it must form the name +of each referent and then stat it to see if the link is dangling, to +a directory, to a file, etc. When the symlink is to a relative name, +ls must concatenate the starting directory name and that relative name. +When, in addition, the starting directory was "/" or "/some-name", +the result was ill-formed, and the subsequent stat would usually fail, +making the caller color it as a dangling symlink. +* src/ls.c (make_link_name): Don't botch the case in which +dir_name(NAME) == "/" and LINKNAME is relative. +* tests/ls/root-rel-symlink-color: New file. Test for the above. +* tests/Makefile.am (TESTS): Add it. +* NEWS (Bug fixes): Mention it. +Reported by Mike Frysinger in http://bugs.gnu.org/11453 +Bug introduced by commit v8.16-23-gbcb9078. +--- + NEWS | 5 ++++ + src/ls.c | 9 +++++++- + tests/Makefile.am | 1 + + tests/ls/root-rel-symlink-color | 51 +++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 65 insertions(+), 1 deletion(-) + create mode 100755 tests/ls/root-rel-symlink-color + +diff --git a/NEWS b/NEWS +index 6c620b3..f9e9c70 100644 +--- a/NEWS ++++ b/NEWS +@@ -2,6 +2,11 @@ GNU coreutils NEWS -*- outline -*- + + * Noteworthy changes in release ?.? (????-??-??) [?] + ++** Bug fixes ++ ++ ls --color would mis-color relative-named symlinks in / ++ [bug introduced in coreutils-8.17] ++ + + * Noteworthy changes in release 8.17 (2012-05-10) [stable] + +diff --git a/src/ls.c b/src/ls.c +index 397e4ea..9494ae9 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -3213,7 +3213,14 @@ make_link_name (char const *name, char const *linkname) + return xstrdup (linkname); + + char *p = xmalloc (prefix_len + 1 + strlen (linkname) + 1); +- stpcpy (stpncpy (p, name, prefix_len + 1), linkname); ++ ++ /* PREFIX_LEN usually specifies a string not ending in slash. ++ In that case, extend it by one, since the next byte *is* a slash. ++ Otherwise, the prefix is "/", so leave the length unchanged. */ ++ if ( ! ISSLASH (name[prefix_len - 1])) ++ ++prefix_len; ++ ++ stpcpy (stpncpy (p, name, prefix_len), linkname); + return p; + } + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index a4370a6..0bafc5f 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -449,6 +449,7 @@ TESTS = \ + ls/proc-selinux-segfault \ + ls/readdir-mountpoint-inode \ + ls/recursive \ ++ ls/root-rel-symlink-color \ + ls/rt-1 \ + ls/slink-acl \ + ls/stat-dtype \ +diff --git a/tests/ls/root-rel-symlink-color b/tests/ls/root-rel-symlink-color +new file mode 100755 +index 0000000..d795432 +--- /dev/null ++++ b/tests/ls/root-rel-symlink-color +@@ -0,0 +1,51 @@ ++#!/bin/sh ++# Exercise the 8.17 ls bug with coloring relative-named symlinks in "/". ++ ++# Copyright (C) 2012 Free Software Foundation, Inc. ++ ++# This program is free software: you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation, either version 3 of the License, or ++# (at your option) any later version. ++ ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++ ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see . ++ ++. "${srcdir=.}/init.sh"; path_prepend_ ../src ++print_ver_ ls ++ ++symlink_to_rel= ++for i in /*; do ++ # Skip non-symlinks: ++ env test -h "$i" || continue ++ ++ # Skip dangling symlinks: ++ env test -e "$i" || continue ++ ++ # Skip any symlink-to-absolute-name: ++ case $(readlink "$i") in /*) continue ;; esac ++ ++ symlink_to_rel=$i ++ break ++done ++ ++test -z "$symlink_to_rel" \ ++ && skip_ no relative symlink in / ++ ++e='\33' ++color_code='01;36' ++c_pre="$e[0m$e[${color_code}m" ++c_post="$e[0m" ++printf "$c_pre$symlink_to_rel$c_post\n" > exp || framework_failure_ ++ ++env TERM=xterm LS_COLORS="ln=$color_code:or=1;31;42" \ ++ ls -d --color=always "$symlink_to_rel" > out || fail=1 ++ ++compare exp out || fail=1 ++ ++Exit $fail +-- +1.7.11.2 + diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 8c1bd135b..f83225f9f 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158980 2012-05-14 04:41:15Z allan $ +# $Id: PKGBUILD 163714 2012-07-18 02:16:52Z dreisner $ # Maintainer: Allan McRae # Contributor: judd pkgname=coreutils pkgver=8.17 -pkgrel=1 +pkgrel=3 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') @@ -17,10 +17,12 @@ install=${pkgname}.install options=('!emptydirs') source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} coreutils-pam.patch + 0001-ls-color-each-symlink-to-relative-name-in-properly.patch su.pam) md5sums=('bbda656ce8ca2c6903948f9faa204ba3' 'ebecd29b095aa21b0b2f833f1ec20d70' 'aad79a2aa6d566c375d7bdd1b0767278' + 'd7c691898a695a6284a927e6a9426fe4' 'fa85e5cce5d723275b14365ba71a8aad') build() { @@ -29,6 +31,10 @@ build() { # added su wheel group pam patch (from fedora git) patch -Np1 -i ${srcdir}/coreutils-pam.patch + # fix coloring for symlinks in / + # upstream commit 6124a3842dfa8484b52e067a8ab8105c3875a4f7 + patch -Np1 -i $srcdir/0001-ls-color-each-symlink-to-relative-name-in-properly.patch + autoreconf -v ./configure --prefix=/usr --libexecdir=/usr/lib/coreutils \ --enable-install-program=su \ @@ -45,18 +51,15 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - + cd ${pkgdir}/usr/bin install -dm755 ${pkgdir}/{bin,usr/sbin} - + # binaries required by FHS _fhs=('cat' 'chgrp' 'chmod' 'chown' 'cp' 'date' 'dd' 'df' 'echo' 'false' 'ln' 'ls' 'mkdir' 'mknod' 'mv' 'pwd' 'rm' 'rmdir' 'stty' 'su' 'sync' 'true' 'uname') mv ${_fhs[@]} ${pkgdir}/bin - - # makepkg uses the full path to this... - ln -s /usr/bin/du ${pkgdir}/bin/du mv chroot ${pkgdir}/usr/sbin install -Dm644 ${srcdir}/su.pam ${pkgdir}/etc/pam.d/su diff --git a/core/gpm/PKGBUILD b/core/gpm/PKGBUILD index 26f471584..eae4b2a23 100644 --- a/core/gpm/PKGBUILD +++ b/core/gpm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 160239 2012-05-31 14:53:52Z eric $ +# $Id: PKGBUILD 163618 2012-07-17 05:32:49Z eric $ # Maintainer: Eric Bélanger pkgname=gpm pkgver=1.20.6 -pkgrel=8 +pkgrel=10 pkgdesc="A mouse server for the console and xterm" arch=('i686' 'x86_64') url="http://www.nico.schottelius.org/software/gpm/" @@ -18,7 +18,7 @@ sha1sums=('4677da0eb2f1910a5a744bbefa08fea82e0dca0c' '19e1feb1493373512a77801699df012d186336ea' '4c31cb7dd51cee4d16d3f7a8956e6d87fac1ad86' '88fe5ff10916c68a87abc8418a56eb0073f69fa9' - '2db35b5f587b8dd21f9943610e7dd70469f888c7') + '20b92360f0ad38a2032fcae37bdbd01b31e43f77') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gpm/gpm.service b/core/gpm/gpm.service index 3e52af729..59e837d80 100644 --- a/core/gpm/gpm.service +++ b/core/gpm/gpm.service @@ -1,6 +1,9 @@ [Unit] -Description=GPM daemon +Description=Virtual console mouse server [Service] Type=forking -ExecStart=/usr/sbin/gpm +ExecStart=/usr/sbin/gpm -m /dev/input/mice -t imps2 + +[Install] +WantedBy=multi-user.target diff --git a/core/grep/PKGBUILD b/core/grep/PKGBUILD index ee30e4262..b878e71d8 100644 --- a/core/grep/PKGBUILD +++ b/core/grep/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163012 2012-07-05 13:49:01Z allan $ +# $Id: PKGBUILD 163715 2012-07-18 02:16:59Z dreisner $ # Maintainer: Allan McRae # Contributor: judd pkgname=grep pkgver=2.13 -pkgrel=1 +pkgrel=2 pkgdesc="A string search utility" arch=('i686' 'x86_64') license=('GPL3') @@ -31,7 +31,4 @@ check() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - - install -dm755 ${pkgdir}/bin - ln -s /usr/bin/grep ${pkgdir}/bin/grep } diff --git a/core/kbd/PKGBUILD b/core/kbd/PKGBUILD index efe8d3ede..cfb6b3dbf 100644 --- a/core/kbd/PKGBUILD +++ b/core/kbd/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 141105 2011-10-24 06:35:43Z tpowa $ +# $Id: PKGBUILD 163716 2012-07-18 02:17:05Z dreisner $ # Maintainer: Tobias Powalowski pkgname=kbd pkgver=1.15.3 -pkgrel=2 +pkgrel=3 pkgdesc="Keytable files and keyboard utilities" arch=('i686' 'x86_64') url="ftp://ftp.altlinux.org/pub/people/legion/kbd/" @@ -35,10 +35,4 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make KEYCODES_PROGS=yes RESIZECONS_PROGS=yes DESTDIR=${pkgdir} install - - # this is needed because initscripts call /bin/loadkeys - # remove this when next versions of kbd - # and initscripts with /usr/bin/loadkeys usage will be released - mkdir ${pkgdir}/bin - ln -s /usr/bin/loadkeys ${pkgdir}/bin/loadkeys } -- cgit v1.2.3-54-g00ecf From 59475c73370c37becae97edfb8eb2fe4d56ef87f Mon Sep 17 00:00:00 2001 From: root Date: Mon, 23 Jul 2012 00:01:51 +0000 Subject: Mon Jul 23 00:01:51 UTC 2012 --- community/linux-tools/PKGBUILD | 16 ++++---- community/rekonq/PKGBUILD | 8 ++-- community/soundkonverter/PKGBUILD | 6 +-- community/vhba-module/PKGBUILD | 7 ++-- community/xmoto/PKGBUILD | 17 ++++---- community/xmoto/system.cpp.patch | 10 +++++ community/xmoto/xmoto-0.5.10-libpng15.patch | 10 +++++ core/bash/PKGBUILD | 8 ++-- core/bison/PKGBUILD | 8 ++-- core/glib2/PKGBUILD | 6 +-- core/nilfs-utils/PKGBUILD | 10 ++--- core/readline/PKGBUILD | 10 +++-- extra/gnome-shell/PKGBUILD | 14 +++---- extra/gtk2/PKGBUILD | 8 ++-- extra/gtk3/PKGBUILD | 6 +-- extra/libburn/PKGBUILD | 12 +++--- extra/libisoburn/PKGBUILD | 10 ++--- extra/libisofs/PKGBUILD | 8 ++-- extra/mkvtoolnix/PKGBUILD | 12 ++++-- extra/mkvtoolnix/mm_io.patch | 11 +++++ extra/ode/PKGBUILD | 9 +++-- extra/xf86-video-chips/PKGBUILD | 15 ++++--- extra/xf86-video-chips/iopl.h | 60 +++++++++++++++++++++++++++ extra/xf86-video-dummy/PKGBUILD | 6 +-- extra/xf86-video-vesa/PKGBUILD | 8 ++-- libre/linux-libre-tools/PKGBUILD | 12 +++--- libre/mozilla-devscripts/PKGBUILD | 9 +++-- pcr/ryzom-client/PKGBUILD | 41 +++++++++++++++++++ pcr/ryzom-data/PKGBUILD | 8 ++-- pcr/ryzom-nel/PKGBUILD | 52 ++++++++++++++++++++++++ testing/dbus-core/PKGBUILD | 10 ++--- testing/dbus/PKGBUILD | 8 ++-- testing/flex/PKGBUILD | 44 ++++++++++++++++++++ testing/flex/flex.install | 22 ++++++++++ testing/flex/lex.sh | 3 ++ testing/systemd/PKGBUILD | 14 ++++--- testing/zsh/PKGBUILD | 63 +++++++++++++++++++++++++++++ testing/zsh/zprofile | 1 + testing/zsh/zsh.install | 11 +++++ 39 files changed, 472 insertions(+), 121 deletions(-) create mode 100644 community/xmoto/system.cpp.patch create mode 100644 community/xmoto/xmoto-0.5.10-libpng15.patch create mode 100644 extra/mkvtoolnix/mm_io.patch create mode 100644 extra/xf86-video-chips/iopl.h create mode 100644 pcr/ryzom-client/PKGBUILD create mode 100644 pcr/ryzom-nel/PKGBUILD create mode 100644 testing/flex/PKGBUILD create mode 100644 testing/flex/flex.install create mode 100644 testing/flex/lex.sh create mode 100644 testing/zsh/PKGBUILD create mode 100644 testing/zsh/zprofile create mode 100644 testing/zsh/zsh.install (limited to 'core') diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD index a8e7f2941..56dfeb802 100644 --- a/community/linux-tools/PKGBUILD +++ b/community/linux-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 73035 2012-06-28 19:07:34Z seblu $ +# $Id: PKGBUILD 74127 2012-07-22 02:44:47Z seblu $ # Maintainer: Sébastien Luttringer pkgbase=linux-tools pkgname=('perf' 'cpupower' 'x86_energy_perf_policy') -pkgver=3.4 -pkgrel=3 +pkgver=3.5 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64') url='http://www.kernel.org' @@ -17,14 +17,14 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz" 'cpupower.rc' 'cpupower.conf' 'cpupower.service') -md5sums=('967f72983655e2479f951195953e8480' +md5sums=('24153eaaa81dedc9481ada8cd9c3b83d' '73dbc931e86b3b73d6e2338dcbee81a4' '857ccdd0598511e3bf4b63522754dc48' '20870541e88109d2f153be3c58a277f1') build() { # apply stable patching set - if [[ -e "$srcdir"/patch-* ]]; then + if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-* ]]; then msg2 'Applying stable patch set' patch -N -p1 -i "$srcdir"/patch-* fi @@ -32,8 +32,9 @@ build() { msg2 'Build perf' pushd linux-$pkgver/tools/perf make \ + WERROR=0 \ DESTDIR="$pkgdir/usr" \ - perfexecdir="lib/$pkgname" \ + perfexecdir='lib/perf' \ PYTHON=python2 \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ @@ -59,8 +60,9 @@ package_perf() { cd linux-$pkgver/tools/perf make \ + WERROR=0 \ DESTDIR="$pkgdir/usr" \ - perfexecdir="lib/$pkgname" \ + perfexecdir='lib/perf' \ PYTHON=python2 \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD index c50418fea..1c9976037 100644 --- a/community/rekonq/PKGBUILD +++ b/community/rekonq/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 70235 2012-05-02 17:32:26Z andrea $ +# $Id: PKGBUILD 74109 2012-07-21 11:42:11Z andrea $ # Maintainer: Peter Lewis # Maintainer: Andrea Scarpino # Contributor: Panagiotis Papadopoulos pkgname=rekonq -pkgver=0.9.2 +pkgver=1.0 pkgrel=1 pkgdesc='A WebKit based web browser for KDE' arch=('i686' 'x86_64') url='http://rekonq.kde.org/' license=('GPL') -depends=('kdebase-keditbookmarks') +depends=('kdebase-keditbookmarks' 'qoauth') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5e5ce5fc20f07ac0deb1584404595750') +md5sums=('ca7b86ad4a778cbba52a14192865c7b0') build(){ cd "${srcdir}" diff --git a/community/soundkonverter/PKGBUILD b/community/soundkonverter/PKGBUILD index ed8abccc5..dae215595 100644 --- a/community/soundkonverter/PKGBUILD +++ b/community/soundkonverter/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 72654 2012-06-18 16:27:25Z stativ $ +# $Id: PKGBUILD 74115 2012-07-21 13:03:07Z stativ $ # Maintainer: Lukas Jirkovsky # Contributor: Mateusz Herych # Contributor: Eric Belanger # Contributor: Darwin Bautista pkgname=soundkonverter -pkgver=1.6.2 +pkgver=1.6.3 pkgrel=1 pkgdesc="Front-end to various audio converters" arch=('i686' 'x86_64') @@ -31,7 +31,7 @@ optdepends=('cdrkit: cdda2wav backend' 'wavpack: wavpack backend') install=$pkgname.install source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz") -md5sums=('268a2620f3e0352bd94eb1f1d668d59f') +md5sums=('f617d9b73937d4576bc21fd359f4964b') build() { cd "$srcdir"/$pkgname-$pkgver diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index 9ffa315b8..16a65b9b7 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73706 2012-07-14 13:07:56Z allan $ +# $Id: PKGBUILD 74112 2012-07-21 11:58:49Z schiv $ # Maintainer: Ray Rashif # Contributor: Mateusz Herych # Contributor: Charles Lindsay @@ -6,7 +6,7 @@ pkgname=vhba-module pkgver=20120422 _extramodules=extramodules-3.4-ARCH -pkgrel=3 +pkgrel=4 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" @@ -31,7 +31,8 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - install -D vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" + install -Dm644 vhba.ko \ + "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ "$startdir/vhba-module.install" diff --git a/community/xmoto/PKGBUILD b/community/xmoto/PKGBUILD index 79ffae8c1..94a49dfd5 100644 --- a/community/xmoto/PKGBUILD +++ b/community/xmoto/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 67382 2012-03-10 21:01:16Z giovanni $ +# $Id: PKGBUILD 74121 2012-07-21 19:56:28Z giovanni $ # Maintainer: Ronald van Haren # Contributor: Travis Willard # Contributor: Denis (dtonator@gmail.com) pkgname=xmoto -pkgver=0.5.9 -pkgrel=2 +pkgver=0.5.10 +pkgrel=1 pkgdesc="A challenging 2D motocross platform game, where physics play an important role." arch=('i686' 'x86_64') url="http://xmoto.tuxfamily.org" @@ -15,14 +15,17 @@ depends=('bzip2' 'libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' 'libxdg-basedir' 'libxml++') install=xmoto.install source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" - 'xmoto-0.5.9-libpng15.patch') -sha1sums=('07757accce78151dc8873bef8270df0e56196772' - '27f52bd30772f67898e0bfd8c1e12478a4848192') + 'xmoto-0.5.10-libpng15.patch' + 'system.cpp.patch') +sha1sums=('692d50a9c91791cd06ee84846632651b44544fcc' + '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d' + 'e741f769d1fc5779a6688970ee97e2a61a50c7ae') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}/xmoto-0.5.9-libpng15.patch" + patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch" + patch -Np1 -i "${srcdir}/system.cpp.patch" # build and install ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest diff --git a/community/xmoto/system.cpp.patch b/community/xmoto/system.cpp.patch new file mode 100644 index 000000000..df42e3a7c --- /dev/null +++ b/community/xmoto/system.cpp.patch @@ -0,0 +1,10 @@ +--- a/src/helpers/System.cpp 2011-10-11 22:18:14.000000000 +0200 ++++ b/src/helpers/System.cpp 2012-07-21 21:28:40.000000000 +0200 +@@ -24,6 +24,7 @@ + #include "Log.h" + #include "VExcept.h" + #include ++#include + + std::vector* System::getDisplayModes(int windowed) { + std::vector* modes = new std::vector; diff --git a/community/xmoto/xmoto-0.5.10-libpng15.patch b/community/xmoto/xmoto-0.5.10-libpng15.patch new file mode 100644 index 000000000..aed175c7c --- /dev/null +++ b/community/xmoto/xmoto-0.5.10-libpng15.patch @@ -0,0 +1,10 @@ +--- a/src/image/tim_png.cpp 2011-12-29 22:13:37.000000000 +0100 ++++ b/src/image/tim_png.cpp 2012-07-21 21:36:34.000000000 +0200 +@@ -24,6 +24,7 @@ + */ + #include + #include ++#include + #include "tim.h" + #include + #include diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 1749c7168..02a62831d 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163494 2012-07-13 12:31:26Z allan $ +# $Id: PKGBUILD 163854 2012-07-21 11:22:49Z allan $ # Maintainer: Allan McRae # Contributor: Aaron Griffin pkgname=bash _basever=4.2 -_patchlevel=036 #prepare for some patches +_patchlevel=037 #prepare for some patches pkgver=$_basever.$_patchlevel pkgrel=1 pkgdesc="The GNU Bourne Again shell" @@ -150,4 +150,6 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '7cd9bfdf7cbfd45274d07620ee94c8d9' 'a7d2eace0da5fd236c93dbfd93458838' '9c3142956064d175a880bcb186e51ef9' - 'a1a87649853f20fe99572ddc02b0c67f') + 'a1a87649853f20fe99572ddc02b0c67f' + 'c10692f447d4966c879f8fb8d7c8ebc9' + '1bf5e34ad46566bc2d0eb7560ff8968e') diff --git a/core/bison/PKGBUILD b/core/bison/PKGBUILD index c96323ad0..7e104649b 100644 --- a/core/bison/PKGBUILD +++ b/core/bison/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161346 2012-06-10 05:52:18Z allan $ +# $Id: PKGBUILD 163856 2012-07-21 11:24:29Z allan $ # Maintainer: Allan McRae # Contributor: Eric Belanger pkgname=bison -pkgver=2.5.1 +pkgver=2.6 pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('glibc' 'm4' 'sh') groups=('base-devel') install=bison.install source=(ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('012708d801a3c986d8654aa673530b61' - '6c7e9276aa8b89879126a611384897a8') +md5sums=('f96a16e79daaef71c797ed88f52e59d1' + 'd67a1a075ab0cccfb53ab23692be1a02') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index 1bbd45ecd..0b4372129 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 159164 2012-05-16 20:53:29Z ibiru $ +# $Id: PKGBUILD 163895 2012-07-21 19:19:49Z ibiru $ # Maintainer: Jan de Groot pkgname=glib2 -pkgver=2.32.3 +pkgver=2.32.4 pkgrel=1 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" @@ -16,7 +16,7 @@ source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.ta glib2.sh glib2.csh revert-warn-glib-compile-schemas.patch) -sha256sums=('b65ceb462807e4a2f91c95e4293ce6bbefca308cb44a1407bcfdd9e40363ff4d' +sha256sums=('a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2' '9456872cdedcc639fb679448d74b85b0facf81033e27157d2861b991823b5a2a' '8d5626ffa361304ad3696493c0ef041d0ab10c857f6ef32116b3e2878ecf89e3' '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97') diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index f4187b5e6..f943a0d97 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161869 2012-06-16 00:19:50Z ibiru $ +# $Id: PKGBUILD 163896 2012-07-21 19:19:52Z ibiru $ # Maintainer : Ionut Biru # Contributor: Geoffroy Carrier pkgname=nilfs-utils -pkgver=2.1.2 +pkgver=2.1.4 pkgrel=1 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64') @@ -13,15 +13,15 @@ backup=('etc/nilfs_cleanerd.conf') depends=('util-linux') options=(!libtool) source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('9a16a5ca459e64a903eac9c2fd456802') +md5sums=('e72f941f5041a057a81a1ce22e03497d') build() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver ./configure --enable-libmount make } package() { - cd "$pkgname-$pkgver" + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install LDCONFIG=/bin/true } diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD index b2b924f2d..037b7e1d0 100644 --- a/core/readline/PKGBUILD +++ b/core/readline/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 163490 2012-07-13 12:30:45Z allan $ +# $Id: PKGBUILD 163855 2012-07-21 11:22:57Z allan $ # Maintainer: Allan McRae # Contributor: judd pkgname=readline _basever=6.2 -_patchlevel=003 #prepare for some patches +_patchlevel=004 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=2 +pkgrel=1 pkgdesc="GNU readline library" arch=('i686' 'x86_64') url="http://tiswww.case.edu/php/chet/readline/rltop.html" @@ -30,7 +30,9 @@ md5sums=('67948acb2ca081f23359d0256e9a271c' '0665020ea118e8434bd145fb71f452cc' '285361ca6d48c51ae2428157e174e812' 'c9d5d79718856e711667dede87cb7622' - '4437205bb1462f5f32e4812b8292c675') + '4437205bb1462f5f32e4812b8292c675' + 'c08e787f50579ce301075c523fa660a4' + '7e39cad1d349b8ae789e4fc33dbb235f') build() { cd ${srcdir}/${pkgname}-$_basever diff --git a/extra/gnome-shell/PKGBUILD b/extra/gnome-shell/PKGBUILD index d9816ab21..8c1904741 100644 --- a/extra/gnome-shell/PKGBUILD +++ b/extra/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158538 2012-05-04 12:58:08Z ibiru $ +# $Id: PKGBUILD 163901 2012-07-21 19:28:49Z ibiru $ # Maintainer: Ionut Biru # Contributor: Flamelab pkgbase=gtk2 pkgname=('gtk2' 'gtk-update-icon-cache') -pkgver=2.24.10 -pkgrel=3 +pkgver=2.24.11 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -13,7 +13,7 @@ options=('!libtool') license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz xid-collision-debug.patch) -sha256sums=('ea56e31bb9d6e19ed2e8911f4c7ac493cb804431caa21cdcadae625d375a0e89' +sha256sums=('328b4ea19a61040145e777e2ac49820968a382ac8581a380c9429897881812a9' 'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558') build() { diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 36f89960c..9d4a7a195 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 158899 2012-05-12 20:17:26Z ibiru $ +# $Id: PKGBUILD 163899 2012-07-21 19:20:27Z ibiru $ # Maintainer: Ionut Biru pkgname=gtk3 -pkgver=3.4.3 +pkgver=3.4.4 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini wacom.patch) -sha256sums=('846010442a96590469cde16ed6a1fdfe09397e435165459f04d31cfa5713799f' +sha256sums=('f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' '86bda95a14a99d0f596c4ecb2ed715689f71c207c65dfc90a39d4ae7f1c0c0f5') build() { diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index c33f73e78..645aa2505 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 155443 2012-04-03 18:01:23Z andyrtr $ +# $Id: PKGBUILD 163883 2012-07-21 12:10:06Z andyrtr $ # Maintainer: Andreas Radke # Contributor: William Rea pkgname=libburn -pkgver=1.2.2 #.pl01 +pkgver=1.2.4 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64') @@ -12,17 +12,17 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool' '!emptydirs') -md5sums=('7878b3af82752d391f2613fcf1b18d4c' - 'e4903839d6dc3a93b50102b98a5362f4') +md5sums=('25b45b1ccf6921a5bce4e2d88f55a81f' + 'a6749b55ba9ec9dad471e3a2202de390') build() { - cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install } diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 622b184f1..36a6f7e47 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 155447 2012-04-03 18:06:59Z andyrtr $ +# $Id: PKGBUILD 163887 2012-07-21 12:16:22Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Gour pkgname=libisoburn -pkgver=1.2.2 +pkgver=1.2.4 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" arch=('i686' 'x86_64') license=('GPL2') -depends=('libburn>=1.2.2' 'libisofs>=1.2.2' 'readline') +depends=('libburn>=1.2.4' 'libisofs>=1.2.4' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('2f94e9dc77c4f3b5066371a5870a844b' - 'b5a1957edce278ce18bd0eed1d93a3ae') +md5sums=('d5d78ec840a8bbc7df6582f65a28ca1e' + '39d26239be2e7ed2ec1dd22e214173dd') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index f17b3e795..a5cfd9def 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155445 2012-04-03 18:03:38Z andyrtr $ +# $Id: PKGBUILD 163885 2012-07-21 12:12:07Z andyrtr $ # Maintainer: AndyRTR # Contributor: Hugo Doria # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.2.2 +pkgver=1.2.4 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz{,.sig}) options=('!libtool') -md5sums=('5d6bee8276b08019078c19d84ef5485b' - '8bac560e309b4f4ca60098742e53d1a3') +md5sums=('0a86f2cda3b86fc95f7c0efbd793f373' + '8b997974f30da1b7a7f97563df4365a3') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index be933c4e8..2439562e4 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 163712 2012-07-18 01:05:57Z ibiru $ +# $Id: PKGBUILD 163843 2012-07-21 11:04:01Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: xduugu pkgbase=mkvtoolnix pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk') pkgver=5.7.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('GPL') url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk' 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby') -source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2") -md5sums=('99ea44be570412dadafe4ccaee0cfe6e') +source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2" + 'mm_io.patch') +md5sums=('99ea44be570412dadafe4ccaee0cfe6e' + '293bd4551ef8529e9d4796c5a201b8fc') build() { cd "${srcdir}/${pkgbase}-${pkgver}" + patch -Np1 -i "${srcdir}/mm_io.patch" + # Disable automagic curl dep used for online update checking sed -i -e '/curl/d' configure.in export CURL_CFLAGS="" CURL_LIBS="" diff --git a/extra/mkvtoolnix/mm_io.patch b/extra/mkvtoolnix/mm_io.patch new file mode 100644 index 000000000..9ee9e018f --- /dev/null +++ b/extra/mkvtoolnix/mm_io.patch @@ -0,0 +1,11 @@ +--- a/src/common/mm_io.cpp 2012-07-08 20:06:02.000000000 +0200 ++++ b/src/common/mm_io.cpp 2012-07-21 11:59:59.000000000 +0200 +@@ -147,7 +147,7 @@ + void + mm_file_io_c::prepare_path(const std::string &path) { + boost::filesystem::path directory = boost::filesystem::path(path).parent_path(); +- if (boost::filesystem::exists(directory)) ++ if (directory.empty() || boost::filesystem::exists(directory)) + return; + + boost::system::error_code error_code; diff --git a/extra/ode/PKGBUILD b/extra/ode/PKGBUILD index 5cd492894..18f3befa2 100644 --- a/extra/ode/PKGBUILD +++ b/extra/ode/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153667 2012-03-17 17:53:37Z giovanni $ +# $Id: PKGBUILD 163893 2012-07-21 19:10:48Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Adam Griffiths pkgname=ode pkgver=0.12 -pkgrel=2 +pkgrel=3 pkgdesc="An open source, high performance library for simulating rigid body dynamics" arch=('i686' 'x86_64') url="http://www.ode.org" @@ -12,14 +12,15 @@ license=('LGPL' 'BSD') depends=('gcc-libs' 'bash') source=("http://downloads.sourceforge.net/sourceforge/opende/${pkgname}-${pkgver}.tar.bz2") options=('!libtool') -md5sums=('83766cae59692c2843d9afccc1768988') +md5sums=('48fdd41fae1a7e7831feeded09826599') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr \ --enable-shared \ - --enable-libccd + --enable-libccd \ + --enable-double-precision make } diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD index aea1d769a..90b34de81 100644 --- a/extra/xf86-video-chips/PKGBUILD +++ b/extra/xf86-video-chips/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 153327 2012-03-12 20:53:18Z andyrtr $ +# $Id: PKGBUILD 163841 2012-07-21 10:59:26Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Alexander Baldeck pkgname=xf86-video-chips -pkgver=1.2.4 -pkgrel=4 +pkgver=1.2.5 +pkgrel=1 pkgdesc="X.org Chips and Technologies video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,14 +14,13 @@ makedepends=('xorg-server-devel>=1.11.99.902') conflicts=('xorg-server<1.11.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - chips-1.2.4-git.patch) -sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4' - 'b13ff000e3f6f06c1a7fd55e9e0ad6078f1b4e5b') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h) +sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2' + 'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i ${srcdir}/chips-1.2.4-git.patch + cp ${srcdir}/iopl.h util/ ./configure --prefix=/usr make } diff --git a/extra/xf86-video-chips/iopl.h b/extra/xf86-video-chips/iopl.h new file mode 100644 index 000000000..e08207c7f --- /dev/null +++ b/extra/xf86-video-chips/iopl.h @@ -0,0 +1,60 @@ +#ifdef __NetBSD__ +# include +# include +# include +#else +# if defined(__linux__) +/* Can't because provides conflicting inb, outb, etc + * # include + */ +int iopl(int level); +# endif +# if defined(SVR4) && defined(i386) +# include +# ifdef NCR + /* broken NCR */ +# define __STDC +# include +# undef __STDC +# else +# include +# endif +# ifdef SVR4 +# if !defined(sun) +# include +# endif +# endif +# include +# if defined(sun) +# include +# endif +# endif +# include "AsmMacros.h" +#endif /* NetBSD */ + +#include +#include +#include + +#ifdef __NetBSD__ +# define SET_IOPL() i386_iopl(3) +# define RESET_IOPL() i386_iopl(0) +#else +# if defined(SVR4) && defined(i386) +# ifndef SI86IOPL +# define SET_IOPL() sysi86(SI86V86,V86SC_IOPL,PS_IOPL) +# define RESET_IOPL() sysi86(SI86V86,V86SC_IOPL,0) +# else +# define SET_IOPL() sysi86(SI86IOPL,3) +# define RESET_IOPL() sysi86(SI86IOPL,0) +# endif +# else +# ifdef linux +# define SET_IOPL() iopl(3) +# define RESET_IOPL() iopl(0) +# else +# define SET_IOPL() (void)0 +# define RESET_IOPL() (void)0 +# endif +# endif +#endif diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD index dbea9727e..f07c93e6a 100644 --- a/extra/xf86-video-dummy/PKGBUILD +++ b/extra/xf86-video-dummy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153331 2012-03-12 20:53:23Z andyrtr $ +# $Id: PKGBUILD 163836 2012-07-21 10:34:04Z andyrtr $ #Maintainer: Jan de Groot pkgname=xf86-video-dummy -pkgver=0.3.5 +pkgver=0.3.6 pkgrel=1 pkgdesc="X.org dummy video driver" arch=(i686 x86_64) @@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.903') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('41cfcaec986ab13e931d260953c5a3f626fd1d2b') +sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD index b3d59bf09..565aeab9f 100644 --- a/extra/xf86-video-vesa/PKGBUILD +++ b/extra/xf86-video-vesa/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 154126 2012-03-23 17:04:49Z andyrtr $ +# $Id: PKGBUILD 163838 2012-07-21 10:36:33Z andyrtr $ # Maintainer: Jan de Groot pkgname=xf86-video-vesa -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="X.org vesa video driver" arch=(i686 x86_64) @@ -15,8 +15,8 @@ groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 revert-kernelcheck.patch) -sha1sums=('acb4f8104f16476d46ceb366aa932783c3644ead' - 'c14454521ac91aaa08aad8a6025d7720a613d54b') +sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3' + 'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index def346093..3803b520c 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -5,11 +5,11 @@ pkgbase=linux-libre-tools _pkgname=('perf' 'cpupower' 'x86_energy_perf_policy') pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre') -_basekernel=3.4 +_basekernel=3.5 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=3 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -22,7 +22,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'cpupower.rc' 'cpupower.conf' 'cpupower.service') -md5sums=('a5e128ca059cceb8b69148b41ff4ac6f' +md5sums=('2407fc9563a74acaf38aa0c06516eb1c' '73dbc931e86b3b73d6e2338dcbee81a4' '18d5aa9e4c6bb23bb02bf65e155e0f0e' '20870541e88109d2f153be3c58a277f1') @@ -37,8 +37,9 @@ build() { msg2 'Build perf' pushd linux-$pkgver/tools/perf make \ + WERROR=0 \ DESTDIR="$pkgdir/usr" \ - perfexecdir="lib/$_pkgname" \ + perfexecdir='lib/perf' \ PYTHON=python2 \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ @@ -67,8 +68,9 @@ package_perf-libre() { cd linux-$pkgver/tools/perf make \ + WERROR=0 \ DESTDIR="$pkgdir/usr" \ - perfexecdir="lib/$_pkgname" \ + perfexecdir='lib/perf' \ PYTHON=python2 \ NO_GTK2=1 \ PERF_VERSION=$pkgver-$pkgrel \ diff --git a/libre/mozilla-devscripts/PKGBUILD b/libre/mozilla-devscripts/PKGBUILD index faa4b3a2a..ef7ea7641 100644 --- a/libre/mozilla-devscripts/PKGBUILD +++ b/libre/mozilla-devscripts/PKGBUILD @@ -1,8 +1,9 @@ # Maintainer: Michał Masłowski +# Contributor: Márcio Silva pkgname=mozilla-devscripts -pkgver=0.30 -pkgrel=1.1 +pkgver=0.32 +pkgrel=1 pkgdesc="Development scripts used by Debian Mozilla's addons packages" arch=("any") url="http://packages.debian.org/source/unstable/mozilla-devscripts" @@ -11,8 +12,8 @@ depends=("python2" "zip" "unzip") _debrepo=http://ftp.debian.org/debian/pool/main/ source=("${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.dsc" "${_debrepo}/m/${pkgname}/${pkgname}_${pkgver}.tar.gz") -md5sums=("6e517cef69c115356eb808866fd29268" - "4e95fb93d0d93b56543d2a789d457309") +md5sums=("386a5854601f29dca4a293f90f6c2a69" + "230126afa15fa654eb254bb4e61b4a93") build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD new file mode 100644 index 000000000..d3d077d4f --- /dev/null +++ b/pcr/ryzom-client/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Jorge Araya Navarro +pkgname=('ryzom-client') +pkgver=0.8.0 +pkgrel=1 +arch=('x86_64' 'i686') +url="http://www.ryzom.com" +license=('AGPL3') +pkgdesc="An awesome free software 3D MMORPG game" +depends=('ryzom-data' 'ryzom-nel') +conflicts=('ryzom-client') +groups=('ryzom') +options=(!strip) +makedepends=('kervala_libsquish-hg' 'cmake' 'bison' + 'lua' 'luabind' 'curl' 'libpng' 'libwww' + 'boost' 'ryzom-nel') + +auser="shackra" +achangeset="3222b96eed75" + +source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz") +sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568') + +build() { + cd "$srcdir/$auser-ryzom-$achangeset/code" + if [[ -d "ryzom-client" ]]; then + rm -rf "ryzom-client" + mkdir "ryzom-client" + else + mkdir "ryzom-client" + fi + + cd "ryzom-client" + cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin -DWITH_SYMBOLS=ON + + make -j3 +} + +package() { + cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname" + make DESTDIR="$pkgdir" install +} diff --git a/pcr/ryzom-data/PKGBUILD b/pcr/ryzom-data/PKGBUILD index 272db5c07..dfb8a116c 100644 --- a/pcr/ryzom-data/PKGBUILD +++ b/pcr/ryzom-data/PKGBUILD @@ -9,9 +9,10 @@ license=('CCPL:by-sa') makedepends=('rsync' 'p7zip-libre') conflicts=('ryzom-data') pkgdesc="An awesome free software 3D MMORPG game. Game data." -source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download") +source=("http://sourceforge.net/projects/ryzom/files/ryzom_client.7z/download" "updateryzomdata") noextract=("download") -sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f') +sha256sums=('fa9e44e1014f4ae8639f1ec092391a41f69fc343ce48dd39b55ffae06ec3291f' + 'b42f74fd21cdbf6734214e5576dbbe7e4cf171bf5d712011fbea6529bd0123fd') package() { cd "$srcdir/" @@ -33,11 +34,12 @@ package() { # creating directories install -d -m 755 "${pkgdir}/usr/share/ryzom/data/fonts/" + install -d -m 755 "${pkgdir}/etc/cron.d/" # installing files install -m 644 fonts/* "${pkgdir}/usr/share/ryzom/data/fonts/" rm -rf fonts install -m 644 * "${pkgdir}/usr/share/ryzom/data/" + install -m 644 ${srcdir}/updateryzomdata "${pkgdir}/etc/cron.d/" } - diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD new file mode 100644 index 000000000..aff8ec5e4 --- /dev/null +++ b/pcr/ryzom-nel/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Jorge Araya Navarro +pkgname='ryzom-nel' +pkgver=0.8.0 +pkgrel=7 +arch=('x86_64' 'i686') +conflicts=('ryzom-nel') +groups=('ryzom') +options=(!strip) +pkgdesc="An awesome free software 3D MMORPG game, NeL engine" +url="http://www.ryzom.com" +license=('AGPL3') +depends=('freetype2' + 'libx11' + 'mesa' + 'libxxf86vm' + 'openal' + 'freealut' + 'libogg' + 'libvorbis' + 'libxml2' + 'libjpeg' + 'rrdtool' ) +makedepends=('cmake' 'bison' 'kervala_libsquish-hg') + +auser="shackra" +achangeset="3222b96eed75" + +source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz") + +build() { + cd "$srcdir/$auser-ryzom-$achangeset/code" + + if [[ -d $pkgname ]]; then + rm -rf $pkgname + mkdir $pkgname + else + mkdir $pkgname + fi + + cd $pkgname + + #CMAKE_USE_RELATIVE_PATHS=true + cmake .. -Wno-dev -DWITH_LIBWWW_STATIC=ON -DWITH_RYZOM=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON + + make -j3 +} + +package() { + cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname" + make DESTDIR="$pkgdir" install +} +sha256sums=('95b5944db8b71b75e95becd8125b0437de5a88691b89e32c1ceb42454a62c568') diff --git a/testing/dbus-core/PKGBUILD b/testing/dbus-core/PKGBUILD index d733500ed..5aa2d0e33 100644 --- a/testing/dbus-core/PKGBUILD +++ b/testing/dbus-core/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162700 2012-06-28 14:06:31Z ibiru $ +# $Id: PKGBUILD 163851 2012-07-21 11:19:10Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus-core -pkgver=1.6.2 -pkgrel=2 +pkgver=1.6.4 +pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) @@ -15,8 +15,8 @@ options=(!libtool) install=dbus.install source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc} dbus) -md5sums=('7fbf877ed6ff7da6df90f07158373829' - '2cd74b6efca77e4e3aa2b7ccde770668' +md5sums=('5ec43dc4554cba638917317b2b4f7640' + '3d4482ee39b49da334441c76f83bf1cb' 'f0364f3f5dc5f653bb05d39aa36e3264') build() { diff --git a/testing/dbus/PKGBUILD b/testing/dbus/PKGBUILD index 05f8856a8..02b2696d7 100644 --- a/testing/dbus/PKGBUILD +++ b/testing/dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162696 2012-06-28 11:58:24Z ibiru $ +# $Id: PKGBUILD 163850 2012-07-21 11:19:03Z andyrtr $ # Maintainer: Jan de Groot # Contributor: Link Dupont # pkgname=dbus -pkgver=1.6.2 +pkgver=1.6.4 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -12,8 +12,8 @@ license=('GPL' 'custom') depends=("dbus-core>=$pkgver" 'libx11') source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc} 30-dbus) -md5sums=('7fbf877ed6ff7da6df90f07158373829' - '2cd74b6efca77e4e3aa2b7ccde770668' +md5sums=('5ec43dc4554cba638917317b2b4f7640' + '3d4482ee39b49da334441c76f83bf1cb' '9fafe8b28460aeaa6054309ef4c5ed92') build() { diff --git a/testing/flex/PKGBUILD b/testing/flex/PKGBUILD new file mode 100644 index 000000000..d51091dc7 --- /dev/null +++ b/testing/flex/PKGBUILD @@ -0,0 +1,44 @@ +# $Id: PKGBUILD 163839 2012-07-21 10:43:39Z allan $ +# Maintainer: Allan McRae +# Contributor: judd + +pkgname=flex +pkgver=2.5.36 +pkgrel=1 +pkgdesc="A tool for generating text-scanning programs" +arch=('i686' 'x86_64') +url="http://flex.sourceforge.net" +license=('custom') +groups=('base-devel') +depends=('glibc' 'm4' 'sh') +install=flex.install +source=(http://downloads.sourceforge.net/sourceforge/flex/flex-$pkgver.tar.bz2 + lex.sh) +md5sums=('5e637290609fd3c2f1f2e75ac2bce1c5' + 'f725259ec23a9e87ee29e2ef82eda9a5') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $srcdir/$pkgname-$pkgver + + # these tests used features removed in bison-2.6 + sed -i -e '/test-bison-yylloc/d' -e '/test-bison-yylval/d' tests/Makefile.in + + make check +} + +package() { + cd $srcdir/$pkgname-$pkgver + + make DESTDIR=$pkgdir install + install -Dm755 $srcdir/lex.sh $pkgdir/usr/bin/lex + + install -Dm644 COPYING \ + $pkgdir/usr/share/licenses/$pkgname/license.txt +} + diff --git a/testing/flex/flex.install b/testing/flex/flex.install new file mode 100644 index 000000000..5b328c722 --- /dev/null +++ b/testing/flex/flex.install @@ -0,0 +1,22 @@ +infodir=/usr/share/info +filelist=(flex.info{,-1,-2}) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +# vim:set ts=2 sw=2 et: diff --git a/testing/flex/lex.sh b/testing/flex/lex.sh new file mode 100644 index 000000000..13e7de692 --- /dev/null +++ b/testing/flex/lex.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec /usr/bin/flex -l "$@" diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD index 863850c92..d677cfcda 100644 --- a/testing/systemd/PKGBUILD +++ b/testing/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=187 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -52,10 +52,10 @@ package_systemd() { pkgdesc="system and service manager" depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' "systemd-tools=$pkgver" 'util-linux' 'xz') - optdepends=('python-dbus: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' + optdepends=('initscripts: legacy support for hostname and vconsole setup' 'initscripts-systemd: legacy generator for initialization scripts' - 'python-cairo: systemd-analyze' + 'python2-cairo: systemd-analyze' + 'python2-dbus: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf @@ -87,6 +87,10 @@ package_systemd() { rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service" rmdir "$pkgdir/etc/systemd/system/getty.target.wants" + # fix systemd-analyze for python2. the 'plot' verb does not work + # with py3k due to a bug in python-cairo + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + ### split off libsystemd (libs, includes, pkgconfig, man3) rm -rf "$srcdir/_libsystemd" install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} @@ -137,7 +141,7 @@ package_systemd() { mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8 mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 - mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5 + mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd } diff --git a/testing/zsh/PKGBUILD b/testing/zsh/PKGBUILD new file mode 100644 index 000000000..ae4a6f30d --- /dev/null +++ b/testing/zsh/PKGBUILD @@ -0,0 +1,63 @@ +# $Id: PKGBUILD 163903 2012-07-21 22:24:24Z pierre $ +# Maintainer: Pierre Schmitz + +pkgname=zsh +pkgver=5.0.0 +pkgrel=1 +pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' +arch=('i686' 'x86_64') +url='http://www.zsh.org/' +license=('custom') +depends=('pcre' 'libcap' 'gdbm') +install=zsh.install +source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2" + 'zprofile') +backup=('etc/zsh/zprofile') +md5sums=('e8484468925cec8d9a84b8b04797e764' + '24a9335edf77252a7b5f52e079f7aef7') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + # FS#16360 + sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \ + Doc/zsh.texi \ + Completion/Unix/Type/_services \ + Completion/Unix/Command/_init_d + + # Remove unneeded and conflicting completion scripts + rm -rf Completion/{AIX,BSD,Cygwin,Darwin,Debian,Mandriva,openSUSE,Redhat,Solaris} + rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast} + rm -f Completion/Unix/Command/_osc + + ./configure --prefix=/usr \ + --bindir=/bin \ + --enable-etcdir=/etc/zsh \ + --enable-zshenv=/etc/zsh/zshenv \ + --enable-zlogin=/etc/zsh/zlogin \ + --enable-zlogout=/etc/zsh/zlogout \ + --enable-zprofile=/etc/zsh/zprofile \ + --enable-zshrc=/etc/zsh/zshrc \ + --enable-maildir-support \ + --with-term-lib='ncursesw' \ + --enable-multibyte \ + --enable-function-subdirs \ + --enable-fndir=/usr/share/zsh/functions \ + --enable-scriptdir=/usr/share/zsh/scripts \ + --with-tcsetpgrp \ + --enable-pcre \ + --enable-cap \ + --enable-zsh-secure-free + make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + HOME="${srcdir}" make check +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}/" install + install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/testing/zsh/zprofile b/testing/zsh/zprofile new file mode 100644 index 000000000..6bfcdf7cb --- /dev/null +++ b/testing/zsh/zprofile @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' diff --git a/testing/zsh/zsh.install b/testing/zsh/zsh.install new file mode 100644 index 000000000..e2a53bea8 --- /dev/null +++ b/testing/zsh/zsh.install @@ -0,0 +1,11 @@ +post_install() { + grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells +} + +post_upgrade() { + post_install +} + +pre_remove() { + sed -i '/^\/bin\/zsh/d' etc/shells +} -- cgit v1.2.3-54-g00ecf