diff options
28 files changed, 506 insertions, 241 deletions
diff --git a/community-testing/erlang/PKGBUILD b/community-testing/erlang/PKGBUILD new file mode 100644 index 000000000..c255213c7 --- /dev/null +++ b/community-testing/erlang/PKGBUILD @@ -0,0 +1,72 @@ +# $Id: PKGBUILD 69278 2012-04-12 02:34:43Z tdziedzic $ +# Maintainer: Lukas Fleischer <archlinux@cryptocrack.de> +# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> +# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> +# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com> + +pkgname=erlang +pkgver=R15B01 +pkgrel=1 +pkgdesc='A small concurrent functional programming language developed by Ericsson.' +arch=(i686 x86_64) +url='http://www.erlang.org/index.html' +license=('custom') +depends=('ncurses' 'glibc') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa') +optdepends=('wxgtk: for wx support' + 'mesa: for wx support' + 'unixodbc: database' + 'java-environment: for Java support') +options=('!makeflags') +source=("http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz" + "http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz") +md5sums=('f12d00f6e62b36ad027d6c0c08905fad' + 'd87412c2a1e6005bbe29dfe642a9ca20') + +build() { + cd "$srcdir/otp_src_${pkgver/./-}" + + export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) + export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < \ + lib/erl_interface/vsn.mk) + + sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure + + CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support \ + --enable-threads + make +} + +package() { + cd "$srcdir/otp_src_${pkgver/./-}" + + make INSTALL_PREFIX="$pkgdir" install + + # fix prefix + cd "$pkgdir/usr/lib/erlang" + sed -i "s#$pkgdir##" bin/erl bin/start "erts-${ERTSVERSION}/bin/erl" \ + "erts-${ERTSVERSION}/bin/start" releases/RELEASES + + # fix symlinks + cd bin/ + ln -sf "../erts-${ERTSVERSION}/bin/epmd" + + cd "$pkgdir/usr/bin" + for file in *; do + ln -sfv "../lib/erlang/bin/$file" + done + + ln -s "../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call" \ + "$pkgdir/usr/bin/erl_call" + + # install documentation + install -d "$pkgdir/usr/share/doc/erlang" + install -Dm0644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" + + # install man pages + cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" + + # install license + install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" \ + "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" +} diff --git a/community/gtk-theme-switch2/PKGBUILD b/community/gtk-theme-switch2/PKGBUILD index a5b6b1015..78087c508 100644 --- a/community/gtk-theme-switch2/PKGBUILD +++ b/community/gtk-theme-switch2/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 46954 2011-05-13 20:41:12Z andrea $ +# $Id: PKGBUILD 69248 2012-04-11 04:16:20Z allan $ # Contributor: Eddie Lozon <almostlucky@attbi.com> # Contributor: Jason Chu <jason@archlinux.org> # Contributor: Thayer Williams <thayer@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=gtk-theme-switch2 pkgver=2.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Gtk2 theme switcher" url="http://muhri.net/nav.php3?node=gts" arch=('i686' 'x86_64') @@ -17,15 +17,14 @@ md5sums=('a9e7e62701cd4fba4d277dc210cd4317') build() { cd ${srcdir}/gtk-theme-switch-${pkgver} - - make || return 1 + make } package() { cd ${srcdir}/gtk-theme-switch-${pkgver} install -Dm755 gtk-theme-switch2 \ - ${pkgdir}/usr/bin/gtk-theme-switch2 || return 1 + ${pkgdir}/usr/bin/gtk-theme-switch2 install -Dm644 gtk-theme-switch2.1 \ - ${pkgdir}/usr/share/man/man1/gtk-theme-switch2.1 || return 1 + ${pkgdir}/usr/share/man/man1/gtk-theme-switch2.1 } diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD index 5e3d59988..29d9895a9 100644 --- a/community/mythplugins/PKGBUILD +++ b/community/mythplugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 62800 2012-01-27 02:41:18Z jconder $ +# $Id: PKGBUILD 69264 2012-04-11 06:54:34Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -10,36 +10,36 @@ pkgname=('mythplugins-mytharchive' 'mythplugins-mythmusic' 'mythplugins-mythnetvision' 'mythplugins-mythnews' - 'mythplugins-mythvideo' 'mythplugins-mythweather' 'mythplugins-mythweb' 'mythplugins-mythzoneminder') -pkgver=0.24.2 -pkgrel=2 +pkgver=0.25 +pkgrel=1 epoch=1 arch=('i686' 'x86_64') url="http://www.mythtv.org" license=('GPL') -makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' - 'libcdaudio' 'libexif' 'libvisual' 'libvorbis' 'mplayer' 'mythtv' - 'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size' - 'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' - 'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging' - 'python-pycurl' 'sdl' 'taglib' 'zlib') +makedepends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac' 'libexif' + 'libvorbis' 'mplayer' 'mythtv' 'perl-datetime-format-iso8601' + 'perl-date-manip' 'perl-image-size' 'perl-json' 'perl-libwww' + 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' + 'python2-oauth' 'python-imaging' 'python-pycurl' 'taglib' 'zlib') source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2" 'mtd.rc') -md5sums=('471836d48657afc488d560aee624931e' +md5sums=('b3f2768372a38e92ca94841519daa05e' '476c12ba074794ad7f4ae092bdf949d6') build() { cd "$srcdir/$pkgbase-$pkgver" find . -name '*.py' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + sed -re 's@cstdio@cstdio>\n#include <unistd.h@' -i mythzoneminder/mythzmserver/zmserver.cpp + ./configure --prefix=/usr \ --enable-all \ - --python=python2 + --python=python2 qmake mythplugins.pro - make + make -s } package_mythplugins-mytharchive() { @@ -77,8 +77,7 @@ package_mythplugins-mythgame() { package_mythplugins-mythmusic() { pkgdesc="Music playing plugin for MythTV" - depends=('cdparanoia' 'flac' 'libcdaudio' 'libvisual' 'libvorbis' 'mythtv' - 'sdl' 'taglib') + depends=('mythtv' 'taglib') cd "$srcdir/$pkgbase-$pkgver/mythmusic" make INSTALL_ROOT="$pkgdir" install @@ -86,7 +85,7 @@ package_mythplugins-mythmusic() { package_mythplugins-mythnetvision() { pkgdesc="MythNetvision plugin for MythTV" - depends=('mythtv' 'python2-oauth' 'python-pycurl') + depends=('mythtv' 'python2-oauth') cd "$srcdir/$pkgbase-$pkgver/mythnetvision" make INSTALL_ROOT="$pkgdir" install @@ -100,19 +99,9 @@ package_mythplugins-mythnews() { make INSTALL_ROOT="$pkgdir" install } -package_mythplugins-mythvideo() { - pkgdesc="Video playback and browsing plugin for MythTV" - depends=('mplayer' 'mythtv') - - cd "$srcdir/$pkgbase-$pkgver/mythvideo" - make INSTALL_ROOT="$pkgdir" install - - install -D -m755 "$srcdir/mtd.rc" "$pkgdir/etc/rc.d/mtd" -} - package_mythplugins-mythweather() { pkgdesc="Weather checking plugin for MythTV" - depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-libwww' 'perl-soap-lite' + depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size' 'perl-datetime-format-iso8601') diff --git a/community/mythtv/PKGBUILD b/community/mythtv/PKGBUILD index 3a2461b55..37a58eecd 100644 --- a/community/mythtv/PKGBUILD +++ b/community/mythtv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67901 2012-03-15 23:14:42Z ebelanger $ +# $Id: PKGBUILD 69262 2012-04-11 06:53:29Z jconder $ # Maintainer: Jonathan Conder <jonno.conder@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Juergen Hoetzel <juergen@archlinux.org> @@ -6,59 +6,53 @@ # Contributor: dorphell <dorphell@archlinux.org> pkgname=mythtv -pkgver=0.24.2 -pkgrel=3 +pkgver=0.25 +pkgrel=1 epoch=1 pkgdesc="A Homebrew PVR project" arch=('i686' 'x86_64') url="http://www.mythtv.org/" license=('GPL') -depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama' - 'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients' - 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp' - 'python2-lxml' 'wget' 'qtwebkit') -makedepends=('yasm') -optdepends=('xmltv: to download tv listings') +depends=('avahi' 'fftw' 'lame' 'libass' 'libavc1394' 'libcdio' 'libiec61883' + 'libpulse' 'libva' 'libvdpau' 'libxinerama' 'lirc-utils' 'mesa' + 'mysql-clients' 'mysql-python' 'perl-dbd-mysql' 'perl-io-socket-inet6' + 'perl-libwww' 'perl-net-upnp' 'python2-lxml' 'qtwebkit' 'urlgrabber' + 'x264') +makedepends=('glew' 'libcec' 'libxml2' 'openssl' 'yasm') +optdepends=('glew: for GPU commercial flagging' + 'libcec: for consumer electronics control capabilities' + 'libxml2: to read blu-ray metadata' + 'openssl: for AirTunes (RAOP) support' + 'xmltv: to download tv listings') backup=('etc/conf.d/mythbackend') install='mythtv.install' source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2" + 'mythtv_0.25_gcc_4.7.patch' 'mythbackend.rc' 'mythbackend.conf') -md5sums=('7259fd24560da77da90b1494492f9550' - 'feadcc9ad064d93d6dceab1efc0bd9ed' - 'bb8e4033d82428d827570fae9ba15e6a') +md5sums=('e49c81de40e279c83dcb1b2aa9a45748' + '6090f5f22a8584db80b76cf19869ee41' + '62fd98347c56b1d9b795792f83269d25' + '1f72db0586f97a7c3fd3155dfa9a6c6f') build() { cd "$srcdir/$pkgname-$pkgver" find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + patch -Np1 -i "$srcdir/mythtv_0.25_gcc_4.7.patch" + ARCH="${CARCH/_/-}" - ./configure --prefix=/usr --cpu="$ARCH" \ - --enable-mmx \ - --enable-audio-oss \ - --enable-audio-alsa \ - --disable-audio-jack \ - --enable-audio-pulse \ - --disable-altivec \ - --disable-distcc \ - --disable-ccache \ - --enable-vdpau \ - --enable-dvb \ - --dvb-path=/usr/include \ - --enable-lirc \ - --enable-joystick-menu \ - --enable-v4l \ - --enable-ivtv \ - --enable-xvmc \ - --enable-xvmcw \ - --enable-xvmc-vld \ - --enable-firewire \ - --enable-opengl-vsync \ - --enable-xrandr \ - --enable-xv \ - --enable-x11 \ - --with-bindings=perl,python \ - --python=python2 + ./configure --prefix=/usr \ + --cpu="$ARCH" \ + --disable-altivec \ + --disable-audio-jack \ + --disable-ccache \ + --disable-distcc \ + --enable-libfftw3 \ + --enable-libmp3lame \ + --enable-libx264 \ + --enable-vaapi \ + --python=python2 make } @@ -72,4 +66,5 @@ package() { mkdir -p "$pkgdir/usr/share/mythtv" cp -R 'contrib' "$pkgdir/usr/share/mythtv" + mkdir -p "$pkgdir/var/log/mythtv" } diff --git a/community/mythtv/mythbackend.conf b/community/mythtv/mythbackend.conf index e004ae5bd..15a248450 100644 --- a/community/mythtv/mythbackend.conf +++ b/community/mythtv/mythbackend.conf @@ -1,11 +1,5 @@ #!/bin/bash # -# Rename this file to: -# -# /etc/config.d/mythbackend -# -############################################################################### -# # Copyright (c) by the MythTV Development Team. # # Derived from work by: @@ -32,21 +26,7 @@ # ############################################################################### # -# Config variables for the mythbackend startup script, which is usually -# located in /etc/rc.d/mythbackend -# -# When the startup script is executed, it sources this file if it exists, -# otherwise it will fall back on default values. -# -# Leave variables commented out to use default values in init script -# (/etc/rc.d/mythbackend). -# -# To override defaults, uncomment the relevant variable definition and -# edit as required. -# - -# -# User who should start the mythbackend processes +# User who should start the mythbackend process # # Running mythbackend as non-root requires you to ensure that audio/video # devices used for recording have suitable user permissions. One way @@ -59,32 +39,14 @@ # MBE_USER='root' # -# Directory holding the mythbackend binary (empty means autodetect). +# Startup options for mythbackend (see 'mythbackend --help' for a list). # -# MBE_DIR='' - -# -# Name of mythbackend binary. -# -# MBE_PROG='mythbackend' - -# -# Other startup options for mythbackend (see 'mythbackend --help' for a list). -# -# MBE_OPTIONS='' +# MBE_OPTS='' # # Directory holding the mythbackend log file # -# LOG_DIR='/var/log/mythtv' - -# -# Name of mythbackend log file. -# -# NOTE: If you are running as non-root take care to ensure the mythbackend user -# has permission to write to this log file. -# -# LOG_FILE='mythbackend.log' +# LOG_PATH='/var/log/mythtv' # # Logging options for mythbackend (see 'mythbackend -v help' for a list) diff --git a/community/mythtv/mythbackend.rc b/community/mythtv/mythbackend.rc index 410e8de41..2b3c2d52e 100644 --- a/community/mythtv/mythbackend.rc +++ b/community/mythtv/mythbackend.rc @@ -2,81 +2,72 @@ . /etc/rc.conf . /etc/rc.d/functions +. /etc/profile +############################################################################### # Default values to use if none are supplied in the config file. - -# Running mythbackend as non-root requires you to ensure that audio/video -# devices used for recording have suitable user permissions. One way -# to achieve this is to modify existing or create new udev rules which -# assign these devices to a non-root group with rw permissions and add -# your mythbackend user to that group. Be aware that console.perms can -# also affect device permissions and may need additional configuration. -# Running as non-root may also introduce increased process latency. # -# User who should start the mythbackend processes +# User who should start the mythbackend process MBE_USER='root' # Startup options for mythbackend -MBE_OPTIONS='' +MBE_OPTS='' -# Name of mythbackend log file -LOG_FILE='/var/log/mythbackend.log' +# Directory holding the mythbackend log file +LOG_PATH='/var/log/mythtv' -# Logging options for mythbackend (empty means '-v important,general') +# Logging options for mythbackend LOG_OPTS='' - ############################################################################### CONFIG_FILE=/etc/conf.d/mythbackend PIDFILE=/var/run/mythbackend.pid -if [[ -f ${CONFIG_FILE} ]]; then - . ${CONFIG_FILE} +if [[ -r "$CONFIG_FILE" ]]; then + . "$CONFIG_FILE" fi -pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)"; - -# fix FS#11890 -mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)" +PID="$(cat "$PIDFILE" 2> /dev/null || pidof mythbackend)" +export HOME="$(getent passwd "$MBE_USER" | cut -d : -f 6)" case "$1" in - start) - stat_busy "Starting MythTV Backend" + start) + stat_busy "Starting MythTV Backend" + + if [[ "$PID" -gt 0 ]] && kill -0 "$PID"; then + stat_fail + exit 0 + fi + + touch "$PIDFILE" + chown "$MBE_USER" "$PIDFILE" "$LOG_PATH" - # already running ? - if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then - stat_fail - exit 1; - fi - touch ${PIDFILE} ${LOG_FILE} - chown "$MBE_USER" ${PIDFILE} ${LOG_FILE} - if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \ - --daemon \ - --logfile $LOG_FILE $LOG_OPTS \ - --pidfile ${PIDFILE} $MBE_OPTIONS"; - then - add_daemon mythbackend - stat_done - else - stat_fail - fi - ;; - - stop) - stat_busy "Stopping MythTV Backend" - if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then - rm_daemon mythbackend - stat_done - rm ${PIDFILE} 2>/dev/null - else - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" + MBE_CMD="/usr/bin/mythbackend --daemon \ + --logpath "$LOG_PATH" $LOG_OPTS \ + --pidfile "$PIDFILE" $MBE_OPTS" + if su "$MBE_USER" -c "$MBE_CMD"; then + add_daemon mythbackend + stat_done + else + stat_fail + fi + ;; + stop) + stat_busy "Stopping MythTV Backend" + if [[ "$PID" -gt 0 ]] && kill "$PID" &> /dev/null; then + rm_daemon mythbackend + stat_done + rm -f "$PIDFILE" + else + stat_fail + fi + ;; + restart) + "$0" stop + "$0" start + ;; + *) + echo "usage: $0 (start|stop|restart)" + ;; esac exit 0 diff --git a/community/mythtv/mythtv_0.25_gcc_4.7.patch b/community/mythtv/mythtv_0.25_gcc_4.7.patch new file mode 100644 index 000000000..83c8244a0 --- /dev/null +++ b/community/mythtv/mythtv_0.25_gcc_4.7.patch @@ -0,0 +1,107 @@ +*** a/libs/libmythbase/compat.h 2012-03-31 20:52:30.430461503 -0400 +--- b/libs/libmythbase/compat.h 2012-03-31 20:59:05.935585911 -0400 +*************** +*** 44,49 **** +--- 44,51 ---- + # include <sys/resource.h> // for setpriority + # include <sys/socket.h> + # include <sys/wait.h> // For WIFEXITED on Mac OS X ++ # include <stdio.h> // for snprintf(), used by inline dlerror() ++ # include <unistd.h> // for usleep() + #endif + + #ifdef USING_MINGW +*** a/libs/libmyth/rssparse.h 2012-03-31 20:52:30.427453729 -0400 +--- b/libs/libmyth/rssparse.h 2012-03-31 21:51:11.687438044 -0400 +*************** +*** 13,18 **** +--- 13,19 ---- + #include <QPair> + #include <QMap> + #include <QVariant> ++ #include <sys/types.h> + + #include "mythexp.h" + +*** a/libs/libmythtv/audioinput.h 2012-03-31 22:41:55.626923063 -0400 +--- b/libs/libmythtv/audioinput.h 2012-03-31 22:41:22.478248297 -0400 +*************** +*** 22,27 **** +--- 22,28 ---- + #define _AUDIOINPUT_H_ + + #include <QString> ++ #include <unistd.h> + + class AudioInput + { +*** a/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 20:52:29.923150437 -0400 +--- b/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400 +*************** +*** 398,404 **** + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ + : "memory"\ + );\ + src += 4-(h+5)*srcStride;\ +--- 398,404 ---- + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : "memory"\ + );\ + src += 4-(h+5)*srcStride;\ +*************** +*** 446,452 **** + QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ + "2: \n\t"\ + : "+a"(src)\ +! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ + : "memory"\ + );\ + tmp += 4;\ +--- 446,452 ---- + QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ + "2: \n\t"\ + : "+a"(src)\ +! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ + : "memory"\ + );\ + tmp += 4;\ +*************** +*** 823,829 **** + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ + "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ + "memory"\ +--- 823,829 ---- + "2: \n\t"\ + \ + : "+a"(src), "+c"(dst)\ +! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ + "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ + "memory"\ +*************** +*** 878,884 **** + QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) + "2: \n\t" + : "+a"(src) +! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7",) + "memory" +--- 878,884 ---- + QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) + "2: \n\t" + : "+a"(src) +! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) + : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", + "%xmm4", "%xmm5", "%xmm6", "%xmm7",) + "memory" diff --git a/community/nickle/PKGBUILD b/community/nickle/PKGBUILD index 1e511b630..44f3e05ca 100644 --- a/community/nickle/PKGBUILD +++ b/community/nickle/PKGBUILD @@ -1,9 +1,9 @@ -#$Id: PKGBUILD 46957 2011-05-13 20:41:22Z andrea $ -#Maintainer: Jan de Groot <jgc@archlinux.org> +#$Id: PKGBUILD 69252 2012-04-11 04:23:34Z allan $ +# Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=nickle pkgver=2.70 -pkgrel=1 +pkgrel=2 pkgdesc="A programming language based prototyping environment with powerful programming and scripting capabilities" arch=('i686' 'x86_64') url="http://nickle.org" @@ -16,7 +16,10 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" + install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/community/pwsafe/PKGBUILD b/community/pwsafe/PKGBUILD index f624e456c..2a4535a27 100644 --- a/community/pwsafe/PKGBUILD +++ b/community/pwsafe/PKGBUILD @@ -1,23 +1,35 @@ -# $Id: PKGBUILD 66173 2012-02-23 02:29:46Z spupykin $ +# $Id: PKGBUILD 69267 2012-04-11 11:46:13Z lcarlier $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> pkgname=pwsafe pkgver=0.2.0 -pkgrel=7 +pkgrel=8 pkgdesc="A commandline program for managing encrypted password databases" arch=('i686' 'x86_64') url="http://nsd.dyndns.org/pwsafe/" license=('GPL') depends=('openssl' 'libxmu' 'readline') -source=($url/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('4bb36538a2772ecbf1a542bc7d4746c0') +source=(${url}/releases/${pkgname}-${pkgver}.tar.gz + pwsafe-XChangeProperty.patch) +md5sums=('4bb36538a2772ecbf1a542bc7d4746c0' + 'cff6aee2e43f5fbe82e8cd7ccfefb099') build() { cd ${srcdir}/${pkgname}-${pkgver} + + # Patch from fedora, fixes FS#28339 + patch -Np0 -i ../pwsafe-XChangeProperty.patch + ./configure --prefix=/usr --mandir=/usr/share/man make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install + # Make pwsafe suid root so it can seed rng as a user chmod +s ${pkgdir}/usr/bin/pwsafe } diff --git a/community/pwsafe/pwsafe-XChangeProperty.patch b/community/pwsafe/pwsafe-XChangeProperty.patch new file mode 100644 index 000000000..6758a573d --- /dev/null +++ b/community/pwsafe/pwsafe-XChangeProperty.patch @@ -0,0 +1,20 @@ +Index: pwsafe.cpp +=================================================================== +RCS file: /cvsroot/pwsafe/pwsafe/pwsafe.cpp,v +retrieving revision 1.57 +diff -u -r1.57 pwsafe.cpp +--- pwsafe.cpp 12 Aug 2007 12:33:06 -0000 1.57 ++++ pwsafe.cpp 5 Jan 2011 22:16:43 -0000 +@@ -1820,10 +1820,10 @@ + if (xev.xselectionrequest.target == XA_TARGETS(xdisplay)) { + // tell them what we can supply + const Atom targets[] = { XA_TARGETS(xdisplay), XA_TIMESTAMP(xdisplay), XA_TEXT(xdisplay), XA_STRING }; +- XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_TARGETS(xdisplay), 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&targets), sizeof(targets)/sizeof(targets[0])); ++ XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_ATOM, 32, PropModeReplace, reinterpret_cast<const unsigned char*>(&targets), sizeof(targets)/sizeof(targets[0])); + } + else if (xev.xselectionrequest.target == XA_TIMESTAMP(xdisplay)) { +- XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_TIMESTAMP(xdisplay), 32, PropModeReplace, reinterpret_cast<const unsigned char*>(×tamp), 1); ++ XChangeProperty(xdisplay, xev.xselectionrequest.requestor, prop, XA_INTEGER, 32, PropModeReplace, reinterpret_cast<const unsigned char*>(×tamp), 1); + } + else if (xev.xselectionrequest.target == XA_TEXT(xdisplay) || + xev.xselectionrequest.target == XA_STRING) { diff --git a/community/snort/PKGBUILD b/community/snort/PKGBUILD index 445886fb0..e64dfe966 100644 --- a/community/snort/PKGBUILD +++ b/community/snort/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 64359 2012-02-11 23:24:21Z allan $ +# $Id: PKGBUILD 69276 2012-04-11 23:23:45Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Hugo Doria <hugo@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> @@ -6,8 +6,8 @@ # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> pkgname=snort -pkgver=2.9.2.1 -pkgrel=2 +pkgver=2.9.2.2 +pkgrel=1 pkgdesc='A lightweight network intrusion detection system.' arch=('i686' 'x86_64') url='http://www.snort.org' @@ -21,10 +21,10 @@ backup=('etc/conf.d/snort' 'etc/snort/classification.config') options=('!makeflags' '!libtool') install='snort.install' -source=('http://www.snort.org/downloads/1416' +source=("http://www.snort.org/dl/snort-current/${pkgname}-${pkgver}.tar.gz" 'snort' 'snort.conf.d') -md5sums=('2f3e2b6ee72adbdfac73cb1c6c14bd61' +md5sums=('4254389550e3be31afebc70e64e6002f' '361b8b9e40b9af0164f6b3e3da2e8277' 'b4fb8a68490589cd34df93de7609bfac') diff --git a/extra/libgphoto2/PKGBUILD b/extra/libgphoto2/PKGBUILD index 629bea861..ea93665fd 100644 --- a/extra/libgphoto2/PKGBUILD +++ b/extra/libgphoto2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 152973 2012-03-10 23:27:06Z tomegun $ +# $Id: PKGBUILD 156010 2012-04-11 12:37:00Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Eduardo Romero <eduardo@archlinux.org> @@ -6,7 +6,7 @@ pkgname=libgphoto2 pkgver=2.4.13 -pkgrel=1 +pkgrel=2 pkgdesc="The core library of gphoto2, designed to allow access to digital camera by external programs." arch=(i686 x86_64) url="http://www.gphoto.org" @@ -31,11 +31,11 @@ package() { # Remove unused udev helper rm -rf "${pkgdir}/usr/lib/udev" - install -m755 -d "${pkgdir}/lib/udev/rules.d" + install -m755 -d "${pkgdir}/usr/lib/udev/rules.d" LD_LIBRARY_PATH="${pkgdir}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \ CAMLIBS="${pkgdir}/usr/lib/libgphoto2/${pkgver}" \ "${pkgdir}/usr/lib/libgphoto2/print-camera-list" udev-rules version 136 > \ - "${pkgdir}/lib/udev/rules.d/40-gphoto.rules" + "${pkgdir}/usr/lib/udev/rules.d/40-gphoto.rules" # Remove recursive symlink rm -f "${pkgdir}/usr/include/gphoto2/gphoto2" diff --git a/extra/misdnuser/PKGBUILD b/extra/misdnuser/PKGBUILD index 00dd5e1c2..a6475d25c 100644 --- a/extra/misdnuser/PKGBUILD +++ b/extra/misdnuser/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 154556 2012-03-30 08:32:21Z tpowa $ +# $Id: PKGBUILD 156006 2012-04-11 12:11:55Z tomegun $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=misdnuser pkgver=2.0.11 -pkgrel=2 +pkgrel=3 pkgdesc="Tools and library for mISDN" arch=('i686' 'x86_64') url="http://www.misdn.org" @@ -25,9 +25,11 @@ package() { make DESTDIR=${pkgdir} install install -D -m 755 ${srcdir}/misdncapid.rc ${pkgdir}/etc/rc.d/misdncapid # fix udev rule - mkdir -p ${pkgdir}/lib/udev/rules.d - mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/lib/udev/rules.d + mkdir -p ${pkgdir}/usr/lib/udev/rules.d + mv ${pkgdir}/etc/udev/rules.d/45-misdn.rules ${pkgdir}/usr/lib/udev/rules.d rm -r ${pkgdir}/etc/udev/ + # remove temporary dir /var/run/mISDNcapid + rm -r ${pkgdir}/var } md5sums=('1c8825afde76e290727240077bbd37ea' '2009563b144de037ecb20f8d727a772e') diff --git a/extra/ntfs-3g_ntfsprogs/PKGBUILD b/extra/ntfs-3g_ntfsprogs/PKGBUILD index d01f70a47..07a3fbf7d 100644 --- a/extra/ntfs-3g_ntfsprogs/PKGBUILD +++ b/extra/ntfs-3g_ntfsprogs/PKGBUILD @@ -1,11 +1,12 @@ -# $Id: PKGBUILD 149729 2012-02-09 19:52:17Z ibiru $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> +# $Id: PKGBUILD 156015 2012-04-11 14:16:02Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> +# Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: Thomas Bächler <thomas.archlinux.org> pkgbase=ntfs-3g_ntfsprogs pkgname=('ntfs-3g' 'ntfsprogs') pkgver=2012.1.15 -pkgrel=1 +pkgrel=2 url="http://www.tuxera.com" arch=('i686' 'x86_64') license=('GPL2') @@ -31,6 +32,9 @@ package_ntfs-3g() { make DESTDIR="$pkgdir" install done + mv "$pkgdir"/lib/* "$pkgdir"/usr/lib/ + rm -rf "$pkgdir"/lib + ln -s /bin/ntfs-3g "$pkgdir/sbin/mount.ntfs" } diff --git a/extra/perl-list-moreutils/PKGBUILD b/extra/perl-list-moreutils/PKGBUILD index 25df44f99..276a6f804 100644 --- a/extra/perl-list-moreutils/PKGBUILD +++ b/extra/perl-list-moreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 145017 2011-12-14 17:49:12Z andrea $ +# $Id: PKGBUILD 155999 2012-04-11 04:34:58Z allan $ # Maintainer : Justin "juster" Davis <jrcd83@gmail.com> # Generator : pbjam 0.01 pkgname=perl-list-moreutils pkgver=0.33 -pkgrel=1 +pkgrel=2 pkgdesc="Provide the stuff missing in List::Util" arch=(i686 x86_64) license=(PerlArtistic GPL) diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index e5c2e7a77..fe73dd9fc 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 155421 2012-04-03 11:45:06Z giovanni $ +# $Id: PKGBUILD 156017 2012-04-11 14:59:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.46 +pkgver=1.47 pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64') @@ -15,10 +15,11 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('02ebd818307773f5c9844678e9a38a7d') +md5sums=('5488d82a8e9291d6a7de5202a95cbbed') build() { cd ${srcdir}/${_cpanname}-${pkgver} + # install module in vendor directories. PERL_MM_USE_DEFAULT=1 perl Makefile.PL -- INSTALLDIRS=vendor make diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD index b3093389f..0c3d80b22 100644 --- a/extra/samba/PKGBUILD +++ b/extra/samba/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 153619 2012-03-16 17:50:36Z stephane $ +# $Id: PKGBUILD 156039 2012-04-11 21:03:20Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') -pkgver=3.6.3 +pkgver=3.6.4 # We use the 'A' to fake out pacman's version comparators. Samba chooses # to append 'a','b',etc to their subsequent releases, which pamcan # misconstrues as alpha, beta, etc. Bad samba! -_realver=3.6.3 -pkgrel=4 +_realver=3.6.4 +pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" license=('GPL3') @@ -145,7 +145,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr # copy ldap example install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } -md5sums=('98ac9db9f4b6ebfc3f013aa193ffb0d1' +md5sums=('d8e070e2a3b12f202f347e4427469bc2' 'dfc6f9018c556b9783c7140de183727f' '5697da77590ec092cc8a883bae06093c' 'a4bbfa39fee95bba2e7ad6b535fae7e6' diff --git a/extra/uim/PKGBUILD b/extra/uim/PKGBUILD index fd1e4dc15..7c15073a2 100644 --- a/extra/uim/PKGBUILD +++ b/extra/uim/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150199 2012-02-14 13:39:03Z bisson $ +# $Id: PKGBUILD 156004 2012-04-11 11:56:37Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=uim -pkgver=1.7.3 +pkgver=1.8.0 pkgrel=1 pkgdesc='Multilingual input method library' url='http://code.google.com/p/uim/' @@ -17,7 +17,7 @@ optdepends=('qt: immodule and helper applications' 'gnome-panel: gnome applet indicator') options=('!libtool') source=("http://uim.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('1c7bb8c6c475dcbc4768bcabac540c42ccfd8185') +sha1sums=('bf26b0b8b6b3949a612607df1d7feb9b6083745e') install=install @@ -36,5 +36,6 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + rm "${pkgdir}"/usr/lib/libgcroots.a install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD index 5e3bb7af1..3af2cc4c0 100644 --- a/extra/v86d/PKGBUILD +++ b/extra/v86d/PKGBUILD @@ -1,25 +1,19 @@ -# $Id: PKGBUILD 129979 2011-06-30 18:07:08Z thomas $ +# $Id: PKGBUILD 156008 2012-04-11 12:26:27Z tomegun $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=v86d pkgver=0.1.10 -pkgrel=2 +pkgrel=3 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" arch=('i686' 'x86_64') url="http://dev.gentoo.org/~spock/projects/uvesafb/" license=('GPL2') depends=('glibc') -conflicts=('mkinitcpio<0.7') -backup=('etc/modprobe.d/uvesafb.conf') options=('!makeflags') source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 v86d v86d_hook modprobe.uvesafb) -md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' - '2748ca01397e5c4435f87692f7d042a8' - '813958b8f6c75a7063e4858f31509694' - '2d7cc8dc6a41916a13869212d0191147') build() { cd "$srcdir/v86d-$pkgver" @@ -32,7 +26,11 @@ package() { cd "$srcdir/v86d-$pkgver" make DESTDIR="$pkgdir" install - install -D -m644 "$srcdir/v86d" "$pkgdir/lib/initcpio/install/v86d" - install -D -m644 "$srcdir/v86d_hook" "$pkgdir/lib/initcpio/hooks/v86d" - install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/etc/modprobe.d/uvesafb.conf" + install -D -m644 "$srcdir/v86d" "$pkgdir/usr/lib/initcpio/install/v86d" + install -D -m644 "$srcdir/v86d_hook" "$pkgdir/usr/lib/initcpio/hooks/v86d" + install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/usr/lib/modprobe.d/uvesafb.conf" } +md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' + 'b20042d1e5354958b62d4944998d68aa' + '5f75b8bc4a7ddf595014591e5db263cb' + '2d7cc8dc6a41916a13869212d0191147') diff --git a/extra/v86d/v86d b/extra/v86d/v86d index 2065b8e64..81735816e 100644 --- a/extra/v86d/v86d +++ b/extra/v86d/v86d @@ -1,6 +1,6 @@ build() { add_binary "/sbin/v86d" - add_file "/etc/modprobe.d/uvesafb.conf" + add_file "/usr/lib/modprobe.d/uvesafb.conf" MODULES="uvesafb" SCRIPT="v86d" } diff --git a/extra/v86d/v86d_hook b/extra/v86d/v86d_hook index e5dff01c1..2b4375e15 100644 --- a/extra/v86d/v86d_hook +++ b/extra/v86d/v86d_hook @@ -1,4 +1,4 @@ run_hook() { /sbin/modprobe uvesafb -}
\ No newline at end of file +} diff --git a/extra/xsp/PKGBUILD b/extra/xsp/PKGBUILD index 46625467b..7b84992f1 100644 --- a/extra/xsp/PKGBUILD +++ b/extra/xsp/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 149095 2012-02-05 17:09:35Z daniel $ +# $Id: PKGBUILD 156037 2012-04-11 18:58:41Z daniel $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=xsp pkgver=2.10.2 -pkgrel=2 +pkgrel=3 pkgdesc="A simple webserver based on mono - provides ASP.NET support" arch=(i686 x86_64) license=('custom') url="http://www.go-mono.com" -depends=('mono>=2.10.2' 'sqlite3') +depends=('mono>=2.10.2' 'sqlite') options=(!makeflags) install=${pkgname}.install source=(http://ftp.novell.com/pub/mono/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 \ diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD index cfd053a4c..024594330 100644 --- a/libre/file-roller-libre/PKGBUILD +++ b/libre/file-roller-libre/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 124730 2011-05-24 07:10:29Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 154606 2012-03-30 12:35:17Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> _pkgname=file-roller pkgname=file-roller-libre -pkgver=3.2.2 +pkgver=3.4.0 pkgrel=1 pkgdesc="Archive manipulator for GNOME" arch=('i686' 'x86_64') license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf' 'nautilus') +depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'dconf') makedepends=('intltool' 'gnome-doc-utils' 'pkg-config' 'nautilus' 'libsm') optdepends=('ununrar: interface to unarchiver, the free RAR uncompression program' 'zip: creates PKZIP-compatible .zip files' @@ -23,19 +24,19 @@ conflicts=("$_pkgname") options=('!libtool' '!emptydirs') install=file-roller.install url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('de2c93e947f7aabf46124d6384b358c162a7ee1236e4930f2486684979d5ebe5') +source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz) +sha256sums=('79dfb3bc2e0fb68094180ae1845e4b6c253d5f231e3cf355521193848610c5dc') build() { - cd "${srcdir}/${_pkgname}-${pkgver}" + cd $_pkgname-$pkgver ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/file-roller \ --localstatedir=/var --disable-static \ - --disable-scrollkeeper --disable-schemas-compile + --disable-schemas-compile make } package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd $_pkgname-$pkgver + make DESTDIR="$pkgdir" install } diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD index 050cfb484..2e5aa615c 100644 --- a/libre/ununrar/PKGBUILD +++ b/libre/ununrar/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Michał Masłowski <mtjm@mtjm.eu> pkgname=ununrar -pkgver=0.0a0dev20110715 +pkgver=0.0a0dev20120412 pkgrel=1 pkgdesc="An unrar-compatible interface to Unarchiver" arch=('any') @@ -12,7 +12,7 @@ provides=('unrar' 'unrar-libre') conflicts=('unrar' 'unrar-libre') options=(!emptydirs) source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz") -sha512sums=('ea2a6805c16be3aad81b18e5e9e044d73ca2f8f87ce078c35e64cdffb12d5f0e4c96e66901af54f388349edbb88c6252ed0e0329e9813cce5e7b9b480802cf44') +sha512sums=('3593198e76643b8873d06db770bf24a8d2fdab6d2ab7880850e29cb6c2f94836bcc032f6cc919dfe39deb030c2bcd942ab870231def3aee14e8e89cf78fc3d6f') package() { cd "$srcdir/Ununrar-$pkgver" diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index 7fa7442b6..8df922e2d 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 68826 2012-04-03 11:11:16Z allan $ +# $Id: PKGBUILD 69269 2012-04-11 15:52:28Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,8 +8,8 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.7.0 -pkgrel=3 -_snapshot=4.7-20120324 +pkgrel=4 +_snapshot=4.7-20120407 _libstdcppmanver=20120307 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" arch=('x86_64') @@ -24,7 +24,7 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64-multilib.patch gcc-4.7.0-cloog-0.17.patch) -md5sums=('947f9a70dcbb4baaf20b1e95b518048e' +md5sums=('e44a8484687ef52c02066d6434ecf42b' '489d2f5311535800a120efd8d18db719' 'ec24c32d3d1030c2bc8cb2ad2d1dc629' '575f7d17b022e609447a590e481b18b5') diff --git a/testing/readline/PKGBUILD b/testing/readline/PKGBUILD new file mode 100644 index 000000000..d33d12ec8 --- /dev/null +++ b/testing/readline/PKGBUILD @@ -0,0 +1,55 @@ +# $Id: PKGBUILD 156002 2012-04-11 05:08:06Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=readline +_basever=6.2 +_patchlevel=002 #prepare for some patches +pkgver=$_basever.$_patchlevel +pkgrel=2 +pkgdesc="GNU readline library" +arch=('i686' 'x86_64') +url="http://tiswww.case.edu/php/chet/readline/rltop.html" +license=('GPL') +depends=('glibc' 'ncurses') +backup=('etc/inputrc') +options=('!emptydirs') +install=readline.install +source=(http://ftp.gnu.org/gnu/readline/readline-$_basever.tar.gz{,.sig} + inputrc) +if [ $_patchlevel -gt 00 ]; then + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + source=(${source[@]} http://ftp.gnu.org/gnu/readline/readline-$_basever-patches/readline${_basever//./}-$(printf "%03d" $p){,.sig}) + done +fi +md5sums=('67948acb2ca081f23359d0256e9a271c' + '928f7d248320a65e43c2dc427e99582b' + '58d54966c1191db45973cb3191ac621a' + '83287d52a482f790dfb30ec0a8746669' + '8e6a51e2e0e6e45a82752e3692c111ac' + '0665020ea118e8434bd145fb71f452cc' + '285361ca6d48c51ae2428157e174e812') + +build() { + cd ${srcdir}/${pkgname}-$_basever + for (( p=1; p<=$((10#${_patchlevel})); p++ )); do + msg "applying patch readline${_basever//./}-$(printf "%03d" $p)" + patch -Np0 -i $srcdir/readline${_basever//./}-$(printf "%03d" $p) + done + + # Remove RPATH from shared objects (FS#14366) + sed -i 's|-Wl,-rpath,$(libdir) ||g' support/shobj-conf + + # build with -fPIC for x86_64 (FS#15634) + [ $CARCH == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" + + ./configure --prefix=/usr + make SHLIB_LIBS=-lncurses +} + +package() { + cd ${srcdir}/${pkgname}-$_basever + make DESTDIR=${pkgdir} install + + install -Dm644 ${srcdir}/inputrc ${pkgdir}/etc/inputrc +} diff --git a/testing/readline/inputrc b/testing/readline/inputrc new file mode 100644 index 000000000..fd13a673b --- /dev/null +++ b/testing/readline/inputrc @@ -0,0 +1,36 @@ +# do not bell on tab-completion +#set bell-style none + +set meta-flag on +set input-meta on +set convert-meta off +set output-meta on + +$if mode=emacs + +# for linux console and RH/Debian xterm +"\e[1~": beginning-of-line +"\e[4~": end-of-line +"\e[5~": beginning-of-history +"\e[6~": end-of-history +"\e[7~": beginning-of-line +"\e[3~": delete-char +"\e[2~": quoted-insert +"\e[5C": forward-word +"\e[5D": backward-word +"\e\e[C": forward-word +"\e\e[D": backward-word +"\e[1;5C": forward-word +"\e[1;5D": backward-word + +# for rxvt +"\e[8~": end-of-line + +# for non RH/Debian xterm, can't hurt for RH/DEbian xterm +"\eOH": beginning-of-line +"\eOF": end-of-line + +# for freebsd console +"\e[H": beginning-of-line +"\e[F": end-of-line +$endif diff --git a/testing/readline/readline.install b/testing/readline/readline.install new file mode 100644 index 000000000..06b646f23 --- /dev/null +++ b/testing/readline/readline.install @@ -0,0 +1,17 @@ +infodir=usr/share/info +filelist=(history.info readline.info rluserman.info) + +post_upgrade() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +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 +} + |